chore: Enable Zen Workspaces functionality and set default workspace to "Default Workspace"

.github/workflows/alpha.yml

@@ -41,14 +41,6 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
       - name: Install dependencies
         run: pnpm install
 
@@ -101,14 +93,6 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
       - name: Install dependencies
         run: pnpm install
 
@@ -165,10 +149,6 @@ jobs:
           sudo apt-get install dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm
           pip install pycairo testresources
 
-      - name: Disable wasm sandboxing for the sake of my sanity
-        run: |
-          echo "ac_add_options --without-wasm-sandboxed-libraries" >> mozconfig
-
       - name: Free up space
         run: |
           sudo rm -rf /usr/share/dotnet
@@ -203,14 +183,6 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
       - name: Install dependencies
         run: pnpm install
 
@@ -230,7 +202,9 @@ jobs:
           cd ..
 
       - name: Build
-        run: pnpm build
+        run: |
+          export ZEN_RELEASE=1
+          pnpm build
 
       - name: Package
         run: pnpm package
@@ -294,11 +268,6 @@ jobs:
       - name: Download
         run: pnpm surfer download
 
-      - name: Disable wasm sandboxing for the sake of my sanity
-        run: |
-          cd engine/
-          echo "ac_add_options --without-wasm-sandboxed-libraries" >> mozconfig
-
       - name: Free up space
         run: |
           sudo rm -rf /usr/share/dotnet
@@ -327,6 +296,7 @@ jobs:
 
           cd ..
           npm install -g pnpm
+          export SURFER_PLATFORM="win32"
           pnpm surfer bootstrap
 
           cd engine/
@@ -334,7 +304,8 @@ jobs:
           echo "export LIB=\"$(cd ~/.mozbuild/clang/lib/clang/* && cd lib/windows && pwd)\"" >> ../configs/common/mozconfig
           cat ../configs/common/mozconfig
 
-          ls ~/win-cross/nsis || true
+          ls ~/win-cross/wine || true
+          ls ~/win-cross/vs2022 || true
   
       - name: setup Rust 
         run: |
@@ -354,23 +325,22 @@ jobs:
         run: pnpm surfer import --verbose  
 
       - name: Build
-        run: pnpm build
+        run: |
+          unset SURFER_PLATFORM
+          export ZEN_RELEASE=1
+          export ZEN_CROSS_COMPILING=1
+          pnpm build
 
       - name: Package
         run: |
           set -x
+          export SURFER_PLATFORM="win32"
           pnpm package
           mv ./dist/output.mar windows.mar
           mv ./dist/zen-$(pnpm surfer get version | xargs).en-US.win64.zip zen.win64.zip
           ls ./dist
           ls .
 
-      #- name: Upload artifact
-      #  uses: actions/upload-artifact@v3
-      #  with:
-      #    name: zen.installer.exe
-      #    path: ./dist/zen.installer.exe
-
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
@@ -383,6 +353,18 @@ jobs:
           name: windows.mar
           path: ./windows.mar
 
+      - name: Upload installer
+        uses: actions/upload-artifact@v3
+        with:
+          name: zen.installer.exe
+          path: ./dist/zen.installer.exe
+
+      - name: Upload installer stub
+        uses: actions/upload-artifact@v3
+        with:
+          name: zen.installer.pretty.exe
+          path: ./dist/zen.installer.pretty.exe
+
       - name: Upload update manifests
         uses: actions/upload-artifact@v3
         with:
@@ -445,8 +427,7 @@ jobs:
           path: ./zen.source.tar.gz
 
   mac:
-    if: false
+    runs-on: macos-14
-    runs-on: macos-13
     needs: [build-data, check-release]
 
     steps:
@@ -493,14 +474,6 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
-        name: Setup pnpm cache
-        with:
-          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-store-
-
       - name: Install dependencies
         run: pnpm install
       - name: Load surfer CI setup
@@ -519,7 +492,9 @@ jobs:
           cd ..
 
       - name: surfer build
-        run: pnpm build --verbose
+        run: |
+          export ZEN_RELEASE=1
+          pnpm build --verbose
 
       - name: Package
         run: pnpm package
@@ -551,7 +526,7 @@ jobs:
     if: ${{ github.event.inputs.create_release == 'true' }}
     permissions: write-all
     name: Release
-    needs: [build-data, linux, source, windows, check-release]
+    needs: [build-data, linux, source, windows, check-release, mac]
     runs-on: ubuntu-latest
 
     steps:
@@ -575,12 +550,20 @@ jobs:
             zen.source.tar.gz
             linux.mar
             windows.mar
+            macos.mar
+            zen.installer.exe
+            zen.installer.pretty.exe
+            zen.macos.dmg
 
       - name: List
         run: find .
 
       - name: Clone updates repo
-        run: git clone https://github.com/zen-browser/updates-server.git
+        uses: actions/checkout@v3
+        with:
+          repository: zen-browser/updates-server
+          path: updates-server
+          token: ${{ secrets.DEPLOY_KEY }}
 
       - name: Copy update manifests
         run: |
@@ -588,16 +571,45 @@ jobs:
           mkdir -p updates
           cp -a ../linux_update_manifest/. updates/
           cp -a ../windows_update_manifest/.  updates/
+          cp -a ../macos_update_manifest/.  updates/
 
-      - name: Setup git
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: 🚀 Update update manifests
+          commit_user_name: Zen Browser Robot
+          commit_user_email: zen-browser-bot@users.noreply.github.com
+          repository: ./updates-server
+
+  distro-flatpak:
+    name: Build flatpak repos
+    needs: [release]
+    runs-on: ubuntu-latest
+    container:
+      image: bilelmoussaoui/flatpak-github-actions:gnome-44
+      options: --privileged
+    if: ${{ github.event.inputs.create_release == 'true' && false }}
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          repository: zen-browser/flatpak
+          token: ${{ secrets.DEPLOY_KEY }}
+          submodules: recursive
+
+      - name: Ensure repo is on main branch
         run: |
-          git config --global user.email "mauro-balades@users.noreply.github.com"
+          cd flatpak
-          git config --global user.name "mauro-balades"
+          git checkout main
+          git pull
           
-      - name: Commit update manifests
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-        run: |
+        with:
-          cd updates-server
+          bundle: org.zen.browser.flatpak
-          git add .
+          manifest-path: flatpak/org.zen.browser.flatpak.json
-          git commit -m "Update manifests for ${{ needs.build-data.outputs.version }}"
+          cache-key: flatpak-builder-${{ github.sha }}
-          git push
 
+      - name: Upload flatpak repo
+        uses: actions/upload-artifact@v3
+        with:
+          name: flatpak-repo
+          path: flatpak/repo

.github/workflows/src/windows_mozconfig

@@ -7,13 +7,35 @@ export WINEDEBUG=-all
 
 #? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793
 #? https://phabricator.services.mozilla.com/D170170
-ac_add_options --target=x86_64-pc-windows-msvc
+ac_add_options --target=x86_64-pc-mingw32
 
 export MOZ_STUB_INSTALLER=1
 export MOZ_MAINTENANCE_SERVICE=
 
 export MOZ_PKG_FORMAT=TAR
-export MOZ_LTO=cross
+
+export CROSS_BUILD=1
+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"
+TOOLS=$(echo ~)/win-cross
+
+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"
+
+ac_add_options --enable-release
+ac_add_options --enable-rust-simd
+ac_add_options RUSTC_OPT_LEVEL=3
+export MOZILLA_OFFICIAL=1
+export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=x86-64"
+
+ac_add_options --enable-default-browser-agent
+ac_add_options --enable-install-strip
+ac_add_options --enable-jxl
+ac_add_options --disable-maintenance-service
+
+ac_add_options --disable-bits-download
 
 # ALWAYS MANTAIN ONE LINE BREAK AT THE END OF THIS FILE
 

README.md

@@ -5,7 +5,7 @@ Experience tranquillity while browsing the web without people tracking you!
 
 # Compatibility
 
-Zen is currently built using firefox version `127.0.2`!
+Zen is currently built using firefox version `128.0`!
 
 ## 🚀 Run Locally
 
@@ -25,7 +25,7 @@ npm i
 Download and bootstrap the browser
 
 ```
-npm run bootstrap
+npm run init
 ```
 
 Start building the browser

configs/common/mozconfig

@@ -1,3 +1,4 @@
+
 # Browser branding
 ac_add_options --enable-update-channel=release
 ac_add_options --without-wasm-sandboxed-libraries
@@ -28,13 +29,34 @@ export MOZ_SOURCE_CHANGESET=${changeset}
 ac_add_options --enable-bootstrap
 
 ac_add_options --enable-application=browser
-ac_add_options --enable-hardening
+
-ac_add_options --enable-rust-simd
+if test "$ZEN_RELEASE"; then
-ac_add_options --enable-release
+  ac_add_options --enable-hardening
-ac_add_options --enable-optimize
+  ac_add_options --enable-rust-simd
-ac_add_options --with-ccache=sccache
+  ac_add_options --enable-release
-ac_add_options --disable-debug
+  ac_add_options --enable-optimize
+  ac_add_options --with-ccache=sccache
+  ac_add_options --disable-debug
+
+  ac_add_options --disable-crashreporter
+  ac_add_options --disable-dmd
+  ac_add_options --disable-geckodriver
+  ac_add_options --disable-parental-controls
+  ac_add_options --disable-profiling
+  ac_add_options --disable-tests
+fi
+
+ac_add_options --enable-unverified-updates
 ac_add_options --enable-updater
 
+ac_add_options --without-wasm-sandboxed-libraries
+
+export MOZ_REQUIRE_SIGNING=
+export MOZ_TELEMETRY_REPORTING=
+
+if test "$ZEN_CROSS_COMPILING"; then
+  ac_add_options --target=x86_64-pc-linux-gnu
+fi
+
 # ALWAYS MANTAIN ONE LINE BREAK AT THE END OF THIS FILE
 

configs/linux/mozconfig

@@ -1,12 +1,27 @@
-# Optimise builds
+
-# ac_add_options --enable-application=browser
+# not when cross compiling
-# ac_add_options --enable-hardening
+if ! test "$ZEN_CROSS_COMPILING"; then
-# ac_add_options --enable-rust-simd
+    if test "$ZEN_RELEASE"; then
-# ac_add_options --enable-release
+        ac_add_options --enable-optimize="-march=x86-64 -msse3 -mtune=haswell -O3 -w"
-# ac_add_options --enable-optimize
+        ac_add_options --enable-release
-# ac_add_options --with-ccache=sccache
+        ac_add_options --enable-rust-simd
-# ac_add_options --disable-debug
+        ac_add_options RUSTC_OPT_LEVEL=3
-# ac_add_options --enable-updater
+        export MOZILLA_OFFICIAL=1
+        export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=x86-64"
+    fi
+
+    if test -d "$HOME/.mozbuild/clang/bin"; then
+        export CC="$HOME"/.mozbuild/clang/bin/clang
+        export CXX="$HOME"/.mozbuild/clang/bin/clang++
+    else
+        export CC=clang
+        export CXX=clang++
+    fi
+
+    ac_add_options --enable-linker=lld
+    ac_add_options --enable-strip
+
+fi
 
 # Disable telemetry and tracking
 mk_add_options MOZ_TELEMETRY_REPORTING=

configs/macos/mozconfig

@@ -1,14 +1,15 @@
-# Optimise builds
+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"
-ac_add_options --enable-application=browser
-ac_add_options --enable-hardening
-ac_add_options --enable-rust-simd
-ac_add_options --enable-release
-ac_add_options --enable-optimize
-ac_add_options --with-ccache=sccache
-ac_add_options --disable-debug
-ac_add_options --enable-updater
-mk_add_options MOZ_MAKE_FLAGS="-j4"
 
-# Disable telemetry and tracking
+if test "$ZEN_RELEASE"; then
-mk_add_options MOZ_TELEMETRY_REPORTING=
+  ac_add_options --enable-optimize="-mcpu=apple-m1 -O3 -w"
-mk_add_options MOZ_DATA_REPORTING=
+  ac_add_options --enable-release
+  ac_add_options --enable-rust-simd
+  ac_add_options RUSTC_OPT_LEVEL=3
+  export MOZILLA_OFFICIAL=1
+  export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=apple-m1"
+fi
+
+ac_add_options --enable-install-strip
+ac_add_options --target=aarch64-apple-darwin
+mk_add_options AUTOCLOBBER=1
+export MOZ_INCLUDE_SOURCE_INFO=1

configs/windows/mozconfig

@@ -1,7 +1,5 @@
-ac_add_options --target=x86_64-pc-mingw32 
+
 ac_add_options --enable-js-shell 
