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

Align Theme Store layout

.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!
+      placeholder: I 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
     validations:
       required: true
   - type: textarea
-    id: logs
+    id: other-details
     attributes:
-      label: Additional context
+      label: Other details
-      description: Add any other context about the feature request here.
+      placeholder: Add any additional details about the feature request here.

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

@@ -97,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

@@ -45,6 +45,30 @@ jobs:
           brew install cairo sccache gnu-tar mercurial
           sudo pip install setuptools
 
+          # completly uninstall python3 and python3.12
+          brew uninstall --ignore-dependencies python3.12 -f
+
+          export PATH="$(python3 -m site --user-base)/bin":$PATH
+          python3 -m pip install --user mercurial
+
+          rm '/usr/local/bin/2to3-3.11' # fix Could not symlink bin/2to3-3.11
+          rm '/usr/local/bin/2to3-3.12' # fix Could not symlink bin/2to3-3.12
+          rm /usr/local/bin/2to3 # fix Could not symlink bin/2to3
+          rm '/usr/local/bin/idle3.11' #fix Could not symlink bin/idle3.11
+          rm '/usr/local/bin/idle3.12' # fix Could not symlink bin/idle3.12
+          rm '/usr/local/bin/idle3' # fix Could not symlink bin/idle3
+          rm '/usr/local/bin/pydoc3.11' # fix Could not symlink bin/pydoc3.11
+          rm '/usr/local/bin/pydoc3.12' # fix Could not symlink bin/pydoc3.12
+          rm '/usr/local/bin/pydoc3' # fix Could not symlink bin/pydoc3
+          rm '/usr/local/bin/python3.11' # fix Could not symlink bin/python3.11
+          rm '/usr/local/bin/python3.12' # fix Could not symlink bin/python3.12
+          rm '/usr/local/bin/python3' # fix Could not symlink bin/python3
+          rm '/usr/local/bin/python3.11-config' # fix Could not symlink bin/python3.11-config
+          rm '/usr/local/bin/python3.12-config' # fix Could not symlink bin/python3.12-config
+          rm '/usr/local/bin/python3-config' # fix Could not symlink bin/python3-config
+
+          brew install watchman
+
       - name: Force usage fo gnu-tar
         run: |
           echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.bash_profile
@@ -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
+      - name: Build language packs
-        run: |
+        run: sh scripts/download-language-packs.sh
-          cd engine
-          ./mach --no-interactive bootstrap --application-choice browser 
-          cd ..
 
       - name: build Zen
         env:

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

@@ -141,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 }}

.gitmodules

@@ -1,3 +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

README.md

