Merge branch 'main' of https://github.com/zen-browser/core

Align Theme Store layout

.gitattributes

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

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,4 +1,4 @@
-name: Bug Report Or Feature Request
+name: Bug Report
 description: File a bug report
 body:
   - type: markdown

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -3,30 +3,16 @@ description: File a feature request
 labels: 
   - "kind: enhancement"
 body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for filing a feature request.
   - type: textarea
-    id: what-happened
+    id: feature-description
     attributes:
       label: What feature would you like to see?
       description: Please describe the feature you would like to see.
-      placeholder: Tell us what you would like to see!
-    validations:
-      required: true
-  - type: dropdown
-    id: platform
-    attributes:
-      label: What platform are you seeing the problem on?
-      options:
-        - Linux
-        - macOS
-        - Windows
+      placeholder: I would like to see…
     validations:
       required: true
   - type: textarea
-    id: logs
+    id: other-details
     attributes:
-      label: Additional context
-      description: Add any other context about the feature request here.
+      label: Other details
+      placeholder: Add any additional details about the feature request here.

.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
 
@@ -87,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
@@ -125,20 +130,22 @@ jobs:
 
 
   source:
+    if: false
     permissions:
       contents: write
     runs-on: ubuntu-latest
     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: |
@@ -185,6 +192,7 @@ jobs:
   #  needs: [build-data]
   #  permissions:
   #    contents: write
+  #  secrets: inherit
   #  with:
   #    build-version: ${{ needs.build-data.outputs.version }}
   #    generate-gpo: true
@@ -195,6 +203,7 @@ jobs:
   #  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 }}
@@ -205,6 +214,7 @@ jobs:
     uses: ./.github/workflows/windows-alpha-build.yml
     permissions:
       contents: write
+    secrets: inherit
     needs: [build-data]
     with:
       build-version: ${{ needs.build-data.outputs.version }}
@@ -215,6 +225,7 @@ jobs:
     uses: ./.github/workflows/linux-alpha-build.yml
     permissions:
       contents: write
+    secrets: inherit
     needs: [build-data] 
     with:
       build-version: ${{ needs.build-data.outputs.version }}
@@ -224,6 +235,7 @@ jobs:
     uses: ./.github/workflows/macos-alpha-build.yml
     permissions:
       contents: write
+    secrets: inherit
     needs: [build-data]
     with:
       build-version: ${{ needs.build-data.outputs.version }}
@@ -244,12 +256,15 @@ jobs:
           node-version: 20
 
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
 
       - name: Install dependencies
         run: |
           npm install -g pnpm
           sudo apt-get update
-          sudo apt-get -y install libfuse2
+          sudo apt-get -y install libfuse2 desktop-file-utils
 
       - name: Download linux build
         uses: actions/download-artifact@v4