-ac_add_options --enable-rust-simd 
-ac_add_options --enable-crashreporter 
 
 # Disable telemetry and tracking
 mk_add_options MOZ_TELEMETRY_REPORTING=

docs/runners.md

@@ -0,0 +1,5 @@
+
+# Warp Build
+
+For linux, we are using [warpbuild](https://warpbuild.com/) because github workflows can't handle building firefox :(
+

docs/workspaces.md

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

package.json

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

pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@zen-browser/surfer':
-        specifier: ^1.0.4
+        specifier: ^1.0.14
-        version: 1.0.4
+        version: 1.0.14
 
 packages:
 
@@ -109,8 +109,8 @@ packages:
   '@types/node@17.0.45':
     resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
 
-  '@zen-browser/surfer@1.0.4':
+  '@zen-browser/surfer@1.0.14':
-    resolution: {integrity: sha512-uDYuVFX7QvY2zuCwkuMnqR8YkmPf77JS2JZXjuBB4g5WGS3xaEoOqPAkbbo+HahAsKSwaiDuMsJs82V8+Hfe1g==}
+    resolution: {integrity: sha512-m7RWU4LqGuC4UvEAkho5H41b8T2zMZhN/dBrm+xugZ+rGRAHcw0NMjE3YDsjDr0/r3ZcKw4INPZGhhgSwIs2TA==}
     hasBin: true
 
   ansi-regex@5.0.1:
@@ -546,7 +546,7 @@ snapshots:
 
   '@types/node@17.0.45': {}
 
-  '@zen-browser/surfer@1.0.4':
+  '@zen-browser/surfer@1.0.14':
     dependencies:
       '@resvg/resvg-js': 1.4.0
       async-icns: 1.0.2

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

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

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

@@ -3,6 +3,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 pref("browser.tabs.cardPreview.enabled", true);
+pref("browser.tabs.hoverPreview.enabled", true);
 pref("browser.tabs.cardPreview.delayMs", 100);
 
 pref("browser.urlbar.suggest.calculator", true);
@@ -37,6 +38,12 @@ pref('browser.display.focus_ring_style', 0);
 pref('browser.display.focus_ring_width', 0);
 pref('browser.privateWindowSeparation.enabled', false); // WINDOWS
 
+pref('browser.newtabpage.activity-stream.newtabWallpapers.enabled', true);
+pref('browser.translations.newSettingsUI.enable', true);
+
+pref("browser.urlbar.trimHttps", true);
+pref("browser.urlbar.untrimOnUserInteraction.featureGate", true);
+
 // Cookie banner handling (reject by default)
 
 pref('cookiebanners.service.mode', 1);
@@ -146,4 +153,4 @@ pref('zen.sidebar.floating', true);
 pref('zen.splitView.working', false);
 
 // Zen Workspaces
-pref('zen.workspaces.enabled', false);
+pref('zen.workspaces.enabled', true);

src/browser/base/content/ZenSidebarManager.mjs

@@ -438,8 +438,7 @@ var gZenBrowserManagerSidebar = {
     let data = this.sidebarData;
     let panel = data.data[this.contextTab];
     let url = (browser == null) ? panel.url : browser.currentURI.spec;
-    let tab = gBrowser.addTrustedTab(url);    
+    gZenUIManager.openAndChangeToTab(url);
-    gBrowser.selectedTab = tab;
     this.close();
   },
 

src/browser/base/content/ZenUIManager.mjs

@@ -0,0 +1,19 @@
+
+var gZenUIManager = {
+  openAndChangeToTab(url, options) {
+    if (window.ownerGlobal.parent) {
+      let tab = window.ownerGlobal.parent.gBrowser.addTrustedTab(url, options);
+      window.ownerGlobal.parent.gBrowser.selectedTab = tab;
+      return tab;
+    }
+    let tab = window.gBrowser.addTrustedTab(url, options);
+    window.gBrowser.selectedTab = tab;
+    return tab;
+  },
+
+  generateUuidv4() {
+    return "10000000-1000-4000-8000-100000000000".replace(/[018]/g, c =>
+      (+c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> +c / 4).toString(16)
+    );
+  },  
+};

src/browser/base/content/ZenWorkspaces.mjs

@@ -1,6 +1,13 @@
 
 var ZenWorkspaces = {
   async init() {
+    let docElement = document.documentElement;
+    if (docElement.getAttribute("chromehidden").includes("toolbar")
+      || docElement.getAttribute("chromehidden").includes("menubar")) {
+      console.log("!!! ZenWorkspaces is disabled in hidden windows !!!");
+      return; // We are in a hidden window, don't initialize ZenWorkspaces
+    }
+    console.log("Initializing ZenWorkspaces...");
     await this.initializeWorkspaces();
     console.log("ZenWorkspaces initialized");
   },
@@ -18,45 +25,291 @@ var ZenWorkspaces = {
     );
   },
 
+  async _workspaces() {
+    if (!this._workspaceCache) {
+      this._workspaceCache = await IOUtils.readJSON(this._storeFile);
+      if (!this._workspaceCache.workspaces) {
+        this._workspaceCache.workspaces = [];
+      }
+    }
+    return this._workspaceCache;
+  },
+
+  onWorkspacesEnabledChanged() {
+    if (this.workspaceEnabled) {
+      this.initializeWorkspaces();
+    } else {
+      this._workspaceCache = null;
+      document.getElementById("zen-workspaces-button")?.remove();
+      for (let tab of gBrowser.tabs) {
+        gBrowser.showTab(tab);
+      }
+    }
+  },
+
   async initializeWorkspaces() {
+    Services.prefs.addObserver("zen.workspaces.enabled", this.onWorkspacesEnabledChanged.bind(this));
+    this.initializeWorkspacesButton();
     let file = new FileUtils.File(this._storeFile);
     if (!file.exists()) {
       await IOUtils.writeJSON(this._storeFile, {});
     }
+    if (this.workspaceEnabled) {
+      let workspaces = await this._workspaces();
+      console.log("Workspaces loaded", workspaces);
+      if (workspaces.workspaces.length === 0) {
+        await this.createAndSaveWorkspace("Default Workspace", true);
+      } else {
+        let activeWorkspace = workspaces.workspaces.find(workspace => workspace.default);
+        if (!activeWorkspace) {
+          activeWorkspace = workspaces.workspaces.find(workspace => workspace.used);
+          activeWorkspace.used = true;
+          await this.saveWorkspaces();
+        }
+        if (!activeWorkspace) {
+          activeWorkspace = workspaces.workspaces[0];
+          activeWorkspace.used = true;
+          await this.saveWorkspaces();
+        }
+        await this.changeWorkspace(activeWorkspace);
+      }
+    }
   },
 
-  async saveWorkspace(workspaceData, windowID) {
+  async saveWorkspace(workspaceData) {
     let json = await IOUtils.readJSON(this._storeFile);
-    json[windowID] = workspaceData;
+    if (typeof json.workspaces === "undefined") {
+      json.workspaces = [];
+    }
+    json.workspaces.push(workspaceData);
+    console.log("Saving workspace", workspaceData);
     await IOUtils.writeJSON(this._storeFile, json);
-  },
+    this._workspaceCache = null;
-
-  async loadWorkspace(windowID) {
-    let json = await IOUtils.readJSON(this._storeFile);
-    return json[windowID];
   },
 
   async removeWorkspace(windowID) {
     let json = await IOUtils.readJSON(this._storeFile);
-    delete json[windowID];
+    if (!json.workspaces) {
+      return;
+    }
+    json.workspaces = json.workspaces.filter(workspace => workspace.uuid !== windowID);
     await IOUtils.writeJSON(this._storeFile, json);
   },
 
-  async getWorkspaces() {
+  async saveWorkspaces() {
-    let json = await IOUtils.readJSON(this._storeFile);
+    await IOUtils.writeJSON(this._storeFile, await this._workspaces());
-    return json;
+    this._workspaceCache = null;
   },
 
-  async getWorkspace(windowID) {
+  async unsafeSaveWorkspaces(workspaces) {
-    let json = await IOUtils.readJSON(this._storeFile);
+    await IOUtils.writeJSON(this._storeFile, workspaces);
-    return json[windowID];
+    this._workspaceCache = null;
+  },
+
+  // Workspaces dialog UI management
+
+  openSaveDialog() {
+    let parentPanel = document.getElementById("PanelUI-zen-workspaces-multiview");
+    PanelUI.showSubView("PanelUI-zen-workspaces-create", parentPanel);
+  },
+
+  cancelWorkspaceCreation() {
+    let parentPanel = document.getElementById("PanelUI-zen-workspaces-multiview");
+    parentPanel.goBack();
+  },
+
+  async _propagateWorkspaceData() {
+    let currentContainer = document.getElementById("PanelUI-zen-workspaces-current-info");
+    let workspaceList = document.getElementById("PanelUI-zen-workspaces-list");
+    const createWorkspaceElement = (workspace) => {
+      let element = document.createElement("toolbarbutton");
+      element.className = "subviewbutton";
+      element.setAttribute("tooltiptext", workspace.name);
+      element.setAttribute("zen-workspace-id", workspace.uuid);
+      element.innerHTML = `
+        <div class="zen-workspace-icon">
+          ${workspace.name[0].toUpperCase()}
+        </div>
+        <div class="zen-workspace-name">
+          ${workspace.name}
+        </div>
+      `;
+      element.onclick = (async () => {
+        await this.changeWorkspace(workspace)
+        let panel = document.getElementById("PanelUI-zen-workspaces");
+        PanelMultiView.hidePopup(panel);
+      }).bind(this, workspace);
+      return element;
+    }
+    let workspaces = await this._workspaces();
+    let activeWorkspace = workspaces.workspaces.find(workspace => workspace.used);
+    currentContainer.innerHTML = "";
+    workspaceList.innerHTML = "";
+    workspaceList.parentNode.style.display = "flex";
+    if (workspaces.workspaces.length - 1 <= 0) {
+      workspaceList.parentNode.style.display = "none";
+    }      
+    if (activeWorkspace) {
+      let currentWorkspace = createWorkspaceElement(activeWorkspace);
+      currentContainer.appendChild(currentWorkspace);
+    }
+    for (let workspace of workspaces.workspaces) {
+      if (workspace.used) {
+        continue;
+      }
+      let workspaceElement = createWorkspaceElement(workspace);
+      workspaceList.appendChild(workspaceElement);
+    }
+  },
+
+  async openWorkspacesDialog(event) {
+    if (!this.workspaceEnabled) {
+      return;
+    }
+    let target = event.target;
+    let panel = document.getElementById("PanelUI-zen-workspaces");
+    await this._propagateWorkspaceData();
+    PanelMultiView.openPopup(panel, target, {
+      position: "bottomright topright",
+      triggerEvent: event,
+    }).catch(console.error);
+  },
+
+  initializeWorkspacesButton() {
+    if (!this.workspaceEnabled) {
+      return;
+    } else if (document.getElementById("zen-workspaces-button")) {
+      let button = document.getElementById("zen-workspaces-button");
+      button.removeAttribute("hidden");
+      return;
+    }
+    let browserTabs = document.getElementById("tabbrowser-tabs");
+    let button = document.createElement("toolbarbutton");
+    button.id = "zen-workspaces-button";
+    button.className = "toolbarbutton-1 chromeclass-toolbar-additional";
+    button.setAttribute("label", "Workspaces");
+    button.setAttribute("tooltiptext", "Workspaces");
+    button.onclick = this.openWorkspacesDialog.bind(this);
+    browserTabs.insertAdjacentElement("beforebegin", button);
+  },
+
+  async _updateWorkspacesButton() {
+    let button = document.getElementById("zen-workspaces-button");
+    if (!button) {
+      return;
+    }
+    let activeWorkspace = (await this._workspaces()).workspaces.find(workspace => workspace.used);
+    if (activeWorkspace) {
+      button.innerHTML = activeWorkspace.name[0].toUpperCase();
+    }
   },
 
   // Workspaces management
 
-  async saveCurrentWorkspace(windowID) {
+  get _workspaceInput() {
-    let workspaceData = this._createWorkspaceData(windowID);
+    return document.getElementById("PanelUI-zen-workspaces-create-input");
-    await this.saveWorkspace(workspaceData, windowID);
+  },
+
+  _prepareNewWorkspace(window) {
+    document.documentElement.setAttribute("zen-workspace-id", window.uuid);
+    this._createNewTabForWorkspace(window);
+  },
+
+  _createNewTabForWorkspace(window) {
+    let tab = gZenUIManager.openAndChangeToTab(Services.prefs.getStringPref("browser.startup.homepage"));
+    tab.setAttribute("zen-workspace-id", window.uuid);
+  },
+
+  async saveWorkspaceFromInput() {
+    let workspaceName = this._workspaceInput.value;
+    if (!workspaceName) {
+      return;
+    }
+    this._workspaceInput.value = "";
+    await this.createAndSaveWorkspace(workspaceName);
+    document.getElementById("PanelUI-zen-workspaces").hidePopup(true);
+  },
+
+  onWorkspaceNameChange(event) {
+    let button = document.getElementById("PanelUI-zen-workspaces-create-save");
+    if (this._workspaceInput.value === "") {
+      button.setAttribute("disabled", "true");
+      return;
+    }
+    button.removeAttribute("disabled");
+  },
+
+  async changeWorkspace(window) {
+    if (!this.workspaceEnabled) {
+      return;
+    }
+    let firstTab = undefined;
+    // Get the number of tabs that are hidden before we start hiding them
+    let numHiddenTabs = gBrowser.tabs.reduce((acc, tab) => {
+      return tab.getAttribute("zen-workspace-id") !== window.uuid ? acc + 1 : acc;
+    }, 0);
+    let workspaces = await this._workspaces();
+    for (let workspace of workspaces.workspaces) {
+      workspace.used = workspace.uuid === window.uuid;
+    }
+    this.unsafeSaveWorkspaces(workspaces);
+    if (numHiddenTabs === gBrowser.tabs.length) {
+      // If all tabs are hidden, we need to create a new tab
+      // to show the workspace
+      this._createNewTabForWorkspace(window);
+    }
+    for (let tab of gBrowser.tabs) {
+      if (tab.getAttribute("zen-workspace-id") === window.uuid) {
+        if (!firstTab) {
+          firstTab = tab;
+          gBrowser.selectedTab = firstTab;
+        }
+        gBrowser.showTab(tab);
+      }
+    }
+    for (let tab of gBrowser.tabs) {
+      if (tab.getAttribute("zen-workspace-id") !== window.uuid) {
+        gBrowser.hideTab(tab);
+      }
+    }
+    document.documentElement.setAttribute("zen-workspace-id", window.uuid);
+    await this.saveWorkspaces();
+    await this._updateWorkspacesButton();
+    await this._propagateWorkspaceData();
+  },
+
+  _createWorkspaceData(name, isDefault) {
+    let window = {
+      uuid: gZenUIManager.generateUuidv4(),
+      default: isDefault,
+      used: true,
+      icon: "",
+      name: name,
+    };
+    this._prepareNewWorkspace(window);
+    return window;
+  },
+
+  async createAndSaveWorkspace(name = "New Workspace", isDefault = false) {
+    if (!this.workspaceEnabled) {
+      return;
+    }
+    let workspaceData = this._createWorkspaceData(name, isDefault);
+    await this.saveWorkspace(workspaceData);
+    await this.changeWorkspace(workspaceData);
+  },
+
+  async onLocationChange(browser) {
+    let tab = gBrowser.getTabForBrowser(browser);
+    let workspaceID = tab.getAttribute("zen-workspace-id");
+    if (!workspaceID) {
+      let workspaces = await this._workspaces();
+      let activeWorkspace = workspaces.workspaces.find(workspace => workspace.used);
+      if (!activeWorkspace) {
+        return;
+      }
+      tab.setAttribute("zen-workspace-id", activeWorkspace.uuid);
+    }
   },
 };
 

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

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

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

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

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

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
-index 6e776a9ce7c525e510b6466065daf755b21567a4..8668b27ec2126ed772a11aa77809b6f22ceab7e2 100644
+index cdd08ec8f3d3cd652be9fcf6d4fb5b50dcf270ba..6cb35378aea2e7967dff0c91d09201b053645fbd 100644
 --- a/browser/base/content/browser.css
 +++ b/browser/base/content/browser.css
 @@ -2,6 +2,8 @@
@@ -10,32 +10,8 @@ index 6e776a9ce7c525e510b6466065daf755b21567a4..8668b27ec2126ed772a11aa77809b6f2
 +
  @namespace html url("http://www.w3.org/1999/xhtml");
  
- :root,
+ panelmultiview {
-@@ -157,8 +159,6 @@ panelview:not([visible]) {
+@@ -566,9 +568,9 @@ printpreview-pagination:focus-within,
-   flex: 100 100;
-   max-width: 225px;
-   min-width: var(--tab-min-width);
--  transition: min-width 100ms ease-out,
--              max-width 100ms ease-out;
- }
- 
- :root[uidensity=touch] .tabbrowser-tab:not([pinned]) {
-@@ -647,12 +647,12 @@ toolbar:not(#TabsToolbar) > #personal-bookmarks {
-   margin-inline-start: 0;
- }
- 
--#urlbar-input-container[pageproxystate=invalid] > #page-action-buttons > .urlbar-page-action,
-+#urlbar-input-container[pageproxystate=invalid] > #page-action-buttons > .urlbar-page-action:not(#zen-split-views-box),
- #identity-box.chromeUI ~ #page-action-buttons > .urlbar-page-action:not(#star-button-box),
- #urlbar[usertyping] > #urlbar-input-container > #page-action-buttons > #urlbar-zoom-button,
- #urlbar:not([usertyping]) > #urlbar-input-container > #urlbar-go-button,
- #urlbar:not([focused]) > #urlbar-input-container > #urlbar-go-button {
--  display: none;
-+  display: none !important;
- }
- 
- #nav-bar:not([keyNav=true]) #identity-box,
-@@ -1237,13 +1237,13 @@ printpreview-pagination:focus-within,
  
  
  #sidebar-box {
@@ -47,15 +23,11 @@ index 6e776a9ce7c525e510b6466065daf755b21567a4..8668b27ec2126ed772a11aa77809b6f2
  }
  
  /* WebExtension Sidebars */
--#sidebar-box[sidebarcommand$="-sidebar-action"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon {
+@@ -583,3 +585,43 @@ printpreview-pagination:focus-within,
-+#sidebar-box[sidebarcommand$="-sidebar-action"] #sidebar-header > #sidebar-switcher-target > #sidebar-icon {
+ toolbar[keyNav=true]:not([collapsed=true], [customizing=true]) toolbartabstop {
-   list-style-image: var(--webextension-menuitem-image, inherit);
+   -moz-user-focus: normal;
-   -moz-context-properties: fill;
+ }
-   fill: currentColor;
++
-@@ -1444,3 +1444,42 @@ toolbar[keyNav=true]:not([collapsed=true], [customizing=true]) toolbartabstop {
- /**
-  * End Dialogs
-  */
 +
 +/**
 + *

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

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

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

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

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

@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index aec0983a6704f09300da9a3a9ab76e627695b708..4228c96f59d6054c19c95686cafa979594e7da1f 100644
+index 3063370347db9e2812ad30205e585c849e44c91e..be74d9e624b8220cb9bd009bae31fb513c4ec73f 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
-@@ -140,6 +140,8 @@
+@@ -139,6 +139,8 @@
    window.addEventListener("DOMContentLoaded",
      gBrowserInit.onDOMContentLoaded.bind(gBrowserInit), { once: true });
  </script>
@@ -11,7 +11,7 @@ index aec0983a6704f09300da9a3a9ab76e627695b708..4228c96f59d6054c19c95686cafa9795
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -161,9 +163,12 @@
+@@ -160,9 +162,12 @@
      </vbox>
    </html:template>
  
@@ -27,3 +27,10 @@ index aec0983a6704f09300da9a3a9ab76e627695b708..4228c96f59d6054c19c95686cafa9795
  
    <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/navigator-toolbox-inc-xhtml.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index 0a67afa81ff5e10dcbfb53149f7ed9109de084ac..bdcce262b5fc18767efd1054fd724b97c42471e4 100644
+index 390a1300a1213af2b411ba09c67e3c25750ee6c3..7c80c54dd43b5414bf5ea9101d53431c0b4a140b 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -32,10 +32,11 @@

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

@@ -1,16 +0,0 @@
-diff --git a/browser/base/content/tabbrowser.js b/browser/base/content/tabbrowser.js
-index 3bca0b6d30468dc3a755219723f673ec80dfce6e..200a609ea31a8c904e2d3e39a3a06ff67fb313ed 100644
---- a/browser/base/content/tabbrowser.js
-+++ b/browser/base/content/tabbrowser.js
-@@ -7623,6 +7623,11 @@ var TabContextMenu = {
-       this.contextTab.linkedBrowser,
-       document.getElementById("context_sendTabToDevice")
-     );
-+
-+    document
-+      .getElementById("context_zenSplitTabs")
-+      .setAttribute("data-l10n-args", tabCountInfo);
-+    document.getElementById("context_zenSplitTabs").disabled = !gZenViewSplitter.contextCanSplitTabs();
-   },
- 
-   handleEvent(aEvent) {

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

@@ -1 +1,2 @@
 <link rel="localization" href="browser/zen-web-side-panels.ftl"/>
+<link rel="localization" href="browser/zen-workspaces.ftl"/>

src/browser/base/content/zen-panels-ui.inc.xhtml

@@ -1,18 +0,0 @@
-<panelview id="PanelUI-zen-profiles" position="bottomleft topleft" mainview="true" side="right">
-  <vbox>
-    <html:div id="PanelUI-zen-profiles-header">
-      <html:div id="PanelUI-zen-profiles-user-picture"></html:div>
-    </html:div>
-    <vbox id="PanelUI-zen-profiles-current-info">
-      <label id="PanelUI-zen-profiles-current-name"></label>
-      <p id="PanelUI-zen-profiles-current-profile-current" data-l10n-id="zen-panel-ui-current-profile-text"></p>
-    </vbox>
-    <toolbarbutton id="PanelUI-zen-profiles-managePrfs" oncommand="switchToTabHavingURI('about:profiles', true);" data-l10n-id="appmenu-manage-profiles" class="subviewbutton"></toolbarbutton>
-#if 0
-    <toolbarbutton id="PanelUI-zen-profiles-privateWin" command="Tools:PrivateBrowsing" data-l10n-id="appmenuitem-new-private-window" class="subviewbutton"></toolbarbutton>
-    <toolbarbutton id="PanelUI-zen-profiles-newProfile" oncommand="ZenProfileDialogUI.createProfileWizard();" data-l10n-id="appmenu-create-profile" class="subviewbutton"></toolbarbutton>
-#endif
-    <vbox id="PanelUI-zen-profiles-list">      
-    </vbox>
-  </vbox>
-</panelview>

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

@@ -56,3 +56,59 @@
   </panelmultiview>
 </panel>
 </html:template>
+
+<panelview id="PanelUI-zen-profiles" position="bottomleft topleft" mainview="true" side="right">
+  <vbox>
+    <html:div id="PanelUI-zen-profiles-header">
+      <html:div id="PanelUI-zen-profiles-user-picture"></html:div>
+    </html:div>
+    <vbox id="PanelUI-zen-profiles-current-info">
+      <label id="PanelUI-zen-profiles-current-name"></label>
+      <p id="PanelUI-zen-profiles-current-profile-current" data-l10n-id="zen-panel-ui-current-profile-text"></p>
+    </vbox>
+    <hbox id="PanelUI-zen-profiles-actions">
+      <toolbarbutton id="PanelUI-zen-profiles-managePrfs" oncommand="switchToTabHavingURI('about:profiles', true);" data-l10n-id="appmenu-manage-profiles" class="subviewbutton"></toolbarbutton>
+      <toolbarbutton id="PanelUI-zen-profiles-privateWin" command="Tools:PrivateBrowsing" data-l10n-id="appmenuitem-new-private-window" class="subviewbutton"></toolbarbutton>
+      <toolbarbutton id="PanelUI-zen-profiles-newProfile" oncommand="ZenProfileDialogUI.createProfileWizard();" data-l10n-id="appmenu-create-profile" class="subviewbutton"></toolbarbutton>
+    </hbox>
+    <vbox id="PanelUI-zen-profiles-list">      
+    </vbox>
+  </vbox>
+</panelview>
+
+<panel type="arrow" role="alertdialog" 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 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>
+          <hbox class="translations-panel-beta" role="image" aria-label="Beta">
+            <image class="translations-panel-beta-icon"></image>
+          </hbox>
+          <toolbarbutton id="PanelUI-zen-workspaces-new" oncommand="ZenWorkspaces.openSaveDialog();" class="subviewbutton">
+            <image></image>
+          </toolbarbutton>
+        </hbox>
+        <html:div id="PanelUI-zen-workspaces-current-info">
+        </html:div>
+      </vbox>
+      <vbox>
+        <h3 data-l10n-id="zen-panel-ui-workspaces-text"></h3>
+        <html:div id="PanelUI-zen-workspaces-list">
+        </html:div>
+      </vbox>
+    </panelview>
+    <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.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>
+  </panelmultiview>
+</panel>

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

@@ -1,5 +1,6 @@
 <script type="text/javascript">
 window.addEventListener("DOMContentLoaded", () => {
+  Services.scriptloader.loadSubScript("chrome://browser/content/ZenUIManager.mjs");
   Services.scriptloader.loadSubScript("chrome://browser/content/ZenWorkspaces.mjs");
   Services.scriptloader.loadSubScript("chrome://browser/content/ZenSidebarManager.mjs");
   Services.scriptloader.loadSubScript("chrome://browser/content/ZenViewSplitter.mjs");

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

@@ -1,6 +1,7 @@
         content/browser/zen-browser-places.js            (content/zen-browser-places.js)
         content/browser/zenThemeModifier.js              (content/zenThemeModifier.js)
         content/browser/ZenSidebarManager.mjs            (content/ZenSidebarManager.mjs)
+        content/browser/ZenUIManager.mjs                 (content/ZenUIManager.mjs)
         content/browser/ZenViewSplitter.mjs              (content/ZenViewSplitter.mjs)
         content/browser/ZenWorkspaces.mjs                 (content/ZenWorkspaces.mjs)
         

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

@@ -0,0 +1,4 @@
+
+<html:div id="zen-watermark">
+  <image src="chrome://branding/content/about-logo.png" />
+</html:div>

src/browser/base/content/zenThemeModifier.js

@@ -95,6 +95,8 @@
 
     _zenInitBrowserLayout() {
       if (!this._inMainBrowserWindow) return;
+      this.openWatermark();
+      console.log("ZenThemeModifier: init browser layout");
       const kNavbarItems = [
         "nav-bar",
         "PersonalToolbar",
@@ -116,7 +118,34 @@
 
       // move the security button to the right
       const securityButton = document.getElementById("tracking-protection-icon-container");
-      document.getElementById("urlbar-input-container").insertBefore(securityButton, document.getElementById("page-action-buttons"));
+      document.getElementsByClassName("urlbar-input-container")[0].insertBefore(securityButton, document.getElementById("page-action-buttons"));
+    
+      const mainWindowEl = document.documentElement;
+      // Dont override the sync avatar if it's already set
+      if (mainWindowEl.style.hasOwnProperty("--avatar-image-url")) {
+        return;
+      }
+      let profile = ProfileService.currentProfile;
+      if (!profile || profile.zenAvatarPath == "") return;
+      // TODO: actually use profile data to generate the avatar, instead of just using the name
+      console.log("ZenThemeModifier: setting avatar image to", profile.zenAvatarPath);
+      mainWindowEl.style.setProperty("--zen-avatar-image-url", `url(${profile.zenAvatarPath})`);
+      mainWindowEl.style.setProperty("--avatar-image-url", `var(--zen-avatar-image-url)`, "important");
+      this.closeWatermark();
+    },
+
+    openWatermark() {
+      const watermark = document.getElementById("zen-watermark");
+      if (watermark) {
+        watermark.removeAttribute("hidden");
+      }
+    },
+
+    closeWatermark() {
+      const watermark = document.getElementById("zen-watermark");
+      if (watermark) {
+        watermark.setAttribute("hidden", "true");
+      }
     },
   };
 

src/browser/components/controlcenter/content/protectionsPanel-inc-xhtml.patch

@@ -1,22 +0,0 @@
-diff --git a/browser/components/controlcenter/content/protectionsPanel.inc.xhtml b/browser/components/controlcenter/content/protectionsPanel.inc.xhtml
-index 29927139181e40fa9779038f996a08a2afc6f76b..ddb95da98de6aba014d69f040aabe6b311fb6772 100644
---- a/browser/components/controlcenter/content/protectionsPanel.inc.xhtml
-+++ b/browser/components/controlcenter/content/protectionsPanel.inc.xhtml
-@@ -8,6 +8,7 @@
-        type="arrow"
-        role="alertdialog"
-        noautofocus="true"
-+       infoMessageShowing=""
-        aria-labelledby="protections-popup-main-header-label"
-        onpopupshown="gProtectionsHandler.onPopupShown(event);ReportBrokenSite.updateParentMenu(event)"
-        onpopuphidden="gProtectionsHandler.onPopupHidden(event);"
-@@ -28,7 +29,7 @@
-             <html:span id="protections-popup-mainView-panel-header-span"/>
-           </html:h1>
-           <toolbarbutton id="protections-popup-info-button" class="panel-info-button"
--                         data-l10n-id="protections-panel-etp-more-info">
-+                         data-l10n-id="protections-panel-etp-more-info" checked="">
-             <image/>
-           </toolbarbutton>
-           <description id="protections-popup-toast-panel-tp-on-desc" data-l10n-id="protections-panel-etp-on-header"></description>
-

src/browser/components/customizableui/CustomizableUI-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 5b09402dc1e19e89dcdfc8b5b45a2004c8cec0e6..0f8d774c728087b96242f35fe038e1fef55e58b3 100644
+index f466105b8290b13c672351bb68dd92644dd670fe..b195cd59d7ff07ff512e7388c9dc33f3c661d955 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -25,7 +25,7 @@ ChromeUtils.defineLazyGetter(lazy, "gWidgetsBundle", function () {
@@ -11,23 +11,19 @@ index 5b09402dc1e19e89dcdfc8b5b45a2004c8cec0e6..0f8d774c728087b96242f35fe038e1fe
  
  const kSpecialWidgetPfx = "customizableui-special-";
  
-@@ -249,14 +249,11 @@ var CustomizableUIInternal = {
+@@ -253,10 +253,9 @@ var CustomizableUIInternal = {
-       Services.policies.isAllowed("removeHomeButtonByDefault")
+       "spring",
-         ? null
-         : "home-button",
--      "spring",
        "urlbar-container",
--      "spring",
+       "spring",
 -      "save-to-pocket-button",
        "downloads-button",
        AppConstants.MOZ_DEV_EDITION ? "developer-button" : null,
 -      "fxa-toolbar-menu-button",
-       lazy.resetPBMToolbarButtonEnabled ? "reset-pbm-toolbar-button" : null,
 +      "wrapper-sidebar-button",
+       lazy.resetPBMToolbarButtonEnabled ? "reset-pbm-toolbar-button" : null,
      ].filter(name => name);
  
-     this.registerArea(
+@@ -288,7 +287,7 @@ var CustomizableUIInternal = {
-@@ -287,7 +284,7 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_TOOLBAR,
          defaultPlacements: [

src/browser/components/moz-build.patch

@@ -1,14 +1,12 @@
 diff --git a/browser/components/moz.build b/browser/components/moz.build
-index 0f91b90fb0ce4eac232d71ad4f9ff82ab7316635..82aa7bb8bd41b061ac861d3fbabbf9f9879a2091 100644
+index 6cbb7ce0037c1457eeae5c331a996719691ebd6b..611707852198740c9b4103f5e2a66e8ee4099a21 100644
 --- a/browser/components/moz.build
 +++ b/browser/components/moz.build
-@@ -72,6 +72,9 @@ DIRS += [
+@@ -27,6 +27,7 @@ with Files("controlcenter/**"):
-     "urlbar",
- ]
- 
-+# Zen Components:
-+DIRS += ["zen-welcome"]
-+
- DIRS += ["build"]
  
  
+ DIRS += [
++    "zen-welcome",
+     "about",
+     "aboutlogins",
+     "aboutwelcome",

src/browser/components/newtab/content-src/styles/_theme-scss.patch

@@ -1,13 +0,0 @@
-diff --git a/browser/components/newtab/content-src/styles/_theme.scss b/browser/components/newtab/content-src/styles/_theme.scss
-index 6b097ae93edc046fb82dc843357e4ce8f34aca60..a76a3d8082d611a5169b0e85053aaca05a59ede1 100644
---- a/browser/components/newtab/content-src/styles/_theme.scss
-+++ b/browser/components/newtab/content-src/styles/_theme.scss
-@@ -25,7 +25,7 @@ $shadow-image-inset: inset 0 0 0 0.5px $black-15;
- // Default theme
- :root {
-   // General styles
--  --newtab-background-color: #{$in-content-page-background};
-+  --newtab-background-color: var(--zen-colors-tertiary);
-   --newtab-background-color-secondary: #{$newtab-background-secondary};
-   --newtab-text-primary-color: #{$in-content-page-color};
-   --newtab-primary-action-background: #{$primary-blue};

src/browser/components/preferences/jar-mn.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/jar.mn b/browser/components/preferences/jar.mn
-index 3b60d18e483bc3c4e9b4309f0dc1e4231b7116b1..aa30bc3de15b68ac90c12142a8851af99e1209ae 100644
+index 3b60d18e483bc3c4e9b4309f0dc1e4231b7116b1..e5b679b25941a7f1ed52db9fa3f7740a7220b9e4 100644
 --- a/browser/components/preferences/jar.mn
 +++ b/browser/components/preferences/jar.mn
 @@ -23,3 +23,5 @@ browser.jar:
@@ -7,4 +7,4 @@ index 3b60d18e483bc3c4e9b4309f0dc1e4231b7116b1..aa30bc3de15b68ac90c12142a8851af9
     content/browser/preferences/web-appearance-dark.svg
     content/browser/preferences/web-appearance-light.svg
 +
-+   content/browser/preferences/zen-looks.js
++   content/browser/preferences/zen-settings.js

src/browser/components/preferences/preferences-js.patch

@@ -1,12 +1,13 @@
 diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index c30a51c67ce636fa889090419a5c2642d74b4f49..b48ab31c564db4a4911c9fca291b4f09ba1025af 100644
+index 7e21bab426b6eb52fe84876d817fddbdb1a35ffc..fe23eb36a28a2baa4facad80a776e739ee6e43b1 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
-@@ -198,6 +198,7 @@ function init_all() {
+@@ -196,6 +196,8 @@ function init_all() {
    // the entire document.
    Preferences.queueUpdateOfAllElements();
    Services.telemetry.setEventRecordingEnabled("aboutpreferences", true);
 +  register_module("paneZenLooks", gZenLooksAndFeel);
++  register_module("paneZenWorkspaces", gZenWorkspacesSettings);
  
    register_module("paneGeneral", gMainPane);
    register_module("paneHome", gHomePane);

src/browser/components/preferences/preferences-xhtml.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index eee227822a772bec128d6adbe4f6aca90ed810f6..b52ee22054e3b2c80d4b780bc01507478becc583 100644
+index 3affb19d1a243da4a5782c9a4a5588d165b4119f..ccb56cc323ff5c3e94013de782af54911fc0c360 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
 @@ -43,6 +43,8 @@
@@ -11,7 +11,7 @@ index eee227822a772bec128d6adbe4f6aca90ed810f6..b52ee22054e3b2c80d4b780bc0150747
    <link rel="localization" href="branding/brand.ftl"/>
    <link rel="localization" href="browser/browser.ftl"/>
      <!-- Used by fontbuilder.js -->
-@@ -99,6 +101,12 @@
+@@ -97,6 +99,12 @@
    <hbox flex="1">
  
      <vbox class="navigation">
@@ -24,7 +24,7 @@ index eee227822a772bec128d6adbe4f6aca90ed810f6..b52ee22054e3b2c80d4b780bc0150747
        <!-- category list -->
        <richlistbox id="categories" data-l10n-id="category-list" data-l10n-attrs="aria-label">
          <richlistitem id="category-general"
-@@ -112,6 +120,17 @@
+@@ -110,6 +118,28 @@
            <label class="category-name" flex="1" data-l10n-id="pane-general-title"></label>
          </richlistitem>
  
@@ -38,11 +38,22 @@ index eee227822a772bec128d6adbe4f6aca90ed810f6..b52ee22054e3b2c80d4b780bc0150747
 +          <image class="category-icon"/>
 +          <label class="category-name" flex="1" data-l10n-id="pane-zen-looks-title"></label>
 +        </richlistitem>
++
++        <richlistitem id="category-zen-workspaces"
++                      class="category"
++                      value="paneZenWorkspaces"
++                      helpTopic="prefs-main"
++                      data-l10n-id="category-zen-workspaces"
++                      data-l10n-attrs="tooltiptext"
++                      align="center">
++          <image class="category-icon"/>
++          <label class="category-name" flex="1" data-l10n-id="pane-zen-workspaces-title"></label>
++        </richlistitem>
 +
          <richlistitem id="category-home"
                        class="category"
                        value="paneHome"
-@@ -230,11 +249,13 @@
+@@ -228,11 +258,13 @@
                  <html:a href="about:policies" target="_blank" data-l10n-id="managed-notice"/>
                </hbox>
              </hbox>
@@ -56,11 +67,12 @@ index eee227822a772bec128d6adbe4f6aca90ed810f6..b52ee22054e3b2c80d4b780bc0150747
            </hbox>
          </hbox>
          <vbox id="mainPrefPane">
-@@ -248,6 +269,7 @@
+@@ -246,6 +278,8 @@
  #include sync.inc.xhtml
  #include experimental.inc.xhtml
  #include moreFromMozilla.inc.xhtml
 +#include zenLooksAndFeel.inc.xhtml
++#include zenWorkspaces.inc.xhtml
          </vbox>
        </vbox>
      </vbox>

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

@@ -48,6 +48,11 @@ var gZenLooksAndFeel = {
   },
 };
 
+var gZenWorkspacesSettings = {
+  init() {
+  },
+};
+
 Preferences.addAll([
   {
     id: "zen.theme.toolbar-themed",
@@ -64,4 +69,9 @@ Preferences.addAll([
     type: "bool",
     default: false,
   },
+  {
+    id: "zen.workspaces.enabled",
+    type: "bool",
+    default: true,
+  }
 ]);

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

@@ -1,4 +1,4 @@
-<script src="chrome://browser/content/preferences/zen-looks.js"/>
+<script src="chrome://browser/content/preferences/zen-settings.js"/>
 <html:template id="template-paneZenLooks">
 <hbox id="zenLooksCategory"
       class="subcategory"

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

@@ -0,0 +1,25 @@
+<html:template id="template-paneZenWorkspaces">
+<hbox id="ZenWorkspacesCategory"
+      class="subcategory"
+      hidden="true"
+      data-category="paneZenWorkspaces">
+<html:h1 data-l10n-id="pane-workspaces-title"/>
+</hbox>
+
+<hbox id="zenSidePanelsCategory"
+      class="subcategory"
+      hidden="true"
+      data-category="paneZenWorkspaces">
+<html:h1 data-l10n-id="pane-settings-workspaces-title"/>
+</hbox>
+
+<groupbox id="zenSidePanelsGroup" data-category="paneZenWorkspaces" hidden="true" class="highlighting-group">
+      <label><html:h2 data-l10n-id="zen-settings-workspaces-header"/></label>
+      <description class="description-deemphasized" data-l10n-id="zen-settings-workspaces-description" />
+
+      <checkbox id="zenWorkspacesActivate"
+            data-l10n-id="zen-settings-workspaces-enabled"
+            preference="zen.workspaces.enabled"/>
+</groupbox>
+
+</html:template>

src/browser/components/sessionstore/TabState-sys-mjs.patch

@@ -0,0 +1,13 @@
+diff --git a/browser/components/sessionstore/TabState.sys.mjs b/browser/components/sessionstore/TabState.sys.mjs
+index 26f5671c849d9b0a126d79b07bc7d3d7870826ec..decc4c975507c9111df78dbc43434fa46d5f5e82 100644
+--- a/browser/components/sessionstore/TabState.sys.mjs
++++ b/browser/components/sessionstore/TabState.sys.mjs
+@@ -98,6 +98,8 @@ var TabStateInternal = {
+       tabData.muteReason = tab.muteReason;
+     }
+ 
++    tabData.zenWorkspace = tab.getAttribute("zen-workspace-id");
++
+     tabData.searchMode = tab.ownerGlobal.gURLBar.getSearchMode(browser, true);
+ 
+     tabData.userContextId = tab.userContextId || 0;

src/browser/components/tabbrowser/content/tab-hover-preview-mjs.patch

@@ -0,0 +1,13 @@
+diff --git a/browser/components/tabbrowser/content/tab-hover-preview.mjs b/browser/components/tabbrowser/content/tab-hover-preview.mjs
+index b07dba3e060dd730e603997b2c374f218a1eb591..412d35a263d1e6a789927206a506c184a5ac0d46 100644
+--- a/browser/components/tabbrowser/content/tab-hover-preview.mjs
++++ b/browser/components/tabbrowser/content/tab-hover-preview.mjs
+@@ -7,7 +7,7 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
+ );
+ 
+ const POPUP_OPTIONS = {
+-  position: "bottomleft topleft",
++  position: "topright topleft",
+   x: 0,
+   y: -2,
+ };

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

@@ -0,0 +1,39 @@
+diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
+index 2674dc2bebf436529a46d45c52cb56e86b82c03f..960c0039cd511a9d2c78e2a0c8c78080464950ee 100644
+--- a/browser/components/tabbrowser/content/tabbrowser.js
++++ b/browser/components/tabbrowser/content/tabbrowser.js
+@@ -3208,6 +3208,11 @@
+         ) {
+           tabWasReused = true;
+           tab = this.selectedTab;
++
++          if (tabData.zenWorkspace) {
++            tab.setAttribute("zen-workspace-id", tabData.zenWorkspace);
++          }
++
+           if (!tabData.pinned) {
+             this.unpinTab(tab);
+           } else {
+@@ -3257,6 +3262,10 @@
+             preferredRemoteType,
+           });
+ 
++          if (tabData.zenWorkspace) {
++            tab.setAttribute("zen-workspace-id", tabData.zenWorkspace);
++          }
++
+           if (select) {
+             tabToSelect = tab;
+           }
+@@ -7878,6 +7887,11 @@ var TabContextMenu = {
+       this.contextTab.linkedBrowser,
+       document.getElementById("context_sendTabToDevice")
+     );
++
++    document
++      .getElementById("context_zenSplitTabs")
++      .setAttribute("data-l10n-args", tabCountInfo);
++    document.getElementById("context_zenSplitTabs").disabled = !gZenViewSplitter.contextCanSplitTabs();
+   },
+ 
+   handleEvent(aEvent) {

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

@@ -1,8 +1,8 @@
-diff --git a/browser/base/content/tabbrowser-tabs.js b/browser/base/content/tabbrowser-tabs.js
+diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c992624170bde0e63 100644
+index 3b97732d8035f07a2308f76f235702c70a5fa388..fea1a6424de65c15db895ce3cf95e699fbf3952c 100644
---- a/browser/base/content/tabbrowser-tabs.js
+--- a/browser/components/tabbrowser/content/tabs.js
-+++ b/browser/base/content/tabbrowser-tabs.js
++++ b/browser/components/tabbrowser/content/tabs.js
-@@ -538,19 +538,36 @@
+@@ -552,19 +552,36 @@
        }
        dt.setDragImage(toDrag, dragImageOffset, dragImageOffset);
  
@@ -40,7 +40,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
          movingTabs: (tab.multiselected ? gBrowser.selectedTabs : [tab]).filter(
            t => t.pinned == tab.pinned
          ),
-@@ -637,21 +654,30 @@
+@@ -651,21 +668,30 @@
          }
        }
  
@@ -76,7 +76,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
            ];
          }
          newMargin = pixelsToScroll > 0 ? maxMargin : minMargin;
-@@ -661,29 +687,38 @@
+@@ -675,29 +701,38 @@
          if (newIndex == children.length) {
            let tabRect = this._getVisibleTabs().at(-1).getBoundingClientRect();
            if (RTL_UI) {
@@ -121,7 +121,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
        var dt = event.dataTransfer;
        var dropEffect = dt.dropEffect;
        var draggedTab;
-@@ -740,7 +775,7 @@
+@@ -754,7 +789,7 @@
            incrementDropIndex = false;
          }
  
@@ -130,7 +130,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
            for (let tab of movingTabs) {
              tab.toggleAttribute("tabdrop-samewindow", true);
              tab.style.transform = "translateX(" + newTranslateX + "px)";
-@@ -1126,10 +1161,13 @@
+@@ -1144,10 +1179,13 @@
      }
  
      _initializeArrowScrollbox() {
@@ -144,7 +144,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
            // Ignore underflow events:
            // - from nested scrollable elements
            // - for vertical orientation
-@@ -1492,19 +1530,30 @@
+@@ -1510,19 +1548,30 @@
          }
        }
  
@@ -184,7 +184,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
  
        let pinned = draggedTab.pinned;
        let numPinned = gBrowser._numPinnedTabs;
-@@ -1513,36 +1562,39 @@
+@@ -1531,36 +1580,39 @@
          pinned ? numPinned : undefined
        );
  
@@ -235,7 +235,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
        }
  
        draggedTab._dragData.translateX = translateX;
-@@ -1575,11 +1627,11 @@
+@@ -1593,11 +1645,11 @@
          if (tabs[mid] == draggedTab && ++mid > high) {
            break;
          }
@@ -249,7 +249,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
            tabCenter
          ) {
            low = mid + 1;
-@@ -1602,16 +1654,16 @@
+@@ -1620,16 +1672,16 @@
        for (let tab of tabs) {
          if (tab != draggedTab) {
            let shift = getTabShift(tab, newIndex);
@@ -269,7 +269,7 @@ index 4733e6d0b66f254c72a592bf3eabeb1a939e76fa..ab16fe96e1e8036df7e8321c99262417
          }
          return 0;
        }
-@@ -1683,9 +1735,9 @@
+@@ -1701,9 +1753,9 @@
  
        // Slide the relevant tabs to their new position.
        for (let t of this._getVisibleTabs()) {

src/browser/components/tabpreview/tab-preview-panel-mjs.patch

@@ -1,13 +0,0 @@
-diff --git a/browser/components/tabpreview/tab-preview-panel.mjs b/browser/components/tabpreview/tab-preview-panel.mjs
-index 683b2c17ec893a97680d885c622029591dda7f29..605f8682368d691f7cc18dfb1775fa2622006ebd 100644
---- a/browser/components/tabpreview/tab-preview-panel.mjs
-+++ b/browser/components/tabpreview/tab-preview-panel.mjs
-@@ -7,7 +7,7 @@ var { XPCOMUtils } = ChromeUtils.importESModule(
- );
- 
- const POPUP_OPTIONS = {
--  position: "bottomleft topleft",
-+  position: "topright topleft",
-   x: 0,
-   y: -2,
- };

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

@@ -36,10 +36,9 @@ button {
 }
 
 .page-split:not([hidden="true"]) {
-  display: flex;
-  margin: 12%;
   flex-direction: row;
-  justify-content: space-between;
+  margin: auto;
+  justify-content: space-around;
 }
 
 #enableFeatures .card {
@@ -62,7 +61,6 @@ button {
   align-items: stretch;
   gap: 8px;
   margin-bottom: 8px;
-  justify-content: center;
 }
 
 .cardGroup .card {
@@ -89,6 +87,13 @@ h1 {
   font-size: 32px;
   font-weight: 700;
   margin: 16px 0 5px 0;
+  line-height: 1;
+}
+
+.page > div:nth-child(2) h1 {
+  margin-bottom: 15px;
+  margin-top: 10px;
+  font-size: 18px;
 }
 
 p {
@@ -139,14 +144,6 @@ input[type='checkbox'] {
   margin-top: 20px;
 }
 
-#search h1 {
-  margin-bottom: 25px;
-}
-
-#theme h1 {
-  margin: 25px 0;
-}
-
 .page[hidden="true"] {
   display: none;
 }

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

@@ -8,10 +8,6 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 <html lang="en">
   <head>
     <meta name="color-scheme" content="light dark">
-    <meta
-      http-equiv="Content-Security-Policy"
-      content="default-src chrome:; object-src 'none'"
-    />
     <meta name="referrer" content="no-referrer" />
 
     <link

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

@@ -14,9 +14,12 @@ ChromeUtils.defineModuleGetter(
   this,
   'ExtensionSettingsStore',
   'resource://gre/modules/ExtensionSettingsStore.jsm'
-)
+);
 
-const welcomeSeenPref = 'zen.welcomeScreen.seen'
+Services.scriptloader.loadSubScript("chrome://browser/content/ZenUIManager.mjs");
+
+const kWelcomeURL = 'https://get-zen.vercel.app/welcome';
+const kWelcomeSeenPref = 'zen.welcomeScreen.seen'
 
 // =============================================================================
 // Util stuff copied from browser/components/preferences/search.js
@@ -134,9 +137,9 @@ class Themes extends Page {
       container.classList.add('card');
       container.classList.add('card-no-hover');
 
-      if (theme.id == "firefox-compact-dream@mozilla.org" || theme.id == "firefox-compact-galaxy@mozilla.org") {
+      //if (theme.id == "firefox-compact-dream@mozilla.org" || theme.id == "firefox-compact-galaxy@mozilla.org") {
-        container.setAttribute('disabled', 'true')
+      //  container.setAttribute('disabled', 'true')
-      }
+      //}
 
       if (theme.isActive) {
         container.classList.add('selected')
@@ -246,8 +249,8 @@ class Search extends Page {
 
     const searchElements = document.getElementById('searchList')
 
-    this.store.getEngine().forEach((search) => {
+    this.store.getEngine().forEach(async (search) => {
-      const container = this.loadSpecificSearch(search, defaultEngine)
+      const container = await this.loadSpecificSearch(search, defaultEngine)
 
       searchElements.appendChild(container)
       this.searchList.push(container)
@@ -257,7 +260,7 @@ class Search extends Page {
   /**
    * @returns {HTMLDivElement}
    */
-  loadSpecificSearch(search, defaultSearch) {
+  async loadSpecificSearch(search, defaultSearch) {
     const container = document.createElement('div');
     container.classList.add('card')
     container.classList.add('card-no-hover')
@@ -273,7 +276,7 @@ class Search extends Page {
     })
 
     const img = document.createElement('img');
-    img.src = search.originalEngine._iconURI.spec;
+    img.src = await search.originalEngine.getIconURL();
 
     const name = document.createElement('h3')
     name.textContent = search.name
@@ -305,6 +308,7 @@ class Pages {
    * @param {Page[]} pages The pages
    */
   constructor(pages) {
+    console.log("Initializing welcome pages...");
     this.pages = pages
     this.currentPage = 0;
 
@@ -324,6 +328,7 @@ class Pages {
       dots.appendChild(dot);
     }
     this._displayCurrentPage();
+    console.log("Welcome pages initialized.")
   }
 
   next() {
@@ -333,15 +338,20 @@ class Pages {
       // We can use internal js apis to close the window. We also want to set
       // the settings api for welcome seen to false to stop it showing again
 
-      Services.prefs.setBoolPref(welcomeSeenPref, true)
+      Services.prefs.setBoolPref(kWelcomeSeenPref, true)
 
-      close()
+      close();
+      this._openWelcomePage();
       return
     }
 
     this._displayCurrentPage()
   }
 
+  _openWelcomePage() {
+    gZenUIManager.openAndChangeToTab(kWelcomeURL);
+  }
+
   _displayCurrentPage() {
     let dots = document.getElementsByClassName("dot");
     for (let i = 0; i < dots.length; i++) {

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

@@ -20,3 +20,16 @@ zen-look-and-feel-compact-view-header = Show in compact view
 zen-look-and-feel-compact-view-description = Only show the toolbars you use!
 zen-look-and-feel-compact-view-enabled = 
     .label = Enable { -brand-short-name }'s compact mode
+
+
+
+pane-zen-workspaces-title = Workspaces
+category-zen-workspaces =
+    .tooltiptext = { pane-workspaces-title }
+pane-settings-workspaces-title = Workspaces
+
+pane-zen-workspaces-header = Workspaces
+zen-settings-workspaces-header = General settings for workspaces
+zen-settings-workspaces-description = With workspaces, you can have multiple browsing sessions at once!
+zen-settings-workspaces-enabled = 
+    .label = Enable Workspaces (Experimental)

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

@@ -16,8 +16,8 @@ welcome-dialog-theme = 🎨 Choose a theme
 welcome-dialog-theme-subtext = Personalize your experience with your favorite look!
 welcome-dialog-theme-action = Continue
 
-welcome-dialog-theme-header-1 = 1. Choose A theme
+welcome-dialog-theme-header-1 = 1. Choose a theme
-welcome-dialog-theme-header-2 = 2. Find Your Perfect Color
+welcome-dialog-theme-header-2 = 2. Find your perfect color
 
 welcome-dialog-search = 🔍 Choose a search engine
 welcome-dialog-search-subtext = Select your preferred search engine to tailor your browsing experience!

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

@@ -0,0 +1,13 @@
+
+zen-panel-ui-current-window-text = Current Window
+
+zen-panel-ui-workspaces-text = Other Workspaces
+
+zen-panel-ui-workspaces-create-text = Create Workspace
+
+zen-panel-ui-workspaces-create-save =
+  .label = Create Workspace
+  .accesskey = S
+zen-panel-ui-workspaces-create-cancel =
+  .label = Cancel
+  .accesskey = C

src/browser/modules/AsyncTabSwitcher-sys-mjs.patch

@@ -1,7 +1,7 @@
-diff --git a/browser/modules/AsyncTabSwitcher.sys.mjs b/browser/modules/AsyncTabSwitcher.sys.mjs
+diff --git a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
 index 9f4aa535e07adab496788165f4089be6732b1444..7b7955c0d1f2f3277cb750652458649d181e90e5 100644
---- a/browser/modules/AsyncTabSwitcher.sys.mjs
+--- a/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
-+++ b/browser/modules/AsyncTabSwitcher.sys.mjs
++++ b/browser/components/tabbrowser/AsyncTabSwitcher.sys.mjs
 @@ -39,6 +39,10 @@ XPCOMUtils.defineLazyPreferenceGetter(
    300
  );

src/browser/themes/addons/dark/manifest-json.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/themes/addons/dark/manifest.json b/browser/themes/addons/dark/manifest.json
-index 544986d5e93c033f944cf301af79e0750864a32c..41b15b8d1e1bb146ef0cf8357ab08d443f88b235 100644
+index bfebde683d00b0acf26509139a0f662029d37c72..976b553f49e40b7ed02743d79ccc102fccffcf6f 100644
 --- a/browser/themes/addons/dark/manifest.json
 +++ b/browser/themes/addons/dark/manifest.json
 @@ -7,10 +7,10 @@
@@ -16,32 +16,7 @@ index 544986d5e93c033f944cf301af79e0750864a32c..41b15b8d1e1bb146ef0cf8357ab08d44
  
    "icons": { "32": "icon.svg" },
  
-@@ -38,19 +38,18 @@
+@@ -58,7 +58,8 @@
-       "ntp_background": "rgb(43, 42, 51)",
-       "ntp_card_background": "rgb(66,65,77)",
-       "ntp_text": "rgb(251, 251, 254)",
--      "sidebar": "#38383D",
-       "sidebar_text": "rgb(249, 249, 250)",
-       "sidebar_border": "rgba(255, 255, 255, 0.1)",
-       "button": "rgba(0, 0, 0, .33)",
-       "button_hover": "rgba(207, 207, 216, .20)",
-       "button_active": "rgba(207, 207, 216, .40)",
--      "button_primary": "rgb(0, 221, 255)",
--      "button_primary_hover": "rgb(128, 235, 255)",
--      "button_primary_active": "rgb(170, 242, 255)",
--      "button_primary_color": "rgb(43, 42, 51)",
-+      "button_primary": "#fff",
-+      "button_primary_hover": "rgb(207, 207, 216)",
-+      "button_primary_active": "rgb(207, 207, 216)",
-+      "button_primary_color": "#000",
-       "input_background": "#42414D",
-       "input_color": "rgb(251,251,254)",
--      "input_border": "#8f8f9d",
-+      "input_border": "#fff",
-       "urlbar_popup_separator": "rgb(82,82,94)",
-       "appmenu_update_icon_color": "#54FFBD",
-       "appmenu_info_icon_color": "#80EBFF",
-@@ -61,7 +60,8 @@
        "color_scheme": "dark",
        "panel_active": "color-mix(in srgb, currentColor 14%, transparent)",
        "toolbar_field_icon_opacity": "1",
@@ -51,7 +26,7 @@ index 544986d5e93c033f944cf301af79e0750864a32c..41b15b8d1e1bb146ef0cf8357ab08d44
      }
    },
  
-@@ -88,7 +88,8 @@
+@@ -82,7 +83,8 @@
      "properties": {
        "panel_active": "--arrowpanel-dimmed-further",
        "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity",

src/browser/themes/addons/dream/manifest.json

@@ -63,7 +63,7 @@
       "toolbar_field_icon_opacity": "0.72",
       "input_border_color": "rgba(0, 0, 0, .3)",
       "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)",
-      "zen_main_browser_background": "radial-gradient(346.69% 165.29% at 50% 50%, rgba(63, 94, 204, 0.50) 0%, rgba(249, 249, 249, 0.23) 100%), #CBD0DF"
+      "zen_main_browser_background": "radial-gradient(ellipse, var(--zen-browser-gradient-base, #1B1E27) 20%, rgb(255, 255, 255) 100%)"
     }
   },
 

src/browser/themes/addons/galaxy/manifest.json

@@ -61,7 +61,7 @@
       "panel_active": "color-mix(in srgb, currentColor 14%, transparent)",
       "toolbar_field_icon_opacity": "1",
       "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)",
-      "zen_main_browser_background": "radial-gradient(236.2% 84.03% at 50% 50%, rgba(68, 0, 255, 0.20) 0%, rgba(63, 0, 0, 0.20) 100%), var(--zen-colors-primary, #1B1E27)"
+      "zen_main_browser_background": "radial-gradient(ellipse, var(--zen-browser-gradient-base, #1B1E27) 20%, #1b1b1b 100%)"
     }
   },
 

src/browser/themes/addons/light/manifest-json.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/themes/addons/light/manifest.json b/browser/themes/addons/light/manifest.json
-index 7385970fa8e3ff9659b72cfb238003958220fb0d..be4d385cf4520a2cad437225e5fb31335bbc3091 100644
+index d490f8f08d203ded55b65fe1a19be105b61ee6c0..eb4349e939b979b3a4d7c525ee0c0f9a53079d4a 100644
 --- a/browser/themes/addons/light/manifest.json
 +++ b/browser/themes/addons/light/manifest.json
 @@ -7,10 +7,10 @@
@@ -16,45 +16,20 @@ index 7385970fa8e3ff9659b72cfb238003958220fb0d..be4d385cf4520a2cad437225e5fb3133
  
    "icons": { "32": "icon.svg" },
  
-@@ -42,12 +42,12 @@
+@@ -59,7 +59,8 @@
-       "button": "rgba(207,207,216,.33)",
-       "button_hover": "rgba(207,207,216,.66)",
-       "button_active": "rgb(207,207,216)",
--      "button_primary": "rgb(0, 97, 224)",
--      "button_primary_hover": "rgb(2, 80, 187)",
--      "button_primary_active": "rgb(5, 62, 148)",
--      "button_primary_color": "rgb(251, 251, 254)",
-+      "button_primary": "#000",
-+      "button_primary_hover": "rgb(31, 31, 31)",
-+      "button_primary_active": "rgb(207,207,216)",
-+      "button_primary_color": "#fff",
-       "input_color": "rgb(21,20,26)",
--      "input_background": "rgb(255,255,255)",
-+      "input_background": "#f0f0f4",
-       "urlbar_popup_hover": "rgb(240,240,244)",
-       "urlbar_popup_separator": "rgb(240,240,244)",
-       "appmenu_update_icon_color": "#2AC3A2",
-@@ -57,12 +57,13 @@
-     },
-     "properties": {
-       "color_scheme": "light",
--      "panel_hover": "color-mix(in srgb, currentColor 12%, transparent)",
-+      "panel_hover": "color-mix(in srgb, currentColor 10%, transparent)",
        "panel_active": "color-mix(in srgb, currentColor 20%, transparent)",
        "panel_active_darker": "color-mix(in srgb, currentColor 27%, transparent)",
        "toolbar_field_icon_opacity": "0.72",
--      "input_border_color": "color-mix(in srgb, currentColor 41%, transparent)",
 -      "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)"
-+      "input_border_color": "rgba(0, 0, 0, .3)",
 +      "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)",
 +      "zen_main_browser_background": "var(--zen-themed-toolbar-bg)"
      }
    },
  
-@@ -93,7 +94,8 @@
+@@ -86,7 +87,8 @@
+       "panel_active": "--arrowpanel-dimmed-further",
        "panel_active_darker": "--panel-item-active-bgcolor",
        "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity",
-       "input_border_color": "--input-border-color",
 -      "zap_gradient": "--panel-separator-zap-gradient"
 +      "zap_gradient": "--panel-separator-zap-gradient",
 +      "zen_main_browser_background": "--zen-main-browser-background"

src/browser/themes/shared/browser-shared-css.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/browser-shared.css
-index 9e513830a9d9eeebe55cf6ab565b0575a943b088..05c8b716c0642f0ecebc47fe2759bc43474b6391 100644
+index 61119b7564d37e55f49dab7e6e14faafb4baa298..bcaad1a231cc839579ed209307c8e95cfb4c37de 100644
 --- a/browser/themes/shared/browser-shared.css
 +++ b/browser/themes/shared/browser-shared.css
-@@ -25,6 +25,8 @@
+@@ -27,6 +27,8 @@
  @import url("chrome://browser/skin/UITour.css");
  @import url("chrome://browser/skin/formautofill-notification.css");
  
@@ -10,8 +10,8 @@ index 9e513830a9d9eeebe55cf6ab565b0575a943b088..05c8b716c0642f0ecebc47fe2759bc43
 +
  @namespace html url("http://www.w3.org/1999/xhtml");
  
- :root {
+ :root,
-@@ -49,7 +51,7 @@
+@@ -75,7 +77,7 @@ body {
    --short-notification-gradient: #9059FF;
  
    --button-bgcolor: color-mix(in srgb, currentColor 13%, transparent);
@@ -20,23 +20,25 @@ index 9e513830a9d9eeebe55cf6ab565b0575a943b088..05c8b716c0642f0ecebc47fe2759bc43
    --button-active-bgcolor: color-mix(in srgb, currentColor 30%, transparent);
    --button-color: currentColor;
    --button-primary-bgcolor: AccentColor;
-@@ -145,9 +147,6 @@
+@@ -181,7 +183,6 @@ body {
- #navigator-toolbox {
    appearance: none;
  
--  /* Toolbar / content area border */
+   /* Toolbar / content area border */
 -  border-bottom: 0.01px solid var(--chrome-content-separator-color);
--
+ 
    background-color: var(--toolbox-non-lwt-bgcolor);
    color: var(--toolbox-non-lwt-textcolor);
- 
+@@ -190,37 +191,13 @@ body {
-@@ -155,33 +154,8 @@
    transition: background-color var(--inactive-window-transition);
  
    &:-moz-window-inactive {
 -    background-color: var(--toolbox-non-lwt-bgcolor-inactive);
      color: var(--toolbox-non-lwt-textcolor-inactive);
    }
+ 
+   &[fullscreenShouldAnimate] {
+     transition: 0.8s margin-top ease-out;
+   }
 -
 -  :root[customizing] & {
 -    border-bottom-style: none;
@@ -61,6 +63,7 @@ index 9e513830a9d9eeebe55cf6ab565b0575a943b088..05c8b716c0642f0ecebc47fe2759bc43
 -    background-repeat: no-repeat, var(--lwt-background-tiling);
 -    background-position: right top, var(--lwt-background-alignment);
 -  }
++  
  }
  
  .browser-toolbar {

src/browser/themes/shared/customizableui/panelUI-shared-css.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/customizableui/panelUI-shared.css b/browser/themes/shared/customizableui/panelUI-shared.css
-index 4f282b9d5a5a3269268ae22f1702c7a6e8238375..d6e8e6cee7166f0eea99f260cca382eeece6684d 100644
+index e4409ac75f6ee794d400559b0b01ae30904d01bc..44d4e648aa5aac17b82e0e1f80c7a953c2923ebc 100644
 --- a/browser/themes/shared/customizableui/panelUI-shared.css
 +++ b/browser/themes/shared/customizableui/panelUI-shared.css
-@@ -717,8 +717,8 @@ toolbarbutton[constrain-size="true"][cui-areatype="panel"] > .toolbarbutton-badg
+@@ -720,15 +720,15 @@ toolbarbutton[constrain-size="true"][cui-areatype="panel"] > .toolbarbutton-badg
  /* Firefox Account Toolbar Panel */
  
  #fxa-avatar-image {
@@ -13,3 +13,11 @@ index 4f282b9d5a5a3269268ae22f1702c7a6e8238375..d6e8e6cee7166f0eea99f260cca382ee
  }
  
  :root {
+   --avatar-image-url: url(chrome://browser/skin/fxa/avatar.svg);
+ 
+   &[fxastatus="not_configured"] {
+-    --avatar-image-url: url(chrome://browser/skin/fxa/avatar-empty.svg);
++    --avatar-image-url: var(--zen-avatar-image-url);
+   }
+ 
+   &:not([fxatoolbarmenu]) #fxa-toolbar-menu-button {

src/browser/themes/shared/identity-block/identity-block-css.patch

@@ -1,17 +1,29 @@
 diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css
-index 39cf7c917aa8807d491cc6a3702e398569681022..6e6942d97596540b0823c7934062ad2d63fa415c 100644
+index 39ae2b00791a7bfd875961de60736612f08892ae..03fe5e42f34ad985f0e04ef46b834a9d223585ee 100644
 --- a/browser/themes/shared/identity-block/identity-block.css
 +++ b/browser/themes/shared/identity-block/identity-block.css
-@@ -65,10 +65,10 @@
+@@ -64,8 +64,9 @@
  }
  
- #identity-box[pageproxystate="valid"].notSecureText > .identity-box-button,
+ #identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button,
--#identity-box[pageproxystate="valid"].chromeUI > .identity-box-button,
 +#identity-box[pageproxystate="valid"] > .identity-box-button,
- #identity-box[pageproxystate="valid"].extensionPage > .identity-box-button,
  #urlbar-label-box {
 -  background-color: var(--urlbar-box-bgcolor);
 +  background-color: light-dark(white, rgb(66, 65, 77));
    color: var(--urlbar-box-text-color);
    padding-inline: 8px;
    border-radius: var(--urlbar-icon-border-radius);
+@@ -154,11 +155,11 @@
+ }
+ 
+ #urlbar:not(.searchButton) > .urlbar-input-container > #identity-box[pageproxystate="invalid"] #identity-icon {
+-  list-style-image: url(chrome://global/skin/icons/search-glass.svg);
++  list-style-image: url(chrome://global/skin/icons/search-glass.svg) !important;
+ }
+ 
+ #urlbar[actiontype="extension"] > .urlbar-input-container > #identity-box #identity-icon {
+-  list-style-image: url(chrome://mozapps/skin/extensions/extension.svg);
++  list-style-image: url(chrome://mozapps/skin/extensions/extension.svg) !important;
+ }
+ 
+ #identity-box[pageproxystate="valid"].extensionPage #identity-icon {

src/browser/themes/shared/preferences/zen-preferences.css

@@ -185,3 +185,9 @@ groupbox h2 {
   position: absolute;
   background: var(--zen-colors-tertiary);
 }
+
+/* Workspace */
+
+#category-zen-workspaces > .category-icon {
+  list-style-image: url("chrome://browser/skin/window.svg");
+}

src/browser/themes/shared/tabbrowser/tab-hover-preview-css.patch

@@ -1,9 +1,9 @@
-diff --git a/browser/components/tabpreview/tabpreview.css b/browser/components/tabpreview/tabpreview.css
+diff --git a/browser/themes/shared/tabbrowser/tab-hover-preview.css b/browser/themes/shared/tabbrowser/tab-hover-preview.css
-index e978266e5da72f3051d5455d7a3f2867a88648c5..c57e844107ea6e99b406422496e9b41511089594 100644
+index 5df2561b9f0e5497a596e4e261ceaac30778e754..cbea9912e7ae15f7a277ecbdcd681cc4e7a4da72 100644
---- a/browser/components/tabpreview/tabpreview.css
+--- a/browser/themes/shared/tabbrowser/tab-hover-preview.css
-+++ b/browser/components/tabpreview/tabpreview.css
++++ b/browser/themes/shared/tabbrowser/tab-hover-preview.css
-@@ -42,3 +42,24 @@
+@@ -44,3 +44,24 @@
-     width: 100%;
+     display: block;
    }
  }
 +
@@ -27,4 +27,3 @@ index e978266e5da72f3051d5455d7a3f2867a88648c5..c57e844107ea6e99b406422496e9b415
 +.tab-preview-thumbnail-container canvas {
 +  border-top: 1px solid var(--zen-border-color);
 +}
-\ No newline at end of file

src/browser/themes/shared/tabbrowser/tabs-css.patch

@@ -1,7 +1,7 @@
-diff --git a/browser/themes/shared/tabs.css b/browser/themes/shared/tabs.css
+diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
 index eb92f71e5942a19618fd74492354de78ac03bacf..28d23667991c9feff7a379acaa5f7c7928fb14cf 100644
---- a/browser/themes/shared/tabs.css
+--- a/browser/themes/shared/tabbrowser/tabs.css
-+++ b/browser/themes/shared/tabs.css
++++ b/browser/themes/shared/tabbrowser/tabs.css
 @@ -67,7 +67,7 @@
  
  #tabbrowser-tabs {

src/browser/themes/shared/urlbar-searchbar-css.patch

@@ -1,22 +1,12 @@
 diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
-index b5684c5f6f4b932070ef2bc53750504791f7f3c3..c3ffdb99adbb4a331967b93181d536dad1a41488 100644
+index 41798f42cfb365116926af97a070dce3ebf6e443..75d1cda0c7938ba36f694e0f770db1820acd01ca 100644
 --- a/browser/themes/shared/urlbar-searchbar.css
 +++ b/browser/themes/shared/urlbar-searchbar.css
-@@ -59,7 +59,7 @@
+@@ -19,6 +19,7 @@
- 
+ #urlbar[breakout-extend] > .urlbar-input-container > #urlbar-label-box > #urlbar-label-search-mode,
- #urlbar-background,
+ .urlbar-input-container[pageproxystate=invalid] > #page-action-buttons > .urlbar-page-action,
- #searchbar {
+ #identity-box.chromeUI ~ #page-action-buttons > .urlbar-page-action:not(#star-button-box),
--  background-color: var(--toolbar-field-background-color);
++#urlbar-input-container[pageproxystate=invalid] > #page-action-buttons > .urlbar-page-action:not(#zen-split-views-box),
-+  background-color: var(--zen-urlbar-background);
+ #urlbar[usertyping] > .urlbar-input-container > #page-action-buttons > #urlbar-zoom-button,
-   background-clip: border-box;
+ #urlbar:not([usertyping]) > .urlbar-input-container > .urlbar-go-button,
-   border: 1px solid var(--toolbar-field-border-color);
+ #urlbar:not([focused]) > .urlbar-input-container > .urlbar-go-button {
-   border-radius: var(--toolbarbutton-border-radius);
-@@ -92,7 +92,7 @@
-      --toolbar-field-focus-border-color is set equal to --focus-outline-color
-      on :root, but LWT themes can override this value. */
-   outline-color: var(--toolbar-field-focus-border-color);
--  border-color: transparent;
-+  /*border-color: transparent;*/
- }
- 
- #urlbar[focused="true"] > #urlbar-background,

src/browser/themes/shared/zen-browser-shared.css

@@ -42,9 +42,11 @@
 /* URL and tool bars */
 
 #urlbar {
+  --toolbarbutton-border-radius: 999px;
   border: transparent;
   overflow: hidden;
   padding: 1px;
+  border-radius: var(--toolbarbutton-border-radius);
 }
 
 #zen-website-and-native-separator {
@@ -80,12 +82,16 @@
   outline-color: none !important;
 }
 
-#urlbar, #urlbar .urlbar-page-action, 
+#urlbar .urlbar-page-action, 
 #urlbar #tracking-protection-icon-container,
 #urlbar:not([extend="true"]) #identity-box:not(.chromeUI) #identity-icon-box {
   border-radius: 999px;
 }
 
+#urlbar[breakout-extend="true"] {
+  --toolbarbutton-border-radius: 6px;
+}
+
 #identity-icon-label {
   padding-inline-start: 8px  !important;
 }
