chore: Update right-side compact mode CSS for vertical tabs

Fix vertical tabs on the right overflow.

.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
@@ -38,8 +38,6 @@ body:
         - Medium
         - High
         - Critical
-        - Enhancement
-      multiple: true
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,32 +0,0 @@
-name: Feature Request
-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
-    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
-    validations:
-      required: true
-  - type: textarea
-    id: logs
-    attributes:
-      label: Additional context
-      description: Add any other context about the feature request here.

.github/advanced-issue-labeler.yml

@@ -13,6 +13,4 @@ policy:
             keys: ['High']
           - name: 'kind: critical severity'
             keys: ['Critical']
-          - name: 'kind: enhancement'
-            keys: ['Enhancement']
 

.github/workflows/alpha.yml

@@ -130,11 +130,12 @@ 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
@@ -263,7 +264,7 @@ jobs:
         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
@@ -280,17 +281,18 @@ 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 ./dist/zen.AppImage ./dist/zen-${{ matrix.generic == true && 'generic' || 'specific' }}.AppImage
+          mv zen*AppImage* dist/.
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
@@ -298,11 +300,17 @@ jobs:
           name: zen-${{ matrix.generic == true && 'generic' || 'specific' }}.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:
@@ -358,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

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

@@ -9,6 +9,7 @@ on:
     
 jobs:
   build-linux:
+    environment: production
     permissions:
       contents: write
     runs-on: ubuntu-latest
@@ -96,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
@@ -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
-        run: |
-          cd engine
-          ./mach --no-interactive bootstrap --application-choice browser 
-          cd ..
+          pnpm surfer import --verbose
+        
+      - name: Build language packs
+        run: sh scripts/download-language-packs.sh
 
       - name: build Zen
         env:

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

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         generic: [true, false]
-
+    environment: production
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
@@ -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 }}

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

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

.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

.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/distribution/policies.json

@@ -5,4 +5,4 @@
    "ManualAppUpdateOnly": true,
    "BackgroundAppUpdate": false
   }
- }
+ }

AppDir/zen.desktop

@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Zen Browser
+Comment=Experience tranquillity while browsing the web without people tracking you!
 Exec=zen %u
 Icon=zen
 Type=Application

README.md

@@ -1,5 +1,11 @@
-
-# 🌀 Zen Browser
+<div align="center">
+<picture>
+    <img src="./zen-black.svg" width="128px">
+</picture>
+</div>
+<h1 align="center">
+Zen Browser
+</h1>
 
 Experience tranquillity while browsing the web without people tracking you!
 
@@ -7,28 +13,36 @@ 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)
 