@@ -266,33 +281,43 @@ jobs:
           APPDIR=AppDir
           tar -xvf *.tar.* && rm -rf *.tar.*
           mv zen/* $APPDIR/
-          wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+          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 gzip "$APPDIR" zen.AppImage
+          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/.
+          mv zen*AppImage* dist/.
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage
-          path: ./dist/zen.AppImage
+          path: ./dist/zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage
+
+      - name: Upload artifact (ZSync)
+        uses: actions/upload-artifact@v4
+        with:
+          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-step-3, check-release, mac, appimage]
+    needs: [build-data, linux, windows-step-3, check-release, mac, appimage]
     runs-on: ubuntu-latest
 
     steps:
-      - name: Update repo
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
 
       - name: Git Pull
         run: git pull
@@ -341,7 +366,9 @@ jobs:
             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
@@ -354,3 +381,83 @@ jobs:
             zen.installer-generic.exe
             zen.macos-x64.dmg
             zen.macos-aarch64.dmg
+
+  release-flatpak:
+    if: ${{ github.event.inputs.create_release == 'true' }}
+    permissions: write-all
+    name: Release Flatpak
+    needs: [release, linux, 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: 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.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Prepare flatpak manifest
+        run: |
+          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 }}. 
+            
+            @mauro-balades
+          branch: update-to-${{ needs.build-data.outputs.version }}
+          base: master
+          git-token: ${{ secrets.DEPLOY_KEY }}
+          delete-branch: true
+          
+

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

@@ -9,6 +9,7 @@ on:
     
 jobs:
   build-linux:
+    environment: production
     permissions:
       contents: write
     runs-on: ubuntu-latest
@@ -19,18 +20,22 @@ jobs:
     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@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
+      - uses: actions/checkout@v4
         with:
-          swap-size-gb: 6
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
 
       - name: Setup git
         run: |
@@ -43,10 +48,7 @@ jobs:
           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: Free up space
-        run: sh .github/workflows/src/disk-setup-and-swap.sh
-
+          
       - name: Configure sccache
         uses: actions/github-script@v7
         with:
@@ -95,6 +97,9 @@ jobs:
           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

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

@@ -6,10 +6,10 @@ on:
         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
@@ -31,6 +31,9 @@ jobs:
           python-version: '3.11' 
 
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
 
       - name: Setup git
         run: |
@@ -42,8 +45,29 @@ jobs:
           brew install cairo sccache gnu-tar mercurial
           sudo pip install setuptools
 
-      - name: Free up space
-        run: sh .github/workflows/src/disk-setup-and-swap.sh
+          # 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: |
@@ -68,17 +92,21 @@ jobs:
       - 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
-
-      - name: Bootstrap
-        run: |
-          cd engine
-          ./mach --no-interactive bootstrap --application-choice browser 
-          cd ..
+        
+      - name: Build language packs
+        run: sh scripts/download-language-packs.sh
 
       - name: build Zen
         env:

.github/workflows/src/disk-setup-and-swap.sh

@@ -1,50 +0,0 @@
-
-echo Before:
-if [ command -v free ]; then
-    free -h
-fi
-if [ command -v df ]; then
-    df -h
-fi
-
-echo
-echo
-
-sudo swapoff /mnt/swapfile
-sudo rm /mnt/swapfile
-sudo fallocate -l 10G /mnt/swapfile
-sudo chmod 600 /mnt/swapfile
-sudo mkswap /mnt/swapfile
-sudo swapon /mnt/swapfile
-sudo apt remove -y '^dotnet-.*' '^llvm-.*' '^php.*' '^mongodb-.*' '^mysql-.*' clang azure-cli google-cloud-sdk google-chrome-stable microsoft-edge firefox powershell mono-devel libgl1-mesa-dri acl aria2 autoconf automake binutils bison brotli bzip2 coreutils 
-sudo apt autoremove -y
-sudo apt clean
-sudo rm -rf  ./git
-sudo rm -rf /home/linuxbrew
-sudo rm -rf /usr/share/dotnet
-sudo rm -rf /usr/local/lib/android
-sudo rm -rf /usr/local/graalvm
-sudo rm -rf /usr/local/share/powershell
-sudo rm -rf /usr/local/share/chromium
-sudo rm -rf /opt/ghc
-sudo rm -rf /usr/local/share/boost
-sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-sudo rm -rf /etc/apache2
-sudo rm -rf /etc/nginx
-sudo rm -rf /usr/local/share/chrome_driver
-sudo rm -rf /usr/local/share/edge_driver
-sudo rm -rf /usr/local/share/gecko_driver
-sudo rm -rf /usr/share/java
-sudo rm -rf /usr/share/miniconda
-sudo rm -rf /usr/local/share/vcpkg
-
-echo
-echo
-
-echo After:
-if [ command -v free ]; then
-    free -h
-fi
-if [ command -v df ]; then
-    df -h
-fi

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

@@ -22,20 +22,24 @@ jobs:
       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
-
-      # 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
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
 
       - name: Install pnpm
         run: npm install -g pnpm
@@ -55,9 +59,6 @@ jobs:
       - name: Download
         run: pnpm surfer download
 
-      - name: Free up space
-        run: sh .github/workflows/src/disk-setup-and-swap.sh
-
       - name: "win-cross Cache"
         env:
           SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5
@@ -140,6 +141,9 @@ jobs:
           SURFER_COMPAT: ${{ matrix.generic == true }}
         run: pnpm surfer import --verbose
 
+      - name: Build language packs
+        run: sh scripts/download-language-packs.sh
+
       - name: Build
         env:
           SURFER_COMPAT: ${{ matrix.generic == true }}

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

@@ -33,14 +33,12 @@ jobs:
         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:
@@ -51,35 +49,29 @@ jobs:
         run: |
           cd C:\artifact
           ls
-          zstd -d ${{ inputs.profile-data-path-archive }}
-          7z x zen-*.tar
-
+          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
@@ -93,5 +85,4 @@ jobs:
       - name: Publish en-US.log
         uses: actions/upload-artifact@v4
         with:
-          path: en-US-${{ matrix.generic == true && 'generic' || 'specific' }}.log
-
+          path: en-US-${{ matrix.generic == true && 'generic' || 'specific' }}.log

.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/zen.desktop

@@ -4,7 +4,7 @@ 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=LibreWolf
+StartupWMClass=zen-alpha
 Categories=Network;WebBrowser;
 StartupNotify=true
 Terminal=false

README.md

@@ -3,22 +3,37 @@
 
 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)
+
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/K3K111FH7H)
 <a href='https://flathub.org/apps/io.github.zen_browser.zen'>
-  <img width='240' alt='Get it on Flathub' src='https://flathub.org/api/badge?locale=en'/>
+  <img width='220' alt='Get it on Flathub' src='https://flathub.org/api/badge?locale=en'/>
 </a>
 
 # Compatibility
 
-Zen is currently built using firefox version `128.0.3`!
+Zen is currently built using firefox version `129.0.2`!
 
-* Checkout the latest [releases notes](https://get-zen.vercel.app/release-notes)!
+* 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)!
+
+# 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
 ```
 
@@ -46,20 +61,30 @@ Finally, run the browser!
 npm start
 ```
 
-## Contributing
-
-Contributions are always welcome!
-
-See `contributing.md` for ways to get started.
-
-Please adhere to this project's `code of conduct`.
-
 ## Special Thanks
 
-- [Erlend](https://havn.blog) (For making the logo)
+- [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)
+
+## Third Party Code
+
+Zen coudn'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](/LICENSE)
+[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>
 

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/about-wordmark.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 260 56">
+  <defs>
+    <style>
+      .cls-1 {
+        fill="context-fill #20123a"
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M10.7,34.7h15.2v5.3H2.7v-3.8l15.1-21.2H2.6v-5.3h23.2v3.8l-15.2,21.2ZM50.7,23.4c.5,1.4.8,3.1.8,5.1v1.7h-15.5c0,1.1.2,2.1.6,2.9.4.8,1,1.5,1.8,1.9.8.4,1.7.7,2.7.7s1.3,0,1.9-.3c.6-.2,1.1-.5,1.5-.9.4-.4.7-.9.9-1.5l5.8.4c-.3,1.4-.9,2.6-1.8,3.7-.9,1-2.1,1.9-3.5,2.4-1.4.6-3.1.9-5,.9s-4.4-.5-6-1.4c-1.7-1-3-2.3-3.9-4.1-.9-1.8-1.4-3.8-1.4-6.2s.5-4.4,1.4-6.2c.9-1.8,2.2-3.1,3.8-4.1,1.7-1,3.6-1.5,5.8-1.5s2.9.2,4.2.7c1.3.5,2.4,1.2,3.4,2.2,1,1,1.7,2.2,2.3,3.6ZM45.5,26.3c0-.9-.2-1.7-.6-2.4-.4-.7-.9-1.3-1.6-1.7-.7-.4-1.5-.6-2.4-.6s-1.8.2-2.5.7c-.7.4-1.3,1-1.7,1.8-.4.7-.6,1.4-.6,2.2h9.5ZM72.8,18c-1.2-.7-2.6-1-4.1-1s-3.1.4-4.3,1.2c-1.2.8-2,1.8-2.5,3.1h-.3v-4h-6v22.7h6.3v-13.2c0-1,.2-1.8.6-2.5.4-.7.9-1.2,1.5-1.6.6-.4,1.4-.5,2.2-.5,1.3,0,2.3.4,3,1.2.7.8,1.1,1.9,1.1,3.3v13.4h6.3v-14.5c0-1.8-.3-3.3-1-4.6-.7-1.3-1.6-2.3-2.7-3ZM113.8,27.8c.6,1.1.9,2.4.9,3.9s-.4,3-1.2,4.3c-.8,1.3-2,2.3-3.5,3-1.6.7-3.5,1.1-5.7,1.1h-13V9.7h12.1c2.2,0,4.1.3,5.6,1,1.5.7,2.6,1.6,3.4,2.7.8,1.2,1.1,2.5,1.1,4s-.2,2.2-.7,3.1c-.5.9-1.1,1.6-1.9,2.2-.8.6-1.8,1-2.8,1.2v.3c1.2,0,2.2.4,3.3,1,1,.6,1.8,1.4,2.5,2.5ZM97.7,22.4h4.8c.9,0,1.7-.2,2.3-.5.7-.3,1.2-.8,1.6-1.3.4-.6.6-1.3.6-2.1s-.4-2-1.2-2.7c-.8-.7-1.9-1-3.3-1h-4.9v7.5ZM108.1,31c0-.8-.2-1.6-.6-2.2-.4-.6-1-1.1-1.7-1.5-.7-.4-1.6-.5-2.7-.5h-5.4v8.1h5.2c1.8,0,3.1-.3,3.9-1,.8-.7,1.2-1.6,1.2-2.7ZM130.6,16.9c-1.3,0-2.4.4-3.4,1.1-1,.7-1.7,1.8-2.1,3.2h-.2v-4h-6.1v22.7h6.3v-12.9c0-.9.2-1.7.6-2.5.4-.7,1-1.3,1.7-1.7.7-.4,1.6-.6,2.5-.6s.9,0,1.4.1c.5,0,.9.1,1.2.2v-5.6c-.3,0-.6-.1-1-.2s-.7,0-1,0ZM154.9,22.5c.9,1.8,1.4,3.8,1.4,6.2s-.5,4.4-1.4,6.1c-.9,1.8-2.2,3.1-3.9,4.1-1.7,1-3.7,1.5-6,1.5s-4.3-.5-6-1.5c-1.7-1-3-2.4-3.9-4.1-.9-1.8-1.4-3.8-1.4-6.1s.5-4.4,1.4-6.2c.9-1.8,2.2-3.1,3.9-4.1,1.7-1,3.7-1.5,6-1.5s4.3.5,6,1.5c1.7,1,3,2.4,3.9,4.1ZM149.8,28.7c0-1.3-.2-2.5-.5-3.5-.4-1-.9-1.9-1.6-2.5-.7-.6-1.6-.9-2.6-.9s-1.9.3-2.7.9c-.7.6-1.3,1.4-1.6,2.5-.4,1-.5,2.2-.5,3.5s.2,2.5.5,3.5c.4,1,.9,1.9,1.6,2.5.7.6,1.6.9,2.7.9s1.9-.3,2.6-.9c.7-.6,1.2-1.4,1.6-2.5.4-1,.5-2.2.5-3.5ZM182,32.4h-.2l-3.7-15.2h-6.3l-3.7,15.3h-.2l-3.5-15.3h-6.4l6.2,22.7h6.7l3.9-14.3h.3l3.9,14.3h6.7l6.2-22.7h-6.4l-3.5,15.2ZM208.1,26.8l-4.1-.8c-1.1-.2-1.8-.5-2.2-.9-.4-.4-.7-.8-.7-1.4s.3-1.2,1-1.6c.7-.4,1.5-.6,2.5-.6s1.4.1,1.9.4c.5.2,1,.6,1.3,1,.3.4.5.8.6,1.3l5.8-.4c-.3-2.1-1.2-3.7-2.9-5-1.7-1.2-3.9-1.8-6.8-1.8s-3.6.3-5.1.9c-1.4.6-2.6,1.4-3.4,2.4-.8,1.1-1.2,2.3-1.2,3.8s.5,3.1,1.6,4.2c1.1,1.1,2.7,1.9,5,2.3l3.9.8c1,.2,1.7.5,2.2.9.5.4.7.8.7,1.4,0,.7-.4,1.2-1,1.7-.7.4-1.6.6-2.7.6s-2-.2-2.8-.7c-.7-.5-1.2-1.2-1.4-2.1l-6.2.3c.3,2.2,1.4,3.9,3.1,5.1,1.8,1.3,4.2,1.9,7.2,1.9s3.7-.3,5.2-.9c1.5-.6,2.7-1.5,3.6-2.6.9-1.1,1.3-2.4,1.3-3.9s-.5-3-1.6-4c-1.1-1-2.7-1.7-4.9-2.2ZM238.6,23.4c.5,1.4.8,3.1.8,5.1v1.7h-15.5c0,1.1.2,2.1.6,2.9.4.8,1,1.5,1.8,1.9.8.4,1.7.7,2.7.7s1.3,0,1.9-.3c.6-.2,1.1-.5,1.5-.9.4-.4.7-.9.9-1.5l5.8.4c-.3,1.4-.9,2.6-1.8,3.7-.9,1-2.1,1.9-3.5,2.4-1.4.6-3.1.9-5,.9s-4.4-.5-6-1.4c-1.7-1-3-2.3-3.9-4.1-.9-1.8-1.4-3.8-1.4-6.2s.5-4.4,1.4-6.2c.9-1.8,2.2-3.1,3.8-4.1,1.7-1,3.6-1.5,5.8-1.5s2.9.2,4.2.7c1.3.5,2.4,1.2,3.4,2.2,1,1,1.7,2.2,2.3,3.6ZM233.5,26.3c0-.9-.2-1.7-.6-2.4-.4-.7-.9-1.3-1.6-1.7-.7-.4-1.5-.6-2.4-.6s-1.8.2-2.5.7c-.7.4-1.3,1-1.7,1.8-.4.7-.6,1.4-.6,2.2h9.5ZM256.4,17c-.4,0-.7,0-1,0-1.3,0-2.4.4-3.4,1.1-1,.7-1.7,1.8-2.1,3.2h-.2v-4h-6.1v22.7h6.3v-12.9c0-.9.2-1.7.6-2.5.4-.7,1-1.3,1.7-1.7.7-.4,1.6-.6,2.5-.6s.9,0,1.4.1c.5,0,.9.1,1.2.2v-5.6c-.3,0-.6-.1-1-.2Z"/>
+</svg>

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

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="80" height="56">
+  <polygon fill="context-fill #20123a" points="26.2482 13.468 26.2482 9.6633 3.0262 9.6633 3.0262 14.9495 18.1924 14.9495 3.055 36.1877 3.055 39.9942 26.2787 39.9942 26.2787 34.7063 11.0972 34.7063 26.2482 13.468"/><path fill="context-fill #20123a" d="M48.7982,19.8217c-.9724-.9572-2.1077-1.675-3.4059-2.1536-1.2999-.4785-2.6982-.7195-4.2001-.7195-2.2316,0-4.173.4938-5.8276,1.4815-1.6529.9877-2.9341,2.3657-3.8438,4.1323-.9079,1.7683-1.361,3.8217-1.361,6.1619,0,2.3979.4531,4.4751,1.361,6.2264.9096,1.7531,2.2044,3.1056,3.8879,4.0593,1.6835.9521,3.6961,1.4289,6.0363,1.4289,1.8752,0,3.5315-.2885,4.9689-.8671,1.4357-.577,2.6117-1.3865,3.5247-2.4285.913-1.042,1.5172-2.2638,1.8141-3.6656l-5.8361-.3852c-.2172.5736-.5328,1.0573-.9469,1.4509-.4158.3954-.913.6924-1.4968.8893-.5821.1968-1.2236.2969-1.9244.2969-1.0573,0-1.9703-.2223-2.7407-.6669-.7704-.4446-1.3644-1.0759-1.7836-1.8956-.4208-.8196-.6296-1.7921-.6296-2.9189v-.0135h15.4904v-1.7327c0-1.9363-.2715-3.6265-.8146-5.0724-.543-1.4476-1.2999-2.649-2.2723-3.6078ZM36.4088,26.3247c.0375-.8157.2407-1.5665.6223-2.2435.4141-.7365.9893-1.3237,1.7258-1.7632.7348-.4395,1.5817-.6584,2.5388-.6584.9198,0,1.7259.1985,2.4216.5991.6975.4005,1.2422.9503,1.6376,1.6512.3937.7009.5923,1.507.5923,2.4149h-9.5385Z"/><path fill="context-fill #20123a" d="M75.9964,20.94c-.6517-1.2778-1.5646-2.2621-2.739-2.9545-1.1761-.6907-2.5524-1.0369-4.1323-1.0369-1.6885,0-3.1242.3887-4.3104,1.1625-1.1846.7756-2.028,1.8243-2.532,3.148h-.2664v-4.0135h-6.0126v22.7486h6.3079v-13.1519c.0102-.9775.1951-1.8141.5566-2.5099.3598-.6958.8638-1.227,1.5104-1.5918.6465-.3649,1.395-.5482,2.2435-.5482,1.2643,0,2.2553.392,2.9766,1.1777.7213.784,1.0759,1.8735,1.0674,3.2651v13.3589h6.3078v-14.4841c0-1.7683-.3258-3.2905-.9775-4.5701Z"/>
+</svg>

configs/branding/beta/MacOSInstaller.svg

@@ -1,4 +1,4 @@
 <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" />
+ <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/beta/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/beta/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/beta/content/about-wordmark.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 260 56">
+  <defs>
+    <style>
+      .cls-1 {
+        fill="context-fill #20123a"
+      }
+    </style>
+  </defs>
+  <path class="cls-1" d="M10.7,34.7h15.2v5.3H2.7v-3.8l15.1-21.2H2.6v-5.3h23.2v3.8l-15.2,21.2ZM50.7,23.4c.5,1.4.8,3.1.8,5.1v1.7h-15.5c0,1.1.2,2.1.6,2.9.4.8,1,1.5,1.8,1.9.8.4,1.7.7,2.7.7s1.3,0,1.9-.3c.6-.2,1.1-.5,1.5-.9.4-.4.7-.9.9-1.5l5.8.4c-.3,1.4-.9,2.6-1.8,3.7-.9,1-2.1,1.9-3.5,2.4-1.4.6-3.1.9-5,.9s-4.4-.5-6-1.4c-1.7-1-3-2.3-3.9-4.1-.9-1.8-1.4-3.8-1.4-6.2s.5-4.4,1.4-6.2c.9-1.8,2.2-3.1,3.8-4.1,1.7-1,3.6-1.5,5.8-1.5s2.9.2,4.2.7c1.3.5,2.4,1.2,3.4,2.2,1,1,1.7,2.2,2.3,3.6ZM45.5,26.3c0-.9-.2-1.7-.6-2.4-.4-.7-.9-1.3-1.6-1.7-.7-.4-1.5-.6-2.4-.6s-1.8.2-2.5.7c-.7.4-1.3,1-1.7,1.8-.4.7-.6,1.4-.6,2.2h9.5ZM72.8,18c-1.2-.7-2.6-1-4.1-1s-3.1.4-4.3,1.2c-1.2.8-2,1.8-2.5,3.1h-.3v-4h-6v22.7h6.3v-13.2c0-1,.2-1.8.6-2.5.4-.7.9-1.2,1.5-1.6.6-.4,1.4-.5,2.2-.5,1.3,0,2.3.4,3,1.2.7.8,1.1,1.9,1.1,3.3v13.4h6.3v-14.5c0-1.8-.3-3.3-1-4.6-.7-1.3-1.6-2.3-2.7-3ZM113.8,27.8c.6,1.1.9,2.4.9,3.9s-.4,3-1.2,4.3c-.8,1.3-2,2.3-3.5,3-1.6.7-3.5,1.1-5.7,1.1h-13V9.7h12.1c2.2,0,4.1.3,5.6,1,1.5.7,2.6,1.6,3.4,2.7.8,1.2,1.1,2.5,1.1,4s-.2,2.2-.7,3.1c-.5.9-1.1,1.6-1.9,2.2-.8.6-1.8,1-2.8,1.2v.3c1.2,0,2.2.4,3.3,1,1,.6,1.8,1.4,2.5,2.5ZM97.7,22.4h4.8c.9,0,1.7-.2,2.3-.5.7-.3,1.2-.8,1.6-1.3.4-.6.6-1.3.6-2.1s-.4-2-1.2-2.7c-.8-.7-1.9-1-3.3-1h-4.9v7.5ZM108.1,31c0-.8-.2-1.6-.6-2.2-.4-.6-1-1.1-1.7-1.5-.7-.4-1.6-.5-2.7-.5h-5.4v8.1h5.2c1.8,0,3.1-.3,3.9-1,.8-.7,1.2-1.6,1.2-2.7ZM130.6,16.9c-1.3,0-2.4.4-3.4,1.1-1,.7-1.7,1.8-2.1,3.2h-.2v-4h-6.1v22.7h6.3v-12.9c0-.9.2-1.7.6-2.5.4-.7,1-1.3,1.7-1.7.7-.4,1.6-.6,2.5-.6s.9,0,1.4.1c.5,0,.9.1,1.2.2v-5.6c-.3,0-.6-.1-1-.2s-.7,0-1,0ZM154.9,22.5c.9,1.8,1.4,3.8,1.4,6.2s-.5,4.4-1.4,6.1c-.9,1.8-2.2,3.1-3.9,4.1-1.7,1-3.7,1.5-6,1.5s-4.3-.5-6-1.5c-1.7-1-3-2.4-3.9-4.1-.9-1.8-1.4-3.8-1.4-6.1s.5-4.4,1.4-6.2c.9-1.8,2.2-3.1,3.9-4.1,1.7-1,3.7-1.5,6-1.5s4.3.5,6,1.5c1.7,1,3,2.4,3.9,4.1ZM149.8,28.7c0-1.3-.2-2.5-.5-3.5-.4-1-.9-1.9-1.6-2.5-.7-.6-1.6-.9-2.6-.9s-1.9.3-2.7.9c-.7.6-1.3,1.4-1.6,2.5-.4,1-.5,2.2-.5,3.5s.2,2.5.5,3.5c.4,1,.9,1.9,1.6,2.5.7.6,1.6.9,2.7.9s1.9-.3,2.6-.9c.7-.6,1.2-1.4,1.6-2.5.4-1,.5-2.2.5-3.5ZM182,32.4h-.2l-3.7-15.2h-6.3l-3.7,15.3h-.2l-3.5-15.3h-6.4l6.2,22.7h6.7l3.9-14.3h.3l3.9,14.3h6.7l6.2-22.7h-6.4l-3.5,15.2ZM208.1,26.8l-4.1-.8c-1.1-.2-1.8-.5-2.2-.9-.4-.4-.7-.8-.7-1.4s.3-1.2,1-1.6c.7-.4,1.5-.6,2.5-.6s1.4.1,1.9.4c.5.2,1,.6,1.3,1,.3.4.5.8.6,1.3l5.8-.4c-.3-2.1-1.2-3.7-2.9-5-1.7-1.2-3.9-1.8-6.8-1.8s-3.6.3-5.1.9c-1.4.6-2.6,1.4-3.4,2.4-.8,1.1-1.2,2.3-1.2,3.8s.5,3.1,1.6,4.2c1.1,1.1,2.7,1.9,5,2.3l3.9.8c1,.2,1.7.5,2.2.9.5.4.7.8.7,1.4,0,.7-.4,1.2-1,1.7-.7.4-1.6.6-2.7.6s-2-.2-2.8-.7c-.7-.5-1.2-1.2-1.4-2.1l-6.2.3c.3,2.2,1.4,3.9,3.1,5.1,1.8,1.3,4.2,1.9,7.2,1.9s3.7-.3,5.2-.9c1.5-.6,2.7-1.5,3.6-2.6.9-1.1,1.3-2.4,1.3-3.9s-.5-3-1.6-4c-1.1-1-2.7-1.7-4.9-2.2ZM238.6,23.4c.5,1.4.8,3.1.8,5.1v1.7h-15.5c0,1.1.2,2.1.6,2.9.4.8,1,1.5,1.8,1.9.8.4,1.7.7,2.7.7s1.3,0,1.9-.3c.6-.2,1.1-.5,1.5-.9.4-.4.7-.9.9-1.5l5.8.4c-.3,1.4-.9,2.6-1.8,3.7-.9,1-2.1,1.9-3.5,2.4-1.4.6-3.1.9-5,.9s-4.4-.5-6-1.4c-1.7-1-3-2.3-3.9-4.1-.9-1.8-1.4-3.8-1.4-6.2s.5-4.4,1.4-6.2c.9-1.8,2.2-3.1,3.8-4.1,1.7-1,3.6-1.5,5.8-1.5s2.9.2,4.2.7c1.3.5,2.4,1.2,3.4,2.2,1,1,1.7,2.2,2.3,3.6ZM233.5,26.3c0-.9-.2-1.7-.6-2.4-.4-.7-.9-1.3-1.6-1.7-.7-.4-1.5-.6-2.4-.6s-1.8.2-2.5.7c-.7.4-1.3,1-1.7,1.8-.4.7-.6,1.4-.6,2.2h9.5ZM256.4,17c-.4,0-.7,0-1,0-1.3,0-2.4.4-3.4,1.1-1,.7-1.7,1.8-2.1,3.2h-.2v-4h-6.1v22.7h6.3v-12.9c0-.9.2-1.7.6-2.5.4-.7,1-1.3,1.7-1.7.7-.4,1.6-.6,2.5-.6s.9,0,1.4.1c.5,0,.9.1,1.2.2v-5.6c-.3,0-.6-.1-1-.2Z"/>
+</svg>

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

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="80" height="56">
+  <polygon fill="context-fill #20123a" points="26.2482 13.468 26.2482 9.6633 3.0262 9.6633 3.0262 14.9495 18.1924 14.9495 3.055 36.1877 3.055 39.9942 26.2787 39.9942 26.2787 34.7063 11.0972 34.7063 26.2482 13.468"/><path fill="context-fill #20123a" d="M48.7982,19.8217c-.9724-.9572-2.1077-1.675-3.4059-2.1536-1.2999-.4785-2.6982-.7195-4.2001-.7195-2.2316,0-4.173.4938-5.8276,1.4815-1.6529.9877-2.9341,2.3657-3.8438,4.1323-.9079,1.7683-1.361,3.8217-1.361,6.1619,0,2.3979.4531,4.4751,1.361,6.2264.9096,1.7531,2.2044,3.1056,3.8879,4.0593,1.6835.9521,3.6961,1.4289,6.0363,1.4289,1.8752,0,3.5315-.2885,4.9689-.8671,1.4357-.577,2.6117-1.3865,3.5247-2.4285.913-1.042,1.5172-2.2638,1.8141-3.6656l-5.8361-.3852c-.2172.5736-.5328,1.0573-.9469,1.4509-.4158.3954-.913.6924-1.4968.8893-.5821.1968-1.2236.2969-1.9244.2969-1.0573,0-1.9703-.2223-2.7407-.6669-.7704-.4446-1.3644-1.0759-1.7836-1.8956-.4208-.8196-.6296-1.7921-.6296-2.9189v-.0135h15.4904v-1.7327c0-1.9363-.2715-3.6265-.8146-5.0724-.543-1.4476-1.2999-2.649-2.2723-3.6078ZM36.4088,26.3247c.0375-.8157.2407-1.5665.6223-2.2435.4141-.7365.9893-1.3237,1.7258-1.7632.7348-.4395,1.5817-.6584,2.5388-.6584.9198,0,1.7259.1985,2.4216.5991.6975.4005,1.2422.9503,1.6376,1.6512.3937.7009.5923,1.507.5923,2.4149h-9.5385Z"/><path fill="context-fill #20123a" d="M75.9964,20.94c-.6517-1.2778-1.5646-2.2621-2.739-2.9545-1.1761-.6907-2.5524-1.0369-4.1323-1.0369-1.6885,0-3.1242.3887-4.3104,1.1625-1.1846.7756-2.028,1.8243-2.532,3.148h-.2664v-4.0135h-6.0126v22.7486h6.3079v-13.1519c.0102-.9775.1951-1.8141.5566-2.5099.3598-.6958.8638-1.227,1.5104-1.5918.6465-.3649,1.395-.5482,2.2435-.5482,1.2643,0,2.2553.392,2.9766,1.1777.7213.784,1.0759,1.8735,1.0674,3.2651v13.3589h6.3078v-14.4841c0-1.7683-.3258-3.2905-.9775-4.5701Z"/>
+</svg>

configs/common/mozconfig

@@ -3,8 +3,10 @@ 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}"
@@ -17,10 +19,9 @@ export MOZ_DISTRIBUTION_ID=${appId}
 # ac_add_options --enable-linker=gold
 
 # Misc
-export MOZ_STUB_INSTALLER=1
 export MOZ_SOURCE_REPO=https://github.com/zen-browser/desktop
 export MOZ_SOURCE_CHANGESET=${changeset}
-export MOZ_INCLUDE_SOURCE_INFO=1
+#export MOZ_INCLUDE_SOURCE_INFO=1
 
 ac_add_options --enable-application=browser
 
@@ -35,6 +36,8 @@ if test "$ZEN_RELEASE"; then
   ac_add_options --disable-jprof
 
   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
@@ -44,9 +47,9 @@ if test "$ZEN_RELEASE"; then
   ac_add_options --disable-crashreporter
   ac_add_options --disable-geckodriver
   ac_add_options --disable-rust-tests
-  ac_add_options --disable-default-browser-agent
 
-  ac_add_options --disable-vtune
+  # 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=1
@@ -89,9 +92,14 @@ 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_CRASHREPORTER=0
 mk_add_options MOZ_DATA_REPORTING=0
 mk_add_options MOZ_SERVICES_HEALTHREPORT=0
 mk_add_options MOZ_TELEMETRY_REPORTING=0
 
-export MOZ_APP_UA_NAME="Firefox"
+# 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

@@ -13,6 +13,9 @@ if test "$ZEN_RELEASE"; then
     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"
@@ -37,15 +40,19 @@ if test "$ZEN_RELEASE"; then
         export RUSTFLAGS="$RUSTFLAGS -C target-cpu=x86-64 -C codegen-units=1"
     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"
+        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"
-        export CPPFLAGS="$CPPFLAGS -O3 -ffp-contract=fast -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes"
-        export CXXFLAGS="$CXXFLAGS -O3 -ffp-contract=fast -march=x86-64-v3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes"
+        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 -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"
     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

@@ -16,10 +16,10 @@ if test "$SURFER_COMPAT" = "true"; then
     ac_add_options --enable-wasm-avx
     ac_add_options --enable-optimize="-march=nehalem -mtune=haswell -O3 -w"
 
-    export CFLAGS="-O3 -march=x86-64-v3"
-    export CPPFLAGS="-O3 -march=x86-64-v3"
-    export CXXFLAGS="-O3 -march=x86-64-v3"
-    export LDFLAGS="-Wl,-O3 -march=x86-64-v3"
+    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
@@ -33,3 +33,4 @@ else
     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

@@ -14,8 +14,8 @@ if test "$ZEN_CROSS_COMPILING"; then
   CROSS_COMPILE=1
   TOOLS=$(echo ~)/win-cross
 
-  #export WIN32_REDIST_DIR="$TOOLS"/vs2022/VC/Redist/MSVC/14.34.31931/x64/Microsoft.VC143.CRT
-  #export WIN_UCRT_REDIST_DIR="$TOOLS/vs2022/Windows Kits/10/Redist/10.0.22621.0/ucrt/DLLs/x64"
+  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_INCLUDE_SOURCE_INFO=1
@@ -31,27 +31,24 @@ ac_add_options --target=x86_64-pc-windows-msvc
 
 ac_add_options --disable-maintenance-service
 ac_add_options --disable-bits-download
-
-ac_add_options --without-wasm-sandboxed-libraries
  
-ac_add_options --enable-wasm-avx
 if test "$SURFER_COMPAT" = "true"; then
-  ac_add_options --enable-optimize="-O3 -mavx -maes -w -ftree-vectorize"
+  ac_add_options --enable-optimize="-O2 -Qvec -mtune=haswell -march=x86-64 -w"
 
-  export CFLAGS="-mavx -maes -mtune=haswell -march=x86-64"
-  export CPPFLAGS="-mavx -maes -mtune=haswell -march=x86-64"
-  export CXXFLAGS="-mavx -maes -mtune=haswell -march=x86-64"
-  export LDFLAGS="-Wl,-O3"
-  export RUSTFLAGS="-C target-feature=+avx -C codegen-units=1 -Ctarget-cpu=x86-64"
+  export CFLAGS="-mtune=haswell -march=x86-64 -O2 -Qvec -w"
+  export CPPFLAGS="-mtune=haswell -march=x86-64 -O2 -Qvec -w"
+  export CXXFLAGS="-mtune=haswell -march=x86-64 -O2 -Qvec -w"
+  export LDFLAGS="-Wl,-O2"
+  export RUSTFLAGS="-C codegen-units=1 -Ctarget-cpu=x86-64"
 else
-  ac_add_options --enable-optimize="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -Xclang -ftree-vectorize -w"
+  ac_add_options --enable-optimize="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -Xclang -w"
   ac_add_options --enable-wasm-avx
 
-  export CFLAGS="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes /arch:AVX -march=x86-64-v3"   
-  export CPPFLAGS="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes /arch:AVX -march=x86-64-v3"
-  export CXXFLAGS="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes /arch:AVX -march=x86-64-v3"
-  export LDFLAGS="-Wl,-O3 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -march=x86-64-v3"
-  export RUSTFLAGS="-C target-feature=+avx -C codegen-units=1 -Ctarget-cpu=x86-64-v3"
+  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 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -march=x86-64-v3"
+  export LDFLAGS="-Wl,-O3 -march=x86-64-v3"
+  export RUSTFLAGS="-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

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/performance.md

@@ -1,35 +1,9 @@
 # 🌀 Zen Browser Performance traker
-```mermaid
-  graph TD;
-    A[mauro-balades] -->B(Zen custom code)
-    G-->B
-    H(ptr1337/CachyOS)-->|AUR Pkg and Opt. flags|D
-    E(Fire Fox-Code)-->C
-    B --> C{Final code}
-    D-->G(Perf. Testing)
-    C-->D(Build)
-    D--> F(Release)
-    F-->I(mar)
-    F-->L(Mac)
-    F-->T(Linux)
-    F-->V(Win install)
-    V-->Z(Zip)
-    V-->Z2(Intall.exe)
-    I-->I1(windows.mar)
-    I-->I2(linux.mar)
-    I-->I3(macos.mar)
-    T-->T1(zen.linux.tar.bz2)
-    T-->T2(AUR)
-    T-->T3(Flatpak)
-    T-->T4(AppImage)
-    L-->L1(zen.macos.dmg)
-```
-
 
 ## Scores 
 
 ## 1
-- [NOCanoa ](https://github.com/NOCanoa)
+- [NOCanoa](https://github.com/NOCanoa)
 
 OS: win 11; CPU: i5 13600k
 
@@ -39,6 +13,10 @@ https://web.basemark.com/
 
 |           | score:  |CSS | HTML5 | Page load and Responsiveness | Resize Cap. |
 |-----------|-----|-----|-------|------------------------------|-------------|
+| 1.0.0-a.15-opt | 2141.63 | 59% | 91% | 90% | 76% |
+| 1.0.0-a.13-opt | 1658.87 | 59% | 91% | 90% | 76% |
+| 1.0.0-a.12-opt | 1874.49 | 59% | 91% | 91% | 76% |
+| 1.0.0-a.11-opt | 1678.49 | 59% | 91% | 91% | 76% |
 | 1.0.0-a.10 | 1660.89 | 59% | 91% | 91% | 76% |
 | 1.0.0-a.9 | 470 |  why  | why  | why  | why  |
 | 1.0.0-a.8 | 446.74  | 59% | 91%   | 96%                          | 76%         |
@@ -46,7 +24,7 @@ https://web.basemark.com/
 | 1.0.0-a.6 | 1747.98 | 59% | 91%   | 91%                          | 76%         |
 | 1.0.0-a.4 | 470.49  | 59% | 91%   | 97%                          | 76%         |
 | 1.0.0-a.3 | 475.52  |59% | 91%   | 97%                          | 76%         |
-| other | last | utpdate | 31/7   | 2024                         | -        |
+| other | last | update | 31/7   | 2024                         | -        |
 | Librewolf 128.0-2 | 1953.65 | 59.66% | 89.01%   | 91.72%                         | 76.12% |
 | FF nightly 130.0a1 | 1912.77 | 59.66% | 90.91%   | 91.72%                         | 76.12% |
 
@@ -54,10 +32,10 @@ https://web.basemark.com/
 ```mermaid
 xychart-beta
     title "Performance over time (Higher is better)"
-    x-axis [.3, .4, .6, .7, .8, .9, .10]
+    x-axis [.3, .4, .6, .7, .8, .9, .10, .11, .12, .13, .15]
     y-axis "Benchmark Points"
-    bar [475.52, 470.49, 1747.98, 1964.43, 446.74, 470, 1660.89]
-    line [475.52, 470.49, 1747.98, 1964.43, 446.74, 470, 1660.89]
+    bar [475.52, 470.49, 1747.98, 1964.43, 446.74, 470, 1660.89, 1678.49, 1874.49, 1658.87, 2141.63]
+    line [475.52, 470.49, 1747.98, 1964.43, 446.74, 470, 1660.89, 1678.49, 1874.49, 1658.87, 2141.63]
 ```
 
 ## Speedometer3.0
@@ -66,25 +44,17 @@ https://browserbench.org/Speedometer3.0/
 
 |           | score:  |
 |-----------|-----|
+| 1.0.0-a.15-opt | TODO   |
+| 1.0.0-a.13-opt | 21.1   |
+| 1.0.0-a.12-opt | 21.5   |
+| 1.0.0-a.11-opt | 20.8   |
 | 1.0.0-a.10 | 21.2 |
 | others| - |
 | Vivaldi 6.7.3329.39| 27.8 |
 | FF nightly 130.0a1 | 27.0 |
 | Librewolf 128.0-2 | 20.2 |
 
+## Repository View Counter
 
-## 2
+<div align='center'><a href='https://www.websitecounterfree.com'><img src='https://www.websitecounterfree.com/c.php?d=9&id=57772&s=40' border='0' alt='Free Website Counter'></a><br / ><small><a href='https://www.websitecounterfree.com' title="Free Website Counter">Free Website Counter</a></small></div>
 
-- [Verix](https://github.com/Veriiix)
-
-OS: Win 11
-CPU: i7-13700KF
-GPU: AMD RX 7900 XTX
-https://www.tablesgenerator.com/
-
-| Version    | Score: |
-|------------|--------|
-| 1.0.0-a.10 | 21.7   |
-| 1.0.0-a.9  | 3.7    |
-
-https://browserbench.org/Speedometer3.0/

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

@@ -1,7 +1,7 @@
 
 # Workspaces Layout
 
-```
+```json
 {
   "workspaces": [
     {

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

@@ -0,0 +1,46 @@
+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
+  - --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/latest/download/archive.tar
+        sha256: {flatpak_sha256}
+        strip-components: 0
+        dest: metadata

package.json

@@ -27,6 +27,6 @@
   },
   "homepage": "https://github.com/zen-browser/core#readme",
   "dependencies": {
-    "@zen-browser/surfer": "^1.2.5"
+    "@zen-browser/surfer": "^1.3.4"
   }
 }

pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@zen-browser/surfer':
-        specifier: ^1.2.5
-        version: 1.2.5
+        specifier: ^1.3.4
+        version: 1.3.4
 
 packages:
 
@@ -109,8 +109,8 @@ packages:
   '@types/node@17.0.45':
     resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
 
-  '@zen-browser/surfer@1.2.5':
-    resolution: {integrity: sha512-EX39ay0wkCiifoAzxfoLZgAVXZawWDNDJuSqefvVq9kG82tbSSdgzhQSRjAOF0ZmaZegjyu0ID5+KroMtz3fLA==}
+  '@zen-browser/surfer@1.3.4':
+    resolution: {integrity: sha512-xnZK6D5/DPy5BZonucUAYZQXg+BUisPJbWSvXypno1Ns0InlpiI0saYSON3hQ+VbLzwBB8LTfGLYphFnskkw7w==}
     hasBin: true
 
   ansi-regex@5.0.1:
@@ -786,7 +786,7 @@ snapshots:
 
   '@types/node@17.0.45': {}
 
-  '@zen-browser/surfer@1.2.5':
+  '@zen-browser/surfer@1.3.4':
     dependencies:
       '@resvg/resvg-js': 1.4.0
       async-icns: 1.0.2

scripts/download-language-packs.sh

@@ -0,0 +1,67 @@
+
+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
+browser_locales=engine/browser/locales
+copy_browser_locales() {
+  langId=$1
+  only_en=$2
+  mkdir -p $browser_locales/$langId
+  if [ "$only_en" = true ]; then
+    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/
+}
+
+copy_browser_locales en-US true
+for lang in $(cat ./l10n/supported-languages); do
+  copy_browser_locales $lang false
+done
+
+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()

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

@@ -1,3 +1,6 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 /* You may copy+paste this file and use it as it is.
  *
@@ -18,7 +21,7 @@
  * SECTION: FASTFOX                                                         *
 ****************************************************************************/
 /** GENERAL ***/