@@ -94,7 +100,7 @@
   border-radius: 5px !important;
 }
 
-#urlbar:not([focused="true"]) #identity-box.chromeUI #identity-icon-box {
+#urlbar:not([breakout-extend="true"]) #identity-box.chromeUI #identity-icon-box {
   border-radius: 20px 10px 10px 20px !important;
 }
 
@@ -324,8 +330,11 @@ toolbarbutton#scrollbutton-up {
   display: none;
 }
 
-.tabbrowser-tab[pinned]:last-of-type {
+@media (-moz-bool-pref: "zen.tabs.vertical") { 
- /** Todo: add a separator */
+  .tabbrowser-tab[pinned] {
+    /* Add a gap between the last pinned tab and the first visible tab */
+    margin-inline-start: 12px !important;
+  }
 }
 
 .tabbrowser-tab:is([multiselected="true"], [selected]) {
@@ -372,6 +381,7 @@ toolbarbutton#scrollbutton-up {
 
 .tab-icon-overlay {
   margin-inline-end: 0 !important;
+  display: none !important; /* TODO: fix this */
 }
 
 /*#tabbrowser-arrowscrollbox {
@@ -397,10 +407,6 @@ toolbarbutton#scrollbutton-up {
   --focus-outline-color: var(--zen-primary-btn-color) !important;
 }
 
-menuseparator {
-  --panel-separator-color: var(--zen-colors-secondary) !important;
-}
-
 /** Specific dialogs override */
 
 #identity-popup-multiView toolbarseparator,
@@ -448,6 +454,7 @@ panelmultiview {
 
 #tabbrowser-tabbox #tabbrowser-tabpanels .browserStack > browser {
   border-radius: var(--zen-browser-border-radius);
+  clip-path: inset(0px 0px 0px round var(--zen-browser-border-radius) 0) !important;
 }
 
 #nav-bar {
@@ -465,7 +472,7 @@ panelmultiview {
 
 @media (-moz-bool-pref: "zen.view.compact") {
   #navigator-toolbox,
-  #zen-appcontent-navbar-container {
+  #zen-appcontent-navbar-container #PersonalToolbar {
     position: absolute;
     z-index: 1;
     overflow: hidden;
@@ -478,7 +485,7 @@ panelmultiview {
     height: 100%;
   }
 
-  #zen-appcontent-navbar-container {
+  #zen-appcontent-navbar-container #PersonalToolbar {
     min-height: 0;
     height: 1px;
     width: 100%;
@@ -491,8 +498,8 @@ panelmultiview {
     opacity: 1;
   }
 
-  #zen-appcontent-navbar-container:hover,
+  #zen-appcontent-navbar-container #PersonalToolbar:hover,
-  #zen-appcontent-navbar-container:has([open="true"]) {
+  #zen-appcontent-navbar-container #PersonalToolbar:has([open="true"]) {
     height: unset;
     background: var(--zen-themed-toolbar-bg) !important;
     overflow: visible;
@@ -501,7 +508,7 @@ panelmultiview {
   }
   
   #navigator-toolbox:hover #titlebar,
-  #navigator-toolbox:has([open="true"]) #titlebar {
+  #navigator-toolbox:has([open="true"]:not(tab)) #titlebar {
     background: var(--zen-themed-toolbar-bg) !important;
     border-right: var(--zen-appcontent-border) !important;
     padding: 0 5px;
@@ -514,6 +521,22 @@ panelmultiview {
   }
 }
 
+:root:is([chromehidden~="location"],[chromehidden~="toolbar"]) {
+  --zen-browser-border-radius: 0 !important;
+
+  & #navigator-toolbox {
+    display: none;
+  }
+
+  & #tabbrowser-tabpanels {
+    margin: 0 !important;
+
+    & .browserSidebarContainer {
+      margin: 0 !important;
+    }
+  }
+}
+
 /* Screenshots */
 
 #screenshotsPagePanel {
@@ -522,3 +545,31 @@ panelmultiview {
   right: 1.5%;
 }
 
+/* Watermark */
+
+#zen-watermark {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: var(--zen-main-browser-background);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+}
+
+#zen-watermark image {
+  opacity: .2;
+  filter: grayscale(100%);
+  width: 200px;
+  height: 200px;
+}
+
+#zen-watermark[hidden="true"] {
+  transition: 0.6s;
+  transition-delay: 1.5s;
+  opacity: 0;
+  pointer-events: none;
+}

