Update ZenStartup.mjs, zen-components, zen-theme.css, and zen-urlbar.css

Update zen-browser.js

.gitattributes

@@ -1,2 +1 @@
 *.patch linguist-language=C++
-.github/workflows/object/*.tar.gz filter=lfs diff=lfs merge=lfs -text

.github/workflows/alpha.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Bump version
         if: ${{ github.event.inputs.update_version == 'true' }}
         run: |
-          pnpm surfer ci --brand alpha --bump prepatch
+          pnpm surfer ci --brand alpha --bump prerelease
 
       - name: Bump version without new version
         if: ${{ github.event.inputs.update_version == 'false' }}
@@ -317,23 +317,16 @@ jobs:
         with:
           submodules: recursive
           token: ${{ secrets.DEPLOY_KEY }}
-          lfs: true
 
       - name: Git Pull
         run: |
           git pull
-          git lfs pull
 
       - uses: actions/download-artifact@v4
 
       - name: List
         run: find .
 
-      - name: Unpack windows build (.tar.gz)
-        run: |
-          tar -xvf .github/workflows/object/windows-x64-signed-generic.tar.gz -C .
-          tar -xvf .github/workflows/object/windows-x64-signed-specific.tar.gz -C .
-
       - name: Clone updates repo
         uses: actions/checkout@v4
         with:
@@ -348,8 +341,8 @@ jobs:
           cp -a ../linux_update_manifest_generic/.  updates/
           cp -a ../linux_update_manifest_specific/.  updates/
 
-          cp -a ../windows-x64-signed-generic/update_manifest/.  updates/
+          cp -a ../.github/workflows/object/windows-x64-signed-generic/update_manifest/.  updates/
-          cp -a ../windows-x64-signed-specific/update_manifest/.  updates/
+          cp -a ../.github/workflows/object/windows-x64-signed-specific/update_manifest/.  updates/
 
           cp -a ../macos_update_manifest_aarch64/.  updates/
           cp -a ../macos_update_manifest_x64/.  updates/
@@ -376,16 +369,16 @@ jobs:
             zen-generic.AppImage.zsync
             zen-specific.AppImage
             zen-specific.AppImage.zsync
-            windows-x64-signed-generic/zen.win-generic.zip
+            .github/workflows/object/windows-x64-signed-generic/zen.win-generic.zip
-            windows-x64-signed-specific/zen.win-specific.zip
+            .github/workflows/object/windows-x64-signed-specific/zen.win-specific.zip
             linux.mar
             linux-generic.mar
-            windows-x64-signed-generic/windows-generic.mar
+            .github/workflows/object/windows-x64-signed-generic/windows-generic.mar
-            windows-x64-signed-specific/windows.mar
+            .github/workflows/object/windows-x64-signed-specific/windows.mar
             macos-x64.mar
             macos-aarch64.mar
-            windows-x64-signed-specific/zen.installer.exe
+            .github/workflows/object/windows-x64-signed-specific/zen.installer.exe
-            windows-x64-signed-generic/zen.installer-generic.exe
+            .github/workflows/object/windows-x64-signed-generic/zen.installer-generic.exe
             zen.macos-x64.dmg
             zen.macos-aarch64.dmg
 

.github/workflows/object/windows-x64-signed-generic.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:805f5d9f727596007dc64057d456e87a2648dff596230ca12af6cf48860843fa
-size 237797081

.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha-generic/update.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<updates>
+  <update type="minor" displayVersion="1.0.1-a.1" appVersion="1.0.1-a.1" platformVersion="130.0" buildID="20240917001725">
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.1/windows-generic.mar" hashFunction="sha512" hashValue="972023778514d694851f4e1ed4dc25d6a76b99873fb5e2ccaee39cfd1e16831e860fe8d5b8a79609126e5f3a30af493ad91bebc33c5e6c9cff03933bb48d50bf" size="72275244"/>
+  </update>
+</updates>

.github/workflows/object/windows-x64-signed-generic/update_manifest/browser/WINNT_x86_64-msvc/alpha-generic/update.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<updates>
+  <update type="minor" displayVersion="1.0.1-a.1" appVersion="1.0.1-a.1" platformVersion="130.0" buildID="20240917001725">
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.1/windows-generic.mar" hashFunction="sha512" hashValue="972023778514d694851f4e1ed4dc25d6a76b99873fb5e2ccaee39cfd1e16831e860fe8d5b8a79609126e5f3a30af493ad91bebc33c5e6c9cff03933bb48d50bf" size="72275244"/>
+  </update>
+</updates>

.github/workflows/object/windows-x64-signed-specific.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51d3bb5508804e438755658157f0f18331675b418bdb11db485f938a4fc5fd8a
-size 237484305

.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc-x64/alpha/update.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<updates>
+  <update type="minor" displayVersion="1.0.1-a.1" appVersion="1.0.1-a.1" platformVersion="130.0" buildID="20240917001715">
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.1/windows.mar" hashFunction="sha512" hashValue="94a67207ea7c6cd9833397a339d647b4c8498d04976133f409aad06eb77e397fc5d3e6a325133d39dfa7d0a73a198f35954563dcbed1c2de089700ff1baf37b7" size="72228768"/>
+  </update>
+</updates>

.github/workflows/object/windows-x64-signed-specific/update_manifest/browser/WINNT_x86_64-msvc/alpha/update.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<updates>
+  <update type="minor" displayVersion="1.0.1-a.1" appVersion="1.0.1-a.1" platformVersion="130.0" buildID="20240917001715">
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.1/windows.mar" hashFunction="sha512" hashValue="94a67207ea7c6cd9833397a339d647b4c8498d04976133f409aad06eb77e397fc5d3e6a325133d39dfa7d0a73a198f35954563dcbed1c2de089700ff1baf37b7" size="72228768"/>
+  </update>
+</updates>

README.md

@@ -40,6 +40,24 @@ Zen is built with performance in mind, and we have optimized the browser to be a
 
 Zen is available for Linux, macOS, and Windows. You can download the latest version from the official website at [zen-browser.app](https://zen-browser.app/download), or from the [GitHub Releases](https://github.com/zen-browser/desktop/releases) page.
 
+### Windows
+
+#### Winget
+
+- Generic
+
+```
+winget install --id Zen-Team.Zen-Browser
+```
+
+- Optimized
+
+```
+winget install --id Zen-Team.Zen-Browser.Optimized
+```
+
+#### 
+
 ### macOS
 
 - Requires macOS 10.15 or later

build/winsign/sign.ps1

@@ -34,8 +34,11 @@ function SignAndPackage($name) {
     $env:MAR="$PWD\\build\\winsign\\mar.exe"
     if ($name -eq "generic") {
         $env:SURFER_COMPAT="true"
+    } else {
+        rm env:SURFER_COMPAT -ErrorAction SilentlyContinue
     }
 
+    echo "Compat Mode? $env:SURFER_COMPAT"
     pnpm surfer package --verbose
 
     # In the release script, we do the following:
@@ -67,13 +70,22 @@ function SignAndPackage($name) {
     # Move the zip
     mv (Get-Item .\dist\*.en-US.win64.zip) windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
 
+    # Extract the zip, sign everything inside, and repackage it
+    Expand-Archive -Path windsign-temp\windows-x64-signed-$name\zen.win-$name.zip -DestinationPath windsign-temp\windows-x64-signed-$name\zen.win-$name
+    rm windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
+    $files = Get-ChildItem windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -Include *.exe
+    $files += Get-ChildItem windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -Include *.dll
+    signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha1 /v $files
+    Compress-Archive -Path windsign-temp\windows-x64-signed-$name\zen.win-$name -DestinationPath windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
+    rmdir windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -ErrorAction SilentlyContinue
+
     # Move the manifest
-    foreach ($file in Get-ChildItem .\dist\update\) {
+    mv .\dist\update\. windsign-temp\windows-x64-signed-$name\update_manifest
-        mv ".\\dist\\update\\$file" windsign-temp\windows-x64-signed-$name\update_manifest
-    }
 
     echo "Invoking tar for $name"
-    tar -czvf .\.github\workflows\object\windows-x64-signed-$name.tar.gz -C .\windsign-temp\windows-x64-signed-$name .
+    # note: We need to sign it into a parent folder, called windows-x64-signed-$name
+    rmdir .\.github\workflows\object\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue
+    mv .\windsign-temp\windows-x64-signed-$name .\.github\workflows\object\windows-x64-signed-$name -Force
 
     echo "Finished $name"
 }

package.json

@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/zen-browser/core#readme",
   "dependencies": {
-    "@zen-browser/surfer": "^1.4.18"
+    "@zen-browser/surfer": "^1.4.20"
   },
   "devDependencies": {
     "husky": "^9.1.5",

pnpm-lock.yaml

@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@zen-browser/surfer':
-        specifier: ^1.4.18
+        specifier: ^1.4.20
-        version: 1.4.18
+        version: 1.4.20
     devDependencies:
       husky:
         specifier: ^9.1.5
@@ -119,8 +119,8 @@ packages:
   '@types/node@17.0.45':
     resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
 
-  '@zen-browser/surfer@1.4.18':
+  '@zen-browser/surfer@1.4.20':
-    resolution: {integrity: sha512-NFqF5amqa4TuGFk+uVQNY4FngIvyhXvtZdpHUbU8Oeq3nfKE+bsLUHbFz8j9I5sFLQkuHmCsfTtR5gKA5el4YA==}
+    resolution: {integrity: sha512-M9+Jax/B+UQsebJ0K3BaNEKUi/EelKufvG2frWQ4uVAQF9LzFwyyliS5wbcUTs3Ufit4b8xQK7ddt02DmK/Lng==}
     hasBin: true
 
   ansi-escapes@7.0.0:
@@ -1003,7 +1003,7 @@ snapshots:
 
   '@types/node@17.0.45': {}
 
-  '@zen-browser/surfer@1.4.18':
+  '@zen-browser/surfer@1.4.20':
     dependencies:
       '@resvg/resvg-js': 1.4.0
       async-icns: 1.0.2

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

@@ -52,7 +52,7 @@ pref('pdfjs.enableHighlightFloatingButton', true);
 
 pref("alerts.showFavicons", true);
 
-pref("browser.tabs.loadBookmarksInTabs", true);
+pref("browser.tabs.loadBookmarksInTabs", false);
 pref('browser.toolbars.bookmarks.visibility', 'never');
 
 // Enable Do Not Track and GPC by default.
@@ -73,7 +73,7 @@ pref('zen.welcomeScreen.seen', false);
 pref('zen.tabs.vertical', true);
 pref('zen.tabs.vertical.right-side', false);
 pref('zen.theme.accent-color', "#aac7ff");
-pref('zen.theme.border-radius', 10); // In pixels
+pref('zen.theme.border-radius', 5); // In pixels
 pref('zen.theme.content-element-separation', 4); // In pixels
 pref('zen.theme.toolbar-themed', true);
 pref('zen.theme.pill-button', false);
@@ -86,7 +86,7 @@ pref('zen.theme.color-prefs.colorful', false);
 pref('zen.view.compact.toolbar-flash-popup', true);
 pref('zen.view.compact.toolbar-flash-popup.duration', 800);
 
-pref('zen.view.sidebar-height-throttle', 500); // in ms
+pref('zen.view.sidebar-height-throttle', 200); // in ms
 pref('zen.view.sidebar-expanded', false);
 pref('zen.view.sidebar-expanded.on-hover', false);
 pref('zen.view.sidebar-expanded.show-button', true);
@@ -99,7 +99,12 @@ pref('zen.keyboard.shortcuts', ""); // Empty string means default shortcuts
 pref('zen.keyboard.shortcuts.disable-firefox', false);
 pref('zen.tabs.dim-pending', true);
 pref('zen.themes.updated-value-observer', false);
+
+#ifdef XP_MACOSX
+pref('zen.themes.tabs.legacy-location', true);
+#else
 pref('zen.themes.tabs.legacy-location', false);
+#endif
 
 // Pref to enable the new profiles (TODO: Check this out!)
 //pref("browser.profiles.enabled", true);
@@ -195,6 +200,9 @@ pref("widget.non-native-theme.use-theme-accent", true);
 pref("privacy.resistFingerprinting.letterboxing", false);
 pref("privacy.resistFingerprinting.letterboxing.dimensions", "");
 
+// Remove Inspect Accessibity Properties menu
+pref("devtools.accessibility.enabled", false);
+
 // Enable GPU by default
 pref('gfx.webrender.all', true);
 pref('layers.acceleration.force-enabled', true);

src/browser/base/content/ZenStartup.mjs

@@ -40,6 +40,7 @@
         // Disable smooth scroll
         gBrowser.tabContainer.arrowScrollbox.smoothScroll = false;
 
+        ZenWorkspaces.init();
         gZenVerticalTabsManager.init();
         gZenCompactModeManager.init();
         gZenKeyboardShortcuts.init();
@@ -66,7 +67,7 @@
       tabs.style.maxHeight = '0px'; // reset to 0
       const toolbarRect = toolbarItems.getBoundingClientRect();
       // -5 for the controls padding
-      let totalHeight = toolbarRect.height - 15;
+      let totalHeight = toolbarRect.height - 5;
       // remove the height from other elements that aren't hidden
       const otherElements = document.querySelectorAll('#tabbrowser-tabs > *:not([hidden="true"])');
       for (let tab of otherElements) {

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

@@ -35,7 +35,7 @@
 
 @keyframes zen-slide-in {
   from {
-    transform: translateX(-10px);
+    transform: translateX(-30px);
     opacity: 0;
   }
   to {
@@ -94,7 +94,7 @@
 @keyframes zen-vtabs-animation {
   0% {
     opacity: 0;
-    transform: translateX(-5px);
+    transform: translateX(-10px);
   }
 
   20% {
@@ -109,7 +109,7 @@
 @keyframes zen-sidebar-panel-animation-right {
   0% {
     opacity: 0;
-    transform: translateX(5px);
+    transform: translateX(10px);
   }
   
   20% {

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

@@ -8,6 +8,7 @@
     /* This fixes an issue with the left border */
     --zen-webview-correction-margin: 2px;
     margin-left: var(--zen-webview-correction-margin);