-pref("content.notify.interval", 100000);
+pref("content.notify.interval", 100000); // (.10s); alt=500000 (.50s)
 
 /** GFX ***/
 pref("gfx.canvas.accelerated.cache-items", 4096);
@@ -29,9 +32,9 @@ pref("gfx.content.skia-font-cache-size", 20);
 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);
+pref("media.memory_cache_max_size", 512000); // alt=512000; also in Securefox (inactive there)
+pref("media.cache_readahead_limit", 9000); // default=60; stop reading ahead when our buffered data is this many seconds ahead of the current playback
+pref("media.cache_resume_threshold", 6000); // default=30; when a network connection is suspended, don't resume it until the amount of buffered data falls below this threshold (in seconds)
 
 /** IMAGE CACHE ***/
 pref("image.mem.decode_bytes_at_a_time", 32768);
@@ -42,14 +45,13 @@ 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.ssl_tokens_cache_capacity", 10240);
+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", 32768);
 
-/** SPECULATIVE LOADING ***/
-pref("network.dns.disablePrefetch", true);
-pref("network.dns.disablePrefetchFromHTTPS", true);
-pref("network.prefetch-next", false);
-pref("network.predictor.enabled", false);
-pref("network.predictor.enable-prefetch", false);
+/** MIXED CONTENT + CROSS-SITE ***/
+pref("pdfjs.enableScripting", false);
+pref("extensions.postDownloadThirdPartyPrompt", false);
 
 /** EXPERIMENTAL ***/
 pref("layout.css.grid-template-masonry-value.enabled", true);