src/browser/themes/shared/zen-icons/icons.css

@@ -153,7 +153,8 @@
 #TabsToolbar #new-tab-button,
 #appMenu-zoomEnlarge-button2,
 #PanelUI-zen-profiles-newProfile,
-#zen-sidebar-add-panel-button {
+#zen-sidebar-add-panel-button,
+#PanelUI-zen-workspaces-new image {
 	list-style-image: url("plus.svg") !important;
 }
 

src/browser/themes/shared/zen-panel-ui.css

@@ -122,21 +122,35 @@
 }
 
 
-#PanelUI-zen-profiles-managePrfs {
+#PanelUI-zen-profiles-actions {
   position: absolute;
   top: 10px;
   right: 10px;
-  border-radius: 5px !important;
+  border-radius: 10px !important;
-  padding: 5px !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-managePrfs label {
+#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;
 }
 
@@ -220,3 +234,115 @@
 #zenSplitViewModifierViewDefault .zen-split-view-modifier-preview.grid box:nth-child(3) {
   grid-area: c;
 }
+
+/* Workspaces */
+
+#zen-workspaces-button {
+  border: 1px solid var(--zen-colors-border);
+  border-radius: 50px;
+  height: calc(var(--zen-sidebar-action-button-width) - 10px) !important;
+  margin-bottom: 5px !important;
+  justify-content: center;
+  align-items: center;
+  display: flex;
+  font-weight: 600;
+}
+
+#PanelUI-zen-workspaces {
+  --panel-width: 320px;
+  width: var(--panel-width);
+  min-height: 200px;
+}
+
+#PanelUI-zen-workspaces > panelmultiview {
+  align-items: flex-start;
+}
+
+#PanelUI-zen-workspaces panelmultiview panelview {
+  position: relative;
+  width: 100%;
+  overflow: hidden !important;
+}
+
+#PanelUI-zen-workspaces-create-input {
+  margin-top: 10px;
+}
+
+#PanelUI-zen-workspaces-list {
+  display: flex;
+  flex-direction: column;
+}
+
+#PanelUI-zen-workspaces .panel-viewcontainer,
+#PanelUI-zen-workspaces .panel-viewstack {
+  width: 100%;
+}
+
+#PanelUI-zen-workspaces-current-info toolbarbutton:last-child {
+  margin-bottom: 0 !important;
+}
+
+#PanelUI-zen-workspaces-list toolbarbutton,
+#PanelUI-zen-workspaces-current-info toolbarbutton  {
+  padding: 5px;
+  border-radius: 7px;
+
+  margin-left: 0 !important;
+  margin-right: 0 !important;
+
+  display: flex;
+  align-items: center;
+
+  &:first-child {
+    margin-top: 10px;
+  }
+
+  & .zen-workspace-icon {
+    width: 30px;
+    height: 30px;
+    border-radius: 7px;
+    margin-right: 10px;
+    border: 1px solid var(--zen-colors-border);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-weight: 600;
+  }
+
+  & .zen-workspace-name {
+    font-weight: 600;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+
+#PanelUI-zen-workspaces-current-info toolbarbutton:first-child {
+  margin-bottom: 10px;
+  margin-top: 5px;
+}
+
+#PanelUI-zen-workspaces-view vbox:nth-child(2) {
+  margin-top: 10px;
+}
+
+#PanelUI-zen-workspaces-new {
+  margin-left: auto;
+  min-height: 1px !important;
+  padding: 3px;
+  border-radius: 4px;
+  width: 20px;
+  height: 20px;
+}
+
+#PanelUI-zen-workspaces-create-footer {
+  padding-bottom: 0 !important;
+  margin-top: 20px;
+  margin-left: 0;
+  margin-bottom: 0 !important;
+  width: 100%;
+}
+
+#PanelUI-zen-workspaces-create-footer button[default="true"] {
+  width: 100%;
+}

