chore: Update vertical-tabs.css to remove margin-bottom on #newtab-button-container

Adding Homebrew

.gitattributes

@@ -0,0 +1,2 @@
+
+*.patch linguist-language=C++

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+
+patreon: zen_browser
+ko_fi: zen_browser

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,63 @@
+name: Bug Report
+description: File a bug report
+labels: [Triage]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for filing a bug report.
+
+        ## Important
+        - Please search existing issues to avoid creating duplicates.
+        - For enhancement requests, please use GitHub Discussions.
+        - Please fill out the template below to the best of your ability.
+  - type: checkboxes
+    id: captchas
+    attributes:
+      label: Captchas
+      description: Just making sure you did actually read the instructions.
+      options:
+        - label: I have read the instructions.
+        - label: I have searched existing issues and avoided creating duplicates.
+        - label: I am not filing an enhancement request.
+  - 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? Please DO NOT report Classic bugs.
+      placeholder: 1.0.0
+    validations:
+      required: true
+  - type: dropdown
+    id: platform
+    attributes:
+      label: What platform are you seeing the problem on?
+      multiple: true
+      options:
+        - Linux
+        - macOS - aarch64
+        - macOS - Intel
+        - Windows
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/workflows/alpha.yml

@@ -30,8 +30,11 @@ jobs:
         with:
           node-version: 20
 
-      - uses: actions/checkout@v3
-
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+          
       - name: Install pnpm
         run: npm install -g pnpm
 
@@ -41,14 +44,6 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
       - name: Install dependencies
         run: pnpm install
 
@@ -57,9 +52,15 @@ jobs:
           npm i -g @zen-browser/surfer
 
       - name: Bump version
+        if: ${{ github.event.inputs.update_version == 'true' }}
         run: |
           pnpm surfer ci --brand alpha --bump prerelease
 
+      - name: Bump version without new version
+        if: ${{ github.event.inputs.update_version == 'false' }}
+        run: |
+          pnpm surfer ci --brand alpha
+
       - name: Debug
         run: |
           surfer get version
@@ -89,8 +90,10 @@ jobs:
         with:
           node-version: 20
 
-      - name: Checkout
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
 
       - name: Install pnpm
         run: npm install -g pnpm
@@ -101,14 +104,6 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
       - name: Install dependencies
         run: pnpm install
 
@@ -133,277 +128,24 @@ jobs:
             exit 1
           fi
 
-  linux:
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    needs: [build-data, check-release]
-
-    steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v3
-
-        # Give the runner some swap space in an attempt to stop gkrust from crashing the build
-      - name: Set Swap Space
-        uses: pierotofy/set-swap-space@v1.0
-        with:
-          swap-size-gb: 6
-
-      - name: Setup git
-        run: |
-          git config --global user.email "mauro-balades@users.noreply.github.com"
-          git config --global user.name "mauro-balades"
-
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update --fix-missing
-          sudo apt-get update
-          sudo apt-get install dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm
-          pip install pycairo testresources
-
-      - name: Disable wasm sandboxing for the sake of my sanity
-        run: |
-          echo "ac_add_options --without-wasm-sandboxed-libraries" >> mozconfig
-
-      - name: Free up space
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-
-      - name: Install sccache
-        env:
-          LINK: https://github.com/mozilla/sccache/releases/download
-          SCCACHE_VERSION: 0.2.13
-        run: |
-          SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
-          mkdir -p $HOME/.local/bin
-          curl -L "$LINK/$SCCACHE_VERSION/$SCCACHE_FILE.tar.gz" | tar xz
-          mv -f $SCCACHE_FILE/sccache $HOME/.local/bin/sccache
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Save sccache
-        uses: actions/cache@v3
-        continue-on-error: false
-        with:
-          path: /home/runner/.cache/sccache
-          key: ${{ runner.os }}-sccache
-
-      - name: Install pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Load surfer CI setup
-        run: pnpm surfer ci --brand alpha --display-version ${{ needs.build-data.outputs.version }}
-
-      - name: Download firefox source and dependencies
-        run: pnpm surfer download
-
-      - name: Import
-        run: pnpm surfer import
-
-      - name: Bootstrap
-        run: |
-          cd engine
-          ./mach --no-interactive bootstrap --application-choice browser
-          cd ..
-
-      - name: Build
-        run: pnpm build
-
-      - name: Package
-        run: pnpm package
-
-      - name: Rename artifacts
-        run: |
-          mv dist/zen-*.tar.bz2 "zen.linux.tar.bz2"
-          mv dist/output.mar linux.mar
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: zen.linux.tar.bz2
-          path: ./zen.linux.tar.bz2
-
-      - name: Upload mar
-        uses: actions/upload-artifact@v3
-        with:
-          name: linux.mar
-          path: ./linux.mar
-
-      - name: Upload update manifests
-        uses: actions/upload-artifact@v3
-        with:
-          name: linux_update_manifest
-          path: ./dist/update
-
-  windows:
-    runs-on: ubuntu-latest
-    needs: [build-data, check-release]
-
-    steps:
-      - name: Install Node.js and pnpm
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v3
-
-      # Give the runner some swap space in an attempt to stop gkrust from crashing the build
-      - name: Set Swap Space
-        uses: pierotofy/set-swap-space@v1.0
-        with:
-          swap-size-gb: 6
-
-      - name: Install pnpm
-        run: npm install -g pnpm
-
-      - name: Setup git
-        run: |
-          git config --global user.email "mauro-balades@users.noreply.github.com"
-          git config --global user.name "mauro-balades"
-
-      - name: Install dependencies
-        run: |
-          pnpm i
-
-      - name: Load surfer CI setup
-        run: pnpm surfer ci --brand alpha --display-version ${{ needs.build-data.outputs.version }}
-
-      - name: Download
-        run: pnpm surfer download
-
-      - name: Disable wasm sandboxing for the sake of my sanity
-        run: |
-          cd engine/
-          echo "ac_add_options --without-wasm-sandboxed-libraries" >> mozconfig
-
-      - name: Free up space
-        run: |
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /opt/ghc
-          sudo rm -rf "/usr/local/share/boost"
-          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-
-      - name: Setup For Windows
-        run: |
-          set -x
-          mkdir -p ~/win-cross
-          cd engine/
-  
-          echo Setup wine
-          aria2c "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-1.toolchains.v3.linux64-wine.latest/artifacts/public%2Fbuild%2Fwine.tar.zst" -o wine.tar.zst
-          tar --zstd -xvf wine.tar.zst -C ~/win-cross
-          rm wine.tar.zst
-  
-          echo Setup Visual Studio
-          sudo apt install -y msitools python3-pip
-          ./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ~/win-cross/vs2022
-          
-          chmod -R +x "$(echo ~)/win-cross/vs2022" || true
- 
-          cat ../.github/workflows/src/windows_mozconfig >> ../configs/common/mozconfig
-
-          cd ..
-          npm install -g pnpm
-          pnpm surfer bootstrap
-
-          cd engine/
-          ls ~/.mozbuild/clang/lib/clang/
-          echo "export LIB=\"$(cd ~/.mozbuild/clang/lib/clang/* && cd lib/windows && pwd)\"" >> ../configs/common/mozconfig
-          cat ../configs/common/mozconfig
-
-          ls ~/win-cross/nsis || true
-  
-      - name: setup Rust 
-        run: |
-          cd engine/
-          # Install a rust version compatible with 17
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.76
-          source $HOME/.cargo/env
-          
-          rustup target add x86_64-pc-windows-msvc
-          cargo install cargo-download
-          cargo download -x windows=0.52.0
-          #? https://github.com/mozilla/sccache#known-caveats
-          export CARGO_INCREMENTAL=0
-          echo "export MOZ_WINDOWS_RS_DIR=$(pwd)/windows-0.52.0" >> ../configs/common/mozconfig
-
-      - name: Import
-        run: pnpm surfer import --verbose  
-
-      - name: Build
-        run: pnpm build
-
-      - name: Package
-        run: |
-          set -x
-          pnpm package
-          mv ./dist/output.mar windows.mar
-          mv ./dist/zen-$(pnpm surfer get version | xargs).en-US.win64.zip zen.win64.zip
-          ls ./dist
-          ls .
-
-      #- name: Upload artifact
-      #  uses: actions/upload-artifact@v3
-      #  with:
-      #    name: zen.installer.exe
-      #    path: ./dist/zen.installer.exe
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: zen.win64.zip
-          path: ./zen.win64.zip
-
-      - name: Upload mar
-        uses: actions/upload-artifact@v3
-        with:
-          name: windows.mar
-          path: ./windows.mar
-
-      - name: Upload update manifests
-        uses: actions/upload-artifact@v3
-        with:
-          name: windows_update_manifest
-          path: ./dist/update
 
   source:
+    if: false
     permissions:
       contents: write
     runs-on: ubuntu-latest
-    needs: [build-data]
-
+    needs: [build-data, check-release]
+    environment: production
     steps:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
           node-version: 20
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
 
       - name: Setup git
         run: |
@@ -439,165 +181,383 @@ jobs:
           cd ..
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: zen.source.tar.gz
           path: ./zen.source.tar.gz
 
-  mac:
-    if: false
-    runs-on: macos-13
-    needs: [build-data, check-release]
+  windows-step-1:
+    name: Windows build step 1 (PGO build)
+    uses: ./.github/workflows/windows-alpha-build.yml
+    needs: [build-data]
+    permissions:
+      contents: write
+    secrets: inherit
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      generate-gpo: true
+      profile-data-path-archive: zen-windows-x86_64-profile-data-and-jarlog.zip
 
+  windows-step-2:
+    name: Windows build step 2 (Generate profile data)
+    uses: ./.github/workflows/windows-profile-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [windows-step-1, build-data]
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      profile-data-path-archive: zen.win64-pgo-stage-1.zip
+
+  windows-step-3:
+    name: Windows build step 3 (build with profile data)
+    uses: ./.github/workflows/windows-alpha-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [build-data, windows-step-2]
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      generate-gpo: false
+
+  linux:
+    name: Linux build
+    uses: ./.github/workflows/linux-alpha-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [build-data] 
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+
+  mac:
+    name: macOS build
+    uses: ./.github/workflows/macos-alpha-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [build-data]
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+
+  appimage:
+    name: AppImage build - Linux ${{ matrix.generic == true && 'generic' || 'specific' }}
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        generic: [true, false]
+    needs: [linux]
     steps:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
           node-version: 20
 
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v4
         with:
-          python-version: '3.11' 
-
-      - uses: actions/checkout@v3
-
-      - name: Setup git
-        run: |
-          git config --global user.email "mauro-balades@users.noreply.github.com"
-          git config --global user.name "mauro-balades"
-
-      - name: Install system dependencies
-        run: |
-          brew install cairo sccache gnu-tar mercurial
-          sudo pip install setuptools
-
-      - name: Force usage fo gnu-tar
-        run: |
-          echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.bash_profile
-          echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.zsh
-          source ~/.bash_profile
-
-      - name: Save sccache
-        uses: actions/cache@v3
-        continue-on-error: false
-        with:
-          path: ~/Library/Caches/Mozilla.sccache
-          key: ${{ runner.os }}-sccache
-
-      - name: Install pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
 
       - name: Install dependencies
-        run: pnpm install
-      - name: Load surfer CI setup
-        run: pnpm surfer ci --brand alpha --display-version ${{ needs.build-data.outputs.version }}
-
-      - name: Download firefox source and dependancies
-        run: pnpm surfer download
-
-      - name: Import
-        run: pnpm surfer import
-
-      - name: Bootstrap
         run: |
-          cd engine
-          ./mach --no-interactive bootstrap --application-choice browser 
-          cd ..
+          npm install -g pnpm
+          sudo apt-get update
+          sudo apt-get -y install libfuse2 desktop-file-utils
 
-      - name: surfer build
-        run: pnpm build --verbose
+      - name: Download linux build
+        uses: actions/download-artifact@v4
+        with:
+          name: zen.linux-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.bz2
 
-      - name: Package
-        run: pnpm package
-
-      - name: Rename artifacts
+      - name: Execute AppImage build
         run: |