-<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'/>
-</a>
+[![Crowdin](https://badges.crowdin.net/zen-browser/localized.svg)](https://crowdin.com/project/zen-browser)
+
+[![Flathub](https://flathub.org/api/badge?locale=en)](https://flathub.org/apps/io.github.zen_browser.zen')
+
+[![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/z3nth10n)
+
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/K3K111FH7H)
 
 # Compatibility
 
-Zen is currently built using firefox version `129.0`!
+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 --recursive
+git clone https://github.com/zen-browser/desktop.git --recurse-submodules
 cd desktop
 ```
 
@@ -56,21 +70,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
 
 - [IAmJafeth](https://github.com/IAmJafeth) (For sponsoring the domain)
-- [Erlend](https://havn.blog) (For making the logo)
+- [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 couldn't be in its current state without the help of these amazing projects!
+
+- Zen's default preferences are based on [BetterFox](https://github.com/yokoffing/Betterfox)
 
 ## License
 
-[MPL LICENSE](/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/MacOSInstaller.svg

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

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

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

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

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

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

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

configs/branding/beta/MacOSInstaller.svg

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

configs/common/mozconfig

@@ -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}
@@ -16,7 +19,6 @@ 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
@@ -31,9 +33,13 @@ if test "$ZEN_RELEASE"; then
   ac_add_options --disable-debug-symbols
   ac_add_options --disable-debug-js-modules
   ac_add_options --disable-tests
+  
   ac_add_options --disable-jprof
+  ac_add_options --disable-vtune
 
   ac_add_options --enable-rust-simd
+  ac_add_options --enable-wasm-simd
+  
   mk_add_options MOZ_PARALLEL_COMPILE=1
 
   ac_add_options --enable-proxy-bypass-protection
@@ -43,9 +49,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
@@ -88,14 +94,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
 
 # Allow loading unsigned extensions
-export MOZ_REQUIRE_SIGNING=1
-mk_add_options MOZ_REQUIRE_SIGNING=1
+export MOZ_REQUIRE_SIGNING=
+mk_add_options MOZ_REQUIRE_SIGNING=
 
 # Sorry ptr, I didnt mean to!
-ac_add_options --without-wasm-sandboxed-libraries
+# 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

@@ -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,11 +14,10 @@ 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
   export MOZ_STUB_INSTALLER=1
   export WINEDEBUG=-all
   export WINE="$TOOLS/wine/bin/wine64"
@@ -31,26 +30,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
  
 if test "$SURFER_COMPAT" = "true"; then
-  ac_add_options --enable-optimize="-O3 -mavx -maes -w -ftree-vectorize"
+  ac_add_options --enable-optimize="-O3 -w -ftree-vectorize"
 
-  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 -ftree-vectorize -Xclang -w"
   ac_add_options --enable-wasm-avx
 
   export CFLAGS="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -march=x86-64-v3"   
   export CPPFLAGS="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -march=x86-64-v3"
   export CXXFLAGS="-O2 -msse3 -mssse3 -msse4.1 -msse4.2 -mavx -maes -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 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,109 +0,0 @@
-# 🌀 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)
-
-OS: win 11; CPU: i5 13600k
-
-## web.basemark
-
-https://web.basemark.com/
-
-|           | score:  |CSS | HTML5 | Page load and Responsiveness | Resize Cap. |
-|-----------|-----|-----|-------|------------------------------|-------------|
-| 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%         |
-| 1.0.0-a.7 | 1964.43 | 59% | 91%   | 91%                          | 76%         |
-| 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                         | -        |
-| 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% |
-
-
-```mermaid
-xychart-beta
-    title "Performance over time (Higher is better)"
-    x-axis [.3, .4, .6, .7, .8, .9, .10, .11, .12, .13]
-    y-axis "Benchmark Points"
-    bar [475.52, 470.49, 1747.98, 1964.43, 446.74, 470, 1660.89, 1678.49, 1874.49, 1658.87 ]
-    line [475.52, 470.49, 1747.98, 1964.43, 446.74, 470, 1660.89, 1678.49, 1874.49, 1658.87 ]
-```
-
-## Speedometer3.0
-
-https://browserbench.org/Speedometer3.0/ 
-
-|           | score:  |
-|-----------|-----|
-| 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 |
-
-
-## 2
-
-- [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.12-opt | 23   |
-| 1.0.0-a.11-opt | 22.1   |
-| 1.0.0-a.10 | 21.7   |
-| 1.0.0-a.9  | 3.7    |
-| others| - |
-| Default FF  | 28    |
-
-
-https://browserbench.org/Speedometer3.0/
-
-
-
-
-## Repository View Counter
-
-<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>
-

docs/workspaces.md

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

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

@@ -4,7 +4,7 @@ runtime-version: '23.08'
 sdk: org.freedesktop.Sdk
 base: org.mozilla.firefox.BaseApp
 base-version: '23.08'
-command: /app/zen/zen
+command: launch-script.sh
 finish-args:
   - --share=ipc
   - --share=network
@@ -17,6 +17,7 @@ finish-args:
   - --filesystem=xdg-download:rw
   - --device=all
   - --talk-name=org.freedesktop.FileManager1
+  - --talk-name=org.freedesktop.ScreenSaver
   - --own-name=org.mozilla.zen.*
   - --own-name=org.mpris.MediaPlayer2.firefox.*
   - --system-talk-name=org.freedesktop.NetworkManager
@@ -27,8 +28,9 @@ modules:
     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.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.7"
+    "@zen-browser/surfer": "^1.3.6"
   }
 }

pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@zen-browser/surfer':
-        specifier: ^1.2.7
-        version: 1.2.7
+        specifier: ^1.3.6
+        version: 1.3.6
 
 packages:
 
@@ -109,8 +109,8 @@ packages:
   '@types/node@17.0.45':
     resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
 
-  '@zen-browser/surfer@1.2.7':
-    resolution: {integrity: sha512-VbbbB7crGXrdfk1PPnlsWFWErwjtccXbRuw5mOQzY327d2t5VraxmkqTzcuGSTxpu3CR/KvzNu0gDg/6+7b4NQ==}
+  '@zen-browser/surfer@1.3.6':
+    resolution: {integrity: sha512-b+5GS9qMGoMB8lRaFYRA9C3EqntVf35sBx5dq7X3IuqlB9GmarYoS5E26EvXbmPJcfYkJG7ar05nHkkZyOrGuw==}
     hasBin: true
 
   ansi-regex@5.0.1:
@@ -786,7 +786,7 @@ snapshots:
 
   '@types/node@17.0.45': {}
 
-  '@zen-browser/surfer@1.2.7':
+  '@zen-browser/surfer@1.3.6':
     dependencies:
       '@resvg/resvg-js': 1.4.0
       async-icns: 1.0.2

scripts/copy-language-pack.sh

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

scripts/download-language-packs.sh

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

scripts/update-en-US-packs.sh

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

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

@@ -21,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);
@@ -45,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.http.max-persistent-connections-per-proxy", 48); // default=32
+pref("network.websocket.max-connections", 400); // default=200
 pref("network.ssl_tokens_cache_capacity", 10240);
 
-/** 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);
@@ -70,7 +69,6 @@ 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);
@@ -120,27 +118,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", "");
@@ -157,7 +155,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);

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

@@ -13,9 +13,12 @@ pref("browser.tabs.hoverPreview.enabled", true);
 pref("browser.tabs.cardPreview.delayMs", 100);
 
 #ifdef MOZ_UPDATE_CHANNEL
-pref("devtools.debugger.prompt-connection", false);
+pref("devtools.debugger.prompt-connection", true);
 #endif
 
+// Dont download the multilingual dictionary
+pref("intl.multilingual.downloadEnabled", false);
+
 // Theme
 pref('toolkit.legacyUserProfileCustomizations.stylesheets', true);
 pref('browser.compactmode.show', true);
@@ -56,6 +59,8 @@ pref("browser.ping-centre.telemetry", false);
 pref("browser.attribution.enabled", false);
 pref("toolkit.telemetry.pioneer-new-studies-available", false);
 
+pref("app.update.checkInstallTime.days", 2);
+
 // CUSTOM ZEN PREFS
 
 pref('zen.welcomeScreen.enabled', true);
@@ -63,15 +68,25 @@ 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);
 
@@ -87,7 +102,7 @@ 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
 pref('apz.overscroll.enabled', true); // not DEFAULT on Linux
@@ -95,12 +110,13 @@ pref('general.smoothScroll', true); // DEFAULT
 
 // Privacy
 pref('dom.private-attribution.submission.enabled', false);
+pref('dom.security.https_only_mode', true);
 
 pref('media.eme.enabled', true);
 pref('webgl.disabled', false);
 
 pref("app.update.url.manual", "https://www.zen-browser.app/download");
-pref("app.update.url.details", "hhttps://www.zen-browser.app/download");
+pref("app.update.url.details", "https://www.zen-browser.app/download");
 pref("app.releaseNotesURL", "https://www.zen-browser.app/release-notes");
 pref("app.releaseNotesURL.aboutDialog", "https://www.zen-browser.app/release-notes");
 
@@ -115,4 +131,48 @@ pref('browser.migrate.opera.enabled', true);
 
 pref('xpinstall.signatures.required', false);
 
-#include better-fox.js
+// Experimental Zen Features
+// Strategy to use for bytecode cache (Thanks https://github.com/gunir)
+pref('dom.script_loader.bytecode_cache.strategy', 2);
+
+// Font rendering, not for MacOSX and Linux
+#ifndef XP_UNIX
+#ifndef XP_MACOSX
+pref('gfx.font_rendering.cleartype_params.rendering_mode', 5);
+pref('gfx.font_rendering.cleartype_params.gamma', 1750);
+#endif
+#endif
+
+pref('gfx.webrender.all', true);
+pref('layers.acceleration.force-enabled', true);
+
+#include better-fox.js
+
+// Betterfox overrides (Stay below the include directive)
+
+// Jang's personal speedups (Thanks to Jang for these!)
+
+// Prefetching:
+pref("network.dns.disablePrefetch", false);
+pref("network.prefetch-next", true);
+pref("network.predictor.enabled", true);
+pref("network.dns.disablePrefetchFromHTTPS", false);
+pref("network.predictor.enable-hover-on-ssl", true);
+pref("network.http.speculative-parallel-limit", 10);
+pref("network.http.rcwn.enabled", false);
+
+// Enable Browser Toolbox, Ctrl+Shift+Alt+I for debugging and modifying UI
+pref("devtools.debugger.remote-enabled", false);
+pref("devtools.chrome.enabled", true);
+
+// Disable firefox's revamp
+pref("sidebar.revamp", false, locked);
+pref("sidebar.verticalTabs", false, locked);
+
+// Better Windows theming
+pref("widget.non-native-theme.scrollbar.style", 2);
+pref("widget.non-native-theme.use-theme-accent", true);
+
+// Expose Letterboxing https://github.com/zen-browser/desktop/issues/475
+pref("privacy.resistFingerprinting.letterboxing", false);
+pref("privacy.resistFingerprinting.letterboxing.dimensions", "");

src/browser/base/content/ZenStartup.mjs

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

src/browser/base/content/ZenUIManager.mjs

@@ -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,5 +105,38 @@ 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() {
+    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/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/zen-assets.inc.xhtml

@@ -0,0 +1,37 @@
+<!-- Styles used all over the browser -->
+<linkset>
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-theme.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-animations.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-sidebar.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-buttons.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-toolbar.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-tabs.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-browser-ui.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-panel-ui.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-single-components.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-browser-container.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-urlbar.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-workspaces.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-decks.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-profile-dialog.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-sidebar-panels.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-popup.css" />
+
+<link rel="stylesheet" type="text/css" href="chrome://browser/content/zen-styles/zen-compact-mode.css" />
+<link rel="stylesheet" type="text/css" href="chrome://browser/skin/zen-icons/icons.css" />
+
+</linkset>
+
+<!-- Scripts used all over the browser -->
+<script type="text/javascript">
+window.addEventListener("DOMContentLoaded", async () => {
+  // Theme importer always needs to be loaded first
+  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenThemesImporter.mjs");
+  Services.scriptloader.loadSubScript("chrome://browser/content/ZenUIManager.mjs");
+  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenSidebarManager.mjs");
+  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspaces.mjs");
+  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenViewSplitter.mjs");
+  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenProfileDialogUI.mjs");
+  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs");
+}, { once: true });
+</script>

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

@@ -0,0 +1,42 @@
+
+
+        content/browser/zenThemeModifier.js                     (content/zenThemeModifier.js)
+        content/browser/ZenStartup.mjs                          (content/ZenStartup.mjs)
+        content/browser/ZenUIManager.mjs                        (content/ZenUIManager.mjs)
+        content/browser/zen-components/ZenViewSplitter.mjs      (content/zen-components/src/ZenViewSplitter.mjs)
+        content/browser/zen-components/ZenWorkspaces.mjs        (content/zen-components/src/ZenWorkspaces.mjs)
+        content/browser/zen-components/ZenSidebarManager.mjs    (content/zen-components/src/ZenSidebarManager.mjs)
+        content/browser/zen-components/ZenProfileDialogUI.mjs   (content/zen-components/src/ZenProfileDialogUI.mjs)
+        content/browser/zen-components/ZenKeyboardShortcuts.mjs (content/zen-components/src/ZenKeyboardShortcuts.mjs)
+        content/browser/zen-components/ZenThemeBuilder.mjs      (content/zen-components/src/ZenThemeBuilder.mjs)
+        content/browser/zen-components/ZenThemesImporter.mjs    (content/zen-components/src/ZenThemesImporter.mjs)
+
+        content/browser/zen-styles/zen-theme.css                (content/zen-styles/zen-theme.css)
+        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)
+        content/browser/zen-styles/zen-single-components.css    (content/zen-styles/zen-single-components.css)
+        content/browser/zen-styles/zen-sidebar.css              (content/zen-styles/zen-sidebar.css)
+        content/browser/zen-styles/zen-toolbar.css              (content/zen-styles/zen-toolbar.css)
+        content/browser/zen-styles/zen-decks.css                (content/zen-styles/zen-decks.css)
+        content/browser/zen-styles/zen-browser-container.css    (content/zen-styles/zen-browser-container.css)
+        content/browser/zen-styles/zen-workspaces.css           (content/zen-styles/zen-workspaces.css)
+        content/browser/zen-styles/zen-profile-dialog.css       (content/zen-styles/zen-profile-dialog.css)
+        content/browser/zen-styles/zen-urlbar.css               (content/zen-styles/zen-urlbar.css)
+        content/browser/zen-styles/zen-popup.css                (content/zen-styles/zen-popup.css)
+        content/browser/zen-styles/zen-sidebar-panels.css       (content/zen-styles/zen-sidebar-panels.css)
+        
+        content/browser/zen-styles/zen-panels/bookmarks.css     (content/zen-styles/zen-panels/bookmarks.css)
+        content/browser/zen-styles/zen-panels/extensions.css    (content/zen-styles/zen-panels/extensions.css)
+        content/browser/zen-styles/zen-panels/print.css         (content/zen-styles/zen-panels/print.css)
+        content/browser/zen-styles/zen-panels/welcome.css       (content/zen-styles/zen-panels/welcome.css)
+
+        content/browser/zen-styles/zen-compact-mode.css         (content/zen-styles/zen-compact-mode.css)
+
+        # Actors
+        content/browser/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs (content/zen-components/src/actors/ZenThemeMarketplaceParent.sys.mjs)
+        content/browser/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs  (content/zen-components/src/actors/ZenThemeMarketplaceChild.sys.mjs)

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

@@ -78,7 +78,7 @@
 
 <panel flip="slide" type="arrow" orient="vertical" id="PanelUI-zen-workspaces" position="bottomright topright" mainview="true" side="left">
   <panelmultiview id="PanelUI-zen-workspaces-multiview" mainViewId="PanelUI-zen-workspaces-view">
-    <panelview lockpanelvertical="true" id="PanelUI-zen-workspaces-view" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
+    <panelview id="PanelUI-zen-workspaces-view" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
       <vbox>
         <hbox>
           <h3 data-l10n-id="zen-panel-ui-current-window-text"></h3>
@@ -98,28 +98,31 @@
         </html:div>
       </vbox>
     </panelview>
-    <panelview lockpanelvertical="true" id="PanelUI-zen-workspaces-create" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
-      <vbox>
-        <h1 data-l10n-id="zen-panel-ui-workspaces-create-text"></h1>
-        <html:input autofocus="true" id="PanelUI-zen-workspaces-create-input" type="text" placeholder="Enter workspace name" oninput="ZenWorkspaces.onWorkspaceNameChange(this);" />
-      </vbox>
-      <html:moz-button-group class="panel-footer" id="PanelUI-zen-workspaces-create-footer">
-        <button disabled="true" default="true" slot="primary" id="PanelUI-zen-workspaces-create-save" oncommand="ZenWorkspaces.saveWorkspaceFromInput();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-save">
-        </button>
-        <button id="PanelUI-zen-workspaces-create-cancel" oncommand="ZenWorkspaces.cancelWorkspaceCreation();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-cancel">
-        </button>
-      </html:moz-button-group>
-    </panelview>
-    <panelview lockpanelvertical="true" id="PanelUI-zen-workspaces-create-icons" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
+    <panelview id="PanelUI-zen-workspaces-create" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
       <vbox>
         <h1 data-l10n-id="zen-panel-ui-workspaces-create-text"></h1>
+        <html:input autofocus="true" id="PanelUI-zen-workspaces-create-input" type="text" placeholder="Enter workspace name" oninput="ZenWorkspaces.onWorkspaceCreationNameChange(this);" />
         <hbox id="PanelUI-zen-workspaces-create-icons-container">
         </hbox>
       </vbox>
       <html:moz-button-group class="panel-footer" id="PanelUI-zen-workspaces-create-footer">
-        <button default="true" slot="primary" id="PanelUI-zen-workspaces-create-save-icons" oncommand="ZenWorkspaces.saveWorkspaceFromIcon();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-save">
+        <button disabled="true" default="true" slot="primary" id="PanelUI-zen-workspaces-create-save" oncommand="ZenWorkspaces.saveWorkspaceFromCreate();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-save">
         </button>
-        <button id="PanelUI-zen-workspaces-create-cancel-icons" oncommand="ZenWorkspaces.cancelWorkspaceCreation();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-cancel">
+        <button id="PanelUI-zen-workspaces-create-cancel" oncommand="ZenWorkspaces.closeWorkspacesSubView();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-create-cancel">
+        </button>
+      </html:moz-button-group>
+    </panelview>
+    <panelview id="PanelUI-zen-workspaces-edit" class="PanelUI-subView" role="document" mainview-with-header="true" has-custom-header="true">
+      <vbox>
+        <h1 data-l10n-id="zen-panel-ui-workspaces-edit-text"></h1>
+        <html:input autofocus="true" id="PanelUI-zen-workspaces-edit-input" type="text" placeholder="Enter workspace name" oninput="ZenWorkspaces.onWorkspaceEditChange();" />
+        <hbox id="PanelUI-zen-workspaces-edit-icons-container">
+        </hbox>
+      </vbox>
+      <html:moz-button-group class="panel-footer" id="PanelUI-zen-workspaces-edit-footer">
+        <button disabled="true" default="true" slot="primary" id="PanelUI-zen-workspaces-edit-save" oncommand="ZenWorkspaces.saveWorkspaceFromEdit();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-edit-save">
+        </button>
+        <button id="PanelUI-zen-workspaces-edit-cancel" oncommand="ZenWorkspaces.closeWorkspacesSubView();" class="footer-button" data-l10n-id="zen-panel-ui-workspaces-edit-cancel">
         </button>
       </html:moz-button-group>
     </panelview>
@@ -129,5 +132,9 @@
 <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_zenEditWorkspace" oncommand="ZenWorkspaces.contextEdit(event);" data-l10n-id="zen-workspaces-panel-context-edit"/>
+  <menuitem id="context_zenDeleteWorkspace" oncommand="ZenWorkspaces.contextDelete(event);" data-l10n-id="zen-workspaces-panel-context-delete"/>
 </menupopup>

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

@@ -1,9 +0,0 @@
-<script type="text/javascript">
-window.addEventListener("DOMContentLoaded", async () => {
-  Services.scriptloader.loadSubScript("chrome://browser/content/ZenUIManager.mjs");
-  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenSidebarManager.mjs");
-  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspaces.mjs");
-  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenViewSplitter.mjs");
-  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenProfileDialogUI.mjs");
-}, { once: true });
-</script>

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

@@ -1,7 +0,0 @@
-        content/browser/zenThemeModifier.js                     (content/zenThemeModifier.js)
-        content/browser/ZenUIManager.mjs                        (content/ZenUIManager.mjs)
-        content/browser/zen-components/ZenViewSplitter.mjs      (content/zen-components/src/ZenViewSplitter.mjs)
-        content/browser/zen-components/ZenWorkspaces.mjs        (content/zen-components/src/ZenWorkspaces.mjs)
-        content/browser/zen-components/ZenSidebarManager.mjs    (content/zen-components/src/ZenSidebarManager.mjs)
-        content/browser/zen-components/ZenProfileDialogUI.mjs    (content/zen-components/src/ZenProfileDialogUI.mjs)
-        

src/browser/base/content/zen-sidebar-icons.inc.xhtml

@@ -1,7 +1,5 @@
-<toolbar id="zen-sidebar-icons-wrapper">
+<toolbar brighttext="true" id="zen-sidebar-icons-wrapper" class="zen-dont-hide-on-fullscreen">
   <toolbarbutton class="toolbarbutton-1 zen-sidebar-action-button chromeclass-toolbar-additional subviewbutton-nav" badge="true" closemenu="none" removable="true" delegatesanchor="true" cui-areatype="toolbar" id="zen-profile-button" data-l10n-id="toolbar-button-account" onclick="ZenProfileDialogUI.showSubView(this, event)">
-    <html:div class="zen-side-bar-profiles-button-panel-correction"></html:div>
-    <html:div></html:div>
   </toolbarbutton>
   <toolbarbutton class="toolbarbutton-1 zen-sidebar-action-button" id="zen-expand-sidebar-button" data-l10n-id="sidebar-zen-expand" oncommand="gZenVerticalTabsManager.toggleExpand();"></toolbarbutton>
   <toolbarbutton class="toolbarbutton-1 zen-sidebar-action-button" id="zen-sidepanel-button" data-l10n-id="sidebar-zen-sidepanel" onclick="gZenBrowserManagerSidebar.toggle();"></toolbarbutton>

src/browser/base/content/zen-sidebar-panel.inc.xhtml

@@ -20,8 +20,8 @@
         <html:p data-l10n-id="zen-sidebar-introduction-description"/>
       </vbox>
     </vbox>
-    <toolbar mode="icons" flex="1" id="zen-sidebar-panels-wrapper">
-      <toolbar mode="icons" flex="1" id="zen-sidebar-panels-sites">
+    <toolbar mode="icons" flex="1" id="zen-sidebar-panels-wrapper" class="zen-dont-hide-on-fullscreen">
+      <toolbar mode="icons" flex="1" id="zen-sidebar-panels-sites" class="zen-dont-hide-on-fullscreen">
         
       </toolbar>
       <toolbarbutton id="zen-sidebar-add-panel-button" class="zen-sidebar-panel-button toolbarbutton-1 chromeclass-toolbar-additional" onclick="gZenBrowserManagerSidebar._openAddPanelDialog();"/>

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

@@ -0,0 +1,109 @@
+
+@keyframes zen-jello-animation {
+  0% {
+    transform: scale3d(0.8, 0.8, 0.8);
+  }
+
+  60% {
+    transform: scale3d(1.02, 1.02, 1.02);
+  }
+
+  to {
+    opacity: 1;
+    transform: scale3d(1, 1, 1);
+  }
+}
+
+@keyframes zen-jello-out-animation {
+  0% {
+    transform: scale3d(1, 1, 1);
+  }
+
+  60% {
+    transform: scale3d(1.02, 1.02, 1.02);
+  }
+
+  99% {
+    opacity: 0;
+    transform: scale3d(0.8, 0.8, 0.8);
+  }
+
+  100% {
+    -moz-window-transform: none;
+    transform: none;
+  }
+}
+
+@keyframes zen-slide-in {
+  from {
+    transform: translateX(-10px);
+    opacity: 0;
+  }
+  to {
+    transform: translateX(0);
+    opacity: 1;
+  }
+}
+
+@keyframes zen-zoom-in {
+  from {
+    transform: scale(0.5);
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
+@keyframes zen-deck-fadeIn {
+  0% {
+    transform: scale(0.9);
+    opacity: 0;
+  }
+
+  100% {
+    transform: scale(1);
+    opacity: 1;
+  }
+}
+
+@keyframes zen-sidebar-panel-animation {
+  0% {
+    opacity: 0;
+    transform: scale3d(0.9, 0.9, 0.9);
+  }
+
+  100% {
+    opacity: 1;
+    transform: scale3d(1, 1, 1);
+  }
+}
+
+@keyframes zen-sidebar-panel-animation-2 {
+  0% {
+    opacity: 0;
+    transform: translateX(-50px);
+  }
+
+  100% {
+    opacity: 1;
+    transform: translateX(0);
+  }
+}
+
+@keyframes zen-sidebar-panel-animation-reverse {
+  0% {
+    opacity: 1;
+    transform: translateX(0);
+  }
+
+  99% {
+    opacity: 0;
+    transform: translateX(-50px);
+  }
+
+  100% {
+    display: none !important;
+  }
+}

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

@@ -0,0 +1,15 @@
+
+:root:not([inDOMFullscreen="true"]):not([chromehidden~="location"]):not([chromehidden~="toolbar"]) {
+  & #tabbrowser-tabbox #tabbrowser-tabpanels .browserSidebarContainer {
+    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-webview-border-radius, var(--zen-border-radius)));
+    border-radius: var(--zen-webview-border-radius, var(--zen-border-radius));
+    transform: translate3d(0, 0, 0);
+    overflow: hidden;
+
+    /* This fixes an issue with the left border */
+    margin-left: 2px;
+  }
+}

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

@@ -0,0 +1,38 @@
+ 
+#browser,
+#appcontent,
+#tabbrowser-tabpanels {
+  background: transparent !important;
+}
+
+#navigator-toolbox {
+  /* see issue #426 */
+  background: var(--zen-navigator-toolbox-background, transparent) !important;
+}
+
+#browser {
+  width: 100%;
+}
+
+html#main-window > body {
+  background: var(--zen-main-browser-background) !important;
+}
+
+:not([inDOMFullscreen="true"]) #appcontent {
+  overflow: hidden;
+}
+
+:not([inDOMFullscreen="true"]) #appcontent,
+#sidebar-box {
+  /** Sidebar is already hidden in full screen mode */
+  border: none;
+}
+
+#zen-main-app-wrapper {
+  background: var(--zen-main-browser-background);
+}
+
+#tabbrowser-tabbox {
+  display: flex;
+  flex-direction: row;
+}

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

@@ -25,9 +25,19 @@ button:active {
 html|button:not(:is(
   .tab-button, .ghost-button,
   .button-toggle, .button-edit,
-  .button-add
-)) {
+  .button-add,
+)),
+xul|button:is(
+  .expander-down
+) {
   transition: .2s;
+  min-width: unset !important;
   border-radius: 6px !important;
-  min-width: 80px !important;
+}
+
+@media (-moz-bool-pref: "zen.theme.pill-button") {
+  :host(:is(.anonymous-content-host, notification-message)),
+  :root {
+    --zen-button-border-radius: 20px;
+  }
 }

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

@@ -0,0 +1,189 @@
+
+/* All overrides for compact mode go here */
+
+@media not (-moz-bool-pref: "zen.view.compact") {
+  #sidebar-box {
+    margin-top: 0 !important;
+  }
+}
+
+@media (-moz-bool-pref: "zen.view.compact") {
+  :root[sizemode="fullscreen"],
+  #navigator-toolbox[inFullscreen]{ margin-top: 0 !important; }
+  
+  #navigator-toolbox {
+    --zen-compact-toolbox-margin-single: calc(var(--zen-element-separation) * 2);
+    --zen-compact-toolbox-margin: var(--zen-compact-toolbox-margin-single);
+    position: absolute;
+    display: block;
+    transition: 200ms ease-in-out !important;
+    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) !important;
+
+    & #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") {
+    #navigator-toolbox {
+      width: fit-content !important;
+    }
+  }
+
+  @media (-moz-bool-pref: "zen.view.sidebar-expanded") {
+    #navigator-toolbox {
+      min-width: calc(var(--zen-navigation-toolbar-min-width) + var(--zen-compact-toolbox-margin-single) * 2) !important;
+    }
+  }
+
+  #zen-sidebar-web-panel-wrapper:not(:has(#zen-sidebar-web-panel[hidden="true"])),
+  #sidebar-box:not([positionend="true"]) {
+    margin-right: 0 !important;
+    margin-left: var(--zen-sidebar-web-panel-spacing) !important;
+  }
+
+  #sidebar-box[positionend="true"] {
+    margin-left: 0 !important;
+    margin-right: var(--zen-sidebar-web-panel-spacing) !important;
+  }
+
+  #sidebar-splitter {
+    margin: 0 !important;
+  }
+
+  @media not (-moz-bool-pref: "zen.view.compact.hide-toolbar") {
+    #navigator-toolbox {
+      /* Remove the top margin */
+      /* The toolbox isn't relative to the webview anymore, meaning we can't just add a static value and call it a day... 
+       * The top margin is calculated by taking the following factors into account:
+       *  1. Element separation
+       *  2. Extra margin to separate from the webview
+       *  3. Add element separation variable, to avoid overlaping with the toolbar
+       *  4. Calculate toolbar height, taken from zen-urlbar.css
+       */
+      --zen-compact-toolbox-margin: calc(var(--zen-compact-toolbox-margin-single) + .15rem + var(--zen-element-separation) + (18px + (var(--toolbarbutton-inner-padding) * 2))) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single);
+    }
+
+    #zen-sidebar-web-panel-wrapper,
+    #sidebar-box {
+      margin-top: 0 !important;
+    }
+  }
+  
+  #navigator-toolbox:hover,
+  #navigator-toolbox:focus-within,
+  #navigator-toolbox[zen-user-show],
+  #mainPopupSet:has(> #appMenu-popup:hover) ~ toolbox,
+  #navigator-toolbox:has(*[open="true"]:not(tab):not(#zen-sidepanel-button)) {
+    transform: none !important;
+    opacity: 1;
+
+    & > * {
+      pointer-events: all;  
+    }
+  }
+  
+  #navigator-toolbox > *{ line-height: normal; }
+  
+  #navigator-toolbox,
+  #navigator-toolbox > *{
+    -moz-appearance: none !important;
+  }
+
+  #zen-sidebar-splitter {
+    display: none !important;
+  }
+  
+  /* Don't apply transform before window has been fully created */
+  :root:not([sessionrestored]) #navigator-toolbox{ transform:none !important }
+  
+  :root[customizing] #navigator-toolbox{
+    position: relative !important;
+    transform: none !important;
+    opacity: 1 !important;
+  }
+  
+  #navigator-toolbox[inFullscreen] > #PersonalToolbar,
+  #PersonalToolbar[collapsed="true"]{ display: none }
+
+  :root:not([inDOMFullscreen="true"]) #tabbrowser-tabbox #tabbrowser-tabpanels .browserSidebarContainer {
+    margin-left: var(--zen-element-separation) !important;
+  }
+
+  @media (-moz-bool-pref: "zen.view.compact.hide-toolbar") {
+    #zen-appcontent-navbar-container {
+      --urlbar-height: unset;
+      transition: .2s ease-in-out;
+      transform: translateY(calc(-100% + var(--zen-element-separation)));
+      opacity: 0;
+      position: absolute;
+      width: 100%;
+      border-bottom-left-radius: 8px;
+      border-bottom-right-radius: 8px;
+      border-bottom: 1px solid var(--zen-colors-border);
+      top: 0;
+      background: var(--zen-colors-tertiary);
+      z-index: 2;
+      transition: .2s ease-in-out;
+    }
+
+    #zen-appcontent-navbar-container:hover,
+    #zen-appcontent-navbar-container:focus-within,
+    #zen-appcontent-navbar-container[zen-user-show],
+    #mainPopupSet:has(> #appMenu-popup:hover) ~ #zen-appcontent-navbar-container,
+    #zen-appcontent-navbar-container:has(*[open="true"]) {
+      transform: translateY(0);
+      opacity: 1;
+    }
+
+    :root:not([inDOMFullscreen="true"]) #tabbrowser-tabbox #tabbrowser-tabpanels .browserSidebarContainer {
+      margin-top: var(--zen-element-separation) !important;
+    }
+
+    #titlebar {
+      padding-top: 5px !important;
+    }
+
+    #zen-sidebar-web-panel-wrapper {
+      margin-top: 10px !important;
+    }
+  }
+
+  @media (-moz-bool-pref: "zen.tabs.vertical.right-side") {
+    #navigator-toolbox {
+      right: 0 !important;
+      transform: translateX(calc(100% - (var(--zen-compact-toolbox-margin-single) / 2))) !important;;
+    }
+
+    #navigator-toolbox:hover,
+    #navigator-toolbox:focus-within,
+    #navigator-toolbox[zen-user-show],
+    #mainPopupSet:has(> #appMenu-popup:hover) ~ toolbox,
+    #navigator-toolbox:has(*[open="true"]:not(tab):not(#zen-sidepanel-button)) {
+      transform: none !important;
+      opacity: 1;
+  
+      & > * {
+        pointer-events: all;  
+      }
+    }
+  }
+}

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

@@ -0,0 +1,120 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/** Zen Decks - ONLY USED FOR SPLIT VIEWS, DO NOT USE THIS CLASS FOR ANY OTHER PURPOSE **/
+
+#tabbrowser-tabpanels[zen-split-view="true"] {
+  display: flex;
+  flex-direction: row;
+}
+
+#tabbrowser-tabpanels[zen-split-view="true"] > *:not([zen-split="true"]) {
+  flex: 0;
+  margin: 0;
+}
+
+#tabbrowser-tabpanels[zen-split-view="true"] > [zen-split="true"] {
+  flex: 1;
+  margin-right: 5px;
+}
+
+#tabbrowser-tabpanels[zen-split-view="true"] > [zen-split-anim="true"] {
+  animation: zen-deck-fadeIn 0.2s forwards;
+}
+
+#tabbrowser-tabpanels[zen-split-view="true"] .browserSidebarContainer[zen-split-active="true"] {
+  box-shadow: 0 0 0 2px var(--zen-primary-color) !important;
+}
+
+#tabbrowser-tabpanels:has(> [zen-split="true"]) {
+  display: grid;
+  grid-gap: 5px;
+}
+
+#zen-split-views-box:not([hidden="true"]) {
+  display: flex !important;
+}
+
+/* Split view panel */
+
+#zenSplitViewModifierViewDefault {
+  min-width: 180px;
+  min-height: 180px;
+  
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  grid-template-rows: 1fr 1fr;
+
+  gap: 10px;
+  padding: 15px;
+}
+
+#zenSplitViewModifierViewDefault > vbox {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  cursor: pointer;
+}
+
+#zenSplitViewModifierViewDefault .zen-split-view-modifier-preview {
+  border-radius: 5px;
+  border: 1px solid var(--zen-colors-border);
+  width: 100px;
+  height: 70px;
+  overflow: hidden;
+  padding: 5px;
+  user-select: none;
+  font-weight: 500;
+}
+
+#zenSplitViewModifierViewDefault .zen-split-view-modifier-preview.active {
+  box-shadow: 0 0 0 2px var(--zen-primary-color);
+  border-width: 0px;
+}
+
+#zenSplitViewModifierViewDefault p {
+  margin-top: 5px;
+  margin-bottom: 0;
+}
+
+#zenSplitViewModifierViewDefault .zen-split-view-modifier-preview box {
+  background-color: var(--zen-colors-secondary);
+  border-radius: 3px;
+  width: 100%;
+  height: 100%;
+}
+
+#zenSplitViewModifierViewDefault .zen-split-view-modifier-preview.hsep {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+
+#zenSplitViewModifierViewDefault .zen-split-view-modifier-preview.hsep box:last-child {
+  margin-top: 5px;
+}
+
+#zenSplitViewModifierViewDefault .zen-split-view-modifier-preview.vsep box:last-child {
+  margin-left: 5px;
+}
+
+#zenSplitViewModifierViewDefault .zen-split-view-modifier-preview.grid {
+  display: grid;
+  grid-template-areas: "a b" "c b";
+  gap: 5px;
+}
+
+#zenSplitViewModifierViewDefault .zen-split-view-modifier-preview.grid box:nth-child(1) {
+  grid-area: a;
+}
+
+#zenSplitViewModifierViewDefault .zen-split-view-modifier-preview.grid box:nth-child(2) {
+  grid-area: b;
+}
+
+#zenSplitViewModifierViewDefault .zen-split-view-modifier-preview.grid box:nth-child(3) {
+  grid-area: c;
+}

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

@@ -0,0 +1,8 @@
+
+panel[type="arrow"][animate][animate="open"] {
+  animation: zen-jello-animation 0.2s ease-in-out;
+}
+
+panel[type="arrow"][animate][animate="cancel"] {
+  animation: zen-jello-out-animation 0.2s ease-in-out;
+}

src/browser/base/content/zen-styles/zen-panels/bookmarks.css

@@ -0,0 +1,65 @@
+#zenEditBookmarkPanelFaviconContainer {
+  border: 1px solid var(--input-border-color);
+  width: 100px;
+  height: 100px;
+  border-radius: 10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin: 16px;
+  background: light-dark(#fff, rgba(255,255,255,.1));
+}
+
+#editBookmarkPanel::part(content) {
+  display: flex;
+  flex-direction: row;
+}
+
+#zenEditBookmarkPanelFavicon {
+  width: 20px;
+  height: 20px;
+}
+
+#editBookmarkPanel .panel-header {
+  min-height: 0;
+  padding-bottom: 0;
+  padding-top: 16px;
+}
+
+#editBMPanel_namePicker {
+  width: -moz-available;
+}
+
+label.editBMPanel_folderRow,
+label.editBMPanel_nameRow {
+  min-width: 60px;
+}
+
+hbox.editBMPanel_folderRow {
+  width: -moz-available;
+}
+
+.zenEditBMPanel_fieldContainer:not(:first-child) {
+  margin-top: 10px;
+}
+
+.zenEditBMPanel_fieldContainer {
+  align-items: center;
+}
+
+#editBookmarkPanelBottomContent {
+  display: none;
+}
+
+:host(:not([native])) #label-box {
+  font-weight: 500;
+}
+
+#editBMPanel_folderMenuList::part(icon) {
+  margin-right: 10px;
+}
+
+/* Bookmarks in toolbar */
+#PersonalToolbar {
+  background: transparent;
+}

src/browser/base/content/zen-styles/zen-panels/extensions.css

@@ -0,0 +1,69 @@
+#unified-extensions-manage-extensions {
+  padding-left: 20px;
+}
+
+panelview .unified-extensions-item-action-button {
+  padding: 5px 20px;
+}
+
+#unified-extensions-description {
+  padding: 0 20px;
+  margin: 0;
+}
+
+.unified-extensions-item {
+  padding: 0;
+}
+
+#unified-extensions-view {
+  --uei-icon-size: 16px;
+
+  .unified-extensions-item {
+    margin-block: 0;
+    border-radius: var(--arrowpanel-menuitem-border-radius);
+
+    > .unified-extensions-item-action-button {
+      .unified-extensions-item-message-deck {
+        display: none;
+      }
+
+      &:hover {
+        background-color: initial;
+      }
+    }
+
+    > .unified-extensions-item-menu-button {
+      list-style-image: url("chrome://global/skin/icons/more.svg");
+      padding: 0;
+
+      > .toolbarbutton-icon {
+        padding: var(--arrowpanel-menuitem-padding-block) var(--arrowpanel-menuitem-padding-inline);
+        border: none;
+        opacity: 0;
+      }
+
+      &:hover {
+
+        > .toolbarbutton-icon {
+          background-color: initial;
+        }
+
+        &:active {
+          color: var(--button-primary-hover-bgcolor);
+        }
+      }
+    }
+
+    &:hover {
+      background-color: var(--panel-item-hover-bgcolor);
+
+      > .unified-extensions-item-menu-button > .toolbarbutton-icon {
+        opacity: 1;
+      }
+    }
+
+    &:has(> .unified-extensions-item-action-button:not([disabled]):hover:active) {
+      background-color: var(--panel-item-active-bgcolor);
+    }
+  }
+}

src/browser/base/content/zen-styles/zen-panels/print.css

@@ -0,0 +1,7 @@
+.printDialogBox {
+  max-width: 90vw;
+}
+
+.printSettingsBrowser {
+  min-width: 350px;
+}

src/browser/base/content/zen-styles/zen-panels/welcome.css

@@ -0,0 +1,30 @@
+/* Zen Welcome idalog override */
+.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/zen-styles/zen-popup.css

@@ -1,20 +1,20 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.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://browser/content/zen-styles/zen-panels/bookmarks.css");
+@import url("chrome://browser/content/zen-styles/zen-panels/extensions.css");
+@import url("chrome://browser/content/zen-styles/zen-panels/print.css");
+@import url("chrome://browser/content/zen-styles/zen-panels/welcome.css");
 
 :root {
-  --panel-subview-body-padding: 2px 0 !important;
-  --arrowpanel-menuitem-border-radius: 5px !important;
-  --arrowpanel-menuitem-margin: var(--uc-arrowpanel-menuitem-margin-block) var(--uc-arrowpanel-menuitem-margin-inline) !important;
-  --arrowpanel-menuitem-padding-block: 8px !important;
-  --arrowpanel-menuitem-padding-inline: 14px !important;
+  --panel-subview-body-padding: 2px 0;
+  --arrowpanel-menuitem-border-radius: 5px;
+  --arrowpanel-menuitem-margin: var(--uc-arrowpanel-menuitem-margin-block) var(--uc-arrowpanel-menuitem-margin-inline);
+  --arrowpanel-menuitem-padding-block: 8px;
+  --arrowpanel-menuitem-padding-inline: 14px;
   --uc-arrowpanel-menuicon-margin-inline: 14px;
   --uc-arrowpanel-menuitem-margin-inline: 4px;
   --uc-arrowpanel-menuitem-margin-block: 2px;
-  --panel-separator-margin-vertical: 2px !important;
-  --panel-separator-margin-horizontal: 1px !important;
+  --panel-separator-margin-vertical: 2px;
+  --panel-separator-margin-horizontal: 1px;
 
   --uc-panel-zoom-button-padding: 8px;
   --uc-panel-zoom-button-inline-padding: 9px;
@@ -41,39 +41,45 @@
   --uc-contextmenu-separator-vertical: calc(4px - var(--uc-contextmenu-menuitem-border-width));
   --uc-contextmenu-separator-horizontal: 0;
 
-  --panel-separator-color: var(--zen-colors-border) !important;
+  --panel-separator-color: var(--zen-colors-border);
+
   --zen-panel-separator-width: 1px;
 }
 
+menupopup, panel {
+  --panel-background: var(--arrowpanel-background);
+  --panel-border-radius: var(--zen-panel-radius);
+}
+
 /* app menu */
 .addon-banner-item,
 .panel-banner-item {
-  margin: 2px 4px 2px !important;
-  padding-inline: 4px 12px !important;
-  padding-block: var(--arrowpanel-menuitem-padding-block) !important;
-  border-radius: var(--arrowpanel-menuitem-border-radius) !important;
+  margin: 2px 4px 2px;
+  padding-inline: 4px 12px;
+  padding-block: var(--arrowpanel-menuitem-padding-block);
+  border-radius: var(--arrowpanel-menuitem-border-radius);
 }
 
 #appMenu-fxa-label2 label,
 #PanelUI-fxa-menu-syncnow-button label {
-  margin-block: 0 !important;
+  margin-block: 0;
 }
 
 .widget-overflow-list .toolbarbutton-1:not(.toolbarbutton-combined)>.toolbarbutton-text,
 .subviewbutton:not(#appMenu-zoom-controls > .subviewbutton)>.toolbarbutton-icon+.toolbarbutton-text,
 #appMenu-fxa-label2>vbox {
-  padding-inline-start: var(--uc-arrowpanel-menuicon-margin-inline) !important;
+  padding-inline-start: var(--uc-arrowpanel-menuicon-margin-inline);
 }
 
 /* special case menuitems with no icons */
 #appMenu-zoom-controls>.toolbarbutton-text,
 #fxa-manage-account-button>vbox,
 #PanelUI-fxa-menu-syncnow-button>hbox {
-  padding-inline-start: calc(16px + var(--uc-arrowpanel-menuicon-margin-inline)) !important;
+  padding-inline-start: calc(16px + var(--uc-arrowpanel-menuicon-margin-inline));
 }
 
 .subviewbutton>.toolbarbutton-icon {
-  width: 15px !important;
+  width: 15px;
 }
 
 /* firefox profile avatar in appmenu */
@@ -89,37 +95,37 @@
 
 /* disable proton account separator */
 #appMenu-fxa-separator {
-  border-image: none !important;
+  border-image: none;
 }
 
 #appMenu-fxa-status2:not([fxastatus]) {
-  padding-block: 0 !important;
+  padding-block: 0;
 }
 
 #appMenu-fxa-status2:not([fxastatus])>#appMenu-fxa-label2 {
-  margin-inline-end: calc(var(--arrowpanel-menuitem-padding-inline) * -1) !important;
+  margin-inline-end: calc(var(--arrowpanel-menuitem-padding-inline) * -1);
 }
 
 /* zoom controls */
 #appMenu-zoom-controls {
-  border-top: 1px solid var(--panel-separator-color) !important;
-  padding-inline: calc(var(--arrowpanel-menuitem-padding-inline) + var(--uc-arrowpanel-menuitem-margin-inline)) var(--uc-arrowpanel-menuitem-margin-inline) !important;
-  padding-block: var(--uc-panel-zoom-padding-block) !important;
-  margin: var(--panel-separator-margin-vertical) 0 calc(var(--panel-separator-margin-vertical) * -1) !important;
+  border-top: 1px solid var(--panel-separator-color);
+  padding-inline: calc(var(--arrowpanel-menuitem-padding-inline) + var(--uc-arrowpanel-menuitem-margin-inline)) var(--uc-arrowpanel-menuitem-margin-inline);
+  padding-block: var(--uc-panel-zoom-padding-block);
+  margin: var(--panel-separator-margin-vertical) 0 calc(var(--panel-separator-margin-vertical) * -1);
 }
 
 #appMenu-zoom-controls>.subviewbutton {
-  padding: var(--uc-panel-zoom-button-padding) var(--uc-panel-zoom-button-inline-padding) !important;
-  margin: 0 !important;
+  padding: var(--uc-panel-zoom-button-padding) var(--uc-panel-zoom-button-inline-padding);
+  margin: 0;
 }
 
 #appMenu-zoom-controls>#appMenu-zoomReset-button2 {
-  padding: var(--uc-panel-zoom-button-padding) calc(var(--uc-panel-zoom-button-padding) / 2) !important;
+  padding: var(--uc-panel-zoom-button-padding) calc(var(--uc-panel-zoom-button-padding) / 2);
 }
 
 /* #appMenu-zoomReduce-button2, */
 #appMenu-zoom-controls>#appMenu-fullscreen-button2 {
-  margin-left: calc((var(--panel-separator-margin-vertical) + var(--uc-arrowpanel-menuitem-margin-block)) * 2 + 1px) !important;
+  margin-left: calc((var(--panel-separator-margin-vertical) + var(--uc-arrowpanel-menuitem-margin-block)) * 2 + 1px);
 }
 
 #appMenu-zoom-controls>#appMenu-fullscreen-button2::before {
@@ -133,65 +139,65 @@
 }
 
 #appMenu-zoomReset-button2 {
-  height: calc(16px + var(--uc-panel-zoom-button-padding) * 2) !important;
-  min-height: calc(16px + var(--uc-panel-zoom-button-padding) * 2) !important;
+  height: calc(16px + var(--uc-panel-zoom-button-padding) * 2);
+  min-height: calc(16px + var(--uc-panel-zoom-button-padding) * 2);
 }
 
 #appMenu-zoomReduce-button2:not([disabled], [open], :active):is(:hover),
 #appMenu-zoomEnlarge-button2:not([disabled], [open], :active):is(:hover),
 #appMenu-fullscreen-button2:not([disabled], [open], :active):is(:hover),
 #appMenu-zoomReset-button2:not([disabled], [open], :active):is(:hover) {
-  background-color: var(--panel-item-hover-bgcolor) !important;
+  background-color: var(--panel-item-hover-bgcolor);
 }
 
 #appMenu-zoomReduce-button2:not([disabled]):is([open], :hover:active),
 #appMenu-zoomEnlarge-button2:not([disabled]):is([open], :hover:active),
 #appMenu-fullscreen-button2:not([disabled]):is([open], :hover:active),
 #appMenu-zoomReset-button2:not([disabled]):is([open], :hover:active) {
-  background-color: var(--panel-item-active-bgcolor) !important;
+  background-color: var(--panel-item-active-bgcolor);
 }
 
 #appMenu-zoomReset-button2>.toolbarbutton-text,
 #appMenu-fullscreen-button2>.toolbarbutton-icon {
-  background-color: transparent !important;
-  padding: 0 !important;
+  background-color: transparent;
+  padding: 0;
 }
 
 .subviewbutton[shortcut]::after {
-  opacity: 0.7 !important;
+  opacity: 0.7;
 }
 
 #widget-overflow-mainView .panel-subview-body {
-  padding-bottom: 0 !important;
+  padding-bottom: 0;
 }
 
 .PanelUI-subView>.panel-header+toolbarseparator {
-  margin-bottom: 0 !important;
+  margin-bottom: 0;
 }
 
 .PanelUI-subView>.panel-header+toolbarseparator+.panel-subview-body {
-  padding-top: var(--panel-separator-margin-vertical) !important;
+  padding-top: var(--panel-separator-margin-vertical);
 }
 
 #identity-popup-security-button {
-  margin-bottom: var(--panel-separator-margin-vertical) !important;
+  margin-bottom: var(--panel-separator-margin-vertical);
 }
 
 #permission-popup-mainView-panel-header,
 #identity-popup-mainView-panel-header,
 #protections-popup-mainView-panel-header,
 .panel-header {
-  min-height: calc((var(--arrowpanel-menuitem-padding-block) + 4px) * 2 + 16px) !important;
+  min-height: calc((var(--arrowpanel-menuitem-padding-block) + 4px) * 2 + 16px);
 }
 
 /* URL bar popup */
 
 .identity-popup-security-connection>hbox>description {
-  margin-inline-start: 0 !important;
+  margin-inline-start: 0;
 }
 
 .identity-popup-security-connection.identity-button {
-  margin-inline-end: calc(-1 * (var(--arrowpanel-menuitem-padding-inline) - 10px)) !important;
+  margin-inline-end: calc(-1 * (var(--arrowpanel-menuitem-padding-inline) - 10px));
 }
 
 #identity-popup-mainView-panel-header-span,
@@ -199,42 +205,42 @@
 #identity-popup-mainView-panel-header label,
 #permission-popup-mainView-panel-header label,
 #protections-popup-mainView-panel-header-span {
-  margin-block: 0 !important;
+  margin-block: 0;
 }
 
 .permission-popup-section {
-  padding-block: var(--uc-permission-itemcontainer-padding-block) !important;
+  padding-block: var(--uc-permission-itemcontainer-padding-block);
 }
 
 #permission-popup-permissions-content {
-  padding-inline: var(--uc-permission-item-padding-inline) !important;
+  padding-inline: var(--uc-permission-item-padding-inline);
 }
 
 .permission-popup-permission-item,
 #permission-popup-storage-access-permission-list-header {
-  margin-block: var(--uc-permission-item-margin-block) !important;
+  margin-block: var(--uc-permission-item-margin-block);
 }
 
 .permission-popup-permission-label,
 .permission-popup-permission-header-label {
-  margin-inline-start: var(--uc-arrowpanel-menuicon-margin-inline) !important;
+  margin-inline-start: var(--uc-arrowpanel-menuicon-margin-inline);
 }
 
 #editBookmarkPanel>#editBookmarkHeaderSeparator,
 #editBookmarkPanel>.panel-subview-body>#editBookmarkSeparator {
-  margin-inline: 0 !important;
+  margin-inline: 0;
 }
 
 #identity-popup-mainView > toolbarseparator:first-child,
 #unified-extensions-view > toolbarseparator:first-child {
-  display: none !important;
-  opacity: 0 !important;
+  display: none;
+  opacity: 0;
 }
 
 
 menupopup::part(content),
 panel::part(content) {
-  border: var(--zen-appcontent-border) !important;
+  border: var(--zen-appcontent-border);
 }
 
 menupopup, 
@@ -242,143 +248,32 @@ panel {
   box-shadow: none;
 }
 
-/*toolbarbutton:not(:is(
-  #appMenu-fxa-label2, 
-  .subviewbutton-iconic, 
-  .zen-sidebar-action-button, 
-  .all-tabs-close-button,
-  .zen-sidebar-panel-button,
-  #zen-sidebar-web-panel-pinned,
-  #PanelUI-zen-profiles-managePrfs,
-  .bookmark-item,
-  #urlbar-zoom-button,
-  .panel-info-button,
-)),*/
-#PanelUI-zen-profiles menuitem {
-  /** ADD HERE ALL TYPES OF BUTTONS THAT WANT TO LOOK CHROME LIKE!!! */
-  margin: 0 !important;
-  border-radius: 0 !important;
-}
-
 .panel-subview-footer-button {
-  padding-top: 10px !important;
-  padding-bottom: 10px !important;
-}
-
-#PanelUI-zen-profiles menuitem {
-  padding: 5px !important;
-}
-
-#PanelUI-zen-profiles menuitem:last-child {
-  margin-bottom: 5px !important;
-}
-
-panelview .unified-extensions-item-action-button {
-  padding: 5px 20px !important;
-}
-
-#unified-extensions-description {
-  padding: 0 20px;
-  margin: 0 !important;
-}
-
-.unified-extensions-item {
-  padding: 0 !important;
-}
-
-.panel-subview-footer-button {
-  --arrowpanel-menuitem-padding-block: 20px !important;
-  --arrowpanel-menuitem-padding-inline: 15px !important;
-}
-
-toolbarseparator, menuseparator {
-  border-width: var(--zen-panel-separator-width) !important;
-}
-
-#appMenu-zoom-controls {
-  border-top-width: var(--zen-panel-separator-width) !important;
-}
-
-#zenEditBookmarkPanelFaviconContainer {
-  border: 1px solid var(--input-border-color);
-  width: 100px;
-  height: 100px;
-  border-radius: 10px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin: 16px;
-  background: light-dark(#fff, rgba(255,255,255,.1));
-}
-
-#editBookmarkPanel::part(content) {
-  display: flex;
-  flex-direction: row !important;
-}
-
-#zenEditBookmarkPanelFavicon {
-  width: 20px;
-  height: 20px;
-}
-
-#editBookmarkPanel .panel-header {
-  min-height: 0 !important;
-  padding-bottom: 0;
-  padding-top: 16px;
-}
-
-#editBMPanel_namePicker {
-  width: -moz-available;
-}
-
-label.editBMPanel_folderRow,
-label.editBMPanel_nameRow {
-  min-width: 60px;
-}
-
-hbox.editBMPanel_folderRow {
-  width: -moz-available;
-}
-
-.zenEditBMPanel_fieldContainer:not(:first-child) {
-  margin-top: 10px;
-}
-
-.zenEditBMPanel_fieldContainer {
-  align-items: center;
-}
-
-#editBookmarkPanelBottomContent {
-  display: none;
-}
-
-:host(:not([native])) #label-box {
-  font-weight: 500 !important;
-}
-
-#editBMPanel_folderMenuList::part(icon) {
-  margin-right: 10px;
-}
-
-/**/
-
-#unified-extensions-manage-extensions {
-  padding-left: 20px;
+  padding-top: 10px;
+  padding-bottom: 10px;
 }
 
 #identity-popup-clear-sitedata-footer {
-  margin-bottom: 0 !important; 
-  padding-top: 0 !important;
+  margin: 0; 
+  padding: 0;
 }
 
-/* Dialog box */
-
-.printDialogBox {
-  max-width: 90vw !important;
+.panel-subview-footer-button {
+  --arrowpanel-menuitem-padding-block: 20px;
+  --arrowpanel-menuitem-padding-inline: 15px;
 }
 
-.printSettingsBrowser {
-  min-width: 350px !important;
+toolbarseparator, menuseparator {
+  border-width: var(--zen-panel-separator-width);
+}
+
+#appMenu-zoom-controls {
+  border-top-width: var(--zen-panel-separator-width);
+}
+
+#identity-popup-multiView toolbarseparator,
+#editBookmarkHeaderSeparator {
+  display: none;
 }
 
 /* Context menu */
@@ -388,58 +283,3 @@ menu, menuitem {
     color: var(--button-hover-color);
   }
 }
-
-/** Unified Extensions View */
-
-#unified-extensions-view {
-  --uei-icon-size: 16px !important;
-
-  .unified-extensions-item {
-    margin-block: 0 !important;
-    border-radius: var(--arrowpanel-menuitem-border-radius) !important;
-
-    > .unified-extensions-item-action-button {
-      .unified-extensions-item-message-deck {
-        display: none;
-      }
-
-      &:hover {
-        background-color: initial !important;
-      }
-    }
-
-    > .unified-extensions-item-menu-button {
-      list-style-image: url("chrome://global/skin/icons/more.svg") !important;
-      padding: 0 !important;
-
-      > .toolbarbutton-icon {
-        padding: var(--arrowpanel-menuitem-padding-block) var(--arrowpanel-menuitem-padding-inline) !important;
-        border: none !important;
-        opacity: 0;
-      }
-
-      &:hover {
-
-        > .toolbarbutton-icon {
-          background-color: initial !important;
-        }
-
-        &:active {
-          color: var(--button-primary-hover-bgcolor) !important;
-        }
-      }
-    }
-
-    &:hover {
-      background-color: var(--panel-item-hover-bgcolor);
-
-      > .unified-extensions-item-menu-button > .toolbarbutton-icon {
-        opacity: 1;
-      }
-    }
-
-    &:has(> .unified-extensions-item-action-button:not([disabled]):hover:active) {
-      background-color: var(--panel-item-active-bgcolor);
-    }
-  }
-}

src/browser/base/content/zen-styles/zen-profile-dialog.css

@@ -0,0 +1,169 @@
+#PanelUI-zen-profiles {
+  --menu-panel-width: 19em;
+  position: relative;
+  padding-bottom: 5px;
+}
+
+#PanelUI-zen-profiles-header {
+  width: 280px;
+  height: 130px;
+  background: color-mix(in srgb, var(--zen-primary-color) 80%, white 20%);
+  position: relative;
+}
+
+#PanelUI-zen-profiles-user-picture {
+  background-image: var(--avatar-image-url);
+  width: 75px;
+  height: 75px;
+  border: 4px var(--arrowpanel-background) solid;
+  background-color: var(--zen-colors-primary-foreground);
+  border-radius: 50%;
+  background-repeat: no-repeat;
+  background-size: cover;
+  background-position: center;
+  margin: 0 auto;
+  transform: translateY(100%);
+}
+
+.PanelUI-zen-profiles-item {
+  position: relative;
+  display: flex;
+  padding: 6px 10px;
+  font: menu;
+  align-items: center;
+}
+
+#PanelUI-zen-profiles-list .PanelUI-zen-profiles-item {
+  margin-bottom: 2px;
+  border-radius: 5px;
+  margin: 2px 5px;
+}
+
+#PanelUI-zen-profiles-list > toolbarseparator:first-child {
+  margin: 5px;
+}
+
+.PanelUI-zen-profiles-item:hover {
+  background: var(--panel-item-hover-bgcolor);
+  color: inherit;
+}
+
+.PanelUI-zen-profiles-item::after {
+  content: '';
+  background-image: url("chrome://global/skin/icons/arrow-right.svg");
+  background-size: 1em;
+  background-repeat: no-repeat;
+  background-position: center;
+  width: 1em;
+  height: 1em;
+  margin-left: auto;
+  pointer-events: none;
+  top: 50%;
+  right: 1em;
+  transform: translateY(-50%);
+  position: absolute;
+}
+
+@media (prefers-color-scheme: dark) {
+  .PanelUI-zen-profiles-item::after {
+    filter: invert(1);
+  }
+}
+
+#PanelUI-zen-profiles-list .PanelUI-zen-profiles-item-avatar {
+  width: 20px;
+  height: 20px;
+  border-radius: 5px;
+  margin: 1px 0.5em 1px 1px;
+}
+
+#PanelUI-zen-profiles-list .PanelUI-zen-profiles-item-name {
+  font-weight: normal;
+  font-size: 15px;
+  margin-left: 5px;
+}
+
+#PanelUI-zen-profiles-current-info {
+  --zen-separation-from-content: 35px;
+  margin-top: calc(var(--zen-separation-from-content) + 30px); /** Ignore the profile picture */
+}
+
+#PanelUI-zen-profiles-current-name {
+  font-size: 1.3em;
+  font-weight: 600;
+  line-height: 0.5;
+  padding: 5px 10px;
+  border-radius: 5px;
+  margin: 0 auto;
+}
+
+
+#PanelUI-zen-profiles toolbarbutton::after {
+  display: none;
+}
+
+#PanelUI-zen-profiles toolbarbutton {
+  padding-left: 16px;
+  padding-right: 16px;
+}
+
+
+#PanelUI-zen-profiles toolbarbutton:last-child {
+  margin-bottom: 5px !important;
+}
+
+#PanelUI-zen-profiles-current-profile-current {
+  font-size: 13px;
+  opacity: 0.5;
+  margin: 0 auto var(--zen-separation-from-content) auto;
+  font-size: 15px;
+  font-weight: 600;
+}
+
+
+#PanelUI-zen-profiles-actions {
+  color-scheme: dark;
+  position: absolute;
+  top: 10px;
+  right: 10px;
+  border-radius: 10px !important;
+  padding: 1px 10px !important;
+  transition: .1s;
+  color: light-dark(white, black);
+  background: light-dark(rgba(255, 255, 255, 0.1), rgba(0, 0, 0, 0.1));
+}
+
+#PanelUI-zen-profiles-managePrfs:hover {
+  background: var(--panel-item-hover-bgcolor);
+}
+
+#PanelUI-zen-profiles-actions toolbarbutton {
+  cursor: pointer;
+  padding: 0;
+}
+
+#PanelUI-zen-profiles-actions toolbarbutton .toolbarbutton-icon {
+  width: 14px !important;
+}
+
+#PanelUI-zen-profiles-actions toolbarbutton:not(:first-child) {
+  margin-left: 10px;
+}
+
+#PanelUI-zen-profiles-actions toolbarbutton label {
+  display: none !important;
+}
+
+#PanelUI-zen-profiles menuitem {
+  /** ADD HERE ALL TYPES OF BUTTONS THAT WANT TO LOOK CHROME LIKE!!! */
+  margin: 0;
+  border-radius: 0;
+}
+
+#PanelUI-zen-profiles menuitem {
+  padding: 5px;
+}
+
+#PanelUI-zen-profiles menuitem:last-child {
+  margin-bottom: 5px;
+}

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

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#zen-sidebar-panels-wrapper {
+ #zen-sidebar-panels-wrapper {
   /*min-height: 500px;*/
   display: flex;
   align-items: center;
@@ -53,6 +53,7 @@
 
 #zen-sidebar-web-panel-wrapper {
   --zen-default-sidebar-width: 300px;
+  --zen-sidebar-web-panel-spacing: var(--zen-element-separation);
   position: relative;
   margin-right: 0;
   display: flex;
@@ -67,17 +68,12 @@
 }
 
 #zen-sidebar-web-panel-wrapper:has(#zen-sidebar-web-panel[pinned="true"]) {
-  --zen-sidebar-web-panel-spacing: 10px;
   margin: var(--zen-appcontent-separator-from-window);
   position: absolute;
   z-index: 1;
   width: -moz-available;
   padding: var(--zen-sidebar-web-panel-spacing);
-  height: 100%;
-}
-
-#zen-sidebar-web-panel:not([pinned="true"]) {
-  --zen-sidebar-web-panel-spacing: calc(10px / 3);
+  height: calc(100% - var(--zen-element-separation));
 }
 
 #zen-sidebar-web-panel {
@@ -93,6 +89,7 @@
   min-height: var(--zen-default-sidebar-width);
   width: calc(var(--zen-default-sidebar-width) + 200px);
   pointer-events: all;
+  height: calc(100% - 20px);
 }
 
 #zen-sidebar-web-panel:not([pinned="true"]) {
@@ -125,7 +122,7 @@
 #zen-sidebar-web-panel[hidden="true"] #zen-sidebar-web-panel-hsplitter,
 #zen-sidebar-web-panel-wrapper[hidden="true"] + #zen-sidebar-web-panel-splitter,
 #zen-sidebar-web-panel-wrapper[hidden="true"] + #zen-sidebar-web-panel-hsplitter,
-#zen-sidebar-web-panel-wrapper:has(#zen-sidebar-web-panel:not([pinned="true"])) + #zen-sidebar-web-panel-splitter {
+#zen-sidebar-web-panel:not([pinned="true"]) #zen-sidebar-web-panel-hsplitter {
   display: none;
   margin: 0;
 }
@@ -158,46 +155,6 @@
   animation: zen-sidebar-panel-animation-reverse 0.2s ease-in-out forwards;
 }
 
-@keyframes zen-sidebar-panel-animation {
-  0% {
-    opacity: 0;
-    transform: scale3d(0.9, 0.9, 0.9);
-  }
-
-  100% {
-    opacity: 1;
-    transform: scale3d(1, 1, 1);
-  }
-}
-
-@keyframes zen-sidebar-panel-animation-2 {
-  0% {
-    opacity: 0;
-    transform: translateX(-50px);
-  }
-
-  100% {
-    opacity: 1;
-    transform: translateX(0);
-  }
-}
-
-@keyframes zen-sidebar-panel-animation-reverse {
-  0% {
-    opacity: 1;
-    transform: translateX(0);
-  }
-
-  99% {
-    opacity: 0;
-    transform: translateX(-50px);
-  }
-
-  100% {
-    display: none !important;
-  }
-}
-
 #zen-sidebar-web-header,
 #zen-sidebar-panels-wrapper {
   width: 100%;
@@ -274,4 +231,4 @@
   width: -moz-available;
   text-align: center;
   display: block;
-}
+}