src/browser/themes/shared/zen-sidebar.css

@@ -163,7 +163,6 @@
   display: flex;
   flex-direction: column;
   padding: 0 3px;
-  height: 100%;
   position: relative;
   background: transparent !important;
   align-items: center;

src/build/application-ini-in.patch

@@ -0,0 +1,11 @@
+diff --git a/build/application.ini.in b/build/application.ini.in
+index 6df13230a45b2a86356f4e5a7b189c46f53e44cc..47fc729cba7d9cb612bfa0297a24644925ab53af 100644
+--- a/build/application.ini.in
++++ b/build/application.ini.in
+@@ -52,5 +52,5 @@ ServerURL=@MOZ_CRASHREPORTER_URL@/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSIO
+ 
+ #if MOZ_UPDATER
+ [AppUpdate]
+-URL=https://@MOZ_APPUPDATE_HOST@/update/6/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%SYSTEM_CAPABILITIES%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml
++URL=https://@MOZ_APPUPDATE_HOST@/updates/browser/%BUILD_TARGET%/%CHANNEL%/update.xml
+ #endif

src/build/moz-build.patch

@@ -0,0 +1,13 @@
+diff --git a/build/moz.build b/build/moz.build
+index 7bf9c501db06d38f924c26372d4243d448af8d81..6042ccfcbfb838ffefe078a72eee00a83fb252f6 100644
+--- a/build/moz.build
++++ b/build/moz.build
+@@ -91,7 +91,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
+         if CONFIG[var]:
+             appini_defines[var] = True
+ 
+-    appini_defines["MOZ_APPUPDATE_HOST"] = "aus5.mozilla.org"
++    appini_defines["MOZ_APPUPDATE_HOST"] = "zen-updates.vercel.app"
+     if CONFIG["MOZ_APPUPDATE_HOST"]:
+         appini_defines["MOZ_APPUPDATE_HOST"] = CONFIG["MOZ_APPUPDATE_HOST"]
+ 