-          mv ./dist/*.dmg "zen.macos.dmg"
-          mv ./dist/output.mar macos.mar
+          set -eux
+          rm AppDir/.DirIcon || true
+          cp configs/branding/alpha/logo128.png AppDir/usr/share/icons/hicolor/128x128/apps/zen.png
+          cp configs/branding/alpha/logo128.png AppDir/zen.png && ln -s zen.png AppDir/.DirIcon
+
+          APPDIR=AppDir
+          tar -xvf *.tar.* && rm -rf *.tar.*
+          mv zen/* $APPDIR/
+          wget https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage
+          chmod +x *.AppImage
+          chmod +x ./AppDir/AppRun
+          echo "AppDir: $APPDIR"
+          ls -al
+          find .
+          ls -al "$APPDIR"
+          ARCH=x86_64 ./appimagetool-x86_64.AppImage --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 10 \
+          -u "gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|desktop|latest|zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage.zsync" \
+          "$APPDIR" zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage
+          mkdir dist
+          mv zen*AppImage* dist/.
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: zen.macos.dmg
-          path: ./zen.macos.dmg
+          name: zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage
+          path: ./dist/zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage
 
-      - name: Upload mar
-        uses: actions/upload-artifact@v3
+      - name: Upload artifact (ZSync)
+        uses: actions/upload-artifact@v4
         with:
-          name: macos.mar
-          path: ./macos.mar
-
-      - name: Upload update manifests
-        uses: actions/upload-artifact@v3
-        with:
-          name: macos_update_manifest
-          path: ./dist/update
+          name: zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage.zsync
+          path: ./dist/zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage.zsync
 
   release:
     if: ${{ github.event.inputs.create_release == 'true' }}
     permissions: write-all
     name: Release
-    needs: [build-data, linux, source, windows, check-release]
+    needs: [build-data, linux, windows-step-3, check-release, mac, appimage]
     runs-on: ubuntu-latest
 
     steps:
-      - name: Update repo
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
 
       - name: Git Pull
         run: git pull
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
+
+      - name: List
+        run: find .
+
+      - name: Clone updates repo
+        uses: actions/checkout@v4
+        with:
+          repository: zen-browser/updates-server
+          path: updates-server
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Copy update manifests
+        run: |
+          cd updates-server
+          mkdir -p updates
+          cp -a ../linux_update_manifest_generic/.  updates/
+          cp -a ../linux_update_manifest_specific/.  updates/
+
+          cp -a ../windows_update_manifest_generic/.  updates/
+          cp -a ../windows_update_manifest_specific/.  updates/
+          
+          cp -a ../macos_update_manifest_aarch64/.  updates/
+          cp -a ../macos_update_manifest_x64/.  updates/
+
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: 🚀 Update update manifests
+          commit_user_name: Zen Browser Robot
+          commit_user_email: zen-browser-bot@users.noreply.github.com
+          repository: ./updates-server
 
       - name: release-github
         uses: 'marvinpinto/action-automatic-releases@latest'
         with:
           repo_token: '${{ secrets.DEPLOY_KEY }}'
           automatic_release_tag: ${{ needs.build-data.outputs.version }}
+          prerelease: false
           title: 'Alpha build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
           files: |
-            zen.linux.tar.bz2
-            zen.win64.zip
             zen.source.tar.gz
+            zen.linux-generic.tar.bz2
+            zen.linux-specific.tar.bz2
+            zen-generic.AppImage
+            zen-generic.AppImage.zsync
+            zen-specific.AppImage
+            zen-specific.AppImage.zsync
+            zen.win-generic.zip
+            zen.win-specific.zip
             linux.mar
+            linux-generic.mar
             windows.mar
+            windows-generic.mar
+            macos-x64.mar
+            macos-aarch64.mar
+            zen.installer.exe
+            zen.installer-generic.exe
+            zen.macos-x64.dmg
+            zen.macos-aarch64.dmg
 
-      - name: List
-        run: find .
+  prepare-flatpak:
+    if: ${{ github.event.inputs.create_release == 'true' }}
+    permissions: write-all
+    name: Prepare Flatpak
+    needs: [release, linux, build-data]
+    runs-on: ubuntu-latest
 
-      - name: Clone updates repo
-        run: git clone https://github.com/zen-browser/updates-server.git
+    steps:
+      - name: Clone flatpak repo
+        uses: actions/checkout@v4
+        with:
+          repository: zen-browser/release-utils
+          token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Copy update manifests
+      - name: Install dependencies
         run: |
-          cd updates-server
-          mkdir -p updates
-          cp -a ../linux_update_manifest/. updates/
-          cp -a ../windows_update_manifest/. updates/
+          sudo apt-get update
+          npm install
+
+      - name: Generate new flatpak release
+        run: |
+          npm run build-flatpak -- \
+            --version ${{ needs.build-data.outputs.version }}
+
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: 🚀 Update releases for flatpak
+          commit_user_name: Zen Browser Robot
+          commit_user_email: zen-browser-bot@users.noreply.github.com
+
+      - name: Clone flatpak repo
+        uses: actions/checkout@v4
+        with:
+          repository: zen-browser/flatpak
+          token: ${{ secrets.DEPLOY_KEY }}
+          path: flatpak
+
+      - name: Move releases.xml
+        run: |
+          pwd
+          ls .
+          ls ..
+          mv releases.xml ./flatpak/io.github.zen_browser.zen.metainfo.xml
+          # output the version to the file
+          echo -n ${{ needs.build-data.outputs.version }} > ./flatpak/version
+
+
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: '[release]: Update flatpak manifest'
+          commit_user_name: Zen Browser Robot
+          commit_user_email: zen-browser-bot@users.noreply.github.com
+          repository: ./flatpak
+
+      - name: Wait 4 minutes for the flatpak repo to update
+        run: sleep 240
+
+  release-flatpak:
+    if: ${{ github.event.inputs.create_release == 'true' }}
+    permissions: write-all
+    name: Release Flatpak
+    needs: [prepare-flatpak]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone flatpak repo
+        uses: actions/checkout@v4
+        with:
+          repository: flathub/io.github.zen_browser.zen
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Download linux generic build
+        uses: actions/download-artifact@v4
+        with:
+          name: zen.linux-generic.tar.bz2
+
+      - name: Update repo
+        uses: actions/checkout@v4
+        with:
+          path: zen-browser
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Download flatpak archive
+        run: |
+          wget https://github.com/zen-browser/flatpak/releases/latest/download/archive.tar -O archive.tar
 
       - name: Setup git
         run: |
-          git config --global user.email "mauro-balades@users.noreply.github.com"
-          git config --global user.name "mauro-balades"
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
-      - name: Commit update manifests
+      - name: Prepare flatpak manifest
         run: |
-          cd updates-server
-          git add .
-          git commit -m "Update manifests for ${{ needs.build-data.outputs.version }}"
-          git push
-          
+          python3 ./zen-browser/scripts/prepare-flatpak-release.py \
+            --flatpak-archive archive.tar \
+            --version ${{ needs.build-data.outputs.version }} \
+            --linux-archive zen.linux-generic.tar.bz2 \
+            --output io.github.zen_browser.zen.yml \
+            --template-root ./zen-browser/flatpak
+
+      - name: Commit changes
+        run: |
+          git add io.github.zen_browser.zen.yml
+          git commit -m "Update to version ${{ needs.build-data.outputs.version }}"
+
+      - name: Clean up
+        run: |
+          rm -rf zen-browser
+          rm -rf archive.tar
+          rm -rf zen.linux-generic.tar.bz2
+
+      - name: Upload flatpak manifest
+        uses: actions/upload-artifact@v4
+        with:
+          name: io.github.zen_browser.zen.yml
+          path: ./io.github.zen_browser.zen.yml
+
+      - name: Create pull request
+        uses: peter-evans/create-pull-request@v6
+        env:
+          GIT_TRACE: 1
+          GIT_CURL_VERBOSE: 1
+        with:
+          token: ${{ secrets.DEPLOY_KEY }}
+          commit-message: 🚀 Update to version ${{ needs.build-data.outputs.version }}
+          title: 🚀 Update to version ${{ needs.build-data.outputs.version }}
+          body: |
+            This PR updates the Zen Browser Flatpak package to version ${{ needs.build-data.outputs.version }}. 
+            
+            @${{ github.actor }} please review and merge this PR.
+          branch: update-to-${{ needs.build-data.outputs.version }}
+          base: master
+          git-token: ${{ secrets.DEPLOY_KEY }}
+          delete-branch: true
+          
+  release-homebrew:
+    if: ${{ github.event.inputs.create_release == 'true' }}
+    permissions: write-all
+    name: Homebrew release
+    needs: [release, mac, build-data]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone flatpak repo
+        uses: actions/checkout@v4
+        with:
+          repository: flathub/io.github.zen_browser.zen
+          token: ${{ secrets.DEPLOY_KEY }}
+    
+      - name: Setup git
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Download macOS ARM build 
+        uses: actions/download-artifact@v4
+        with:
+          name: zen.macos-aarch64.dmg
+
+      - name: Download macOS x64 build
+        uses: actions/download-artifact@v4
+        with:
+          name: zen.macos-x64.dmg
+
+      - name: Update zen-browser Cask
+        run: sh .github/workflows/src/update-homebrew.sh 
+
+      - name: Clean up 
+        run: | 
+          rm -rf zen.macos-x64.dmg
+          rm -rf zen.macos-aarch64.dmg
+
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        if: ${{ github.event.inputs.update_version == 'true' }}
+        with:
+          commit_message: 🔖 Update version to ${{ steps.data.outputs.version }} for homebrew!
+          commit_user_name: Zen Browser Robot
+          commit_user_email: zen-browser-bot@users.noreply.github.com
+

.github/workflows/clear-cache.yml

@@ -0,0 +1,30 @@
+name: Clear cache
+
+on:
+  workflow_dispatch:
+
+permissions:
+  actions: write
+
+jobs:
+  clear-cache:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clear cache
+        uses: actions/github-script@v6
+        with:
+          script: |
+            console.log("About to clear")
+            const caches = await github.rest.actions.getActionsCacheList({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+            })
+            for (const cache of caches.data.actions_caches) {
+              console.log(cache)
+              github.rest.actions.deleteActionsCacheById({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                cache_id: cache.id,
+              })
+            }
+            console.log("Clear completed")

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

@@ -0,0 +1,148 @@
+
+on:
+  workflow_call:
+    inputs:
+      build-version:
+        description: 'The version to build'
+        required: true
+        type: string
+    
+jobs:
+  build-linux:
+    environment: production
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        generic: [true, false]
+    name: Build Linux - ${{ matrix.generic == true && 'Generic' || 'Specific' }}
+
+    steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Setup git
+        run: |
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update --fix-missing
+          sudo apt-get update
+          sudo apt-get install dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm
+          pip install pycairo testresources
+          
+      - name: Configure sccache
+        uses: actions/github-script@v7
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
+      - name: Install sccache
+        env:
+          LINK: https://github.com/mozilla/sccache/releases/download
+          SCCACHE_VERSION: 0.2.13
+        run: |
+          SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
+          mkdir -p $HOME/.local/bin
+          curl -L "$LINK/$SCCACHE_VERSION/$SCCACHE_FILE.tar.gz" | tar xz
+          mv -f $SCCACHE_FILE/sccache $HOME/.local/bin/sccache
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: Save sccache
+        uses: actions/cache@v3
+        continue-on-error: false
+        with:
+          path: /home/runner/.cache/sccache
+          key: ${{ runner.os }}-sccache
+
+      - name: Install pnpm
+        run: npm install -g pnpm
+
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Load surfer CI setup
+        run: pnpm surfer ci --brand alpha --display-version ${{ inputs.build-version }}
+
+      - name: Download firefox source and dependencies
+        run: pnpm surfer download
+
+      - name: Import
+        env:
+          SURFER_COMPAT: ${{ matrix.generic == true }}
+        run: pnpm surfer import
+
+      - name: Build language packs
+        run: sh scripts/download-language-packs.sh
+
+      - name: Bootstrap
+        run: |
+          cd engine
+          ./mach --no-interactive bootstrap --application-choice browser
+          cd ..
+
+      - name: Build
+        env:
+          SURFER_COMPAT: ${{ matrix.generic == true }}
+        continue-on-error: true
+        run: sh .github/workflows/src/alpha-build.sh
+
+      - name: Build again if it failed
+        if: failure()
+        env:
+          SURFER_COMPAT: ${{ matrix.generic == true }}
+        run: sh .github/workflows/src/alpha-build.sh
+
+      - name: Package
+        env:
+          SURFER_COMPAT: ${{ matrix.generic == true }}
+        run: pnpm package
+
+      - name: Rename artifacts
+        run: |
+          mv dist/zen-*.tar.bz2 "zen.linux-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.bz2"
+          mv dist/output.mar linux${{ matrix.generic == true && '-generic' || '' }}.mar
+
+      - name: Upload binary
+        uses: actions/upload-artifact@v4
+        with:
+
+          name: zen.linux-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.bz2
+          path: ./zen.linux-${{ matrix.generic == true && 'generic' || 'specific' }}.tar.bz2
+
+      - name: Upload mar
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux${{ matrix.generic == true && '-generic' || '' }}.mar
+          path: ./linux${{ matrix.generic == true && '-generic' || '' }}.mar
+
+      - name: Upload update manifests
+        uses: actions/upload-artifact@v4
+        with:
+          name: linux_update_manifest_${{ matrix.generic == true && 'generic' || 'specific' }}
+          path: ./dist/update

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

@@ -0,0 +1,172 @@
+
+on:
+  workflow_call:
+    inputs:
+      build-version:
+        description: 'The version to build'
+        required: true
+        type: string
+jobs:
+  mac-build:
+    name: Build macOS - ${{ matrix.arch }}
+    environment: production
+    runs-on: ${{ matrix.os }}
+    strategy: 
+      fail-fast: false
+      matrix:
+        include:
+          - arch: aarch64
+            os: macos-14
+          - arch: x64
+            os: macos-13
+
+    steps:
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.11' 
+
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Setup git
+        run: |
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
+
+      - name: Install system dependencies
+        run: |
+          brew install cairo sccache gnu-tar mercurial
+          sudo pip install setuptools
+
+          # completly uninstall python3 and python3.12
+          brew uninstall --ignore-dependencies python3.12 -f
+
+          export PATH="$(python3 -m site --user-base)/bin":$PATH
+          python3 -m pip install --user mercurial
+
+          rm '/usr/local/bin/2to3-3.11' # fix Could not symlink bin/2to3-3.11
+          rm '/usr/local/bin/2to3-3.12' # fix Could not symlink bin/2to3-3.12
+          rm /usr/local/bin/2to3 # fix Could not symlink bin/2to3
+          rm '/usr/local/bin/idle3.11' #fix Could not symlink bin/idle3.11
+          rm '/usr/local/bin/idle3.12' # fix Could not symlink bin/idle3.12
+          rm '/usr/local/bin/idle3' # fix Could not symlink bin/idle3
+          rm '/usr/local/bin/pydoc3.11' # fix Could not symlink bin/pydoc3.11
+          rm '/usr/local/bin/pydoc3.12' # fix Could not symlink bin/pydoc3.12
+          rm '/usr/local/bin/pydoc3' # fix Could not symlink bin/pydoc3
+          rm '/usr/local/bin/python3.11' # fix Could not symlink bin/python3.11
+          rm '/usr/local/bin/python3.12' # fix Could not symlink bin/python3.12
+          rm '/usr/local/bin/python3' # fix Could not symlink bin/python3
+          rm '/usr/local/bin/python3.11-config' # fix Could not symlink bin/python3.11-config
+          rm '/usr/local/bin/python3.12-config' # fix Could not symlink bin/python3.12-config
+          rm '/usr/local/bin/python3-config' # fix Could not symlink bin/python3-config
+
+          brew install watchman
+
+      - name: Force usage fo gnu-tar
+        run: |
+          echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.bash_profile
+          echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.zsh
+          source ~/.bash_profile
+
+      - name: Install pnpm
+        run: npm install -g pnpm
+
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      - name: Install dependencies
+        run: pnpm install
+      - name: Load surfer CI setup
+        run: pnpm surfer ci --brand alpha --display-version ${{ inputs.build-version }}
+
+      - name: Download firefox source and dependancies
+        run: pnpm surfer download
+
+      - name: Bootstrap
+        run: |
+          cd engine
+          export PATH="$(python3 -m site --user-base)/bin":$PATH
+          ./mach --no-interactive bootstrap --application-choice browser --no-system-changes
+          cd ..
+
+      - name: Import
+        env:
+          SURFER_COMPAT: ${{ matrix.arch == 'x64' }}  
+        run: |
+          pnpm surfer import --verbose
+        
+      - name: Build language packs
+        run: sh scripts/download-language-packs.sh
+
+      - name: build Zen
+        env:
+          SURFER_COMPAT: ${{ matrix.arch == 'x64' }}
+        run: |
+          if test "${{ matrix.arch }}" = "x64"; then
+            export ZEN_DISABLE_LTO=1
+          fi
+          sh .github/workflows/src/alpha-build.sh
+
+      - name: Rebuild Zen if failed
+        if: failure()
+        run: sh .github/workflows/src/alpha-build.sh
+
+      - name: import APPLE DEVELOPER ID CERTIFICATE for .app
+        uses: apple-actions/import-codesign-certs@v3
+        with:
+          p12-file-base64: ${{ secrets.macOS_CERTIFICATES_P12_For_App_BASE64 }}
+          p12-password: ${{ secrets.macOS_CERTIFICATES_P12_PASSWORD }}
+
+      - name: Sign to .app 🖋️
+        run: |
+          ls engine
+          ls engine/obj-${{ matrix.arch == 'x64' && 'x86_64' || 'aarch64' }}-apple-darwin
+          ls engine/obj-${{ matrix.arch == 'x64' && 'x86_64' || 'aarch64' }}-apple-darwin/dist
+          chmod +x ./build/codesign/sign.bash
+          ./build/codesign/sign.bash \
+            -a "./engine/obj-${{ matrix.arch == 'x64' && 'x86_64' || 'aarch64' }}-apple-darwin/dist/Zen Browser.app" \
+            -i "${{ secrets.macOS_AppleDeveloperId }}" \
+            -b "./build/codesign/browser.developer.entitlements.xml" \
+            -p "./build/codesign/plugin-container.developer.entitlements.xml"
+
+      - name: Package
+        env:
+          SURFER_COMPAT: ${{ matrix.arch == 'x64' }}
+        run: pnpm package
+
+      - name: Rename artifacts
+        run: |
+          mv ./dist/*.dmg "zen.macos-${{ matrix.arch }}.dmg"
+          mv ./dist/output.mar macos-${{ matrix.arch }}.mar
+
+      - name: Sign to .dmg 
+        run: |
+          codesign -s "${{ secrets.macOS_AppleDeveloperId }}" zen.macos-${{ matrix.arch }}.dmg
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: zen.macos-${{ matrix.arch }}.dmg
+          path: ./zen.macos-${{ matrix.arch }}.dmg
+
+      - name: Upload mar
+        uses: actions/upload-artifact@v4
+        with:
+          name: macos-${{ matrix.arch }}.mar
+          path: ./macos-${{ matrix.arch }}.mar
+
+      - name: Upload update manifests
+        uses: actions/upload-artifact@v4
+        with:
+          name: macos_update_manifest_${{ matrix.arch }}
+          path: ./dist/update

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

@@ -0,0 +1,26 @@
+set -ex
+
+if command -v apt-get &> /dev/null
+then
+  sudo apt-get update
+  sudo apt-get install -y xvfb
+fi
+
+ulimit -n 4096
+
+# Check if xfvb is installed
+if ! command -v Xvfb &> /dev/null; then
+  if ! test "$ZEN_CROSS_COMPILING"; then
+    Xvfb :2 -screen 0 1024x768x24 &
+    export LLVM_PROFDATA=$HOME/.mozbuild/clang/bin/llvm-profdata
+    export DISPLAY=:2
+  fi
+  export ZEN_RELEASE=1
+  pnpm build 
+else
+  echo "Xvfb could not be found, running without it"
+  echo "ASSUMING YOU ARE RUNNING THIS ON MACOS"
+  set -v
+  export ZEN_RELEASE=1
+  pnpm build
+fi

.github/workflows/src/update-homebrew.sh

@@ -0,0 +1,7 @@
+latest_version=$(git describe --tags --abbrev=0)
+sed -i "s/version(.*)/version('${latest_version}')/" ./Casks/zen-browser.rb
+
+sha_x64=$(shasum -a 256 zen.macos-x64.dmg)
+sha_arm=$(shasum -a 256 zen.macos-aarch64.dmg)
+
+sed -i "s/sha256(.*)/sha256(arm:'${sha_arm}', intel:'${sha_x64}')/" ./Casks/zen-browser.rb

.github/workflows/src/windows_mozconfig

@@ -1,19 +0,0 @@
-
-export WINSYSROOT="$(echo ~)/win-cross/vs2022"
-
-export MIDL="$(echo ~)/win-cross/wine/bin/widl"
-export WINE="$(echo ~)/win-cross/wine/bin/wine64"
-export WINEDEBUG=-all
-
-#? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793
-#? https://phabricator.services.mozilla.com/D170170
-ac_add_options --target=x86_64-pc-windows-msvc
-
-export MOZ_STUB_INSTALLER=1
-export MOZ_MAINTENANCE_SERVICE=
-
-export MOZ_PKG_FORMAT=TAR
-export MOZ_LTO=cross
-
-# ALWAYS MANTAIN ONE LINE BREAK AT THE END OF THIS FILE
-

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

@@ -0,0 +1,240 @@
+
+on:
+  workflow_call:
+    inputs:
+      generate-gpo: 
+        required: true
+        type: boolean
+        default: false
+      build-version:
+        description: 'The version to build'
+        required: true
+        type: string
+      profile-data-path-archive:
+        description: 'The path to the zip archive containing the profile data'
+        type: string
+
+jobs:
+  windows-build:
+    name: Build Windows - ${{ matrix.generic == true && 'Generic' || 'Specific' }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        generic: [true, false]
+    environment: production
+    steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          # this might remove tools that are actually needed,
+          # if set to "true" but frees about 6 GB
+          tool-cache: false
+
+      - name: Install Node.js and pnpm
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Install pnpm
+        run: npm install -g pnpm
+
+      - name: Setup git
+        run: |
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
+
+      - name: Install dependencies
+        run: |
+          pnpm i
+
+      - name: Load surfer CI setup
+        run: pnpm surfer ci --brand alpha --display-version ${{ inputs.build-version }}
+
+      - name: Download
+        run: pnpm surfer download
+
+      - name: "win-cross Cache"
+        env:
+          SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5
+        id: cache-win-cross
+        uses: actions/cache@v4
+        with:
+          path: ${HOME}/win-cross
+          key: win-cross
+
+      - name: Configure sccache
+        uses: actions/github-script@v7
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
+      - name: Setup For Windows
+        if: steps.cache-win-cross.outputs.cache-hit != 'true'
+        run: |
+          set -x
+          mkdir -p ~/win-cross
+          cd engine/
+  
+          echo Setup wine
+          aria2c "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-1.toolchains.v3.linux64-wine.latest/artifacts/public%2Fbuild%2Fwine.tar.zst" -o wine.tar.zst
+          tar --zstd -xvf wine.tar.zst -C ~/win-cross
+          rm wine.tar.zst
+  
+          echo Setup Visual Studio
+          sudo apt install -y msitools python3-pip
+          ./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ~/win-cross/vs2022
+          
+      - name: Bootstrap
+        run: |
+          set -x
+          cd engine/
+
+          chmod -R +x "$(echo ~)/win-cross/vs2022" || true
+
+          cd ..
+          npm install -g pnpm
+          export SURFER_PLATFORM="win32"
+          pnpm surfer bootstrap
+
+          cd engine/
+          ls ~/.mozbuild/clang/lib/clang/
+          echo "export LIB=\"$(cd ~/.mozbuild/clang/lib/clang/* && cd lib/windows && pwd)\"" >> ../configs/common/mozconfig
+          cat ../configs/common/mozconfig
+
+          sudo apt-get update
+          sudo apt-get install dos2unix
+
+          ls ~/win-cross/wine || true
+          ls ~/win-cross/vs2022 || true
+  
+      - name: setup Rust 
+        run: |
+          cd engine/
+          # Install a rust version compatible with 17
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
+          source $HOME/.cargo/env
+          
+          rustup target add x86_64-pc-windows-msvc
+          cargo install cargo-download
+          cargo download -x windows=0.52.0
+          #? https://github.com/mozilla/sccache#known-caveats
+          export CARGO_INCREMENTAL=0
+
+          echo "" >> ../configs/common/mozconfig
+          echo "export MOZ_WINDOWS_RS_DIR=$(pwd)/windows-0.52.0" >> ../configs/common/mozconfig
+
+      - name: Import
+        env:
+          SURFER_COMPAT: ${{ matrix.generic == true }}
+        run: pnpm surfer import --verbose
+
+      - name: Build language packs
+        run: sh scripts/download-language-packs.sh
+      
+      - uses: actions/download-artifact@v4
+        name: Download artifact if use profdata
+        if: ${{ !inputs.generate-gpo }}
+        with:
+          path: ~/artifact
+          name: windows-profdata-${{ matrix.generic == true && 'generic' || 'specific' }}
+
+      - name: Show artifact info
+        if: ${{ !inputs.generate-gpo }}
+        run: |
+          ls ~/artifact
+          ls ~/artifact/en-US.log
+          ls ~/artifact/merged.profdata
+
+          chmod +x ~/artifact/en-US.log
+          chmod +x ~/artifact/merged.profdata
+
+      - name: Build
+        env:
+          SURFER_COMPAT: ${{ matrix.generic == true }}
+        run: |
+          set -x
+          dos2unix configs/windows/mozconfig
+          export SURFER_PLATFORM="win32"
+          export ZEN_CROSS_COMPILING=1
+          if test ${{ inputs.generate-gpo }} = true; then
+            export ZEN_GA_GENERATE_PROFILE=1
+          fi
+          sh .github/workflows/src/alpha-build.sh
+
+      - name: Package
+        env:
+          SURFER_COMPAT: ${{ matrix.generic == true }}
+        run: |
+          set -x
+          export SURFER_PLATFORM="win32"
+          pnpm package
+          mv ./dist/zen-$(pnpm surfer get version | xargs).en-US.win64.zip zen.win64.zip
+          ls ./dist
+          ls .
+
+      - name: 🐛 Debug Session
+        if: ${{ failure() }}
+        uses: Warpbuilds/gha-debug@v1.3
+        timeout-minutes: 15
+
+      - name: Move package for PGO upload
+        if: ${{ inputs.generate-gpo }}
+        run: |
+          set -x
+          mv ./zen.win64.zip ./zen.win64-pgo-stage-1.zip
+
+      - name: Rename artifacts
+        if: ${{ !inputs.generate-gpo }}
+        run: |
+          mv ./zen.win64.zip zen.win-${{ matrix.generic == true && 'generic' || 'specific' }}.zip
+          mv ./dist/output.mar windows${{ matrix.generic == true && '-generic' || '' }}.mar
+          mv ./dist/zen.installer.exe ./zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        if: ${{ !inputs.generate-gpo }}
+        with:
+          name: zen.win-${{ matrix.generic == true && 'generic' || 'specific' }}.zip
+          path: ./zen.win-${{ matrix.generic == true && 'generic' || 'specific' }}.zip
+
+      - name: Upload PGO build
+        uses: actions/upload-artifact@v4
+        if: ${{ inputs.generate-gpo }}
+        with:
+          name: ${{ matrix.generic == true && 'generic' || 'specific' }}-${{ inputs.profile-data-path-archive }}
+          path: ./zen.win64-pgo-stage-1.zip
+ 
+      - name: Upload mar
+        uses: actions/upload-artifact@v4
+        if: ${{ !inputs.generate-gpo }}
+        with:
+          name: windows${{ matrix.generic == true && '-generic' || '' }}.mar
+          path: ./windows${{ matrix.generic == true && '-generic' || '' }}.mar
+
+      - name: Upload installer
+        uses: actions/upload-artifact@v4
+        if: ${{ !inputs.generate-gpo }}
+        with:
+          name: zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
+          path: ./zen.installer${{ matrix.generic == true && '-generic' || '' }}.exe
+
+      - name: Upload installer stub
+        uses: actions/upload-artifact@v4
+        if: ${{ !inputs.generate-gpo && false }}
+        with:
+          name: zen.installer.pretty.exe
+          path: ./dist/zen.installer.pretty.exe
+
+      - name: Upload update manifests
+        uses: actions/upload-artifact@v4
+        if: ${{ !inputs.generate-gpo }}
+        with:
+          name: windows_update_manifest_${{ matrix.generic == true && 'generic' || 'specific' }}
+          path: ./dist/update

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

@@ -0,0 +1,94 @@
+
+on:
+  workflow_call:
+    inputs:
+      build-version:
+        description: 'The version to build'
+        required: true
+        type: string
+      profile-data-path-archive:
+        description: 'The path to the zip archive containing the profile data'
+        required: false
+        type: string
+
+jobs:
+  windows-profile-build:
+    name: Windows Profile Build - ${{ matrix.generic == true && 'generic' || 'specific' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        generic: [true, false]
+    runs-on: windows-latest
+    # Script edited from https://github.com/Floorp-Projects/Floorp/blob/ESR115/.github/workflows/window-generate-profile-data-and-jarlog.yml
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Node.js and pnpm
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - name: Setup git
+        run: |
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
+      - name: Install pnpm
+        run: npm install -g pnpm
+
+      - name: Install Surfer
+        run: |
+          npm i -g @zen-browser/surfer
+      - uses: actions/download-artifact@v4
+        name: Download artifact 
+        with:
+          path: C:\artifact
+          name: ${{ matrix.generic == true && 'generic' || 'specific' }}-zen-windows-x86_64-profile-data-and-jarlog.zip
+
+      - name:  Unpack artifact
+        run: |
+          cd C:\artifact
+          ls
+          Expand-Archive -Path .\${{ inputs.profile-data-path-archive }} -DestinationPath C:\artifact
+          ls
+      - name: Setup 
+        run: |
+          (New-Object System.Net.WebClient).DownloadFile("https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe","C:\MozillaBuildSetup-Latest.exe")
+          C:\MozillaBuildSetup-Latest.exe /S | out-null
+      - name: Download firefox
+        run: |
+          git config --global core.safecrlf false  
+          pnpm surfer download
+      - name: Generate 
+        run: |
+          ls
+          $Env:USE_MINTTY = "0"
+          $workspace_dir_current = [regex]::replace($env:GITHUB_WORKSPACE, "^([A-Z]):", { "/" + $args.value.Substring(0, 1).toLower() }) -replace "\\","/"
+          $workspace_dir = $workspace_dir_current + "/engine"
+          echo $workspace_dir
+          echo "cd $workspace_dir" '' >> mozilla-build-run.sh
+          echo 'export PATH=/c/mozilla-build/msys2/usr/bin:$PATH' '' >> mozilla-build-run.sh
+          echo './mach --no-interactive bootstrap --application-choice browser' '' >> mozilla-build-run.sh
+          echo 'ls /c/Users/runneradmin/.mozbuild/clang/bin' '' >> mozilla-build-run.sh
+          echo 'LLVM_PROFDATA=/c/Users/runneradmin/.mozbuild/clang/bin/llvm-profdata.exe JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary /c/artifact/zen/zen.exe' '' >> mozilla-build-run.sh
+          C:\mozilla-build\start-shell.bat $workspace_dir_current\mozilla-build-run.sh
+          
+      - name: 🐛 Debug Session
+        if: ${{ failure() }}
+        uses: Warpbuilds/gha-debug@v1.3
+        timeout-minutes: 15
+
+      - name: Move profile data
+        run: |
+          dir
+          dir engine
+          mv engine/merged.profdata merged.profdata
+          mv engine/en-US.log en-US.log
+
+      - name: Publish artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          path: |
+            merged.profdata
+            en-US.log
+          name: windows-profdata-${{ matrix.generic == true && 'generic' || 'specific' }}

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "src/browser/base/content/zen-components"]
+	path = src/browser/base/content/zen-components
+	url = https://github.com/zen-browser/components
+[submodule "l10n"]
+	path = l10n
+	url = https://github.com/zen-browser/l10n-packs

.vscode/settings.json

@@ -13,6 +13,10 @@
     "utility": "cpp",
     "variant": "cpp",
     "compare": "cpp",
-    "thread": "cpp"
+    "thread": "cpp",
+    "string": "cpp",
+    "string_view": "cpp",
+    "span": "cpp",
+    "vector": "cpp"
   }
 }

AppDir/AppRun

@@ -0,0 +1,14 @@
+#!/bin/sh
+SELF=$(readlink -f "$0")
+HERE=${SELF%/*}
+export PATH="${HERE}:${HERE}/usr/bin/:${HERE}/usr/sbin/:${HERE}/usr/games/:${HERE}/bin/:${HERE}/sbin/${PATH:+:$PATH}"
+export LD_LIBRARY_PATH="${HERE}/usr/lib/:${HERE}/usr/lib/i386-linux-gnu/:${HERE}/usr/lib/x86_64-linux-gnu/:${HERE}/usr/lib32/:${HERE}/usr/lib64/:${HERE}/lib/:${HERE}/lib/i386-linux-gnu/:${HERE}/lib/x86_64-linux-gnu/:${HERE}/lib32/:${HERE}/lib64/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+export PYTHONPATH="${HERE}/usr/share/pyshared/${PYTHONPATH:+:$PYTHONPATH}"
+export MOZ_LEGACY_PROFILES=1 # Prevent per installation profiles
+DEFAULT_XDG_DATA_DIRS='./share/:/usr/share/gnome:/usr/local/share/:/usr/share/'
+export XDG_DATA_DIRS="${HERE}/usr/share/:${XDG_DATA_DIRS:-$DEFAULT_XDG_DATA_DIRS}"
+export PERLLIB="${HERE}/usr/share/perl5/:${HERE}/usr/lib/perl5/${PERLLIB:+:$PERLLIB}"
+export GSETTINGS_SCHEMA_DIR="${HERE}/usr/share/glib-2.0/schemas/${GSETTINGS_SCHEMA_DIR:+:$GSETTINGS_SCHEMA_DIR}"
+export QT_PLUGIN_PATH="${HERE}/usr/lib/qt4/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt4/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt4/plugins/:${HERE}/usr/lib32/qt4/plugins/:${HERE}/usr/lib64/qt4/plugins/:${HERE}/usr/lib/qt5/plugins/:${HERE}/usr/lib/i386-linux-gnu/qt5/plugins/:${HERE}/usr/lib/x86_64-linux-gnu/qt5/plugins/:${HERE}/usr/lib32/qt5/plugins/:${HERE}/usr/lib64/qt5/plugins/${QT_PLUGIN_PATH:+:$QT_PLUGIN_PATH}"
+EXEC=$(grep -e '^Exec=.*' "${HERE}"/*.desktop | head -n 1 | cut -d "=" -f 2 | cut -d " " -f 1)
+exec "${EXEC}" "$@"

AppDir/distribution/policies.json

@@ -0,0 +1,8 @@
+{
+  "policies": {
+   "DisableAppUpdate": true,
+   "AppAutoUpdate": false,
+   "ManualAppUpdateOnly": true,
+   "BackgroundAppUpdate": false
+  }
+ }

AppDir/zen.desktop

@@ -0,0 +1,26 @@
+[Desktop Entry]
+Name=Zen Browser
+Comment=Experience tranquillity while browsing the web without people tracking you!
+Exec=zen %u
+Icon=zen
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
+StartupWMClass=zen-alpha
+Categories=Network;WebBrowser;
+StartupNotify=true
+Terminal=false
+X-MultipleArgs=false
+Keywords=Internet;WWW;Browser;Web;Explorer;
+Actions=new-window;new-private-window;profilemanager;
+
+[Desktop Action new-window]
+Name=Open a New Window
+Exec=zen %u
+
+[Desktop Action new-private-window]
+Name=Open a New Private Window
+Exec=zen --private-window %u
+
+[Desktop Action profilemanager]
+Name=Open the Profile Manager
+Exec=zen --ProfileManager %u

Casks/zen-browser.rb

@@ -0,0 +1,26 @@
+cask("zen-browser") do
+  arch(arm: "aarch64", intel: "x64")
+  version("1.0.0-a.34")
+  sha256(arm: "6cc6e72c4a6a11d0139489d438ccf811715e170eebc01da739da32ace2580747", intel: "b9cb48f21a4ee39f3f3ae2361b9b0a55ae7219638cf798e1483c0eb8cf4660a6")
+
+  url("https://github.com/zen-browser/desktop/releases/download/#{version}/zen.macos-#{arch}.dmg")
+  name("Zen Browser")
+  desc("Beautifully designed, privacy-focused browser packed with awesome features")
+  homepage("https://zen-browser.app/")
+
+  livecheck do
+    url(:stable)
+    regex(/[0-9].*-a.[0-9]*/i)
+  end
+
+  zap trash: [
+    "~/Library/Preferences/org.mozilla.com.zen.browser.plist",
+    "~/Library/Saved Application State/org.mozilla.com.zen.browser.savedState"
+  ]
+
+  app("Zen Browser.app")
+
+  postflight do
+    system("xattr -c '/Applications/Zen Browser.app/'")
+  end
+end

LICENSE

@@ -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.

README.md

@@ -1,18 +1,58 @@
-
-# 🌀 Zen Browser
+<div align="center">
+<picture>
+    <img src="./zen-black.svg" width="128px">
+</picture>
+</div>
+<h1 align="center">
+Zen Browser
+</h1>
 
 Experience tranquillity while browsing the web without people tracking you!
 
