test: Fixed restore tests and fixed possible memory leak on theme modifiers, b=no-bug, c=common, workspaces, tests

Signed-off-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>

.github/workflows/src/release-build.sh

@@ -8,6 +8,8 @@ if command -v apt-get &> /dev/null; then
   sudo apt-get install -y xvfb libnvidia-egl-wayland1 mesa-utils libgl1-mesa-dri
 fi
 
+. $HOME/.cargo/env
+
 ulimit -n 4096
 
 if command -v Xvfb &> /dev/null; then

.gitignore

@@ -14,3 +14,5 @@ venv/
 win-cross/
 
 !firefox-patches/
+target/
+.vscode/

README.md

@@ -29,8 +29,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 `140.0.2`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 140.0.2`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `141.0`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 141.0`!
 
 ### Contributing
 

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

@@ -1 +1 @@
-d5e5ed08dac5a263dbc7784dff272198b17bbc4f
+074a37c050cb91b65dd429d27f20bfe830962a43

build/winsign/firefox_update.ps1

@@ -0,0 +1,12 @@
+
+Remove-Item -Recurse -Force engine
+Remove-Item -Recurse -Force .surfer
+
+npm run init
+
+$job = Start-Job -ScriptBlock {
+    npm run build
+}
+
+# Wait for job to complete with timeout (in seconds)
+$job | Wait-Job -Timeout 5

build/winsign/sign.ps1