src/toolkit/locales/en-US/toolkit/branding/brandings-ftl.patch

@@ -0,0 +1,34 @@
+diff --git a/toolkit/locales/en-US/toolkit/branding/brandings.ftl b/toolkit/locales/en-US/toolkit/branding/brandings.ftl
+index cc95fbc3b8e1123b6bf3d0fb4cd35a456e413da4..9a090c6a238bdeada9e22514b21bd2b9d39a2b88 100644
+--- a/toolkit/locales/en-US/toolkit/branding/brandings.ftl
++++ b/toolkit/locales/en-US/toolkit/branding/brandings.ftl
+@@ -20,10 +20,10 @@
+ -mozmonitor-brand-name = Mozilla Monitor
+ -pocket-brand-name = Pocket
+ -send-brand-name = Firefox Send
+--screenshots-brand-name = Firefox Screenshots
++-screenshots-brand-name = Zen Screenshots
+ -mozilla-vpn-brand-name = Mozilla VPN
+--profiler-brand-name = Firefox Profiler
+--translations-brand-name = Firefox Translations
++-profiler-brand-name = Zen Profiler
++-translations-brand-name = Zen Translations
+ -focus-brand-name = Firefox Focus
+ -relay-brand-name = Firefox Relay
+ -relay-brand-short-name = Relay
+@@ -37,12 +37,12 @@
+ 
+ # “Suggest” can be localized, “Firefox” must be treated as a brand
+ # and kept in English.
+--firefox-suggest-brand-name = Firefox Suggest
++-firefox-suggest-brand-name = Zen Suggest
+ 
+ # ”Home" can be localized, “Firefox” must be treated as a brand
+ # and kept in English.
+--firefox-home-brand-name = Firefox Home
++-firefox-home-brand-name = Zen Home
+ 
+ # View" can be localized, “Firefox” must be treated as a brand
+ # and kept in English.
+--firefoxview-brand-name = Firefox View
++-firefoxview-brand-name = Zen View