+    margin-top: var(--zen-webview-correction-margin);
     
     #browser:has(#navigator-toolbox[zen-right-side="true"]) & {
       margin-left: 0;
@@ -17,7 +18,7 @@
     --uc-tweak-rounded-corners-shadow-color: var(--zen-colors-border);
 
     --uc-tweak-rounded-corners-shadow:
-      0 0 1px 1px var(--uc-tweak-rounded-corners-shadow-color);
+      0 0 0 1px var(--uc-tweak-rounded-corners-shadow-color);
 
     box-shadow: var(--uc-tweak-rounded-corners-shadow) !important;
 
@@ -32,7 +33,7 @@
        * same shadow from the browser window on top. */
       box-shadow:
         var(--uc-tweak-rounded-corners-shadow, 0 0 transparent),
-        0 0 0 16px var(--zen-themed-toolbar-bg) !important;
+        0 0 0 16px var(--zen-main-browser-background) !important;
       clip-path: inset(0);
       pointer-events: none;
     }

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

@@ -12,14 +12,12 @@
     margin-top: 0 !important;
   }
 
-  #nav-bar {
-    padding-left: 5px !important;
-  }
-
   #navigator-toolbox {
     --zen-compact-toolbox-margin-single: calc(var(--zen-element-separation) * 2);
