Update submodule commit in l10n

``

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

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <updates>
-  <update type="minor" displayVersion="1.0.1-a.4" appVersion="1.0.1-a.4" platformVersion="130.0.1" buildID="20240923205830">
+  <update type="minor" displayVersion="1.0.1-a.5" appVersion="1.0.1-a.5" platformVersion="130.0.1" buildID="20240924220503">
-    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.4/windows-generic.mar" hashFunction="sha512" hashValue="ca66dda03aa051564c52c0e324e4f3d0246a0274f50f40c351e074bd905f8d21f5fc4e21abcb7e58544c1589b1e0d85923324e4e04491aec0e56ac55e27b1cd8" size="72276852"/>
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.5/windows-generic.mar" hashFunction="sha512" hashValue="a3cb65d8286bbfe126091d426f80521869ac34b35ed2b3e408abb2beed2211caf66e14bcec4cc7608c24533691427c3bed272338cded84952a3f474945f1d422" size="72356444"/>
   </update>
 </updates>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <updates>
-  <update type="minor" displayVersion="1.0.1-a.4" appVersion="1.0.1-a.4" platformVersion="130.0.1" buildID="20240923205830">
+  <update type="minor" displayVersion="1.0.1-a.5" appVersion="1.0.1-a.5" platformVersion="130.0.1" buildID="20240924220503">
-    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.4/windows-generic.mar" hashFunction="sha512" hashValue="ca66dda03aa051564c52c0e324e4f3d0246a0274f50f40c351e074bd905f8d21f5fc4e21abcb7e58544c1589b1e0d85923324e4e04491aec0e56ac55e27b1cd8" size="72276852"/>
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.5/windows-generic.mar" hashFunction="sha512" hashValue="a3cb65d8286bbfe126091d426f80521869ac34b35ed2b3e408abb2beed2211caf66e14bcec4cc7608c24533691427c3bed272338cded84952a3f474945f1d422" size="72356444"/>
   </update>
 </updates>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <updates>
-  <update type="minor" displayVersion="1.0.1-a.4" appVersion="1.0.1-a.4" platformVersion="130.0.1" buildID="20240923205720">
+  <update type="minor" displayVersion="1.0.1-a.5" appVersion="1.0.1-a.5" platformVersion="130.0.1" buildID="20240924220342">
-    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.4/windows.mar" hashFunction="sha512" hashValue="f6db2c947f718e6bd91af7f7ba0b88117a1c08410819b4ae37a19f22cd3d7a0b3aec123271a41c8ac19bedebb2e5927286eb5a5d76e4bf5ba1e3b07db985c099" size="72375516"/>
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.5/windows.mar" hashFunction="sha512" hashValue="ca7f2506ea94095b0146820263e95f17888c06bf3eeda9728425e073c24a8f754143c3cd92b834a7583144eb2fb9a6a0618b1a961452e15a341cb5fd93d9af9d" size="72318312"/>
   </update>
 </updates>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <updates>
-  <update type="minor" displayVersion="1.0.1-a.4" appVersion="1.0.1-a.4" platformVersion="130.0.1" buildID="20240923205720">
+  <update type="minor" displayVersion="1.0.1-a.5" appVersion="1.0.1-a.5" platformVersion="130.0.1" buildID="20240924220342">
-    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.4/windows.mar" hashFunction="sha512" hashValue="f6db2c947f718e6bd91af7f7ba0b88117a1c08410819b4ae37a19f22cd3d7a0b3aec123271a41c8ac19bedebb2e5927286eb5a5d76e4bf5ba1e3b07db985c099" size="72375516"/>
+    <patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a.5/windows.mar" hashFunction="sha512" hashValue="ca7f2506ea94095b0146820263e95f17888c06bf3eeda9728425e073c24a8f754143c3cd92b834a7583144eb2fb9a6a0618b1a961452e15a341cb5fd93d9af9d" size="72318312"/>
   </update>
 </updates>

README.md

@@ -111,6 +111,11 @@ Download and bootstrap the browser
 npm run init
 ```
 
+Copy a language pack
+```
+sh scripts/update-en-US-packs.sh
+```
+
 Start building the browser
 
 ```

build/winsign/sign.ps1