src/toolkit/themes/shared/in-content/common-shared-css.patch

@@ -1,5 +1,5 @@
 diff --git a/toolkit/themes/shared/in-content/common-shared.css b/toolkit/themes/shared/in-content/common-shared.css
-index c8f4f3efd231d007e024f039170efd58a8a9de86..f5e3296d20580afc0973cc87685d2ac35b6cfc10 100644
+index 542e38159dde876566f520f7d45d5387c1982d34..92705331fa12d88e9091310c1f527562931e7132 100644
 --- a/toolkit/themes/shared/in-content/common-shared.css
 +++ b/toolkit/themes/shared/in-content/common-shared.css
 @@ -5,6 +5,8 @@
@@ -20,3 +20,13 @@ index c8f4f3efd231d007e024f039170efd58a8a9de86..f5e3296d20580afc0973cc87685d2ac3
  
    --dialog-warning-text-color: var(--red-60);
  
+@@ -791,7 +793,8 @@ html|*#categories > html|*.category:dir(rtl) {
+ @media not (forced-colors) {
+   #categories > .category[selected],
+   #categories > .category.selected {
+-    color: var(--in-content-accent-color);
++    /*color: var(--in-content-accent-color);*/
++    opacity: .7;
+   }
+ 
+   #categories > .category[selected]:not(:hover) {