+* [Website](https://www.zen-browser.app)
+* [Download](https://www.zen-browser.app/download)
+* [Release Notes](https://www.zen-browser.app/release-notes/latest)
+
+[![Crowdin](https://badges.crowdin.net/zen-browser/localized.svg)](https://crowdin.com/project/zen-browser)
+
+[![Flathub](https://flathub.org/api/badge?locale=en)](https://flathub.org/apps/io.github.zen_browser.zen)
+
+[![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/zen_browser)
+
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/zen_browser)
+
 # Compatibility
 
-Zen is currently built using firefox version `127.0.2`!
+Zen is currently built using firefox version `130.0`!
+
+* Check out the latest [release notes](https://www.zen-browser.app/release-notes)!
+
+# Performance
+
+Zen is built with performance in mind, and we have optimized the browser to be as fast as possible!
+
+* Checkout the latest [performance benchmarks](https://docs.zen-browser.app/benchmarks)!
+
+# Installation
+
+## MacOS
+You can install the Zen Browser using Homebrew: 
+
+```
+brew tap zen-browser/browser https://github.com/zen-browser/desktop.git
+brew install zen-browser
+```
+
+# Core Components
+
+Some components used by @zen-browser as an attempt to make firefox forks a better place. You can find them [here](https://github.com/zen-browser/components).
 
 ## 🚀 Run Locally
 
 Clone the project
 
 ```bash
-git clone https://github.com/zen-browser/desktop.git
+git clone https://github.com/zen-browser/desktop.git --recurse-submodules
 cd desktop
 ```
 
@@ -25,7 +65,7 @@ npm i
 Download and bootstrap the browser
 
 ```
-npm run bootstrap
+npm run init
 ```
 
 Start building the browser
@@ -40,16 +80,30 @@ Finally, run the browser!
 npm start
 ```
 
-## Contributing
+## Special Thanks
 
-Contributions are always welcome!
+- [IAmJafeth](https://github.com/IAmJafeth) (For sponsoring the domain)
+- [Donno 🐒](https://www.onnno.nl/) (For making the logo)
+- [ptr1337](https://github.com/ptr1337) (AUR Packages and optimization flags)
+- [nitro](https://github.com/n7itro) (For the amazing work on the browser)
 
-See `contributing.md` for ways to get started.
+## Third Party Code
 
-Please adhere to this project's `code of conduct`.
+Zen couldn't be in its current state without the help of these amazing projects!
 
+- Zen's default preferences are based on [BetterFox](https://github.com/yokoffing/Betterfox)
 
 ## License
 
-[MPL LICENSE](https://choosealicense.com/licenses/mit/)
+[MPL LICENSE](./LICENSE)
+
+## Star History
+
+<a href="https://star-history.com/#zen-browser/desktop&Date">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=zen-browser/desktop&type=Date&theme=dark" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=zen-browser/desktop&type=Date" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=zen-browser/desktop&type=Date" />
+ </picture>
+</a>
 

build/codesign/browser.developer.entitlements.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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.
+-->
+<plist version="1.0">
+  <dict>
+    <!-- Firefox needs to create executable pages (without MAP_JIT) -->
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
+
+    <!-- Firefox needs to create executable pages with MAP_JIT on aarch64 -->
+    <key>com.apple.security.cs.allow-jit</key><true/>
+
+    <!-- Allow loading third party libraries. Needed for Flash and CDMs -->
+    <key>com.apple.security.cs.disable-library-validation</key><true/>
+
+    <!-- Firefox 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 -->
+    <key>com.apple.security.device.camera</key><true/>
+
+    <!-- Firefox needs to access the location on sites the user allows -->
+    <key>com.apple.security.personal-information.location</key><true/>
+
+    <!-- Allow Firefox to send Apple events to other applications. Needed
+         for native messaging webextension helper applications launched by
+         Firefox which rely on Apple Events to signal other processes. -->
+    <key>com.apple.security.automation.apple-events</key><true/>
+  </dict>
+</plist>

build/codesign/plugin-container.developer.entitlements.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!--
+     Entitlements to apply to the plugin-container.app bundle during
+     codesigning of production channel builds.
+-->
+<plist version="1.0">
+  <dict>
+    <!-- Firefox needs to create executable pages (without MAP_JIT) -->
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key><true/>
+
+    <!-- Firefox needs to create executable pages with MAP_JIT on aarch64 -->
+    <key>com.apple.security.cs.allow-jit</key><true/>
+
+    <!-- Allow loading third party libraries. Needed for Flash and CDMs -->
+    <key>com.apple.security.cs.disable-library-validation</key><true/>
+
+    <!-- Firefox 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 -->
+    <key>com.apple.security.device.camera</key><true/>
+
+    <!-- Firefox needs to access the location on sites the user allows -->
+    <key>com.apple.security.personal-information.location</key><true/>
+
+    <!-- Allow Firefox to send Apple events to other applications. Needed
+         for native messaging webextension helper applications launched by
+         Firefox which rely on Apple Events to signal other processes. -->
+    <key>com.apple.security.automation.apple-events</key><true/>
+  </dict>
+</plist>

build/codesign/sign.bash

@@ -0,0 +1,155 @@
+#!/bin/bash
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# Runs codesign commands to codesign a Firefox .app bundle and enable macOS
+# Hardened Runtime. Intended to be manually run by developers working on macOS
+# 10.14+ who want to enable Hardened Runtime for manual testing. This is
+# provided as a stop-gap until automated build tooling is available that signs
+# binaries with a certificate generated during builds (bug 1522409). This
+# script requires macOS 10.14 because Hardened Runtime is only available for
+# applications running on 10.14 despite support for the codesign "-o runtime"
+# option being available in 10.13.6 and newer.
+#
+# The script requires an identity string (-i option) from an Apple Developer
+# ID certificate. This can be found in the macOS KeyChain after configuring an
+# Apple Developer ID certificate.
+#
+# Example usage on macOS 10.14:
+#
+#   $ ./mach build
+#   $ ./mach build package
+#   $ open </PATH/TO/DMG/FILE.dmg>
+#   <Drag Nightly.app to ~>
+#   $ ./security/mac/hardenedruntime/codesign.bash \
+#         -a ~/Nightly.app \
+#         -i <MY-IDENTITY-STRING> \
+#         -b security/mac/hardenedruntime/browser.developer.entitlements.xml
+#         -p security/mac/hardenedruntime/plugin-container.developer.entitlements.xml
+#   $ open ~/Nightly.app
+#
+
+set -x
+
+usage ()
+{
+  echo  "Usage: $0 "
+  echo  "    -a <PATH-TO-BROWSER.app>"
+  echo  "    -i <IDENTITY>"
+  echo  "    -b <ENTITLEMENTS-FILE>"
+  echo  "    -p <CHILD-ENTITLEMENTS-FILE>"
+  echo  "    [-o <OUTPUT-DMG-FILE>]"
+  exit -1
+}
+
+# Make sure we are running on macOS with the sw_vers command available.
+SWVERS=/usr/bin/sw_vers
+if [ ! -x ${SWVERS} ]; then
+    echo "ERROR: macOS 10.14 or later is required"
+    exit -1
+fi
+
+# Require macOS 10.14 or newer.
+OSVERSION=`${SWVERS} -productVersion|sed -En 's/[0-9]+\.([0-9]+)\.[0-9]+/\1/p'`;
+if [ ${OSVERSION} \< 14 ]; then
+    echo "ERROR: macOS 10.14 or later is required"
+    exit -1
+fi
+
+while getopts "a:i:b:o:p:" opt; do
+  case ${opt} in
+    a ) BUNDLE=$OPTARG ;;
+    i ) IDENTITY=$OPTARG ;;
+    b ) BROWSER_ENTITLEMENTS_FILE=$OPTARG ;;
+    p ) PLUGINCONTAINER_ENTITLEMENTS_FILE=$OPTARG ;;
+    o ) OUTPUT_DMG_FILE=$OPTARG ;;
+    \? ) usage; exit -1 ;;
+  esac
+done
+
+if [ -z "${BUNDLE}" ] ||
+   [ -z "${IDENTITY}" ] ||
+   [ -z "${PLUGINCONTAINER_ENTITLEMENTS_FILE}" ] ||
+   [ -z "${BROWSER_ENTITLEMENTS_FILE}" ]; then
+    usage
+    exit -1
+fi
+
+if [ ! -d "${BUNDLE}" ]; then
+  echo "Invalid bundle. Bundle should be a .app directory"
+  usage
+  exit -1
+fi
+
+if [ ! -e "${PLUGINCONTAINER_ENTITLEMENTS_FILE}" ]; then
+  echo "Invalid entitlements file"
+  usage
+  exit -1
+fi
+
+if [ ! -e "${BROWSER_ENTITLEMENTS_FILE}" ]; then
+  echo "Invalid entitlements file"
+  usage
+  exit -1
+fi
+
+# DMG file output flag is optional
+if [ ! -z "${OUTPUT_DMG_FILE}" ] &&
+   [ -e "${OUTPUT_DMG_FILE}" ]; then
+  echo "Output dmg file ${OUTPUT_DMG_FILE} exists. Please delete it first."
+  usage
+  exit -1
+fi
+
+echo "-------------------------------------------------------------------------"
+echo "bundle:                              $BUNDLE"
+echo "identity:                            $IDENTITY"
+echo "browser entitlements file:           $BROWSER_ENTITLEMENTS_FILE"
+echo "plugin-container entitlements file:  $PLUGINCONTAINER_ENTITLEMENTS_FILE"
+echo "output dmg file (optional):          $OUTPUT_DMG_FILE"
+echo "-------------------------------------------------------------------------"
+
+# Clear extended attributes which cause codesign to fail
+xattr -cr "${BUNDLE}"
+
+# Sign these binaries first. Signing of some binaries has an ordering
+# requirement where other binaries must be signed first.
+codesign --force -o runtime --verbose --sign "$IDENTITY" \
+"${BUNDLE}/Contents/Library/LaunchServices/org.mozilla.updater" \
+"${BUNDLE}/Contents/MacOS/XUL" \
+"${BUNDLE}/Contents/MacOS/pingsender" \
+"${BUNDLE}/Contents/MacOS/minidump-analyzer" \
+"${BUNDLE}/Contents/MacOS/*.dylib" \
+
+codesign --force -o runtime --verbose --sign "$IDENTITY" --deep \
+"${BUNDLE}"/Contents/MacOS/crashreporter.app
+
+codesign --force -o runtime --verbose --sign "$IDENTITY" --deep \
+"${BUNDLE}"/Contents/MacOS/updater.app
+
+# Sign zen main executable
+codesign --force -o runtime --verbose --sign "$IDENTITY" --deep \
+--entitlements ${BROWSER_ENTITLEMENTS_FILE} \
+"${BUNDLE}"/Contents/MacOS/zen
+
+# Sign Library/LaunchServices
+codesign --force -o runtime --verbose --sign "$IDENTITY" --deep \
+"${BUNDLE}"/Contents/Library/LaunchServices/org.mozilla.updater
+
+# Sign gmp-clearkey files
+find "${BUNDLE}"/Contents/Resources/gmp-clearkey -type f -exec \
+codesign --force -o runtime --verbose --sign "$IDENTITY" {} \;
+
+# Sign the main bundle
+codesign --force -o runtime --verbose --sign "$IDENTITY" \
+--entitlements ${BROWSER_ENTITLEMENTS_FILE} "${BUNDLE}"
+
+# Sign the plugin-container bundle with deep
+codesign --force -o runtime --verbose --sign "$IDENTITY" --deep \
+--entitlements ${PLUGINCONTAINER_ENTITLEMENTS_FILE} \
+"${BUNDLE}"/Contents/MacOS/plugin-container.app
+
+# Validate
+codesign -vvv --verbose=4 --deep "${BUNDLE}"

configs/branding/alpha/MacOSInstaller.svg

@@ -1,4 +1 @@
-<svg width="320" height="130" xmlns="http://www.w3.org/2000/svg">
-  <rect width="300" height="100" x="10" y="10" style="fill:rgb(0,0,255);stroke-width:3;stroke:red" />
-  Sorry, your browser does not support inline SVG.  
-</svg>
+<svg width="320" height="130" xmlns="http://www.w3.org/2000/svg"><rect width="300" height="100" x="10" y="10" style="fill:rgb(0,0,255);stroke-width:3;stroke:red" />Sorry, your browser does not support inline SVG.</svg> 

configs/branding/alpha/content/about-logo-private.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256"><defs><style>.g{fill:#000;}.g,.h,.i{stroke-width:0px;}.h{fill:url(#e);}.i{fill:#fff;}</style><linearGradient id="e" x1="128" y1="256" x2="128" y2="0" gradientUnits="userSpaceOnUse"><stop offset=".1" stop-color="#fff" stop-opacity=".02"/><stop offset=".9" stop-color="#fff" stop-opacity=".1"/></linearGradient></defs><g id="c"><rect class="g" y="0" width="256" height="256" rx="58.4" ry="58.4"/></g><g id="d"><rect class="h" y="0" width="256" height="256" rx="58.4" ry="58.4"/></g><g id="f"><path class="i" d="M165.9156,146.3156c-15.6016,0-28.6656,11.0055-31.8813,25.6562h-12.0687c-3.2156-14.6508-16.2797-25.6562-31.8813-25.6562-18.0063,0-32.6562,14.65-32.6562,32.6562s14.65,32.6562,32.6562,32.6562c15.6016,0,28.6656-11.0055,31.8813-25.6562h12.0687c3.2156,14.6508,16.2797,25.6562,31.8813,25.6562,18.0063,0,32.6562-14.65,32.6562-32.6562s-14.65-32.6562-32.6562-32.6562ZM90.0844,197.6281c-10.2875,0-18.6562-8.3687-18.6562-18.6562s8.3687-18.6562,18.6562-18.6562,18.6562,8.3688,18.6562,18.6562-8.3687,18.6562-18.6562,18.6562ZM165.9156,197.6281c-10.2875,0-18.6562-8.3687-18.6562-18.6562s8.3687-18.6562,18.6562-18.6562,18.6562,8.3688,18.6562,18.6562-8.3687,18.6562-18.6562,18.6562Z"/><path class="i" d="M214.4,115.6812h-21.8391l-9.2422-65.2906c-.3031-2.1406-1.5813-4.0219-3.4594-5.0969-1.8781-1.0719-4.1469-1.2188-6.1469-.3906l-45.7125,18.8906-45.7125-18.8906c-2-.8281-4.2688-.6813-6.1469.3906-1.8781,1.075-3.1562,2.9562-3.4594,5.0969l-9.2422,65.2906h-21.8391c-3.8656,0-7,3.1344-7,7s3.1344,7,7,7h172.8c3.8656,0,7-3.1344,7-7s-3.1344-7-7-7ZM85.2781,61.2875l40.0469,16.55c1.7125.7063,3.6375.7063,5.35,0l40.0469-16.55,7.6984,54.3937h-100.8406l7.6984-54.3937Z"/></g></svg>

configs/branding/alpha/content/about-logo.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="d" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256"><defs><style>.f{fill:#000;}.f,.g,.h{stroke-width:0px;}.g{fill:url(#e);}.h{fill:#fff;}</style><linearGradient id="e" x1="128" y1="256" x2="128" y2="0" gradientUnits="userSpaceOnUse"><stop offset=".1" stop-color="#fff" stop-opacity=".02"/><stop offset=".9" stop-color="#fff" stop-opacity=".1"/></linearGradient></defs><rect class="f" width="256" height="256" rx="58.4" ry="58.4"/><rect class="g" width="256" height="256" rx="58.4" ry="58.4"/><path class="h" d="M202.9973,184.5702c-.1715,10.2808-8.7737,18.4298-19.0559,18.4298h-77.2885c-3.0056,0-5.0458-3.0553-3.894-5.8314l.0262-.0632c5.0822-12.2707,13.3289-22.6249,23.8591-30.1785,1.3098-.9395,2.8903-1.4269,4.5023-1.4269h53.1034c10.462,0,18.9225,8.5681,18.7473,19.0702Z"/><path class="h" d="M149.3471,53c3.0056,0,5.0458,3.0553,3.894,5.8314l-.0262.0631c-5.0822,12.2708-13.3289,22.6249-23.8591,30.1785-1.3098.9396-2.8903,1.427-4.5023,1.427h-52.7949c-10.2822,0-18.8844-8.149-19.0559-18.4298-.1752-10.5021,8.2853-19.0702,18.7473-19.0702h77.5971Z"/><path class="h" d="M71.7465,203c-2.3913,0-4.8207-.46-7.1673-1.4319-9.5666-3.9624-14.1096-14.9301-10.1472-24.4964,6.0943-14.7127,14.8294-27.9027,25.9634-39.2034,11.5341-11.7073,25.1364-20.8551,40.4297-27.1898,21.021-8.7076,37.393-25.0792,46.0995-46.0995,3.9624-9.567,14.9305-14.1093,24.4964-10.1472,9.5666,3.9624,14.1096,14.9301,10.1472,24.4964-6.0943,14.7127-14.8294,27.9027-25.9634,39.2034-11.5341,11.7073-25.1364,20.8551-40.4297,27.1898-21.021,8.7076-37.393,25.0792-46.0995,46.0995-2.9905,7.22-9.9725,11.5791-17.329,11.5791Z"/></svg>

configs/branding/alpha/content/firefox-wordmark.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 56"><defs><style>.b{fill:context-fill #20123a;}</style></defs><path class="b" d="M11.2896,37.6632h15.1928v5.2919H3.2415v-3.8076l15.1487-21.2557H3.2126v-5.2919h23.2393v3.811l-15.1622,21.2523ZM50.8649,26.3765c.5434,1.4469.8151,3.1418.8151,5.0778v1.7322h-15.5019v.017c0,1.1243.2089,2.0991.6301,2.9176.4195.822,1.0139,1.4537,1.7849,1.8987s1.6847.6657,2.7427.6657c.7014,0,1.3433-.0984,1.9258-.2955.5842-.197,1.0818-.4925,1.4979-.8899.4144-.394.7303-.8797.9476-1.4503l5.8404.3838c-.2972,1.4028-.9018,2.6255-1.8154,3.6683-.9137,1.0428-2.0906,1.8511-3.5273,2.4319-1.4385.5774-3.0959.8661-4.9726.8661-2.3419,0-4.3561-.4755-6.0408-1.43-1.6847-.9544-2.9805-2.3063-3.8907-4.0623-.9086-1.7526-1.362-3.8314-1.362-6.2327,0-2.3402.4534-4.3951,1.362-6.1647.9103-1.7696,2.1925-3.1486,3.8466-4.1336,1.6558-.9884,3.5986-1.4843,5.8318-1.4843,1.503,0,2.9024.2411,4.2032.7201,1.2992.4789,2.4354,1.199,3.4084,2.1568.9731.9578,1.7306,2.1602,2.274,3.6072ZM45.7378,29.2737c0-.9069-.1987-1.7119-.5927-2.4149-.3957-.6997-.9409-1.2534-1.6388-1.6508-.6964-.4008-1.503-.6012-2.4235-.6012-.9578,0-1.8053.2208-2.5406.6589-.7371.4382-1.3127,1.0292-1.7271,1.7628-.3818.679-.5853,1.4304-.6228,2.2451h9.5455ZM73.0682,20.9318c-1.1769-.6929-2.5543-1.0394-4.1353-1.0394-1.6898,0-3.1265.3872-4.3137,1.165-1.1854.7744-2.0294,1.824-2.5338,3.1486h-.2667v-4.0181h-6.017v22.7672h6.3125v-13.1617c.0102-.9782.1953-1.8138.557-2.5135.36-.6963.8644-1.2261,1.5115-1.593.647-.3635,1.396-.5469,2.2451-.5469,1.2653,0,2.257.394,2.9788,1.1786.7217.7846,1.0767,1.8749,1.0682,3.2675v13.3689h6.3125v-14.4965c0-1.7662-.326-3.2913-.9782-4.5718-.6521-1.2805-1.5658-2.2655-2.741-2.955Z"/></svg>

configs/branding/beta/MacOSInstaller.svg

@@ -1,4 +0,0 @@
-<svg width="320" height="130" xmlns="http://www.w3.org/2000/svg">
-  <rect width="300" height="100" x="10" y="10" style="fill:rgb(0,0,255);stroke-width:3;stroke:red" />
-  Sorry, your browser does not support inline SVG.  
-</svg>

configs/common/mozconfig

@@ -1,40 +1,106 @@
 # Browser branding
-ac_add_options --enable-update-channel=release
-ac_add_options --without-wasm-sandboxed-libraries
-
-# ac_add_options --with-branding=beta
-
 ac_add_options --with-app-name=${binName}
+ac_add_options --with-app-basename=Zen
+ac_add_options --enable-official-branding
+
+# Localization
+ac_add_options --with-l10n-base="$PWD/browser/locales"
+
 export MOZ_USER_DIR="${name}"
-export MOZ_APP_VENDOR="${vendor}"
 export MOZ_APP_BASENAME=Zen
 export MOZ_APP_PROFILE=${binName}
 export MOZ_APP_DISPLAYNAME="${name}"
 export MOZ_BRANDING_DIRECTORY=${brandingDir}
 export MOZ_OFFICIAL_BRANDING_DIRECTORY=${brandingDir}
-export MOZ_MACBUNDLE_ID=${appId}
 export MOZ_DISTRIBUTION_ID=${appId}
 
 # Uncomment if builds are too resource hungry
 # mk_add_options MOZ_MAKE_FLAGS="-j4"
-#ac_add_options --enable-linker=gold
+# ac_add_options --enable-linker=gold
 
 # Misc
-export MOZ_STUB_INSTALLER=1
-export MOZ_INCLUDE_SOURCE_INFO=1
 export MOZ_SOURCE_REPO=https://github.com/zen-browser/desktop
 export MOZ_SOURCE_CHANGESET=${changeset}
-
-ac_add_options --enable-bootstrap
+export MOZ_INCLUDE_SOURCE_INFO=1
 
 ac_add_options --enable-application=browser
-ac_add_options --enable-hardening
-ac_add_options --enable-rust-simd
-ac_add_options --enable-release
-ac_add_options --enable-optimize
-ac_add_options --with-ccache=sccache
-ac_add_options --disable-debug
-ac_add_options --enable-updater
 
-# ALWAYS MANTAIN ONE LINE BREAK AT THE END OF THIS FILE
+if test "$ZEN_RELEASE"; then
+  ac_add_options --enable-bootstrap
+  
+  ac_add_options --enable-release
+  ac_add_options --disable-debug
+  ac_add_options --disable-debug-symbols
+  ac_add_options --disable-debug-js-modules
+  ac_add_options --disable-tests
+  
+  ac_add_options --disable-jprof
+  ac_add_options --disable-vtune
 
+  ac_add_options --enable-rust-simd
+  ac_add_options --enable-wasm-simd
+  
+  mk_add_options MOZ_PARALLEL_COMPILE=1
+
+  ac_add_options --enable-proxy-bypass-protection
+  ac_add_options --enable-hardening
+  ac_add_options --disable-profiling
+
+  ac_add_options --disable-crashreporter
+  ac_add_options --disable-geckodriver
+  ac_add_options --disable-rust-tests
+
+  # Done by vlad, if something fails, it's his fault
+  ac_add_options --disable-default-browser-agent
+
+  if ! test "$ZEN_DISABLE_LTO"; then
+    export MOZ_LTO=cross,thin
+    ac_add_options --enable-lto=cross,thin
+  fi
+
+  ac_add_options --enable-jemalloc
+
+  mk_add_options MOZILLA_OFFICIAL=1
+  MOZILLA_OFFICIAL=1
+  export MOZILLA_OFFICIAL=1
+
+  mk_add_options MOZ_OPTIMIZE=2
+  MOZ_OPTIMIZE=2
+  export MOZ_OPTIMIZE=2
+
+  export OPT_LEVEL="3"
+  ac_add_options OPT_LEVEL="3"
+
+  export RUSTC_OPT_LEVEL="3"
+  ac_add_options RUSTC_OPT_LEVEL="3"
+
+  mk_add_options AUTOCLOBBER=1
+  export AUTOCLOBBER=1
+
+  ac_add_options --enable-updater
+
+  export MOZ_PACKAGE_JSSHELL=1
+fi
+
+ac_add_options --enable-unverified-updates
+
+ac_add_options --enable-raw
+ac_add_options --enable-webrtc
+ac_add_options --enable-jxl
+ac_add_options --enable-av1
+ac_add_options --enable-eme=widevine
+
+ac_add_options --allow-addon-sideload
+ac_add_options --with-unsigned-addon-scopes=app,system
+
+mk_add_options MOZ_DATA_REPORTING=0
+mk_add_options MOZ_SERVICES_HEALTHREPORT=0
+mk_add_options MOZ_TELEMETRY_REPORTING=0
+
+# Allow loading unsigned extensions
+export MOZ_REQUIRE_SIGNING=
+mk_add_options MOZ_REQUIRE_SIGNING=
+
+# Sorry ptr, I didnt mean to!
+# Edit: ok, ill remove it, goodbye top #1 on fastest browsers benchmark :[
+# ac_add_options --without-wasm-sandboxed-libraries

configs/linux/mozconfig

@@ -1,13 +1,58 @@
-# Optimise builds
-# ac_add_options --enable-application=browser
-# ac_add_options --enable-hardening
-# ac_add_options --enable-rust-simd
-# ac_add_options --enable-release
-# ac_add_options --enable-optimize
-# ac_add_options --with-ccache=sccache
-# ac_add_options --disable-debug
-# ac_add_options --enable-updater
 
-# Disable telemetry and tracking
-mk_add_options MOZ_TELEMETRY_REPORTING=
-mk_add_options MOZ_DATA_REPORTING=
+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 "$ZEN_RELEASE"; then
+
+    ac_add_options --disable-dmd
+    ac_add_options --enable-linker=lld
+    ac_add_options --disable-elf-hack
+
+    ac_add_options --disable-gpsd
+    ac_add_options --disable-necko-wifi
+
+    ac_add_options --enable-install-strip
+    ac_add_options --enable-strip
+    export STRIP_FLAGS="--strip-debug --strip-unneeded"
+
+    if [ -f /home/runner/.mozbuild/sccache/sccache ]; then
+        mk_add_options 'export RUSTC_WRAPPER=/home/runner/.mozbuild/sccache/sccache'
+        mk_add_options 'export CCACHE_CPP2=yes'
+        ac_add_options --with-ccache=/home/runner/.mozbuild/sccache/sccache
+        mk_add_options 'export SCCACHE_GHA_ENABLED=on'
+    fi
+
+    export MOZ_PGO=1
+    ac_add_options MOZ_PGO=1
+
+    if test "$SURFER_COMPAT" = "true"; then
+        ac_add_options --enable-optimize="-O3 -march=x86-64"
+
+        export CFLAGS="$CFLAGS -O3 -ffp-contract=fast -march=x86-64"
+        export CPPFLAGS="$CPPFLAGS -O3 -ffp-contract=fast -march=x86-64"
+        export CXXFLAGS="$CXXFLAGS -O3 -flto=thin -ffp-contract=fast -march=x86-64"
+        export LDFLAGS="$LDFLAGS -Wl,-O3 -Wl,-mllvm,-fp-contract=fast -march=x86-64"
+        export RUSTFLAGS="$RUSTFLAGS -C target-cpu=x86-64 -C codegen-units=1 -Clink-args=--icf=safe"
+    else
+        ac_add_options --enable-wasm-avx
+        ac_add_options --enable-optimize="-O3 -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -mpopcnt -mpclmul"
+        
+        export CFLAGS="$CFLAGS -O3 -ffp-contract=fast -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -mpopcnt -mpclmul"     
+        export CPPFLAGS="$CPPFLAGS -O3 -ffp-contract=fast -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -mpopcnt -mpclmul"
+        export CXXFLAGS="$CXXFLAGS -O3 -flto=thin -ffp-contract=fast -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -mpopcnt -mpclmul"
+        export LDFLAGS="$LDFLAGS -Wl,-O3 -Wl,-mllvm,-fp-contract=fast -march=x86-64-v3"
+        export RUSTFLAGS="$RUSTFLAGS -C target-cpu=x86-64-v3 -C target-feature=+sse4.1 -C target-feature=+avx2 -C codegen-units=1 -Clink-args=--icf=safe"
+    fi
+    export VERBOSE=1
+    export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
+fi
+
+ac_add_options --target=x86_64-pc-linux
+
+ac_add_options --enable-alsa
+ac_add_options --enable-pulseaudio

configs/macos/mozconfig

@@ -1,14 +1,36 @@
-# Optimise builds
-ac_add_options --enable-application=browser
-ac_add_options --enable-hardening
-ac_add_options --enable-rust-simd
-ac_add_options --enable-release
-ac_add_options --enable-optimize
-ac_add_options --with-ccache=sccache
-ac_add_options --disable-debug
-ac_add_options --enable-updater
-mk_add_options MOZ_MAKE_FLAGS="-j4"
 
-# Disable telemetry and tracking
-mk_add_options MOZ_TELEMETRY_REPORTING=
-mk_add_options MOZ_DATA_REPORTING=
+# SURFER_COMPAT has a different meaning here, in macOS it means that the build is for
+# x86_64, not ARM64. 
+unset MOZ_STDCXX_COMPAT
+
+ac_add_options --disable-dmd
+
+export MOZ_MACBUNDLE_ID=${appId}
+export MOZ_MACBUNDLE_NAME="Zen Browser.app"
+
+if test "$SURFER_COMPAT" = "true"; then
+    export MOZ_PGO=1
+    ac_add_options MOZ_PGO=1
+    ac_add_options --target=x86_64-apple-darwin
+
+    ac_add_options --enable-wasm-avx
+    ac_add_options --enable-optimize="-march=nehalem -mtune=haswell -O3 -w"
+
+    export CFLAGS="-O3 -march=nehalem"
+    export CPPFLAGS="-O3 -march=nehalem"
+    export CXXFLAGS="-O3 -march=nehalem"
+    export LDFLAGS="-Wl,-O3 -march=nehalem"
+    export RUSTFLAGS="-Ctarget-cpu=nehalem -C codegen-units=1"
+else
+    ac_add_options --target=aarch64-apple-darwin
+
+    ac_add_options --enable-optimize="-O3 -mcpu=apple-m1 -march=armv8.3-a+simd"
+
+    export CFLAGS="-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
+    export CPPFLAGS="-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
+    export CXXFLAGS="-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
+    export LDFLAGS="-Wl,-O3 -march=armv8.3-a+simd -mcpu=apple-m1"
+    export RUSTFLAGS="-C target-feature=+v8.3a -C codegen-units=1 -Ctarget-cpu=apple-m1"
+fi
+export VERBOSE=1
+export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"

configs/windows/mozconfig

@@ -1,8 +1,66 @@
-ac_add_options --target=x86_64-pc-mingw32 
-ac_add_options --enable-js-shell 
-ac_add_options --enable-rust-simd 
-ac_add_options --enable-crashreporter 
-
-# Disable telemetry and tracking
-mk_add_options MOZ_TELEMETRY_REPORTING=
-mk_add_options MOZ_DATA_REPORTING=
+
+if test "$ZEN_CROSS_COMPILING"; then
+
+  export WINSYSROOT="$(echo ~)/win-cross/vs2022"
+
+  export MIDL="$(echo ~)/win-cross/wine/bin/widl"
+  export WINE="$(echo ~)/win-cross/wine/bin/wine64"
+  export WINEDEBUG=-all
+
+  export MOZ_STUB_INSTALLER=1
+  export MOZ_PKG_FORMAT=TAR
+
+  export CROSS_BUILD=1
+  CROSS_COMPILE=1
+  TOOLS=$(echo ~)/win-cross
+
+  export WIN_UCRT_REDIST_DIR="$(echo ~)/win-cross/vs2022/Windows Kits/10/Redist/10.0.22621.0/ucrt/DLLs/x64"
+  export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2022/VC/Redist/MSVC/14.38.33135/x64/Microsoft.VC143.CRT"
+
+  export MIDL="$TOOLS/wine/bin/widl"
+  export MOZ_STUB_INSTALLER=1
+  export WINEDEBUG=-all
+  export WINE="$TOOLS/wine/bin/wine64"
+
+fi
+
+#? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793
+#? https://phabricator.services.mozilla.com/D170170
+ac_add_options --target=x86_64-pc-windows-msvc
+
+ac_add_options --disable-maintenance-service
+ac_add_options --disable-bits-download
+ 
+if test "$SURFER_COMPAT" = "true"; then
+  ac_add_options --enable-optimize="-O3 -w -ftree-vectorize"
+
+  export CFLAGS="-mtune=haswell -march=x86-64 -O2 -Qvec -w"
+  export CPPFLAGS="-mtune=haswell -march=x86-64 -O2 -Qvec -w"
+  export CXXFLAGS="-flto=thin -mtune=haswell -march=x86-64 -O2 -Qvec -w"
+  export LDFLAGS="-Wl,-O2"
+  export RUSTFLAGS="-Clink-args=--icf=safe -C codegen-units=1 -Ctarget-cpu=x86-64"
+else
+  ac_add_options --enable-optimize="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -ftree-vectorize -Xclang -w"
+  ac_add_options --enable-wasm-avx
+
+  export CFLAGS="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -march=x86-64-v3"   
+  export CPPFLAGS="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -march=x86-64-v3"
+  export CXXFLAGS="-O2 -flto=thin -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -march=x86-64-v3"
+  export LDFLAGS="-Wl,-O3 -march=x86-64-v3"
+  export RUSTFLAGS="-Clink-args=--icf=safe -C target-feature=+avx -C codegen-units=1 -Ctarget-cpu=x86-64-v3"    
+fi
+export POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
+export VERBOSE=1
+
+if test "$ZEN_CROSS_COMPILING"; then
+  if test "$ZEN_GA_GENERATE_PROFILE"; then
+    export CXXFLAGS="$CXXFLAGS -fprofile-generate -mllvm -enable-name-compression=false -mllvm -pgo-temporal-instrumentation -fprofile-update=atomic"
+    mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
+    ac_add_options --enable-profile-generate=cross
+  else
+    ac_add_options --enable-profile-use=cross
+    ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged.profdata
+    ac_add_options --with-pgo-jarlog=$(echo ~)/artifact/en-US.log
+  fi
+
+fi

docs/changes.md

@@ -0,0 +1,15 @@
+
+## Changed things that should be tested each release
+
+* Workspaces
+* Sidebar
+* Split views
+* Vertical tabs (expanded and not expanded)
+* Tab groups
+* Welcome Page
+* Overall performance
+* Overall stability
+* Pinning tabs (Grid layout)
+* Overall UX
+* Themes Page
+* Settings Page

docs/key-shortcuts.md

@@ -0,0 +1,19 @@
+
+# Custom Keyboard Shortcuts
+
+```json
+{
+  "<shortcut-id>": {
+    "key": "<key>",
+    "alt": false,
+    "shift": false,
+    "ctrl": false,
+    "meta": false,
+    "keycode": 0
+  }
+}
+```
+
+The `key` field is the key that will trigger the shortcut. The `alt`, `shift`, `ctrl`, and `meta` fields are booleans that indicate if the respective modifier key should be pressed when the shortcut is triggered.
+
+The `keycode` field is the keycode of the key that will trigger the shortcut. This field is optional and can be used to specify the keycode of the key that will trigger the shortcut. If the `keycode` field is specified, the `key` field will be ignored.

docs/requirements.md

@@ -0,0 +1,31 @@
+
+# Supported CPUs for optimized builds (Windows and Linux)
+
+> If you CPU is not listed, you should use the "Generic" build.
+
+* AMD Family 15h (Excavator)
+* AMD Family 17h (Zen)
+* AMD Family 17h (Zen+)
+* AMD Family 17h (Zen 2)
+* AMD Family 19h (Zen 3)
+* Intel 4th Gen Core (Haswell)
+* Intel 5th Gen Core (Broadwell)
+* Intel 6th Gen Core (Skylake)
+* Intel 7th Gen Core (Kaby Lake)
+* Intel 8/9th Gen Core (Coffee Lake)
+* Intel 10th Gen Core (Comet Lake)
+* Intel 12th Gen (Alder Lake)
+* Intel 13th Gen (Raptor Lake)
+* Intel 14th Gen (Raptor Lake Refresh)
+* Intel 15th Gen (Lunar / Arrow Lake)
+* AMD Family 19h (Zen 4 / Zen 4c)
+* AMD Family 1Ah (Zen 5 / Zen 5c)
+* Intel 6th Gen Core (Skylake X)
+* Intel 8th Gen Core i3 (Cannon Lake)
+* Intel Xeon / 10th Gen Core (Ice Lake)
+* Intel Xeon (Cascade Lake)
+* Intel Xeon (Cooper Lake)
+* Intel 3rd Gen 10nm++ (Tiger Lake)
+* Intel 4th Gen 10nm++ (Sapphire Rapids)
+* Intel 5th Gen 10nm++ (Emerald Rapids)
+* Intel 11th Gen (Rocket Lake)

docs/workspaces.md

@@ -0,0 +1,19 @@
+
+# Workspaces Layout
+
+```json
+{
+  "workspaces": [
+    {
+      "uuid": "uuid1",
+      "name": "workspace1",
+      "icon": "icon1",
+      "default": true
+    },
+    ...
+  ]
+}
+```
+To save the tabs and identity them, they will contain a `zen-workspace-uuid` attribute with the workspace uuid.
+
+We will make use of firefox's builtin session restore feature to save the tabs and windows after the user closes the browser.

flatpak/io.github.zen_browser.zen.yml.template

@@ -0,0 +1,47 @@
+app-id: io.github.zen_browser.zen
+runtime: org.freedesktop.Platform
+runtime-version: '23.08'
+sdk: org.freedesktop.Sdk
+base: org.mozilla.firefox.BaseApp
+base-version: '23.08'
+command: launch-script.sh
+finish-args:
+  - --share=ipc
+  - --share=network
+  - --socket=pulseaudio
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --socket=pcsc
+  - --socket=cups
+  - --persist=.zen
+  - --filesystem=xdg-download:rw
+  - --device=all
+  - --talk-name=org.freedesktop.FileManager1
+  - --talk-name=org.freedesktop.ScreenSaver
+  - --own-name=org.mozilla.zen.*
+  - --own-name=org.mpris.MediaPlayer2.firefox.*
+  - --system-talk-name=org.freedesktop.NetworkManager
+  - --talk-name=org.a11y.Bus
+modules:
+  - name: zen_browser
+    buildsystem: simple
+    build-commands:
+      - mv zen /app/
+
+      - install -Dm0755 metadata/launch-script.sh ${{FLATPAK_DEST}}/bin/launch-script.sh
+      - install -Dm0644 metadata/policies.json ${{FLATPAK_DEST}}/bin/distribution/policies.json
+      - install -Dm0644 metadata/icons/io.github.zen_browser.zen.svg ${{FLATPAK_DEST}}/share/icons/hicolor/scalable/apps/${{FLATPAK_ID}}.svg
+      - install -Dm0644 metadata/io.github.zen_browser.zen.metainfo.xml ${{FLATPAK_DEST}}/share/metainfo/${{FLATPAK_ID}}.metainfo.xml
+      - install -Dm0644 metadata/io.github.zen_browser.zen.desktop ${{FLATPAK_DEST}}/share/applications/${{FLATPAK_ID}}.desktop
+
+    sources:
+      - type: archive
+        url: https://github.com/zen-browser/desktop/releases/download/{version}/zen.linux-generic.tar.bz2
+        sha256: {linux_sha256}
+        strip-components: 0
+
+      - type: archive
+        url: https://github.com/zen-browser/flatpak/releases/download/{version}/archive.tar
+        sha256: {flatpak_sha256}
+        strip-components: 0
+        dest: metadata

package.json

@@ -4,14 +4,16 @@
   "description": "",
   "scripts": {
     "build": "surfer build",
+    "build:ui": "surfer build --ui",
     "start": "cd engine && ./mach run --noprofile",
     "import": "surfer import",
     "export": "surfer export",
+    "init": "npm run bootstrap && npm run import",
     "bootstrap": "surfer download && surfer bootstrap",
     "package": "surfer package",
     "update-ff": "python3 scripts/update_ff.py",
     "update-ff:raw": "surfer update",
-    "update-newtab": "python3 update_newtab.py"
+    "update-newtab": "python3 scripts/update_newtab.py"
   },
   "repository": {
     "type": "git",
@@ -25,6 +27,6 @@
   },
   "homepage": "https://github.com/zen-browser/core#readme",
   "dependencies": {
-    "@zen-browser/surfer": "^1.0.4"
+    "@zen-browser/surfer": "^1.3.6"
   }
 }

pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@zen-browser/surfer':
-        specifier: ^1.0.4
-        version: 1.0.4
+        specifier: ^1.3.6
+        version: 1.3.6
 
 packages:
 
@@ -109,8 +109,8 @@ packages:
   '@types/node@17.0.45':
     resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
 
-  '@zen-browser/surfer@1.0.4':
-    resolution: {integrity: sha512-uDYuVFX7QvY2zuCwkuMnqR8YkmPf77JS2JZXjuBB4g5WGS3xaEoOqPAkbbo+HahAsKSwaiDuMsJs82V8+Hfe1g==}
+  '@zen-browser/surfer@1.3.6':
+    resolution: {integrity: sha512-b+5GS9qMGoMB8lRaFYRA9C3EqntVf35sBx5dq7X3IuqlB9GmarYoS5E26EvXbmPJcfYkJG7ar05nHkkZyOrGuw==}
     hasBin: true
 
   ansi-regex@5.0.1:
@@ -124,6 +124,10 @@ packages:
   argparse@1.0.10:
     resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
 
+  async-compat@1.4.7:
+    resolution: {integrity: sha512-DzJRBBF6Q+AJYuAnFXflE5P0FEkJ7oKMOOR4YhzMNZsDnXOSUdCpYt+PpbCGrljempC3hujxy48rHBcBAWdr7g==}
+    engines: {node: '>=0.8'}
+
   async-icns@1.0.2:
     resolution: {integrity: sha512-d2P/f3aAWdOE3+tEqTW4HLj9Ob7/t54/NH2nRFK9Q7ZhJJXK7TlF1G3vgB6UP/ILHjI3Akjv+d8sFXyAZxCIFQ==}
     hasBin: true
@@ -131,12 +135,43 @@ packages:
   axios@0.21.4:
     resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
 
+  balanced-match@1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+
+  base64-js@0.0.2:
+    resolution: {integrity: sha512-Pj9L87dCdGcKlSqPVUjD+q96pbIx1zQQLb2CUiWURfjiBELv84YX+0nGnKmyT/9KkC7PQk7UN1w+Al8bBozaxQ==}
+    engines: {node: '>= 0.4'}
+
   base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
+  bl@2.2.1:
+    resolution: {integrity: sha512-6Pesp1w0DEX1N550i/uGV/TqucVL4AM/pgThFSN/Qq9si1/DF9aIHs1BxD8V/QU0HoeHO6cQRTAuYnLPKq1e4g==}
+
+  bl@3.0.1:
+    resolution: {integrity: sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ==}
+
   bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
 
+  bops@0.1.1:
+    resolution: {integrity: sha512-Cx1zStcMp+YoFan8OgudNPMih82eJZE+27feki1WeyoFTR9Ye7AR1SUW3saE6QQvdS/g52aJ2IojBjWOiRiLbw==}
+
+  brace-expansion@1.1.11:
+    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+
+  buffer-alloc-unsafe@1.1.0:
+    resolution: {integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==}
+
+  buffer-alloc@1.2.0:
+    resolution: {integrity: sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==}
+
+  buffer-fill@1.0.0:
+    resolution: {integrity: sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ==}
+
+  buffer-v6-polyfill@1.0.5:
+    resolution: {integrity: sha512-LdUw/JMZyKN+EBDbOHqynYtOLXDjgo+uf5vCUhfO5hVsU2chvbqyexizvxUMaU4ipYZy9MiQyIFwMeIgsb6nBA==}
+
   buffer@5.7.1:
     resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
 
@@ -173,9 +208,22 @@ packages:
     resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==}
     engines: {node: ^12.20.0 || >=14}
 
+  concat-map@0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+
+  content-disposition@0.5.4:
+    resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
+    engines: {node: '>= 0.6'}
+
   core-js-pure@3.37.1:
     resolution: {integrity: sha512-J/r5JTHSmzTxbiYYrzXg9w1VpqrYt+gexenBE9pugeyhwPZTAEJddyiReJWsLO6uNQ8xJZFbod6XC7KKwatCiA==}
 
+  core-js@3.37.1:
+    resolution: {integrity: sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==}
+
+  core-util-is@1.0.3:
+    resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
+
   cross-spawn@7.0.3:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
     engines: {node: '>= 8'}
@@ -192,6 +240,9 @@ packages:
     resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==}
     engines: {node: '>=8'}
 
+  duplexify@4.1.3:
+    resolution: {integrity: sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==}
+
   emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
@@ -211,6 +262,20 @@ packages:
     resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
     engines: {node: '>=6'}
 
+  extract-base-iterator@1.0.1:
+    resolution: {integrity: sha512-CbDiNxzBKMsVv/EVZnG+itxULcsRijEUm1l8cZ5S0519R77MA9jX3FOJsf+96OnxfVwUJiy1q9+pDvXarkQKHQ==}
+    engines: {node: '>=0.8'}
+
+  fast-extract@1.1.0:
+    resolution: {integrity: sha512-uUN0xFXyicJXBhwP4a7IRYmLWDB8POLb1DpBy+4HyWwWcD8dzlWZCDUWXdpvjCq3ve/RWlWRIVT5ZJ4WKbIPZw==}
+    engines: {node: '>=0.8'}
+
+  fifo@2.4.1:
+    resolution: {integrity: sha512-XTbUCNmo54Jav0hcL6VxDuY4x1eCQH61HEF80C2Oww283pfjQ2C8avZeyq4v43sW2S2403kmzssE9j4lbF66Sg==}
+
+  flush-write-stream@2.0.0:
+    resolution: {integrity: sha512-uXClqPxT4xW0lcdSBheb2ObVU+kuqUk3Jk64EwieirEXZx9XUrVwp/JuBfKAWaM4T5Td/VL7QLDWPXp/MvGm/g==}
+
   follow-redirects@1.15.6:
     resolution: {integrity: sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==}
     engines: {node: '>=4.0'}
@@ -220,6 +285,10 @@ packages:
       debug:
         optional: true
 
+  fs-access-compat@1.0.3:
+    resolution: {integrity: sha512-bIT52oDQuazHSEnu17+MnRGVTTtLpMluu9Zuv25RhJ+iVWrTX95aXK+9yEsQ1ZaIRCWeHjx1IgR38QH/8psWKQ==}
+    engines: {node: '>=0.8'}
+
   fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
 
@@ -227,6 +296,13 @@ packages:
     resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
     engines: {node: '>=12'}
 
+  fs.realpath@1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+
+  get-caller-file@2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+
   get-stream@6.0.1:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
     engines: {node: '>=10'}
@@ -234,6 +310,10 @@ packages:
   github-from-package@0.0.0:
     resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
 
+  glob@7.2.3:
+    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    deprecated: Glob versions prior to v9 are no longer supported
+
   globalyzer@0.1.0:
     resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
 
@@ -247,6 +327,9 @@ packages:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
     engines: {node: '>=8'}
 
+  hash-string@1.0.0:
+    resolution: {integrity: sha512-dtNNyxXobzHavayZwOwRWhBTqS9GX4jDjIMsGc0fDyaN2A+4zMn5Ua9ODDCggN6w3Spma6mAHL3ImmW3BkWDmQ==}
+
   human-signals@2.1.0:
     resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
     engines: {node: '>=10.17.0'}
@@ -254,6 +337,14 @@ packages:
   ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
+  imurmurhash@0.1.4:
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
+
+  inflight@1.0.6:
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
+
   inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
@@ -264,6 +355,10 @@ packages:
     resolution: {integrity: sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
 
+  is-absolute@1.0.0:
+    resolution: {integrity: sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==}
+    engines: {node: '>=0.10.0'}
+
   is-apple-silicon@https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a:
     resolution: {tarball: https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a}
     version: 1.0.1
@@ -271,14 +366,35 @@ packages:
   is-arrayish@0.3.2:
     resolution: {integrity: sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==}
 
+  is-error@2.2.2:
+    resolution: {integrity: sha512-IOQqts/aHWbiisY5DuPJQ0gcbvaLFCa7fBa9xoLfxBZvQ+ZI/Zh9xoI7Gk+G64N0FdK4AbibytHht2tWgpJWLg==}
+
   is-fullwidth-code-point@3.0.0:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
+  is-promise@4.0.0:
+    resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==}
+
+  is-relative@1.0.0:
+    resolution: {integrity: sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==}
+    engines: {node: '>=0.10.0'}
+
   is-stream@2.0.1:
     resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
     engines: {node: '>=8'}
 
+  is-unc-path@1.0.0:
+    resolution: {integrity: sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-windows@1.0.2:
+    resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
+    engines: {node: '>=0.10.0'}
+
+  isarray@1.0.0:
+    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
+
   isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
@@ -297,6 +413,15 @@ packages:
     resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
     engines: {node: '>=6'}
 
+  lifecycle@1.0.4:
+    resolution: {integrity: sha512-FJx0SNrM2rouctdOH4rATsHT+BvgyXX4LEQ+Yn9COQNPK3u4XAPp9qS7OKpRO22MeT39oxkjZkRcLnHxSmiduw==}
+
+  lodash.compact@3.0.1:
+    resolution: {integrity: sha512-2ozeiPi+5eBXW1CLtzjk8XQFhQOEMwwfxblqeq6EGyTxZJ1bPATqilY0e6g2SLQpP4KuMeuioBhEnWz5Pr7ICQ==}
+
+  lodash.throttle@4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+
   merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
 
@@ -308,12 +433,22 @@ packages:
     resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
     engines: {node: '>=10'}
 
+  minimatch@3.1.2:
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+
   minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
   mkdirp-classic@0.5.3:
     resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
 
+  mkpath@1.0.0:
+    resolution: {integrity: sha512-PbNHr7Y/9Y/2P5pKFv5XOGBfNQqZ+fdiHWcuf7swLACN5ZW5LU7J5tMU8LSBjpluAxAxKYGD9nnaIbdRy9+m1w==}
+
+  mock-require-lazy@1.0.1:
+    resolution: {integrity: sha512-Sv05IW2MuG7C+gVTHirqF8cbqAM8MeMEIKU3MIQDA1pyXKnv0AGa/3l0iwXk/i+81OoFzt+iU0p8DdphV2Ejww==}
+    engines: {node: '>=0.8'}
+
   modern-async@1.1.4:
     resolution: {integrity: sha512-jaZlzQB3W9PRF43+T144lYWb7UaTapJM6MZxNGLqpgPVal6uV4ixkR+t/1H1/7UM03jDu5BnvAYDqeawvL7kiw==}
 
@@ -323,6 +458,9 @@ packages:
   napi-build-utils@1.0.2:
     resolution: {integrity: sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==}
 
+  next-tick@1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+
   node-abi@3.65.0:
     resolution: {integrity: sha512-ThjYBfoDNr08AWx6hGaRbfPwxKV9kVzAzOzlLKbk2CuqXE2xnCh+cbAGnwM3t8Lq4v9rUB7VfondlkBckcJrVA==}
     engines: {node: '>=10'}
@@ -330,6 +468,10 @@ packages:
   node-addon-api@5.1.0:
     resolution: {integrity: sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==}
 
+  normalize-path@3.0.0:
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
+    engines: {node: '>=0.10.0'}
+
   npm-run-path@4.0.1:
     resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
     engines: {node: '>=8'}
@@ -341,6 +483,14 @@ packages:
     resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
     engines: {node: '>=6'}
 
+  os-shim@0.1.3:
+    resolution: {integrity: sha512-jd0cvB8qQ5uVt0lvCIexBaROw1KyKm5sbulg2fWOHjETisuCzWyt+eTZKEMs8v6HwzoGs8xik26jg7eCM6pS+A==}
+    engines: {node: '>= 0.4.0'}
+
+  path-is-absolute@1.0.1:
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
+    engines: {node: '>=0.10.0'}
+
   path-key@3.1.1:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
     engines: {node: '>=8'}
@@ -363,6 +513,12 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  process-nextick-args@2.0.1:
+    resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
+
+  progress-stream@2.0.0:
+    resolution: {integrity: sha512-xJwOWR46jcXUq6EH9yYyqp+I52skPySOeHfkxOZ2IY1AiBi/sFJhbhAKHoV3OTw/omQ45KTio9215dRJ2Yxd3Q==}
+
   prompts@2.4.2:
     resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
     engines: {node: '>= 6'}
@@ -370,20 +526,49 @@ packages:
   pump@3.0.0:
     resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
 
+  pumpify@2.0.1:
+    resolution: {integrity: sha512-m7KOje7jZxrmutanlkS1daj1dS6z6BgslzOXmcSEpIlCxM3VJH7lG5QLeck/6hgF6F4crFf01UtQmNsJfweTAw==}
+
+  queue-cb@1.2.1:
+    resolution: {integrity: sha512-6BliHPdr+07JEc1f3WSZq1oun1okwC4g5StX+DBBIr4Xrx3a5oRLHV9fRFPH1kfOxP4o/sIsoJX3qY9JqTIORw==}
+    engines: {node: '>=0.8'}
+
   rc@1.2.8:
     resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
     hasBin: true
 
+  readable-stream@2.3.8:
+    resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
+
   readable-stream@3.6.2:
     resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
     engines: {node: '>= 6'}
 
+  require_optional@1.0.1:
+    resolution: {integrity: sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==}
+
+  resolve-from@2.0.0:
+    resolution: {integrity: sha512-qpFcKaXsq8+oRoLilkwyc7zHGF5i9Q2/25NIgLQQ/+VVv9rU4qvr6nXVAw1DsnXJyQkZsR4Ytfbtg5ehfcUssQ==}
+    engines: {node: '>=0.10.0'}
+
+  rimraf@2.7.1:
+    resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
+    hasBin: true
+
   rustic@1.2.2:
     resolution: {integrity: sha512-aagYrcImcYj3QbaP7nirOw8/q8aULMu0LkKucP9B4WsRbXlXpk195nYAEB+uJzAcgk2pKS+yMzbAJtIoOqwZoQ==}
 
+  safe-buffer@5.1.2:
+    resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
+
   safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
+  semver@5.7.2:
+    resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}
+    hasBin: true
+
   semver@7.6.2:
     resolution: {integrity: sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==}
     engines: {node: '>=10'}
@@ -401,6 +586,9 @@ packages:
     resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
     engines: {node: '>=8'}
 
+  short-hash@1.0.0:
+    resolution: {integrity: sha512-qbUCD2Pkl4IXRyVqneEjGnUr0NGDGLzZnBUVGJngIQZf/FrhOL0yJhH+JQzak0t8xMmScIKpoX1SxOsPHdwa4w==}
+
   signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
@@ -416,13 +604,26 @@ packages:
   sisteransi@1.0.5:
     resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
 
+  speedometer@1.0.0:
+    resolution: {integrity: sha512-lgxErLl/7A5+vgIIXsh9MbeukOaCb2axgQ+bKCdIE+ibNT4XNYGNCR1qFEGq6F+YDASXK3Fh/c5FgtZchFolxw==}
+
   sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
+  stack-base-iterator@1.1.1:
+    resolution: {integrity: sha512-1mNThtigubwfisTX+RwMXahSxLch7quWujkD0ef957UD/5STUrnl3TQM/Kspwqm5tokJ9eOukDUkOGroigh3Kw==}
+    engines: {node: '>=0.8'}
+
+  stream-shift@1.0.3:
+    resolution: {integrity: sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==}
+
   string-width@4.2.3:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
 
+  string_decoder@1.1.1:
+    resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
+
   string_decoder@1.3.0:
     resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
 
@@ -445,16 +646,44 @@ packages:
   tar-fs@2.1.1:
     resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==}
 
+  tar-iterator@1.0.1:
+    resolution: {integrity: sha512-RxwFVLHCrZCEHIaWUaxXG21dPlzU/POiTAMqZzaRgy/ndOP2sPnB/P2/g4yN/VwXMgFu343M5URlYbH8qg7gAA==}
+    engines: {node: '>=0.8'}
+
+  tar-stream-compat@2.1.5:
+    resolution: {integrity: sha512-hhIcRHj6S+y7IDR+VO8IcOjPUsAJ+50POvGK1fDFqbOTLTs/J7YA07TUgvpSkYkYuRUfYsuAFM/0SrvrdIZMdQ==}
+    engines: {node: '>=0.8'}
+
   tar-stream@2.2.0:
     resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
     engines: {node: '>=6'}
 
+  temp-suffix@0.1.1:
+    resolution: {integrity: sha512-wcluXJ6A8HhyhEOOTXHPKV9TRTcL7vwmnfrWTZn7c7zrFp16trP1lfpsxaKN52pToFNByQ+y3zsJC8JlDAaKrg==}
+    engines: {node: '>=0.8'}
+
+  through2@2.0.5:
+    resolution: {integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==}
+
+  through@2.3.8:
+    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
+
   tiny-glob@0.2.9:
     resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==}
 
+  to-utf8@0.0.1:
+    resolution: {integrity: sha512-zks18/TWT1iHO3v0vFp5qLKOG27m67ycq/Y7a7cTiRuUNlc4gf3HGnkRgMv0NyhnfTamtkYBJl+YeD1/j07gBQ==}
+
   tunnel-agent@0.6.0:
     resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
 
+  unbzip2-stream@1.4.3:
+    resolution: {integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==}
+
+  unc-path-regex@0.1.2:
+    resolution: {integrity: sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==}
+    engines: {node: '>=0.10.0'}
+
   universalify@2.0.1:
     resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
     engines: {node: '>= 10.0.0'}
@@ -474,6 +703,17 @@ packages:
     resolution: {integrity: sha512-WCSfbfZnQDdLQLiMdGUQpMxxckeQ4oZNMNhLVkcekTu7xhD4tuUDyAPoY8CwXvBYE6LwBHd6QW2WZXlOWr1vCw==}
     engines: {node: '>=12.0'}
 
+  xtend@4.0.2:
+    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
+    engines: {node: '>=0.4'}
+
+  zip-iterator@1.0.1:
+    resolution: {integrity: sha512-0mrjvo33Z9E/7rd2iiNmEJMjbiv+/czKyTl+IOdgpY87+y9vUW+bB6HmhGU9s7G3TpWsEIID3n+7cckK3D2hwQ==}
+    engines: {node: '>=0.8'}
+
+  zip@1.2.0:
+    resolution: {integrity: sha512-8B4Z9BXJKkI8BkHhKvQan4rwCzUENnj95YHFYrI7F1NbqKCIdW86kujctzEB+kJ6XapHPiAhiZ9xi5GbW5SPdw==}
+
 snapshots:
 
   '@oozcitak/dom@1.15.10':
@@ -546,7 +786,7 @@ snapshots:
 
   '@types/node@17.0.45': {}
 
-  '@zen-browser/surfer@1.0.4':
+  '@zen-browser/surfer@1.3.6':
     dependencies:
       '@resvg/resvg-js': 1.4.0
       async-icns: 1.0.2
@@ -555,6 +795,7 @@ snapshots:
       cli-progress: 3.12.0
       commander: 6.2.1
       execa: 5.1.1
+      fast-extract: 1.1.0
       fs-extra: 10.1.0
       ini: 3.0.1
       is-apple-silicon: https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a
@@ -581,6 +822,11 @@ snapshots:
     dependencies:
       sprintf-js: 1.0.3
 
+  async-compat@1.4.7:
+    dependencies:
+      is-error: 2.2.2
+      is-promise: 4.0.0
+
   async-icns@1.0.2:
     dependencies:
       commander: 9.5.0
@@ -591,14 +837,48 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
+  balanced-match@1.0.2: {}
+
+  base64-js@0.0.2: {}
+
   base64-js@1.5.1: {}
 
+  bl@2.2.1:
+    dependencies:
+      readable-stream: 2.3.8
+      safe-buffer: 5.2.1
+
+  bl@3.0.1:
+    dependencies:
+      readable-stream: 3.6.2
+
   bl@4.1.0:
     dependencies:
       buffer: 5.7.1
       inherits: 2.0.4
       readable-stream: 3.6.2
 
+  bops@0.1.1:
+    dependencies:
+      base64-js: 0.0.2
+      to-utf8: 0.0.1
+
+  brace-expansion@1.1.11:
+    dependencies:
+      balanced-match: 1.0.2
+      concat-map: 0.0.1
+
+  buffer-alloc-unsafe@1.1.0: {}
+
+  buffer-alloc@1.2.0:
+    dependencies:
+      buffer-alloc-unsafe: 1.1.0
+      buffer-fill: 1.0.0
+
+  buffer-fill@1.0.0: {}
+
+  buffer-v6-polyfill@1.0.5: {}
+
   buffer@5.7.1:
     dependencies:
       base64-js: 1.5.1
@@ -635,8 +915,18 @@ snapshots:
 
   commander@9.5.0: {}
 
+  concat-map@0.0.1: {}
+
+  content-disposition@0.5.4:
+    dependencies:
+      safe-buffer: 5.2.1
+
   core-js-pure@3.37.1: {}
 
+  core-js@3.37.1: {}
+
+  core-util-is@1.0.3: {}
+
   cross-spawn@7.0.3:
     dependencies:
       path-key: 3.1.1
@@ -651,6 +941,13 @@ snapshots:
 
   detect-libc@2.0.3: {}
 
+  duplexify@4.1.3:
+    dependencies:
+      end-of-stream: 1.4.4
+      inherits: 2.0.4
+      readable-stream: 3.6.2
+      stream-shift: 1.0.3
+
   emoji-regex@8.0.0: {}
 
   end-of-stream@1.4.4:
@@ -673,8 +970,54 @@ snapshots:
 
   expand-template@2.0.3: {}
 
+  extract-base-iterator@1.0.1:
+    dependencies:
+      core-js: 3.37.1
+      fs-access-compat: 1.0.3
+      graceful-fs: 4.2.11
+      is-absolute: 1.0.0
+      lodash.compact: 3.0.1
+      mkpath: 1.0.0
+      queue-cb: 1.2.1
+      rimraf: 2.7.1
+      stack-base-iterator: 1.1.1
+
+  fast-extract@1.1.0:
+    dependencies:
+      bl: 3.0.1
+      buffer-v6-polyfill: 1.0.5
+      content-disposition: 0.5.4
+      core-js: 3.37.1
+      end-of-stream: 1.4.4
+      flush-write-stream: 2.0.0
+      lodash.throttle: 4.1.1
+      mkpath: 1.0.0
+      mock-require-lazy: 1.0.1
+      next-tick: 1.1.0
+      once: 1.4.0
+      progress-stream: 2.0.0
+      pumpify: 2.0.1
+      queue-cb: 1.2.1
+      readable-stream: 2.3.8
+      require_optional: 1.0.1
+      rimraf: 2.7.1
+      signal-exit: 3.0.7
+      tar-iterator: 1.0.1
+      temp-suffix: 0.1.1
+      unbzip2-stream: 1.4.3
+      zip-iterator: 1.0.1
+
+  fifo@2.4.1: {}
+
+  flush-write-stream@2.0.0:
+    dependencies:
+      inherits: 2.0.4
+      readable-stream: 3.6.2
+
   follow-redirects@1.15.6: {}
 
+  fs-access-compat@1.0.3: {}
+
   fs-constants@1.0.0: {}
 
   fs-extra@10.1.0:
@@ -683,10 +1026,23 @@ snapshots:
       jsonfile: 6.1.0
       universalify: 2.0.1
 
+  fs.realpath@1.0.0: {}
+
+  get-caller-file@2.0.5: {}
+
   get-stream@6.0.1: {}
 
   github-from-package@0.0.0: {}
 
+  glob@7.2.3:
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 3.1.2
+      once: 1.4.0
+      path-is-absolute: 1.0.1
+
   globalyzer@0.1.0: {}
 
   globrex@0.1.2: {}
@@ -695,24 +1051,54 @@ snapshots:
 
   has-flag@4.0.0: {}
 
+  hash-string@1.0.0: {}
+
   human-signals@2.1.0: {}
 
   ieee754@1.2.1: {}
 
+  imurmurhash@0.1.4: {}
+
+  inflight@1.0.6:
+    dependencies:
+      once: 1.4.0
+      wrappy: 1.0.2
+
   inherits@2.0.4: {}
 
   ini@1.3.8: {}
 
   ini@3.0.1: {}
 
+  is-absolute@1.0.0:
+    dependencies:
+      is-relative: 1.0.0
+      is-windows: 1.0.2
+
   is-apple-silicon@https://codeload.github.com/trickypr/is-apple-silicon/tar.gz/5f75501a1d7566ba9f94174b6825d7bd9d302b6a: {}
 
   is-arrayish@0.3.2: {}
 
+  is-error@2.2.2: {}
+
   is-fullwidth-code-point@3.0.0: {}
 
+  is-promise@4.0.0: {}
+
+  is-relative@1.0.0:
+    dependencies:
+      is-unc-path: 1.0.0
+
   is-stream@2.0.1: {}
 
+  is-unc-path@1.0.0:
+    dependencies:
+      unc-path-regex: 0.1.2
+
+  is-windows@1.0.2: {}
+
+  isarray@1.0.0: {}
+
   isexe@2.0.0: {}
 
   js-yaml@3.14.1:
@@ -730,16 +1116,33 @@ snapshots:
 
   kleur@4.1.5: {}
 
+  lifecycle@1.0.4: {}
+
+  lodash.compact@3.0.1: {}
+
+  lodash.throttle@4.1.1: {}
+
   merge-stream@2.0.0: {}
 
   mimic-fn@2.1.0: {}
 
   mimic-response@3.1.0: {}
 
+  minimatch@3.1.2:
+    dependencies:
+      brace-expansion: 1.1.11
+
   minimist@1.2.8: {}
 
   mkdirp-classic@0.5.3: {}
 
+  mkpath@1.0.0: {}
+
+  mock-require-lazy@1.0.1:
+    dependencies:
+      get-caller-file: 2.0.5
+      normalize-path: 3.0.0
+
   modern-async@1.1.4:
     dependencies:
       core-js-pure: 3.37.1
@@ -749,12 +1152,16 @@ snapshots:
 
   napi-build-utils@1.0.2: {}
 
+  next-tick@1.1.0: {}
+
   node-abi@3.65.0:
     dependencies:
       semver: 7.6.2
 
   node-addon-api@5.1.0: {}
 
+  normalize-path@3.0.0: {}
+
   npm-run-path@4.0.1:
     dependencies:
       path-key: 3.1.1
@@ -767,6 +1174,10 @@ snapshots:
     dependencies:
       mimic-fn: 2.1.0
 
+  os-shim@0.1.3: {}
+
+  path-is-absolute@1.0.1: {}
+
   path-key@3.1.1: {}
 
   picomatch@2.3.1: {}
@@ -794,6 +1205,13 @@ snapshots:
       tar-fs: 2.1.1
       tunnel-agent: 0.6.0
 
+  process-nextick-args@2.0.1: {}
+
+  progress-stream@2.0.0:
+    dependencies:
+      speedometer: 1.0.0
+      through2: 2.0.5
+
   prompts@2.4.2:
     dependencies:
       kleur: 3.0.3
@@ -804,6 +1222,14 @@ snapshots:
       end-of-stream: 1.4.4
       once: 1.4.0
 
+  pumpify@2.0.1:
+    dependencies:
+      duplexify: 4.1.3
+      inherits: 2.0.4
+      pump: 3.0.0
+
+  queue-cb@1.2.1: {}
+
   rc@1.2.8:
     dependencies:
       deep-extend: 0.6.0
@@ -811,16 +1237,41 @@ snapshots:
       minimist: 1.2.8
       strip-json-comments: 2.0.1
 
+  readable-stream@2.3.8:
+    dependencies:
+      core-util-is: 1.0.3
+      inherits: 2.0.4
+      isarray: 1.0.0
+      process-nextick-args: 2.0.1
+      safe-buffer: 5.1.2
+      string_decoder: 1.1.1
+      util-deprecate: 1.0.2
+
   readable-stream@3.6.2:
     dependencies:
       inherits: 2.0.4
       string_decoder: 1.3.0
       util-deprecate: 1.0.2
 
+  require_optional@1.0.1:
+    dependencies:
+      resolve-from: 2.0.0
+      semver: 5.7.2
+
+  resolve-from@2.0.0: {}
+
+  rimraf@2.7.1:
+    dependencies:
+      glob: 7.2.3
+
   rustic@1.2.2: {}
 
+  safe-buffer@5.1.2: {}
+
   safe-buffer@5.2.1: {}
 
+  semver@5.7.2: {}
+
   semver@7.6.2: {}
 
   sharp@0.30.7:
@@ -840,6 +1291,10 @@ snapshots:
 
   shebang-regex@3.0.0: {}
 
+  short-hash@1.0.0:
+    dependencies:
+      hash-string: 1.0.0
+
   signal-exit@3.0.7: {}
 
   simple-concat@1.0.1: {}
@@ -856,14 +1311,28 @@ snapshots:
 
   sisteransi@1.0.5: {}
 
+  speedometer@1.0.0: {}
+
   sprintf-js@1.0.3: {}
 
+  stack-base-iterator@1.1.1:
+    dependencies:
+      async-compat: 1.4.7
+      fifo: 2.4.1
+      once: 1.4.0
+
+  stream-shift@1.0.3: {}
+
   string-width@4.2.3:
     dependencies:
       emoji-regex: 8.0.0
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
 
+  string_decoder@1.1.1:
+    dependencies:
+      safe-buffer: 5.1.2
+
   string_decoder@1.3.0:
     dependencies:
       safe-buffer: 5.2.1
@@ -887,6 +1356,28 @@ snapshots:
       pump: 3.0.0
       tar-stream: 2.2.0
 
+  tar-iterator@1.0.1:
+    dependencies:
+      end-of-stream: 1.4.4
+      extract-base-iterator: 1.0.1
+      fs-access-compat: 1.0.3
+      lifecycle: 1.0.4
+      lodash.compact: 3.0.1
+      mkpath: 1.0.0
+      once: 1.4.0
+      queue-cb: 1.2.1
+      rimraf: 2.7.1
+      tar-stream-compat: 2.1.5
+
+  tar-stream-compat@2.1.5:
+    dependencies:
+      bl: 2.2.1
+      buffer-alloc: 1.2.0
+      end-of-stream: 1.4.4
+      fs-constants: 1.0.0
+      inherits: 2.0.4
+      readable-stream: 2.3.8
+
   tar-stream@2.2.0:
     dependencies:
       bl: 4.1.0
@@ -895,15 +1386,35 @@ snapshots:
       inherits: 2.0.4
       readable-stream: 3.6.2
 
+  temp-suffix@0.1.1:
+    dependencies:
+      imurmurhash: 0.1.4
+
+  through2@2.0.5:
+    dependencies:
+      readable-stream: 2.3.8
+      xtend: 4.0.2
+
+  through@2.3.8: {}
+
   tiny-glob@0.2.9:
     dependencies:
       globalyzer: 0.1.0
       globrex: 0.1.2
 
+  to-utf8@0.0.1: {}
+
   tunnel-agent@0.6.0:
     dependencies:
       safe-buffer: 5.2.1
 
+  unbzip2-stream@1.4.3:
+    dependencies:
+      buffer: 5.7.1
+      through: 2.3.8
+
+  unc-path-regex@0.1.2: {}
+
   universalify@2.0.1: {}
 
   util-deprecate@1.0.2: {}
@@ -920,3 +1431,27 @@ snapshots:
       '@oozcitak/infra': 1.0.8
       '@oozcitak/util': 8.3.8
       js-yaml: 3.14.1
+
+  xtend@4.0.2: {}
+
+  zip-iterator@1.0.1:
+    dependencies:
+      buffer-v6-polyfill: 1.0.5
+      end-of-stream: 1.4.4
+      extract-base-iterator: 1.0.1
+      fs-access-compat: 1.0.3
+      lifecycle: 1.0.4
+      lodash.compact: 3.0.1
+      mkpath: 1.0.0
+      once: 1.4.0
+      os-shim: 0.1.3
+      queue-cb: 1.2.1
+      readable-stream: 2.3.8
+      rimraf: 2.7.1
+      short-hash: 1.0.0
+      temp-suffix: 0.1.1
+      zip: 1.2.0
+
+  zip@1.2.0:
+    dependencies:
+      bops: 0.1.1

scripts/copy-language-pack.sh

@@ -0,0 +1,17 @@
+browser_locales=engine/browser/locales
+
+copy_browser_locales() {
+  langId=$1
+  mkdir -p $browser_locales/$langId
+  if [ "$langId" = "en-US" ]; then
+    find $browser_locales/$langId -type f -name "zen*" -delete
+    rsync -av --exclude=.git ./l10n/en-US/browser/ $browser_locales/$langId/
+    return
+  fi
+  rm -rf $browser_locales/$langId/
+  rsync -av --exclude=.git ./l10n/$langId/ $browser_locales/$langId/
+}
+
+LANG=$1
+echo "Copying language pack for $LANG"
+copy_browser_locales $LANG

scripts/download-language-packs.sh

@@ -0,0 +1,57 @@
+
+set -ex
+
+CURRENT_DIR=$(pwd)
+
+git config --global init.defaultBranch main
+git config --global fetch.prune true
+
+mkdir ~/tools
+cd ~/tools
+git clone https://github.com/glandium/git-cinnabar.git
+cd git-cinnabar
+git checkout 0.5.11
+export PATH=~/tools/git-cinnabar:$PATH
+cd ~
+git cinnabar download
+cd $CURRENT_DIR
+
+update_language() {
+  langId=$1
+  cd ./l10n
+  cd $langId
+
+  echo "Updating $langId"
+  rm -rf .git
+
+  git init 
+  git remote add upstream hg://hg.mozilla.org/l10n-central/$langId
+  git remote set-url upstream hg://hg.mozilla.org/l10n-central/$langId
+  git pull upstream branches/default/tip
+
+  cd $CURRENT_DIR
+}
+
+export PATH=~/tools/git-cinnabar:$PATH
+for lang in $(cat ./l10n/supported-languages); do
+  update_language $lang
+done
+cd $CURRENT_DIR
+
+# Move all the files to the correct location
+
+sh scripts/copy-language-pack.sh en-US
+for lang in $(cat ./l10n/supported-languages); do
+  sh scripts/copy-language-pack.sh $lang
+done
+
+wait
+
+echo "Cleaning up"
+rm -rf ~/tools
+rm -rf ~/.git-cinnabar
+
+for lang in $(cat ./l10n/supported-languages); do
+  # remove every file except if it starts with "zen"
+  find ./l10n/$lang -type f -not -name "zen*" -delete
+done

scripts/prepare-flatpak-release.py

@@ -0,0 +1,58 @@
+
+import os
+import sys
+
+import hashlib
+import argparse
+
+FLATID = "io.github.zen_browser.zen"
+
+def get_sha256sum(filename):  
+    sha256 = hashlib.sha256()
+    with open(filename, "rb") as f:
+        for byte_block in iter(lambda: f.read(4096), b""):
+            sha256.update(byte_block)
+    return sha256.hexdigest()
+
+def build_template(template, linux_sha256, flatpak_sha256, version):
+    print(f"Building template with version {version}")
+    print(f"\tLinux archive sha256: {linux_sha256}")
+    print(f"\tFlatpak archive sha256: {flatpak_sha256}")
+    return template.format(linux_sha256=linux_sha256, 
+                          flatpak_sha256=flatpak_sha256,
+                          version=version)
+
+def get_template(template_root):
+    file = f"{template_root}/{FLATID}.yml.template"
+    print(f"Reading template {file}")
+    with open(file, "r") as f:
+        return f.read()
+    print(f"Template {template_root}/flatpak.yml not found")
+    sys.exit(1)
+
+def main():
+    parser = argparse.ArgumentParser(description='Prepare flatpak release')
+    parser.add_argument('--version', help='Version of the release', required=True)
+    parser.add_argument('--linux-archive', help='Linux archive', required=True)
+    parser.add_argument('--flatpak-archive', help='Flatpak archive', required=True)
+    parser.add_argument('--output', help='Output file', default=f"{FLATID}.yml")
+    parser.add_argument('--template-root', help='Template root', default="flatpak")
+    args = parser.parse_args()
+
+    version = args.version
+    linux_archive = args.linux_archive
+    flatpak_archive = args.flatpak_archive
+    output = args.output
+    template_root = args.template_root
+
+    linux_sha256 = get_sha256sum(linux_archive)
+    flatpak_sha256 = get_sha256sum(flatpak_archive)
+
+    template = build_template(get_template(template_root), linux_sha256, flatpak_sha256, version)
+
+    print(f"Writing output to {output}")
+    with open(output, "w") as f:
+        f.write(template)
+
+if __name__ == "__main__":
+    main()

scripts/update-en-US-packs.sh

@@ -0,0 +1,2 @@
+
+sh ./scripts/copy-language-pack.sh en-US

src/browser/app/profile/better-fox.js

@@ -0,0 +1,225 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+//
+/* You may copy+paste this file and use it as it is.
+ *
+ * If you make changes to your about:config while the program is running, the
+ * changes will be overwritten by the user.js when the application restarts.
+ *
+ * To make lasting changes to preferences, you will have to edit the user.js.
+ */
+
+/****************************************************************************
+ * Betterfox                                                                *
+ * "Ad meliora"                                                             *
+ * version: 128                                                             *
+ * url: https://github.com/yokoffing/Betterfox                              *
+****************************************************************************/
+
+/****************************************************************************
+ * SECTION: FASTFOX                                                         *
+****************************************************************************/
+/** GENERAL ***/
+pref("content.notify.interval", 100000); // (.10s); alt=500000 (.50s)
+
+/** GFX ***/
+pref("gfx.canvas.accelerated.cache-items", 4096);
+pref("gfx.canvas.accelerated.cache-size", 512);
+pref("gfx.content.skia-font-cache-size", 20);
+
+/** DISK CACHE ***/
+pref("browser.cache.jsbc_compression_level", 3);
+
+/** MEDIA CACHE ***/
+pref("media.memory_cache_max_size", 65536);
+pref("media.cache_readahead_limit", 7200);
+pref("media.cache_resume_threshold", 3600);
+
+/** IMAGE CACHE ***/
+pref("image.mem.decode_bytes_at_a_time", 32768);
+
+/** NETWORK ***/
+pref("network.http.max-connections", 1800);
+pref("network.http.max-persistent-connections-per-server", 10);
+pref("network.http.max-urgent-start-excessive-connections-per-host", 5);
+pref("network.http.pacing.requests.enabled", false);
+pref("network.dnsCacheExpiration", 3600);
+pref("network.http.max-persistent-connections-per-proxy", 48); // default=32
+pref("network.websocket.max-connections", 400); // default=200
+pref("network.ssl_tokens_cache_capacity", 10240);
+
+/** MIXED CONTENT + CROSS-SITE ***/
+pref("pdfjs.enableScripting", false);
+pref("extensions.postDownloadThirdPartyPrompt", false);
+
+/** EXPERIMENTAL ***/
+pref("layout.css.grid-template-masonry-value.enabled", true);
+pref("dom.enable_web_task_scheduling", true);
+pref("dom.security.sanitizer.enabled", true);
+
+/****************************************************************************
+ * SECTION: SECUREFOX                                                       *
+****************************************************************************/
+/** TRACKING PROTECTION ***/
+pref("browser.contentblocking.category", "strict");
+pref("urlclassifier.trackingSkipURLs", "*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com");
+pref("urlclassifier.features.socialtracking.skipURLs", "*.instagram.com, *.twitter.com, *.twimg.com");
+pref("network.cookie.sameSite.noneRequiresSecure", true);
+pref("browser.download.start_downloads_in_tmp_dir", true);
+pref("browser.helperApps.deleteTempFileOnExit", true);
+pref("browser.uitour.enabled", false);
+
+/** OCSP & CERTS / HPKP ***/
+pref("security.OCSP.enabled", 0);
+pref("security.remote_settings.crlite_filters.enabled", true);
+pref("security.pki.crlite_mode", 2);
+
+/** SSL / TLS ***/
+pref("security.ssl.treat_unsafe_negotiation_as_broken", true);
+pref("browser.xul.error_pages.expert_bad_cert", true);
+pref("security.tls.enable_0rtt_data", false);
+
+/** DISK AVOIDANCE ***/
+pref("browser.privatebrowsing.forceMediaMemoryCache", true);
+pref("browser.sessionstore.interval", 60000);
+
+/** SHUTDOWN & SANITIZING ***/
+pref("privacy.history.custom", true);
+
+/** SEARCH / URL BAR ***/
+pref("browser.urlbar.trimHttps", true);
+pref("browser.search.separatePrivateDefault.ui.enabled", true);
+pref("browser.urlbar.update2.engineAliasRefresh", true);
+pref("browser.search.suggest.enabled", false);
+pref("browser.urlbar.quicksuggest.enabled", false);
+pref("browser.urlbar.suggest.quicksuggest.sponsored", false);
+pref("browser.urlbar.suggest.quicksuggest.nonsponsored", false);
+pref("browser.urlbar.groupLabels.enabled", false);
+pref("browser.formfill.enable", false);
+pref("security.insecure_connection_text.enabled", true);
+pref("security.insecure_connection_text.pbmode.enabled", true);
+pref("network.IDN_show_punycode", true);
+
+/** CONTAINERS ***/
+pref("privacy.userContext.ui.enabled", true);
+
+/** WEBRTC ***/
+pref("media.peerconnection.ice.proxy_only_if_behind_proxy", true);
+pref("media.peerconnection.ice.default_address_only", true);
+
+/** SAFE BROWSING ***/
+pref("browser.safebrowsing.downloads.remote.enabled", false);
+
+/** MOZILLA ***/
+pref("permissions.default.desktop-notification", 2);
+pref("permissions.default.geo", 2);
+pref("permissions.manager.defaultsUrl", "");
+pref("webchannel.allowObject.urlWhitelist", "");
+
+/** TELEMETRY ***/
+pref("datareporting.policy.dataSubmissionEnabled", false, locked);
+pref("datareporting.healthreport.uploadEnabled", false, locked);
+pref("toolkit.telemetry.unified", false, locked);
+pref("toolkit.telemetry.enabled", false, locked);
+pref("toolkit.telemetry.server", "data:,", locked);
+pref("toolkit.telemetry.archive.enabled", false, locked);
+pref("toolkit.telemetry.newProfilePing.enabled", false, locked);
+pref("toolkit.telemetry.shutdownPingSender.enabled", false, locked);
+pref("toolkit.telemetry.updatePing.enabled", false, locked);
+pref("toolkit.telemetry.bhrPing.enabled", false, locked);
+pref("toolkit.telemetry.firstShutdownPing.enabled", false, locked);
+pref("toolkit.telemetry.coverage.opt-out", true, locked);
+pref("toolkit.coverage.opt-out", true, locked);
+pref("toolkit.coverage.endpoint.base", "", locked);
+pref("browser.newtabpage.activity-stream.feeds.telemetry", false, locked);
+pref("browser.newtabpage.activity-stream.telemetry", false, locked);
+
+/** EXPERIMENTS ***/
+pref("app.shield.optoutstudies.enabled", false, locked);
+pref("app.normandy.enabled", false, locked);
+pref("app.normandy.api_url", "", locked);
+
+/** CRASH REPORTS ***/
+pref("breakpad.reportURL", "");
+pref("browser.tabs.crashReporting.sendReport", false);
+pref("browser.crashReports.unsubmittedCheck.autoSubmit2", false);
+
+/** DETECTION ***/
+pref("captivedetect.canonicalURL", "");
+pref("network.captive-portal-service.enabled", false);
+pref("network.connectivity-service.enabled", false);
+pref("dom.private-attribution.submission.enabled", false);
+
+/****************************************************************************
+ * SECTION: PESKYFOX                                                        *
+****************************************************************************/
+/** MOZILLA UI ***/
+pref("browser.privatebrowsing.vpnpromourl", "", locked);
+pref("extensions.getAddons.showPane", false);
+pref("extensions.htmlaboutaddons.recommendations.enabled", false);
+pref("browser.discovery.enabled", false);
+pref("browser.shell.checkDefaultBrowser", false);
+pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", false);
+pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", false);
+pref("browser.preferences.moreFromMozilla", false);
+pref("browser.tabs.tabmanager.enabled", false);
+pref("browser.aboutConfig.showWarning", false);
+pref("browser.aboutwelcome.enabled", false);
+
+/** THEME ADJUSTMENTS ***/
+pref("toolkit.legacyUserProfileCustomizations.stylesheets", true);
+pref("browser.compactmode.show", true);
+pref("browser.display.focus_ring_on_anything", true);
+pref("browser.display.focus_ring_style", 0);
+pref("browser.display.focus_ring_width", 0);
+pref("layout.css.prefers-color-scheme.content-override", 2);
+pref("browser.privateWindowSeparation.enabled", false); // WINDOWS
+
+/** FULLSCREEN NOTICE ***/
+pref("full-screen-api.transition-duration.enter", "0 0");
+pref("full-screen-api.transition-duration.leave", "0 0");
+pref("full-screen-api.warning.delay", -1);
+pref("full-screen-api.warning.timeout", 0);
+
+/** URL BAR ***/
+pref("browser.urlbar.suggest.calculator", true);
+pref("browser.urlbar.unitConversion.enabled", true);
+pref("browser.urlbar.trending.featureGate", false);
+
+/** NEW TAB PAGE ***/
+pref("browser.newtabpage.activity-stream.feeds.topsites", false);
+pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
+
+/** POCKET ***/
+pref("extensions.pocket.enabled", false);
+
+/** DOWNLOADS ***/
+pref("browser.download.always_ask_before_handling_new_types", true);
+pref("browser.download.manager.addToRecentDocs", false);
+
+/** PDF ***/
+pref("browser.download.open_pdf_attachments_inline", true);
+
+/** TAB BEHAVIOR ***/
+pref("browser.bookmarks.openInTabClosesMenu", false);
+pref("browser.menu.showViewImageInfo", true);
+pref("findbar.highlightAll", true);
+pref("layout.word_select.eat_space_to_next_word", false);
+
+/****************************************************************************
+ * START: MY OVERRIDES                                                      *
+****************************************************************************/
+// visit https://github.com/yokoffing/Betterfox/wiki/Common-Overrides
+// visit https://github.com/yokoffing/Betterfox/wiki/Optional-Hardening
+// Enter your personal overrides below this line:
+
+/****************************************************************************
+ * SECTION: SMOOTHFOX                                                       *
+****************************************************************************/
+// visit https://github.com/yokoffing/Betterfox/blob/main/Smoothfox.js
+// Enter your scrolling overrides below this line:
+
+/****************************************************************************
+ * END: BETTERFOX                                                           *
+****************************************************************************/

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

@@ -1,10 +1,10 @@
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 27c2d13fbd8599a131de6b70bba581d435198793..25aa7546d57e206b76838bc23b609f602af43a83 100644
+index b8aa71126c2bb4521caf25f9caf845a8a429dc64..59cdc2e9998e802d6c79ff967eaa30088a3b7a21 100644
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -3061,3 +3061,5 @@ pref("startup.homepage_override_nimbus_maxVersion", "");
- pref("toolkit.contentRelevancy.enabled", false);
- // Pref to enable the ingestion through the Rust component.
+@@ -3110,3 +3110,5 @@ pref("toolkit.contentRelevancy.enabled", false);
  pref("toolkit.contentRelevancy.ingestEnabled", false);
+ // Pref to enable extra logging for the content relevancy feature
+ pref("toolkit.contentRelevancy.log", false);
 +
 +#include zen-browser.js

src/browser/app/profile/zen-browser.js

@@ -2,45 +2,33 @@
 // License, v. 2.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.tabs.cardPreview.enabled", true);
-pref("browser.tabs.cardPreview.delayMs", 100);
-
-pref("browser.urlbar.suggest.calculator", true);
-
-#ifdef MOZ_UPDATE_CHANNEL
-pref("devtools.debugger.prompt-connection", false);
+#ifdef XP_UNIX
+  #ifndef XP_MACOSX
+    #define UNIX_BUT_NOT_MAC
+  #endif
 #endif
 
-// Mozilla Services
-pref('browser.privatebrowsing.vpnpromourl', '');
-pref("browser.vpn_promo.enabled", false);
-pref("browser.contentblocking.report.show_mobile_app", false);
-pref("browser.protections_panel.infoMessage.seen", true);
-pref('extensions.getAddons.showPane', false);
-pref('extensions.htmlaboutaddons.recommendations.enabled', false);
-pref('browser.discovery.enabled', false);
-pref('browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons', false);
-pref(
-  'browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features',
-  false
-);
-pref('browser.preferences.moreFromMozilla', false);
-pref('browser.aboutwelcome.enabled', true);
-pref("browser.aboutwelcome.showModal", false);
-pref('browser.translations.select.enable', true);
+pref("browser.tabs.cardPreview.enabled", true);
+pref("browser.tabs.hoverPreview.enabled", true);
+pref("browser.tabs.cardPreview.delayMs", 100);
+
+#ifdef MOZ_UPDATE_CHANNEL
+pref("devtools.debugger.prompt-connection", true);
+#endif
+
+// Dont download the multilingual dictionary
+pref("intl.multilingual.downloadEnabled", false);
 
 // Theme
 pref('toolkit.legacyUserProfileCustomizations.stylesheets', true);
 pref('browser.compactmode.show', true);
-pref('browser.display.focus_ring_on_anything', true);
-pref('browser.display.focus_ring_style', 0);
-pref('browser.display.focus_ring_width', 0);
-pref('browser.privateWindowSeparation.enabled', false); // WINDOWS
 
-// Cookie banner handling (reject by default)
+pref('browser.newtabpage.activity-stream.newtabWallpapers.enabled', true);
+pref('browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled', true);
+pref('browser.translations.newSettingsUI.enable', true);
 
-pref('cookiebanners.service.mode', 1);
-pref('cookiebanners.service.mode.privateBrowsing', 1);
+pref("browser.urlbar.trimHttps", true);
+pref("browser.urlbar.untrimOnUserInteraction.featureGate", true);
 
 // Url bar
 pref('browser.urlbar.unitConversion.enabled', true);
@@ -52,87 +40,53 @@ pref('browser.urlbar.clipboard.featureGate', true);
 // new tab page
 pref('browser.newtabpage.activity-stream.feeds.topsites', false);
 pref('browser.newtabpage.activity-stream.feeds.section.topstories', false);
-pref("browser.topsites.contile.enabled", false);
-
-// Pocket
-pref('extensions.pocket.enabled', false);
+pref("browser.topsites.contile.enabled", true);
 
 // Pdf
 pref('browser.download.open_pdf_attachments_inline', true);
 pref('pdfjs.enableHighlightEditor', true);
 pref('pdfjs.enableHighlightFloatingButton', true);
 
-// Tabs
-pref('browser.bookmarks.openInTabClosesMenu', false);
-pref('browser.menu.showViewImageInfo', true);
-pref('findbar.highlightAll', true);
-pref('layout.word_select.eat_space_to_next_word', false);
-pref('privacy.userContext.enabled', true);
-pref('privacy.userContext.ui.enabled', true);
-
-// UA
-pref('general.useragent.compatMode.firefox', true);
-
-
-// Tracking protection
-
-pref(
-  'urlclassifier.trackingSkipURLs',
-  '*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com'
-);
-pref(
-  'urlclassifier.features.socialtracking.skipURLs',
-  '*.instagram.com, *.twitter.com, *.twimg.com'
-);
-pref('network.cookie.sameSite.noneRequiresSecure', true);
-pref('browser.download.start_downloads_in_tmp_dir', true);
-pref('browser.helperApps.deleteTempFileOnExit', true);
-pref('privacy.globalprivacycontrol.enabled', true);
-
-pref('gfx.canvas.accelerated.cache-items', 4096);
-pref('gfx.canvas.accelerated.cache-size', 512);
-pref('gfx.content.skia-font-cache-size', 20);
-pref('gfx.webrender.all', true);
-pref('layout.css.backdrop-filter.enabled', true);
-
 pref("alerts.showFavicons", true);
 pref('browser.toolbars.bookmarks.visibility', 'never');
 
+// Enable Do Not Track and GPC by default.
+pref("privacy.donottrackheader.enabled", true);
+pref("privacy.globalprivacycontrol.enabled", true);
+// Disable more telemetry
+pref("toolkit.telemetry.enabled", false);
+pref("browser.ping-centre.telemetry", false);
+pref("browser.attribution.enabled", false);
+pref("toolkit.telemetry.pioneer-new-studies-available", false);
+
+pref("app.update.checkInstallTime.days", 2);
+
 // CUSTOM ZEN PREFS
 
 pref('zen.welcomeScreen.enabled', true);
 pref('zen.welcomeScreen.seen', false);
 pref('zen.tabs.vertical', true);
+pref('zen.tabs.vertical.right-side', false);
 pref('zen.theme.accent-color', "#aac7ff");
+pref('zen.theme.border-radius', 10); // In pixels
 pref('zen.theme.toolbar-themed', true);
+pref('zen.theme.pill-button', false);
 pref('zen.view.compact', false);
+pref('zen.view.compact.hide-toolbar', false);
 
-pref('browser.cache.jsbc_compression_level', 3);
+pref('zen.view.sidebar-expanded', false);
+pref('zen.view.sidebar-expanded.on-hover', false);
+pref('zen.view.sidebar-expanded.show-button', true);
+pref('zen.view.sidebar-expanded.max-width', 400);
 
-pref('media.memory_cache_max_size', 65536);
-pref('media.cache_readahead_limit', 7200);
-pref('media.cache_resume_threshold', 3600);
+pref('zen.view.sidebar-collapsed.hide-mute-button', true);
 
-pref('image.mem.decode_bytes_at_a_time', 32768);
-
-pref('network.buffer.cache.size', 262144);
-pref('network.buffer.cache.count', 128);
-pref('network.http.max-connections', 1800);
-pref('network.http.max-persistent-connections-per-server', 10);
-pref('network.http.max-urgent-start-excessive-connections-per-host', 5);
-pref('network.http.pacing.requests.enabled', false);
-pref('network.dnsCacheExpiration', 3600);
-pref('network.dns.max_high_priority_threads', 8);
-pref('network.ssl_tokens_cache_capacity', 10240);
-
-pref('network.dns.disablePrefetch', true);
-pref('network.prefetch-next', false);
-pref('network.predictor.enabled', false);
-
-pref('layout.css.grid-template-masonry-value.enabled', true);
-pref('dom.enable_web_task_scheduling', true);
-pref('layout.css.has-selector.enabled', true);
-pref('dom.security.sanitizer.enabled', true);
+pref('zen.keyboard.shortcuts.enabled', true);
+pref('zen.keyboard.shortcuts', ""); // Empty string means default shortcuts
+pref('zen.keyboard.shortcuts.disable-firefox', false);
+pref('zen.tabs.dim-pending', true);
+pref('zen.themes.updated-value-observer', false);
+pref('zen.themes.tabs.legacy-location', false);
 
 // Pref to enable the new profiles (TODO: Check this out!)
 //pref("browser.profiles.enabled", true);
@@ -140,10 +94,95 @@ pref('dom.security.sanitizer.enabled', true);
 // Zen Sidebar
 pref('zen.sidebar.data', "{\"data\":\n {\"p1\":{\n   \"url\":\"https://www.wikipedia.org/\"\n  },\n\"p2\":{\n   \"url\":\"https://m.twitter.com/\",\n\"ua\": true\n  },\n\"p3\": {\n   \"url\": \"https://www.youtube.com/\",\n\"ua\": true\n},\n\"p4\": {\n   \"url\": \"https://translate.google.com/\",\n\"ua\": true\n},\n\"p5\": {\n   \"url\": \"https://todoist.com/\",\n\"ua\": true\n}},\n\"index\":[\"p1\",\"p2\",\"p3\",\"p4\",\"p5\"]}");
 pref('zen.sidebar.enabled', true);
-pref('zen.sidebar.floating', true);
+pref('zen.sidebar.close-on-blur', true);
 
 // Zen Split View
 pref('zen.splitView.working', false);
 
 // Zen Workspaces
-pref('zen.workspaces.enabled', false);
+pref('zen.workspaces.enabled', true);
+
+// Zen Watermark
+pref('zen.watermark.enabled', true, sticky);
+
+// Smooth scrolling
+pref('apz.overscroll.enabled', true); // not DEFAULT on Linux
+pref('general.smoothScroll', true); // DEFAULT
+
+// Privacy
+pref('dom.private-attribution.submission.enabled', false);
+pref('dom.security.https_only_mode', true);
+
+pref('media.eme.enabled', true);
+
+pref("app.update.url.manual", "https://www.zen-browser.app/download");
+pref("app.update.url.details", "https://www.zen-browser.app/download");
+pref("app.releaseNotesURL", "https://www.zen-browser.app/release-notes");
+pref("app.releaseNotesURL.aboutDialog", "https://www.zen-browser.app/release-notes");
+
+// Enable importers for other browsers
+pref('browser.migrate.vivaldi.enabled', true);
+pref('browser.migrate.opera-gx.enabled', true);
+pref('browser.migrate.opera.enabled', true);
+
+// DNS
+// pref('network.proxy.type', 0);
+// pref('network.trr.mode', 5);
+
+pref('xpinstall.signatures.required', false);
+
+// Experimental Zen Features
+// Strategy to use for bytecode cache (Thanks https://github.com/gunir)
+pref('dom.script_loader.bytecode_cache.strategy', 2);
+
+// Font rendering, not for MacOSX and Linux
+#ifndef XP_UNIX
+#ifndef XP_MACOSX
+pref("gfx.font_rendering.directwrite.bold_simulation", 2);
+pref("gfx.font_rendering.cleartype_params.enhanced_contrast", 25);
+pref("gfx.font_rendering.cleartype_params.force_gdi_classic_for_families", "");
+#endif
+#endif
+
+// Enable GPU by default
+pref('gfx.webrender.all', true);
+pref('layers.acceleration.force-enabled', true);
+pref('media.ffmpeg.vaapi.enabled', true);
+
+#if defined(XP_WIN)
+  pref("dom.ipc.processPriorityManager.backgroundUsesEcoQoS", false);
+#endif
+
+// Enable experimental settings page (Usef for Zen Labs)
+pref('browser.preferences.experimental', true);
+
+#include better-fox.js
+
+// Betterfox overrides (Stay below the include directive)
+
+// Jang's personal speedups (Thanks to Jang for these!)
+
+// Prefetching:
+pref("network.dns.disablePrefetch", false);
+pref("network.prefetch-next", true);
+pref("network.predictor.enabled", true);
+pref("network.dns.disablePrefetchFromHTTPS", false);
+pref("network.predictor.enable-hover-on-ssl", true);
+pref("network.http.speculative-parallel-limit", 10);
+pref("network.http.rcwn.enabled", false);
+
+// Enable Browser Toolbox, Ctrl+Shift+Alt+I for debugging and modifying UI
+pref("devtools.debugger.remote-enabled", false);
+pref("devtools.chrome.enabled", true);
+
+// Disable firefox's revamp
+pref("sidebar.revamp", false, locked);
+pref("sidebar.verticalTabs", false, locked);
+
+// Better Windows theming
+pref("widget.non-native-theme.scrollbar.style", 2);
+pref("widget.non-native-theme.use-theme-accent", true);
+
+// Expose Letterboxing https://github.com/zen-browser/desktop/issues/475
+pref("privacy.resistFingerprinting.letterboxing", false);
+pref("privacy.resistFingerprinting.letterboxing.dimensions", "");

src/browser/app/splash-rc.patch

@@ -0,0 +1,14 @@
+diff --git a/browser/app/splash.rc b/browser/app/splash.rc
+index 259a8068c3aa256b8c50487a04f1844292b90b2e..8b9c792e1484bb801246b06b6ce43fb6d6271ee8 100644
+--- a/browser/app/splash.rc
++++ b/browser/app/splash.rc
+@@ -6,6 +6,9 @@
+ #include <windows.h>
+ #include "nsNativeAppSupportWin.h"
+ 
++#define MANIFEST_PATH "firefox.exe.manifest" 
++CREATEPROCESS_MANIFEST_RESOURCE_ID  RT_MANIFEST             MANIFEST_PATH
++
+ IDI_APPICON ICON FIREFOX_ICO
+ IDI_DOCUMENT ICON DOCUMENT_ICO
+ IDI_APPLICATION ICON FIREFOX_ICO

src/browser/base/content/ZenSidebarManager.mjs

@@ -1,483 +0,0 @@
-
-
-
-var gZenBrowserManagerSidebar = {
-  _sidebarElement: null,
-  _currentPanel: null,
-  _lastOpenedPanel: null,
-  _hasChangedConfig: true,
-  _splitterElement: null,
-  _hSplitterElement: null,
-  _isDragging: false,
-  contextTab: null,
-
-  DEFAULT_MOBILE_USER_AGENT: "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36 Edg/114.0.1823.79",
-  MAX_SIDEBAR_PANELS: 8, // +1 for the add panel button
-  MAX_RUNS: 3,
-
-  init() {
-    this.update();
-    this.close(); // avoid caching
-    this.listenForPrefChanges();
-  },
-
-  get sidebarData() {
-    let services = Services.prefs.getStringPref("zen.sidebar.data");
-    if (services === "") {
-      return {};
-    }
-    return JSON.parse(services);
-  },
-
-  listenForPrefChanges() {
-    Services.prefs.addObserver("zen.sidebar.data", this.handleEvent.bind(this));
-    Services.prefs.addObserver("zen.sidebar.enabled", this.handleEvent.bind(this));
-    Services.prefs.addObserver("zen.sidebar.floating", this.handleEvent.bind(this));
-
-    let sidebar = document.getElementById("zen-sidebar-web-panel");
-    this.splitterElement.addEventListener("mousedown", (function(event) {
-      let computedStyle = window.getComputedStyle(sidebar);
-      let maxWidth = parseInt(computedStyle.getPropertyValue("max-width").replace("px", ""));
-      let minWidth = parseInt(computedStyle.getPropertyValue("min-width").replace("px", ""));
-
-      if (!this._isDragging) { // Prevent multiple resizes
-        this._isDragging = true;
-        let sidebarWidth = sidebar.getBoundingClientRect().width;
-        let startX = event.clientX;
-        let startWidth = sidebarWidth;
-        let mouseMove = (function(e) {
-          let newWidth = startWidth + e.clientX - startX;
-          if (newWidth <= minWidth+10) {
-            newWidth = minWidth+1;
-          } else if (newWidth >= maxWidth-10) {
-            newWidth = maxWidth-1;
-          }
-          sidebar.style.width = `${newWidth}px`;
-        });
-        let mouseUp = (function() {
-          this.handleEvent();
-          this._isDragging = false;
-          document.removeEventListener("mousemove", mouseMove);
-          document.removeEventListener("mouseup", mouseUp);
-        }).bind(this);
-        document.addEventListener("mousemove", mouseMove);
-        document.addEventListener("mouseup", mouseUp);
-      }
-    }).bind(this));
-
-    this.hSplitterElement.addEventListener("mousedown", (function(event) {
-      let computedStyle = window.getComputedStyle(sidebar);
-      const parent = sidebar.parentElement;
-      // relative to avoid the top margin
-      // 20px is the padding
-      let parentRelativeHeight = parent.getBoundingClientRect().height - parent.getBoundingClientRect().top + 20;
-      let minHeight = parseInt(computedStyle.getPropertyValue("min-height").replace("px", ""));
-      if (!this._isDragging) { // Prevent multiple resizes
-        this._isDragging = true;
-        let sidebarHeight = sidebar.getBoundingClientRect().height;
-        let startY = event.clientY;
-        let startHeight = sidebarHeight;
-        let mouseMove = (function(e) {
-          let newHeight = startHeight + e.clientY - startY;
-          if (newHeight <= minHeight+10) {
-            newHeight = minHeight+1;
-          } else if (newHeight >= parentRelativeHeight) { // 10px is the padding
-            newHeight = parentRelativeHeight;
-          }
-          sidebar.style.height = `${newHeight}px`;
-        });
-        let mouseUp = (function() {
-          this.handleEvent();
-          this._isDragging = false;
-          document.removeEventListener("mousemove", mouseMove);
-          document.removeEventListener("mouseup", mouseUp);
-        }).bind(this);
-        document.addEventListener("mousemove", mouseMove);
-        document.addEventListener("mouseup", mouseUp);
-      }
-    }).bind(this));
-
-    this.handleEvent();
-  },
-
-  handleEvent() {
-    this._hasChangedConfig = true;
-    this.update();
-    this._hasChangedConfig = false;
-
-    const button = document.getElementById("zen-sidepanel-button");
-    if (Services.prefs.getBoolPref("zen.sidebar.enabled")) {
-      button.removeAttribute("hidden");
-    } else {
-      button.setAttribute("hidden", "true");
-      this._closeSidebarPanel();
-      return;
-    }
-  },
-
-  toggle() {
-    if (!this._currentPanel) {
-      this._currentPanel = this._lastOpenedPanel;
-      if (!this._currentPanel) {
-        let data = this.sidebarData;
-        this._currentPanel = data.index[0];
-      }
-      this.update();
-      return;
-    } 
-    // already open?
-    this.close();
-  },
-
-  update() {
-    this._updateWebPanels();
-    this._updateSidebarButton();
-    this._updateWebPanel();
-    this._updateButtons();
-  },
-
-  _updateSidebarButton() {
-    let button = document.getElementById("zen-sidepanel-button");
-    if (this._currentPanel) {
-      button.setAttribute("open", "true");
-    } else {
-      button.removeAttribute("open");
-    }
-  },
-
-  _updateWebPanels() {
-    if (Services.prefs.getBoolPref("zen.sidebar.enabled")) {
-      this.sidebarElement.removeAttribute("hidden");
-    } else {
-      this.sidebarElement.setAttribute("hidden", "true");
-      this._closeSidebarPanel();
-      return;
-    }
-
-    let data = this.sidebarData;
-    if (!data.data || !data.index) {
-      return;
-    }
-    this.sidebarElement.innerHTML = "";
-    for (let site of data.index) {
-      let panel = data.data[site];
-      if (!panel || !panel.url) {
-        continue;
-      }
-      let button = document.createXULElement("toolbarbutton");
-      button.classList.add("zen-sidebar-panel-button", "toolbarbutton-1", "chromeclass-toolbar-additional");
-      button.setAttribute("flex", "1");
-      button.setAttribute("zen-sidebar-id", site);
-      button.setAttribute("context", "zenWebPanelContextMenu");
-      this._getWebPanelIcon(panel.url, button);
-      button.addEventListener("click", this._handleClick.bind(this));
-      this.sidebarElement.appendChild(button);
-    }
-    const addButton = document.getElementById("zen-sidebar-add-panel-button");
-    if (data.index.length < this.MAX_SIDEBAR_PANELS) {
-      addButton.removeAttribute("hidden");
-    } else {
-      addButton.setAttribute("hidden", "true");
-    }
-  },
-
-  async _openAddPanelDialog() {
-    let dialogURL = "chrome://browser/content/places/zenNewWebPanel.xhtml";
-    let features = "centerscreen,chrome,modal,resizable=no";
-    let aParentWindow = Services.wm.getMostRecentWindow("navigator:browser");
-
-    if (aParentWindow?.gDialogBox) {
-      await aParentWindow.gDialogBox.open(dialogURL, {});
-    } else {
-      aParentWindow.openDialog(dialogURL, "", features, {});
-    }
-  },
-
-  _setPinnedToElements() {
-    let sidebar = document.getElementById("zen-sidebar-web-panel");
-    sidebar.setAttribute("pinned", "true");
-    document.getElementById("zen-sidebar-web-panel-pinned").setAttribute("pinned", "true");
-  },
-
-  _removePinnedFromElements() {
-    let sidebar = document.getElementById("zen-sidebar-web-panel");
-    sidebar.removeAttribute("pinned");
-    document.getElementById("zen-sidebar-web-panel-pinned").removeAttribute("pinned");
-  },
-
-  _openAndGetWebPanelWrapper() {
-    let sidebar = document.getElementById("zen-sidebar-web-panel");
-    sidebar.removeAttribute("hidden");
-    if (Services.prefs.getBoolPref("zen.sidebar.floating")) {
-      this._setPinnedToElements();
-    }
-    return sidebar;
-  },
-
-  _closeSidebarPanel() {
-    let sidebar = document.getElementById("zen-sidebar-web-panel");
-    sidebar.setAttribute("hidden", "true");
-    this._lastOpenedPanel = this._currentPanel;
-    this._currentPanel = null;
-  },
-
-  _handleClick(event) {
-    let target = event.target;
-    let panelId = target.getAttribute("zen-sidebar-id");
-    if (this._currentPanel === panelId) {
-      return;
-    }
-    this._currentPanel = panelId;
-    this._updateWebPanel();
-  },
-
-  _updateButtons() {
-    for (let button of this.sidebarElement.querySelectorAll(".zen-sidebar-panel-button")) {
-      if (button.getAttribute("zen-sidebar-id") === this._currentPanel) {
-        button.setAttribute("selected", "true");
-      } else {
-        button.removeAttribute("selected");
-      }
-    }
-  },
-
-  _hideAllWebPanels() {
-    let sidebar = this._openAndGetWebPanelWrapper();
-    for (let browser of sidebar.querySelectorAll("browser[zen-sidebar-id]")) {
-      browser.setAttribute("hidden", "true");
-      browser.docShellIsActive = false;
-    }
-  },
-
-  _updateWebPanel() {
-    this._updateButtons();
-    let sidebar = this._openAndGetWebPanelWrapper();
-    this._hideAllWebPanels();
-    if (!this._currentPanel) {
-      sidebar.setAttribute("hidden", "true");
-      return;
-    }
-    let existantWebview = this._getCurrentBrowser();
-    if (existantWebview) {
-      existantWebview.docShellIsActive = true;
-      existantWebview.removeAttribute("hidden");
-      document.getElementById("zen-sidebar-web-panel-title").textContent = existantWebview.contentTitle;
-      return;
-    }
-    let data = this._getWebPanelData(this._currentPanel);
-    let browser = this._createWebPanelBrowser(data);
-    let browserContainers = document.getElementById("zen-sidebar-web-panel-browser-containers");
-    browserContainers.appendChild(browser);
-    if (data.ua) {
-      browser.browsingContext.customUserAgent = this.DEFAULT_MOBILE_USER_AGENT;
-    }
-    browser.docShellIsActive = true;
-  },
-
-  _getWebPanelData(id) {
-    let data = this.sidebarData;
-    let panel = data.data[id];
-    if (!panel || !panel.url) {
-      return {};
-    }
-    return {
-      id: id,
-      ...panel,
-    };
-  },
-
-  _createWebPanelBrowser(data) {
-    const titleContainer = document.getElementById("zen-sidebar-web-panel-title");
-    titleContainer.textContent = "Loading...";
-    let browser = gBrowser.createBrowser({});
-    browser.setAttribute("disablefullscreen", "true");
-    browser.setAttribute("src", data.url);
-    browser.setAttribute("zen-sidebar-id", data.id);
-    browser.setAttribute("disableglobalhistory", "true");
-    browser.setAttribute("autoscroll", "false");
-    browser.setAttribute("autocompletepopup", "PopupAutoComplete");
-    browser.setAttribute("contextmenu", "contentAreaContextMenu");
-    browser.setAttribute("disablesecurity", "true");
-    browser.addEventListener("pagetitlechanged", (function(event) {
-      let browser = event.target;
-      let title = browser.contentTitle;
-      if (!title) {
-        return;
-      }
-      let id = browser.getAttribute("zen-sidebar-id");
-      if (id === this._currentPanel) {
-        titleContainer.textContent = title;
-      }
-    }).bind(this));
-    return browser;
-  },
-
-  _getWebPanelIcon(url, element) {
-    let { preferredURI } = Services.uriFixup.getFixupURIInfo(url);
-    element.setAttribute("image", `page-icon:${preferredURI.spec}`);
-    fetch(`https://s2.googleusercontent.com/s2/favicons?domain_url=${preferredURI.spec}`).then(async response => {
-      if (response.ok) {
-        let blob = await response.blob();
-        let reader = new FileReader();
-        reader.onload = function() {
-          element.setAttribute("image", reader.result);
-        };
-        reader.readAsDataURL(blob);
-      }
-    });
-  },
-
-  _getBrowserById(id) {
-    let sidebar = document.getElementById("zen-sidebar-web-panel");
-    return sidebar.querySelector(`browser[zen-sidebar-id="${id}"]`);
-  },
-
-  _getCurrentBrowser() {
-    return this._getBrowserById(this._currentPanel);
-  },
-
-  reload() {
-    let browser = this._getCurrentBrowser();
-    if (browser) {
-      browser.reload();
-    }
-  },
-
-  forward() {
-    let browser = this._getCurrentBrowser();
-    if (browser) {
-      browser.goForward();
-    }
-  },
-
-  back() {
-    let browser = this._getCurrentBrowser();
-    if (browser) {
-      browser.goBack();
-    }
-  },
-
-  home() {
-    let browser = this._getCurrentBrowser();
-    if (browser) {
-      browser.gotoIndex();
-    }
-  },
-
-  close() {
-    this._hideAllWebPanels();
-    this._closeSidebarPanel();
-    this._updateSidebarButton();
-  },
-
-  togglePinned(elem) {
-    let sidebar = document.getElementById("zen-sidebar-web-panel");
-    if (sidebar.hasAttribute("pinned")) {
-      this._removePinnedFromElements();
-    } else {
-      this._setPinnedToElements();
-    }
-    Services.prefs.setBoolPref("zen.sidebar.floating", sidebar.hasAttribute("pinned"));
-    this.update();
-  },
-
-  get sidebarElement() {
-    if (!this._sidebarElement) {
-      this._sidebarElement = document.getElementById("zen-sidebar-panels-sites");
-    }
-    return this._sidebarElement;
-  },
-
-  get splitterElement() {
-    if (!this._splitterElement) {
-      this._splitterElement = document.getElementById("zen-sidebar-web-panel-splitter");
-    }
-    return this._splitterElement;
-  },
-
-  get hSplitterElement() {
-    if (!this._hSplitterElement) {
-      this._hSplitterElement = document.getElementById("zen-sidebar-web-panel-hsplitter");
-    }
-    return this._hSplitterElement;
-  },
-
-  // Context menu
-
-  updateContextMenu(aPopupMenu) {
-    let panel =
-      aPopupMenu.triggerNode &&
-      (aPopupMenu.triggerNode || aPopupMenu.triggerNode.closest("toolbarbutton[zen-sidebar-id]"));
-    if (!panel) {
-      return;
-    }
-    let id = panel.getAttribute("zen-sidebar-id");
-    this.contextTab = id;
-    let data = this._getWebPanelData(id);
-    let browser = this._getBrowserById(id);
-    let isMuted = browser && browser.audioMuted;
-    let mutedContextItem = document.getElementById("context_zenToggleMuteWebPanel");
-    document.l10n.setAttributes(mutedContextItem, 
-      !isMuted ? "zen-web-side-panel-context-mute-panel" : "zen-web-side-panel-context-unmute-panel");
-    if (!isMuted) {
-      mutedContextItem.setAttribute("muted", "true");
-    } else {
-      mutedContextItem.removeAttribute("muted");
-    }
-    document.l10n.setAttributes(document.getElementById("context_zenToogleUAWebPanel"), 
-      data.ua ? "zen-web-side-panel-context-disable-ua" : "zen-web-side-panel-context-enable-ua");
-    if (!browser) {
-      document.getElementById("context_zenUnloadWebPanel").setAttribute("disabled", "true");
-    } else {
-      document.getElementById("context_zenUnloadWebPanel").removeAttribute("disabled");
-    }
-  },
-
-  contextOpenNewTab() {
-    let browser = this._getBrowserById(this.contextTab);
-    let data = this.sidebarData;
-    let panel = data.data[this.contextTab];
-    let url = (browser == null) ? panel.url : browser.currentURI.spec;
-    let tab = gBrowser.addTrustedTab(url);    
-    gBrowser.selectedTab = tab;
-    this.close();
-  },
-
-  contextToggleMuteAudio() {
-    let browser = this._getBrowserById(this.contextTab);
-    if (browser.audioMuted) {
-      browser.unmute();
-    } else {
-      browser.mute();
-    }
-  },
-
-  contextToggleUserAgent() {
-    let browser = this._getBrowserById(this.contextTab);
-    browser.browsingContext.customUserAgent = browser.browsingContext.customUserAgent ? null : this.DEFAULT_MOBILE_USER_AGENT;
-    let data = this.sidebarData;
-    data.data[this.contextTab].ua = !data.data[this.contextTab].ua;
-    Services.prefs.setStringPref("zen.sidebar.data", JSON.stringify(data));
-    browser.reload();
-  },
-
-  contextDelete() {
-    let data = this.sidebarData;
-    delete data.data[this.contextTab];
-    data.index = data.index.filter(id => id !== this.contextTab);
-    let browser = this._getBrowserById(this.contextTab);
-    if (browser) {
-      browser.remove();
-    }
-    this._closeSidebarPanel();
-    Services.prefs.setStringPref("zen.sidebar.data", JSON.stringify(data));
-  },
-
-  contextUnload() {
-    let browser = this._getBrowserById(this.contextTab);
-    browser.remove();
-    this._closeSidebarPanel();
-  },
-};
-
-gZenBrowserManagerSidebar.init();

src/browser/base/content/ZenStartup.mjs

@@ -0,0 +1,127 @@
+
+var ZenStartup = {
+  init() {
+    this._changeSidebarLocation();
+    this._zenInitBrowserLayout();
+    window.SessionStore.promiseInitialized.then(async () => {
+      this._focusSearchBar();
+    });
+  },
+
+  _zenInitBrowserLayout() {
+    if (this.__hasInitBrowserLayout) return;
+    this.__hasInitBrowserLayout = true;
+    this.openWatermark();
+    console.info("ZenThemeModifier: init browser layout");
+    const kNavbarItems = [
+      "nav-bar",
+      "PersonalToolbar"
+    ];
+    const kNewContainerId = "zen-appcontent-navbar-container";
+    let newContainer = document.getElementById(kNewContainerId);
+    for (let id of kNavbarItems) {
+      const node = document.getElementById(id);
+      console.assert(node, "Could not find node with id: " + id);
+      if (!node) continue;
+      newContainer.appendChild(node);
+    }
+
+    // Fix notification deck
+    document.getElementById("zen-appcontent-navbar-container")
+      .appendChild(document.getElementById("tab-notification-deck-template"));
+
+    gZenVerticalTabsManager.init();
+    gZenCompactModeManager.init();
+    gZenKeyboardShortcuts.init();
+
+    function throttle(f, delay) {
+      let timer = 0;
+      return function(...args) {
+          clearTimeout(timer);
+          timer = setTimeout(() => f.apply(this, args), delay);
+      }
+    }
+
+    new ResizeObserver(throttle(
+      this._updateTabsToolbar.bind(this), 1000
+    )).observe(document.getElementById("tabbrowser-tabs"));
+
+    this.closeWatermark();
+  },
+
+  _updateTabsToolbar() {
+    // Set tabs max-height to the "toolbar-items" height
+    const toolbarItems = document.getElementById("tabbrowser-tabs");
+    const tabs = document.getElementById("tabbrowser-arrowscrollbox");
+    tabs.style.maxHeight = '0px'; // reset to 0
+    const toolbarRect = toolbarItems.getBoundingClientRect();
+    // -5 for the controls padding
+    tabs.style.maxHeight = toolbarRect.height - 5 + "px";
+    console.info("ZenThemeModifier: set tabs max-height to", toolbarRect.height + "px");
+  },
+
+  openWatermark() {
+    if (!Services.prefs.getBoolPref("zen.watermark.enabled", false)) {
+      return;
+    }
+    const watermark = window.MozXULElement.parseXULToFragment(`
+      <html:div id="zen-watermark">
+        <image src="chrome://branding/content/about-logo.png" />
+      </html:div>
+    `);
+    document.body.appendChild(watermark);
+  },
+
+  closeWatermark() {
+    const watermark = document.getElementById("zen-watermark");
+    if (watermark) {
+      watermark.setAttribute("hidden", "true");
+    }
+  },
+
+  _changeSidebarLocation() {
+    const legacyLocation = Services.prefs.getBoolPref("zen.themes.tabs.legacy-location", false);
+    const kElementsToAppend = [
+      "sidebar-splitter",
+      "sidebar-box",
+    ];
+    if (legacyLocation) {
+      kElementsToAppend.push("navigator-toolbox");
+      window.document.documentElement.setAttribute("zen-sidebar-legacy", "true");
+    }
+    const wrapper = document.getElementById("zen-tabbox-wrapper");
+    const appWrapepr = document.getElementById("zen-sidebar-box-container");
+    for (let id of kElementsToAppend) {
+      const elem = document.getElementById(id);
+      if (elem) {
+        wrapper.prepend(elem);
+      }
+    }
+    appWrapepr.setAttribute("hidden", "true");
+
+    const browser = document.getElementById("browser")
+    const toolbox = document.getElementById("navigator-toolbox");
+    if (!legacyLocation) {
+      browser.prepend(toolbox);
+    }
+
+    // remove all styles except for the width, since we are xulstoring the complet style list
+    const width = toolbox.style.width;
+    toolbox.removeAttribute("style");
+    toolbox.style.width = width;
+
+    // Set a splitter to navigator-toolbox
+    const splitter = document.createXULElement("splitter");
+    splitter.setAttribute("id", "zen-sidebar-splitter");
+    splitter.setAttribute("orient", "horizontal");
+    splitter.setAttribute("resizebefore", "sibling");
+    splitter.setAttribute("resizeafter", "none");
+    toolbox.insertAdjacentElement("afterend", splitter);
+  },
+
+  _focusSearchBar() {
+    gURLBar.focus();
+  },
+};
+
+ZenStartup.init();

src/browser/base/content/ZenUIManager.mjs

@@ -0,0 +1,142 @@
+
+var gZenUIManager = {
+  openAndChangeToTab(url, options) {
+    if (window.ownerGlobal.parent) {
+      let tab = window.ownerGlobal.parent.gBrowser.addTrustedTab(url, options);
+      window.ownerGlobal.parent.gBrowser.selectedTab = tab;
+      return tab;
+    }
+    let tab = window.gBrowser.addTrustedTab(url, options);
+    window.gBrowser.selectedTab = tab;
+    return tab;
+  },
+
+  generateUuidv4() {
+    return "10000000-1000-4000-8000-100000000000".replace(/[018]/g, c =>
+      (+c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> +c / 4).toString(16)
+    );
+  },
+  
+  toogleBookmarksSidebar() {
+    const button = document.getElementById('zen-bookmark-button');
+    SidebarController.toggle('viewBookmarksSidebar', button);
+  },
+
+  createValidXULText(text) {
+    return text.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+  }
+};
+
+var gZenVerticalTabsManager = {
+  init() {
+    //Services.prefs.addObserver('zen.view.compact', this._updateEvent.bind(this));
+    Services.prefs.addObserver('zen.view.sidebar-expanded', this._updateEvent.bind(this));
+    Services.prefs.addObserver('zen.view.sidebar-expanded.max-width', this._updateEvent.bind(this));
+    Services.prefs.addObserver('zen.view.sidebar-expanded.on-hover', this._updateOnHoverVerticalTabs.bind(this));
+    this._updateMaxWidth();
+    this.initRightSideOrderContextMenu();
+    this._updateOnHoverVerticalTabs();
+  },
+
+  _updateOnHoverVerticalTabs() {
+    let onHover = Services.prefs.getBoolPref('zen.view.sidebar-expanded.on-hover');
+    let sidebar = document.getElementById('navigator-toolbox');
+    if (onHover) {
+      sidebar.setAttribute('zen-user-hover', 'true');
+    } else {
+      sidebar.removeAttribute('zen-user-hover');
+    }
+  },
+
+  initRightSideOrderContextMenu() {
+    const kConfigKey = 'zen.tabs.vertical.right-side';
+    const fragment = window.MozXULElement.parseXULToFragment(`
+      <menuitem id="zen-toolbar-context-tabs-right"
+                type="checkbox"
+                ${Services.prefs.getBoolPref(kConfigKey) ? 'checked="true"' : ''}
+                data-lazy-l10n-id="zen-toolbar-context-tabs-right"/>
+    `);
+    fragment.getElementById("zen-toolbar-context-tabs-right").addEventListener('click', () => {
+      let rightSide = Services.prefs.getBoolPref(kConfigKey);
+      Services.prefs.setBoolPref(kConfigKey, !rightSide);
+    });
+    document.getElementById('viewToolbarsMenuSeparator').before(fragment);
+  },
+
+  _updateEvent() {
+    this._updateMaxWidth();
+  },
+
+  _updateMaxWidth() {
+    let isCompactMode = Services.prefs.getBoolPref('zen.view.compact');
+    let expanded = this.expanded;
+    let maxWidth = Services.prefs.getIntPref('zen.view.sidebar-expanded.max-width');
+    let toolbox = document.getElementById('navigator-toolbox');
+    if (expanded && !isCompactMode) {
+      toolbox.style.maxWidth = `${maxWidth}px`;
+    } else {
+      toolbox.style.removeProperty('maxWidth');
+    }
+  },
+
+  get expanded() {
+    return Services.prefs.getBoolPref('zen.view.sidebar-expanded');
+  },
+
+  get expandButton() {
+    if (this._expandButton) {
+      return this._expandButton;
+    }
+    this._expandButton = document.getElementById('zen-expand-sidebar-button');
+    return this._expandButton;
+  },
+
+  //_updateExpandButton() {
+  //  let isCompactMode = Services.prefs.getBoolPref('zen.view.compact');
+  //  let button = this.expandButton;
+  //  let expanded = this.expanded;
+  //  if (expanded && !isCompactMode) {
+  //    button.setAttribute('open', 'true');
+  //  } else {
+  //    button.removeAttribute('open');
+  //  }
+  //},
+
+  toggleExpand() {
+    let expanded = !this.expanded;
+    Services.prefs.setBoolPref('zen.view.sidebar-expanded', expanded);
+    Services.prefs.setBoolPref('zen.view.sidebar-expanded.on-hover', false);
+  },
+};
+
+var gZenCompactModeManager = {
+  init() {
+    Services.prefs.addObserver('zen.view.compact', this._updateEvent.bind(this));
+  },
+
+  get prefefence() {
+    return Services.prefs.getBoolPref('zen.view.compact');
+  },
+
+  set preference(value) {
+    Services.prefs.setBoolPref('zen.view.compact', value);
+  },
+
+  _updateEvent() {
+    Services.prefs.setBoolPref('zen.view.sidebar-expanded.on-hover', false);
+  },
+
+  toggle() {
+    this.preference = !this.prefefence;
+  },
+
+  toggleSidebar() {
+    let sidebar = document.getElementById('navigator-toolbox');
+    sidebar.toggleAttribute('zen-user-show');
+  },
+
+  toggleToolbar() {
+    let toolbar = document.getElementById('zen-appcontent-navbar-container');
+    toolbar.toggleAttribute('zen-user-show');
+  }
+};

src/browser/base/content/ZenViewSplitter.mjs

@@ -1,272 +0,0 @@
-
-var gZenViewSplitter = {
-  /**
-   * [ 
-   *   {
-   *     tabs: [
-   *      tab1,
-   *      tab2,
-   *      tab3,
-   *     ],
-   *    gridType: "vsep" | "hsep" | "grid",
-   *   }
-   * ]
-   */
-  _data: [],
-  currentView: -1,
-
-  init() {
-    Services.prefs.setBoolPref("zen.splitView.working", false);
-    window.addEventListener("TabClose", this);
-    console.log("ZenViewSplitter initialized");
-  },
-
-  handleEvent(event) {
-    switch (event.type) {
-      case "TabClose":
-        this.onTabClose(event);
-    }
-  },
-
-  get tabBrowserPanel() {
-    if (!this._tabBrowserPanel) {
-      this._tabBrowserPanel = document.getElementById("tabbrowser-tabpanels");
-    }
-    return this._tabBrowserPanel;
-  },
-
-  onTabClose(event) {
-    const tab = event.target;
-    let index = this._data.findIndex((group) => group.tabs.includes(tab));
-    if (index < 0) {
-      return;
-    }
-    let dataTab = this._data[index].tabs;
-    dataTab.splice(dataTab.indexOf(tab), 1);
-    tab._zenSplitted = false;
-    tab.linkedBrowser.zenModeActive = false;
-    let container = tab.linkedBrowser.closest(".browserSidebarContainer");
-    container.removeAttribute("zen-split");
-    if (!event.forUnsplit) {
-      tab.linkedBrowser.docShellIsActive = false;
-      container.style.display = "none";         
-    } else {
-      container.style.gridArea = "1 / 1";
-    }
-    if (dataTab.length < 2) {
-      this._data.splice(index, 1);
-      if (this.currentView == index) {
-        console.assert(dataTab.length == 1, "Data tab length is not 1");      
-        this.currentView = -1;
-        this.tabBrowserPanel.removeAttribute("zen-split-view");
-        this.tabBrowserPanel.style.gridTemplateAreas = "";
-        this.tabBrowserPanel.style.gridGap = "0px";     
-        Services.prefs.setBoolPref("zen.splitView.working", false);
-        for (const tab of dataTab) {
-          let container = tab.linkedBrowser.closest(".browserSidebarContainer");
-          container.removeAttribute("zen-split");
-          container.style.gridArea = "1 / 1";
-          tab._zenSplitted = false;               
-        }     
-      }
-      return;
-    }
-    let lastTab = dataTab[dataTab.length - 1];
-    this._showSplitView(lastTab);
-  },
-
-  onLocationChange(browser) {
-    let tab = gBrowser.getTabForBrowser(browser);
-    this.updateSplitViewButton(!(tab && tab._zenSplitted));
-    if (!tab) {
-      return;
-    }
-
-    this._showSplitView(tab);
-  },
-
-  splitTabs(tabs) {
-    if (tabs.length < 2) {
-      return;
-    }
-    this._data.push({
-      tabs,
-      gridType: "grid",
-    });
-    gBrowser.selectedTab = tabs[0];
-    this._showSplitView(tabs[0]);
-  },
-
-  _showSplitView(tab) {
-    const splitData = this._data.find((group) => group.tabs.includes(tab));
-    function modifyDecks(tabs, add) {
-      for (const tab of tabs) {
-        tab.linkedBrowser.zenModeActive = add;
-        tab.linkedBrowser.docShellIsActive = add;
-        let browser = tab.linkedBrowser.closest(".browserSidebarContainer");
-        if (add) {
-          browser.setAttribute("zen-split", "true");
-          continue;
-        }
-        browser.removeAttribute("zen-split");
-      }
-    }
-    const handleClick = (tab) => {
-      return ((event) => {
-        gBrowser.selectedTab = tab;
-      })
-    };    
-    if (!splitData || (this.currentView >= 0 && !this._data[this.currentView].tabs.includes(tab))) {
-      this.updateSplitViewButton(true);
-      if (this.currentView < 0) {
-        return;
-      }
-      for (const tab of this._data[this.currentView].tabs) {
-        //tab._zenSplitted = false;
-        let container = tab.linkedBrowser.closest(".browserSidebarContainer");
-        container.removeAttribute("zen-split-active");
-        container.classList.remove("deck-selected");
-        console.assert(container, "No container found for tab");
-        container.removeEventListener("click", handleClick(tab));
-        container.style.gridArea = "";
-      }
-      this.tabBrowserPanel.removeAttribute("zen-split-view");
-      this.tabBrowserPanel.style.gridTemplateAreas = "";
-      Services.prefs.setBoolPref("zen.splitView.working", false);
-      modifyDecks(this._data[this.currentView].tabs, false);
-      this.currentView = -1;
-      if (!splitData) {
-        return;
-      }
-    }
-    this.tabBrowserPanel.setAttribute("zen-split-view", "true");
-    Services.prefs.setBoolPref("zen.splitView.working", true);
-    this.currentView = this._data.indexOf(splitData);
-    let gridType = splitData.gridType || "grid"; // TODO: let user decide the grid type
-    let i = 0;
-    // 2 rows, infinite columns
-    let currentRowGridArea = ["", ""/* first row, second row */];
-    let numberOfRows = 0;
-    for (const _tab of splitData.tabs) {
-      _tab._zenSplitted = true;
-      let container = _tab.linkedBrowser.closest(".browserSidebarContainer");
-      console.assert(container, "No container found for tab");
-      container.removeAttribute("zen-split-active");
-      if (_tab == tab) {
-        container.setAttribute("zen-split-active", "true");
-      }
-      container.setAttribute("zen-split-anim", "true");
-      container.addEventListener("click", handleClick(_tab));
-      // Set the grid type for the container. If the grid type is not "grid", then set the grid type contain 
-      // each column or row. If it's "grid", then try to create
-      if (gridType == "grid") {
-        // Each 2 tabs, create a new row
-        if (i % 2 == 0) {
-          currentRowGridArea[0] += ` tab${i + 1}`;
-        } else {
-          currentRowGridArea[1] += ` tab${i + 1}`;
-          numberOfRows++;
-        }
-        container.style.gridArea = `tab${i + 1}`;
-      }  
-      i++;
-    }
-    if (gridType == "grid") {
-      if ((numberOfRows < splitData.tabs.length / 2) && (splitData.tabs.length != 2)) { 
-        // Make the last tab occupy the last row
-        currentRowGridArea[1] += ` tab${i}`;
-      }
-      if (gridType == "grid" && (splitData.tabs.length === 2)) {
-        currentRowGridArea[0]     = `tab1 tab2`;
-        currentRowGridArea[1] = "";
-      }     
-      this.tabBrowserPanel.style.gridTemplateAreas = `'${currentRowGridArea[0]}'`;
-      if (currentRowGridArea[1] != "") {
-        this.tabBrowserPanel.style.gridTemplateAreas += `     '${currentRowGridArea[1]}'`;
-      }
-    } else if (gridType == "vsep") {
-      this.tabBrowserPanel.style.gridTemplateAreas = `'${splitData.tabs.map((_, i) => `tab${i + 1}`).join(" ")}'`;
-    } else if (gridType == "hsep") {
-      this.tabBrowserPanel.style.gridTemplateAreas = `${splitData.tabs.map((_, i) => `'tab${i + 1}'`).join(" ")}`;
-    }
-    modifyDecks(splitData.tabs, true);
-    this.updateSplitViewButton(false);
-  },
-
-  contextSplitTabs() {
-    let tabs = gBrowser.selectedTabs;
-    this.splitTabs(tabs);
-  },
-
-  contextCanSplitTabs() {
-    if (gBrowser.selectedTabs.length < 2) {
-      return false;
-    }
-    // Check if any tab is already split
-    for (const tab of gBrowser.selectedTabs) {
-      if (tab._zenSplitted) {
-        return false;
-      }
-    }
-    return true;
-  },
-
-  // Panel and url button
-
-  updateSplitViewButton(hidden) {
-    let button = document.getElementById("zen-split-views-box");
-    if (hidden) {
-      button.setAttribute("hidden", "true");
-      return;
-    }
-    button.removeAttribute("hidden");
-  },
-
-  get _modifierElement() {
-    if (!this.__modifierElement) {
-      let wrapper = document.getElementById("template-zen-split-view-modifier");
-      const panel = wrapper.content.firstElementChild;
-      wrapper.replaceWith(wrapper.content);
-      this.__modifierElement = panel;
-    }
-    return this.__modifierElement;
-  },
-
-  async openSplitViewPanel(event) {
-    let panel = this._modifierElement;
-    let target = event.target.parentNode;
-    for (const gridType of ["hsep", "vsep", "grid", "unsplit"]) {
-      let selector = panel.querySelector(`.zen-split-view-modifier-preview.${gridType}`);
-      selector.classList.remove("active");
-      if (this.currentView >= 0 && this._data[this.currentView].gridType == gridType) {
-        selector.classList.add("active");
-      }
-      if (this.__hasSetMenuListener) {
-        continue;
-      }
-      selector.addEventListener("click", ((gridType) => {
-        if (gridType === "unsplit") {
-          let currentTab = gBrowser.selectedTab;
-          let tabs = this._data[this.currentView].tabs;
-          for (const tab of tabs) {
-            this.onTabClose({ target: tab, forUnsplit: true });
-          }
-          gBrowser.selectedTab = currentTab;
-          panel.hidePopup();
-          this.updateSplitViewButton(true);
-          return;
-        }
-        this._data[this.currentView].gridType = gridType;
-        this._showSplitView(gBrowser.selectedTab);
-        panel.hidePopup();
-      }).bind(this, gridType));
-    } 
-    this.__hasSetMenuListener = true;
-    PanelMultiView.openPopup(panel, target, {
-      position: "bottomright topright",
-      triggerEvent: event,
-    }).catch(console.error);
-  },
-};
-
-gZenViewSplitter.init();

src/browser/base/content/ZenWorkspaces.mjs

@@ -1,63 +0,0 @@
-
-var ZenWorkspaces = {
-  async init() {
-    await this.initializeWorkspaces();
-    console.log("ZenWorkspaces initialized");
-  },
-
-  get workspaceEnabled() {
-    return Services.prefs.getBoolPref("zen.workspaces.enabled", false);
-  },
-
-  // Wrorkspaces saving/loading
-  get _storeFile() {
-    return PathUtils.join(
-      PathUtils.profileDir,
-      "zen-workspaces",
-      "Workspaces.json",
-    );
-  },
-
-  async initializeWorkspaces() {
-    let file = new FileUtils.File(this._storeFile);
-    if (!file.exists()) {
-      await IOUtils.writeJSON(this._storeFile, {});
-    }
-  },
-
-  async saveWorkspace(workspaceData, windowID) {
-    let json = await IOUtils.readJSON(this._storeFile);
-    json[windowID] = workspaceData;
-    await IOUtils.writeJSON(this._storeFile, json);
-  },
-
-  async loadWorkspace(windowID) {
-    let json = await IOUtils.readJSON(this._storeFile);
-    return json[windowID];
-  },
-
-  async removeWorkspace(windowID) {
-    let json = await IOUtils.readJSON(this._storeFile);
-    delete json[windowID];
-    await IOUtils.writeJSON(this._storeFile, json);
-  },
-
-  async getWorkspaces() {
-    let json = await IOUtils.readJSON(this._storeFile);
-    return json;
-  },
-
-  async getWorkspace(windowID) {
-    let json = await IOUtils.readJSON(this._storeFile);
-    return json[windowID];
-  },
-
-  // Workspaces management
-
-  async saveCurrentWorkspace(windowID) {
-    let workspaceData = this._createWorkspaceData(windowID);
-    await this.saveWorkspace(workspaceData, windowID);
-  },
-};
-
-ZenWorkspaces.init();

src/browser/base/content/appmenu-viewcache-inc-xhtml.patch

@@ -1,11 +0,0 @@
-diff --git a/browser/base/content/appmenu-viewcache.inc.xhtml b/browser/base/content/appmenu-viewcache.inc.xhtml
-index 07b1765f18236835363fb74c898d3a690659cc9b..7b58cbb5de147ed29fbc48c0093c731fe5cca90b 100644
---- a/browser/base/content/appmenu-viewcache.inc.xhtml
-+++ b/browser/base/content/appmenu-viewcache.inc.xhtml
-@@ -765,5 +765,6 @@
-     </vbox>
-   </panelview>
- 
-+#include zen-panels-ui.inc.xhtml
- #include ../../components/reportbrokensite/content/reportBrokenSitePanel.inc.xhtml
- </html:template>

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

@@ -1,12 +1,10 @@
 diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
-index b0308911446dd6fc549401371a85faa6341f8338..3942a0b45308b110685c34e8a9367d7c5d40d8c4 100644
+index 16559b2c0e3aef391b43e09281aee24007feb0bd..2579cea92a55fabb73fdd130c3706af08c3fd849 100644
 --- a/browser/base/content/browser-box.inc.xhtml
 +++ b/browser/base/content/browser-box.inc.xhtml
-@@ -18,12 +18,18 @@
-     <browser id="sidebar" autoscroll="false" disablehistory="true" disablefullscreen="true" tooltip="aHTMLTooltip"/>
+@@ -21,11 +21,15 @@
    </vbox>
    <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
-+  <vbox id="browser">
    <vbox id="appcontent" flex="1">
 +    <html:div id="zen-appcontent-navbar-container"></html:div>
      <!-- gNotificationBox will be added here lazily. -->
@@ -18,6 +16,5 @@ index b0308911446dd6fc549401371a85faa6341f8338..3942a0b45308b110685c34e8a9367d7c
                    flex="1" selectedIndex="0"/>
      </tabbox>
 +  </hbox>
-+  </vbox>
    </vbox>
  </hbox>

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

@@ -1,97 +0,0 @@
-diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
-index 6e776a9ce7c525e510b6466065daf755b21567a4..8668b27ec2126ed772a11aa77809b6f22ceab7e2 100644
---- a/browser/base/content/browser.css
-+++ b/browser/base/content/browser.css
-@@ -2,6 +2,8 @@
-  * License, v. 2.0. If a copy of the MPL was not distributed with this
-  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
-+@import url("chrome://global/skin/zen-global-shared.css");
-+
- @namespace html url("http://www.w3.org/1999/xhtml");
- 
- :root,
-@@ -157,8 +159,6 @@ panelview:not([visible]) {
-   flex: 100 100;
-   max-width: 225px;
-   min-width: var(--tab-min-width);
--  transition: min-width 100ms ease-out,
--              max-width 100ms ease-out;
- }
- 
- :root[uidensity=touch] .tabbrowser-tab:not([pinned]) {
-@@ -647,12 +647,12 @@ toolbar:not(#TabsToolbar) > #personal-bookmarks {
-   margin-inline-start: 0;
- }
- 
--#urlbar-input-container[pageproxystate=invalid] > #page-action-buttons > .urlbar-page-action,
-+#urlbar-input-container[pageproxystate=invalid] > #page-action-buttons > .urlbar-page-action:not(#zen-split-views-box),
- #identity-box.chromeUI ~ #page-action-buttons > .urlbar-page-action:not(#star-button-box),
- #urlbar[usertyping] > #urlbar-input-container > #page-action-buttons > #urlbar-zoom-button,
- #urlbar:not([usertyping]) > #urlbar-input-container > #urlbar-go-button,
- #urlbar:not([focused]) > #urlbar-input-container > #urlbar-go-button {
--  display: none;
-+  display: none !important;
- }
- 
- #nav-bar:not([keyNav=true]) #identity-box,
-@@ -1237,13 +1237,13 @@ printpreview-pagination:focus-within,
- 
- 
- #sidebar-box {
--  min-width: 14em;
-+  min-width: 323px;
-   max-width: 36em;
--  width: 18em;
-+  width: 393px;
- }
- 
- /* WebExtension Sidebars */
--#sidebar-box[sidebarcommand$="-sidebar-action"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon {
-+#sidebar-box[sidebarcommand$="-sidebar-action"] #sidebar-header > #sidebar-switcher-target > #sidebar-icon {
-   list-style-image: var(--webextension-menuitem-image, inherit);
-   -moz-context-properties: fill;
-   fill: currentColor;
-@@ -1444,3 +1444,42 @@ toolbar[keyNav=true]:not([collapsed=true], [customizing=true]) toolbartabstop {
- /**
-  * End Dialogs
-  */
-+
-+/**
-+ *
-+ * ZEN OVERRIDES
-+ */
-+
-+.content-prompt-dialog > .dialogOverlay {
-+  align-content: start;
-+}
-+
-+.dialogBox:not(.spotlightBox) {
-+  border: 1px solid var(--zen-dialog-border-color);
-+}
-+
-+#window-modal-dialog:not([zen-dialog-welcome-element="true"]) .dialogBox:not(.spotlightBox) {
-+  transform: translateY(-9px);
-+}
-+
-+#window-modal-dialog[zen-dialog-welcome-element="true"] .dialogBox:not(.spotlightBox) {
-+  margin: 0 !important;
-+}
-+
-+#window-modal-dialog[zen-dialog-welcome-element="true"], 
-+#window-modal-dialog[zen-dialog-welcome-element="true"] .dialogOverlay,
-+#window-modal-dialog[zen-dialog-welcome-element="true"] .dialogFrame,
-+#window-modal-dialog[zen-dialog-welcome-element="true"] .dialogBox {
-+  width: 100% !important;
-+  height: 100% !important;
-+  max-height: none !important;
-+  max-width: none !important;
-+}
-+
-+#window-modal-dialog[zen-dialog-welcome-element="true"] {
-+  --zen-welcome-dialog-space: 7px;
-+  margin: 0 auto !important;
-+  max-width: calc(100% - calc(var(--zen-welcome-dialog-space) * 2)) !important;
-+  max-height: calc(100% - calc(var(--zen-welcome-dialog-space) * 2)) !important;
-+  margin-top: var(--zen-welcome-dialog-space) !important;
-+}

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

@@ -1,33 +1,15 @@
 diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
-index 0717ce21386b73fc3399c97b34c6892a674cca77..f20e8a43fdd1d885f917948a26f1c3a1bd917707 100644
+index f8d49ac2a3a62f389ea44b07a26fcb102abc0b24..c29415e10c776ebc435f33e55f8afb71f0dcf22a 100644
 --- a/browser/base/content/browser-init.js
 +++ b/browser/base/content/browser-init.js
-@@ -230,6 +230,12 @@ var gBrowserInit = {
-       gURLBar.readOnly = true;
+@@ -237,6 +237,10 @@ var gBrowserInit = {
+     gPrivateBrowsingUI.init();
+     BrowserSearch.init();
+     BrowserPageActions.init();
++
++    Services.scriptloader.loadSubScript("chrome://browser/content/ZenStartup.mjs", window);
++    Services.scriptloader.loadSubScript("chrome://browser/content/zenThemeModifier.js", window);
++
+     if (gToolbarKeyNavEnabled) {
+       ToolbarKeyboardNavigator.init();
      }
- 
-+    Services.scriptloader.loadSubScript("chrome://browser/content/zenThemeModifier.js", this);
-+
-+    // ZEN: Propagate the current profile used to the browser UI, such as 
-+    // showing the avatar and profile info to the side bar
-+    zenUpdateBrowserProfiles();
-+
-     // Misc. inits.
-     gUIDensity.init();
-     TabletModeUpdater.init();
-@@ -1105,3 +1111,15 @@ var gBrowserInit = {
- };
- 
- gBrowserInit.idleTasksFinishedPromise = gBrowserInit.idleTasksFinished.promise;
-+
-+function zenUpdateBrowserProfiles() {
-+  const mainWindowEl = document.documentElement;
-+  // Dont override the sync avatar if it's already set
-+  if (mainWindowEl.style.hasOwnProperty("--avatar-image-url")) {
-+    return;
-+  }
-+  let profile = ProfileService.currentProfile;
-+  if (!profile || profile.zenAvatarPath == "") return;
-+  // TODO: actually use profile data to generate the avatar, instead of just using the name
-+  mainWindowEl.style.setProperty("--avatar-image-url", `url(${profile.zenAvatarPath})`);
-+} 

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

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index 5f41ca778131eedfd32043dc27d6528be978c4fb..086b01e8fdf80dd333d80b9eede190cdb5315b70 100644
+index b18f371a47fec53882c3dfb68e34d1a474eaf446..2c183d7e7fc65e00403f5e40e7859b915a3ea700 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
 @@ -630,6 +630,15 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -18,16 +18,17 @@ index 5f41ca778131eedfd32043dc27d6528be978c4fb..086b01e8fdf80dd333d80b9eede190cd
  customElements.setElementCreationCallback("screenshots-buttons", () => {
    Services.scriptloader.loadSubScript(
      "chrome://browser/content/screenshots/screenshots-buttons.js",
-@@ -3668,6 +3677,8 @@ var XULBrowserWindow = {
+@@ -3679,6 +3688,9 @@ var XULBrowserWindow = {
      AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
      TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
  
 +    gZenViewSplitter.onLocationChange(gBrowser.selectedBrowser);
++    ZenWorkspaces.onLocationChange(gBrowser.selectedBrowser);
 +
      PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
  
      if (!gMultiProcessBrowser) {
-@@ -4982,7 +4993,7 @@ function setToolbarVisibility(
+@@ -5001,7 +5013,7 @@ function setToolbarVisibility(
        );
      }
  
@@ -36,7 +37,7 @@ index 5f41ca778131eedfd32043dc27d6528be978c4fb..086b01e8fdf80dd333d80b9eede190cd
      switch (isVisible) {
        case true:
        case "always":
-@@ -7813,6 +7824,12 @@ var gDialogBox = {
+@@ -7832,6 +7844,12 @@ var gDialogBox = {
      parentElement.showModal();
      this._didOpenHTMLDialog = true;
  

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

@@ -1,32 +0,0 @@
-diff --git a/browser/base/content/browser-siteProtections.js b/browser/base/content/browser-siteProtections.js
-index 5364aa74cd938141e85e3a3333e8d1fa58ea3ae4..5cd1748a883b19caa2977c1047d51b9551686bf4 100644
---- a/browser/base/content/browser-siteProtections.js
-+++ b/browser/base/content/browser-siteProtections.js
-@@ -1904,9 +1904,14 @@ var gProtectionsHandler = {
-       // the information contained there would mostly be broken and/or
-       // irrelevant anyway.
-       this._trackingProtectionIconContainer.hidden = true;
-+      // ZEN: We make a clear distinction between native UI and websites for security reasons.
-+      //   we can remove the separator for websites that dont need it, like "about:*" pages, where
-+      //   they are safe to use.
-+      this._nativeSeparatorForWebsitesContainer.hidden = true;
-       return;
-     }
-     this._trackingProtectionIconContainer.hidden = false;
-+    this._nativeSeparatorForWebsitesContainer.hidden = false;
- 
-     // Check whether the user has added an exception for this site.
-     this.hasException = ContentBlockingAllowList.includes(
-@@ -2882,4 +2887,12 @@ var gProtectionsHandler = {
- 
-     return messageEl;
-   },
-+
-+  get _nativeSeparatorForWebsitesContainer() {
-+    delete this._nativeSeparatorForWebsitesContainer;
-+    return (this._nativeSeparatorForWebsitesContainer = document.getElementById(
-+      "zen-website-and-native-separator"
-+    ));
-+  },
-+
- };

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

@@ -1,17 +1,17 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index aec0983a6704f09300da9a3a9ab76e627695b708..4228c96f59d6054c19c95686cafa979594e7da1f 100644
+index 481ebbee437250c71e9bd10c4fb6fc0c31314925..3bb046a4635fad831cc447e29516ee5ed407a3f2 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
-@@ -140,6 +140,8 @@
+@@ -138,6 +138,8 @@
    window.addEventListener("DOMContentLoaded",
      gBrowserInit.onDOMContentLoaded.bind(gBrowserInit), { once: true });
  </script>
 +#include zen-locales.inc.xhtml
-+#include zen-scripts.inc.xhtml
++#include zen-assets.inc.xhtml
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -161,9 +163,12 @@
+@@ -159,9 +161,12 @@
      </vbox>
    </html:template>
  

src/browser/base/content/global-scripts-inc.patch

@@ -1,11 +0,0 @@
-diff --git a/browser/base/content/global-scripts.inc b/browser/base/content/global-scripts.inc
-index f5f43b8f9509c37bf217b3ed1c6c562be85430e0..c8ab55760f817aa14e3db15f6b5556118e65d218 100644
---- a/browser/base/content/global-scripts.inc
-+++ b/browser/base/content/global-scripts.inc
-@@ -22,4 +22,6 @@ if (AppConstants.platform == "macosx") {
-   Services.scriptloader.loadSubScript("chrome://global/content/macWindowMenu.js", this);
- }
- 
-+Services.scriptloader.loadSubScript("chrome://browser/content/zen-browser-places.js", this);
-+
- </script>