@@ -60,14 +62,12 @@ 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);
-pref("privacy.globalprivacycontrol.enabled", true);
 
 /** OCSP & CERTS / HPKP ***/
 pref("security.OCSP.enabled", 0);
@@ -100,24 +100,6 @@ pref("security.insecure_connection_text.enabled", true);
 pref("security.insecure_connection_text.pbmode.enabled", true);
 pref("network.IDN_show_punycode", true);
 
-/** HTTPS-FIRST POLICY ***/
-pref("dom.security.https_first", true);
-pref("dom.security.https_first_schemeless", true);
-
-/** PASSWORDS ***/
-pref("signon.formlessCapture.enabled", false);
-pref("signon.privateBrowsingCapture.enabled", false);
-pref("network.auth.subresource-http-auth-allow", 1);
-pref("editor.truncate_user_pastes", false);
-
-/** MIXED CONTENT + CROSS-SITE ***/
-pref("security.mixed_content.block_display_content", true);
-pref("pdfjs.enableScripting", false);
-pref("extensions.postDownloadThirdPartyPrompt", false);
-
-/** HEADERS / REFERERS ***/
-pref("network.http.referer.XOriginTrimmingPolicy", 2);
-
 /** CONTAINERS ***/
 pref("privacy.userContext.ui.enabled", true);
 