src/toolkit/themes/shared/in-content/zen-common-shared.css

@@ -81,6 +81,8 @@
   --urlbar-box-bgcolor: light-dark(white, rgb(66, 65, 77)) !important;
   --zen-input-border-color: light-dark(rgb(204, 204, 204), rgb(66, 65, 77)) !important;
 
+  --zen-browser-gradient-base: color-mix(in srgb, var(--zen-primary-color) 50%, white 50%);
+
   /* TODO: Support dark themes! */
 }
 
@@ -102,6 +104,7 @@
     --zen-dialog-background: color-mix(in srgb, var(--zen-primary-color) 10%, black 90%);
     --zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 8%, black 92%); 
 
+    --zen-browser-gradient-base: color-mix(in srgb, var(--zen-primary-color) 30%, black 70%);
   }
 }
 

src/toolkit/themes/shared/zen-popup.css

@@ -36,8 +36,8 @@
   --uc-contextmenu-separator-vertical: calc(4px - var(--uc-contextmenu-menuitem-border-width));
   --uc-contextmenu-separator-horizontal: 0;
 
-  --panel-separator-color: var(--zen-colors-secondary) !important;
+  --panel-separator-color: var(--zen-colors-border) !important;
-  --zen-panel-separator-width: 2px;
+  --zen-panel-separator-width: 1px;
 }
 
 /* app menu */

surfer.json

@@ -5,7 +5,7 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "127.0.2"
+    "version": "128.0"
   },
   "buildOptions": {
     "generateBranding": true
@@ -27,7 +27,7 @@
       "brandShortName": "Zen Browser",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "0.0.0-a.1",
+        "displayVersion": "1.0.0-a.2",
         "github": {
           "repo": "zen-browser/desktop"
         },