@@ -5,6 +5,7 @@ param(
 $ErrorActionPreference = "Stop"
 
 echo "Preparing environment"
+git pull --recurse-submodules
 mkdir windsign-temp -ErrorAction SilentlyContinue
 
 echo "Please UNZIP the generic and specific artifacts into windsign-temp"
@@ -93,6 +94,12 @@ function SignAndPackage($name) {
 SignAndPackage specific
 SignAndPackage generic
 
+echo "All artifacts signed and packaged, ready for release!"
+echo "Commiting the changes to the repository"
+git add .\.github\workflows\object
+git commit -m "Sign and package windows artifacts"
+git push
+
 # Cleaning up
 
 echo "All done!"

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

@@ -30,6 +30,9 @@ pref('browser.newtabpage.activity-stream.newtabWallpapers.enabled', true);
 pref('browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled', true);
 pref('browser.translations.newSettingsUI.enable', true);
 
+pref('privacy.userContext.enabled', true);
+pref('privacy.userContext.ui.enabled', true);
+
 pref("browser.urlbar.trimHttps", true);
 pref("browser.urlbar.untrimOnUserInteraction.featureGate", true);
 
@@ -96,11 +99,15 @@ pref('zen.view.sidebar-expanded.max-width', 400);
 
 pref('zen.view.sidebar-collapsed.hide-mute-button', true);
 
-pref('zen.keyboard.shortcuts.enabled', true);
+pref('zen.keyboard.shortcuts.enabled', true, locked);
-pref('zen.keyboard.shortcuts', ""); // Empty string means default shortcuts
+pref('zen.keyboard.shortcuts.version', 0); // Empty string means default shortcuts
 pref('zen.tabs.dim-pending', true);
 pref('zen.themes.updated-value-observer', false);
 
+pref('zen.tab-unloader.enabled', true);
+pref('zen.tab-unloader.timeout-minutes', 20);
+pref('zen.tab-unloader.excluded-urls', "example.com,example.org");
+
 // Pref to enable the new profiles (TODO: Check this out!)
 //pref("browser.profiles.enabled", true);
 
@@ -112,13 +119,14 @@ pref('zen.sidebar.close-on-blur', true);
 // Zen Split View
 pref('zen.splitView.working', false);
 pref('zen.splitView.min-resize-width', 7);
+pref('zen.splitView.change-on-hover', false);
 
 // Zen Workspaces
 pref('zen.workspaces.enabled', true);
 pref('zen.workspaces.hide-default-container-indicator', true);
 pref('zen.workspaces.individual-pinned-tabs', true);
 pref('zen.workspaces.show-icon-strip', true);
-pref('zen.workspaces.icons', '["🌐", "📁", "📎", "📝", "📅", "📊"]');
+pref('zen.workspaces.icons', '["🌐", "📁", "💼", "📝", "📅", "📊","🧠"]');
 
 // Zen Watermark
 pref('zen.watermark.enabled', true, sticky);

src/browser/base/content/ZenCustomizableUI.sys.mjs

@@ -18,7 +18,8 @@ export var ZenCustomizableUI = new class {
           "preferences-button", "zen-expand-sidebar-button", "zen-profile-button"
         ],
         defaultCollapsed: null,
-      }
+      },
+      true
     );
     CustomizableUIInternal.registerArea(
       "zen-sidebar-icons-wrapper",
@@ -26,7 +27,8 @@ export var ZenCustomizableUI = new class {
         type: this.TYPE_TOOLBAR,
         defaultPlacements: this.defaultSidebarIcons,
         defaultCollapsed: null,
-      }
+      },
+      true
     );
   }
 
@@ -44,7 +46,6 @@ export var ZenCustomizableUI = new class {
         brighttext="true"
         data-l10n-id="tabs-toolbar"
         customizable="true"
-        toolbarname="Zen Sidebar Top Buttons"
         context="toolbar-context-menu"
         flex="1"
         skipintoolbarset="true"

src/browser/base/content/ZenStartup.mjs

@@ -8,7 +8,7 @@
       window.SessionStore.promiseInitialized.then(async () => {
         this._changeSidebarLocation();
         this._zenInitBrowserLayout();
-        this._focusSearchBar();
+        this._initSearchBar();
       });
     },
 
@@ -125,8 +125,13 @@
       toolbox.insertAdjacentElement('afterend', splitter);
     },
 