@@ -135,27 +117,27 @@ pref("permissions.manager.defaultsUrl", "");
 pref("webchannel.allowObject.urlWhitelist", "");
 
 /** TELEMETRY ***/
-pref("datareporting.policy.dataSubmissionEnabled", false);
-pref("datareporting.healthreport.uploadEnabled", false);
-pref("toolkit.telemetry.unified", false);
-pref("toolkit.telemetry.enabled", false);
-pref("toolkit.telemetry.server", "data:,");
-pref("toolkit.telemetry.archive.enabled", false);
-pref("toolkit.telemetry.newProfilePing.enabled", false);
-pref("toolkit.telemetry.shutdownPingSender.enabled", false);
-pref("toolkit.telemetry.updatePing.enabled", false);
-pref("toolkit.telemetry.bhrPing.enabled", false);
-pref("toolkit.telemetry.firstShutdownPing.enabled", false);
-pref("toolkit.telemetry.coverage.opt-out", true);
-pref("toolkit.coverage.opt-out", true);
-pref("toolkit.coverage.endpoint.base", "");
-pref("browser.newtabpage.activity-stream.feeds.telemetry", false);
-pref("browser.newtabpage.activity-stream.telemetry", false);
+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);
-pref("app.normandy.enabled", false);
-pref("app.normandy.api_url", "");
+pref("app.shield.optoutstudies.enabled", false, locked);
+pref("app.normandy.enabled", false, locked);
+pref("app.normandy.api_url", "", locked);
 
 /** CRASH REPORTS ***/
 pref("breakpad.reportURL", "");
@@ -172,7 +154,7 @@ pref("dom.private-attribution.submission.enabled", false);
  * SECTION: PESKYFOX                                                        *
 ****************************************************************************/
 /** MOZILLA UI ***/
-pref("browser.privatebrowsing.vpnpromourl", "");
+pref("browser.privatebrowsing.vpnpromourl", "", locked);
 pref("extensions.getAddons.showPane", false);
 pref("extensions.htmlaboutaddons.recommendations.enabled", false);
 pref("browser.discovery.enabled", false);
@@ -193,10 +175,6 @@ pref("browser.display.focus_ring_width", 0);
 pref("layout.css.prefers-color-scheme.content-override", 2);
 pref("browser.privateWindowSeparation.enabled", false); // WINDOWS
 
-/** COOKIE BANNER HANDLING ***/
-pref("cookiebanners.service.mode", 1);
-pref("cookiebanners.service.mode.privateBrowsing", 1);
-
 /** FULLSCREEN NOTICE ***/
 pref("full-screen-api.transition-duration.enter", "0 0");
 pref("full-screen-api.transition-duration.leave", "0 0");

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

@@ -16,6 +16,9 @@ pref("browser.tabs.cardPreview.delayMs", 100);
 pref("devtools.debugger.prompt-connection", false);
 #endif
 
+// Dont download the multilingual dictionary
+pref("intl.multilingual.downloadEnabled", false);
+
 // Theme
 pref('toolkit.legacyUserProfileCustomizations.stylesheets', true);
 pref('browser.compactmode.show', true);
@@ -56,28 +59,42 @@ pref("browser.ping-centre.telemetry", false);
 pref("browser.attribution.enabled", false);
 pref("toolkit.telemetry.pioneer-new-studies-available", false);
 
+pref("browser.contentblocking.category", "standard");
+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.theme.floating-urlbar', false);
 pref('zen.view.compact', false);
 pref('zen.view.compact.hide-toolbar', false);