-    --zen-compact-toolbox-margin: var(--zen-compact-toolbox-margin-single);
+    --zen-compact-toolbox-margin: 
-    position: absolute;
+      calc(var(--zen-compact-toolbox-margin-single) / 2) var(--zen-compact-toolbox-margin-single) 
+      calc(var(--zen-compact-toolbox-margin-single) + var(--zen-element-separation)) var(--zen-compact-toolbox-margin-single);
+    position: absolute !important;
     display: block;
     transition: 200ms ease-in-out !important;
     transform: translateX(calc(-100% + (var(--zen-compact-toolbox-margin-single) / 2)));
@@ -28,8 +26,11 @@
     z-index: 2;
     height: 100%;
     margin: 0;
+    margin-top: var(--zen-element-separation) !important;
     padding: var(--zen-compact-toolbox-margin) !important;
 
+    min-width: 500px !important;
+
     & #titlebar {
       border: 1px solid var(--zen-colors-border);
       transition-delay: 200ms;
@@ -48,6 +49,11 @@
     }
   }
 
+  :root:not([inDOMFullscreen='true']) #tabbrowser-tabpanels {
+    padding: var(--zen-element-separation) !important;
+    padding-top: 0 !important;
+  }
+
   @media not (-moz-bool-pref: 'zen.view.sidebar-expanded') {
     #navigator-toolbox {
       width: fit-content !important;
@@ -86,13 +92,12 @@
        *  3. Add element separation variable, to avoid overlaping with the toolbar
        *  4. Calculate toolbar height, taken from zen-urlbar.css
        */
-      --zen-compact-toolbox-margin: calc(
+      --zen-compact-toolbox-margin: calc( 
-          var(--zen-compact-toolbox-margin-single) + 0.15rem + var(--zen-element-separation) +
+        var(--zen-element-separation) + 0.8rem + 
-            (18px + (var(--toolbarbutton-inner-padding) * 2))
+        (18px + (var(--toolbarbutton-inner-padding) * 2)) 
-        )
+      ) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single);
-        var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single)
-        var(--zen-compact-toolbox-margin-single);
 
