New translations zen-menubar.ftl (Irish)

README.md

@@ -34,8 +34,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne
 
 ### Firefox Versions
 
-- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `147.0.2`! 🚀
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `147.0.1`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 147.0.2`!
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 147.0.1`!
 
 ### Contributing
 

build/firefox-cache/l10n-last-commit-hash

@@ -1 +1 @@
-7712a9ac90683965f71be525fe2827467632715d
+783b222b1b93fb9e8c52eb57558ef7f07bca6e7e

build/flatpak/app.zen_browser.zen.yml.template

@@ -20,6 +20,7 @@ finish-args:
   - --socket=cups
   - --persist=.zen
   - --env=DICPATH=/usr/share/hunspell
+  - --filesystem=xdg-config/gtk-3.0:ro
   - --filesystem=xdg-download:rw
   - --filesystem=/run/.heim_org.h5l.kcm-socket
   - --filesystem=xdg-run/speech-dispatcher:ro

build/windows/sign.ps1

@@ -148,7 +148,7 @@ function SignAndPackage($name) {
         $env:WIN32_REDIST_DIR="$PWD\win-cross\vs2022\VC\Redist\MSVC\14.38.33135\x64\Microsoft.VC143.CRT"
     }
 
-    $env:MAR="..\\build\\windows\\mar.exe"
+    $env:MAR="..\\build\\winsign\\mar.exe"
     if ($name -eq "arm64") {
         $env:SURFER_COMPAT="aarch64"
     } else {

locales/ca/browser/browser/preferences/zen-preferences.ftl

@@ -314,4 +314,4 @@ zen-devtools-toggle-storage-shortcut = Commuta l'emmagatzematge
 zen-devtools-toggle-dom-shortcut = Commuta el DOM
 zen-devtools-toggle-accessibility-shortcut = Commuta l'accessibilitat
 zen-close-all-unpinned-tabs-shortcut = Tanca totes les pestanyes no fixades
-zen-new-unsynced-window-shortcut = Nova finestra no sincronitzada
+zen-new-unsynced-window-shortcut = Nova finestra en blanc

locales/ca/browser/browser/zen-menubar.ftl

@@ -19,4 +19,4 @@ zen-menubar-appearance-light =
 zen-menubar-appearance-dark = 
     .label = Fosca
 zen-menubar-new-unsynced-window = 
-    .label = New Blank Window
+    .label = Nova finestra en blanc

locales/cy/browser/browser/preferences/zen-preferences.ftl

@@ -314,4 +314,4 @@ zen-devtools-toggle-storage-shortcut = Toglo Storio
 zen-devtools-toggle-dom-shortcut = Toglo DOM
 zen-devtools-toggle-accessibility-shortcut = Toglo Hygyrchedd
 zen-close-all-unpinned-tabs-shortcut = Cau Pob Tab Heb ei Binio
-zen-new-unsynced-window-shortcut = Ffenestr Newydd Heb ei Chydweddu
+zen-new-unsynced-window-shortcut = Ffenestr Wag Newydd

locales/cy/browser/browser/zen-general.ftl

@@ -2,8 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-zen-panel-ui-current-profile-text = proffil cyfredol
+zen-panel-ui-current-profile-text = y proffil cyfredol
-unified-extensions-description = Mae ychwanegiadau'n cael ei defnyddio er mwyn ychwanegu fwy o weithrediadau i { -brand-short-name }.
+unified-extensions-description = Mae estyniadau'n cael ei defnyddio er mwyn ychwanegu fwy o swyddogaeth i { -brand-short-name }.
 tab-context-zen-reset-pinned-tab = 
     .label = Ailosod Tab wedi'i Binio
     .accesskey = A
@@ -109,7 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Rhywbeth wedi torri?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Ailgychwyn yn y Modd Diogel
-zen-window-sync-migration-dialog-title = Keep Your Windows in Sync
+zen-window-sync-migration-dialog-title = Cadw Eich Ffenestr Wedi'u Cydweddu
-zen-window-sync-migration-dialog-message = Zen now syncs windows on the same device, so changes in one window are reflected across the others instantly.
+zen-window-sync-migration-dialog-message = Mae Zen bellach yn cydweddu ffenestri ar yr un ddyfais, felly mae newidiadau mewn un ffenestr yn cael eu dangos ar y lleill yn syth.
-zen-window-sync-migration-dialog-learn-more = Learn More
+zen-window-sync-migration-dialog-learn-more = Dysgu Rhagor
-zen-window-sync-migration-dialog-accept = Got It
+zen-window-sync-migration-dialog-accept = Iawn

locales/cy/browser/browser/zen-menubar.ftl

@@ -19,4 +19,4 @@ zen-menubar-appearance-light =
 zen-menubar-appearance-dark = 
     .label = Tywyll
 zen-menubar-new-unsynced-window = 
-    .label = New Blank Window
+    .label = Ffenestr Wag Newydd

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

@@ -53,8 +53,8 @@ category-zen-workspaces =
     .tooltiptext = { pane-zen-tabs-title }
 pane-settings-workspaces-title = Workspaces
 
-zen-tabs-select-recently-used-on-close =
+zen-tabs-unloader-enabled =
-    .label = When closing a tab, switch to the most recently used tab instead of the next tab
+    .label = Enable Tab Unloader
 
 zen-tabs-close-on-back-with-no-history =
     .label = Close tab and switch to its owner tab (or most recently used tab) when going back with no history

locales/en-US/browser/browser/zen-menubar.ftl

@@ -23,4 +23,4 @@ zen-menubar-appearance-dark =
     .label = Dark
 
 zen-menubar-new-unsynced-window =
-    .label = New blank window
+    .label = New Blank Window

locales/fr/browser/browser/zen-menubar.ftl

@@ -19,4 +19,4 @@ zen-menubar-appearance-light =
 zen-menubar-appearance-dark = 
     .label = Sombre
 zen-menubar-new-unsynced-window = 
-    .label = New Blank Window
+    .label = Nouvelle fenêtre non synchronisée

locales/ga-IE/browser/browser/zen-menubar.ftl

@@ -19,4 +19,4 @@ zen-menubar-appearance-light =
 zen-menubar-appearance-dark = 
     .label = Dorcha
 zen-menubar-new-unsynced-window = 
-    .label = New Blank Window
+    .label = Fuinneog Nua Bán

locales/he/browser/browser/zen-menubar.ftl

@@ -19,4 +19,4 @@ zen-menubar-appearance-light =
 zen-menubar-appearance-dark = 
     .label = כהה
 zen-menubar-new-unsynced-window = 
-    .label = New Blank Window
+    .label = חלון ריק חדש

locales/hu/browser/browser/zen-menubar.ftl

@@ -19,4 +19,4 @@ zen-menubar-appearance-light =
 zen-menubar-appearance-dark = 
     .label = Sötét
 zen-menubar-new-unsynced-window = 
-    .label = New Blank Window
+    .label = Új üres lap

locales/id/browser/browser/preferences/zen-preferences.ftl

@@ -49,8 +49,8 @@ zen-tabs-close-on-back-with-no-history =
 zen-tabs-cycle-by-attribute = 
     .label = Ctrl+Tab berputar hanya dalam tab Esensial atau Ruang Kerja
 zen-tabs-cycle-ignore-pending-tabs = 
-    .label = Ignore Pending tabs when cycling with Ctrl+Tab
+    .label = Lewati tab tak termuat saat beralih dengan Ctrl+Tab
-zen-tabs-cycle-by-attribute-warning = Ctrl+Tab will cycle by recently used order, as it is enabled
+zen-tabs-cycle-by-attribute-warning = Ctrl+Tab akan beralih berdasarkan urutan terakhir digunakan
 zen-look-and-feel-compact-toolbar-themed = 
     .label = Gunakan latar belakang bertema untuk bilah atas dalam mode ringkas
 zen-workspace-continue-where-left-off = 
@@ -314,4 +314,4 @@ zen-devtools-toggle-storage-shortcut = Ubah Penyimpanan
 zen-devtools-toggle-dom-shortcut = Ubah DOM
 zen-devtools-toggle-accessibility-shortcut = Ubah Aksesibilitas
 zen-close-all-unpinned-tabs-shortcut = Tutup Semua Tab yang Tidak Disematkan
-zen-new-unsynced-window-shortcut = New Unsynced Window
+zen-new-unsynced-window-shortcut = Jendela Kosong Baru

locales/id/browser/browser/zen-general.ftl

@@ -60,8 +60,8 @@ zen-site-data-settings = Pengaturan
 zen-generic-manage = Kelola
 zen-generic-more = Selengkapnya
 zen-generic-next = Lanjut
-zen-essentials-promo-label = Add to Essentials
+zen-essentials-promo-label = Tambahkan ke Essentials
-zen-essentials-promo-sublabel = Keep your favorite tabs just a click away
+zen-essentials-promo-sublabel = Akses tab favorit Anda hanya dengan sekali klik
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Diizinkan
 zen-site-data-setting-block = Diblokir
@@ -109,7 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Ada yang rusak?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Mulai Ulang dalam Mode Aman
-zen-window-sync-migration-dialog-title = Keep Your Windows in Sync
+zen-window-sync-migration-dialog-title = Jaga Jendela Anda Tetap Sinkron
-zen-window-sync-migration-dialog-message = Zen now syncs windows on the same device, so changes in one window are reflected across the others instantly.
+zen-window-sync-migration-dialog-message = Zen kini menyinkronkan jendela pada perangkat yang sama, sehingga perubahan di satu jendela akan langsung terlihat di jendela lainnya.
-zen-window-sync-migration-dialog-learn-more = Learn More
+zen-window-sync-migration-dialog-learn-more = Pelajari Lebih Lanjut
-zen-window-sync-migration-dialog-accept = Got It
+zen-window-sync-migration-dialog-accept = Oke!

locales/id/browser/browser/zen-menubar.ftl

@@ -5,18 +5,18 @@
 zen-menubar-toggle-pinned-tabs = 
     .label =
         { $pinnedAreCollapsed -> 
-            [true] Expand Pinned Tabs
+         [true] Perluas Tab yang Disematkan 
-           *[false] Collapse Pinned Tabs
+         *[false] Ciutkan Tab yang Disematkan 
         }
 zen-menubar-appearance = 
-    .label = Appearance
+    .label = Tampilan
 zen-menubar-appearance-description = 
-    .label = Websites will use:
+    .label = Situs web akan menggunakan:
 zen-menubar-appearance-auto = 
-    .label = Automatic
+    .label = Otomatis
 zen-menubar-appearance-light = 
-    .label = Light
+    .label = Terang
 zen-menubar-appearance-dark = 
-    .label = Dark
+    .label = Gelap
 zen-menubar-new-unsynced-window = 
-    .label = New Blank Window
+    .label = Jendela Kosong Baru

locales/id/browser/browser/zen-workspaces.ftl

@@ -4,13 +4,13 @@
 
 zen-panel-ui-workspaces-text = Ruang Kerja Lainnya
 zen-panel-ui-spaces-label = 
-    .label = Spaces
+    .label = Ruang
 zen-panel-ui-workspaces-create = 
     .label = Buat Ruang
 zen-panel-ui-folder-create = 
     .label = Buat Folder
 zen-panel-ui-new-empty-split = 
-    .label = New Split
+    .label = Split Baru
 zen-workspaces-panel-context-delete = 
     .label = Hapus Ruang
     .accesskey = D
@@ -66,6 +66,6 @@ zen-workspaces-close-all-unpinned-tabs-title =
     .label = Bersihkan
     .tooltiptext = Tutup semua tab yang tidak disematkan
 zen-panel-ui-workspaces-change-forward = 
-    .label = Next Space
+    .label = Ruang Selanjutnya
 zen-panel-ui-workspaces-change-back = 
-    .label = Previous Space
+    .label = Ruang Sebelumnya

locales/is/browser/browser/zen-menubar.ftl

@@ -19,4 +19,4 @@ zen-menubar-appearance-light =
 zen-menubar-appearance-dark = 
     .label = Dökkt
 zen-menubar-new-unsynced-window = 
-    .label = New Blank Window
+    .label = Nýr auður gluggi

locales/ko/browser/browser/zen-menubar.ftl

@@ -19,4 +19,4 @@ zen-menubar-appearance-light =
 zen-menubar-appearance-dark = 
     .label = 다크
 zen-menubar-new-unsynced-window = 
-    .label = New Blank Window
+    .label = 새 빈 창

locales/lt/browser/browser/preferences/zen-preferences.ftl

@@ -314,4 +314,4 @@ zen-devtools-toggle-storage-shortcut = Perjungti saugyklą
 zen-devtools-toggle-dom-shortcut = Perjungti DOM
 zen-devtools-toggle-accessibility-shortcut = Perjungti prieinamumą
 zen-close-all-unpinned-tabs-shortcut = Užverti visas neprisegtas korteles
-zen-new-unsynced-window-shortcut = Naujas nesinchronizuotas langas
+zen-new-unsynced-window-shortcut = Naujas tuščias langas

locales/lt/browser/browser/zen-general.ftl

@@ -60,8 +60,8 @@ zen-site-data-settings = Nustatymai
 zen-generic-manage = Tvarkyti
 zen-generic-more = Daugiau
 zen-generic-next = Sekantis
-zen-essentials-promo-label = Add to Essentials
+zen-essentials-promo-label = Įtraukti į būtiniausius
-zen-essentials-promo-sublabel = Keep your favorite tabs just a click away
+zen-essentials-promo-sublabel = Laikykite mėgstamas korteles vos nuo vienu paspaudimu
 # These labels will be used for the site data panel settings
 zen-site-data-setting-allow = Leidžiama
 zen-site-data-setting-block = Užblokuota
@@ -109,7 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Kažkas sugedo?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Paleisti iš naujo saugioje režime
-zen-window-sync-migration-dialog-title = Keep Your Windows in Sync
+zen-window-sync-migration-dialog-title = Išlaikykite savo langus sinchronizuotus
-zen-window-sync-migration-dialog-message = Zen now syncs windows on the same device, so changes in one window are reflected across the others instantly.
+zen-window-sync-migration-dialog-message = „Zen“ dabar sinchronizuoja langus tame pačiame įrenginyje, todėl viename lange atlikti pakeitimai iš karto atsispindi ir kituose.
-zen-window-sync-migration-dialog-learn-more = Learn More
+zen-window-sync-migration-dialog-learn-more = Sužinoti daugiau
-zen-window-sync-migration-dialog-accept = Got It
+zen-window-sync-migration-dialog-accept = Supratau

locales/lt/browser/browser/zen-menubar.ftl

@@ -19,4 +19,4 @@ zen-menubar-appearance-light =
 zen-menubar-appearance-dark = 
     .label = Tamsų
 zen-menubar-new-unsynced-window = 
-    .label = New Blank Window
+    .label = Naujas tuščias langas

locales/pt-BR/browser/browser/zen-menubar.ftl

@@ -19,4 +19,4 @@ zen-menubar-appearance-light =
 zen-menubar-appearance-dark = 
     .label = Escuro
 zen-menubar-new-unsynced-window = 
-    .label = New Blank Window
+    .label = Nova janela em branco

locales/pt-PT/browser/browser/zen-general.ftl

@@ -18,9 +18,9 @@ tab-context-zen-replace-pinned-url-with-current =
     .label = Substituir o URL Fixado pelo URL Atual
     .accesskey = C
 tab-context-zen-edit-title = 
-    .label = Change Label...
+    .label = Alterar etiqueta...
 tab-context-zen-edit-icon = 
-    .label = Change Icon...
+    .label = Alterar ícone...
 zen-themes-corrupted = O seu ficheiro de modificações do { -brand-short-name } está corrompido. Elas foram redefinidas como iguais às do tema padrão.
 zen-shortcuts-corrupted = O seu ficheiro de atalhos do { -brand-short-name } está corrompido. Eles foram redefinidos para os atalhos padrão.
 # note: Do not translate the "<br/>" tags in the following string
@@ -109,7 +109,7 @@ zen-sidebar-notification-updated-tooltip =
 zen-sidebar-notification-restart-safe-mode-label = Falhou alguma coisa?
 zen-sidebar-notification-restart-safe-mode-tooltip = 
     .title = Reiniciar em Modo de Segurança
-zen-window-sync-migration-dialog-title = Keep Your Windows in Sync
+zen-window-sync-migration-dialog-title = Mantenha As Suas Janelas Sincronizadas
-zen-window-sync-migration-dialog-message = Zen now syncs windows on the same device, so changes in one window are reflected across the others instantly.
+zen-window-sync-migration-dialog-message = Agora, o Zen sincroniza as janelas no dispositivo, pelo que alterações numa janela são refletidas instantaneamente nas outras.
 zen-window-sync-migration-dialog-learn-more = Learn More
-zen-window-sync-migration-dialog-accept = Got It
+zen-window-sync-migration-dialog-accept = Entendido

locales/pt-PT/browser/browser/zen-menubar.ftl

@@ -19,4 +19,4 @@ zen-menubar-appearance-light =
 zen-menubar-appearance-dark = 
     .label = Escuro
 zen-menubar-new-unsynced-window = 
-    .label = New Blank Window
+    .label = Nova janela sem sincronização

locales/ru/browser/browser/preferences/zen-preferences.ftl

@@ -314,4 +314,4 @@ zen-devtools-toggle-storage-shortcut = Переключить хранилище
 zen-devtools-toggle-dom-shortcut = Переключить DOM
 zen-devtools-toggle-accessibility-shortcut = Включить/выключить специальные возможности
 zen-close-all-unpinned-tabs-shortcut = Закрыть все не закреплённые вкладки
-zen-new-unsynced-window-shortcut = Новое несинхронизированное окно
+zen-new-unsynced-window-shortcut = Новое пустое окно

locales/sv-SE/browser/browser/preferences/zen-preferences.ftl

@@ -314,4 +314,4 @@ zen-devtools-toggle-storage-shortcut = Växla lagring
 zen-devtools-toggle-dom-shortcut = Växla DOM
 zen-devtools-toggle-accessibility-shortcut = Växla tillgänglighetsinställningar
 zen-close-all-unpinned-tabs-shortcut = Stäng alla flikar som inte är fästa
-zen-new-unsynced-window-shortcut = Nytt osynkroniserat fönster
+zen-new-unsynced-window-shortcut = Nytt tomt fönster

locales/sv-SE/browser/browser/zen-menubar.ftl

@@ -19,4 +19,4 @@ zen-menubar-appearance-light =
 zen-menubar-appearance-dark = 
     .label = Mörkt
 zen-menubar-new-unsynced-window = 
-    .label = New Blank Window
+    .label = Nytt tomt fönster

locales/tr/browser/browser/preferences/zen-preferences.ftl

@@ -314,4 +314,4 @@ zen-devtools-toggle-storage-shortcut = Depolamayı Aç/Kapat
 zen-devtools-toggle-dom-shortcut = DOM'u Aç/Kapat
 zen-devtools-toggle-accessibility-shortcut = Erişilebilirliği Aç/Kapat
 zen-close-all-unpinned-tabs-shortcut = Sabitlenmemiş Tüm Sekmeleri Kapat
-zen-new-unsynced-window-shortcut = Senkronize Edilmemiş Yeni Pencere
+zen-new-unsynced-window-shortcut = Yeni Boş Pencere

locales/tr/browser/browser/zen-menubar.ftl

@@ -19,4 +19,4 @@ zen-menubar-appearance-light =
 zen-menubar-appearance-dark = 
     .label = Koyu
 zen-menubar-new-unsynced-window = 
-    .label = New Blank Window
+    .label = Yeni Boş Pencere

locales/zh-TW/browser/browser/preferences/zen-preferences.ftl

@@ -314,4 +314,4 @@ zen-devtools-toggle-storage-shortcut = 開啟儲存空間檢測器
 zen-devtools-toggle-dom-shortcut = 開啟 DOM
 zen-devtools-toggle-accessibility-shortcut = 開啟輔助功能
 zen-close-all-unpinned-tabs-shortcut = 關閉所有未釘選的分頁
-zen-new-unsynced-window-shortcut = 開新未同步視窗
+zen-new-unsynced-window-shortcut = 開新初始視窗

locales/zh-TW/browser/browser/zen-menubar.ftl

@@ -19,4 +19,4 @@ zen-menubar-appearance-light =
 zen-menubar-appearance-dark = 
     .label = 暗色
 zen-menubar-new-unsynced-window = 
-    .label = 新的初始視窗
+    .label = 開新初始視窗

locales/zh-TW/browser/browser/zen-workspaces.ftl

@@ -49,7 +49,7 @@ zen-panel-ui-gradient-click-to-add = 點擊新增顏色
 zen-workspace-creation-name = 
     .placeholder = 工作區名稱
 zen-move-tab-to-workspace-button = 
-    .label = 移動至……
+    .label = 移動至…
     .tooltiptext = 將此視窗所有頁面移至單一工作區
 zen-workspaces-panel-context-reorder = 
     .label = 排序工作區

prefs/zen/session-store.yaml

@@ -6,10 +6,7 @@
   value: true
 
 - name: zen.session-store.log
-  value: true
+  value: "@IS_TWILIGHT@"
 
 - name: zen.session-store.restore-unsynced-windows
   value: true
-
-- name: browser.sessionstore.max_windows_undo
-  value: 2

prefs/zen/workspaces.yaml

@@ -33,7 +33,7 @@
   value: true
 
 - name: zen.workspaces.dnd-switch-padding
-  value: 5
+  value: 4
 
 - name: zen.workspaces.debug
   value: "@cond"

prefs/zen/zen.yaml

@@ -30,7 +30,7 @@
   value: 20 # Percentage of folder height to trigger dragover
 
 - name: zen.tabs.dnd-switch-space-delay
-  value: 800 # milliseconds
+  value: 1000 # milliseconds
 
 - name: zen.ctrlTab.show-pending-tabs
   value: false

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

@@ -1193,11 +1193,6 @@ Preferences.addAll([
     type: "bool",
     default: false,
   },
-  {
-    id: "zen.tabs.select-recently-used-on-close",
-    type: "bool",
-    default: true,
-  },
 ]);
 
 Preferences.addSetting({

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

@@ -37,10 +37,15 @@
             class="description-deemphasized"
             data-l10n-id="zen-tabs-cycle-by-attribute-warning"
             hidden="true"/>
-      <checkbox data-l10n-id="zen-tabs-select-recently-used-on-close"
-            preference="zen.tabs.select-recently-used-on-close"/>
 </groupbox>
 
+<hbox id="zenTabsUnloadCategory"
+      class="subcategory"
+      hidden="true"
+      data-category="paneZenTabManagement">
+<html:h1 data-l10n-id="pane-zen-tabs-unloader-title"/>
+</hbox>
+
 <hbox id="zenPinnedTabsManagerCategory"
       class="subcategory"
       hidden="true"

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96faedf6f0b 100644
+index 2a055f0c5f34f0a2667f659185120c07d38f4e41..cd350d9e787c1ef0d1dffcb7d872b9c2e8fe19ff 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
 @@ -127,6 +127,9 @@ const TAB_EVENTS = [
@@ -54,15 +54,6 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96f
      let tabbrowser = aWindow.gBrowser;
  
      // add tab change listeners to all already existing tabs
-@@ -2076,7 +2085,7 @@ var SessionStoreInternal = {
-     let isTaskbarTab = this._windows[aWindow.__SSi].isTaskbarTab;
-     // A regular window is not a private window, taskbar tab window, or popup window
-     let isRegularWindow =
--      !isPrivateWindow && !isTaskbarTab && aWindow.toolbar.visible;
-+      !isPrivateWindow && !isTaskbarTab && aWindow.toolbar.visible && !this._windows[aWindow.__SSi].isZenUnsynced;
- 
-     // perform additional initialization when the first window is loading
-     if (lazy.RunState.isStopped) {
 @@ -2131,6 +2140,7 @@ var SessionStoreInternal = {
            null,
            "sessionstore-one-or-no-tab-restored"
@@ -104,56 +95,36 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96f
  
      TAB_EVENTS.forEach(function (aEvent) {
        tabbrowser.tabContainer.removeEventListener(aEvent, this, true);
-@@ -2434,7 +2452,7 @@ var SessionStoreInternal = {
+@@ -2491,7 +2509,7 @@ var SessionStoreInternal = {
- 
-       let isLastRegularWindow =
-         Object.values(this._windows).filter(
--          wData => !wData.isPrivate && !wData.isTaskbarTab
-+          wData => !wData.isPrivate && !wData.isTaskbarTab && !wData.isZenUnsynced
-         ).length == 1;
-       this._log.debug(
-         `onClose, closing window isLastRegularWindow? ${isLastRegularWindow}`
-@@ -2491,8 +2509,8 @@ var SessionStoreInternal = {
        // 2) Flush the window.
        // 3) When the flush is complete, revisit our decision to store the window
        //    in _closedWindows, and add/remove as necessary.
 -      if (!winData.isPrivate && !winData.isTaskbarTab) {
--        this.maybeSaveClosedWindow(winData, isLastWindow);
 +      if (!winData.isPrivate && !winData.isTaskbarTab && !winData.isZenUnsynced) {
-+        this.maybeSaveClosedWindow(winData, isLastWindow, isLastRegularWindow);
+         this.maybeSaveClosedWindow(winData, isLastWindow);
        }
  
-       completionPromise = lazy.TabStateFlusher.flushWindow(aWindow).then(() => {
+@@ -2512,7 +2530,8 @@ var SessionStoreInternal = {
-@@ -2512,8 +2530,9 @@ var SessionStoreInternal = {
  
          // Save non-private windows if they have at
          // least one saveable tab or are the last window.
 -        if (!winData.isPrivate && !winData.isTaskbarTab) {
--          this.maybeSaveClosedWindow(winData, isLastWindow);
 +        lazy.ZenWindowSync.on_WindowCloseAndBrowserFlushed(browsers);
 +        if (!winData.isPrivate && !winData.isTaskbarTab && !winData.isZenUnsynced) {
-+          this.maybeSaveClosedWindow(winData, isLastWindow, isLastRegularWindow);
+           this.maybeSaveClosedWindow(winData, isLastWindow);
  
            if (!isLastWindow && winData.closedId > -1) {
-             this._addClosedAction(
+@@ -2608,6 +2627,9 @@ var SessionStoreInternal = {
-@@ -2589,7 +2608,7 @@ var SessionStoreInternal = {
-    *        to call this method again asynchronously (for example, after
-    *        a window flush).
-    */
--  maybeSaveClosedWindow(winData, isLastWindow) {
-+  maybeSaveClosedWindow(winData, isLastWindow, isLastRegularWindow = false) {
-     // Make sure SessionStore is still running, and make sure that we
-     // haven't chosen to forget this window.
-     if (
-@@ -2606,6 +2625,7 @@ var SessionStoreInternal = {
-       // _closedWindows from a previous call to this function.
-       let winIndex = this._closedWindows.indexOf(winData);
        let alreadyStored = winIndex != -1;
-+      lazy.ZenSessionStore.maybeSaveClosedWindow(winData, isLastRegularWindow);
        // If sidebar command is truthy, i.e. sidebar is open, store sidebar settings
        let shouldStore = hasSaveableTabs || isLastWindow;
++      lazy.ZenSessionStore.maybeSaveClosedWindow(winData, isLastWindow);
++      // TODO: Do we want to store closed Zen windows? All of them are synced anyways
++      shouldStore = false;
  
-@@ -3408,7 +3428,7 @@ var SessionStoreInternal = {
+       if (shouldStore && !alreadyStored) {
+         let index = this._closedWindows.findIndex(win => {
+@@ -3408,7 +3430,7 @@ var SessionStoreInternal = {
      if (!isPrivateWindow && tabState.isPrivate) {
        return;
      }
@@ -162,7 +133,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96f
        return;
      }
  
-@@ -4129,6 +4149,12 @@ var SessionStoreInternal = {
+@@ -4129,6 +4151,12 @@ var SessionStoreInternal = {
          Math.min(tabState.index, tabState.entries.length)
        );
        tabState.pinned = false;
@@ -175,7 +146,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96f
  
        if (inBackground === false) {
          aWindow.gBrowser.selectedTab = newTab;
-@@ -4565,6 +4591,8 @@ var SessionStoreInternal = {
+@@ -4565,6 +4593,8 @@ var SessionStoreInternal = {
        // Append the tab if we're opening into a different window,
        tabIndex: aSource == aTargetWindow ? pos : Infinity,
        pinned: state.pinned,
@@ -184,7 +155,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96f
        userContextId: state.userContextId,
        skipLoad: true,
        preferredRemoteType,
-@@ -5414,7 +5442,7 @@ var SessionStoreInternal = {
+@@ -5414,7 +5444,7 @@ var SessionStoreInternal = {
  
      for (let i = tabbrowser.pinnedTabCount; i < tabbrowser.tabs.length; i++) {
        let tab = tabbrowser.tabs[i];
@@ -193,7 +164,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96f
          removableTabs.push(tab);
        }
      }
-@@ -5525,7 +5553,7 @@ var SessionStoreInternal = {
+@@ -5525,7 +5555,7 @@ var SessionStoreInternal = {
  
      // collect the data for all windows
      for (ix in this._windows) {
@@ -202,7 +173,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96f
          // window data is still in _statesToRestore
          continue;
        }
-@@ -5668,11 +5696,12 @@ var SessionStoreInternal = {
+@@ -5668,11 +5698,12 @@ var SessionStoreInternal = {
      }
  
      let tabbrowser = aWindow.gBrowser;
@@ -216,7 +187,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96f
      // update the internal state data for this window
      for (let tab of tabs) {
        if (tab == aWindow.FirefoxViewHandler.tab) {
-@@ -5683,6 +5712,9 @@ var SessionStoreInternal = {
+@@ -5683,6 +5714,9 @@ var SessionStoreInternal = {
        tabsData.push(tabData);
      }
  
@@ -226,7 +197,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96f
      // update tab group state for this window
      winData.groups = [];
      for (let tabGroup of aWindow.gBrowser.tabGroups) {
-@@ -5695,7 +5727,7 @@ var SessionStoreInternal = {
+@@ -5695,7 +5729,7 @@ var SessionStoreInternal = {
      // a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
      // since it's only inserted into the tab strip after it's selected).
      if (aWindow.FirefoxViewHandler.tab?.selected) {
@@ -235,7 +206,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96f
        winData.title = tabbrowser.tabs[0].label;
      }
      winData.selected = selectedIndex;
-@@ -5810,8 +5842,8 @@ var SessionStoreInternal = {
+@@ -5810,8 +5844,8 @@ var SessionStoreInternal = {
      // selectTab represents.
      let selectTab = 0;
      if (overwriteTabs) {
@@ -246,7 +217,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96f
        selectTab = Math.min(selectTab, winData.tabs.length);
      }
  
-@@ -5833,6 +5865,7 @@ var SessionStoreInternal = {
+@@ -5833,6 +5867,7 @@ var SessionStoreInternal = {
      if (overwriteTabs) {
        for (let i = tabbrowser.browsers.length - 1; i >= 0; i--) {
          if (!tabbrowser.tabs[i].selected) {
@@ -254,7 +225,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96f
            tabbrowser.removeTab(tabbrowser.tabs[i]);
          }
        }
-@@ -5866,6 +5899,12 @@ var SessionStoreInternal = {
+@@ -5866,6 +5901,12 @@ var SessionStoreInternal = {
          savedTabGroup => !openTabGroupIdsInWindow.has(savedTabGroup.id)
        );
      }
@@ -267,7 +238,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96f
  
      // Move the originally open tabs to the end.
      if (initialTabs) {
-@@ -6419,6 +6458,25 @@ var SessionStoreInternal = {
+@@ -6419,6 +6460,25 @@ var SessionStoreInternal = {
  
      // Most of tabData has been restored, now continue with restoring
      // attributes that may trigger external events.
@@ -293,17 +264,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96f
  
      if (tabData.pinned) {
        tabbrowser.pinTab(tab);
-@@ -6567,6 +6625,9 @@ var SessionStoreInternal = {
+@@ -7343,7 +7403,7 @@ var SessionStoreInternal = {
-         aWindow.gURLBar.readOnly = false;
-       }
-     }
-+    if (aWinData.isZenUnsynced) {
-+      this._windows[aWindow.__SSi].isZenUnsynced = true;
-+    }
- 
-     let promiseParts = Promise.withResolvers();
-     aWindow.setTimeout(() => {
-@@ -7343,7 +7404,7 @@ var SessionStoreInternal = {
  
        let groupsToSave = new Map();
        for (let tIndex = 0; tIndex < window.tabs.length; ) {
@@ -312,7 +273,7 @@ index 2a055f0c5f34f0a2667f659185120c07d38f4e41..2f63071f78782dbc30bde25b3bcaa96f
            // Adjust window.selected
            if (tIndex + 1 < window.selected) {
              window.selected -= 1;
-@@ -7358,7 +7419,7 @@ var SessionStoreInternal = {
+@@ -7358,7 +7418,7 @@ var SessionStoreInternal = {
            );
            // We don't want to increment tIndex here.
            continue;

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689b5f65e94 100644
+index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..9c1fa86151f3d5896c45fef31a1417570d4f1266 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -398,6 +398,7 @@
@@ -384,15 +384,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        );
      }
  
-@@ -3599,6 +3720,7 @@
+@@ -3746,6 +3867,7 @@
-         color: group.color,
-         insertBefore: newTabs[0],
-         isAdoptingGroup: true,
-+        forSplitView: group.hasAttribute('split-view-group'),
-       });
-     }
- 
-@@ -3746,6 +3868,7 @@
          openWindowInfo,
          skipLoad,
          triggeringRemoteType,
@@ -400,7 +392,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        }
      ) {
        // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -3815,6 +3938,7 @@
+@@ -3815,6 +3937,7 @@
            openWindowInfo,
            name,
            skipLoad,
@@ -408,7 +400,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
          });
        }
  
-@@ -4003,7 +4127,7 @@
+@@ -4003,7 +4126,7 @@
          // Add a new tab if needed.
          if (!tab) {
            let createLazyBrowser =
@@ -417,7 +409,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
  
            let url = "about:blank";
            if (tabData.entries?.length) {
-@@ -4040,8 +4164,10 @@
+@@ -4040,8 +4163,10 @@
              insertTab: false,
              skipLoad: true,
              preferredRemoteType,
@@ -429,7 +421,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
            if (select) {
              tabToSelect = tab;
            }
-@@ -4053,7 +4179,8 @@
+@@ -4053,7 +4178,8 @@
            this.pinTab(tab);
            // Then ensure all the tab open/pinning information is sent.
            this._fireTabOpen(tab, {});
@@ -439,7 +431,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
            let { groupId } = tabData;
            const tabGroup = tabGroupWorkingData.get(groupId);
            // if a tab refers to a tab group we don't know, skip any group
-@@ -4067,7 +4194,10 @@
+@@ -4067,7 +4193,10 @@
                  tabGroup.stateData.id,
                  tabGroup.stateData.color,
                  tabGroup.stateData.collapsed,
@@ -451,7 +443,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
                );
                tabsFragment.appendChild(tabGroup.node);
              }
-@@ -4112,9 +4242,23 @@
+@@ -4112,9 +4241,23 @@
        // to remove the old selected tab.
        if (tabToSelect) {
          let leftoverTab = this.selectedTab;
@@ -475,7 +467,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
  
        if (tabs.length > 1 || !tabs[0].selected) {
          this._updateTabsAfterInsert();
-@@ -4305,11 +4449,14 @@
+@@ -4305,11 +4448,14 @@
        if (ownerTab) {
          tab.owner = ownerTab;
        }
@@ -491,7 +483,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -4321,7 +4468,7 @@
+@@ -4321,7 +4467,7 @@
            let lastRelatedTab =
              openerTab && this._lastRelatedTabMap.get(openerTab);
            let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -500,7 +492,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
              tabGroup = previousTab.group;
            }
            if (
-@@ -4337,7 +4484,7 @@
+@@ -4337,7 +4483,7 @@
                  previousTab.splitview
                ) + 1;
            } else if (previousTab.visible) {
@@ -509,7 +501,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
            } else if (previousTab == FirefoxViewHandler.tab) {
              elementIndex = 0;
            }
-@@ -4365,14 +4512,14 @@
+@@ -4365,14 +4511,14 @@
        }
        // Ensure index is within bounds.
        if (tab.pinned) {
@@ -528,7 +520,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
  
        if (pinned && !itemAfter?.pinned) {
          itemAfter = null;
-@@ -4385,7 +4532,7 @@
+@@ -4385,7 +4531,7 @@
  
        this.tabContainer._invalidateCachedTabs();
  
@@ -537,7 +529,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
          if (
            (this.isTab(itemAfter) && itemAfter.group == tabGroup) ||
            this.isSplitViewWrapper(itemAfter)
-@@ -4416,7 +4563,11 @@
+@@ -4416,7 +4562,11 @@
          const tabContainer = pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
@@ -549,7 +541,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        }
  
        if (tab.group?.collapsed) {
-@@ -4431,6 +4582,7 @@
+@@ -4431,6 +4581,7 @@
        if (pinned) {
          this._updateTabBarForPinnedTabs();
        }
@@ -557,7 +549,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
  
        TabBarVisibility.update();
      }
-@@ -4983,6 +5135,7 @@
+@@ -4983,6 +5134,7 @@
          telemetrySource,
        } = {}
      ) {
@@ -565,7 +557,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
        // can be considered equivalent to closing the window.
        if (
-@@ -5072,6 +5225,7 @@
+@@ -5072,6 +5224,7 @@
          if (lastToClose) {
            this.removeTab(lastToClose, aParams);
          }
@@ -573,7 +565,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        } catch (e) {
          console.error(e);
        }
-@@ -5110,6 +5264,12 @@
+@@ -5110,6 +5263,12 @@
          aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
        }
  
@@ -586,7 +578,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -5124,6 +5284,9 @@
+@@ -5124,6 +5283,9 @@
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
        let isLastTab = this.#isLastTabInWindow(aTab);
@@ -596,7 +588,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -5172,7 +5335,13 @@
+@@ -5172,7 +5334,13 @@
          // We're not animating, so we can cancel the animation stopwatch.
          Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
          aTab._closeTimeAnimTimerId = null;
@@ -611,7 +603,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
          return;
        }
  
-@@ -5306,7 +5475,7 @@
+@@ -5306,7 +5474,7 @@
            closeWindowWithLastTab != null
              ? closeWindowWithLastTab
              : !window.toolbar.visible ||
@@ -620,7 +612,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5330,6 +5499,7 @@
+@@ -5330,6 +5498,7 @@
  
          newTab = true;
        }
@@ -628,7 +620,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -5370,13 +5540,7 @@
+@@ -5370,13 +5539,7 @@
        aTab._mouseleave();
  
        if (newTab) {
@@ -643,7 +635,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        } else {
          TabBarVisibility.update();
        }
-@@ -5509,6 +5673,7 @@
+@@ -5509,6 +5672,7 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -651,7 +643,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        if (!this._windowIsClosing) {
          // update tab close buttons state
          this.tabContainer._updateCloseButtons();
-@@ -5732,6 +5897,7 @@
+@@ -5732,6 +5896,7 @@
        }
  
        let excludeTabs = new Set(aExcludeTabs);
@@ -659,7 +651,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
  
        // If this tab has a successor, it should be selectable, since
        // hiding or closing a tab removes that tab as a successor.
-@@ -5744,15 +5910,22 @@
+@@ -5744,15 +5909,22 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -684,7 +676,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        let tab = this.tabContainer.findNextTab(aTab, {
          direction: 1,
          filter: _tab => remainingTabs.includes(_tab),
-@@ -5766,7 +5939,7 @@
+@@ -5766,7 +5938,7 @@
        }
  
        if (tab) {
@@ -693,7 +685,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -5787,7 +5960,7 @@
+@@ -5787,7 +5959,7 @@
          });
        }
  
@@ -702,7 +694,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
      }
  
      _blurTab(aTab) {
-@@ -5798,7 +5971,7 @@
+@@ -5798,7 +5970,7 @@
       * @returns {boolean}
       *   False if swapping isn't permitted, true otherwise.
       */
@@ -711,7 +703,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        // Do not allow transfering a private tab to a non-private window
        // and vice versa.
        if (
-@@ -5852,6 +6025,7 @@
+@@ -5852,6 +6024,7 @@
        // fire the beforeunload event in the process.  Close the other
        // window if this was its last tab.
        if (
@@ -719,7 +711,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
          !remoteBrowser._beginRemoveTab(aOtherTab, {
            adoptedByTab: aOurTab,
            closeWindowWithLastTab: true,
-@@ -5863,7 +6037,7 @@
+@@ -5863,7 +6036,7 @@
        // If this is the last tab of the window, hide the window
        // immediately without animation before the docshell swap, to avoid
        // about:blank being painted.
@@ -728,7 +720,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        if (closeWindow) {
          let win = aOtherTab.ownerGlobal;
          win.windowUtils.suppressAnimation(true);
-@@ -5987,11 +6161,13 @@
+@@ -5987,11 +6160,13 @@
        }
  
        // Finish tearing down the tab that's going away.
@@ -742,7 +734,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
  
        this.setTabTitle(aOurTab);
  
-@@ -6193,10 +6369,10 @@
+@@ -6193,10 +6368,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -755,7 +747,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -6254,7 +6430,8 @@
+@@ -6254,7 +6429,8 @@
       *
       * @param {MozTabbrowserTab|MozTabbrowserTabGroup|MozTabbrowserTabGroup.labelElement} aTab
       */
@@ -765,7 +757,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        if (this.tabs.length == 1) {
          return null;
        }
-@@ -6278,12 +6455,14 @@
+@@ -6278,12 +6454,14 @@
        }
  
        // tell a new window to take the "dropped" tab
@@ -781,7 +773,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
      }
  
      /**
-@@ -6388,7 +6567,7 @@
+@@ -6388,7 +6566,7 @@
       *   `true` if element is a `<tab-group>`
       */
      isTabGroup(element) {
@@ -790,7 +782,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
      }
  
      /**
-@@ -6473,8 +6652,8 @@
+@@ -6473,8 +6651,8 @@
        }
  
        // Don't allow mixing pinned and unpinned tabs.
@@ -801,7 +793,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        } else {
          tabIndex = Math.max(tabIndex, this.pinnedTabCount);
        }
-@@ -6500,10 +6679,16 @@
+@@ -6500,10 +6678,16 @@
        this.#handleTabMove(
          element,
          () => {
@@ -820,7 +812,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
            if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
              neighbor.after(element);
            } else {
-@@ -6561,23 +6746,31 @@
+@@ -6561,23 +6745,31 @@
      #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
        if (this.isTabGroupLabel(targetElement)) {
          targetElement = targetElement.group;
@@ -858,7 +850,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        } else if (!element.pinned && targetElement && targetElement.pinned) {
          // If the caller asks to move an unpinned element next to a pinned
          // tab, move the unpinned element to be the first unpinned element
-@@ -6590,14 +6783,34 @@
+@@ -6590,14 +6782,34 @@
          //    move the tab group right before the first unpinned tab.
          // 4. Moving a tab group and the first unpinned tab is grouped:
          //    move the tab group right before the first unpinned tab's tab group.
@@ -894,7 +886,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
          element.pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
-@@ -6606,7 +6819,7 @@
+@@ -6606,7 +6818,7 @@
          element,
          () => {
            if (moveBefore) {
@@ -903,7 +895,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
            } else if (targetElement) {
              targetElement.after(element);
            } else {
-@@ -6676,10 +6889,10 @@
+@@ -6676,10 +6888,10 @@
       * @param {TabMetricsContext} [metricsContext]
       */
      moveTabToExistingGroup(aTab, aGroup, metricsContext) {
@@ -916,7 +908,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
          return;
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -6751,6 +6964,7 @@
+@@ -6751,6 +6963,7 @@
  
        let state = {
          tabIndex: tab._tPos,
@@ -924,7 +916,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        };
        if (tab.visible) {
          state.elementIndex = tab.elementIndex;
-@@ -6777,7 +6991,7 @@
+@@ -6777,7 +6990,7 @@
        let changedTabGroup =
          previousTabState.tabGroupId != currentTabState.tabGroupId;
  
@@ -933,7 +925,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
          tab.dispatchEvent(
            new CustomEvent("TabMove", {
              bubbles: true,
-@@ -6818,6 +7032,10 @@
+@@ -6818,6 +7031,10 @@
  
        moveActionCallback();
  
@@ -944,11 +936,11 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -6869,6 +7087,19 @@
+@@ -6869,6 +7086,19 @@
       *    The new tab in the current window, null if the tab couldn't be adopted.
       */
      adoptTab(aTab, { elementIndex, tabIndex, selectTab = false } = {}) {
-+      if (window.gZenWorkspaces.currentWindowIsSyncing && aTab.ownerGlobal.gZenWorkspaces?.currentWindowIsSyncing) {
++      if (window.gZenWorkspaces.currentWindowIsSyncing === aTab.ownerGlobal.gZenWorkspaces.currentWindowIsSyncing) {
 +        const tabId = aTab.id;
 +        const thisTab = window.gZenWindowSync.getItemFromWindow(window, tabId);
 +        if (thisTab) {
@@ -964,7 +956,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        // Swap the dropped tab with a new one we create and then close
        // it in the other window (making it seem to have moved between
        // windows). We also ensure that the tab we create to swap into has
-@@ -6910,6 +7141,8 @@
+@@ -6910,6 +7140,8 @@
          params.userContextId = aTab.getAttribute("usercontextid");
        }
        let newTab = this.addWebTab("about:blank", params);
@@ -973,7 +965,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
        let newBrowser = this.getBrowserForTab(newTab);
  
        aTab.container.tabDragAndDrop.finishAnimateTabMove();
-@@ -7718,7 +7951,7 @@
+@@ -7718,7 +7950,7 @@
              // preventDefault(). It will still raise the window if appropriate.
              break;
            }
@@ -982,7 +974,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
            window.focus();
            aEvent.preventDefault();
            break;
-@@ -7735,7 +7968,6 @@
+@@ -7735,7 +7967,6 @@
          }
          case "TabGroupCollapse":
            aEvent.target.tabs.forEach(tab => {
@@ -990,7 +982,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
            });
            break;
          case "TabGroupCreateByUser":
-@@ -7895,7 +8127,9 @@
+@@ -7895,7 +8126,9 @@
  
          let filter = this._tabFilters.get(tab);
          if (filter) {
@@ -1000,7 +992,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
  
            let listener = this._tabListeners.get(tab);
            if (listener) {
-@@ -8698,6 +8932,7 @@
+@@ -8698,6 +8931,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -1008,7 +1000,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
            }
-@@ -8778,6 +9013,7 @@
+@@ -8778,6 +9012,7 @@
          // known defaults. Note we use the original URL since about:newtab
          // redirects to a prerendered page.
          const shouldRemoveFavicon =
@@ -1016,7 +1008,7 @@ index 0eaca7a58e0026237b71b2ad515efe84d9e8c779..2ab8633d0378e5a25cf75c50b29d4689
            !this.mBrowser.mIconURL &&
            !ignoreBlank &&
            !(originalLocation.spec in FAVICON_DEFAULTS);
-@@ -9803,7 +10039,7 @@ var TabContextMenu = {
+@@ -9803,7 +10038,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !this.multiselected;

src/browser/themes/shared/tabbrowser/content-area-css.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/themes/shared/tabbrowser/content-area.css b/browser/themes/shared/tabbrowser/content-area.css
-index b00139d7af878326ff303c08d5ddd47501b8c7db..7361a5e98d6ea372f6fdc583d90044d276cfb81b 100644
+index b00139d7af878326ff303c08d5ddd47501b8c7db..52bad3e978004f3322f3d504cbd663e7b620b69f 100644
 --- a/browser/themes/shared/tabbrowser/content-area.css
 +++ b/browser/themes/shared/tabbrowser/content-area.css
 @@ -90,7 +90,6 @@
@@ -32,7 +32,7 @@ index b00139d7af878326ff303c08d5ddd47501b8c7db..7361a5e98d6ea372f6fdc583d90044d2
  .dialogOverlay[topmost="true"],
  #window-modal-dialog::backdrop {
 -  background-color: var(--dialog-backdrop-color);
-+  background-color: light-dark(rgba(255, 255, 255, .3), rgba(0, 0, 0, .3));
++  background-color: light-dark(rgba(255, 255, 255, .2), rgba(0, 0, 0, .2));
  }
  
  .dialogOverlay[hideContent="true"][topmost="true"] {

src/zen/common/modules/ZenMenubar.mjs

@@ -24,7 +24,6 @@ export class nsZenMenuBar {
     this.#initViewMenu();
     this.#initSpacesMenu();
     this.#initAppMenu();
-    this.#hideWindowRestoreMenus();
   }
 
   #initViewMenu() {
@@ -122,15 +121,4 @@ export class nsZenMenuBar {
                 command="cmd_zenNewNavigatorUnsynced"/>`)
     );
   }
-
-  #hideWindowRestoreMenus() {
-    if (!Services.prefs.getBoolPref("zen.window-sync.enabled", true)) {
-      return;
-    }
-    const itemsToHide = ["appMenuRecentlyClosedWindows", "historyUndoWindowMenu"];
-    for (const id of itemsToHide) {
-      const element = PanelMultiView.getViewNode(document, id);
-      element.setAttribute("hidden", "true");
-    }
-  }
 }

src/zen/common/modules/ZenUIManager.mjs

@@ -1362,7 +1362,7 @@ window.gZenVerticalTabsManager = {
         // Check if name is blank, reset if so
         // Always remove, so we can always rename and if it's empty,
         // it will reset to the original name anyway
-        if (hasChanged || (this._tabEdited.zenStaticLabel && newName)) {
+        if (hasChanged) {
           this._tabEdited.zenStaticLabel = newName;
           gBrowser._setTabLabel(this._tabEdited, newName);
           gZenUIManager.showToast("zen-tabs-renamed");

src/zen/common/styles/zen-browser-container.css

@@ -61,9 +61,6 @@
 
 .zen-pseudo-browser-image {
   position: absolute;
-  transform: scale(1);
-  width: 100%;
-  height: 100%;
   inset: 0;
   opacity: 0.4;
   pointer-events: none;

src/zen/common/styles/zen-theme.css

@@ -142,7 +142,7 @@
 
   --zen-toolbar-element-bg: light-dark(
     color-mix(in oklch, var(--toolbox-textcolor) 10%, transparent),
-    color-mix(in oklch, var(--toolbox-textcolor) 15%, transparent)
+    color-mix(in oklch, var(--toolbox-textcolor) 12.5%, transparent)
   );
 
   --zen-toolbar-element-bg-hover: light-dark(

src/zen/compact-mode/ZenCompactMode.mjs

@@ -743,10 +743,6 @@ window.gZenCompactModeManager = {
             return;
           }
 
-          if (this._isTabBeingDragged) {
-            return;
-          }
-
           if (this.hoverableElements[i].keepHoverDuration) {
             this.flashElement(
               target,

src/zen/compact-mode/sidebar.inc.css

@@ -12,7 +12,6 @@
   #zen-dragover-background {
     width: calc(100% - var(--zen-toolbox-padding) * 2 - 5px);
     left: unset;
-    transform: translateY(-4px);
   }
 
   #zen-tabbox-wrapper {

src/zen/drag-and-drop/ZenDragAndDrop.js

@@ -39,7 +39,6 @@
       !element ||
       element.closest(".zen-current-workspace-indicator") ||
       element.hasAttribute("split-view-group") ||
-      element.classList.contains("zen-drop-target") ||
       isEssentialsPromo(element)
     ) {
       return element;
@@ -53,9 +52,6 @@
     if (isTabGroupLabel(element)) {
       return element.closest(".tab-group-label-container");
     }
-    if (gBrowser.isTabGroup(element)) {
-      return element.labelContainerElement;
-    }
     throw new Error(`Element "${element.tagName}" is not expected to move`);
   };
 
@@ -105,7 +101,7 @@
 
     startTabDrag(event, tab, ...args) {
       this.ZenDragAndDropService.onDragStart(1);
-      gZenCompactModeManager._isTabBeingDragged = true;
+
       super.startTabDrag(event, tab, ...args);
       const dt = event.dataTransfer;
       if (isTabGroupLabel(tab)) {
@@ -115,9 +111,11 @@
       const { offsetX, offsetY } = this.#getDragImageOffset(event, tab, draggingTabs);
       const dragImage = this.#createDragImageForTabs(draggingTabs);
       this.originalDragImageArgs = [dragImage, offsetX, offsetY];
-      dt.setDragImage(...this.originalDragImageArgs);
+      dt.updateDragImage(...this.originalDragImageArgs);
       if (tab.hasAttribute("zen-essential")) {
-        tab.style.visibility = "hidden";
+        setTimeout(() => {
+          tab.style.visibility = "hidden";
+        }, 0);
       }
     }
 
@@ -127,28 +125,18 @@
       );
       const tabRect = window.windowUtils.getBoundsWithoutFlushing(movingTabs[0]);
       const wrapper = document.createElement("div");
-      let movingTabsCount = Math.min(movingTabs.length, 3);
       wrapper.style.width = tabRect.width + "px";
-      wrapper.style.height = tabRect.height * movingTabsCount + "px";
+      wrapper.style.height = tabRect.height * movingTabs.length + "px";
       wrapper.style.position = "fixed";
       wrapper.style.top = "-9999px";
       periphery.appendChild(wrapper);
-      for (let i = 0; i < movingTabsCount; i++) {
+      for (let i = 0; i < movingTabs.length; i++) {
         const tab = movingTabs[i];
         const tabClone = tab.cloneNode(true);
         if (tab.hasAttribute("zen-essential")) {
           const rect = tab.getBoundingClientRect();
           tabClone.style.minWidth = tabClone.style.maxWidth = `${rect.width}px`;
           tabClone.style.minHeight = tabClone.style.maxHeight = `${rect.height}px`;
-          if (tabClone.hasAttribute("visuallyselected")) {
-            tabClone.style.transform = "translate(-50%, -50%)";
-          }
-        } else if (AppConstants.platform !== "macosx") {
-          // On windows and linux, we still don't add some extra opaqueness
-          // for the tab to be more visible. This is a hacky workaround.
-          // TODO: Make windows and linux DnD use nsZenDragAndDrop::mDragImageOpacity
-          tabClone.style.colorScheme = "light";
-          tabClone.style.color = "black";
         }
         if (i > 0) {
           tabClone.style.transform = `translate(${i * 4}px, -${i * (tabRect.height - 4)}px)`;
@@ -162,13 +150,6 @@
           const label = tabClone.textLabel;
           const tabLabelParentWidth = label.parentElement.getBoundingClientRect().width;
           label.textContent = label.textContent.slice(0, Math.floor(tabLabelParentWidth / 6));
-        } else if (gBrowser.isTabGroup(tabClone) && tabClone.hasAttribute("split-view-group")) {
-          let tabs = tab.tabs;
-          for (let j = 0; j < tabs.length; j++) {
-            const tabInGroup = tabs[j];
-            const tabInGroupClone = tabInGroup.cloneNode(true);
-            tabClone.appendChild(tabInGroupClone);
-          }
         }
       }
       this.#maybeCreateDragImageDot(movingTabs, wrapper);
@@ -216,7 +197,12 @@
         ? dragData.screenY
         : dragData.screenX;
       let allTabs = this._tabbrowserTabs.ariaFocusableItems;
-      let tabs = allTabs;
+      let numEssentials = gBrowser._numZenEssentials;
+      let isEssential = draggedTab.hasAttribute("zen-essential");
+      let tabs = allTabs.slice(
+        isEssential ? 0 : numEssentials,
+        isEssential ? numEssentials : undefined
+      );
       if (!tabs.length) {
         tabs = [...movingTabs];
       }
@@ -249,9 +235,7 @@
       dragData.translateY = translateY;
 
       // Move the dragged tab based on the mouse position.
-      let periphery = gZenWorkspaces.activeWorkspaceElement.querySelector(
+      let periphery = document.getElementById("tabbrowser-arrowscrollbox-periphery");
-        "#tabbrowser-arrowscrollbox-periphery"
-      );
       let lastMovingTab = movingTabs.at(-1);
       let firstMovingTab = movingTabs[0];
       let endEdge = (ele) => ele[screenAxis] + bounds(ele)[size];
@@ -468,7 +452,9 @@
         // 4) we just started dragging and the `oldDropElementIndex` has its default
         //    valuë of `movingTabs[0].elementIndex`. In this case, the drop element
         //    shouldn't be a moving tab, so keep it `undefined`.
-        let lastPossibleDropElement = this._rtlMode ? tabs.find((t) => t != draggedTab) : undefined;
+        let lastPossibleDropElement = this._rtlMode
+          ? tabs.find((t) => t != draggedTab)
+          : tabs.findLast((t) => t != draggedTab);
         let maxElementIndexForDropElement = lastPossibleDropElement?.elementIndex;
         if (Number.isInteger(maxElementIndexForDropElement)) {
           let index = Math.min(oldDropElementIndex, maxElementIndexForDropElement);
@@ -535,7 +521,7 @@
 
       [dropBefore, dropElement] = this.#applyDragoverIndicator(
         event,
-        dropElement,
+        tabs,
         movingTabs,
         draggedTab
       ) ?? [dropBefore, dropElement];
@@ -622,30 +608,12 @@
         if (!this.#changeSpaceTimer) {
           this.#changeSpaceTimer = setTimeout(() => {
             this.clearDragOverVisuals();
-            gZenWorkspaces
+            dt.updateDragImage(...this.originalDragImageArgs);
-              .changeWorkspaceShortcut(isNearLeftEdge ? -1 : 1, false, /* Disable wrapping */ true)
+            gZenWorkspaces.changeWorkspaceShortcut(
-              .then((spaceChanged) => {
+              isNearLeftEdge ? -1 : 1,
-                if (AppConstants.platform !== "macosx") {
+              false,
-                  // See the hack in #createDragImageForTabs for more details which
+              /* Disable wrapping */ true
-                  // explains why we need to do this on non-macOS platforms.
+            );
-                  return;
-                }
-                let tabs = this.originalDragImageArgs[0].children;
-                const { isDarkMode, isExplicitMode } =
-                  gZenThemePicker.getGradientForWorkspace(spaceChanged);
-                for (let tab of tabs) {
-                  if (isExplicitMode) {
-                    tab.style.colorScheme = isDarkMode ? "dark" : "light";
-                  } else {
-                    tab.style.colorScheme = "";
-                  }
-                }
-                requestAnimationFrame(() => {
-                  requestAnimationFrame(() => {
-                    dt.updateDragImage(...this.originalDragImageArgs);
-                  });
-                });
-              });
             this.#changeSpaceTimer = null;
           }, this._dndSwitchSpaceDelay);
         }
@@ -710,7 +678,6 @@
 
     handle_drop(event) {
       this.clearSpaceSwitchTimer();
-      gZenFolders.highlightGroupOnDragOver(null);
       super.handle_drop(event);
       this.#maybeClearVerticalPinnedGridDragOver();
       const dt = event.dataTransfer;
@@ -738,10 +705,7 @@
       if (isTabGroupLabel(dropElement)) {
         dropElement = dropElement.group;
       }
-      if (
+      if (isTabGroupLabel(draggedTab)) {
-        isTabGroupLabel(draggedTab) ||
-        (isTab(draggedTab) && draggedTab.group?.hasAttribute("split-view-group"))
-      ) {
         draggedTab = draggedTab.group;
       }
       for (let item of this._tabbrowserTabs.ariaFocusableItems) {
@@ -853,9 +817,6 @@
       if (currentEssenialContainer?.essentialsPromo) {
         currentEssenialContainer.essentialsPromo.remove();
       }
-      // We also call it here to ensure we clear any highlight if the drop happened
-      // outside of a valid drop target.
-      gZenFolders.highlightGroupOnDragOver(null);
       this.ZenDragAndDropService.onDragEnd();
       super.handle_dragend(event);
       this.#removeDragOverBackground();
@@ -872,10 +833,6 @@
         this._tempDragImageParent.remove();
         delete this._tempDragImageParent;
       }
-      delete gZenCompactModeManager._isTabBeingDragged;
-      if (dt.dropEffect !== "move") {
-        gZenCompactModeManager._clearAllHoverStates();
-      }
     }
 
     #applyDragOverBackground(element) {
@@ -915,26 +872,35 @@
     }
 
     // eslint-disable-next-line complexity
-    #applyDragoverIndicator(event, dropElement, movingTabs, draggedTab) {
+    #applyDragoverIndicator(event, tabs, movingTabs, draggedTab) {
       const separation = 4;
-      const dropZoneSelector = ":is(.zen-drop-target)";
+      const dropZoneSelector =
+        ":is(.tabbrowser-tab, .zen-drop-target, .tab-group-label, tab-group[split-view-group])";
       let shouldPlayHapticFeedback = false;
       let showIndicatorUnderNewTabButton = false;
       let dropBefore = false;
-      let dropElementFromEvent = event.target.closest(dropZoneSelector);
+      let dropElement = event.target.closest(dropZoneSelector);
-      dropElement = dropElementFromEvent || dropElement;
+      if (!dropElement) {
-      if (!dropElementFromEvent) {
+        if (event.target.classList.contains("zen-workspace-empty-space")) {
-        let hoveringPeriphery = !!event.target.closest("#tabbrowser-arrowscrollbox-periphery");
+          dropElement = this._tabbrowserTabs.ariaFocusableItems.at(-1);
-        if (event.target.classList.contains("zen-workspace-empty-space") || hoveringPeriphery) {
-          let lastTab = gBrowser.tabs.at(-1);
-          dropElement =
-            (hoveringPeriphery
-              ? this._tabbrowserTabs.ariaFocusableItems.at(
-                  gBrowser._numVisiblePinTabsWithoutCollapsed
-                )
-              : this._tabbrowserTabs.ariaFocusableItems.at(-1)) || lastTab;
           // Only if there are no normal tabs to drop after
-          showIndicatorUnderNewTabButton = lastTab.hasAttribute("zen-empty-tab");
+          showIndicatorUnderNewTabButton =
+            gBrowser.tabs[gBrowser.tabs.length - 1].hasAttribute("zen-empty-tab");
+        } else {
+          const numEssentials = gBrowser._numZenEssentials;
+          const numPinned = gBrowser.pinnedTabCount - numEssentials;
+          const tabToUse =
+            event.target.closest(dropZoneSelector) || draggedTab._dragData?.dropElement;
+          if (!tabToUse) {
+            return null;
+          }
+          const isPinned = tabToUse.pinned;
+          const relativeTabs = tabs.slice(
+            isPinned ? 0 : numPinned,
+            isPinned ? numPinned : undefined
+          );
+          const draggedTabRect = elementToMove(tabToUse).getBoundingClientRect();
+          dropElement = event.clientY > draggedTabRect.top ? relativeTabs.at(-1) : relativeTabs[0];
         }
       }
       dropElement = elementToMove(dropElement);
@@ -943,47 +909,24 @@
         shouldPlayHapticFeedback = this.#lastDropTarget !== null;
         this.#removeDragOverBackground();
       }
-      if (!dropElement) {
+      let isZenFolder = dropElement.parentElement?.isZenFolder;
-        let dragData = draggedTab._dragData;
-        dropElement = dragData.dropElement;
-        dropBefore = dragData.dropBefore;
-      }
-      if (!dropElement) {
-        this.clearDragOverVisuals();
-        return null;
-      }
-      if (dropElement.hasAttribute("zen-empty-tab") && dropElement.group) {
-        let secondTab = dropElement.group.tabs[1];
-        dropElement = secondTab || dropElement.group.labelContainerElement;
-        if (secondTab) {
-          dropBefore = true;
-        }
-      }
-      let possibleFolderElement = dropElement.parentElement;
-      let isZenFolder = possibleFolderElement?.isZenFolder;
       let canHightlightGroup =
-        gZenFolders.highlightGroupOnDragOver(possibleFolderElement, movingTabs) || !isZenFolder;
+        gZenFolders.highlightGroupOnDragOver(dropElement.parentElement, movingTabs) || !isZenFolder;
       let rect = window.windowUtils.getBoundsWithoutFlushing(dropElement);
       const overlapPercent = (event.clientY - rect.top) / rect.height;
       // We wan't to leave a small threshold (20% for example) so we can drag tabs below and above
       // a folder label without dragging into the folder.
       let threshold = Services.prefs.getIntPref("zen.tabs.folder-dragover-threshold-percent") / 100;
       let dropIntoFolder =
-        isZenFolder &&
+        isZenFolder && (overlapPercent < threshold || overlapPercent > 1 - threshold);
-        (overlapPercent < threshold ||
-          (overlapPercent > 1 - threshold &&
-            (possibleFolderElement.collapsed ||
-              possibleFolderElement.childGroupsAndTabs.length < 2)));
       if (
         isTabGroupLabel(draggedTab) &&
         draggedTab.group?.isZenFolder &&
-        (((isTab(dropElement) || dropElement.hasAttribute("split-view-group")) &&
+        (isTab(dropElement) || dropElement.hasAttribute("split-view-group")) &&
-          (!dropElement.pinned || dropElement.hasAttribute("zen-essential"))) ||
+        (!dropElement.pinned || dropElement.hasAttribute("zen-essential"))
-          showIndicatorUnderNewTabButton)
       ) {
-        dropElement = null;
         this.clearDragOverVisuals();
-        return [dropElement, dropBefore];
+        return null;
       }
       if (
         isTab(dropElement) ||
@@ -998,7 +941,7 @@
         let top = 0;
         threshold =
           Services.prefs.getIntPref("browser.tabs.dragDrop.moveOverThresholdPercent") / 100;
-        if (overlapPercent > threshold || showIndicatorUnderNewTabButton) {
+        if (overlapPercent > threshold) {
           top = Math.round(rect.top + rect.height) + "px";
           dropBefore = false;
         } else {

src/zen/folders/ZenFolders.mjs

@@ -1134,10 +1134,11 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
    * @param {MozTabbrowserTabGroup|undefined|null} folder The folder to highlight, or null to clear highlight.
    * @param {Array<MozTabbrowserTab>|null} movingTabs The tabs being moved.
    */
-  highlightGroupOnDragOver(folder, movingTabs = null) {
+  highlightGroupOnDragOver(folder, movingTabs) {
     if (folder === this.#lastHighlightedGroup) {
       return true;
     }
+    const tab = movingTabs ? movingTabs[0] : null;
     if (this.#lastHighlightedGroup && this.#lastHighlightedGroup !== folder) {
       if (this.#lastHighlightedGroup.collapsed) {
         this.updateFolderIcon(this.#lastHighlightedGroup, "close");
@@ -1147,6 +1148,7 @@ class nsZenFolders extends nsZenDOMOperatedFeature {
     if (
       folder?.isZenFolder &&
       (!folder.hasAttribute("split-view-group") || !folder.hasAttribute("selected")) &&
+      folder !== tab?.group &&
       !(
         folder.level >= this.#ZEN_MAX_SUBFOLDERS &&
         movingTabs?.some((t) => gBrowser.isTabGroupLabel(t))

src/zen/folders/zen-folders.css

@@ -123,11 +123,11 @@ zen-folder {
         }
 
         &[state="open"] .back {
-          transform: skewX(16deg) translate(-4px, 2px) scale(0.85);
+          transform: skewX(16deg) translate(-2px, 3.4px) scale(0.85);
         }
 
         &[state="open"] :is(.front, .dots, .icon) {
-          transform: skewX(-16deg) translate(8px, 2px) scale(0.85);
+          transform: skewX(-16deg) translate(11.1px, 3.4px) scale(0.85);
         }
 
         & .icon {

src/zen/glance/ZenGlanceManager.mjs

@@ -640,6 +640,7 @@ class nsZenGlanceManager extends nsZenDOMOperatedFeature {
       left: [],
       width: [],
       height: [],
+      transform: [],
     };
 
     const steps = this.#ARC_CONFIG.ARC_STEPS;
@@ -673,6 +674,7 @@ class nsZenGlanceManager extends nsZenDOMOperatedFeature {
       const y =
         startPosition.y + distanceY * eased + arcDirection * arcHeight * (1 - (2 * eased - 1) ** 2);
 
+      sequence.transform.push(`translate(-50%, -50%)`);
       sequence.top.push(`${y}px`);
       sequence.left.push(`${x}px`);
       sequence.width.push(`${currentWidth}px`);

src/zen/kbs/ZenKeyboardShortcuts.mjs

@@ -506,10 +506,6 @@ class KeyShortcut {
     return this.#disabled;
   }
 
-  setDisabled(value) {
-    this.#disabled = value;
-  }
-
   isReserved() {
     return this.#reserved;
   }
@@ -800,10 +796,6 @@ class nsZenKeyboardShortcutsLoader {
         continue;
       }
       let parsed = KeyShortcut.parseFromXHTML(key, { group: "devTools" });
-      // Move "inspector" shortcut to use "L" key instead of "I"
-      if (parsed.getID() == "key_inspector" || parsed.getID() == "key_inspectorMac") {
-        parsed.setNewBinding("L");
-      }
       newShortcutList.push(parsed);
     }
 
@@ -1113,34 +1105,26 @@ class nsZenKeyboardShortcutsVersioner {
 
     if (version < 15) {
       // Migrate from version 13 to 14
-      // Add shortcut to open a new unsynced window: Default accelt+shift+N
+      // Add shortcut to open a new unsynced window: Default accelt+option+N (Ctrl+Alt+N on non-macOS)
       data.push(
         new KeyShortcut(
           "zen-new-unsynced-window",
           "N",
           "",
           ZEN_OTHER_SHORTCUTS_GROUP,
-          nsKeyShortcutModifiers.fromObject({ accel: true, shift: true }),
+          AppConstants.platform === "win"
+            ? nsKeyShortcutModifiers.fromObject({ alt: true })
+            : nsKeyShortcutModifiers.fromObject({ accel: true, alt: true }),
           "cmd_zenNewNavigatorUnsynced",
           "zen-new-unsynced-window-shortcut"
         )
       );
       // Also, change the default for new empty split from + to * on mac
-      // and disable the "Restore closed window" shortcut by default due to conflicts
-      let emptySplitFound = false,
-        undoCloseWindowFound = false;
       for (let shortcut of data) {
         if (shortcut.getID() == "zen-new-empty-split-view" && AppConstants.platform == "macosx") {
           if (shortcut.getKeyName() == "+") {
             shortcut.setNewBinding("*");
           }
-          emptySplitFound = true;
-        } else if (shortcut.getID() == "key_undoCloseWindow") {
-          shortcut.shouldBeEmpty = true;
-          shortcut.setDisabled(true);
-          undoCloseWindowFound = true;
-        }
-        if (emptySplitFound && undoCloseWindowFound) {
           break;
         }
       }

src/zen/sessionstore/ZenSessionManager.sys.mjs

@@ -84,7 +84,6 @@ export class nsZenSessionManager {
       compression: "lz4",
       backupFile,
     });
-    this.log("Session file path:", this.#file.path);
     this.#deferredBackupTask = new lazy.DeferredTask(async () => {
       await this.#createBackupsIfNeeded();
     }, REGENERATION_DEBOUNCE_RATE_MS);
@@ -166,7 +165,6 @@ export class nsZenSessionManager {
   async readFile() {
     let fileExists = await IOUtils.exists(this.#storeFilePath);
     if (!fileExists) {
-      this.log("Session file does not exist, running migration", this.#storeFilePath);
       this._shouldRunMigration = true;
     }
     this.init();
@@ -183,7 +181,6 @@ export class nsZenSessionManager {
     }
     this.#sidebar = this.#file.data || {};
     if (!this.#sidebar.spaces?.length && !this._shouldRunMigration) {
-      this.log("No spaces data found in session file, running migration", this.#sidebar);
       // If we have no spaces data, we should run migration
       // to restore them from the database. Note we also do a
       // check if we already planned to run migration for optimization.
@@ -192,13 +189,6 @@ export class nsZenSessionManager {
     }
   }
 
-  get #shouldRestoreOnlyPinned() {
-    return (
-      Services.prefs.getIntPref("browser.startup.page", 1) !== BROWSER_STARTUP_RESUME_SESSION ||
-      lazy.PrivateBrowsingUtils.permanentPrivateBrowsing
-    );
-  }
-
   /**
    * Called when the session file is read. Restores the sidebar data
    * into all windows.
@@ -207,22 +197,15 @@ export class nsZenSessionManager {
    *        The initial session state read from the session file.
    */
   onFileRead(initialState) {
+    if (!lazy.gWindowSyncEnabled) {
+      return initialState;
+    }
     // For the first time after migration, we restore the tabs
     // That where going to be restored by SessionStore. The sidebar
     // object will always be empty after migration because we haven't
     // gotten the opportunity to save the session yet.
     if (this._shouldRunMigration) {
-      initialState = this.#runStateMigration(initialState);
+      this.#runStateMigration(initialState);
-    }
-    if (!lazy.gWindowSyncEnabled) {
-      if (initialState?.windows?.length && this.#shouldRestoreOnlyPinned) {
-        this.log("Window sync disabled, restoring only pinned tabs");
-        for (let i = 0; i < initialState.windows.length; i++) {
-          let winData = initialState.windows[i];
-          winData.tabs = (winData.tabs || []).filter((tab) => tab.pinned);
-        }
-      }
-      return initialState;
     }
     // If there are no windows, we create an empty one. By default,
     // firefox would create simply a new empty window, but we want
@@ -232,15 +215,14 @@ export class nsZenSessionManager {
     if (!initialState?.windows?.length) {
       this.log("No windows found in initial state, creating an empty one");
       initialState ||= {};
-      initialState.windows = [
+      initialState.windows = this._shouldRunMigration ? [] : [{}];
-        {
-          tabs: [],
-        },
-      ];
     }
     // When we don't have browser.startup.page set to resume session,
     // we only want to restore the pinned tabs into the new windows.
-    if (this.#shouldRestoreOnlyPinned && this.#sidebar?.tabs) {
+    const shouldRestoreOnlyPinned =
+      Services.prefs.getIntPref("browser.startup.page", 1) !== BROWSER_STARTUP_RESUME_SESSION ||
+      lazy.PrivateBrowsingUtils.permanentPrivateBrowsing;
+    if (shouldRestoreOnlyPinned && this.#sidebar?.tabs) {
       this.log("Restoring only pinned tabs into windows");
       const sidebar = this.#sidebar;
       sidebar.tabs = (sidebar.tabs || []).filter((tab) => tab.pinned);
@@ -267,9 +249,9 @@ export class nsZenSessionManager {
         }
         this.#restoreWindowData(winData);
       }
-    } else if (initialState) {
+    } else {
       this.log("Saving windata state after migration");
-      this.saveState(Cu.cloneInto(initialState, {}));
+      this.saveState(initialState);
     }
     delete this._shouldRunMigration;
     return initialState;
@@ -290,14 +272,8 @@ export class nsZenSessionManager {
    * @param {object} initialState
    *        The initial session state read from the session file.
    */
-  // eslint-disable-next-line complexity
   #runStateMigration(initialState) {
-    this.log(
+    this.log("Restoring tabs from Places DB after migration", initialState, this._migrationData);
-      "Restoring tabs from Places DB after migration",
-      initialState,
-      initialState?.lastSessionState,
-      this._migrationData
-    );
     // Restore spaces into the sidebar object if we don't
     // have any yet.
     if (!this.#sidebar.spaces?.length) {
@@ -306,12 +282,6 @@ export class nsZenSessionManager {
         spaces: this._migrationData?.spaces || [],
       };
     }
-    if (
-      !initialState?.windows?.length &&
-      (initialState?.lastSessionState || initialState?.deferredInitialState)
-    ) {
-      initialState = { ...(initialState.lastSessionState || initialState.deferredInitialState) };
-    }
     // There might be cases where there are no windows in the
     // initial state, for example if the user had 'restore previous
     // session' disabled before migration. In that case, we try
@@ -325,14 +295,6 @@ export class nsZenSessionManager {
         this.log("Restoring tabs from last closed normal window");
       }
     }
-    if (!initialState?.windows?.length) {
-      initialState ||= {};
-      initialState.windows = [
-        {
-          tabs: [],
-        },
-      ];
-    }
     for (const winData of initialState?.windows || []) {
       winData.spaces = this._migrationData?.spaces || [];
       if (winData.tabs) {
@@ -347,17 +309,9 @@ export class nsZenSessionManager {
         }
       }
     }
-    return initialState;
+    // Save the state to the sidebar object so that it gets written
-  }
+    // to the session file.
-
+    delete this._migrationData;
-  /**
-   * Determines if a given window data object is saveable.
-   *
-   * @param {object} aWinData - The window data object to check.
-   * @returns {boolean} True if the window is saveable, false otherwise.
-   */
-  #isWindowSaveable(aWinData) {
-    return !aWinData.isPopup && !aWinData.isTaskbarTab && !aWinData.isZenUnsynced;
   }
 
   /**
@@ -367,8 +321,8 @@ export class nsZenSessionManager {
    */
   saveState(state) {
     let windows = state?.windows || [];
-    windows = windows.filter((win) => this.#isWindowSaveable(win));
+    windows = windows.filter((win) => !win.isPopup && !win.isTaskbarTab && !win.isZenUnsynced);
-    if (!windows.length) {
+    if (!windows.length || !lazy.gWindowSyncEnabled) {
       // Don't save (or even collect) anything in permanent private
       // browsing mode. We also don't want to save if there are no windows.
       return;
@@ -548,7 +502,7 @@ export class nsZenSessionManager {
    *        Whether this new window is being restored from a closed window.
    */
   restoreNewWindow(aWindow, SessionStoreInternal, fromClosedWindow = false) {
-    if (aWindow.gZenWorkspaces?.privateWindowOrDisabled) {
+    if (aWindow.gZenWorkspaces?.privateWindowOrDisabled || !lazy.gWindowSyncEnabled) {
       return;
     }
     this.log("Restoring new window with Zen session data");
@@ -566,10 +520,6 @@ export class nsZenSessionManager {
       this.#restoreWindowData(newWindow);
     }
     newWindow.tabs = this.#filterUnusedTabs(newWindow.tabs || []);
-    if (!lazy.gWindowSyncEnabled) {
-      // Don't bring over any unpinned tabs if window sync is disabled.
-      newWindow.tabs = newWindow.tabs.filter((tab) => tab.pinned);
-    }
 
     // These are window-specific from the previous window state that
     // we don't want to restore into the new window. Otherwise, new

src/zen/sessionstore/ZenWindowSync.sys.mjs

@@ -10,17 +10,17 @@ const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
+  SessionStore: "resource:///modules/sessionstore/SessionStore.sys.mjs",
   TabStateFlusher: "resource:///modules/sessionstore/TabStateFlusher.sys.mjs",
   // eslint-disable-next-line mozilla/valid-lazy
   ZenSessionStore: "resource:///modules/zen/ZenSessionManager.sys.mjs",
   TabStateCache: "resource:///modules/sessionstore/TabStateCache.sys.mjs",
-  setTimeout: "resource://gre/modules/Timer.sys.mjs",
 });
 
-XPCOMUtils.defineLazyPreferenceGetter(lazy, "gWindowSyncEnabled", "zen.window-sync.enabled", true);
+XPCOMUtils.defineLazyPreferenceGetter(lazy, "gWindowSyncEnabled", "zen.window-sync.enabled");
 XPCOMUtils.defineLazyPreferenceGetter(lazy, "gShouldLog", "zen.window-sync.log", true);
 
-const OBSERVING = ["browser-window-before-show", "sessionstore-windows-restored"];
+const OBSERVING = ["browser-window-before-show"];
 const INSTANT_EVENTS = ["SSWindowClosing"];
 const UNSYNCED_WINDOW_EVENTS = ["TabOpen"];
 const EVENTS = [
@@ -140,13 +140,16 @@ class nsZenWindowSync {
   }
 
   init() {
-    if (this.#initialized) {
+    if (!lazy.gWindowSyncEnabled || this.#initialized) {
       return;
     }
     this.#initialized = true;
     for (let topic of OBSERVING) {
       Services.obs.addObserver(this, topic);
     }
+    lazy.SessionStore.promiseAllWindowsRestored.then(() => {
+      this.#onSessionStoreInitialized();
+    });
   }
 
   uninit() {
@@ -173,13 +176,6 @@ class nsZenWindowSync {
    * @param {Window} aWindow - The browser window that is about to be shown.
    */
   #onWindowBeforeShow(aWindow) {
-    if (
-      aWindow.gZenWindowSync ||
-      aWindow.document.documentElement.hasAttribute("zen-unsynced-window")
-    ) {
-      return;
-    }
-    this.log("Setting up window sync for window", aWindow);
     // There are 2 possibilities to know if we are trying to open
     // a new *unsynced* window:
     // 1. We are passing `zen-unsynced` in the window arguments.
@@ -225,7 +221,6 @@ class nsZenWindowSync {
     // that didn't have this feature.
     await this.#runOnAllWindowsAsync(null, async (aWindow) => {
       const { gZenWorkspaces } = aWindow;
-      this.#onWindowBeforeShow(aWindow);
       await gZenWorkspaces.promiseInitialized;
       for (let tab of gZenWorkspaces.allStoredTabs) {
         if (!tab.id) {
@@ -293,10 +288,6 @@ class nsZenWindowSync {
         this.#onWindowBeforeShow(aSubject);
         break;
       }
-      case "sessionstore-windows-restored": {
-        this.#onSessionStoreInitialized();
-        break;
-      }
     }
   }
 
@@ -309,9 +300,6 @@ class nsZenWindowSync {
     ) {
       return;
     }
-    if (!lazy.gWindowSyncEnabled && !UNSYNCED_WINDOW_EVENTS.includes(aEvent.type)) {
-      return;
-    }
     if (INSTANT_EVENTS.includes(aEvent.type)) {
       this.#handleNextEvent(aEvent);
       return;
@@ -517,11 +505,7 @@ class nsZenWindowSync {
    */
   #moveItemToMatchOriginal(aOriginalItem, aTargetItem, aWindow, { isEssential, isPinned }) {
     const { gBrowser, gZenWorkspaces } = aWindow;
-    let originalSibling = aOriginalItem.previousElementSibling;
+    const originalSibling = aOriginalItem.previousElementSibling;
-    if (originalSibling?.classList.contains("space-fake-collapsible-start")) {
-      // Skip space fake elements.
-      originalSibling = originalSibling.previousElementSibling;
-    }
     let isFirstTab = true;
     if (gBrowser.isTabGroup(originalSibling) || gBrowser.isTab(originalSibling)) {
       isFirstTab =
@@ -593,17 +577,7 @@ class nsZenWindowSync {
    * @param {object} aOtherTab - The tab in the other window.
    */
   async #swapBrowserDocShellsAsync(aOurTab, aOtherTab) {
-    if (!this.#canSwapBrowsers(aOurTab, aOtherTab)) {
+    let promise = this.#maybeFlushTabState(aOurTab);
-      this.log(
-        `Cannot swap browsers between tabs ${aOurTab.id} and ${aOtherTab.id} due to process mismatch`
-      );
-      return;
-    }
-    if (aOtherTab.closing) {
-      this.log(`Cannot swap browsers, other tab ${aOtherTab.id} is closing`);
-      return;
-    }
-    let promise = this.#maybeFlushTabState(aOtherTab);
     await this.#styleSwapedBrowsers(
       aOurTab,
       aOtherTab,
@@ -652,27 +626,6 @@ class nsZenWindowSync {
     }
   }
 
-  /**
-   * Checks if two tabs can have their browsers swapped.
-   *
-   * @param {object} aOurTab - The tab in the current window.
-   * @param {object} aOtherTab - The tab in the other window.
-   * @returns {boolean} True if the tabs can be swapped, false otherwise.
-   */
-  #canSwapBrowsers(aOurTab, aOtherTab) {
-    // In this case, the other tab is most likely discarded or pending.
-    // We *shouldn't* care about this scenario since the remoteness should be
-    // the same anyways.
-    if (!aOurTab.linkedBrowser || !aOtherTab.linkedBrowser) {
-      return true;
-    }
-    // Can't swap between chrome and content processes.
-    if (aOurTab.linkedBrowser.isRemoteBrowser != aOtherTab.linkedBrowser.isRemoteBrowser) {
-      return false;
-    }
-    return true;
-  }
-
   /**
    * Swaps the browser docshells between two tabs.
    *
@@ -685,32 +638,19 @@ class nsZenWindowSync {
    */
   #swapBrowserDocShellsInner(aOurTab, aOtherTab, { focus = true, onClose = false } = {}) {
     // Can't swap between chrome and content processes.
-    if (!this.#canSwapBrowsers(aOurTab, aOtherTab)) {
+    if (aOurTab.linkedBrowser.isRemoteBrowser != aOtherTab.linkedBrowser.isRemoteBrowser) {
-      this.log(
-        `Cannot swap browsers between tabs ${aOurTab.id} and ${aOtherTab.id} due to process mismatch`
-      );
       return null;
     }
     // See https://github.com/zen-browser/desktop/issues/11851, swapping the browsers
     // don't seem to update the state's cache properly, leading to issues when restoring
     // the session later on.
-    let tabStateEntries = this.#getTabEntriesFromCache(aOtherTab);
+    let tabStateEntries = this.#getTabEntriesFromCache(aOurTab);
-    const setStateToTab = () => {
-      if (!tabStateEntries?.entries.length) {
-        this.log(`Error: No tab state entries found for tab ${aOurTab.id} during swap`);
-        return;
-      }
-      lazy.TabStateCache.update(aOurTab.linkedBrowser.permanentKey, {
-        history: tabStateEntries,
-      });
-    };
     // Running `swapBrowsersAndCloseOther` doesn't expect us to use the tab after
     // the operation, so it doesn't really care about cleaning up the other tab.
     // We need to make a new tab progress listener for the other tab after the swap.
     this.#withRestoreTabProgressListener(
       aOtherTab,
       () => {
-        setStateToTab();
         this.log(`Swapping docshells between windows for tab ${aOurTab.id}`);
         aOurTab.ownerGlobal.gBrowser.swapBrowsersAndCloseOther(aOurTab, aOtherTab, false);
         // Since we are moving progress listeners around, there's a chance that we
@@ -761,7 +701,13 @@ class nsZenWindowSync {
     // we would start receiving invalid history changes from the the incorrect
     // browser view that was just swapped out.
     return this.#maybeFlushTabState(aOurTab).finally(() => {
-      setStateToTab();
+      if (!tabStateEntries?.entries.length) {
+        this.log(`Error: No tab state entries found for tab ${aOtherTab.id} during swap`);
+        return;
+      }
+      lazy.TabStateCache.update(aOurTab.linkedBrowser.permanentKey, {
+        history: tabStateEntries,
+      });
     });
   }
 
@@ -959,7 +905,7 @@ class nsZenWindowSync {
     if (aTab.linkedBrowser) {
       cachedState = lazy.TabStateCache.get(aTab.linkedBrowser.permanentKey);
     }
-    return cachedState?.history?.entries ? Cu.cloneInto(cachedState.history, {}) : { entries: [] };
+    return cachedState?.history?.entries ? cachedState.history : { entries: [] };
   }
 
   /**
@@ -1061,37 +1007,20 @@ class nsZenWindowSync {
     moveAllTabsToWindow(true);
   }
 
-  /**
-   * Updates the initial pinned tab image for all windows if not already set.
-   *
-   * @param {object} aTab - The tab to update the image for.
-   */
-  #maybeEditAllTabsEntryImage(aTab) {
-    if (!aTab?._zenPinnedInitialState || aTab._zenPinnedInitialState.image) {
-      return;
-    }
-    let image = aTab.getAttribute("image") || aTab.ownerGlobal.gBrowser.getIcon(aTab);
-    this.#runOnAllWindows(null, (win) => {
-      const targetTab = this.getItemFromWindow(win, aTab.id);
-      if (targetTab) {
-        targetTab._zenPinnedInitialState.image = image;
-      }
-    });
-  }
-
   /* Mark: Event Handlers */
 
   on_TabOpen(aEvent) {
     const tab = aEvent.target;
     const window = tab.ownerGlobal;
     const isUnsyncedWindow = window.gZenWorkspaces.privateWindowOrDisabled;
+
     if (tab.id) {
       // This tab was opened as part of a sync operation.
       return;
     }
     tab._zenContentsVisible = true;
     tab.id = this.#newTabSyncId;
-    if (isUnsyncedWindow || !lazy.gWindowSyncEnabled) {
+    if (isUnsyncedWindow) {
       return;
     }
     this.#runOnAllWindows(window, (win) => {
@@ -1116,7 +1045,6 @@ class nsZenWindowSync {
       // No need to sync icon changes for tabs that aren't active in this window.
       return;
     }
-    this.#maybeEditAllTabsEntryImage(aEvent.target);
     return this.#delegateGenericSyncEvent(aEvent, SYNC_FLAG_ICON);
   }
 
@@ -1175,9 +1103,6 @@ class nsZenWindowSync {
   }
 
   on_focus(aEvent) {
-    if (typeof aEvent.target !== "object") {
-      return;
-    }
     const { ownerGlobal: window } = aEvent.target;
     if (
       !window?.gBrowser ||
@@ -1333,11 +1258,7 @@ class nsZenWindowSync {
       }
     });
 
-    return new Promise((resolve) => {
+    return this.#onTabSwitchOrWindowFocus(window, null, /* ignoreSameTab = */ true);
-      lazy.setTimeout(() => {
-        this.#onTabSwitchOrWindowFocus(window, null, /* ignoreSameTab = */ true).finally(resolve);
-      }, 0);
-    });
   }
 }
 

src/zen/split-view/ZenViewSplitter.mjs

@@ -1354,15 +1354,10 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
       }
     });
 
-    // Apply grid to tabs first to set zen-split attribute on containers
-    // before setting zen-split-view on parents. This prevents the black flash
-    // caused by CSS rules that hide containers without zen-split attribute
-    // when the parent has zen-split-view attribute.
-    this.applyGridToTabs(splitData.tabs);
-
     this.tabBrowserPanel.setAttribute("zen-split-view", "true");
     document.getElementById("tabbrowser-tabbox").setAttribute("zen-split-view", "true");
 
+    this.applyGridToTabs(splitData.tabs);
     this.applyGridLayout(splitData.layoutTree);
     this.setTabsDocShellState(splitData.tabs, true);
     this.toggleWrapperDisplay(true);
@@ -1408,10 +1403,6 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
       tab.setAttribute("split-view", "true");
       const container = tab.linkedBrowser?.closest(".browserSidebarContainer");
       container.setAttribute("is-zen-split", "true");
-      // Set zen-split early to prevent visibility flash when switching workspaces.
-      // The CSS rule for [is-zen-split]:not([zen-split]) sets visibility:hidden,
-      // so we must set zen-split before the parent zen-split-view attribute is applied.
-      container.setAttribute("zen-split", "true");
       if (!container?.querySelector(".zen-tab-rearrange-button")) {
         // insert a header into the container
         const header = this._createHeader(container);
@@ -2131,11 +2122,7 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
 
       const layout = deserializeNode(groupData.layoutTree);
       const splitData = this.splitTabs(group.tabs, groupData.gridType, -1);
-      if (splitData) {
+      splitData.layoutTree = layout;
-        splitData.layoutTree = layout;
-      } else {
-        gBrowser.removeTabGroup(group);
-      }
     }
 
     delete this._sessionRestoring;

src/zen/tabs/ZenPinnedTabManager.mjs

@@ -76,17 +76,6 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
     this._zenClickEventListener = this._onTabClick.bind(this);
 
     gZenWorkspaces._resolvePinnedInitialized();
-    if (lazy.zenPinnedTabRestorePinnedTabsToPinnedUrl) {
-      gZenWorkspaces.promiseInitialized.then(() => {
-        for (const tab of gZenWorkspaces.allStoredTabs) {
-          try {
-            this.resetPinnedTab(tab);
-          } catch (ex) {
-            console.error("Error restoring pinned tab:", ex);
-          }
-        }
-      });
-    }
   }
 
   log(message) {
@@ -173,7 +162,7 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
     this._resetTabToStoredState(tab);
   }
 
-  replacePinnedUrlWithCurrent(tab = undefined) {
+  async replacePinnedUrlWithCurrent(tab = undefined) {
     tab ??= TabContextMenu.contextTab;
     if (!tab || !tab.pinned) {
       return;
@@ -571,16 +560,6 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
       );
       const essentialTabsTarget = event.target.closest(".zen-essentials-container");
       const tabsTarget = !pinnedTabsTarget;
-      let currentEssenialContainer = gZenWorkspaces.getCurrentEssentialsContainer();
-      if (currentEssenialContainer?.essentialsPromo) {
-        currentEssenialContainer.essentialsPromo.remove();
-      }
-
-      movingTabs = movingTabs.filter((tab) =>
-        gBrowser.isTabGroupLabel(tab) && tab.group?.isZenFolder
-          ? !tabsTarget && !essentialTabsTarget
-          : true
-      );
 
       // TODO: Solve the issue of adding a tab between two groups
       // Remove group labels from the moving tabs and replace it
@@ -672,6 +651,7 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
           }
         }
       }
+
       return moved;
     } catch (ex) {
       console.error("Error moving tabs:", ex);

src/zen/tabs/zen-tabs/vertical-tabs.css

@@ -296,7 +296,7 @@
   border-bottom: 0px solid transparent !important;
 
   --tab-block-margin: 2px;
-  --tab-selected-bgcolor: light-dark(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.18));
+  --tab-selected-bgcolor: light-dark(rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0.12));
   --tab-selected-shadow: 0 1px 1px 1px light-dark(rgba(0, 0, 0, 0.09), rgba(0, 0, 0, 0.05)) !important;
   grid-gap: 0 !important;
 
@@ -496,11 +496,6 @@
     padding-left: 0 !important;
   }
 
-  #tabbrowser-tabs {
-    --toolbarbutton-inner-padding: 10px !important;
-    --tab-icon-end-margin: var(--toolbarbutton-inner-padding) !important;
-  }
-
   & .tab-audio-button {
     margin-inline-start: -4px;
     margin-inline-end: 2px;
@@ -670,7 +665,7 @@
       .tab-sharing-icon-overlay,
       .tab-icon-overlay {
         margin-inline-end: var(--toolbarbutton-inner-padding) !important;
-        margin-inline-start: calc(var(--toolbarbutton-inner-padding) / 3) !important;
+        margin-inline-start: calc(var(--toolbarbutton-inner-padding) / 4) !important;
       }
     }
   }
@@ -934,7 +929,7 @@
   height: calc(100% - var(--tab-block-margin) * 2);
   margin-left: calc(-1 * var(--tab-inline-padding) + var(--tab-block-margin));
   margin-right: 8px;
-  padding: 0 calc(var(--toolbarbutton-inner-padding) - 2px) 0 calc(var(--toolbarbutton-inner-padding) / 3 + var(--tab-inline-padding) - 2px);
+  padding: 0 calc(var(--toolbarbutton-inner-padding) - 2px) 0 calc(var(--toolbarbutton-inner-padding) / 4 + var(--tab-inline-padding) - 2px);
   border-radius: 0;
   border-top-left-radius: var(--border-radius-medium);
   width: unset;

src/zen/tests/mochitests/sandbox/browser_content_sandbox_fs_tests.js

@@ -682,13 +682,6 @@ async function testFileAccessWindowsOnly() {
   let tests = [];
 
   let extDir = GetPerUserExtensionDir();
-  // We used to unconditionally create this directory from Firefox, but that
-  // was dropped in bug 2001887. The value of this directory is questionable;
-  // the test was added in Firefox 56 (bug 1403744) to cover legacy add-ons,
-  // but legacy add-on support was discontinued in Firefox 57, and we stopped
-  // sideloading add-ons from this directory on all builds except ESR in
-  // Firefox 74 (bug 1602840).
-  await IOUtils.makeDirectory(extDir.path);
   tests.push({
     desc: "per-user extensions dir",
     ok: true,

src/zen/tests/mochitests/sandbox/browser_content_sandbox_fs_xdg_xdgConfigHome.js

@@ -22,13 +22,6 @@ add_setup(async function setup() {
   const xdgConfigHome = Services.env.get("XDG_CONFIG_HOME");
   Assert.greater(xdgConfigHome.length, 1, "XDG_CONFIG_HOME is defined");
 
-  // Verify the profile directory is inside XDG_CONFIG_HOME
-  const profileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
-  Assert.ok(
-    profileDir.path.startsWith(xdgConfigHome),
-    `Profile directory (${profileDir.path}) should be inside XDG_CONFIG_HOME (${xdgConfigHome})`
-  );
-
   // If it is there, do actual testing
   sanityChecks();
 });

src/zen/tests/mochitests/sandbox/browser_xdg_default.toml

@@ -12,14 +12,11 @@ support-files = [
   "browser_content_sandbox_utils.js",
   "browser_content_sandbox_fs_tests.js",
 ]
-test-directories = [
+# .config needs to exists for the sandbox to properly add it
-  "/tmp/.xdg_default_test",
+test-directories = ["/tmp/.xdg_default_test", "/tmp/.xdg_default_test/.config"]
-  "/tmp/.xdg_default_test/.config/mozilla/firefox/xdg_default_profile",
-]
 environment = [
   "HOME=/tmp/.xdg_default_test",
 ]
-profile-path = "/tmp/.xdg_default_test/.config/mozilla/firefox/xdg_default_profile"
 
 ["browser_content_sandbox_fs_xdg_default.js"]
 run-if = ["os == 'linux'"]

src/zen/tests/mochitests/sandbox/browser_xdg_mozLegacyHome.toml

@@ -12,17 +12,12 @@ support-files = [
   "browser_content_sandbox_utils.js",
   "browser_content_sandbox_fs_tests.js",
 ]
-test-directories = [
+test-directories = ["/tmp/.xdg_mozLegacyHome_test/.config", "/tmp/.xdg_config_home_test"]
-  "/tmp/.xdg_mozLegacyHome_test/.config",
-  "/tmp/.xdg_config_home_test",
-  "/tmp/.xdg_mozLegacyHome_test/.mozilla/firefox/xdg_mozLegacyHome_profile",
-]
 environment = [
   "XDG_CONFIG_HOME=/tmp/.xdg_config_home_test",
   "HOME=/tmp/.xdg_mozLegacyHome_test",
   "MOZ_LEGACY_HOME=1",
 ]
-profile-path = "/tmp/.xdg_mozLegacyHome_test/.mozilla/firefox/xdg_mozLegacyHome_profile"
 
 ["browser_content_sandbox_fs_xdg_mozLegacyHome.js"]
 run-if = ["os == 'linux'"]

src/zen/tests/mochitests/sandbox/browser_xdg_xdgConfigHome.toml

@@ -11,15 +11,11 @@ support-files = [
   "browser_content_sandbox_utils.js",
   "browser_content_sandbox_fs_tests.js",
 ]
-test-directories = [
+test-directories = "/tmp/.xdg_config_home_test"
-  "/tmp/.xdg_config_home_test",
-  "/tmp/.xdg_config_home_test/mozilla/firefox/xdg_config_home_profile",
-]
 environment = [
   "XDG_CONFIG_HOME=/tmp/.xdg_config_home_test",
   "MOZ_LEGACY_HOME=0",
 ]
-profile-path = "/tmp/.xdg_config_home_test/mozilla/firefox/xdg_config_home_profile"
 
 ["browser_content_sandbox_fs_xdg_xdgConfigHome.js"]
 run-if = [

src/zen/workspaces/ZenGradientGenerator.mjs

@@ -1348,8 +1348,7 @@ export class nsZenThemePicker extends nsZenMultiWindowFeature {
   }
 
   getToolbarColor(isDarkMode = false) {
-    const opacity = 0.8;
+    return isDarkMode ? [255, 255, 255, 0.6] : [0, 0, 0, 0.6]; // Default toolbar
-    return isDarkMode ? [255, 255, 255, opacity] : [0, 0, 0, opacity]; // Default toolbar
   }
 
   onWorkspaceChange(workspace, skipUpdate = false, theme = null) {

src/zen/workspaces/ZenWorkspaces.mjs

@@ -6,12 +6,6 @@
 
 import { nsZenThemePicker } from "chrome://browser/content/zen-components/ZenGradientGenerator.mjs";
 
-const lazy = {};
-
-ChromeUtils.defineESModuleGetters(lazy, {
-  ZenSessionStore: "resource:///modules/zen/ZenSessionManager.sys.mjs",
-});
-
 /**
  * Zen Spaces manager. This class is mainly responsible for the UI
  * and user interactions but it also contains some logic to manage
@@ -894,13 +888,6 @@ class nsZenWorkspaces {
       return Promise.resolve();
     }
     const spacesFromStore = aWinData.spaces || [];
-    if (
-      !this.privateWindowOrDisabled &&
-      spacesFromStore.length === 0 &&
-      lazy.ZenSessionStore._migrationData
-    ) {
-      spacesFromStore.push(...lazy.ZenSessionStore._migrationData.spaces);
-    }
     this._workspaceCache = spacesFromStore.length
       ? [...spacesFromStore]
       : [this.#createWorkspaceData("Space", undefined)];
@@ -2752,7 +2739,6 @@ class nsZenWorkspaces {
 
     let nextWorkspace = workspaces[targetIndex];
     await this.changeWorkspace(nextWorkspace, { whileScrolling });
-    return nextWorkspace;
   }
 
   #initializeWorkspaceTabContextMenus() {

src/zen/workspaces/zen-workspaces.css

@@ -155,7 +155,7 @@
 
 /* Mark workspaces indicator */
 .zen-current-workspace-indicator {
-  --indicator-gap: calc(var(--toolbarbutton-inner-padding) - 1px);
+  --indicator-gap: 10px;
   padding: calc(2px + var(--tab-inline-padding) + var(--zen-toolbox-padding));
   font-weight: 500;
   position: relative;
@@ -208,14 +208,8 @@
     align-items: center;
     fill-opacity: 0.6;
     -moz-context-properties: fill-opacity, fill;
-    fill: var(--toolbox-textcolor);
+    fill: currentColor;
-    font-size: 16px;
+    font-size: 14px;
-    padding-top: 2px;
-    color: light-dark(rgba(0, 0, 0, 0.8), rgba(255, 255, 255, 0.8));
-
-    & img {
-      transform: translateY(-1px);
-    }
 
     &[zen-emoji-open='true']::before {
       border: 1px dashed light-dark(rgba(0, 0, 0, .5), rgba(255, 255, 255, .5));
@@ -231,19 +225,19 @@
 
     @media (-moz-platform: windows) {
       & img {
-        margin-bottom: -2px;
+        margin-bottom: -4px;
       }
     }
   }
 
   .zen-current-workspace-indicator-name {
-    display: block;
+    display: flex;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
     cursor: auto;
-    white-space: nowrap;
     font-weight: 600;
+    align-items: center;
     margin: 0;
 
     :root[zen-unsynced-window] & {

surfer.json

@@ -5,8 +5,8 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "147.0.2",
+    "version": "147.0.1",
-    "candidate": "147.0.2",
+    "candidate": "147.0.1",
     "candidateBuild": 1
   },
   "buildOptions": {
@@ -20,7 +20,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.18.2b",
+        "displayVersion": "1.18b",
         "github": {
           "repo": "zen-browser/desktop"
         },
@@ -40,7 +40,7 @@
       "brandShortName": "Twilight",
       "brandFullName": "Zen Twilight",
       "release": {
-        "displayVersion": "1.19t",
+        "displayVersion": "1.18t",
         "github": {
           "repo": "zen-browser/desktop"
         }