-    _focusSearchBar() {
+    _initSearchBar() {
+      // Only focus the url bar 
       gURLBar.focus();
+
+      gURLBar._initCopyCutController();
+      gURLBar._initPasteAndGo();
+      gURLBar._initStripOnShare();
     },
 
     logHeader() {

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 a29d7a84e84651ea0bdc9be8e4ac650bde2e048a..e1d1cf3bb925b8efb1411d1dc77a56f086858b5a 100644
+index a29d7a84e84651ea0bdc9be8e4ac650bde2e048a..bc22e55a66686fbae95047686f845f71a0c3aae9 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
 @@ -32,6 +32,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -26,17 +26,18 @@ index a29d7a84e84651ea0bdc9be8e4ac650bde2e048a..e1d1cf3bb925b8efb1411d1dc77a56f0
  customElements.setElementCreationCallback("screenshots-buttons", () => {
    Services.scriptloader.loadSubScript(
      "chrome://browser/content/screenshots/screenshots-buttons.js",
-@@ -3435,6 +3445,9 @@ var XULBrowserWindow = {
+@@ -3435,6 +3445,10 @@ var XULBrowserWindow = {
      AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
      TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
  
 +    gZenViewSplitter.onLocationChange(gBrowser.selectedBrowser);
 +    ZenWorkspaces.onLocationChange(gBrowser.selectedBrowser);
++    gZenTabUnloader.onLocationChange(gBrowser.selectedBrowser);
 +
      PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
  
      if (!gMultiProcessBrowser) {
-@@ -4769,7 +4782,7 @@ function setToolbarVisibility(
+@@ -4769,7 +4783,7 @@ function setToolbarVisibility(
        );
      }
  
@@ -45,7 +46,7 @@ index a29d7a84e84651ea0bdc9be8e4ac650bde2e048a..e1d1cf3bb925b8efb1411d1dc77a56f0
      switch (isVisible) {
        case true:
        case "always":
-@@ -7609,6 +7622,12 @@ var gDialogBox = {
+@@ -7609,6 +7623,12 @@ var gDialogBox = {
      parentElement.showModal();
      this._didOpenHTMLDialog = true;
  

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

@@ -31,6 +31,7 @@ window.addEventListener("DOMContentLoaded", async () => {
   Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenCompactMode.mjs");
   Services.scriptloader.loadSubScript("chrome://browser/content/ZenUIManager.mjs");
   Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenSidebarManager.mjs");
+  Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenTabUnloader.mjs");
   Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspaces.mjs");
   Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenViewSplitter.mjs");
   Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenProfileDialogUI.mjs");

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

@@ -13,6 +13,7 @@
         content/browser/zen-components/ZenKeyboardShortcuts.mjs (content/zen-components/src/ZenKeyboardShortcuts.mjs)
         content/browser/zen-components/ZenThemeBuilder.mjs      (content/zen-components/src/ZenThemeBuilder.mjs)
         content/browser/zen-components/ZenThemesImporter.mjs    (content/zen-components/src/ZenThemesImporter.mjs)
+        content/browser/zen-components/ZenTabUnloader.mjs       (content/zen-components/src/ZenTabUnloader.mjs)
 
         content/browser/zen-styles/zen-theme.css                (content/zen-styles/zen-theme.css)
         content/browser/zen-styles/zen-buttons.css              (content/zen-styles/zen-buttons.css)

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

@@ -4,7 +4,7 @@
   class="browser-toolbar customization-target zen-dont-hide-on-fullscreen"
   data-l10n-id="tabs-toolbar"
   customizable="true"
-  toolbarname="Zen Sidebar Icons"
+  skipintoolbarset="true"
   context="toolbar-context-menu"
   mode="icons">
   <toolbarbutton removeable="true" class="toolbarbutton-1 zen-sidebar-action-button" id="zen-sidepanel-button" data-l10n-id="sidebar-zen-sidepanel" onclick="gZenBrowserManagerSidebar.toggle();"></toolbarbutton>

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

@@ -1,6 +1,6 @@
 <hbox id="zen-sidebar-web-panel-wrapper">
   <box id="zen-sidebar-web-panel" class="chromeclass-extrachrome" hidden="true" persist="pinned style hidden">
-    <toolbar mode="icons" flex="1" id="zen-sidebar-web-header">
+    <toolbar mode="icons" flex="1" id="zen-sidebar-web-header" fullscreentoolbar="true">
       <hbox>
         <toolbarbutton id="zen-sidebar-web-panel-back" class="toolbarbutton-1 chromeclass-toolbar-additional" oncommand="gZenBrowserManagerSidebar.back();"/>
         <toolbarbutton id="zen-sidebar-web-panel-forward" class="toolbarbutton-1 chromeclass-toolbar-additional" oncommand="gZenBrowserManagerSidebar.forward();"/>
@@ -20,13 +20,15 @@
         <html:p data-l10n-id="zen-sidebar-introduction-description"/>
       </vbox>
     </vbox>
-    <toolbar mode="icons" flex="1" id="zen-sidebar-panels-wrapper" class="zen-dont-hide-on-fullscreen">
+    <toolbar mode="icons" flex="1" id="zen-sidebar-panels-wrapper" fullscreentoolbar="true">
-      <toolbar mode="icons" flex="1" id="zen-sidebar-panels-sites" class="zen-dont-hide-on-fullscreen">
+      <toolbar mode="icons" flex="1" id="zen-sidebar-panels-sites" fullscreentoolbar="true">
         
       </toolbar>
       <toolbarbutton id="zen-sidebar-add-panel-button" class="zen-sidebar-panel-button toolbarbutton-1 chromeclass-toolbar-additional" onclick="gZenBrowserManagerSidebar._openAddPanelDialog();"/>
     </toolbar>
-    <html:span id="zen-sidebar-web-panel-splitter"></html:span>
+    <html:span class="zen-sidebar-web-panel-splitter" side="left"></html:span>
-    <html:span id="zen-sidebar-web-panel-hsplitter"></html:span>
+    <html:span class="zen-sidebar-web-panel-splitter" side="right"></html:span>
+    <html:span class="zen-sidebar-web-panel-splitter" orient="horizontal" side="top"></html:span>
+    <html:span class="zen-sidebar-web-panel-splitter" orient="horizontal" side="bottom"></html:span>
   </box>
 </hbox>

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

@@ -33,10 +33,6 @@
   width: 100%;
 }
 
-:root:not([inDOMFullscreen='true']) #appcontent {
-  overflow: hidden;
-}
-
 :root:not([inDOMFullscreen='true']) #appcontent,
 #sidebar-box {
   /** Sidebar is already hidden in full screen mode */
@@ -57,5 +53,5 @@
 }
 
 :root:not([inDOMFullscreen='true']) #tabbrowser-tabbox {
-  padding: 1px; /* To allow the web view's shadow to be visible */
+  padding: 2px; /* To allow the web view's shadow to be visible */
 }

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

@@ -33,8 +33,9 @@
       }
 
       #navigator-toolbox {
+        --zen-toolbox-max-width: 54px !important;
         position: absolute;
-        height: 98%;
+        height: calc(98% - var(--zen-element-separation));
         z-index: 9;
         background: var(--zen-themed-toolbar-bg) !important;
         box-shadow: 0 0 2px 2px rgba(0,0,0,.1);
@@ -45,11 +46,9 @@
         padding: var(--zen-toolbox-padding) !important;
         transition: all 0.2s ease-in-out;
         right: calc(100% - var(--zen-element-separation) + 1px);
-        top: 50%;
+        top: 1%;
         opacity: 0;
 
-        transform: translate3d(0, -50%, 0);
-
         #browser:has(#navigator-toolbox[zen-right-side='true']) & {
           border-left-width: 1px;
           border-right-width: 0;
@@ -77,9 +76,9 @@
       #navigator-toolbox:has(*[open='true']:not(tab):not(#zen-sidepanel-button)) {
         opacity: 1;
         
-        transform: translate3d(calc(100% - var(--zen-element-separation)), -50%, 0);
+        transform: translateX(calc(100% - var(--zen-element-separation)));
         #browser:has(#navigator-toolbox[zen-right-side='true']) & {
-          transform: translate3d(calc(-100% + var(--zen-element-separation)), -50%, 0);
+          transform: translateX(calc(-100% + var(--zen-element-separation)));
         }
       }
     }
@@ -110,8 +109,12 @@
         width: 100%;
         opacity: 0;
 
+        :root[tabsintitlebar][sizemode="normal"]:not([gtktiledwindow="true"]) & {
           border-top-left-radius: env(-moz-gtk-csd-titlebar-radius);
           border-top-right-radius: env(-moz-gtk-csd-titlebar-radius);
+          border-left-width: 0;
+          border-right-width: 0;
+        }
       }
 
       #zen-appcontent-navbar-container:hover,

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

@@ -70,7 +70,7 @@
 #zen-sidebar-web-panel-wrapper:has(#zen-sidebar-web-panel[pinned='true']) {
   position: absolute;
   z-index: 1;
-  width: -moz-available;
+  width: calc(100% - var(--zen-sidebar-web-panel-spacing) * 3);
   margin: var(--zen-sidebar-web-panel-spacing);
   /* Why times 3? 
    *  + 1 for the top margin, making the element overflow the view.
@@ -83,7 +83,8 @@
 #zen-sidebar-web-panel {
   border-radius: var(--zen-panel-radius);
   overflow: hidden;
-  box-shadow: 0 0 0 1px var(--zen-colors-border);
+  box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.1);
+  border: 1px solid var(--zen-colors-border);
   background: var(--zen-colors-tertiary);
   opacity: 0;
   animation-delay: 0.1s;
@@ -101,10 +102,10 @@
   height: unset !important;
 }
 
-#zen-sidebar-web-panel-splitter {
+.zen-sidebar-web-panel-splitter {
   position: absolute;
   top: 0;
-  right: 0;
+  left: 0;
   height: 100%;
   width: 4px;
   background: transparent;
@@ -112,21 +113,26 @@
   cursor: ew-resize;
 }
 
-#zen-sidebar-web-panel-hsplitter {
+.zen-sidebar-web-panel-splitter[side='right'] {
-  position: absolute;
+  left: initial;
-  bottom: -2px;
+  right: 0;
-  left: 0;
+}
+
+.zen-sidebar-web-panel-splitter[orient='horizontal'] {
   width: 100%;
   height: 7px;
-  background: transparent;
-  border: none;
   cursor: ns-resize;
 }
 
-#zen-sidebar-web-panel[hidden='true'] #zen-sidebar-web-panel-hsplitter,
+.zen-sidebar-web-panel-splitter[side='bottom'] {
-#zen-sidebar-web-panel-wrapper[hidden='true'] + #zen-sidebar-web-panel-splitter,
+  top: initial;
-#zen-sidebar-web-panel-wrapper[hidden='true'] + #zen-sidebar-web-panel-hsplitter,
+  bottom: -2px;
-#zen-sidebar-web-panel:not([pinned='true']) #zen-sidebar-web-panel-hsplitter {
+}
+
+#zen-sidebar-web-panel[hidden='true'] .zen-sidebar-web-panel-splitter,
+#zen-sidebar-web-panel-wrapper[hidden='true'] + .zen-sidebar-web-panel-splitter,
+#zen-sidebar-web-panel:not([pinned='true']) .zen-sidebar-web-panel-splitter[orient='horizontal'],
+#zen-sidebar-web-panel:not([pinned='true']) .zen-sidebar-web-panel-splitter[side='left'] {
   display: none;
   margin: 0;
 }

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

@@ -31,10 +31,11 @@
     min-width: var(--zen-toolbox-min-width);
     margin-top: 0 !important; /* Fix full screen mode */
 
-    padding: var(--zen-toolbox-padding);
     padding-top: var(--zen-toolbox-top-align);
     padding-bottom: var(--zen-element-separation);
 
+    order: 0 !important;
+
     display: flex;
   }
 
@@ -162,6 +163,10 @@
     #navigator-toolbox[zen-expanded='true']:not([zen-user-hover='true'])) {
     --zen-toolbox-min-width: fit-content;
 
+    & {
+      padding: var(--zen-toolbox-padding);
+    }
+
     & #titlebar {
       min-width: 150px;
     }
@@ -276,8 +281,8 @@
     #navigator-toolbox[zen-user-hover='true']:has(*[open='true']:not(tab):not(#zen-sidepanel-button)),
     #navigator-toolbox[zen-expanded='true']:not([zen-user-hover='true']))) {
     --zen-toolbox-max-width: 45px;
+    --zen-toolbox-padding: 8px;
     max-width: var(--zen-toolbox-max-width) !important;
-    min-width: calc(var(--zen-toolbox-max-width) + var(--zen-toolbox-padding) / 2 + 2px) !important;
 
     & #vertical-tabs-newtab-button {
       padding: 0 !important;
@@ -460,6 +465,11 @@
       height: 100%;
 
       border-top-right-radius: var(--zen-border-radius);
+      width: var(--zen-toolbox-max-width);
+
+      & .tabbrowser-tab {
+        transition: 0s !important;
+      }
     }
 
     #navigator-toolbox[zen-has-hover],
@@ -469,10 +479,9 @@
     #navigator-toolbox[has-popup-menu],
     #navigator-toolbox:has(.tabbrowser-tab:active),
     #navigator-toolbox:has(*[open='true']:not(tab):not(#zen-sidepanel-button)) {
-      --zen-navigation-toolbar-min-width: 55.5px !important; /* + the width of the splitter */
+      --zen-toolbox-max-width: 41px;
-
+      max-width: var(--zen-toolbox-max-width) !important;
-      max-width: var(--zen-navigation-toolbar-min-width) !important;
+      min-width: calc(var(--zen-toolbox-max-width) + var(--zen-toolbox-padding) / 2 + 3px) !important;
-      min-width: var(--zen-navigation-toolbar-min-width) !important;
       padding: 0 !important;
 
       & #TabsToolbar {
@@ -484,8 +493,69 @@
         position: absolute;
         padding: var(--zen-toolbox-padding);
         transition: 0 !important;
-        animation: zen-vtabs-animation 0.3s ease-in-out;
+        /*animation: zen-vtabs-animation 0.3s ease-in-out;*/
         -moz-window-dragging: no-drag;
+        overflow: hidden;
+        transition: width .2s !important;
+
+        & .tab-throbber,
+        & .tab-icon-pending,
+        & .tab-icon-image,
+        & .tab-sharing-icon-overlay,
+        & .tab-icon-overlay {
+          transition: 0.1s !important;
+        }
+
+      }
+
+      /* Make pinned tabs stay in a single line */
+      #vertical-pinned-tabs-container {
+        display: flex;
+        flex-direction: column;
+        gap: 0 !important;
+
+        margin-bottom: 8px;
+        position: relative;
+  
+        &::after {
+          bottom: -4px;
+          content: '';
+          display: block;
+          height: 1px;
+          background: color-mix(in srgb, var(--zen-colors-border) 80%, transparent 20%);
+          width: 99%;
+          left: 50%;
+          transform: translateX(-50%);
+          position: absolute;
+        }
+
+        & .tabbrowser-tab {
+          & .tab-label-container {
+            display: flex;
+          }
+
+          & .tab-throbber,
+          & .tab-icon-pending,
+          & .tab-icon-image,
+          & .tab-sharing-icon-overlay,
+          & .tab-icon-overlay {
+            margin-inline-end: var(--toolbarbutton-inner-padding) !important;
+          }
+
+          &:hover .tab-close-button {
+            display: block !important;
+          }
+
+          & .tab-background {
+            box-shadow: none;
+
+            background: transparent !important;
+          }
+
+          &:hover .tab-background {
+            background-color: var(--tab-hover-background-color) !important;
+          }
+        }
       }
 
       &[zen-right-side='true'] #TabsToolbar {