+      margin-top: 0 !important;
       :root[zen-sidebar-legacy='true'] & {
         --zen-compact-toolbox-margin: calc(var(--zen-compact-toolbox-margin-single) / 2)
           var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single)
@@ -106,6 +111,11 @@
     }
   }
 
+  #navigator-toolbox[zen-right-side='true'] {
+    right: 0 !important;
+    transform: translateX(calc(100% - (var(--zen-compact-toolbox-margin-single) / 2))) !important;
+  }
+
   #navigator-toolbox:hover,
   #navigator-toolbox:focus-within,
   #navigator-toolbox[zen-user-show],
@@ -115,6 +125,7 @@
   #navigator-toolbox:has(.tabbrowser-tab:active),
   #navigator-toolbox:has(*[open='true']:not(tab):not(#zen-sidepanel-button)) {
     transform: none !important;
+    position: absolute !important;
     opacity: 1;
 
     & > * {
@@ -195,27 +206,4 @@
       margin-top: 10px !important;
     }
   }
-
-  #navigator-toolbox[zen-right-side='true'] {
-    & {
-      right: 0 !important;
-      transform: translateX(calc(100% - (var(--zen-compact-toolbox-margin-single) / 2))) !important;
-    }
-
-    &:hover,
-    &:focus-within,
-    &[zen-user-show],
-    &[flash-popup],
-    &[movingtab],
-    &:has(.tabbrowser-tab:active),
-    & #mainPopupSet:has(> #appMenu-popup:hover) ~ toolbox,
-    &:has(*[open='true']:not(tab):not(#zen-sidepanel-button)) {
-      transform: none !important;
-      opacity: 1;
-
-      & > * {
-        pointer-events: all;
-      }
-    }
-  }
 }

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