@@ -6,7 +6,7 @@ param(
 $ErrorActionPreference = "Stop"
 
 echo "Preparing environment"
-git pull --recurse
+git pull origin dev --recurse
 mkdir windsign-temp -ErrorAction SilentlyContinue
 
 # Download in parallel
@@ -113,6 +113,7 @@ signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $fi
 
 $env:ZEN_RELEASE="true"
 $env:SURFER_SIGNING_MODE="true"
+$env:SCCACHE_GHA_ENABLED="false"
 Wait-Job -Name "SurferInit"
 Wait-Job -Name "DownloadGitl10n"
 

package-lock.json

@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "MPL-2.0",
       "dependencies": {
-        "@zen-browser/surfer": "^1.11.13"
+        "@zen-browser/surfer": "^1.11.15"
       },
       "devDependencies": {
         "@babel/preset-typescript": "^7.27.0",
@@ -817,9 +817,9 @@
       "license": "MIT"
     },
     "node_modules/@zen-browser/surfer": {
-      "version": "1.11.13",
-      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.13.tgz",
-      "integrity": "sha512-D0TyunAWYtTdJkuUkYeOc6VBXzE9aoDs58kWu/Oi/aU3vd8IbqXPbZZfYwj5FWPWDReMrJUNkkKAEdbL44y9aw==",
+      "version": "1.11.15",
+      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.15.tgz",
+      "integrity": "sha512-Ue7BvhH1TyGRhd6LdsFPbnMupERjuwXe4cnclQUU6Cslc7LpqMjtFGxd9VA6eIeNRkuNIJJPJsQhQxIdA/dMSA==",
       "license": "MPL-2.0",
       "dependencies": {
         "@resvg/resvg-js": "^1.4.0",
@@ -1826,14 +1826,15 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
-      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
         "mime-types": "^2.1.12"
       },
       "engines": {

package.json

@@ -6,12 +6,12 @@
     "**/*": ""
   },
   "scripts": {
-    "build": "surfer build",
+    "build": "npm run ffprefs && surfer build",
     "build:ui": "surfer build --ui",
     "start": "cd engine && ./mach run --noprofile",
     "import": "surfer import",
     "export": "surfer export",
-    "init": "npm run download && npm run bootstrap && npm run import",
+    "init": "npm run download && npm run import && npm run bootstrap",
     "download": "surfer download",
     "bootstrap": "surfer bootstrap",
     "package": "surfer package",
@@ -25,7 +25,10 @@
     "reset-ff": "surfer reset",
     "surfer": "surfer",
     "test": "python3 scripts/run_tests.py",
-    "test:dbg": "python3 scripts/run_tests.py --jsdebugger --debug-on-failure"
+    "test:dbg": "python3 scripts/run_tests.py --jsdebugger --debug-on-failure",
+    "ffprefs": "cd tools/ffprefs && cargo run --bin ffprefs -- ../../",
+    "lc": "surfer license-check",
+    "lc:fix": "surfer license-check --fix"
   },
   "repository": {
     "type": "git",
@@ -42,7 +45,7 @@
   },
   "homepage": "https://github.com/zen-browser/desktop#readme",
   "dependencies": {
-    "@zen-browser/surfer": "^1.11.13"
+    "@zen-browser/surfer": "^1.11.15"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.27.0",

prefs/ai.yaml

@@ -0,0 +1,19 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Machine learning and chat feature preferences
+- name: browser.ml.chat.enabled
+  value: false
+
+- name: browser.ml.chat.shortcuts
+  value: false
+
+- name: browser.ml.chat.shortcuts.custom
+  value: false
+
+- name: browser.ml.chat.sidebar
+  value: false
+
+- name: browser.ml.enable
+  value: false

prefs/browser.yaml

@@ -0,0 +1,81 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: browser.startup.page
+  value: 3
+
+- name: browser.sessionstore.restore_pinned_tabs_on_demand
+  value: true
+
+- name: browser.tabs.loadBookmarksInTabs
+  value: false
+
+- name: browser.tabs.hoverPreview.enabled
+  value: false
+
+- name: browser.tabs.dragdrop.moveOverThresholdPercent
+  value: 50
+
+- name: browser.tabs.unloadTabInContextMenu
+  value: true
+
+- name: browser.tabs.fadeOutExplicitlyUnloadedTabs
+  value: true
+
+- name: browser.toolbars.bookmarks.visibility
+  value: 'never'
+
+- name: browser.bookmarks.openInTabClosesMenu
+  value: false
+
+- name: browser.menu.showViewImageInfo
+  value: true
+
+- name: findbar.highlightAll
+  value: true
+
+- name: layout.word_select.eat_space_to_next_word
+  value: false
+
+- name: widget.non-native-theme.scrollbar.style
+  value: 2
+
+- name: widget.non-native-theme.use-theme-accent
+  value: true
+
+- name: browser.download.autohideButton
+  value: false
+
+- name: sidebar.revamp
+  value: false
+  locked: true
+
+- name: sidebar.verticalTabs
+  value: false
+  locked: true
+
+- name: browser.preferences.experimental
+  value: true
+
+- name: browser.download.manager.addToRecentDocs
+  value: false
+
+- name: browser.download.open_pdf_attachments_inline
+  value: true
+
+- name: browser.download.alwaysOpenPanel
+  value: false
+
+- name: app.update.checkInstallTime.days
+  value: 6
+  condition: 'defined(MOZILLA_OFFICIAL)'
+
+- name: browser.profiles.enabled
+  value: false
+
+- name: browser.tabs.groups.enabled
+  value: false
+
+- name: browser.urlbar.scotchBonnet.enableOverride
+  value: false

prefs/compact-mode.yaml

@@ -0,0 +1,38 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: zen.view.compact.hide-tabbar
+  value: true
+
+- name: zen.view.compact.hide-toolbar
+  value: false
+
+- name: zen.view.compact.toolbar-flash-popup
+  value: false
+
+- name: zen.view.compact.toolbar-flash-popup.duration
+  value: 800
+
+- name: zen.view.compact.toolbar-hide-after-hover.duration
+  value: 1000
+
+- name: zen.view.compact.color-toolbar
+  value: true
+
+- name: zen.view.compact.color-sidebar
+  value: true
+
+- name: zen.view.compact.animate-sidebar
+  value: true
+
+- name: zen.view.compact.show-sidebar-and-toolbar-on-hover
+  value: true
+
+- name: zen.view.compact.show-background-tab-toast
+  value: true
+
+# Do not edit manually
+- name: zen.view.compact.should-enable-at-startup
+  hidden: true
+  value: false

prefs/disablemozilla.yaml

@@ -0,0 +1,33 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: browser.privatebrowsing.vpnpromourl
+  value: ''
+  locked: true
+
+- name: extensions.getAddons.showPane
+  value: false
+
+- name: extensions.htmlaboutaddons.recommendations.enabled
+  value: false
+
+- name: browser.discovery.enabled
+  value: false
+
+- name: browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons
+  value: false
+
+- name: browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features
+  value: false
+
+- name: browser.preferences.moreFromMozilla
+  value: false
+  locked: true
+
+- name: browser.aboutwelcome.enabled
+  value: false
+
+- name: browser.contentblocking.report.show_mobile_app
+  value: false
+  locked: true

prefs/downloads.yaml

@@ -2,6 +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/.
 
-pref('pdfjs.enableHighlightEditor', true);
-pref('pdfjs.enableHighlightFloatingButton', true);
-pref("pdfjs.enableScripting", false);
+- name: zen.downloads.download-animation
+  value: true
+
+- name: zen.downloads.download-animation-duration
+  value: 1000 # ms

prefs/extensions.yaml

@@ -2,5 +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/.
 
-pref('zen.downloads.download-animation', true);
-pref('zen.downloads.download-animation-duration', 1000); // ms
+- name: xpinstall.signatures.required
+  value: true
+
+- name: extensions.pocket.enabled
+  value: false

prefs/fullscreen.yaml

@@ -0,0 +1,16 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Fullscreen API preferences
+- name: full-screen-api.transition-duration.enter
+  value: '0 0'
+
+- name: full-screen-api.transition-duration.leave
+  value: '0 0'
+
+- name: full-screen-api.warning.delay
+  value: -1
+
+- name: full-screen-api.warning.timeout
+  value: 0

prefs/glance.yaml

@@ -0,0 +1,18 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: zen.glance.enabled
+  value: true
+
+- name: zen.glance.enable-contextmenu-search
+  value: true
+
+- name: zen.glance.hold-duration
+  value: 300 # in ms
+
+- name: zen.glance.open-essential-external-links
+  value: true
+
+- name: zen.glance.activation-method
+  value: 'alt' # ctrl, alt, shift, none, hold

prefs/gtk.yaml

@@ -0,0 +1,21 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# GTK-specific preferences
+- name: widget.gtk.rounded-bottom-corners.enabled
+  value: true
+  condition: 'defined(MOZ_WIDGET_GTK) && defined(UNIX_BUT_NOT_MAC)'
+
+- name: zen.widget.linux.transparency
+  value: false
+  condition: 'defined(MOZ_WIDGET_GTK)'
+
+# VAAPI/FFmpeg preferences for Linux
+- name: media.ffmpeg.vaapi.enabled
+  value: true
+  condition: 'defined(MOZ_WIDGET_GTK)'
+
+- name: media.ffmpeg.encoder.enabled
+  value: true
+  condition: 'defined(MOZ_WIDGET_GTK)'

prefs/kbs.yaml

@@ -0,0 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: zen.keyboard.shortcuts.enabled
+  value: true
+
+- name: zen.keyboard.shortcuts.version
+  value: 0 # Empty string means default shortcuts
+
+- name: zen.keyboard.shortcuts.disable-mainkeyset-clear
+  value: false # for debugging

prefs/macos.yaml

@@ -3,7 +3,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Enable transparent background for macos
-pref('widget.macos.sidebar-blend-mode.behind-window', true);
+- name: widget.macos.sidebar-blend-mode.behind-window
+  value: true
+  condition: 'defined(XP_MACOSX)'
+
 # 1. hudWindow
 # 2. fullScreenUI
 # 3. popover
@@ -11,4 +14,9 @@ pref('widget.macos.sidebar-blend-mode.behind-window', true);
 # 5. toolTip
 # 6. headerView
 # 7. underlay
-pref('zen.widget.macos.window-material', 1);
+- name: zen.widget.macos.window-material
+  value: 1
+  condition: 'defined(XP_MACOSX)'
+  cpptype: uint32_t
+  mirror: always
+  type: static

prefs/media.yaml

@@ -0,0 +1,17 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: image.jxl.enabled
+  value: true
+  locked: true
+
+- name: svg.context-properties.content.enabled
+  value: true
+
+- name: image.avif.enabled
+  value: true
+  locked: true
+
+- name: media.eme.enabled
+  value: true

prefs/mods.yaml

@@ -0,0 +1,28 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: zen.mods.updated-value-observer
+  value: false
+
+- name: zen.mods.auto-update-days
+  value: 20 # In days
+
+- name: zen.mods.auto-update
+  value: '@cond'
+  condition: 'defined(MOZILLA_OFFICIAL)'
+
+- name: zen.rice.share.notice.accepted
+  value: false
+
+# === Mark: Site Injection ===
+
+- name: zen.injections.match-urls
+  value: 'https://zen-browser.app/*'
+  locked: true
+  condition: 'defined(MOZILLA_OFFICIAL)'
+
+- name: zen.injections.match-urls
+  value: 'http://localhost/*'
+  locked: true
+  condition: '!defined(MOZILLA_OFFICIAL)'

prefs/multilingual.yaml

@@ -2,7 +2,5 @@
 # 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/.
 
-# Mica
-pref("widget.windows.mica", true);
-pref("widget.windows.mica.popups", true);
-pref("widget.windows.mica.toplevel-backdrop", 2);
+- name: intl.multilingual.downloadEnabled
+  value: false

prefs/newtab.yaml

@@ -0,0 +1,24 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: browser.newtabpage.activity-stream.feeds.topsites
+  value: false
+
+- name: browser.newtabpage.activity-stream.feeds.section.topstories
+  value: false
+
+- name: browser.topsites.contile.enabled
+  value: false
+
+- name: browser.newtabpage.activity-stream.system.showWeather
+  value: false
+
+- name: browser.newtabpage.activity-stream.newtabWallpapers.enabled
+  value: true
+
+- name: browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled
+  value: true
+
+- name: browser.translations.newSettingsUI.enable
+  value: true

prefs/pdf.yaml

@@ -0,0 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: pdfjs.enableHighlightEditor
+  value: true
+
+- name: pdfjs.enableHighlightFloatingButton
+  value: true
+
+- name: pdfjs.enableScripting
+  value: false

prefs/performance.yaml

@@ -0,0 +1,10 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: browser.lowMemoryResponseMask
+  value: 3
+  condition: 'defined(XP_MACOSX)'
+
+- name: network.predictor.enable-hover-on-ssl
+  value: true

prefs/pip.yaml

@@ -2,6 +2,9 @@
 # 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/.
 
-pref("media.videocontrols.picture-in-picture.video-toggle.enabled", true);
+- name: media.videocontrols.picture-in-picture.video-toggle.enabled
+  value: true
+
 # TODO: Enable once we have a proper settings page
-pref("media.videocontrols.picture-in-picture.enable-when-switching-tabs.enabled", false);
+- name: media.videocontrols.picture-in-picture.enable-when-switching-tabs.enabled
+  value: false

prefs/privacy.yaml

@@ -0,0 +1,121 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Telemetry & Data Reporting
+- name: datareporting.policy.dataSubmissionEnabled
+  value: false
+  locked: true
+
+- name: datareporting.healthreport.uploadEnabled
+  value: false
+  locked: true
+
+- name: toolkit.telemetry.unified
+  value: false
+  locked: true
+
+- name: toolkit.telemetry.enabled
+  value: false
+  locked: true
+
+- name: toolkit.telemetry.server
+  value: 'data:,'
+  locked: true
+
+- name: toolkit.telemetry.archive.enabled
+  value: false
+  locked: true
+
+- name: toolkit.telemetry.newProfilePing.enabled
+  value: false
+  locked: true
+
+- name: toolkit.telemetry.shutdownPingSender.enabled
+  value: false
+  locked: true
+
+- name: toolkit.telemetry.updatePing.enabled
+  value: false
+  locked: true
+
+- name: toolkit.telemetry.bhrPing.enabled
+  value: false
+  locked: true
+
+- name: toolkit.telemetry.firstShutdownPing.enabled
+  value: false
+  locked: true
+
+- name: toolkit.telemetry.coverage.opt-out
+  value: true
+  locked: true
+
+- name: toolkit.coverage.opt-out
+  value: true
+  locked: true
+
+- name: toolkit.coverage.endpoint.base
+  value: ''
+  locked: true
+
+- name: browser.newtabpage.activity-stream.feeds.telemetry
+  value: false
+  locked: true
+
+- name: browser.newtabpage.activity-stream.telemetry
+  value: false
+  locked: true
+
+- name: browser.ping-centre.telemetry
+  value: false
+
+- name: browser.attribution.enabled
+  value: false
+
+- name: toolkit.telemetry.pioneer-new-studies-available
+  value: false
+
+- name: app.shield.optoutstudies.enabled
+  value: false
+  locked: true
+
+- name: app.normandy.enabled
+  value: false
+
+- name: app.normandy.api_url
+  value: ''
+  locked: true
+
+# Crash Reports
+- name: breakpad.reportURL
+  value: ''
+
+- name: browser.tabs.crashReporting.sendReport
+  value: false
+
+- name: browser.crashReports.unsubmittedCheck.autoSubmit2
+  value: false
+
+# Privacy and Misc
+- name: extensions.getAddons.cache.enabled
+  value: false
+
+- name: browser.privatebrowsing.forceMediaMemoryCache
+  value: true
+
+- name: browser.helperApps.deleteTempFileOnExit
+  value: true
+
+- name: browser.uitour.enabled
+  value: false
+
+- name: privacy.globalprivacycontrol.enabled
+  value: true
+
+# Contextual Identities
+- name: privacy.userContext.enabled
+  value: true
+
+- name: privacy.userContext.ui.enabled
+  value: true

prefs/smoothscroll.yaml

@@ -0,0 +1,49 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Smooth scrolling and mousewheel tuning preferences
+
+- name: general.smoothScroll.msdPhysics.enabled
+  condition: '!defined(XP_MACOSX)'
+  value: true
+
+- name: general.smoothScroll.currentVelocityWeighting
+  condition: '!defined(XP_MACOSX)'
+  value: '0.15'
+
+- name: general.smoothScroll.stopDecelerationWeighting
+  condition: '!defined(XP_MACOSX)'
+  value: '0.6'
+
+- name: mousewheel.min_line_scroll_amount
+  condition: '!defined(XP_MACOSX)'
+  value: 10
+
+- name: general.smoothScroll.mouseWheel.durationMinMS
+  condition: '!defined(XP_MACOSX)'
+  value: 80
+
+- name: general.smoothScroll.msdPhysics.continuousMotionMaxDeltaMS
+  condition: '!defined(XP_MACOSX)'
+  value: 12
+
+- name: general.smoothScroll.msdPhysics.motionBeginSpringConstant
+  condition: '!defined(XP_MACOSX)'
+  value: 600
+
+- name: general.smoothScroll.msdPhysics.regularSpringConstant
+  condition: '!defined(XP_MACOSX)'
+  value: 650
+
+- name: general.smoothScroll.msdPhysics.slowdownMinDeltaMS
+  condition: '!defined(XP_MACOSX)'
+  value: 25
+
+- name: general.smoothScroll.msdPhysics.slowdownSpringConstant
+  condition: '!defined(XP_MACOSX)'
+  value: 250
+
+- name: mousewheel.default.delta_multiplier_y
+  condition: '!defined(XP_MACOSX)'
+  value: 200

prefs/split-view.yaml

@@ -0,0 +1,12 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: zen.splitView.enable-tab-drop
+  value: true
+
+- name: zen.splitView.min-resize-width
+  value: 7
+
+- name: zen.splitView.rearrange-hover-size
+  value: 24

prefs/static.yaml

@@ -0,0 +1,16 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: zen.haptic-feedback.enabled
+  cpptype: bool
+  value: true
+  mirror: always
+  type: static
+
+- name: zen.swipe.is-fast-swipe
+  cpptype: bool
+  value: true
+  mirror: always
+  hidden: true
+  type: static

prefs/theme.yaml

@@ -0,0 +1,42 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: zen.theme.accent-color
+  value: '#ffb787'
+
+- name: zen.theme.content-element-separation
+  value: 8
+
+- name: zen.theme.dark-mode-bias
+  value: 0.25
+
+- name: zen.theme.gradient
+  value: true
+
+- name: zen.theme.gradient.show-custom-colors
+  value: false
+
+- name: zen.theme.essentials-favicon-bg
+  value: true
+
+- name: zen.theme.acrylic-elements
+  value: false
+
+- name: zen.theme.disable-lightweight
+  value: true
+
+- name: zen.theme.use-sysyem-colors
+  value: false
+
+# ==== Mark: border radius ====
+
+# macOS border radius
+- name: zen.theme.border-radius
+  value: 10
+  condition: 'defined(XP_MACOSX)'
+
+# non-macOS border radius
+- name: zen.theme.border-radius
+  value: 8
+  condition: '!defined(XP_MACOSX)'

prefs/urlbar.yaml

@@ -0,0 +1,80 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# URL bar and search-related preferences
+
+- name: browser.urlbar.unitConversion.enabled
+  value: true
+
+- name: browser.urlbar.trending.featureGate
+  value: false
+
+- name: browser.urlbar.weather.featureGate
+  value: false
+
+- name: browser.urlbar.quickactions.enabled
+  value: true
+
+- name: browser.urlbar.clipboard.featureGate
+  value: true
+
+- name: browser.urlbar.suggest.calculator
+  value: true
+
+- name: browser.urlbar.trimHttps
+  value: true
+
+- name: browser.urlbar.untrimOnUserInteraction.featureGate
+  value: true
+
+# Keep in sync with browser/components/topsites/constants.mjs
+- name: browser.urlbar.maxRichResults
+  value: 7
+
+# Enable private suggestions
+- name: browser.search.suggest.enabled
+  value: false
+
+- name: browser.search.suggest.enabled.private
+  value: false
+
+- name: browser.search.separatePrivateDefault.ui.enabled
+  value: true
+
+- name: browser.urlbar.update2.engineAliasRefresh
+  value: true
+
+- name: browser.urlbar.quicksuggest.enabled
+  value: false
+  locked: true
+
+- name: browser.urlbar.suggest.quicksuggest.sponsored
+  value: false
+  locked: true
+
+- name: browser.urlbar.suggest.quicksuggest.nonsponsored
+  value: false
+  locked: true
+
+- name: browser.urlbar.groupLabels.enabled
+  value: false
+
+- name: browser.urlbar.keepPanelOpenDuringImeComposition
+  value: true # IMPORTANT: Fixes closing the urlbar when on some languages
+
+- name: browser.formfill.enable
+  value: false
+
+- name: security.insecure_connection_text.enabled
+  value: true
+
+- name: security.insecure_connection_text.pbmode.enabled
+  value: true
+
+- name: network.IDN_show_punycode
+  value: true
+
+- name: browser.urlbar.suggest.topsites
+  value: true
+  locked: true

prefs/view.yaml

@@ -0,0 +1,44 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: zen.view.sidebar-height-throttle
+  value: 0
+
+- name: zen.view.sidebar-expanded.max-width
+  value: 500
+
+- name: zen.view.mac.show-three-dot-menu
+  value: false
+  condition: 'defined(XP_MACOSX)'
+
+- name: zen.widget.mac.mono-window-controls
+  value: true
+  condition: 'defined(XP_MACOSX)'
+
+- name: zen.view.use-single-toolbar
+  value: true
+
+- name: zen.view.sidebar-expanded
+  value: true
+
+- name: zen.view.sidebar-collapsed.hide-mute-button
+  value: true
+
+- name: zen.view.experimental-force-window-controls-left
+  value: false
+
+- name: zen.view.hide-window-controls
+  value: true
+
+- name: zen.view.experimental-no-window-controls
+  value: false
+
+- name: zen.view.grey-out-inactive-windows
+  value: true
+
+- name: zen.view.show-newtab-button-top
+  value: true
+
+- name: zen.view.window.scheme
+  value: 2

prefs/watermark.yaml

@@ -2,6 +2,7 @@
 # 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/.
 
-pref('zen.splitView.enable-tab-drop', true);
-pref('zen.splitView.min-resize-width', 7);
-pref('zen.splitView.rearrange-hover-size', 24);
+- name: zen.watermark.enabled
+  value: '@cond'
+  sticky: true
+  condition: 'defined(MOZILLA_OFFICIAL)'

prefs/welcome.yaml

@@ -0,0 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: zen.welcome-screen.seen
+  value: '@cond'
+  sticky: true
+  condition: '!defined(MOZILLA_OFFICIAL)'

prefs/windows.yaml

@@ -0,0 +1,19 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Mica effect preferences for Windows
+- name: widget.windows.mica
+  value: true
+  condition: 'defined(XP_WIN)'
+
+- name: widget.windows.mica.popups
+  value: true
+  condition: 'defined(XP_WIN)'
+
+# 1 = DWMSBT_MAINWINDOW
+# 2 = DWMSBT_TRANSIENTWINDOW (default, also used for popups)
+# 3 = DWMSBT_TABBEDWINDOW
+- name: widget.windows.mica.toplevel-backdrop
+  value: 2
+  condition: 'defined(XP_WIN)'

prefs/workspaces.yaml

@@ -0,0 +1,46 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: zen.workspaces.continue-where-left-off
+  value: false
+
+- name: zen.workspaces.hide-default-container-indicator
+  value: true
+
+- name: zen.workspaces.force-container-workspace
+  value: false
+
+- name: zen.workspaces.open-new-tab-if-last-unpinned-tab-is-closed
+  value: false
+
+- name: zen.workspaces.swipe-actions
+  value: true
+
+- name: zen.workspaces.wrap-around-navigation
+  value: true
+
+- name: zen.workspaces.natural-scroll
+  value: false
+
+- name: zen.workspaces.scroll-modifier-key
+  value: ctrl
+
+- name: services.sync.engine.workspaces
+  value: false
+
+- name: zen.workspaces.separate-essentials
+  value: true
+
+- name: zen.workspaces.debug
+  value: '@cond'
+  condition: '!defined(MOZILLA_OFFICIAL)' # Section: Pinned tabs management
+
+- name: zen.pinned-tab-manager.debug
+  value: false
+
+- name: zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url
+  value: false
+
+- name: zen.pinned-tab-manager.close-shortcut-behavior
+  value: reset-unload-switch

prefs/zen-urlbar.yaml

@@ -0,0 +1,24 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: zen.urlbar.replace-newtab
+  value: true
+
+- name: zen.urlbar.show-protections-icon
+  value: false
+
+- name: zen.urlbar.behavior
+  value: floating-on-type
+
+- name: zen.urlbar.wait-to-clear
+  value: 45000
+
+- name: zen.urlbar.show-domain-only-in-sidebar
+  value: true
+
+- name: zen.urlbar.hide-one-offs
+  value: true
+
+- name: zen.urlbar.enable-overrides
+  value: false

prefs/zen.yaml

@@ -0,0 +1,27 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+- name: zen.tabs.vertical
+  value: true
+
+- name: zen.tabs.vertical.right-side
+  value: false
+
+- name: zen.tabs.rename-tabs
+  value: true
+
+- name: zen.tabs.show-newtab-vertical
+  value: true
+
+- name: zen.ctrlTab.show-pending-tabs
+  value: false
+
+- name: zen.mediacontrols.enabled
+  value: true
+
+- name: zen.haptic-feedback.enabled
+  value: true
+
+- name: zen.startup.smooth-scroll-in-tabs
+  value: true

scripts/check_rc_response.py

@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import json
 import os
 import sys

scripts/copy_language_pack.py

@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import os
 import shutil
 import sys

scripts/download-language-packs.sh

@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 set -x
 
 if ! [ -z "$ZEN_L10N_CURR_DIR" ]; then

scripts/fetch-formal-git-components.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 set -e
 

scripts/prepare-flatpak-release.py

@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import hashlib
 import argparse
 import sys

scripts/recalculate-patches.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Recursively find all .patch files in the current directory and its subdirectories
 find src -type f -name "*.patch" | while read -r patch_file; do

scripts/remove-failed-jobs.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 gh_bulk_delete_workflow_runs() {
   local repo=zen-browser/$1

scripts/run_tests.py

@@ -1,6 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import os
 import sys
-import subprocess
 from pathlib import Path
 
 
@@ -28,7 +31,8 @@ def main():
 
   def run_mach_with_paths(test_paths):
     command = ['./mach', 'mochitest'] + other_args + test_paths
-    subprocess.run(command, check=True)
+    # Replace the current process with the mach command
+    os.execvp(command[0], command)
 
   if path in ("", "all"):
     test_dirs = [p for p in Path("zen/tests").iterdir() if p.is_dir()]

scripts/update-surfer.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # make sure we are on root
 if [ ! -f "package.json" ]; then

scripts/update_en_US_packs.py

@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 from copy_language_pack import copy_browser_locales
 
 if __name__ == "__main__":

scripts/update_ff.py

@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
 import os
 import json
 import argparse

scripts/update_ts_types.py

@@ -1,3 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os
 

src/Cargo-lock.patch

@@ -1,8 +1,8 @@
 diff --git a/Cargo.lock b/Cargo.lock
-index f7ebed9b2a71da90c5751cfd5d5f018cc8b73612..96e881c7782198f1e58be2578f167c7079a8191e 100644
+index f223ba9af3edd60a42730a606aca2c48bbdddc0c..501cf2de684532203bfb2e96f8add919f3d6e739 100644
 --- a/Cargo.lock
 +++ b/Cargo.lock
-@@ -4014,8 +4014,6 @@ dependencies = [
+@@ -4049,8 +4049,6 @@ dependencies = [
  [[package]]
  name = "mime_guess"
  version = "2.0.4"

src/Cargo-toml.patch

@@ -1,8 +1,8 @@
 diff --git a/Cargo.toml b/Cargo.toml
-index 8c6b99bc629ec26e01ab3746f2ae46174bfaa0b1..5791c7470923c7c15986089b40357ce80365e942 100644
+index d402d783e2bbc30b87b2c59cf02e38b74d0484c1..b718ee7ed0519cac20d2828fee0350b44fc3f45a 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -233,6 +233,9 @@ rure = { path = "third_party/rust/rure" }
+@@ -227,6 +227,9 @@ rure = { path = "third_party/rust/rure" }
  # Patch `plist` to work with `indexmap` 2.*
  plist = { path = "third_party/rust/plist" }
  

src/browser/app/profile/ai.inc

@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref("browser.ml.chat.enabled", false);
-pref("browser.ml.chat.shortcuts", false);
-pref("browser.ml.chat.shortcuts.custom", false);
-pref("browser.ml.chat.sidebar", false);
-pref("browser.ml.enable", false);

src/browser/app/profile/browser.inc

@@ -1,55 +0,0 @@
-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// Restore session on startup
-pref("browser.startup.page", 3);
-pref("browser.sessionstore.restore_pinned_tabs_on_demand", true);
-
-// Toolbars
-pref("browser.tabs.loadBookmarksInTabs", false);
-pref("browser.tabs.hoverPreview.enabled", false);
-pref("browser.tabs.dragdrop.moveOverThresholdPercent", 50);
-pref("browser.tabs.unloadTabInContextMenu", true);
-pref("browser.tabs.fadeOutExplicitlyUnloadedTabs", true);
-
-pref('browser.toolbars.bookmarks.visibility', 'never');
-pref("browser.bookmarks.openInTabClosesMenu", false);
-pref("browser.menu.showViewImageInfo", true);
-pref("findbar.highlightAll", true);
-
-pref("layout.word_select.eat_space_to_next_word", false);
-
-// Better Windows theming
-pref("widget.non-native-theme.scrollbar.style", 2);
-pref("widget.non-native-theme.use-theme-accent", true);
-
-// for the new layout:
-pref('browser.download.autohideButton', false);
-
-// Disable Firefox's revamp
-pref("sidebar.revamp", false, locked);
-pref("sidebar.verticalTabs", false, locked);
-
-// Enable experimental settings page (Used for Zen Labs)
-pref('browser.preferences.experimental', true);
-
-// Downloads
-pref("browser.download.manager.addToRecentDocs", false);
-pref('browser.download.open_pdf_attachments_inline', true);
-pref('browser.download.alwaysOpenPanel', false);
-
-// Updates
-#ifdef MOZILLA_OFFICIAL
-pref("app.update.checkInstallTime.days", 6);
-#endif
-
-#include fullscreen.inc
-#include ai.inc
-#include disablemozilla.inc
-
-// TODO: Check this out!
-pref("browser.profiles.enabled", false);
-pref("browser.tabs.groups.enabled", false);
-pref("browser.urlbar.scotchBonnet.enableOverride", false);

src/browser/app/profile/disablemozilla.inc

@@ -1,14 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// Common UI changes
-pref("browser.privatebrowsing.vpnpromourl", "", locked);
-pref("extensions.getAddons.showPane", false);
-pref("extensions.htmlaboutaddons.recommendations.enabled", false);
-pref("browser.discovery.enabled", false);
-pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", false);
-pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", false);
-pref("browser.preferences.moreFromMozilla", false, locked);
-pref("browser.aboutwelcome.enabled", false);
-pref("browser.contentblocking.report.show_mobile_app", false, locked);

src/browser/app/profile/extensions.inc

@@ -1,8 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// security: They must enable this themselves, to avoid people downloading malware
-pref('xpinstall.signatures.required', true);
-pref("extensions.pocket.enabled", false);
-

src/browser/app/profile/features.inc

@@ -1,41 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifdef MOZILLA_OFFICIAL
-  pref('zen.welcome-screen.seen', false, sticky);
-#else
-  pref('zen.welcome-screen.seen', true, sticky);
-#endif
-
-pref('zen.tabs.vertical', true);
-pref('zen.tabs.vertical.right-side', false);
-pref('zen.tabs.rename-tabs', true);
-pref('zen.tabs.show-newtab-vertical', true);
-
-pref('zen.ctrlTab.show-pending-tabs', false);
-
-pref('zen.mediacontrols.enabled', true);
-
-pref('zen.haptic-feedback.enabled', true);
-
-#include features/mods.inc
-#include features/theme.inc
-#include features/compact-mode.inc
-#include features/urlbar.inc
-#include features/glance.inc
-#include features/view.inc
-#include features/downloads.inc
-#include features/workspaces.inc
-#include features/split-view.inc
-#include features/kbs.inc
-
-// Section: Watermark
-#ifdef MOZILLA_OFFICIAL
-  pref('zen.watermark.enabled', true, sticky);
-#else
-  pref('zen.watermark.enabled', false, sticky);
-#endif
-
-// Startup flags
-pref('zen.startup.smooth-scroll-in-tabs', true);

src/browser/app/profile/features/compact-mode.inc

@@ -1,14 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref('zen.view.compact.hide-tabbar', true);
-pref('zen.view.compact.hide-toolbar', false);
-pref('zen.view.compact.toolbar-flash-popup', false);
-pref('zen.view.compact.toolbar-flash-popup.duration', 800);
-pref('zen.view.compact.toolbar-hide-after-hover.duration', 1000);
-pref('zen.view.compact.color-toolbar', true);
-pref('zen.view.compact.color-sidebar', true);
-pref('zen.view.compact.animate-sidebar', true);
-pref('zen.view.compact.show-sidebar-and-toolbar-on-hover', true);
-pref('zen.view.compact.show-background-tab-toast', true);

src/browser/app/profile/features/glance.inc

@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref('zen.glance.enabled', true);
-pref('zen.glance.enable-contextmenu-search', true);
-pref('zen.glance.hold-duration', 300); // in ms
-pref('zen.glance.open-essential-external-links', true);
-pref('zen.glance.activation-method', 'alt'); // ctrl, alt, shift, none, hold

src/browser/app/profile/features/kbs.inc

@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref('zen.keyboard.shortcuts.enabled', true);
-pref('zen.keyboard.shortcuts.version', 0); // Empty string means default shortcuts
-pref('zen.keyboard.shortcuts.disable-mainkeyset-clear', false); // for debugging

src/browser/app/profile/features/mods.inc

@@ -1,17 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref('zen.mods.updated-value-observer', false);
-
-pref('zen.mods.auto-update-days', 20); // In days
-
-#ifdef MOZILLA_OFFICIAL
-  pref('zen.mods.auto-update', true);
-  pref('zen.injections.match-urls', 'https://zen-browser.app/*', locked);
-#else
-  pref('zen.mods.auto-update', false);
-  pref('zen.injections.match-urls', 'http://localhost/*', locked);
-#endif
-
-pref('zen.rice.share.notice.accepted', false);

src/browser/app/profile/features/theme.inc

@@ -1,24 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref('zen.theme.accent-color', "#ffb787");
-pref('zen.theme.content-element-separation', 8); // In pixels
-pref('zen.theme.gradient', true);
-pref('zen.theme.gradient.show-custom-colors', false);
-pref('zen.theme.essentials-favicon-bg', true);
-
-#ifdef XP_MACOSX
-  pref('zen.theme.border-radius', 10); // In pixels
-#else
-  pref('zen.theme.border-radius', 8); // In pixels
-#endif
-
-#ifdef XP_MACOSX
-  pref('zen.theme.acrylic-elements', false);
-#else
-  pref('zen.theme.acrylic-elements', false);
-#endif
-
-# Light weight themes
-pref('zen.theme.disable-lightweight', true);

src/browser/app/profile/features/urlbar.inc

@@ -1,11 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref('zen.urlbar.replace-newtab', true);
-pref('zen.urlbar.show-protections-icon', false);
-pref('zen.urlbar.behavior', 'floating-on-type'); // default, floating-on-type, float
-pref('zen.urlbar.wait-to-clear', 45000); // in ms (default 45s)
-pref('zen.urlbar.show-domain-only-in-sidebar', true);
-pref('zen.urlbar.hide-one-offs', true);
-pref('zen.urlbar.enable-overrides', false);

src/browser/app/profile/features/view.inc

@@ -1,29 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref('zen.view.sidebar-height-throttle', 0); // in ms
-pref('zen.view.sidebar-expanded.max-width', 500);
-
-#ifdef XP_MACOSX
-  pref('zen.view.mac.show-three-dot-menu', false);
-  pref('zen.widget.mac.mono-window-controls', true);
-#endif
-
-pref('zen.view.use-single-toolbar', true);
-pref('zen.view.sidebar-expanded', true);
-pref('zen.view.sidebar-collapsed.hide-mute-button', true);
-pref('zen.view.experimental-force-window-controls-left', false);
-
-pref('zen.view.hide-window-controls', true);
-pref('zen.view.experimental-no-window-controls', false);
-
-pref('zen.view.grey-out-inactive-windows', true);
-
-pref('zen.view.show-newtab-button-border-top', false);
-pref('zen.view.show-newtab-button-top', true);
-
-# 0: Dark
-# 1: Light
-# 2: Auto (system color scheme unless overridden by browser theme)
-pref('zen.view.window.scheme', 2); // auto, light, dark

src/browser/app/profile/features/workspaces.inc

@@ -1,25 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref('zen.workspaces.continue-where-left-off', false);
-pref('zen.workspaces.hide-default-container-indicator', true);
-pref('zen.workspaces.force-container-workspace', false);
-pref('zen.workspaces.open-new-tab-if-last-unpinned-tab-is-closed', false);
-pref('zen.workspaces.swipe-actions', true);
-pref('zen.workspaces.wrap-around-navigation', true);
-pref('zen.workspaces.natural-scroll', false);
-pref('zen.workspaces.scroll-modifier-key','ctrl'); // can be ctrl, alt, shift, or a meta key
-pref('services.sync.engine.workspaces', false);
-pref('zen.workspaces.separate-essentials', true);
-
-#ifdef MOZILLA_OFFICIAL
-  pref('zen.workspaces.debug', false);
-#else
-  pref('zen.workspaces.debug', true);
-#endif
-
-# Section: Pinned tabs management
-pref('zen.pinned-tab-manager.debug', false);
-pref('zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url', false);
-pref('zen.pinned-tab-manager.close-shortcut-behavior', 'reset-unload-switch');

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

@@ -1,10 +0,0 @@
-diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index 412e0879bbb0c7e7d1eb842212b064e1c77cab8f..bd23e5f2cd3f9c382f704fd1fcfdbb3edd71a454 100644
---- a/browser/app/profile/firefox.js
-+++ b/browser/app/profile/firefox.js
-@@ -3361,3 +3361,5 @@ pref("toolkit.contentRelevancy.log", false);
- // rotation altogether.
- pref("browser.contextual-services.contextId.rotation-in-days", 0);
- pref("browser.contextual-services.contextId.rust-component.enabled", false);
-+
-+#include zen-browser.js

src/browser/app/profile/fullscreen.inc

@@ -1,8 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref("full-screen-api.transition-duration.enter", "0 0");
-pref("full-screen-api.transition-duration.leave", "0 0");
-pref("full-screen-api.warning.delay", -1);
-pref("full-screen-api.warning.timeout", 0);

src/browser/app/profile/linux.inc

@@ -1,14 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref("widget.gtk.rounded-bottom-corners.enabled", true);
-
-// Enable transparent background for linux
-#ifdef MOZ_WIDGET_GTK
-pref('zen.widget.linux.transparency', false);
-
-// VAAPI/FFMPEG is Linux only
-pref('media.ffmpeg.vaapi.enabled', true);
-pref('media.ffmpeg.encoder.enabled', true);
-#endif

src/browser/app/profile/media.inc

@@ -1,9 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref('image.jxl.enabled', true, locked);
-pref("svg.context-properties.content.enabled", true);
-pref("image.avif.enabled", true, locked);
-
-pref("media.eme.enabled", true);

src/browser/app/profile/newtab.inc

@@ -1,12 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref('browser.newtabpage.activity-stream.feeds.topsites', false);
-pref('browser.newtabpage.activity-stream.feeds.section.topstories', false);
-pref("browser.topsites.contile.enabled", false);
-pref('browser.newtabpage.activity-stream.system.showWeather', false);
-
-pref('browser.newtabpage.activity-stream.newtabWallpapers.enabled', true);
-pref('browser.newtabpage.activity-stream.newtabWallpapers.v2.enabled', true);
-pref('browser.translations.newSettingsUI.enable', true);

src/browser/app/profile/performance.inc

@@ -1,18 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifdef XP_MACOSX
-# Pref to control the reponse taken on macOS when the OS is under memory
-# pressure. Changes to the pref take effect immediately. Browser restart not
-# required. The pref value is a bitmask:
-# 0x0: No response (other than recording for telemetry, crash reporting)
-# 0x1: Use the tab unloading feature to reduce memory use. Requires that
-#      the above "browser.tabs.unloadOnLowMemory" pref be set to true for tab
-#      unloading to occur.
-# 0x2: Issue the internal "memory-pressure" notification to reduce memory use
-# 0x3: Both 0x1 and 0x2.
-  pref("browser.lowMemoryResponseMask", 3);
-#endif
-
-pref("network.predictor.enable-hover-on-ssl", true);

src/browser/app/profile/privacy.inc

@@ -1,47 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref("datareporting.policy.dataSubmissionEnabled", false, locked);
-pref("datareporting.healthreport.uploadEnabled", false, locked);
-pref("toolkit.telemetry.unified", false, locked);
-pref("toolkit.telemetry.enabled", false, locked);
-pref("toolkit.telemetry.server", "data:,", locked);
-pref("toolkit.telemetry.archive.enabled", false, locked);
-pref("toolkit.telemetry.newProfilePing.enabled", false, locked);
-pref("toolkit.telemetry.shutdownPingSender.enabled", false, locked);
-pref("toolkit.telemetry.updatePing.enabled", false, locked);
-pref("toolkit.telemetry.bhrPing.enabled", false, locked);
-pref("toolkit.telemetry.firstShutdownPing.enabled", false, locked);
-pref("toolkit.telemetry.coverage.opt-out", true, locked);
-pref("toolkit.coverage.opt-out", true, locked);
-pref("toolkit.coverage.endpoint.base", "", locked);
-pref("browser.newtabpage.activity-stream.feeds.telemetry", false, locked);
-pref("browser.newtabpage.activity-stream.telemetry", false, locked);
-pref("browser.ping-centre.telemetry", false);
-pref("browser.attribution.enabled", false);
-pref("toolkit.telemetry.pioneer-new-studies-available", false);
-pref("app.shield.optoutstudies.enabled", false, locked);
-pref("app.normandy.enabled", false);
-pref("app.normandy.api_url", "", locked);
-
-# Crash reports
-pref("breakpad.reportURL", "");
-pref("browser.tabs.crashReporting.sendReport", false);
-pref("browser.crashReports.unsubmittedCheck.autoSubmit2", false);
-
-# Other privacy
-pref("extensions.getAddons.cache.enabled", false);
-
-# Disable cache for private browsing
-pref("browser.privatebrowsing.forceMediaMemoryCache", true);
-
-# Tracking protection
-pref("browser.helperApps.deleteTempFileOnExit", true);
-pref("browser.uitour.enabled", false);
-
-pref("privacy.globalprivacycontrol.enabled", true);
-
-# Contextual identity
-pref('privacy.userContext.enabled', true);
-pref('privacy.userContext.ui.enabled', true);

src/browser/app/profile/smoothscroll.inc

@@ -1,15 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref("general.smoothScroll.msdPhysics.enabled", true);
-pref("general.smoothScroll.currentVelocityWeighting", "0.15");
-pref("general.smoothScroll.stopDecelerationWeighting", "0.6");
-pref("mousewheel.min_line_scroll_amount", 10);
-pref("general.smoothScroll.mouseWheel.durationMinMS", 80);
-pref("general.smoothScroll.msdPhysics.continuousMotionMaxDeltaMS", 12);
-pref("general.smoothScroll.msdPhysics.motionBeginSpringConstant", 600);
-pref("general.smoothScroll.msdPhysics.regularSpringConstant", 650);
-pref("general.smoothScroll.msdPhysics.slowdownMinDeltaMS", 25);
-pref("general.smoothScroll.msdPhysics.slowdownSpringConstant", 250);
-pref("mousewheel.default.delta_multiplier_y", 200);

src/browser/app/profile/urlbar.inc

@@ -1,35 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-pref('browser.urlbar.unitConversion.enabled', true);
-pref('browser.urlbar.trending.featureGate', false);
-pref('browser.urlbar.weather.featureGate', false);
-pref('browser.urlbar.quickactions.enabled', true);
-pref('browser.urlbar.clipboard.featureGate', true);
-pref('browser.urlbar.suggest.calculator', true);
-
-pref("browser.urlbar.trimHttps", true);
-pref("browser.urlbar.untrimOnUserInteraction.featureGate", true);
-
-# Keep in sync with browser/components/topsites/constants.mjs
-pref("browser.urlbar.maxRichResults", 7);
-
-# Enable private suggestions
-pref('browser.search.suggest.enabled', false);
-pref('browser.search.suggest.enabled.private', false);
-
-pref("browser.urlbar.trimHttps", true);
-pref("browser.search.separatePrivateDefault.ui.enabled", true);
-pref("browser.urlbar.update2.engineAliasRefresh", true);
-pref("browser.urlbar.quicksuggest.enabled", false, locked);
-pref("browser.urlbar.suggest.quicksuggest.sponsored", false, locked);
-pref("browser.urlbar.suggest.quicksuggest.nonsponsored", false, locked);
-pref("browser.urlbar.groupLabels.enabled", false);
-pref("browser.urlbar.keepPanelOpenDuringImeComposition", true); // IMPORTANT: Fixes closing the urlbar when on some languages
-pref("browser.formfill.enable", false);
-pref("security.insecure_connection_text.enabled", true);
-pref("security.insecure_connection_text.pbmode.enabled", true);
-pref("network.IDN_show_punycode", true);
-
-pref("browser.urlbar.suggest.topsites", true, locked);

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

@@ -1,41 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifdef XP_UNIX
-  #ifndef XP_MACOSX
-    #define UNIX_BUT_NOT_MAC
-  #endif
-#endif
-
-# Dont download the multilingual dictionary
-pref("intl.multilingual.downloadEnabled", false);
-
-#ifdef XP_WIN
-  #include windows.inc
-#endif
-
-#ifdef UNIX_BUT_NOT_MAC
-  #include linux.inc
-#endif
-
-#ifdef XP_MACOSX
-  #include macos.inc
-#endif
-
-#include urlbar.inc
-#include newtab.inc
-#include pdf.inc
-#include extensions.inc
-#include privacy.inc
-#include media.inc
-#include browser.inc
-
-#include features.inc
-
-#ifndef XP_MACOSX
-  #include smoothscroll.inc
-#endif
-
-#include performance.inc
-#include pip.inc

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

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-addons.js b/browser/base/content/browser-addons.js
-index f4d5125d9a1c8f0aef24536ca7d2ef3f133d8a99..cacd7f465e67226de4a366354779c6cb0cbd0b4c 100644
+index 061edde0e05e0744ba1aa80df5f9699e264fe69b..cc2b2f04758ee9690429ea6c4aad959d858218e8 100644
 --- a/browser/base/content/browser-addons.js
 +++ b/browser/base/content/browser-addons.js
 @@ -1057,7 +1057,7 @@ var gXPInstallObserver = {
@@ -46,8 +46,8 @@ index f4d5125d9a1c8f0aef24536ca7d2ef3f133d8a99..cacd7f465e67226de4a366354779c6cb
 +    await gZenVerticalTabsManager._preCustomize();
  
      CustomizableUI.addWidgetToArea(widgetId, newArea, newPosition);
- 
-     this.updateAttention();
+     // addWidgetToArea() will trigger onWidgetAdded or onWidgetMoved as needed,
+     // and our handlers will call updateAttention() as needed.
 +    await gZenVerticalTabsManager._postCustomize();
    },
  

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

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-commands.js b/browser/base/content/browser-commands.js
-index b0b2383453ef771af3eb9260618f1e2e3022eb4e..7c5844582d9adb55c55fb1627a9980cf0e5c110b 100644
+index b0b2383453ef771af3eb9260618f1e2e3022eb4e..d631cc8db95b4285e892ac8fcb5e72b7da489850 100644
 --- a/browser/base/content/browser-commands.js
 +++ b/browser/base/content/browser-commands.js
 @@ -318,6 +318,10 @@ var BrowserCommands = {
@@ -13,21 +13,19 @@ index b0b2383453ef771af3eb9260618f1e2e3022eb4e..7c5844582d9adb55c55fb1627a9980cf
      // A notification intended to be useful for modular peformance tracking
      // starting as close as is reasonably possible to the time when the user
      // expressed the intent to open a new tab.  Since there are a lot of
-@@ -402,6 +406,13 @@ var BrowserCommands = {
+@@ -402,6 +406,11 @@ var BrowserCommands = {
        return;
      }
  
 +    if (gBrowser.selectedTab.hasAttribute("zen-empty-tab")) {
-+      if (gZenWorkspaces.shouldCloseWindow()) {
-+        closeWindow(true);
-+      }
++      gZenWorkspaces.handleTabCloseWindow();
 +      return;
 +    }
 +
      // Keyboard shortcuts that would close a tab that is pinned select the first
      // unpinned tab instead.
      if (
-@@ -409,8 +420,8 @@ var BrowserCommands = {
+@@ -409,8 +418,8 @@ var BrowserCommands = {
        (event.ctrlKey || event.metaKey || event.altKey) &&
        gBrowser.selectedTab.pinned
      ) {

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

@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index 6d664917a5a3bb1cea8a747e42e8bc0065ec999e..dfacd5c40ef14319fe7398452c007f167003a583 100644
+index 8e839c497bba9de04948ad8759679b6a6f61a65f..877ec60553fc64fea860de297dc0858eb05bae7f 100644
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
-@@ -33,6 +33,7 @@ ChromeUtils.defineESModuleGetters(this, {
+@@ -29,6 +29,7 @@ ChromeUtils.defineESModuleGetters(this, {
    ContextualIdentityService:
      "resource://gre/modules/ContextualIdentityService.sys.mjs",
    CustomizableUI: "resource:///modules/CustomizableUI.sys.mjs",
@@ -10,7 +10,7 @@ index 6d664917a5a3bb1cea8a747e42e8bc0065ec999e..dfacd5c40ef14319fe7398452c007f16
    DevToolsSocketStatus:
      "resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs",
    DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
-@@ -2340,6 +2341,10 @@ var XULBrowserWindow = {
+@@ -2282,6 +2283,10 @@ var XULBrowserWindow = {
      AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
      TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
  
@@ -21,7 +21,7 @@ index 6d664917a5a3bb1cea8a747e42e8bc0065ec999e..dfacd5c40ef14319fe7398452c007f16
      PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
  
      if (!gMultiProcessBrowser) {
-@@ -4816,7 +4821,7 @@ function switchToTabHavingURI(
+@@ -4617,7 +4622,7 @@ function switchToTabHavingURI(
        ignoreQueryString || replaceQueryString,
        ignoreFragmentWhenComparing
      );
@@ -30,7 +30,7 @@ index 6d664917a5a3bb1cea8a747e42e8bc0065ec999e..dfacd5c40ef14319fe7398452c007f16
      for (let i = 0; i < browsers.length; i++) {
        let browser = browsers[i];
        let browserCompare = cleanURL(
-@@ -4859,7 +4864,7 @@ function switchToTabHavingURI(
+@@ -4660,7 +4665,7 @@ function switchToTabHavingURI(
          }
  
          if (!doAdopt) {
@@ -39,7 +39,7 @@ index 6d664917a5a3bb1cea8a747e42e8bc0065ec999e..dfacd5c40ef14319fe7398452c007f16
          }
  
          return true;
-@@ -5717,6 +5722,9 @@ var ConfirmationHint = {
+@@ -5476,6 +5481,9 @@ var ConfirmationHint = {
      MozXULElement.insertFTLIfNeeded("toolkit/branding/brandings.ftl");
      MozXULElement.insertFTLIfNeeded("browser/confirmationHints.ftl");
      document.l10n.setAttributes(this._message, messageId, options.l10nArgs);

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

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index 8f8c5536cb6e54300897180ca3f950974c60e930..78076e29faf749b83d6c8e099af6767621f34d58 100644
+index 665b048cf149b9a6d0ccc43f8d9199f077b8ada2..d031a99ae5c9c6e69cfd831c7d271d8a8d097dc8 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
 @@ -26,6 +26,7 @@
@@ -10,7 +10,7 @@ index 8f8c5536cb6e54300897180ca3f950974c60e930..78076e29faf749b83d6c8e099af67676
          persist="screenX screenY width height sizemode"
          data-l10n-sync="true">
  <head>
-@@ -105,8 +106,10 @@
+@@ -103,8 +104,10 @@
  
    <title data-l10n-id="browser-main-window-default-title"></title>
  
@@ -21,7 +21,7 @@ index 8f8c5536cb6e54300897180ca3f950974c60e930..78076e29faf749b83d6c8e099af67676
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -128,9 +131,11 @@
+@@ -126,9 +129,11 @@
      </vbox>
    </html:template>
  

src/browser/base/content/navigator-toolbox-inc-xhtml.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index ad1515eb111bc2532b2f17ea28fc04463030d30d..899f4baf2cd3472abd5591f3c9987f0c02b9313f 100644
+index 5f79e21271ad8b4e97604b9c84ed4e6e9de4a5f2..1c8cc6795d51130b29a32ecafa40e27ea6df655e 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -2,7 +2,7 @@
@@ -22,15 +22,15 @@ index ad1515eb111bc2532b2f17ea28fc04463030d30d..899f4baf2cd3472abd5591f3c9987f0c
    <toolbar id="TabsToolbar"
             class="browser-toolbar browser-titlebar"
             fullscreentoolbar="true"
-@@ -50,6 +50,8 @@
-               tooltip="tabbrowser-tab-tooltip"
-               orient="horizontal"
-               stopwatchid="tabClick">
+@@ -56,6 +56,8 @@
+ # the current structure that we may want to revisit.
+           <arrowscrollbox id="pinned-tabs-container" orient="horizontal" tabindex="-1"></arrowscrollbox>
+           <splitter orient="vertical" id="vertical-pinned-tabs-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
 +<html:div id="zen-essentials" skipintoolbarset="true"></html:div>
 +<html:div id="zen-tabs-wrapper">
            <hbox class="tab-drop-indicator" hidden="true"/>
- # If the name (tabbrowser-arrowscrollbox) or structure of this changes
- # significantly, there is an optimization in
+           <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="horizontal" flex="1" clicktoscroll="" scrolledtostart="" scrolledtoend="">
+             <tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="" fadein=""/>
 @@ -75,6 +77,7 @@
                                tooltip="dynamic-shortcut-tooltip"
                                data-l10n-id="tabs-toolbar-new-tab"/>

src/browser/base/content/nsContextMenu-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
-index 3bd0ee8af8b696161d18fd2a978f9e25972ed3ad..9e602a942271bd54231dc66363f8db51aea9e78a 100644
+index e5ae99edff6cef4964ff15a7d32b0f9c80625425..6b7b6e75c76b25319334113bf2f17817f67e1073 100644
 --- a/browser/base/content/nsContextMenu.sys.mjs
 +++ b/browser/base/content/nsContextMenu.sys.mjs
-@@ -1111,6 +1111,8 @@ export class nsContextMenu {
+@@ -1050,6 +1050,8 @@ export class nsContextMenu {
          !this.isSecureAboutPage()
      );
  

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

@@ -12,8 +12,9 @@
         content/browser/zen-components/ZenUIMigration.mjs                       (../../zen/common/ZenUIMigration.mjs)
         content/browser/zen-components/ZenCommonUtils.mjs                       (../../zen/common/ZenCommonUtils.mjs)
         content/browser/zen-components/ZenSessionStore.mjs                      (../../zen/common/ZenSessionStore.mjs)
-        content/browser/zen-components/ZenEmojisData.min.mjs                        (../../zen/common/emojis/ZenEmojisData.min.mjs)
+        content/browser/zen-components/ZenEmojisData.min.mjs                    (../../zen/common/emojis/ZenEmojisData.min.mjs)
         content/browser/zen-components/ZenEmojiPicker.mjs                       (../../zen/common/emojis/ZenEmojiPicker.mjs)
+        content/browser/zen-components/ZenHasPolyfill.mjs                       (../../zen/common/ZenHasPolyfill.mjs)
 
         content/browser/zen-styles/zen-theme.css                                (../../zen/common/styles/zen-theme.css)
         content/browser/zen-styles/zen-buttons.css                              (../../zen/common/styles/zen-buttons.css)
@@ -29,7 +30,6 @@
         content/browser/zen-styles/zen-branding.css                             (../../zen/common/styles/zen-branding.css)
 
         content/browser/zen-styles/zen-panels/bookmarks.css                     (../../zen/common/styles/zen-panels/bookmarks.css)
-        content/browser/zen-styles/zen-panels/extensions.css                    (../../zen/common/styles/zen-panels/extensions.css)
         content/browser/zen-styles/zen-panels/print.css                         (../../zen/common/styles/zen-panels/print.css)
         content/browser/zen-styles/zen-panels/dialog.css                        (../../zen/common/styles/zen-panels/dialog.css)
 

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

@@ -53,6 +53,10 @@
 
   <command id="cmd_zenCopyCurrentURL" />
   <command id="cmd_zenCopyCurrentURLMarkdown" />
+
+  <command id="cmd_zenGlanceClose" />
+  <command id="cmd_zenGlanceExpand" />
+  <command id="cmd_zenGlanceSplit" />
 </commandset>
 
 <keyset id="zenKeyset"></keyset>

src/browser/base/content/zen-panels/gradient-generator.inc

@@ -100,7 +100,13 @@
                 </defs>
               </svg>
             </box>
-            <html:input type="range" min="0.3" max="0.8" value="0.4" step="0.001" id="PanelUI-zen-gradient-generator-opacity" />
+            <html:input type="range" max="0.9" value="0.4" step="0.001" id="PanelUI-zen-gradient-generator-opacity"
+#ifdef XP_MACOSX
+              min="0.25"
+#else
+              min="0.35"
+#endif
+              />
           </vbox>
           <vbox id="PanelUI-zen-gradient-generator-texture-wrapper">
           </vbox>
@@ -110,7 +116,8 @@
         <vbox id="zen-theme-picker-color">
           <label data-l10n-id="zen-panel-ui-gradient-generator-custom-color"></label>
           <hbox>
-            <html:input type="text" placeholder="#000000" id="PanelUI-zen-gradient-generator-custom-input" />
+            <html:input type="color" id="PanelUI-zen-gradient-generator-custom-input" />
+            <html:input type="number" value="1" min="0" max="1" step="0.01" id="PanelUI-zen-gradient-generator-custom-opacity" />
             <toolbarbutton id="PanelUI-zen-gradient-generator-color-custom-add" class="subviewbutton">
               <image></image>
             </toolbarbutton>

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

@@ -5,7 +5,8 @@
 # This needs to be here, before all the other scripts, because it's used before
 # the window is fully loaded.
 # Make sure they are loaded before the global-scripts.inc file.
-<script type="text/javascript" src="chrome://browser/content/zen-sets.js"></script>                                  
+<script type="text/javascript" src="chrome://browser/content/zen-sets.js"></script>
+<script type="text/javascript" src="chrome://browser/content/zen-components/ZenHasPolyfill.mjs"></script>
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenCommonUtils.mjs"></script>
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs"></script>
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspaceIcons.mjs"></script>

src/browser/base/jar-mn.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
-index 4401c78d34007fa7481f8b8eeb070d17110821ae..064f14a7adf4ce1b98d58302998272444466c3ee 100644
+index ad10fe2c55c422090ebfc3989ca6858c1d958a10..0ff76c3bd768b2b337683a35f8dbd197f421905c 100644
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
 @@ -105,3 +105,5 @@ browser.jar:

src/browser/base/moz-build.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/base/moz.build b/browser/base/moz.build
-index 9da444880c4dbf188443d43e8d0a71d98311a2b7..3a654be6f78931e92479b30de6f0a6e50da81908 100644
+index 803f8a5b62608af58fc43bd9fab298a63fa549a4..2e00cb9d02dade5cd9b8d3dea5d948ac6e829c26 100644
 --- a/browser/base/moz.build
 +++ b/browser/base/moz.build
-@@ -81,3 +81,5 @@ DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
+@@ -82,3 +82,5 @@ DEFINES["MOZ_APP_VERSION_DISPLAY"] = CONFIG["MOZ_APP_VERSION_DISPLAY"]
  DEFINES["APP_LICENSE_BLOCK"] = "%s/content/overrides/app-license.html" % SRCDIR
  
  JAR_MANIFESTS += ["jar.mn"]

src/browser/components/BrowserContentHandler-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs
-index e72feb538c0dc182211945a66e51bcea73d3d4a0..b4d9115873b7af414043c53fb817b611b78ec58f 100644
+index 415d1d52507e0710a3c1daa5864618527b162100..f420fcb8db2ed6f33eb3b38ec9bd213809aa74c3 100644
 --- a/browser/components/BrowserContentHandler.sys.mjs
 +++ b/browser/components/BrowserContentHandler.sys.mjs
-@@ -1281,6 +1281,7 @@ function maybeRecordToHandleTelemetry(uri, isLaunch) {
+@@ -1276,6 +1276,7 @@ function maybeRecordToHandleTelemetry(uri, isLaunch) {
        ".avif",
        ".htm",
        ".html",

src/browser/components/BrowserGlue-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
-index bde641f7112adde948707c172b9f18d3635d8ef1..3f430451586904e6be086114ec10f719745093be 100644
+index 05a5063427e4038b3d57f6f5bae31b60428c7880..a01e25b52ffc3a68dddb513cb085b7df726d15b0 100644
 --- a/browser/components/BrowserGlue.sys.mjs
 +++ b/browser/components/BrowserGlue.sys.mjs
 @@ -8,6 +8,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
@@ -10,6 +10,15 @@ index bde641f7112adde948707c172b9f18d3635d8ef1..3f430451586904e6be086114ec10f719
    AboutHomeStartupCache: "resource:///modules/AboutHomeStartupCache.sys.mjs",
    AWToolbarButton: "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs",
    ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs",
+@@ -1496,7 +1497,7 @@ BrowserGlue.prototype = {
+       windowcount++;
+       let tabbrowser = win.gBrowser;
+       if (tabbrowser) {
+-        pagecount += tabbrowser.visibleTabs.length - tabbrowser.pinnedTabCount;
++        pagecount += tabbrowser.visibleTabs.filter(t => t.getAttribute("pending")!=="true").length;
+       }
+     }
+ 
 @@ -1659,6 +1660,8 @@ BrowserGlue.prototype = {
      } else if (profileDataVersion < APP_DATA_VERSION) {
        lazy.ProfileDataUpgrader.upgrade(profileDataVersion, APP_DATA_VERSION);

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361efac34729 100644
+index 8c9b11d0c1ce7ae016889950e92b3adda318235c..ba81498aa16ce844a8d189c047f596d1969f4fed 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -10,7 +10,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
    HomePage: "resource:///modules/HomePage.sys.mjs",
    PanelMultiView: "resource:///modules/PanelMultiView.sys.mjs",
    PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
-@@ -331,20 +332,14 @@ var CustomizableUIInternal = {
+@@ -331,19 +332,14 @@ var CustomizableUIInternal = {
        "back-button",
        "forward-button",
        "stop-reload-button",
@@ -21,7 +21,6 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
        "vertical-spacer",
        "urlbar-container",
        "spring",
--      "save-to-pocket-button",
 -      "downloads-button",
        AppConstants.MOZ_DEV_EDITION ? "developer-button" : null,
 -      "fxa-toolbar-menu-button",
@@ -32,7 +31,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
      this.registerArea(
        CustomizableUI.AREA_NAVBAR,
        {
-@@ -352,8 +347,6 @@ var CustomizableUIInternal = {
+@@ -351,8 +347,6 @@ var CustomizableUIInternal = {
          overflowable: true,
          defaultPlacements: navbarPlacements,
          verticalTabsDefaultPlacements: [
@@ -41,7 +40,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
          ],
          defaultCollapsed: false,
        },
-@@ -377,10 +370,7 @@ var CustomizableUIInternal = {
+@@ -376,10 +370,7 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_TOOLBAR,
          defaultPlacements: [
@@ -52,7 +51,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
          ],
          verticalTabsDefaultPlacements: [],
          defaultCollapsed: null,
-@@ -462,6 +452,7 @@ var CustomizableUIInternal = {
+@@ -461,6 +452,7 @@ var CustomizableUIInternal = {
        CustomizableUI.AREA_NAVBAR,
        CustomizableUI.AREA_BOOKMARKS,
        CustomizableUI.AREA_TABSTRIP,
@@ -60,7 +59,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
      ]);
      if (AppConstants.platform != "macosx") {
        toolbars.add(CustomizableUI.AREA_MENUBAR);
-@@ -1262,6 +1253,9 @@ var CustomizableUIInternal = {
+@@ -1245,6 +1237,9 @@ var CustomizableUIInternal = {
          placements = gPlacements.get(area);
        }
  
@@ -70,7 +69,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
        // For toolbars that need it, mark as dirty.
        let defaultPlacements = areaProperties.get("defaultPlacements");
        if (
-@@ -1769,7 +1763,7 @@ var CustomizableUIInternal = {
+@@ -1752,7 +1747,7 @@ var CustomizableUIInternal = {
          lazy.log.info(
            "Widget " + aWidgetId + " not found, unable to remove from " + aArea
          );
@@ -79,7 +78,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
        }
  
        this.notifyDOMChange(widgetNode, null, container, true, () => {
-@@ -1779,7 +1773,7 @@ var CustomizableUIInternal = {
+@@ -1762,7 +1757,7 @@ var CustomizableUIInternal = {
          // We also need to remove the panel context menu if it's there:
          this.ensureButtonContextMenu(widgetNode);
          if (gPalette.has(aWidgetId) || this.isSpecialWidget(aWidgetId)) {
@@ -88,7 +87,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
          } else {
            window.gNavToolbox.palette.appendChild(widgetNode);
          }
-@@ -1947,16 +1941,16 @@ var CustomizableUIInternal = {
+@@ -1930,16 +1925,16 @@ var CustomizableUIInternal = {
          elem.setAttribute("skipintoolbarset", "true");
        }
      }
@@ -108,7 +107,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
      // Handle initial state of vertical tabs.
      if (isVerticalTabs) {
        // Show the vertical tabs toolbar
-@@ -2198,6 +2192,10 @@ var CustomizableUIInternal = {
+@@ -2181,6 +2176,10 @@ var CustomizableUIInternal = {
     *   The identifier string of the area that aNode is being inserted into.
     */
    insertWidgetBefore(aNode, aNextNode, aContainer, aAreaId) {
@@ -119,7 +118,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
      this.notifyDOMChange(aNode, aNextNode, aContainer, false, () => {
        this.setLocationAttributes(aNode, aAreaId);
        aContainer.insertBefore(aNode, aNextNode);
-@@ -3321,7 +3319,6 @@ var CustomizableUIInternal = {
+@@ -3301,7 +3300,6 @@ var CustomizableUIInternal = {
      if (!this.isWidgetRemovable(aWidgetId)) {
        return;
      }
@@ -127,7 +126,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
      let placements = gPlacements.get(oldPlacement.area);
      let position = placements.indexOf(aWidgetId);
      if (position != -1) {
-@@ -4556,7 +4553,7 @@ var CustomizableUIInternal = {
+@@ -4536,7 +4534,7 @@ var CustomizableUIInternal = {
     * For all registered areas, builds those areas to reflect the current
     * placement state of all widgets.
     */
@@ -136,7 +135,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
      for (let [areaId, areaNodes] of gBuildAreas) {
        let placements = gPlacements.get(areaId);
        let isFirstChangedToolbar = true;
-@@ -4567,7 +4564,7 @@ var CustomizableUIInternal = {
+@@ -4547,7 +4545,7 @@ var CustomizableUIInternal = {
          if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
            let defaultCollapsed = area.get("defaultCollapsed");
            let win = areaNode.ownerGlobal;
@@ -145,7 +144,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
              win.setToolbarVisibility(
                areaNode,
                typeof defaultCollapsed == "string"
-@@ -5858,6 +5855,7 @@ export var CustomizableUI = {
+@@ -5838,6 +5836,7 @@ export var CustomizableUI = {
    unregisterArea(aName, aDestroyPlacements) {
      CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
    },
@@ -153,7 +152,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
    /**
     * Add a widget to an area.
     * If the area to which you try to add is not known to CustomizableUI,
-@@ -7905,11 +7903,11 @@ class OverflowableToolbar {
+@@ -7885,11 +7884,11 @@ class OverflowableToolbar {
          parseFloat(style.paddingLeft) -
          parseFloat(style.paddingRight) -
          toolbarChildrenWidth;
@@ -167,7 +166,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
      });
  
      lazy.log.debug(
-@@ -7919,7 +7917,8 @@ class OverflowableToolbar {
+@@ -7899,7 +7898,8 @@ class OverflowableToolbar {
      // If the target has min-width: 0, their children might actually overflow
      // it, so check for both cases explicitly.
      let targetContentWidth = Math.max(targetWidth, targetChildrenWidth);
@@ -177,7 +176,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
      return { isOverflowing, targetContentWidth, totalAvailWidth };
    }
  
-@@ -8013,7 +8012,7 @@ class OverflowableToolbar {
+@@ -7993,7 +7993,7 @@ class OverflowableToolbar {
          }
        }
        if (!inserted) {
@@ -186,7 +185,7 @@ index 5bb6be19f7f855b129aac921af1ed5cfc63d732b..41230a61f3088a234903dcc10abd361e
        }
        child.removeAttribute("cui-anchorid");
        child.removeAttribute("overflowedItem");
-@@ -8358,7 +8357,7 @@ class OverflowableToolbar {
+@@ -8338,7 +8338,7 @@ class OverflowableToolbar {
          break;
        }
        case "mousedown": {

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

@@ -1,8 +1,8 @@
 diff --git a/browser/components/customizableui/CustomizeMode.sys.mjs b/browser/components/customizableui/CustomizeMode.sys.mjs
-index 619bb2af5a3a0995fc93fa040696dd2854848ab5..14ad5f6122971a0a0dc20d22acdc073f84965dad 100644
+index bc601c9cd248637f304b8f3219862e8e6f6c7506..da28068906ddeb81337696da568608edb43223b7 100644
 --- a/browser/components/customizableui/CustomizeMode.sys.mjs
 +++ b/browser/components/customizableui/CustomizeMode.sys.mjs
-@@ -500,7 +500,7 @@ export class CustomizeMode {
+@@ -502,7 +502,7 @@ export class CustomizeMode {
        this.#transitioning = true;
  
        let customizer = document.getElementById("customization-container");
@@ -11,7 +11,7 @@ index 619bb2af5a3a0995fc93fa040696dd2854848ab5..14ad5f6122971a0a0dc20d22acdc073f
        browser.hidden = true;
        customizer.hidden = false;
  
-@@ -637,7 +637,7 @@ export class CustomizeMode {
+@@ -639,7 +639,7 @@ export class CustomizeMode {
      }
  
      let customizer = document.getElementById("customization-container");
@@ -20,7 +20,7 @@ index 619bb2af5a3a0995fc93fa040696dd2854848ab5..14ad5f6122971a0a0dc20d22acdc073f
      customizer.hidden = true;
      browser.hidden = false;
  
-@@ -1173,6 +1173,7 @@ export class CustomizeMode {
+@@ -1175,6 +1175,7 @@ export class CustomizeMode {
      return (
        aNode.localName == "toolbarbutton" ||
        aNode.localName == "toolbaritem" ||
@@ -28,7 +28,7 @@ index 619bb2af5a3a0995fc93fa040696dd2854848ab5..14ad5f6122971a0a0dc20d22acdc073f
        aNode.localName == "toolbarseparator" ||
        aNode.localName == "toolbarspring" ||
        aNode.localName == "toolbarspacer"
-@@ -3125,6 +3126,20 @@ export class CustomizeMode {
+@@ -3127,6 +3128,20 @@ export class CustomizeMode {
          if (makeSpaceImmediately) {
            aDraggedOverItem.setAttribute("notransition", "true");
          }

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

@@ -1,8 +1,8 @@
 diff --git a/browser/components/customizableui/ToolbarContextMenu.sys.mjs b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-index b88b0166fb99bc3d44a2e05798650b8ad6ab9a46..2e66c8294f0ef4f91ae160bd55b7417b55e9f5b2 100644
+index 0924175cecdceade096a325b2d4cd2656da24524..3c1e4a179d13aac740069c23e9bf8e40376d5032 100644
 --- a/browser/components/customizableui/ToolbarContextMenu.sys.mjs
 +++ b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-@@ -240,8 +240,8 @@ export var ToolbarContextMenu = {
+@@ -241,8 +241,8 @@ export var ToolbarContextMenu = {
      // Show/hide sidebar and vertical tabs menu items
      let sidebarRevampEnabled = Services.prefs.getBoolPref("sidebar.revamp");
      let showSidebarActions =

src/browser/components/customizableui/content/panelUI-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
-index 689205034d9df67ff1fe0ebbf4a3481a5f414391..2fab7474f1038a7a3cd2f4b4798d59696900cc85 100644
+index b3c4898fa5aa7ba997d84a2b4fdce398978e1150..736d7aca6232e94a1de0afe2c292060c5c622565 100644
 --- a/browser/components/customizableui/content/panelUI.js
 +++ b/browser/components/customizableui/content/panelUI.js
-@@ -516,8 +516,7 @@ const PanelUI = {
+@@ -517,8 +517,7 @@ const PanelUI = {
          tempPanel.setAttribute("animate", "false");
        }
        tempPanel.setAttribute("context", "");
@@ -12,7 +12,7 @@ index 689205034d9df67ff1fe0ebbf4a3481a5f414391..2fab7474f1038a7a3cd2f4b4798d5969
          .appendChild(tempPanel);
  
        let multiView = document.createXULElement("panelmultiview");
-@@ -608,10 +607,12 @@ const PanelUI = {
+@@ -609,10 +608,12 @@ const PanelUI = {
      if (hasKids && !this.navbar.hasAttribute("nonemptyoverflow")) {
        this.navbar.setAttribute("nonemptyoverflow", "true");
        this.overflowPanel.setAttribute("hasfixeditems", "true");
@@ -25,7 +25,7 @@ index 689205034d9df67ff1fe0ebbf4a3481a5f414391..2fab7474f1038a7a3cd2f4b4798d5969
      }
    },
  
-@@ -959,7 +960,7 @@ const PanelUI = {
+@@ -960,7 +961,7 @@ const PanelUI = {
          el.removeAttribute("data-lazy-l10n-id");
        });
  

src/browser/components/customizableui/content/zenCustomizationMode.inc.xhtml

@@ -1,4 +0,0 @@
-
-<toolbarseparator hidden="true" id="zen-customization-uidensity-separator"/>
-<html:input hidden="true" type="range" id="customization-zen-browser-space" min="0" max="16" step="4"></html:input>
-<label hidden="true" data-l10n-id="customization-zen-browser-space" for="customization-zen-browser-space"/>

src/browser/components/places/PlacesUIUtils-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/places/PlacesUIUtils.sys.mjs b/browser/components/places/PlacesUIUtils.sys.mjs
-index c7c5c28e1ea6d05094ed9fe751c6b50ab9645370..72f1038aa37b0951a1e78331ee317f714e5b6e8b 100644
+index 513199c212ab22c8af9e084352b6aa2647818000..9610e73af653fbc620e330a1e6e7b543dce50234 100644
 --- a/browser/components/places/PlacesUIUtils.sys.mjs
 +++ b/browser/components/places/PlacesUIUtils.sys.mjs
 @@ -59,6 +59,7 @@ class BookmarkState {

src/browser/components/places/content/editBookmark-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/places/content/editBookmark.js b/browser/components/places/content/editBookmark.js
-index 9ab4e96cc4738d0ba549dca67b8559e0f9534f37..07b9087b0b17e33853d78c66ea1e5321a2bfef80 100644
+index ac84ff7b7623a279191c7608ef0b47363b54cd31..53919bae7a49f1e87edaedc8072ee08fb697811b 100644
 --- a/browser/components/places/content/editBookmark.js
 +++ b/browser/components/places/content/editBookmark.js
 @@ -386,6 +386,10 @@ var gEditItemOverlay = {

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

@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/dialogs/syncChooseWhatToSync.js b/browser/components/preferences/dialogs/syncChooseWhatToSync.js
-index a38c2a235971f2fe470f9bee92fc9c1a6d9b8b15..564be3dabe01621a621ca586421cdb77e0220f8b 100644
+index 64aa0d98a0622c01f3dcfff1a04bfcda368354d2..2013e04b0881ad2295d6897b91e1573cc6efc571 100644
 --- a/browser/components/preferences/dialogs/syncChooseWhatToSync.js
 +++ b/browser/components/preferences/dialogs/syncChooseWhatToSync.js
-@@ -13,6 +13,7 @@ Preferences.addAll([
+@@ -21,6 +21,7 @@ Preferences.addAll([
    { id: "services.sync.engine.passwords", type: "bool" },
    { id: "services.sync.engine.addresses", type: "bool" },
    { id: "services.sync.engine.creditcards", type: "bool" },

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

@@ -1,5 +1,5 @@
 diff --git a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
-index 6e74bbce9096179d38db422879349013f3954fa9..859f8b9640ef49411164f8e5160d4d9b8db11e54 100644
+index ef127a1bc2e3ea4221b641156c38a74edb3b44ae..acd39fe7f6dc7ec03ea50928e2d002791b834dcf 100644
 --- a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
 +++ b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
 @@ -27,6 +27,10 @@
@@ -13,7 +13,7 @@ index 6e74bbce9096179d38db422879349013f3954fa9..859f8b9640ef49411164f8e5160d4d9b
      </linkset>
      <script src="chrome://global/content/preferencesBindings.js" />
      <script src="chrome://browser/content/preferences/dialogs/syncChooseWhatToSync.js" />
-@@ -79,6 +83,12 @@
+@@ -87,6 +91,12 @@
            preference="services.sync.engine.prefs"
          />
        </html:div>