+
 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('zen.view.sidebar-collapsed.hide-mute-button', 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 to enable the new profiles (TODO: Check this out!)
 //pref("browser.profiles.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);
@@ -86,11 +103,11 @@ pref('zen.splitView.working', false);
 pref('zen.workspaces.enabled', true);
 
 // Zen Watermark
-pref('zen.watermark.enabled', true);
+pref('zen.watermark.enabled', true, sticky);
 
 // Smooth scrolling
-user_pref('apz.overscroll.enabled', true); // not DEFAULT on Linux
-user_pref('general.smoothScroll', true); // DEFAULT
+pref('apz.overscroll.enabled', true); // not DEFAULT on Linux
+pref('general.smoothScroll', true); // DEFAULT
 
 // Privacy
 pref('dom.private-attribution.submission.enabled', false);
@@ -98,14 +115,60 @@ pref('dom.private-attribution.submission.enabled', false);
 pref('media.eme.enabled', true);
 pref('webgl.disabled', false);
 
-pref("app.update.url.manual", "https://get-zen.vercel.app/download");
-pref("app.update.url.details", "hhttps://get-zen.vercel.app/download");
-pref("app.releaseNotesURL", "https://get-zen.vercel.app/release-notes");
-pref("app.releaseNotesURL.aboutDialog", "https://get-zen.vercel.app/release-notes");
+pref("app.update.url.manual", "https://www.zen-browser.app/download");
+pref("app.update.url.details", "hhttps://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);
 
-#include better-fox.js
+// 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);
+
+// Extremly experimental features
+pref("dom.webgpu.enabled", true);
+
+// Font rendering, not for MacOSX and Linux
+#ifndef XP_UNIX
+#ifndef XP_MACOSX
+pref('gfx.font_rendering.cleartype_params.rendering_mode', 5);
+pref('gfx.font_rendering.cleartype_params.gamma', 1750);
+#endif
+#endif
+
+#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", true);
+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);

src/browser/base/content/ZenSidebarManager.mjs

@@ -1,544 +0,0 @@
-
-
-
-var gZenBrowserManagerSidebar = {
-  _sidebarElement: null,
-  _currentPanel: null,
-  _lastOpenedPanel: null,
-  _hasChangedConfig: true,
-  _splitterElement: null,
-  _hSplitterElement: null,
-  _hasRegisteredPinnedClickOutside: false,
-  _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();
-    this.insertIntoContextMenu();
-  },
-
-  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;
-
-    // https://stackoverflow.com/questions/11565471/removing-event-listener-which-was-added-with-bind
-    var clickOutsideHandler = this._handleClickOutside.bind(this);
-    if (Services.prefs.getBoolPref("zen.sidebar.floating") && !this._hasRegisteredPinnedClickOutside) {
-      document.addEventListener("mouseup", clickOutsideHandler);
-      this._hasRegisteredPinnedClickOutside = true;
-    } else if (!Services.prefs.getBoolPref("zen.sidebar.floating") && this._hasRegisteredPinnedClickOutside) {
-      document.removeEventListener("mouseup", clickOutsideHandler);
-      this._hasRegisteredPinnedClickOutside = 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;
-    }
-  },
-
-  _handleClickOutside(event) {
-    let sidebar = document.getElementById("zen-sidebar-web-panel");
-    if (!sidebar.hasAttribute("pinned") || !this._currentPanel || this._isDragging) {
-      return;
-    }
-    let target = event.target;
-    const closestSelector = [
-      "#zen-sidebar-web-panel",
-      "#zen-sidebar-panels-wrapper",
-      "#zenWebPanelContextMenu",
-      "#zen-sidebar-web-panel-splitter",
-      "#contentAreaContextMenu"
-    ].join(", ");
-    if (target.closest(closestSelector)) {
-      return;
-    }
-    this.close();
-  },
-
-  toggle() {
-    if (!this._currentPanel) {
-      this._currentPanel = this._lastOpenedPanel;
-    } 
-    if (document.getElementById("zen-sidebar-web-panel").hasAttribute("hidden")) {
-      this.open();
-      return;
-    }
-    this.close();
-  },
-
-  open() {
-    let sidebar = document.getElementById("zen-sidebar-web-panel");
-    sidebar.removeAttribute("hidden");
-    this.update();
-  },
-
-  update() {
-    this._updateWebPanels();
-    this._updateSidebarButton();
-    this._updateWebPanel();
-    this._updateButtons();
-  },
-
-  _updateSidebarButton() {
-    let button = document.getElementById("zen-sidepanel-button");
-    if (!document.getElementById("zen-sidebar-web-panel").hasAttribute("hidden")) {
-      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");
-  },
-
-  _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();
-  },
-
-  _createNewPanel(url) {
-    let data = this.sidebarData;
-    let newName = "p" + new Date().getTime();
-    data.index.push(newName);
-    data.data[newName] = {
-      url: url,
-      ua: false,
-    };
-    Services.prefs.setStringPref("zen.sidebar.data", JSON.stringify(data));
-    this._currentPanel = newName;
-    this.open();
-  },
-
-  _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 = document.getElementById("zen-sidebar-web-panel");
-    for (let browser of sidebar.querySelectorAll("browser[zen-sidebar-id]")) {
-      browser.setAttribute("hidden", "true");
-      browser.docShellIsActive = false;
-    }
-  },
-
-  get introductionPanel() {
-    return document.getElementById("zen-sidebar-introduction-panel");
-  },
-
-  _updateWebPanel() {
-    this._updateButtons();
-    let sidebar = document.getElementById("zen-sidebar-web-panel");
-    this._hideAllWebPanels();
-    if (!this._currentPanel) {
-      this.introductionPanel.removeAttribute("hidden");
-      return;
-    }
-    this.introductionPanel.setAttribute("hidden", "true");
-    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;
-    gZenUIManager.openAndChangeToTab(url);
-    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();
-    this.close();
-    this._lastOpenedPanel = null;
-    Services.prefs.setStringPref("zen.sidebar.data", JSON.stringify(data));
-  },
-
-  contextUnload() {
-    let browser = this._getBrowserById(this.contextTab);
-    browser.remove();
-    this._closeSidebarPanel();
-    this.close();
-    this._lastOpenedPanel = null;
-  },
-
-  insertIntoContextMenu() {
-    const sibling = document.getElementById("context-stripOnShareLink");
-    const menuitem = document.createXULElement("menuitem");
-    menuitem.setAttribute("id", "context-zenAddToWebPanel");
-    menuitem.setAttribute("hidden", "true");
-    menuitem.setAttribute("oncommand", "gZenBrowserManagerSidebar.addPanelFromContextMenu();");
-    menuitem.setAttribute("data-l10n-id", "zen-web-side-panel-context-add-to-panel");
-    sibling.insertAdjacentElement("afterend", menuitem);
-  },
-
-  addPanelFromContextMenu() {
-    const url = gContextMenu.linkURL || gContextMenu.target.ownerDocument.location.href;
-    this._createNewPanel(url);
-  },
-};
-
-gZenBrowserManagerSidebar.init();

src/browser/base/content/ZenStartup.mjs

@@ -0,0 +1,111 @@
+
+var ZenStartup = {
+  init() {
+    this._changeSidebarLocation();
+    this._zenInitBrowserLayout();
+    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 kElementsToAppend = [
+      "sidebar-splitter",
+      "sidebar-box",
+      "navigator-toolbox",
+    ];
+    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");
+
+    // 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");
+    const titlebar = document.getElementById("navigator-toolbox");
+    titlebar.insertAdjacentElement("afterend", splitter);
+  },
+
+  _focusSearchBar() {
+    gURLBar.focus();
+  },
+};
+
+ZenStartup.init();

src/browser/base/content/ZenUIManager.mjs