@@ -10,12 +10,33 @@ toolbar {
   align-items: center;
   list-style-image: var(--avatar-image-url);
   position: relative;
+  border-radius: var(--tab-border-radius);
+
+  width: calc(2 * var(--toolbarbutton-inner-padding) + 16px) !important;
+  height: calc(2 * var(--toolbarbutton-inner-padding) + 16px) !important;
 
   & image {
+    border-radius: 999px;
     display: flex;
     justify-content: center;
     align-items: center;
-    padding: 8px;
+    height: calc(var(--toolbarbutton-inner-padding) + 10px);
+    width: calc(var(--toolbarbutton-inner-padding) + 10px);
+    padding: 0;
+  }
+
+  &:hover {
+    background-color: var(--toolbarbutton-hover-background);
+
+    & image {
+      background: transparent !important;
+    }
+  }
+}
+
+@media not (-moz-bool-pref: 'zen.view.sidebar-expanded.show-button') {
+  #zen-expand-sidebar-button {
+    display: none !important;
   }
 }
 
@@ -54,3 +75,8 @@ toolbar {
     }
   }
 }
+
+/* Menubar */
+#toolbar-menubar {
+  display: none !important;
+}

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

@@ -8,9 +8,16 @@
     height: 100%;
   }
 
+  #private-browsing-indicator-with-label {
+    display: none !important;
+  }
+
   #browser {
     --zen-toolbox-padding: 5px;
-    --zen-toolbox-top-align: var(--zen-toolbox-padding);
+
+    :root:not([zen-sidebar-legacy='true']) & {
+      --zen-toolbox-top-align: var(--zen-toolbox-padding);
+    }
   }
 
   #navigator-toolbox {
@@ -18,30 +25,60 @@
     --tab-border-radius: var(--border-radius-medium);
     --zen-toolbox-min-width: 1px;
 
+    --tab-hover-background-color: var(--toolbarbutton-hover-background) !important;
+
     min-width: var(--zen-toolbox-min-width);
 
     padding: var(--zen-toolbox-padding);
     padding-top: var(--zen-toolbox-top-align);
+
+    margin-top: 0 !important;
+    display: flex;
   }
 
 
   #TabsToolbar-customization-target {
+    position: relative;
     gap: var(--zen-toolbox-padding);
+    &::after {
+      content: '';
+      display: block;
+      height: 1px;
+      background: color-mix(in srgb, var(--zen-colors-border) 70%, transparent 30%);
+      margin: 0 auto;
+      width: 80%;
+      left: 50%;
+      transform: translateX(-50%);
+      position: absolute;
+      bottom: calc(-1 * var(--zen-toolbox-padding));
+    }
   }
 
   #tabbrowser-tabs {
     margin-inline-start: 0 !important;
     padding-inline-start: 0 !important;
-    grid-gap: 2px !important;
 
-    border-bottom: 1px solid var(--zen-colors-border) !important;
+    position: relative;
+    border-bottom: 0px solid transparent !important;
 
     --tab-block-margin: 2px;
+    grid-gap: 0 !important;
 
     & .tabbrowser-tab {
+      animation: zen-slide-in 0.2s;
+
       max-width: unset !important;
       padding: 0 !important;
 
+      font-size: var(--urlbarView-small-font-size);
+
+      position: relative;
+
+      height: calc(var(--tab-min-height) + var(--tab-block-margin) * 2) !important;
+      min-height: calc(var(--tab-min-height) + var(--tab-block-margin) * 2) !important;
+
+      border-radius: var(--border-radius-medium);
+
       & .tab-background {
         overflow: hidden;
 
@@ -72,6 +109,7 @@
     margin-inline-end: 0 !important;
     padding-top: 0 !important;
     border-top: solid transparent 0px !important;
+    margin: 0 2px !important;
 
     &[showborder] {
       padding-top: 4px !important;
@@ -88,6 +126,12 @@
     }
   }
 
+  #tabbrowser-arrowscrollbox {
+    &::part(scrollbox) {
+      gap: 0px !important;
+    }
+  }
+
   #vertical-pinned-tabs-container {
     padding-inline-end: 0 !important;
     gap: 3px !important;
@@ -125,8 +169,12 @@
 
       padding-top: calc(var(--zen-toolbox-padding) * 2);
 
-      width: calc(100% - var(--zen-toolbox-padding));
+      width: 100%;
       position: relative;
+
+      --toolbarbutton-inner-padding: 9px !important;
+
+      justify-content: space-between;
     }
 
     /* Mark: Fix separator paddings */
@@ -138,6 +186,13 @@
       padding-right: 0 !important;
     }
 