@@ -513,11 +583,11 @@
   /* Mark: Move sidebar to the right */
   #browser:has(#navigator-toolbox[zen-right-side='true']) {
     & #navigator-toolbox {
-      order: 3;
+      order: 3 !important;
     }
 
     & #zen-sidebar-splitter {
-      order: 2;
+      order: 2 !important;
     }
   }
 
@@ -561,7 +631,7 @@
       align-items: center;
 
       #nav-bar:has(&) & {
-        padding-inline-start: calc(var(--zen-toolbox-padding) + var(--toolbarbutton-outer-padding));
+        padding-inline-start: var(--toolbarbutton-outer-padding);
       }
 
       #browser:has(#navigator-toolbox[zen-right-side='true']) & {

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

@@ -68,6 +68,8 @@
   --button-primary-active-bgcolor: var(--in-content-primary-button-background-active) !important;
   --button-primary-color: var(--in-content-primary-button-text-color) !important;
 
+  --color-accent-primary-hover: var(--zen-primary-color) !important;
+
   --in-content-page-background: var(--zen-colors-tertiary) !important;
   --zen-in-content-dialog-background: var(--zen-colors-tertiary);
 
@@ -112,7 +114,7 @@
 
   --input-bgcolor: var(--zen-colors-tertiary) !important;
   --input-border-color: var(--zen-input-border-color) !important;