@@ -21,6 +21,10 @@ var gZenUIManager = {
     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 = {
@@ -28,7 +32,35 @@ var gZenVerticalTabsManager = {
     //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() {
@@ -73,9 +105,38 @@ var gZenVerticalTabsManager = {
   toggleExpand() {
     let expanded = !this.expanded;
     Services.prefs.setBoolPref('zen.view.sidebar-expanded', expanded);
-
-    let toolbox = document.getElementById('navigator-toolbox');
-    toolbox.removeAttribute('width');
-    toolbox.style.removeProperty('width');
+    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,305 +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);
-    this.insertIntoContextMenu();
-    console.log("ZenViewSplitter initialized");
-  },
-
-  handleEvent(event) {
-    switch (event.type) {
-      case "TabClose":
-        this.onTabClose(event);
-    }
-  },
-
-  insertIntoContextMenu() {
-    const sibling = document.getElementById("context-stripOnShareLink");
-    const menuitem = document.createXULElement("menuitem");
-    menuitem.setAttribute("id", "context-zenSplitLink");
-    menuitem.setAttribute("hidden", "true");
-    menuitem.setAttribute("oncommand", "gZenViewSplitter.contextSplitLink();");
-    menuitem.setAttribute("data-l10n-id", "zen-split-link");
-    const separator = document.createXULElement("menuseparator");
-    sibling.insertAdjacentElement("afterend", menuitem);
-    sibling.insertAdjacentElement("afterend", separator);
-  },
-
-  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);
-  },
-
-  contextSplitLink() {
-    const url = gContextMenu.linkURL || gContextMenu.target.ownerDocument.location.href;
-    const tab = gBrowser.selectedTab;
-    const newTab = gZenUIManager.openAndChangeToTab(url);
-    this.splitTabs([tab, newTab]);
-  },
-
-  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;
-    }
-    // Check if any tab is already split
-    for (const tab of tabs) {
-      if (tab._zenSplitted) {
-        let index = this._data.findIndex((group) => group.tabs.includes(tab));
-        if (index < 0) {
-          return;
-        }
-        this._showSplitView(tab);
-        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);
-      // console.log("Setting the active tab to be active", gBrowser.selectedTab);
-      gBrowser.selectedTab.linkedBrowser.docShellIsActive = true; // Make sure the active tab is active
-      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,426 +0,0 @@
-
-var ZenWorkspaces = {
-  async init() {
-    let docElement = document.documentElement;
-    if (docElement.getAttribute("chromehidden").includes("toolbar")
-      || docElement.getAttribute("chromehidden").includes("menubar")
-      || docElement.hasAttribute("privatebrowsingmode")) {
-      console.warn("ZenWorkspaces: !!! ZenWorkspaces is disabled in hidden windows !!!");
-      return; // We are in a hidden window, don't initialize ZenWorkspaces
-    } 
-    console.log("ZenWorkspaces: Initializing ZenWorkspaces...");
-    await this.initializeWorkspaces();
-    console.log("ZenWorkspaces: 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 _workspaces() {
-    if (!this._workspaceCache) {
-      this._workspaceCache = await IOUtils.readJSON(this._storeFile);
-      if (!this._workspaceCache.workspaces) {
-        this._workspaceCache.workspaces = [];
-      }
-    }
-    return this._workspaceCache;
-  },
-
-  onWorkspacesEnabledChanged() {
-    if (this.workspaceEnabled) {
-      this.initializeWorkspaces();
-    } else {
-      this._workspaceCache = null;
-      document.getElementById("zen-workspaces-button")?.remove();
-      for (let tab of gBrowser.tabs) {
-        gBrowser.showTab(tab);
-      }
-    }
-  },
-
-  async initializeWorkspaces() {
-    Services.prefs.addObserver("zen.workspaces.enabled", this.onWorkspacesEnabledChanged.bind(this));
-    this.initializeWorkspacesButton();
-    let file = new FileUtils.File(this._storeFile);
-    if (!file.exists()) {
-      await IOUtils.writeJSON(this._storeFile, {});
-    }
-    if (this.workspaceEnabled) {
-      let workspaces = await this._workspaces();
-      if (workspaces.workspaces.length === 0) {
-        await this.createAndSaveWorkspace("Default Workspace", true);
-      } else {
-        let activeWorkspace = workspaces.workspaces.find(workspace => workspace.default);
-        if (!activeWorkspace) {
-          activeWorkspace = workspaces.workspaces.find(workspace => workspace.used);
-          activeWorkspace.used = true;
-          await this.saveWorkspaces();
-        }
-        if (!activeWorkspace) {
-          activeWorkspace = workspaces.workspaces[0];
-          activeWorkspace.used = true;
-          await this.saveWorkspaces();
-        }
-        await this.changeWorkspace(activeWorkspace);
-      }
-      this._initializeWorkspaceIcons();
-    }
-  },
-
-  _initializeWorkspaceIcons() {
-    const kIcons = ["🏠", "📄", "💹", "💼", "📧", "✅", "👥"];
-    let container = document.getElementById("PanelUI-zen-workspaces-create-icons-container");
-    for (let icon of kIcons) {
-      let button = document.createXULElement("toolbarbutton");
-      button.className = "toolbarbutton-1";
-      button.setAttribute("label", icon);
-      button.onclick = ((event) => {
-        for (let button of container.children) {
-          button.removeAttribute("selected");
-        }
-        button.setAttribute("selected", "true");
-      }).bind(this, button);
-      container.appendChild(button);
-    }
-  },
-
-  async saveWorkspace(workspaceData) {
-    let json = await IOUtils.readJSON(this._storeFile);
-    if (typeof json.workspaces === "undefined") {
-      json.workspaces = [];
-    }
-    json.workspaces.push(workspaceData);
-    console.log("ZenWorkspaces: Saving workspace", workspaceData);
-    await IOUtils.writeJSON(this._storeFile, json);
-    this._workspaceCache = null;
-  },
-
-  async removeWorkspace(windowID) {
-    let json = await this._workspaces();
-    console.log("ZenWorkspaces: Removing workspace", windowID);
-    await this.changeWorkspace(json.workspaces.find(workspace => workspace.uuid !== windowID));
-    this._deleteAllTabsInWorkspace(windowID);
-    json.workspaces = json.workspaces.filter(workspace => workspace.uuid !== windowID);
-    await this.unsafeSaveWorkspaces(json);
-    await this._propagateWorkspaceData();
-  },
-
-  async saveWorkspaces() {
-    await IOUtils.writeJSON(this._storeFile, await this._workspaces());
-    this._workspaceCache = null;
-  },
-
-  async unsafeSaveWorkspaces(workspaces) {
-    await IOUtils.writeJSON(this._storeFile, workspaces);
-    this._workspaceCache = null;
-  },
-
-  // Workspaces dialog UI management
-
-  openSaveDialog() {
-    let parentPanel = document.getElementById("PanelUI-zen-workspaces-multiview");
-    PanelUI.showSubView("PanelUI-zen-workspaces-create", parentPanel);
-  },
-
-  cancelWorkspaceCreation() {
-    let parentPanel = document.getElementById("PanelUI-zen-workspaces-multiview");
-    parentPanel.goBack();
-  },
-
-  workspaceHasIcon(workspace) {
-    return typeof workspace.icon !== "undefined" && workspace.icon !== "";
-  },
-
-  getWorkspaceIcon(workspace) {
-    if (this.workspaceHasIcon(workspace)) {
-      return workspace.icon;
-    }
-    return workspace.name[0].toUpperCase();
-  },
-
-  async _propagateWorkspaceData() {
-    let currentContainer = document.getElementById("PanelUI-zen-workspaces-current-info");
-    let workspaceList = document.getElementById("PanelUI-zen-workspaces-list");
-    const createWorkspaceElement = (workspace) => {
-      let element = document.createXULElement("toolbarbutton");
-      element.className = "subviewbutton";
-      element.setAttribute("tooltiptext", workspace.name);
-      element.setAttribute("zen-workspace-id", workspace.uuid);
-      //element.setAttribute("context", "zenWorkspaceActionsMenu");
-      let childs = window.MozXULElement.parseXULToFragment(`
-        <div class="zen-workspace-icon">
-          ${this.getWorkspaceIcon(workspace)}
-        </div>
-        <div class="zen-workspace-name">
-          ${workspace.name}
-        </div>
-        <toolbarbutton closemenu="none" class="toolbarbutton-1 zen-workspace-actions">
-          <image class="toolbarbutton-icon" id="zen-workspace-actions-menu-icon"></image>
-        </toolbarbutton>
-      `);
-      childs.querySelector(".zen-workspace-actions").addEventListener("command", ((event) => {
-        let button = event.target;
-        this._contextMenuId = button.closest("toolbarbutton[zen-workspace-id]").getAttribute("zen-workspace-id");
-        const popup = button.ownerDocument.getElementById(
-          "zenWorkspaceActionsMenu"
-        );
-        popup.openPopup(button, "after_end");
-      }).bind(this));
-      element.appendChild(childs);
-      element.onclick = (async () => {
-        if (event.target.closest(".zen-workspace-actions")) {
-          return; // Ignore clicks on the actions button
-        }
-        await this.changeWorkspace(workspace)
-        let panel = document.getElementById("PanelUI-zen-workspaces");
-        PanelMultiView.hidePopup(panel);
-      }).bind(this, workspace);
-      return element;
-    }
-    let workspaces = await this._workspaces();
-    let activeWorkspace = workspaces.workspaces.find(workspace => workspace.used);
-    currentContainer.innerHTML = "";
-    workspaceList.innerHTML = "";
-    workspaceList.parentNode.style.display = "flex";
-    if (workspaces.workspaces.length - 1 <= 0) {
-      workspaceList.innerHTML = "No workspaces available";
-      workspaceList.setAttribute("empty", "true");
-    } else {
-      workspaceList.removeAttribute("empty");
-    }
-    if (activeWorkspace) {
-      let currentWorkspace = createWorkspaceElement(activeWorkspace);
-      currentContainer.appendChild(currentWorkspace);
-    }
-    for (let workspace of workspaces.workspaces) {
-      if (workspace.used) {
-        continue;
-      }
-      let workspaceElement = createWorkspaceElement(workspace);
-      workspaceList.appendChild(workspaceElement);
-    }
-  },
-
-  async openWorkspacesDialog(event) {
-    if (!this.workspaceEnabled) {
-      return;
-    }
-    let target = event.target;
-    let panel = document.getElementById("PanelUI-zen-workspaces");
-    await this._propagateWorkspaceData();
-    PanelMultiView.openPopup(panel, target, {
-      position: "bottomright topright",
-      triggerEvent: event,
-    }).catch(console.error);
-  },
-
-  initializeWorkspacesButton() {
-    if (!this.workspaceEnabled) {
-      return;
-    } else if (document.getElementById("zen-workspaces-button")) {
-      let button = document.getElementById("zen-workspaces-button");
-      button.removeAttribute("hidden");
-      return;
-    }
-    let browserTabs = document.getElementById("tabbrowser-tabs");
-    let button = document.createElement("toolbarbutton");
-    button.id = "zen-workspaces-button";
-    button.className = "toolbarbutton-1 chromeclass-toolbar-additional";
-    button.setAttribute("label", "Workspaces");
-    button.setAttribute("tooltiptext", "Workspaces");
-    button.onclick = this.openWorkspacesDialog.bind(this);
-    browserTabs.insertAdjacentElement("beforebegin", button);
-  },
-
-  async _updateWorkspacesButton() {
-    let button = document.getElementById("zen-workspaces-button");
-    if (!button) {
-      return;
-    }
-    let activeWorkspace = (await this._workspaces()).workspaces.find(workspace => workspace.used);
-    if (activeWorkspace) {
-      button.innerHTML = `
-        <div class="zen-workspace-sidebar-icon">
-          ${this.getWorkspaceIcon(activeWorkspace)}
-        </div>
-        <div class="zen-workspace-sidebar-name">
-          ${activeWorkspace.name}
-        </div>
-      `;
-      if (!this.workspaceHasIcon(activeWorkspace)) {
-        button.querySelector(".zen-workspace-sidebar-icon").setAttribute("no-icon", "true");
-      }
-    }
-  },
-
-  // Workspaces management
-
-  get _workspaceInput() {
-    return document.getElementById("PanelUI-zen-workspaces-create-input");
-  },
-
-  _deleteAllTabsInWorkspace(workspaceID) {
-    for (let tab of gBrowser.tabs) {
-      if (tab.getAttribute("zen-workspace-id") === workspaceID) {
-        gBrowser.removeTab(tab, {
-          animate: true,
-          skipSessionStore: true,
-          closeWindowWithLastTab: false,
-        });
-      }
-    }
-  },
-
-  _prepareNewWorkspace(window) {
-    document.documentElement.setAttribute("zen-workspace-id", window.uuid);
-    let tabCount = 0;
-    for (let tab of gBrowser.tabs) {
-      if (!tab.hasAttribute("zen-workspace-id")) {
-        tab.setAttribute("zen-workspace-id", window.uuid);
-        tabCount++;
-      }
-    }
-    if (tabCount === 0) {
-      this._createNewTabForWorkspace(window);
-    }
-  },
-
-  _createNewTabForWorkspace(window) {
-    let tab = gZenUIManager.openAndChangeToTab(Services.prefs.getStringPref("browser.startup.homepage"));
-    tab.setAttribute("zen-workspace-id", window.uuid);
-  },
-
-  async saveWorkspaceFromInput() {
-    // Go to the next view
-    let parentPanel = document.getElementById("PanelUI-zen-workspaces-multiview");
-    PanelUI.showSubView("PanelUI-zen-workspaces-create-icons", parentPanel);
-  },
-
-  async saveWorkspaceFromIcon() {
-    let workspaceName = this._workspaceInput.value;
-    if (!workspaceName) {
-      return;
-    }
-    this._workspaceInput.value = "";
-    let icon = document.querySelector("#PanelUI-zen-workspaces-create-icons-container [selected]");
-    icon?.removeAttribute("selected");
-    await this.createAndSaveWorkspace(workspaceName, false, icon?.label);
-    document.getElementById("PanelUI-zen-workspaces").hidePopup(true);
-  },
-
-  onWorkspaceNameChange(event) {
-    let button = document.getElementById("PanelUI-zen-workspaces-create-save");
-    if (this._workspaceInput.value === "") {
-      button.setAttribute("disabled", "true");
-      return;
-    }
-    button.removeAttribute("disabled");
-  },
-
-  async changeWorkspace(window) {
-    if (!this.workspaceEnabled) {
-      return;
-    }
-    let firstTab = undefined;
-    let workspaces = await this._workspaces();
-    for (let workspace of workspaces.workspaces) {
-      workspace.used = workspace.uuid === window.uuid;
-    }
-    this.unsafeSaveWorkspaces(workspaces);
-    console.log("ZenWorkspaces: Changing workspace to", window.uuid);
-    for (let tab of gBrowser.tabs) {
-      if (tab.getAttribute("zen-workspace-id") === window.uuid && !tab.pinned) {
-        if (!firstTab) {
-          firstTab = tab;
-          gBrowser.selectedTab = firstTab;
-        }
-        gBrowser.showTab(tab);
-      }
-    }
-    if (typeof firstTab === "undefined") {
-      this._createNewTabForWorkspace(window);
-    }
-    for (let tab of gBrowser.tabs) {
-      if (tab.getAttribute("zen-workspace-id") !== window.uuid) {
-        gBrowser.hideTab(tab);
-      }
-    }
-    document.documentElement.setAttribute("zen-workspace-id", window.uuid);
-    await this.saveWorkspaces();
-    await this._updateWorkspacesButton();
-    await this._propagateWorkspaceData();
-  },
-
-  _createWorkspaceData(name, isDefault, icon) {
-    let window = {
-      uuid: gZenUIManager.generateUuidv4(),
-      default: isDefault,
-      used: true,
-      icon: icon,
-      name: name,
-    };
-    this._prepareNewWorkspace(window);
-    return window;
-  },
-
-  async createAndSaveWorkspace(name = "New Workspace", isDefault = false, icon = undefined) {
-    if (!this.workspaceEnabled) {
-      return;
-    }
-    let workspaceData = this._createWorkspaceData(name, isDefault, icon);
-    await this.saveWorkspace(workspaceData);
-    await this.changeWorkspace(workspaceData);
-  },
-
-  async onLocationChange(browser) {
-    let tab = gBrowser.getTabForBrowser(browser);
-    let workspaceID = tab.getAttribute("zen-workspace-id");
-    if (!workspaceID) {
-      let workspaces = await this._workspaces();
-      let activeWorkspace = workspaces.workspaces.find(workspace => workspace.used);
-      if (!activeWorkspace) {
-        return;
-      }
-      tab.setAttribute("zen-workspace-id", activeWorkspace.uuid);
-    }
-  },
-
-  // Context menu management
-
-  _contextMenuId: null,
-  async updateContextMenu(_) {
-    console.assert(this._contextMenuId, "No context menu ID set");
-    document.querySelector(`#PanelUI-zen-workspaces [zen-workspace-id="${this._contextMenuId}"] .zen-workspace-actions`).setAttribute("active", "true");
-    const workspaces = await this._workspaces();
-    let deleteMenuItem = document.getElementById("context_zenDeleteWorkspace");
-    if (workspaces.workspaces.length <= 1 || workspaces.workspaces.find(workspace => workspace.uuid === this._contextMenuId).default) {
-      deleteMenuItem.setAttribute("disabled", "true");
-    } else {
-      deleteMenuItem.removeAttribute("disabled");
-    }
-  },
-
-  onContextMenuClose() {
-    let target = document.querySelector(`#PanelUI-zen-workspaces [zen-workspace-id="${this._contextMenuId}"] .zen-workspace-actions`);
-    if (target) {
-      target.removeAttribute("active");
-    }
-    this._contextMenuId = null;
-  },
-
-  async contextDelete() {
-    await this.removeWorkspace(this._contextMenuId);
-  }
-};
-
-ZenWorkspaces.init();

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

@@ -1,69 +0,0 @@
-diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
-index cdd08ec8f3d3cd652be9fcf6d4fb5b50dcf270ba..6cb35378aea2e7967dff0c91d09201b053645fbd 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");
- 
- panelmultiview {
-@@ -566,9 +568,9 @@ printpreview-pagination:focus-within,
- 
- 
- #sidebar-box {
--  min-width: 14em;
-+  min-width: 323px;
-   max-width: 36em;
--  width: 18em;
-+  width: 393px;
- }
- 
- /* WebExtension Sidebars */
-@@ -583,3 +585,43 @@ printpreview-pagination:focus-within,
- toolbar[keyNav=true]:not([collapsed=true], [customizing=true]) toolbartabstop {
-   -moz-user-focus: normal;
- }
-+
-+
-+/**
-+ *
-+ * 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,12 +1,13 @@
 diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
-index a79a9734619f89639c15087fe28e9615354a7209..edaef604d33d76b570571e1bbb2ebc590e045d87 100644
+index f8d49ac2a3a62f389ea44b07a26fcb102abc0b24..c29415e10c776ebc435f33e55f8afb71f0dcf22a 100644
 --- a/browser/base/content/browser-init.js
 +++ b/browser/base/content/browser-init.js
-@@ -237,6 +237,9 @@ var gBrowserInit = {
+@@ -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) {

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 3063370347db9e2812ad30205e585c849e44c91e..be74d9e624b8220cb9bd009bae31fb513c4ec73f 100644
+index 481ebbee437250c71e9bd10c4fb6fc0c31314925..3bb046a4635fad831cc447e29516ee5ed407a3f2 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
-@@ -139,6 +139,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)
-@@ -160,9 +162,12 @@
+@@ -159,9 +161,12 @@
      </vbox>
    </html:template>
  
@@ -27,10 +27,3 @@ index 3063370347db9e2812ad30205e585c849e44c91e..be74d9e624b8220cb9bd009bae31fb51
  
    <html:template id="customizationPanel">
      <box id="customization-container" flex="1" hidden="true"><![CDATA[
-@@ -176,5 +181,6 @@
- 
-   <!-- Put it at the very end to make sure it's not covered by anything. -->
-   <html:div id="fullscr-toggler" hidden="hidden"/>
-+#include zen-watermark.inc.xhtml
- </html:body>
- </html>

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>

src/browser/base/content/main-popupset-inc-xhtml.patch

@@ -1,21 +1,8 @@
 diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
-index ef8245938ea669227c255d85422a26b99cb2290b..48c061796072e976a45f7bd0ca1c8b3913728fc7 100644
+index 1fb595272a184f9a40f56f87d86232e3324f7750..8dd0f0ff856be524a5fa27fb8c6180c1fe058134 100644
 --- a/browser/base/content/main-popupset.inc.xhtml
 +++ b/browser/base/content/main-popupset.inc.xhtml
-@@ -80,6 +80,12 @@
-     <menuitem id="context_closeDuplicateTabs"
-               data-lazy-l10n-id="tab-context-close-duplicate-tabs"
-               oncommand="gBrowser.removeDuplicateTabs(TabContextMenu.contextTab);"/>
-+    <menuseparator/>
-+    <menuitem id="context_zenSplitTabs"
-+              data-lazy-l10n-id="tab-zen-split-tabs"
-+              data-l10n-args='{"tabCount": 1}'
-+              oncommand="gZenViewSplitter.contextSplitTabs();"/>
-+    <menuseparator/>
-     <menu id="context_closeTabOptions"
-           data-lazy-l10n-id="tab-context-close-multiple-tabs">
-       <menupopup id="closeTabOptions">
-@@ -169,6 +175,10 @@
+@@ -144,6 +144,10 @@
             hidden="true"
             tabspecific="true"
             aria-labelledby="editBookmarkPanelTitle">
@@ -26,22 +13,15 @@ index ef8245938ea669227c255d85422a26b99cb2290b..48c061796072e976a45f7bd0ca1c8b39
        <box class="panel-header">
          <html:h1>
            <html:span id="editBookmarkPanelTitle"/>
-@@ -191,12 +201,14 @@
-                   class="footer-button"
-                   data-l10n-id="bookmark-panel-save-button"
-                   default="true"
-+                  autofocus="true"
-                   oncommand="StarUI.panel.hidePopup();"/>
-           <button id="editBookmarkPanelRemoveButton"
-                   class="footer-button"
-                   oncommand="StarUI.removeBookmarkButtonCommand();"/>
+@@ -169,6 +173,7 @@
+                   class="footer-button"/>
          </html:moz-button-group>
        </vbox>
 +      </vbox>
      </panel>
    </html:template>
  
-@@ -514,6 +526,8 @@
+@@ -454,6 +459,8 @@
  
  #include popup-notifications.inc
  

src/browser/base/content/navigator-toolbox-inc-xhtml.patch

@@ -1,7 +1,16 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index 390a1300a1213af2b411ba09c67e3c25750ee6c3..7c80c54dd43b5414bf5ea9101d53431c0b4a140b 100644
+index 390a1300a1213af2b411ba09c67e3c25750ee6c3..a7ab07f8e8a0c5f91a6c12eb5d27c56edbd7405c 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
+@@ -2,7 +2,7 @@
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
+-<toolbox id="navigator-toolbox">
++<toolbox id="navigator-toolbox" persist="width style">
+ 
+   <vbox id="titlebar">
+     <!-- Menu -->
 @@ -32,10 +32,11 @@
  
        <hbox class="titlebar-spacer" type="pre-tabs"/>
@@ -44,22 +53,7 @@ index 390a1300a1213af2b411ba09c67e3c25750ee6c3..7c80c54dd43b5414bf5ea9101d53431c
      </toolbar>
  
    </vbox>
-@@ -409,6 +412,14 @@
-                 <image id="star-button"
-                        class="urlbar-icon"/>
-               </hbox>
-+              <hbox id="zen-split-views-box"
-+                  hidden="true"
-+                  role="button"
-+                  class="urlbar-page-action"
-+                  onclick="gZenViewSplitter.openSplitViewPanel(event);">
-+                <image id="zen-split-views-button"
-+                      class="urlbar-icon"/>
-+              </hbox>
-             </hbox>
-           </hbox>
-         </hbox>
-@@ -450,6 +461,7 @@
+@@ -450,6 +453,7 @@
  
        <toolbarbutton id="fxa-toolbar-menu-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
                       badged="true"
@@ -67,7 +61,7 @@ index 390a1300a1213af2b411ba09c67e3c25750ee6c3..7c80c54dd43b5414bf5ea9101d53431c
                       delegatesanchor="true"
                       onmousedown="gSync.toggleAccountPanel(this, event)"
                       onkeypress="gSync.toggleAccountPanel(this, event)"
-@@ -501,6 +513,8 @@
+@@ -501,6 +505,8 @@
                       consumeanchor="PanelUI-button"
                       data-l10n-id="appmenu-menu-button-closed2"/>
      </toolbaritem>