+    & #TabsToolbar-customization-target {
+      &::after {
+        width: 98%;
+        bottom: calc(-0.5 * var(--zen-toolbox-padding));
+      }
+    }
+
     & #newtab-button-container {
       &::before {
         width: 100%;
@@ -162,9 +217,26 @@
 
     & #tabbrowser-tabs {
       & .tabbrowser-tab {
+        & .tab-background {
+          @media not (prefers-color-scheme: dark) {
+            box-shadow: none !important;
+          }
+        }
+
         &:not([pinned]):is(:hover, [visuallyselected]) .tab-close-button {
           display: block !important;
         }
+
+        .tab-throbber,
+        .tab-icon-pending,
+        .tab-icon-image,
+        .tab-sharing-icon-overlay,
+        .tab-icon-overlay {
+          &:not([pinned]) {
+            margin-inline-end: var(--toolbarbutton-inner-padding) !important;
+            margin-inline-start: calc(var(--toolbarbutton-inner-padding) / 4) !important;    
+          }
+        }
       }
     }
 
@@ -172,6 +244,15 @@
       :root:not([zen-sidebar-legacy='true']) #navigator-toolbox:is([zen-user-hover='true']:hover, :not([zen-user-hover='true'])) {
         padding-right: 47px !important;
       }
+      
+      & #zen-profile-button {
+        width: 100% !important;
+        padding: var(--toolbarbutton-inner-padding) !important;
+  
+        & label {
+          padding-left: calc(var(--toolbarbutton-inner-padding) * 1.5);
+        }
+      }
     }
   }
 
@@ -196,6 +277,7 @@
       display: flex;
       flex-direction: column;
       padding-top: calc(var(--zen-toolbox-padding) * 2);
+      align-items: center;
     }
 
     :root:has(&) #zen-sidebar-splitter {
@@ -225,6 +307,31 @@
           }
         }
       }
+
+      #vertical-pinned-tabs-container {
+        display: flex;
+        flex-direction: column;
+        gap: 0 !important;
+      }
+
+      @media (-moz-bool-pref: 'zen.view.sidebar-collapsed.hide-mute-button') {
+        & .tab-icon-overlay:is([soundplaying], [muted]):not([selected]) {
+          display: none !important;
+        
+          :is(
+            :root[uidensity=compact],
+            #tabbrowser-tabs[secondarytext-unsupported],
+            :root:not([uidensity=compact]) #tabbrowser-tabs:not([secondarytext-unsupported]) .tabbrowser-tab:hover
+          ) .tab-icon-stack[indicator-replaces-favicon] > :not(&),
+          :root:not([uidensity=compact]) #tabbrowser-tabs:not([secondarytext-unsupported]) .tabbrowser-tab:not(:hover) &[indicator-replaces-favicon] {
+            opacity: 1 !important;
+          }
+        }
+      }
+
+      & .tab-throbber, & .tab-icon-pending, & .tab-icon-image, & .tab-sharing-icon-overlay, & .tab-icon-overlay {
+        margin-inline-end: 0 !important;
+      }
     }
   }
 
@@ -268,7 +375,7 @@
     #mainPopupSet:has(> #appMenu-popup:hover) ~ toolbox,
     #navigator-toolbox:has(.tabbrowser-tab:active),
     #navigator-toolbox:has(*[open='true']:not(tab):not(#zen-sidepanel-button)) {
-      --zen-navigation-toolbar-min-width: 3.4rem !important;
+      --zen-navigation-toolbar-min-width: 50px !important;
 
       max-width: var(--zen-navigation-toolbar-min-width) !important;
       min-width: var(--zen-navigation-toolbar-min-width) !important;
@@ -330,12 +437,6 @@
           text-align: start;
         }
       }
-
-      #navigator-toolbox,
-      #titlebar,
-      #TabsToolbar {
-        transition: .1s !important;
-      }
     }
   }
 
@@ -349,4 +450,26 @@
       order: 2;
     }
   }
+
+  /* Mark: Override the default tab close button */
+  #tabbrowser-tabs {
+    & .tabbrowser-tab {
+      &[pinned] .tab-close-button {
+        display: none !important;
+      }
+
+      &[selected] .tab-background {
+        background: var(--zen-colors-secondary) !important;
+      }
+    }
+  }
+
+  /* Customization mode */
+  :root[customizing] #navigator-toolbox {
+    overflow: hidden;
+    max-width: 0 !important;
+    margin-right: var(--zen-element-separation);
+    padding: 0 !important;
+    opacity: 0;
+  }
 }

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

@@ -103,6 +103,8 @@
   --fp-contextmenu-bgcolor: light-dark(Menu, rgb(43 42 51 / 0.95));
   --toolbar-bgcolor: transparent;
 
+  --toolbarbutton-active-background: var(--zen-colors-border) !important;
+
   --input-bgcolor: var(--zen-colors-tertiary) !important;
   --input-border-color: var(--zen-input-border-color) !important;
   --zen-themed-toolbar-bg: var(--zen-colors-tertiary);

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