-  --zen-themed-toolbar-bg: var(--zen-colors-tertiary);
+  --zen-themed-toolbar-bg: light-dark(#eeeded, var(--zen-colors-tertiary)) !important;
 
   --toolbar-field-background-color: var(--zen-colors-input-bg) !important;
   --arrowpanel-background: var(--zen-dialog-background) !important;
@@ -172,7 +174,7 @@
 
 @media not (-moz-bool-pref: 'zen.theme.toolbar-themed') {
   :root {
-    --toolbar-bgcolor: light-dark(white, #1b1b1b) !important;
+    --toolbar-bgcolor: light-dark(#E6E6E6, #1b1b1b) !important;
     --zen-themed-toolbar-bg: var(--toolbar-bgcolor);
   }
 }

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index 7e21bab426b6eb52fe84876d817fddbdb1a35ffc..56b42e2d025e4a47ea0983cf33ae69ffafa0d576 100644
+index 7e21bab426b6eb52fe84876d817fddbdb1a35ffc..39637cc8aea988c77e5a6c66a85ec66acd4ca4bc 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
 @@ -196,6 +196,10 @@ function init_all() {
@@ -7,7 +7,7 @@ index 7e21bab426b6eb52fe84876d817fddbdb1a35ffc..56b42e2d025e4a47ea0983cf33ae69ff
    Preferences.queueUpdateOfAllElements();
    Services.telemetry.setEventRecordingEnabled("aboutpreferences", true);
 +  register_module("paneZenLooks", gZenLooksAndFeel);
-+  register_module("paneZenWorkspaces", gZenWorkspacesSettings);
++  register_module("paneZenTabManagement", gZenWorkspacesSettings);
 +  register_module("paneZenCKS", gZenCKSSettings);
 +  register_module("paneZenMarketplace", gZenMarketplaceManager);
  

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 3affb19d1a243da4a5782c9a4a5588d165b4119f..837f078ff1f3a65a40877c1380c6d050a8415bab 100644
+index 53bdc9c912a6cd0c787dbcf41f2a82b7169d5aa7..e47c4b36b6e469b0cc8b95bde0508dc6cb0b49ae 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
 @@ -43,6 +43,8 @@
@@ -39,15 +39,15 @@ index 3affb19d1a243da4a5782c9a4a5588d165b4119f..837f078ff1f3a65a40877c1380c6d050
 +          <label class="category-name" flex="1" data-l10n-id="pane-zen-looks-title"></label>
 +        </richlistitem>
 +
-+        <richlistitem id="category-zen-workspaces"
++        <richlistitem id="category-zen-tabs-management"
 +                      class="category"
-+                      value="paneZenWorkspaces"
++                      value="paneZenTabManagement"
 +                      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>
++          <label class="category-name" flex="1" data-l10n-id="pane-zen-tabs-title"></label>
 +        </richlistitem>
 +
 +        <richlistitem id="category-zen-CKS"
@@ -95,7 +95,7 @@ index 3affb19d1a243da4a5782c9a4a5588d165b4119f..837f078ff1f3a65a40877c1380c6d050
  #include moreFromMozilla.inc.xhtml
 +#include zenLooksAndFeel.inc.xhtml
 +#include zenKeyboardShortcuts.inc.xhtml
-+#include zenWorkspaces.inc.xhtml
++#include zenTabsManagement.inc.xhtml
 +#include zenMarketplace.inc.xhtml
          </vbox>
        </vbox>

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

@@ -185,6 +185,7 @@ var gZenMarketplaceManager = {
           .closest('.zenThemeMarketplaceItem')
           .querySelector('.zenThemeMarketplaceItemUninstallButton')
           .getAttribute('zen-theme-id');
+        event.target.setAttribute('disabled', true);
 
         if (!event.target.hasAttribute('pressed')) {
           await this.disableTheme(themeId);
@@ -203,6 +204,10 @@ var gZenMarketplaceManager = {
             document.getElementById(`zenThemeMarketplaceItemConfigureButton-${sanitizedName}`).removeAttribute('hidden');
           }
         }
+        setTimeout(() => {
+          // We use a timeout to make sure the theme list has been updated before re-enabling the button.
+          event.target.removeAttribute('disabled');
+        }, 400);
       });
 
       fragment.querySelector('.zenThemeMarketplaceItemTitle').textContent = themeName;
@@ -665,15 +670,16 @@ var zenMissingKeyboardShortcutL10n = {
   key_gotoHistory: "zen-key-goto-history",
 
   goHome: "zen-key-go-home",
+  key_redo: "zen-key-redo",
 }  
 
 var gZenCKSSettings = {
   async init() {
+    await this._initializeCKS();
     if (this.__hasInitialized) return;
     this.__hasInitialized = true;
     this._currentActionID = null;
     this._initializeEvents();
-    await this._initializeCKS();
   },
 
   _initializeEvents() {
@@ -698,6 +704,7 @@ var gZenCKSSettings = {
 
   async _initializeCKS() {
     let wrapper = document.getElementById(ZEN_CKS_WRAPPER_ID);
+    wrapper.innerHTML = '';
 
     let shortcuts = await gZenKeyboardShortcutsManager.getModifiableShortcuts();
 
@@ -727,9 +734,9 @@ var gZenCKSSettings = {
       
       let fragment = window.MozXULElement.parseXULToFragment(`
         <hbox class="${ZEN_CKS_CLASS_BASE}">
-          <label class="${ZEN_CKS_LABEL_CLASS}" for="${ZEN_CKS_CLASS_BASE}-${action}"></label>
+          <label class="${ZEN_CKS_LABEL_CLASS}" for="${ZEN_CKS_CLASS_BASE}-${keyID}"></label>
           <vbox flex="1">
-            <html:input readonly="1" class="${ZEN_CKS_INPUT_FIELD_CLASS}" id="${ZEN_CKS_INPUT_FIELD_CLASS}-${action}" />
+            <html:input readonly="1" class="${ZEN_CKS_INPUT_FIELD_CLASS}" id="${ZEN_CKS_INPUT_FIELD_CLASS}-${keyID}" />
           </vbox>
         </hbox>
       `);
@@ -756,18 +763,32 @@ var gZenCKSSettings = {
         const value = event.target.getAttribute(KEYBIND_ATTRIBUTE_KEY);
         this._currentActionID = event.target.getAttribute('data-id');
         event.target.classList.add(`${ZEN_CKS_INPUT_FIELD_CLASS}-editing`);
+        this._hasSafed = true;
       });
 
       input.addEventListener('editDone', (event) => {
         const target = event.target;
         target.classList.add(`${ZEN_CKS_INPUT_FIELD_CLASS}-editing`);
-        this._editDone(target);
       });
 
       input.addEventListener('blur', (event) => {
         const target = event.target;
         target.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-editing`);
-        this._editDone(target);
+        if (!this._hasSafed) {
+          target.classList.add(`${ZEN_CKS_INPUT_FIELD_CLASS}-unsafed`);
+          if (!target.nextElementSibling) {
+            target.after(window.MozXULElement.parseXULToFragment(`
+              <label class="${ZEN_CKS_CLASS_BASE}-unsafed" data-l10n-id="zen-key-unsafed"></label>
+            `));
+            target.value = 'Not set';
+          }
+        } else {
+          target.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-unsafed`);
+          const sibling = target.nextElementSibling;
+          if (sibling && sibling.classList.contains(`${ZEN_CKS_CLASS_BASE}-unsafed`)) {
+            sibling.remove();
+          }
+        }
       });
 
       const groupElem = wrapper.querySelector(`[data-group="${ZEN_CKS_GROUP_PREFIX}-${group}"]`);
@@ -798,23 +819,18 @@ var gZenCKSSettings = {
 
   //TODO Check for duplicates
   async _handleKeyDown(event) {
-    if (!this._currentActionID) {
+    if (!this._currentActionID || document.hidden) {
       return;
     }
 
     event.preventDefault();
 
     let input = document.querySelector(`.${ZEN_CKS_INPUT_FIELD_CLASS}[${KEYBIND_ATTRIBUTE_KEY}="${this._currentActionID}"]`);
-    let accelKey = false;
+    const modifiers = new KeyShortcutModifiers(event.ctrlKey, event.altKey, event.shiftKey, event.metaKey, false);
-    let controlKey = false;
-    if (AppConstants.platform === 'macosx') {
-      accelKey = event.ctrlKey;
-    } else {
-      accelKey = event.ctrlKey;
-    }
-    const modifiers = new KeyShortcutModifiers(controlKey, event.altKey, event.shiftKey, event.metaKey, accelKey);
     const modifiersActive = modifiers.areAnyActive();
 
+    input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-not-set`);
+
     let shortcut = event.key;
 
     shortcut = shortcut.replace(/Ctrl|Control|Shift|Alt|Option|Cmd|Meta/, ''); // Remove all modifiers
@@ -833,14 +849,14 @@ var gZenCKSSettings = {
         if (!input.classList.contains(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`)) {
           input.classList.add(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`);
         }
+        input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-unsafed`);
         if (hasConflicts && !input.nextElementSibling) {
           input.after(window.MozXULElement.parseXULToFragment(`
-            <label class="${ZEN_CKS_CLASS_BASE}-conflict">Conflict with another shortcut</label>
+            <label class="${ZEN_CKS_CLASS_BASE}-conflict" data-l10n-id="zen-key-conflict"></label>
           `));
         }
       } else {
         input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-editing`);
-        input.blur();
 
         this._editDone(this._latestValidKey, this._latestModifier);
         this._latestValidKey = null;
@@ -855,6 +871,7 @@ var gZenCKSSettings = {
           sibling.remove();
         }
       }
+      this._hasSafed = true;
       input.blur();
       this._currentActionID = null;
       return;
@@ -862,10 +879,12 @@ var gZenCKSSettings = {
       this._resetShortcut(input);
       this._latestValidKey = null;
       this._latestModifier = null;
+      this._hasSafed = true;
       return;
     }
 
     this._latestModifier = modifiers;
+    this._hasSafed = false;
     input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`);
     input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-not-set`);
     input.value = modifiers.toUserString() + shortcut;
@@ -939,4 +958,19 @@ Preferences.addAll([
     type: 'bool',
     default: true,
   },
+  {
+    id: 'zen.tab-unloader.enabled',
+    type: 'bool',
+    default: true,
+  },
+  {
+    id: 'zen.view.split-view.change-on-hover',
+    type: 'bool',
+    default: true,
+  },
+  {
+    id: 'zen.tab-unloader.timeout-minutes',
+    type: 'int',
+    default: 10,
+  }
 ]);

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

@@ -255,6 +255,22 @@
       </hbox>
 </groupbox>
 
+<hbox id="zenSplitViewCategory"
+      class="subcategory"
+      hidden="true"
+      data-category="paneZenLooks">
+<html:h1 data-l10n-id="zen-split-view-title"/>
+</hbox>
+
+<groupbox id="zenSplitViewGroup" data-category="paneZenLooks" hidden="true" class="highlighting-group">
+      <label><html:h2 data-l10n-id="zen-split-view-header"/></label>
+      <description class="description-deemphasized" data-l10n-id="zen-split-view-description" />
+
+      <checkbox id="zenLooksAndFeelSplitViewChangeOnHover"
+            data-l10n-id="zen-split-view-change-on-hover"
+            preference="zen.view.split-view.change-on-hover"/>
+</groupbox>
+
 <hbox id="zenVerticalTabsCategory"
       class="subcategory"
       hidden="true"

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

@@ -1,19 +1,19 @@
-<html:template id="template-paneZenWorkspaces">
+<html:template id="template-paneZenTabManagement">
 <hbox id="ZenWorkspacesCategory"
       class="subcategory"
       hidden="true"
-      data-category="paneZenWorkspaces">
+      data-category="paneZenTabManagement">
 <html:h1 data-l10n-id="pane-workspaces-title"/>
 </hbox>
 
 <hbox id="zenSidePanelsCategory"
       class="subcategory"
       hidden="true"
-      data-category="paneZenWorkspaces">
+      data-category="paneZenTabManagement">
 <html:h1 data-l10n-id="pane-settings-workspaces-title"/>
 </hbox>
 
-<groupbox id="zenSidePanelsGroup" data-category="paneZenWorkspaces" hidden="true" class="highlighting-group">
+<groupbox id="zenWorkspacesGroup" data-category="paneZenTabManagement" 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" />
 
@@ -33,4 +33,32 @@
       </vbox>
 </groupbox>
 
+<hbox id="zenTabsUnloadCategory"
+      class="subcategory"
+      hidden="true"
+      data-category="paneZenTabManagement">
+<html:h1 data-l10n-id="pane-zen-tabs-unloader-title"/>
+</hbox>
+
+<groupbox id="zenTabsUnloadGroup" data-category="paneZenTabManagement" hidden="true" class="highlighting-group">
+      <label><html:h2 data-l10n-id="zen-tabs-unloader-header"/></label>
+      <description class="description-deemphasized" data-l10n-id="zen-tabs-unloader-description" />
+
+      <checkbox id="zenTabsUnloadActivate"
+            data-l10n-id="zen-tabs-unloader-enabled"
+            preference="zen.tab-unloader.enabled"/>
+
+      <label><html:h2 data-l10n-id="zen-tabs-unloader-unload-delay"/></label>
+      <hbox id="zenTabsUnloadDelayContainer">
+            <description class="description-deemphasized" data-l10n-id="zen-tabs-unloader-unload-delay-description" />
+            <html:input id="zenTabsUnloadDelay"
+                  type="number"
+                  min="1"
+                  max="1000"
+                  preference="zen.tab-unloader.timeout-minutes"/>
+      </hbox>
+</groupbox>
+
 </html:template>
+
+

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 282e7f31fe158d929130c17628f7e30f690fd666..213e6f1ea1cd454b4d0f3679a5acb414b0ef9242 100644
+index 282e7f31fe158d929130c17628f7e30f690fd666..c139830f6bbd84428310692cfb840bc390c5c6f3 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -1387,10 +1387,12 @@
@@ -18,6 +18,15 @@ index 282e7f31fe158d929130c17628f7e30f690fd666..213e6f1ea1cd454b4d0f3679a5acb414
        selectedTab._notselectedsinceload = false;
      }
  
+@@ -1449,7 +1451,7 @@
+         let tabsToReset = [];
+         for (let i = numPinned; i < tabs.length; i++) {
+           let tab = tabs[i];
+-          tab.style.setProperty("max-width", aTabWidth, "important");
++          //tab.style.setProperty("max-width", aTabWidth, "important");
+           if (!isEndTab) {
+             // keep tabs the same width
+             tab.style.transition = "none";
 @@ -1629,7 +1631,7 @@
        }
  

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

@@ -305,10 +305,19 @@ groupbox h2 {
 
 /* Workspace */
 
-#category-zen-workspaces > .category-icon {
+#category-zen-tabs-management > .category-icon {
   list-style-image: url('chrome://browser/skin/window.svg');
 }
 
+#zenTabsUnloadDelayContainer {
+  display: flex;
+  align-items: center;
+
+  & #zenTabsUnloadDelay {
+    margin-left: auto;
+  }
+}
+
 /* CKS */
 
 #category-zen-CKS > .category-icon {
@@ -367,10 +376,20 @@ groupbox h2 {
   margin-top: 5px;
 }
 
+.zenCKSOption-unsafed {
+  color: yellow;
+  margin-left: 10px;
+  margin-top: 5px;
+}
+
 .zenCKSOption-input.zenCKSOption-input-invalid {
   border-color: red;
 }
 
+.zenCKSOption-input.zenCKSOption-input-unsafed {
+  border-color: yellow;
+}
+
 .zenCKSOption-input.zenCKSOption-input-valid {
   border-color: green;
 }

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

@@ -975,6 +975,11 @@ menuitem[id='placesContext_new:separator'] {
   --menu-image: url('close-all.svg');
 }
 
+#context_zenUnloadTab,
+#context_zenTabActions {
+  --menu-image: url('close-all.svg');
+}
+
 .customize-context-reportExtension,
 .unified-extensions-context-menu-report-extension {
   --menu-image: url('report.svg');

src/toolkit/content/widgets/moz-toggle/moz-toggle-css.patch

@@ -0,0 +1,13 @@
+diff --git a/toolkit/content/widgets/moz-toggle/moz-toggle.css b/toolkit/content/widgets/moz-toggle/moz-toggle.css
+index 8509f15f02f01b3259e6b6ddf97203e7aa8e9e60..989bd48d3615210cc090a6e753d86bd23fcb46b6 100644
+--- a/toolkit/content/widgets/moz-toggle/moz-toggle.css
++++ b/toolkit/content/widgets/moz-toggle/moz-toggle.css
+@@ -34,7 +34,7 @@
+   --toggle-background-color: var(--button-background-color);
+   --toggle-background-color-hover: var(--button-background-color-hover);
+   --toggle-background-color-active: var(--button-background-color-active);
+-  --toggle-background-color-pressed: var(--color-accent-primary);
++  --toggle-background-color-pressed: var(--zen-primary-color);
+   --toggle-background-color-pressed-hover: var(--color-accent-primary-hover);
+   --toggle-background-color-pressed-active: var(--color-accent-primary-active);
+   --toggle-border-color: var(--border-color-interactive);

src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/toolkit/mozapps/extensions/AddonManager.sys.mjs b/toolkit/mozapps/extensions/AddonManager.sys.mjs
-index 2f855e6e48f420e3782d3be31cfdfa6c40db479b..911a6494812f0496ac928489244f2ac7bf0ed025 100644
+index 2f855e6e48f420e3782d3be31cfdfa6c40db479b..de55b4c7ff7517169ac56693b4cb3c46b3c20736 100644
 --- a/toolkit/mozapps/extensions/AddonManager.sys.mjs
 +++ b/toolkit/mozapps/extensions/AddonManager.sys.mjs
-@@ -1214,7 +1214,7 @@ var AddonManagerInternal = {
+@@ -1214,12 +1214,12 @@ var AddonManagerInternal = {
          ITEM_VERSION: aAddon.version,
          ITEM_STATUS: addonStatus,
          APP_ID: Services.appinfo.ID,
@@ -11,3 +11,9 @@ index 2f855e6e48f420e3782d3be31cfdfa6c40db479b..911a6494812f0496ac928489244f2ac7
          REQ_VERSION: UPDATE_REQUEST_VERSION,
          APP_OS: Services.appinfo.OS,
          APP_ABI: Services.appinfo.XPCOMABI,
+         APP_LOCALE: getLocale(),
+-        CURRENT_APP_VERSION: Services.appinfo.version,
++        CURRENT_APP_VERSION: AppConstants.ZEN_FIREFOX_VERSION,
+       })
+     );
+ 

src/toolkit/mozapps/extensions/internal/AddonUpdateChecker-sys-mjs.patch

@@ -0,0 +1,13 @@
+diff --git a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.sys.mjs b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.sys.mjs
+index 5b7b10a7641c57e1f5206fb57030c8c2afb60971..a1161428e6ae4141b3d6767042edf90935694121 100644
+--- a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.sys.mjs
++++ b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.sys.mjs
+@@ -558,7 +558,7 @@ export var AddonUpdateChecker = {
+     aIgnoreStrictCompat
+   ) {
+     if (!aAppVersion) {
+-      aAppVersion = Services.appinfo.version;
++      aAppVersion = Services.appinfo.platformVersion;
+     }
+     if (!aPlatformVersion) {
+       aPlatformVersion = Services.appinfo.platformVersion;

surfer.json

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