@@ -7,28 +7,33 @@ Experience tranquillity while browsing the web without people tracking you!
 * [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 `129.0.1`!
+Zen is currently built using firefox version `129.0.2`!
 
-* Checkout the latest [releases notes](https://www.zen-browser.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](./docs/performance.md)!
+* 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
 ```
 
@@ -61,6 +66,7 @@ npm start
 - [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
 
@@ -70,5 +76,15 @@ Zen coudn't be in its current state without the help of these amazing projects!
 
 ## 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,6 +3,9 @@ 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_BASENAME=Zen
 export MOZ_APP_PROFILE=${binName}
@@ -75,7 +78,7 @@ if test "$ZEN_RELEASE"; then
 
   ac_add_options --enable-updater
 
-  #export MOZ_PACKAGE_JSSHELL=1
+  export MOZ_PACKAGE_JSSHELL=1
 fi
 
 ac_add_options --enable-unverified-updates
@@ -89,7 +92,6 @@ 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

configs/windows/mozconfig

@@ -33,12 +33,12 @@ ac_add_options --disable-maintenance-service
 ac_add_options --disable-bits-download
  
 if test "$SURFER_COMPAT" = "true"; then
-  ac_add_options --enable-optimize="-O3 -w"
+  ac_add_options --enable-optimize="-O2 -Qvec -mtune=haswell -march=x86-64 -w"
 
-  export CFLAGS="-mtune=haswell -march=x86-64"
+  export CFLAGS="-mtune=haswell -march=x86-64 -O2 -Qvec -w"
-  export CPPFLAGS="-mtune=haswell -march=x86-64"
+  export CPPFLAGS="-mtune=haswell -march=x86-64 -O2 -Qvec -w"
-  export CXXFLAGS="-mtune=haswell -march=x86-64"
+  export CXXFLAGS="-mtune=haswell -march=x86-64 -O2 -Qvec -w"
-  export LDFLAGS="-Wl,-O3"
+  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 -w"

docs/performance.md

@@ -24,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% |
 

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

@@ -29,7 +29,7 @@ modules:
 
       - 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.png ${{FLATPAK_DEST}}/share/icons/hicolor/256x256/apps/${{FLATPAK_ID}}.png
+      - 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
 

package.json

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

pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@zen-browser/surfer':
-        specifier: ^1.2.8
+        specifier: ^1.3.4
-        version: 1.2.8
+        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.8':
+  '@zen-browser/surfer@1.3.4':
-    resolution: {integrity: sha512-eMWZur7TnBCeLOFEVjxdBQnFfMCg2yzpgKOu+Dfy3nBxqDPg6gKanNX8nUY6I+oT+fiTG3FC4cVTGdE3Ye+8MQ==}
+    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.8':
+  '@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

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

@@ -47,6 +47,7 @@ pref("network.http.pacing.requests.enabled", false);
 pref("network.dnsCacheExpiration", 3600);
 pref("network.http.max-persistent-connections-per-proxy", 48); // default=32
 pref("network.websocket.max-connections", 400); // default=200
+pref("network.ssl_tokens_cache_capacity", 32768);
 
 /** MIXED CONTENT + CROSS-SITE ***/
 pref("pdfjs.enableScripting", false);

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,6 +59,9 @@ 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);
@@ -68,9 +74,14 @@ pref('zen.theme.toolbar-themed', true);
 pref('zen.theme.pill-button', false);
 pref('zen.view.compact', false);
 pref('zen.view.compact.hide-toolbar', false);
+
 pref('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);
@@ -127,6 +138,14 @@ 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)
@@ -150,5 +169,6 @@ pref("devtools.chrome.enabled", true);
 pref("sidebar.revamp", false, locked);
 pref("sidebar.verticalTabs", false, locked);
 
-// Better scrollbar for Windows
+// Better Windows theming
 pref("widget.non-native-theme.scrollbar.style", 2);
+pref("widget.non-native-theme.use-theme-accent", true);

src/browser/base/content/ZenStartup.mjs

@@ -3,6 +3,7 @@ var ZenStartup = {
   init() {
     this._changeSidebarLocation();
     this._zenInitBrowserLayout();
+    this._focusSearchBar();
   },
 
   _zenInitBrowserLayout() {
@@ -101,6 +102,10 @@ var ZenStartup = {
     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,8 +32,20 @@ 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() {
@@ -89,11 +105,13 @@ var gZenVerticalTabsManager = {
   toggleExpand() {
     let expanded = !this.expanded;
     Services.prefs.setBoolPref('zen.view.sidebar-expanded', expanded);
+    Services.prefs.setBoolPref('zen.view.sidebar-expanded.on-hover', false);
   },
 };
 
 var gZenCompactModeManager = {
   init() {
+    Services.prefs.addObserver('zen.view.compact', this._updateEvent.bind(this));
   },
 
   get prefefence() {
@@ -104,6 +122,10 @@ var gZenCompactModeManager = {
     Services.prefs.setBoolPref('zen.view.compact', value);
   },
 
+  _updateEvent() {
+    Services.prefs.setBoolPref('zen.view.sidebar-expanded.on-hover', false);
+  },
+
   toggle() {
     this.preference = !this.prefefence;
   },

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

@@ -15,6 +15,7 @@
         content/browser/zen-styles/zen-buttons.css              (content/zen-styles/zen-buttons.css)
         content/browser/zen-styles/zen-tabs.css                 (content/zen-styles/zen-tabs.css)
         content/browser/zen-styles/zen-tabs/vertical-tabs.css   (content/zen-styles/zen-tabs/vertical-tabs.css)
+        content/browser/zen-styles/zen-tabs/horizontal-tabs.css (content/zen-styles/zen-tabs/horizontal-tabs.css)
         content/browser/zen-styles/zen-browser-ui.css           (content/zen-styles/zen-browser-ui.css)
         content/browser/zen-styles/zen-animations.css           (content/zen-styles/zen-animations.css)
         content/browser/zen-styles/zen-panel-ui.css             (content/zen-styles/zen-panel-ui.css)

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

@@ -1,4 +1,5 @@
 <link rel="localization" href="browser/zen-web-side-panels.ftl"/>
 <link rel="localization" href="browser/zen-workspaces.ftl"/>
 <link rel="localization" href="browser/zen-split-view.ftl"/>
+<link rel="localization" href="browser/zen-general.ftl"/>
 <link rel="localization" href="browser/zen-vertical-tabs.ftl"/>

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

@@ -129,5 +129,8 @@
 <menupopup id="zenWorkspaceActionsMenu"
             onpopupshowing="ZenWorkspaces.updateContextMenu(this);"
             onpopuphidden="ZenWorkspaces.onContextMenuClose();">
-  <menuitem id="context_zenDeleteWorkspace" oncommand="ZenWorkspaces.contextDelete();" data-l10n-id="zen-workspaces-panel-context-delete"/>
+  <menuitem id="context_zenOpenWorkspace" oncommand="ZenWorkspaces.openWorkspace();" data-l10n-id="zen-workspaces-panel-context-open"/>
+  <menuseparator/>
+  <menuitem id="context_zenSetAsDefaultWorkspace" oncommand="ZenWorkspaces.setDefaultWorkspace();" data-l10n-id="zen-workspaces-panel-context-set-default"/>
+  <menuitem id="context_zenDeleteWorkspace" oncommand="ZenWorkspaces.contextDelete(event);" data-l10n-id="zen-workspaces-panel-context-delete"/>
 </menupopup>

src/browser/base/content/zen-styles/zen-browser-container.css

@@ -4,8 +4,9 @@
     width: -moz-available;
     margin: 0 var(--zen-element-separation) var(--zen-element-separation) 0;
     box-shadow: 0 0 0 1px var(--zen-colors-border);
-    clip-path: inset(-5px -5px -5px round var(--zen-browser-border-radius));
+    clip-path: inset(-5px -5px -5px round var(--zen-webview-border-radius, var(--zen-border-radius)));
-    border-radius: var(--zen-browser-border-radius);
+    border-radius: var(--zen-webview-border-radius, var(--zen-border-radius));
+    transform: translate3d(0, 0, 0);
     overflow: hidden;
   }
 }

src/browser/base/content/zen-styles/zen-browser-ui.css

@@ -1,11 +1,15 @@
  
-#navigator-toolbox, 
 #browser,
 #appcontent,
 #tabbrowser-tabpanels {
   background: transparent !important;
 }
 
+#navigator-toolbox {
+  /* see issue #426 */
+  background: var(--zen-navigator-toolbox-background, transparent) !important;
+}
+
 #browser {
   width: 100%;
 }

src/browser/base/content/zen-styles/zen-compact-mode.css

@@ -17,21 +17,29 @@
     position: absolute;
     display: block;
     transition: 200ms ease-in-out !important;
-    transform: translateX(calc(-100% + var(--zen-compact-toolbox-margin-single) + 2px));
+    transform: translateX(calc(-100% + (var(--zen-compact-toolbox-margin-single) / 2)));
     opacity: 0;
     line-height: 0;
     z-index: 1;
     height: 100%;
     margin: 0;
-    padding: var(--zen-compact-toolbox-margin);
+    padding: var(--zen-compact-toolbox-margin) !important;
-    padding-top: calc(var(--zen-compact-toolbox-margin-single) - var(--zen-element-separation));
 
     & #titlebar {
       border: 1px solid var(--zen-colors-border);
+      transition-delay: 200ms;
       background: var(--zen-colors-tertiary) !important;
       padding: 0 5px;
       border-radius: var(--zen-panel-radius);
     }
+
+    & > * {
+      pointer-events: none;  
+    }
+
+    &, & #titlebar {
+      min-width: calc(var(--zen-navigation-toolbar-min-width) + var(--zen-compact-toolbox-margin-single) * 4) !important;
+    }
   }
 
   @media not (-moz-bool-pref: "zen.view.sidebar-expanded") {
@@ -64,7 +72,7 @@
   @media not (-moz-bool-pref: "zen.view.compact.hide-toolbar") {
     #navigator-toolbox {
       /* Remove the top margin */
-      --zen-compact-toolbox-margin: calc(var(--zen-compact-toolbox-margin-single) / 3) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single);
+      --zen-compact-toolbox-margin: calc(var(--zen-compact-toolbox-margin-single) / 2) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single);
     }
 
     #zen-sidebar-web-panel-wrapper,
@@ -78,12 +86,15 @@
   #navigator-toolbox[zen-user-show],
   #mainPopupSet:has(> #appMenu-popup:hover) ~ toolbox,
   #navigator-toolbox:has(*[open="true"]:not(tab):not(#zen-sidepanel-button)) {
-    transition-delay: 33ms !important;
     transform: none !important;
     opacity: 1;
+
+    & > * {
+      pointer-events: all;  
+    }
   }
   
-  #navigator-toolbox > *{ line-height: normal; pointer-events: auto }
+  #navigator-toolbox > *{ line-height: normal; }
   
   #navigator-toolbox,
   #navigator-toolbox > *{
@@ -111,10 +122,6 @@
   }
 
   @media (-moz-bool-pref: "zen.view.compact.hide-toolbar") {
-    #navigator-toolbox {
-      padding-top: var(--zen-compact-toolbox-margin);
-    }
-
     #zen-appcontent-navbar-container {
       --urlbar-height: unset;
       transition: .2s ease-in-out;

src/browser/base/content/zen-styles/zen-popup.css

@@ -283,4 +283,3 @@ menu, menuitem {
     color: var(--button-hover-color);
   }
 }
-

src/browser/base/content/zen-styles/zen-sidebar.css

@@ -10,7 +10,7 @@
 }
 
 #sidebar-box {
-  --zen-sidebar-box-border-radius: var(--zen-browser-border-radius);  
+  --zen-sidebar-box-border-radius: var(--zen-panel-radius);  
   margin: var(--zen-element-separation);
   border-radius: var(--zen-sidebar-box-border-radius);
   overflow: hidden;
@@ -73,10 +73,7 @@
   display: none;
 }
 
-#TabsToolbar .toolbarbutton-1:hover > :is(.toolbarbutton-icon, .toolbarbutton-badge-stack),
+.zen-sidebar-action-button:hover {
-#TabsToolbar .toolbarbutton-1[open="true"] > :is(.toolbarbutton-icon, .toolbarbutton-badge-stack),
-.zen-sidebar-action-button:hover,
-.zen-sidebar-action-button[open="true"] {
   background: var(--toolbarbutton-hover-background) !important;
 }
 
@@ -215,7 +212,7 @@
 
 @media (-moz-bool-pref: "zen.view.sidebar-expanded.show-button") {
   #zen-expand-sidebar-button {
-    display: block;
+    display: flex;
   }
 }
  

src/browser/base/content/zen-styles/zen-tabs.css

@@ -1,6 +1,6 @@
 
 /* Styles for both vertical and horizontal tabs */
-/*@import url("chrome://browser/content/zen-styles/zen-tabs/horizontal-tabs.css");*/
+@import url("chrome://browser/content/zen-styles/zen-tabs/horizontal-tabs.css");
 @import url("chrome://browser/content/zen-styles/zen-tabs/vertical-tabs.css");
 
 #zen-tabbox-wrapper {

src/browser/base/content/zen-styles/zen-tabs/horizontal-tabs.css

@@ -0,0 +1,3 @@
+@media not (-moz-bool-pref: "zen.tabs.vertical") {
+  
+}

src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css

@@ -9,7 +9,7 @@
     margin-top: 0; /* Issue #156 */
   }
   
-  :root[inFullscreen="true"] #navigator-toolbox {
+  #navigator-toolbox {
     margin-top: 0 !important;
   }
   
@@ -31,6 +31,7 @@
   
   #TabsToolbar-customization-target {
     flex-direction: column;
+    max-width: 100%;
   }
   
   :root[customizing] .customization-target:not(#widget-overflow-fixed-list) {
@@ -150,6 +151,7 @@
   .tabbrowser-tab {
     margin-inline-start: 0;
     margin: 0 auto;
+    margin-bottom: 1.5px;
   }
   
   .tabbrowser-tab[pinned] {
@@ -234,14 +236,14 @@
     display: none; /* TODO: fix this */
   }
 
-  @media not (-moz-bool-pref: "zen.view.sidebar-expanded") {
+  @media (-moz-bool-pref: "zen.view.sidebar-collapsed.hide-mute-button") and (not (-moz-bool-pref: "zen.view.sidebar-expanded")) {
-    #navigator-toolbox {
+    .tab-icon-overlay:is([soundplaying], [muted]):not([selected]) {
-      width: fit-content !important;
+      display: none;
     }
   }
   
   @media (-moz-bool-pref: "zen.view.sidebar-expanded") {  
-    #navigator-toolbox {
+    #navigator-toolbox:is([zen-user-hover="true"]:hover, :not([zen-user-hover="true"])) {
       --zen-navigation-toolbar-min-width: 155px;
       min-width: var(--zen-navigation-toolbar-min-width) !important;
       align-items: start;
@@ -249,41 +251,40 @@
       width: 170px;
       border: none;
       padding-left: 2px;
-    }
     
-    .tab-label-container {
+      & .tab-label-container {
         display: block;
       }
     
-    #titlebar,
+      & #titlebar,
-    #TabsToolbar,
+      & #TabsToolbar,
-    #TabsToolbar .toolbar-items {
+      & #TabsToolbar .toolbar-items {
         width: 100%;
         align-items: flex-start;
       }
     
-    #TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) {
+      & #TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) {
         width: 100% !important;
         border-radius: 8px;
       }
     
-    #TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button):hover {
+      & #TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button):hover {
         background: var(--button-hover-bgcolor);
       }
     
-    #TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) .toolbarbutton-text,
+      & #TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) .toolbarbutton-text,
-    #TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) .toolbarbutton-icon,
+      & #TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) .toolbarbutton-icon,
-    #TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) .toolbarbutton-badge-stack {
+      & #TabsToolbar > .toolbar-items toolbarbutton:not(#zen-workspaces-button) .toolbarbutton-badge-stack {
         background: transparent !important;
       }
     
-    #tabbrowser-arrowscrollbox-periphery > toolbarbutton {
+      & #tabbrowser-arrowscrollbox-periphery > toolbarbutton {
         display: flex;
         justify-content: center;
         align-items: center;
       }
 
-    .tabbrowser-tab {
+      & .tabbrowser-tab {
         max-width: unset !important;
     
         &:not([pinned]) {
@@ -323,7 +324,8 @@
           margin: 0 !important;
         }
       }
-    #tabbrowser-arrowscrollbox::part(scrollbox) {
+
+      & #tabbrowser-arrowscrollbox::part(scrollbox) {
         /* We have the pinned tabs on the top, next to each other,
         * and the rest of the tabs are below them. */
         display: grid;
@@ -331,51 +333,127 @@
         padding: calc(var(--zen-tabbrowser-padding) / 2);
       }
     
-    .tabbrowser-tab:not([pinned]),
+      & .tabbrowser-tab:not([pinned]),
-    #tabbrowser-arrowscrollbox-periphery {
+      & #tabbrowser-arrowscrollbox-periphery {
         grid-column: 1 / -1;
       }
     
-    .tabbrowser-tab[pinned] {
+      & .tabbrowser-tab[pinned] {
         grid-column: span 1;
         min-width: 100%;
       }
     
-    #zen-sidebar-icons-wrapper {
+      & #zen-sidebar-icons-wrapper {
         width: -moz-available;
         display: grid;
         grid-template-columns: repeat(auto-fill, minmax(37px, 1fr));
         transition: .1s;
       }
     
-    #zen-sidebar-icons-wrapper::before {
+      & #zen-sidebar-icons-wrapper::before {
         width: 100%;
       }
     }
+  }
+
+  @media not (-moz-bool-pref: "zen.view.sidebar-expanded") {
+    #navigator-toolbox {
+      width: fit-content !important;
+    }
+  }
+
+  #navigator-toolbox[zen-user-hover="true"] {
+    width: fit-content !important;
+  } 
 
   /* Display the vertical tabs on the right side */
   @media (-moz-bool-pref: "zen.tabs.vertical.right-side") and (not (-moz-bool-pref: "zen.view.compact")) {
     #navigator-toolbox {
-      order: 4;
+      order: 6;
       padding-left: 0;
     }
 
-    @media (-moz-bool-pref: "zen.view.sidebar-expanded") {
-      #navigator-toolbox {
-        padding-right: 3px !important;
-      }
-    }
-
     #zen-sidebar-splitter {
-      order: 3;
+      order: 5;
     }
 
     #tabbrowser-tabbox {
-      padding-left: 10px;
+      padding-left: var(--zen-element-separation);
     }
 
     #tabbrowser-tabpanels .browserSidebarContainer {
       margin-right: 0 !important;
     }
   }
+
+  @media (-moz-bool-pref: "zen.view.sidebar-expanded.on-hover") and (not (-moz-bool-pref: "zen.view.compact")) {
+    #zen-sidebar-splitter {
+      display: none !important;
+    }
+
+    #navigator-toolbox {
+      z-index: 1;
+    }
+
+    #navigator-toolbox, #titlebar, #TabsToolbar {
+      transition: 0s !important;
+    }
+
+    #TabsToolbar {
+      --hovered-verticaltab-width: 20em;
+
+      z-index: 1;
+      background-repeat: no-repeat !important;
+      background-position: center center !important;
+      background-size: cover !important;
+
+      border-top: 1px solid transparent;
+      border-right: 1px solid transparent;
+
+      height: 100%;
+
+      border-top-right-radius: var(--zen-border-radius);
+      transform: translateY(-1px);
+    }
+    
+    #navigator-toolbox:not(:hover) #TabsToolbar #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab .tab-content[class] > .tab-close-button[class] {
+      display: none !important;
+      visibility: hidden !important;
+    }
+
+    #navigator-toolbox:hover {
+      --zen-navigation-toolbar-min-width: 3.7rem !important;
+    }
+        
+    #navigator-toolbox:hover #TabsToolbar {
+      z-index: 100 !important;
+      width: 250px !important;
+      background-color: var(--zen-dialog-background);
+      border-top-color: var(--zen-colors-border);
+      border-right-color: var(--zen-colors-border);
+      padding-right: .1rem !important;
+      position: absolute;
+    }
+
+    @media (-moz-bool-pref: "zen.tabs.vertical.right-side") {
+      #navigator-toolbox:hover {
+        --zen-navigation-toolbar-min-width: 0 !important;
+        position: relative;
+        padding: 0 !important;
+      }
+      
+      #TabsToolbar {
+        border-right: 0 !important;
+        border-left: 1px solid transparent;
+        border-top-right-radius: 0;
+        border-top-left-radius: var(--zen-border-radius);
+
+        right: 100%;
+      }
+
+      #navigator-toolbox:hover #TabsToolbar {
+        border-left: 1px solid var(--zen-colors-border);
+      }
+    }
+  }
 }

src/browser/base/content/zen-styles/zen-theme.css

@@ -28,7 +28,7 @@
   --zen-colors-input-bg: color-mix(in srgb, var(--zen-primary-color) 10%, white 80%);
 
   --zen-dialog-background: var(--zen-colors-tertiary);
-  --zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 8%, #f1f1f1 92%);
+  --zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 8%, #f7f7f7 92%);
 
   --zen-secondary-btn-color: var(--zen-colors-primary-foreground);   
 
@@ -89,7 +89,6 @@
 
   --zen-appcontent-border: 1px solid var(--zen-colors-border);
   --zen-panel-radius: var(--zen-border-radius);
-  --zen-browser-border-radius: var(--zen-panel-radius);
 
   --toolbarbutton-border-radius: 6px;
 
@@ -112,7 +111,7 @@
   --input-border-color: var(--zen-input-border-color) !important;
   --zen-themed-toolbar-bg: var(--zen-colors-tertiary);
 
-  --toolbar-field-background-color: var(--zen-colors-input-bg);
+  --toolbar-field-background-color: var(--zen-colors-input-bg) !important;
   --arrowpanel-background: var(--zen-dialog-background) !important;
 }
 
@@ -132,7 +131,7 @@
     --zen-colors-border: color-mix(in srgb, var(--zen-colors-secondary) 80%, black 20%);
   
     --zen-dialog-background: color-mix(in srgb, var(--zen-primary-color) 10%, black 90%);
-    --zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 8%, black 92%);
+    --zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 8%, rgb(15, 15, 15) 92%);
 
     --zen-browser-gradient-base: color-mix(in srgb, var(--zen-primary-color) 30%, black 70%);
   }

src/browser/base/content/zen-styles/zen-workspaces.css

@@ -18,19 +18,20 @@
 }
 
 @media (-moz-bool-pref: "zen.view.sidebar-expanded") {
-  #zen-workspaces-button .zen-workspace-sidebar-name {
+  #navigator-toolbox:is([zen-user-hover="true"]:hover, :not([zen-user-hover="true"])) {
+    & #zen-workspaces-button .zen-workspace-sidebar-name {
       display: block;
     }
 
-  #zen-workspaces-button .zen-workspace-sidebar-icon[no-icon="true"] {
+    & #zen-workspaces-button .zen-workspace-sidebar-icon[no-icon="true"] {
       display: none;
     }
 
-  #zen-workspaces-button .zen-workspace-sidebar-icon[no-icon="true"] + .zen-workspace-sidebar-name {
+    & #zen-workspaces-button .zen-workspace-sidebar-icon[no-icon="true"] + .zen-workspace-sidebar-name {
       margin-left: 0;
     }
 
-  #zen-workspaces-button {
+    & #zen-workspaces-button {
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
@@ -38,6 +39,7 @@
       padding: 2px 10px;
       width: calc(100% - var(--zen-tabbrowser-padding) * 8) !important;
     }
+  }
 }
 
 /* Workspaces Panel UI */

src/browser/components/customizableui/content/customizeMode-inc-xhtml.patch

@@ -1,13 +0,0 @@
-diff --git a/browser/components/customizableui/content/customizeMode.inc.xhtml b/browser/components/customizableui/content/customizeMode.inc.xhtml
-index 2788cc6a8fb42b7b968eb45aafc02f8d6fcf771d..5142e65576aebaac0e31677b707a5e05f88dae76 100644
---- a/browser/components/customizableui/content/customizeMode.inc.xhtml
-+++ b/browser/components/customizableui/content/customizeMode.inc.xhtml
-@@ -94,7 +94,7 @@
-         class="footer-button"
-         oncommand="gCustomizeMode.togglePong(this.checked);"
-         hidden="true"/>
--
-+#include zenCustomizationMode.inc.xhtml
- <spacer id="customization-footer-spacer"/>
- #ifdef XP_MACOSX
-     <button id="customization-touchbar-button"

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

@@ -15,6 +15,12 @@ const kZenColors = [
   "#d4bbff",
 ];
 
+const kZenOSToSmallName = {
+  WINNT: "windows",
+  Darwin: "macos",
+  Linux: "linux",
+};
+
 var gZenMarketplaceManager = {  
   init() {
     this._buildThemesList();
@@ -70,12 +76,45 @@ var gZenMarketplaceManager = {
     return this._themes;
   },
 
+  get currentOperatingSystem() {
+    let os = Services.appinfo.OS;
+    return kZenOSToSmallName[os];
+  },
+
+  _getValidPreferences(preferences) {
+    for (let key in preferences) {
+      // [!][os:]key
+      let restOfPreferences = key;
+      let isNegation = false;
+      if (key.startsWith("!")) {
+        isNegation = true;
+        restOfPreferences = key.slice(1);
+      }
+      let os = "";
+      if (restOfPreferences.includes(":")) {
+        [os, restOfPreferences] = restOfPreferences.split(":");
+      }
+      if (isNegation && os === this.currentOperatingSystem) {
+        delete preferences[key];
+      } else if (os && os !== this.currentOperatingSystem && !isNegation) {
+        delete preferences[key];
+      } else {
+        // Change the key to contain only the rest of the preferences.
+        preferences[restOfPreferences] = preferences[key];
+        if (key !== restOfPreferences) {
+          delete preferences[key];
+        }
+      }
+    }
+    return preferences;
+  },
+
   async _getThemePreferences(theme) {
     const themePath = PathUtils.join(this.themesRootPath, theme.id, "preferences.json");
     if (!(await IOUtils.exists(themePath)) || !theme.preferences) {
       return {};
     }
-    return await IOUtils.readJSON(themePath);
+    return this._getValidPreferences(await IOUtils.readJSON(themePath));
   },
 
   async _buildThemesList() {
@@ -83,8 +122,8 @@ var gZenMarketplaceManager = {
     this.themesList.innerHTML = "";
     for (let theme of Object.values(themes)) {
       const fragment = window.MozXULElement.parseXULToFragment(`
-        <hbox class="zenThemeMarketplaceItem">
+        <hbox class="zenThemeMarketplaceItem" align="center">
-          <vbox class="zenThemeMarketplaceItemContent">
+          <vbox class="zenThemeMarketplaceItemContent" flex="1">
             <label><h3 class="zenThemeMarketplaceItemTitle"></h3></label>
             <description class="description-deemphasized zenThemeMarketplaceItemDescription"></description>
           </vbox>
@@ -144,10 +183,43 @@ var gZenLooksAndFeel = {
   init() {
     this._initializeColorPicker(this._getInitialAccentColor());
     window.zenPageAccentColorChanged = this._handleAccentColorChange.bind(this);
+    this._initializeTabbarExpandForm();
     gZenThemeBuilder.init();
     gZenMarketplaceManager.init();
   },
 
+  _initializeTabbarExpandForm() {
+    const form = document.getElementById("zen-expand-tabbar-strat");
+    const radios = form.querySelectorAll("input[type=radio]");
+    const onHoverPref = "zen.view.sidebar-expanded.on-hover";
+    const defaultExpandPref = "zen.view.sidebar-expanded";
+    if (Services.prefs.getBoolPref(onHoverPref)) {
+      form.querySelector("input[value=\"hover\"]").checked = true;
+    } else if (Services.prefs.getBoolPref(defaultExpandPref)) {
+      form.querySelector("input[value=\"expand\"]").checked = true;
+    } else {
+      form.querySelector("input[value=\"none\"]").checked = true;
+    }
+    for (let radio of radios) {
+      radio.addEventListener("change", e => {
+        switch (e.target.value) {
+          case "expand":
+            Services.prefs.setBoolPref(onHoverPref, false);
+            Services.prefs.setBoolPref(defaultExpandPref, true);
+            break;
+          case "none":
+            Services.prefs.setBoolPref(onHoverPref, false);
+            Services.prefs.setBoolPref(defaultExpandPref, false);
+            break;
+          case "hover":
+            Services.prefs.setBoolPref(onHoverPref, true);
+            Services.prefs.setBoolPref(defaultExpandPref, true);
+            break;
+        }
+      });
+    }
+  },
+
   _initializeColorPicker(accentColor) {
     let elem = document.getElementById("zenLooksAndFeelColorOptions");
     elem.innerHTML = "";

src/browser/components/preferences/zenLooksAndFeel.inc.xhtml

@@ -96,9 +96,23 @@
       <checkbox id="zenLooksAndFeelShowTabExpandButton"
             data-l10n-id="zen-vertical-tabs-show-expand-button"
             preference="zen.view.sidebar-expanded.show-button"/>
-      <checkbox id="zenLooksAndFeelExpandTabsByDefault"
+
-            data-l10n-id="zen-vertical-tabs-expand-tabs-by-default"
+      <label><html:h2 data-l10n-id="zen-vertical-tabs-expand-tabs-header"/></label>
-            preference="zen.view.sidebar-expanded"/>
+      <description class="description-deemphasized" data-l10n-id="zen-vertical-tabs-expand-tabs-description" />
+      <form xmlns="http://www.w3.org/1999/xhtml" id="zen-expand-tabbar-strat" autocomplete="off" class="indent">
+            <hbox>
+                  <input type="radio" name="zen-expand-tabbar-value" value="expand" data-l10n-id="zen-vertical-tabs-expand-tabs-by-default" />
+                  <span data-l10n-id="zen-vertical-tabs-expand-tabs-by-default" />
+            </hbox>
+            <hbox>
+                  <input type="radio" name="zen-expand-tabbar-value" value="hover" data-l10n-id="zen-vertical-tabs-expand-tabs-on-hover" />
+                  <span data-l10n-id="zen-vertical-tabs-expand-tabs-on-hover" />
+            </hbox>
+            <hbox>
+                  <input type="radio" name="zen-expand-tabbar-value" value="none" data-l10n-id="zen-vertical-tabs-dont-expand-tabs-by-default" />
+                  <span data-l10n-id="zen-vertical-tabs-dont-expand-tabs-by-default" />
+            </hbox>
+      </form>
 </groupbox>
 
 </html:template>

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index e9aa0f03c26dc26e1a2e56d28fadb70e60c8e8ca..9c209752b01bd07a3f38452da4bc8efc7433466c 100644
+index e9aa0f03c26dc26e1a2e56d28fadb70e60c8e8ca..f66f9c168ab560e41ea9d03c2d0727e4a5c15132 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -552,19 +552,36 @@
@@ -146,6 +146,15 @@ index e9aa0f03c26dc26e1a2e56d28fadb70e60c8e8ca..9c209752b01bd07a3f38452da4bc8efc
        children.pop();
        this._allTabs = children;
        return children;
+@@ -1386,7 +1430,7 @@
+         let tabsToReset = [];
+         for (let i = numPinned; i < tabs.length; i++) {
+           let tab = tabs[i];
+-          tab.style.setProperty("max-width", aTabWidth, "important");
++          //tab.style.setProperty("max-width", aTabWidth, "important");
+           if (!isEndTab) {
+             // keep tabs the same width
+             tab.style.transition = "none";
 @@ -1476,11 +1520,11 @@
          for (let i = numPinned - 1; i >= 0; i--) {
            let tab = tabs[i];

src/browser/components/zen-welcome/welcome.js

@@ -18,7 +18,6 @@ ChromeUtils.defineModuleGetter(
 
 Services.scriptloader.loadSubScript("chrome://browser/content/ZenUIManager.mjs");
 
-const kWelcomeURL = 'https://www.zen-browser.app/welcome';
 const kWelcomeSeenPref = 'zen.welcomeScreen.seen'
 
 // =============================================================================
@@ -288,19 +287,12 @@ class Pages {
       Services.prefs.setBoolPref(kWelcomeSeenPref, true)
 
       close();
-      this._openWelcomePage();
       return
     }
 
     this._displayCurrentPage()
   }
 
-  _openWelcomePage() {
-    gZenUIManager.openAndChangeToTab(kWelcomeURL, {
-      inBackground: true,
-    });
-  }
-
   _displayCurrentPage() {
     let progress = document.getElementById('circular-progress');
     progress.style.setProperty('--progress', ((this.currentPage + 1) / this.pages.length) * 100);

src/browser/installer/package-manifest-in.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
-index 1b87a9ab4aec939acac1da54a2b6670cc581fe86..603de2aa8d07adce7eb1002313f6403e1d90c5ea 100644
+index da760e143740a166df14d055cf3ec7b095b93d10..093dacee4356d4084432d53639873e3da006dd94 100644
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -370,8 +370,8 @@ bin/libfreebl_64int_3.so
+@@ -377,17 +377,17 @@ bin/libfreebl_64int_3.so
  ; [MaintenanceService]
  ;
  #ifdef MOZ_MAINTENANCE_SERVICE
@@ -13,3 +13,23 @@ index 1b87a9ab4aec939acac1da54a2b6670cc581fe86..603de2aa8d07adce7eb1002313f6403e
  #endif
  
  ; [Crash Reporter]
+ ;
+ #ifdef MOZ_CRASHREPORTER
+ #ifdef XP_MACOSX
+-@BINPATH@/crashreporter.app/
++;@BINPATH@/crashreporter.app/
+ #else
+-@BINPATH@/crashreporter@BIN_SUFFIX@
++;@BINPATH@/crashreporter@BIN_SUFFIX@
+ #if defined(XP_WIN)
+ @BINPATH@/@DLL_PREFIX@mozwer@DLL_SUFFIX@
+ #endif
+@@ -397,7 +397,7 @@ bin/libfreebl_64int_3.so
+ ; [ minidump-analyzer ]
+ ;
+ #ifdef MOZ_CRASHREPORTER
+-@BINPATH@/minidump-analyzer@BIN_SUFFIX@
++;@BINPATH@/minidump-analyzer@BIN_SUFFIX@
+ #endif
+ 
+ ; [ Ping Sender ]

src/browser/locales/en-US/browser/appExtensionFields-ftl.patch

@@ -1,32 +0,0 @@
-diff --git a/browser/locales/en-US/browser/appExtensionFields.ftl b/browser/locales/en-US/browser/appExtensionFields.ftl
-index 09d7a076eccd4235fac66156770d8b9ae01a7d16..f32affde0d6f77dadd421ff68bf2050bda9f0cd0 100644
---- a/browser/locales/en-US/browser/appExtensionFields.ftl
-+++ b/browser/locales/en-US/browser/appExtensionFields.ftl
-@@ -8,13 +8,13 @@
- extension-default-theme-name-auto=System theme — auto
- extension-default-theme-description=Follow the operating system setting for buttons, menus, and windows.
- 
--extension-firefox-compact-light-name=Light
-+extension-firefox-compact-light-name=Zen Light
- extension-firefox-compact-light-description=A theme with a light color scheme.
- 
--extension-firefox-compact-dark-name=Dark
-+extension-firefox-compact-dark-name=Zen Dark
- extension-firefox-compact-dark-description=A theme with a dark color scheme.
- 
--extension-firefox-alpenglow-name=Firefox Alpenglow
-+extension-firefox-alpenglow-name=Zen Universe
- extension-firefox-alpenglow-description=Use a colorful appearance for buttons, menus, and windows.
- 
- ## Colorway Themes
-@@ -28,3 +28,9 @@ extension-colorways-balanced-name={ $colorway-name } — Balanced
- # "Bold" is used in the sense of bravery or courage, not in the sense of
- # emphasized text.
- extension-colorways-bold-name={ $colorway-name } — Bold
-+
-+extension-firefox-compact-galaxy-name=Zen Galaxy
-+extension-firefox-compact-galaxy-description=A theme with a dark color scheme and a nice galaxy touch!
-+
-+extension-firefox-compact-dream-name=Zen Dream
-+extension-firefox-compact-dream-description=A theme with a light color scheme and a nice dream-y touch!
-\ No newline at end of file

src/browser/locales/en-US/browser/appmenu-ftl.patch

@@ -1,10 +0,0 @@
-diff --git a/browser/locales/en-US/browser/appmenu.ftl b/browser/locales/en-US/browser/appmenu.ftl
-index 5ad2d75f6215f7da44948cda5ad938db8fd97e8d..da4442ebcd594b602b9e991c9591071dddcaa5f6 100644
---- a/browser/locales/en-US/browser/appmenu.ftl
-+++ b/browser/locales/en-US/browser/appmenu.ftl
-@@ -314,3 +314,5 @@ appmenuitem-relay-title = { -relay-brand-short-name }
- appmenuitem-relay-description = Mask your real email and phone
- appmenuitem-vpn-title = { -mozilla-vpn-brand-name }
- appmenuitem-vpn-description = Protect your online activity
-+
-+zen-panel-ui-current-profile-text = current profile

src/browser/locales/en-US/browser/customizeMode-ftl.patch

@@ -1,11 +0,0 @@
-diff --git a/browser/locales/en-US/browser/customizeMode.ftl b/browser/locales/en-US/browser/customizeMode.ftl
-index e5f54b231738fc8fee505c8c8dcccde820995cfc..ec81ef8e451faa25878830b7d4796708e15fe395 100644
---- a/browser/locales/en-US/browser/customizeMode.ftl
-+++ b/browser/locales/en-US/browser/customizeMode.ftl
-@@ -36,3 +36,5 @@ customize-mode-touchbar-cmd =
-     .label = Customize Touch Bar…
- customize-mode-downloads-button-autohide =
-     .label = Hide button when empty
-+
-+customization-zen-browser-space = Content Space
-\ No newline at end of file

src/browser/locales/en-US/browser/editBookmarkOverlay-ftl.patch

@@ -1,13 +0,0 @@
-diff --git a/browser/locales/en-US/browser/editBookmarkOverlay.ftl b/browser/locales/en-US/browser/editBookmarkOverlay.ftl
-index da74660e48620fe9097d05a51ba4be34f21246e6..3153ee3e3ea534807f7e6c35b016edf25749bbe7 100644
---- a/browser/locales/en-US/browser/editBookmarkOverlay.ftl
-+++ b/browser/locales/en-US/browser/editBookmarkOverlay.ftl
-@@ -13,7 +13,7 @@ bookmark-overlay-url =
- # Location refers to the position of the bookmark within the browser's
- # bookmarks, not to its URL or address.
- bookmark-overlay-location-2 =
--  .value = Location
-+  .value = Folder
-   .accesskey = L
- 
- bookmark-overlay-choose =

src/browser/locales/en-US/browser/preferences/zen-preferences.ftl

@@ -1,159 +0,0 @@
-
-pane-zen-looks-title = Look And Feel
-category-zen-looks =
-    .tooltiptext = { pane-zen-looks-title }
-
-zen-warning-language = Changing the default language could make it easier for Websites to track you.
-
-zen-look-and-feel-colors-header = Pick a theme colour
-zen-look-and-feel-colors-description = Make { -brand-short-name } look and feel the way you like
-zen-look-and-feel-themed-toolbar = 
-    .label = Make the toolbar themed with the accent color
-
-pane-zen-side-panels-title = Side Web Panels
-zen-side-panels-header = General settings for web panels
-zen-side-panels-description = Increase productivity by having multiple views at once!
-zen-side-panels-enabled = 
-    .label = Enable Web Side Panels
-
-zen-side-panels-close-on-blur = 
-    .label = Close the panel when it loses focus if it's not pinned
-
-zen-look-and-feel-compact-view-header = Show in compact view
-zen-look-and-feel-compact-view-description = Only show the toolbars you use!
-zen-look-and-feel-compact-view-enabled = 
-    .label = Enable { -brand-short-name }'s compact mode
-
-zen-look-and-feel-compact-view-top-toolbar = 
-    .label = Hide the top toolbar as well in compact mode
-
-zen-look-and-feel-buttons-header = Button style
-zen-look-and-feel-buttons-description = Choose the style of buttons you want to see
-
-zen-look-and-feel-pilled-buttons = 
-    .label = Pilled Buttons
-
-pane-zen-workspaces-title = Workspaces
-category-zen-workspaces =
-    .tooltiptext = { pane-workspaces-title }
-pane-settings-workspaces-title = Workspaces
-
-pane-zen-workspaces-header = Workspaces
-zen-settings-workspaces-header = General settings for workspaces
-zen-settings-workspaces-description = With workspaces, you can have multiple browsing sessions at once!
-zen-settings-workspaces-enabled = 
-    .label = Enable Workspaces (Experimental)
-
-pane-zen-theme-title = Theme Settings
-
-zen-look-and-feel-urlbar-header = Awesome Bar Settings
-zen-look-and-feel-urlbar-description = Customize the look and feel of the Awesome Bar
-
-zen-vertical-tabs-title = Sidebar and tabs layout
-zen-vertical-tabs-header = Vertical Tabs
-zen-vertical-tabs-description = Manage your tabs in a vertical layout
-zen-vertical-tabs-show-expand-button = 
-    .label = Show Expand Button
-zen-vertical-tabs-expand-tabs-by-default = 
-    .label = Expand Tabs by Default
-
-zen-theme-marketplace-header = Theme Marketplace
-zen-theme-marketplace-description = Find and install themes from the marketplace.
-zen-theme-marketplace-remove-button = 
-    .label = Remove Theme
-
-zen-theme-marketplace-link = Visit Marketplace
-
-pane-zen-CKS-title = Keyboard Shortcuts
-category-zen-CKS =
-    .tooltiptext = { pane-zen-CKS-title }
-pane-settings-CKS-title = { -brand-short-name } Keyboard Shortcuts
-
-zen-settings-CKS-header = Customize your keyboard shortcuts
-zen-settings-CKS-description = Change the default keyboard shortcuts to your liking and improve your browsing experience
-
-zen-settings-CKS-disable-firefox = 
-    .label = Disable { -brand-short-name }'s default keyboard shortcuts
-
-zen-cks-group-tab-action = Tab Actions
-zen-cks-group-page-action = Page Actions
-zen-cks-group-visible-action = Visible Actions
-zen-cks-group-history-action = History Actions
-zen-cks-group-search-action = Search Actions
-zen-cks-group-tools-action = Tools Actions
-zen-cks-group-bookmark-action = Bookmark Actions
-zen-cks-group-open-page-action = Open Page Actions
-zen-cks-group-downloads-action = Downloads Actions
-zen-cks-group-sidebar-action = Sidebar Actions
-zen-cks-group-compact-mode-action = Compact Mode Actions
-zen-cks-group-split-view-action = Split View Actions
-zen-cks-group-workspace-action = Workspace Actions
-
-open-new-tab = Open New Tab
-close-tab = Close Tab
-open-new-window = Open New Window
-open-new-private-window = Open New Private Window
-close-window = Close Window
-restore-last-tab = Restore Last Tab
-restore-last-window = Restore Last Window
-show-next-tab = Show Next Tab
-show-previous-tab = Show Previous Tab
-show-all-tabs-panel = Show All Tabs Panel
-send-with-mail = Send Page with Mail
-save-page = Save Page
-print-page = Print Page
-mute-current-tab = Mute Current Tab
-show-source-of-page = Show Source of Page
-show-page-info = Show Page Info
-zoom-in = Zoom In
-zoom-out = Zoom Out
-reset-zoom = Reset Zoom
-back = Back
-forward = Forward
-stop = Stop
-reload = Reload
-force-reload = Force Reload
-search-in-this-page = Search in This Page
-show-next-search-result = Show Next Search Result
-show-previous-search-result = Show Previous Search Result
-search-the-web = Search the Web
-open-migration-wizard = Open Migration Wizard
-quit-from-application = Quit Application
-enter-into-customize-mode = Enter Customize Mode
-enter-into-offline-mode = Enter Offline Mode
-open-screen-capture = Open Screen Capture
-bookmark-this-page = Bookmark This Page
-open-bookmark-add-tool = Open Bookmark Add Tool
-open-bookmarks-manager = Open Bookmarks Manager
-toggle-bookmark-toolbar = Toggle Bookmark Toolbar
-open-general-preferences = Open General Preferences
-open-privacy-preferences = Open Privacy Preferences
-open-workspaces-preferences = Open Workspaces Preferences
-open-containers-preferences = Open Containers Preferences
-open-search-preferences = Open Search Preferences
-open-sync-preferences = Open Sync Preferences
-open-task-manager = Open Task Manager
-open-addons-manager = Open Add-ons Manager
-open-home-page = Open Home Page
-forget-history = Forget History
-quick-forget-history = Quick Forget History
-clear-recent-history = Clear Recent History
-restore-last-session = Restore Last Session
-search-history = Search History
-manage-history = Manage History
-open-downloads = Open Downloads
-show-bookmark-sidebar = Show Bookmark Sidebar
-show-history-sidebar = Show History Sidebar
-show-synced-tabs-sidebar = Show Synced Tabs Sidebar
-reverse-sidebar = Reverse Sidebar Position
-hide-sidebar = Hide Sidebar
-toggle-sidebar = Toggle Sidebar
-zen-toggle-web-panels = Toggle Web Panels
-zen-toggle-compact-mode = Toggle Compact Mode
-zen-toggle-compact-mode-sidebar = Toggle Compact Mode Sidebar
-zen-toggle-compact-mode-toolbar = Toggle Compact Mode Toolbar
-zen-change-workspace = Cycle Workspaces
-zen-split-view-grid = Split View Grid
-zen-split-view-vertical = Split View Vertical
-zen-split-view-horizontal = Split View Horizontal
-zen-split-view-close = Close Split View

src/browser/locales/en-US/browser/sidebarMenu-ftl.patch

@@ -1,14 +0,0 @@
-diff --git a/browser/locales/en-US/browser/sidebarMenu.ftl b/browser/locales/en-US/browser/sidebarMenu.ftl
-index e050a2302c6699ffcabad2db4d45267912297519..d4ff03ace4d08482b4a6de62c4f00016486cad84 100644
---- a/browser/locales/en-US/browser/sidebarMenu.ftl
-+++ b/browser/locales/en-US/browser/sidebarMenu.ftl
-@@ -19,3 +19,8 @@ sidebar-menu-close =
- 
- sidebar-close-button =
-   .tooltiptext = Close sidebar
-+
-+sidebar-zen-sidepanel =
-+  .label = Side Panels
-+sidebar-zen-expand =
-+  .label = Expand Sidebar
-\ No newline at end of file