@@ -285,3 +285,18 @@ button.popup-notification-dropmarker {
     padding-inline-start: 0;
   }
 }
+
+@media (-moz-bool-pref: 'zen.view.compact') or (-moz-bool-pref: 'zen.themes.tabs.legacy-location') {
+  #nav-bar {
+    padding-left: var(--zen-element-separation) !important;
+  }
+
+  .titlebar-button:last-child {
+    padding-right: var(--zen-element-separation) !important;
+  }
+}
+
+
+#PersonalToolbar:not([collapsed="true"]) {
+  padding-bottom: 6px;
+}

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

@@ -16,6 +16,7 @@
   white-space: nowrap;
   text-overflow: ellipsis;
   font-size: 12px;
+  pointer-events: none;
 }
 
 @media (-moz-bool-pref: 'zen.view.sidebar-expanded') {

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

@@ -198,6 +198,19 @@ var gZenMarketplaceManager = {
     return this.__browser;
   },
 
+  __throttle(mainFunction, delay) {
+    let timerFlag = null;
+
+    return (...args) => {
+      if (timerFlag === null) {
+        mainFunction(...args);
+        timerFlag = setTimeout(() => {
+          timerFlag = null;
+        }, delay);
+      }
+    };
+  },
+
   async _buildThemesList() {
     if (!this.themesList) return;
     if (this._doNotRebuildThemesList) {
@@ -214,6 +227,8 @@ var gZenMarketplaceManager = {
     const themeList = document.createElement('div');
 
     for (let theme of Object.values(themes)) {
+      const sanitizedName = `theme-${theme.name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-z_-]+/g, '')}`;
+
       const fragment = window.MozXULElement.parseXULToFragment(`
         <vbox class="zenThemeMarketplaceItem">
           <vbox class="zenThemeMarketplaceItemContent">
@@ -223,14 +238,13 @@ var gZenMarketplaceManager = {
             <description class="description-deemphasized zenThemeMarketplaceItemDescription"></description>
           </vbox>
           <hbox class="zenThemeMarketplaceItemActions">
-            <button class="zenThemeMarketplaceItemConfigureButton" hidden="true"></button>
+            <button id="zenThemeMarketplaceItemConfigureButton-${sanitizedName}" class="zenThemeMarketplaceItemConfigureButton" hidden="true"></button>
             <button class="zenThemeMarketplaceItemUninstallButton" data-l10n-id="zen-theme-marketplace-remove-button" zen-theme-id="${theme.id}"></button>
           </hbox>
         </vbox>
       `);
 
       const themeName = `${theme.name} (v${theme.version || '1.0.0'})`;
-      const sanitizedName = `theme-${theme.name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-z_-]+/g, '')}`;
 
       const base = fragment.querySelector('.zenThemeMarketplaceItem');
       const baseHeader = fragment.querySelector('#zenThemeMarketplaceItemContentHeader');
@@ -279,8 +293,10 @@ var gZenMarketplaceManager = {
 
         if (!event.target.hasAttribute('pressed')) {
           await this.disableTheme(themeId);
+          document.getElementById(`zenThemeMarketplaceItemConfigureButton-${sanitizedName}`).setAttribute('hidden', true);
         } else {
           await this.enableTheme(themeId);
+          document.getElementById(`zenThemeMarketplaceItemConfigureButton-${sanitizedName}`).removeAttribute('hidden');
         }
       });
 
@@ -307,7 +323,7 @@ var gZenMarketplaceManager = {
       if (preferences.length > 0) {
         const preferencesWrapper = document.createXULElement('vbox');
 
-        preferencesWrapper.classList.add('zenThemeMarketplaceItemPreferences');
+        preferencesWrapper.setAttribute('flex', '1');
 
         for (let entry of preferences) {
           const { property, label, type } = entry;
@@ -395,7 +411,7 @@ var gZenMarketplaceManager = {
             }
 
             case 'checkbox': {
-              const fragment = window.MozXULElement.parseXULToFragment(`
+              const checkbox = window.MozXULElement.parseXULToFragment(`
                 <hbox class="zenThemeMarketplaceItemPreference">
                   <checkbox class="zenThemeMarketplaceItemPreferenceCheckbox" label="${label}" tooltiptext="${property}" zen-pref="${property}"></checkbox>
                 </hbox>
@@ -403,10 +419,10 @@ var gZenMarketplaceManager = {
 
               // Checkbox only works with "true" and "false" values, it's not like HTML checkboxes.
               if (Services.prefs.getBoolPref(property, false)) {
-                fragment.querySelector('.zenThemeMarketplaceItemPreferenceCheckbox').setAttribute('checked', 'true');
+                checkbox.querySelector('.zenThemeMarketplaceItemPreferenceCheckbox').setAttribute('checked', 'true');
               }
 
-              fragment.querySelector('.zenThemeMarketplaceItemPreferenceCheckbox').addEventListener('click', (event) => {
+              checkbox.querySelector('.zenThemeMarketplaceItemPreferenceCheckbox').addEventListener('click', (event) => {
                 let target = event.target.closest('.zenThemeMarketplaceItemPreferenceCheckbox');
                 let key = target.getAttribute('zen-pref');
                 let checked = target.hasAttribute('checked');
@@ -420,7 +436,51 @@ var gZenMarketplaceManager = {
                 Services.prefs.setBoolPref(key, !checked);
               });
 
-              preferencesWrapper.appendChild(fragment);
+              preferencesWrapper.appendChild(checkbox);
+              break;
+            }
+
+            case 'string': {
+              const container = document.createXULElement('hbox');
+              container.classList.add('zenThemeMarketplaceItemPreference');
+              container.setAttribute('align', 'center');
+              container.setAttribute('role', 'group');
+
+              const savedValue = Services.prefs.getStringPref(property, '');
+              const sanitizedProperty = property?.replaceAll(/\./g, '-');
+
+              const input = document.createElement('input');
+              input.setAttribute('flex', '1');
+              input.setAttribute('type', 'text');
+              input.id = `${sanitizedProperty}-input`;
+              input.value = savedValue;
+
+              input.addEventListener(
+                'input',
+                this.__throttle((event) => {
+                  const value = event.target.value;
+
+                  Services.prefs.setStringPref(property, value);
+
+                  if (value === '') {
+                    browser.document.querySelector(':root').style.removeProperty(`--${sanitizedProperty}`);
+                  } else {
+                    browser.document.querySelector(':root').style.setProperty(`--${sanitizedProperty}`, value);
+                  }
+                }, 500)
+              );
+
+              const nameLabel = document.createXULElement('label');
+              nameLabel.setAttribute('flex', '1');
+              nameLabel.setAttribute('class', 'zenThemeMarketplaceItemPreferenceLabel');
+              nameLabel.setAttribute('value', label);
+              nameLabel.setAttribute('tooltiptext', property);
+
+              container.appendChild(nameLabel);
+              container.appendChild(input);
+              container.setAttribute('aria-labelledby', label);
+
+              preferencesWrapper.appendChild(container);
               break;
             }
 

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

@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df236fcefae7 100644
+index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..c776348e776c1f9efc9b9f2ca479b1050f0a750b 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -453,10 +453,13 @@
+@@ -453,10 +453,12 @@
      },
  
      get _numPinnedTabs() {
@@ -13,12 +13,11 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
 +        if (!tab.pinned) {
            break;
          }
-+        if (tab.hidden) continue;
 +        i++;
        }
        return i;
      },
-@@ -2704,6 +2707,11 @@
+@@ -2704,6 +2706,11 @@
          );
        }
  
@@ -30,7 +29,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2771,6 +2779,9 @@
+@@ -2771,6 +2778,9 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -40,7 +39,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
          if (insertTab) {
            // insert the tab into the tab container in the correct position
            this._insertTabAtIndex(t, {
-@@ -3248,6 +3259,14 @@
+@@ -3248,6 +3258,14 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -55,7 +54,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3297,6 +3316,13 @@
+@@ -3297,6 +3315,13 @@
              preferredRemoteType,
            });
  
@@ -69,7 +68,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
            if (select) {
              tabToSelect = tab;
            }
-@@ -4184,6 +4210,7 @@
+@@ -4184,6 +4209,7 @@
          isLastTab ||
          aTab.pinned ||
          aTab.hidden ||
@@ -77,7 +76,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
          this._removingTabs.size >
            3 /* don't want lots of concurrent animations */ ||
          !aTab.hasAttribute(
-@@ -5117,10 +5144,10 @@
+@@ -5117,10 +5143,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      },
  

src/toolkit/modules/UpdateUtils-sys-mjs.patch

@@ -0,0 +1,13 @@
+diff --git a/toolkit/modules/UpdateUtils.sys.mjs b/toolkit/modules/UpdateUtils.sys.mjs
+index be9ce9d5402c30bf4a9712f1ce9026503c191a53..230882363b3e1bbe7f0977567db61f72494a19ea 100644
+--- a/toolkit/modules/UpdateUtils.sys.mjs
++++ b/toolkit/modules/UpdateUtils.sys.mjs
+@@ -81,7 +81,7 @@ export var UpdateUtils = {
+           replacement = Services.appinfo.name;
+           break;
+         case "VERSION":
+-          replacement = Services.appinfo.version;
++          replacement = AppConstants.ZEN_FIREFOX_VERSION;
+           break;
+         case "BUILD_ID":
+           replacement = Services.appinfo.appBuildID;

surfer.json

@@ -18,7 +18,7 @@
       "brandShortName": "Zen Browser",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.0.1-a",
+        "displayVersion": "1.0.1-a.2",
         "github": {
           "repo": "zen-browser/desktop"
         },