diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 3a8365b99..2e6c49487 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,4 @@
-blank_issues_enabled: false 
+blank_issues_enabled: false
 contact_links:
   - name: Feature Request
     url: https://github.com/zen-browser/desktop/discussions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 33ccfa668..60a68b902 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,7 +58,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: [debug-inputs]
     steps:
-
       - uses: actions/checkout@v4
         with:
           submodules: recursive
@@ -206,7 +205,7 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     needs: [build-data, check-release]
-    
+
     steps:
       - name: Install Node.js
         uses: actions/setup-node@v3
@@ -341,7 +340,7 @@ jobs:
         run: |
           npm install -g pnpm
           sudo apt-get update
-          sudo apt-get -y install libfuse2 desktop-file-utils appstream 
+          sudo apt-get -y install libfuse2 desktop-file-utils appstream
 
       - name: Download linux build
         uses: actions/download-artifact@v4
@@ -431,7 +430,7 @@ jobs:
           mkdir -p updates
           cp -a ../linux_update_manifest_generic/.  updates/
           cp -a ../linux_update_manifest_specific/.  updates/
-          cp -a ../linux_update_manifest_aarch64/.  updates/ 
+          cp -a ../linux_update_manifest_aarch64/.  updates/
 
           if [[ $RELEASE_BRANCH == 'alpha' ]]; then
             cp -a ../.github/workflows/object/windows-x64-signed-generic/update_manifest/.  updates/
diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
index f311a87e6..206960ca5 100644
--- a/.github/workflows/linux-release-build.yml
+++ b/.github/workflows/linux-release-build.yml
@@ -13,7 +13,6 @@ on:
 
 jobs:
   build-linux:
-    
     permissions:
       contents: write
     runs-on: ubuntu-latest
diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml
index c72c4679f..55c09ffc4 100644
--- a/.github/workflows/macos-release-build.yml
+++ b/.github/workflows/macos-release-build.yml
@@ -14,7 +14,7 @@ on:
 jobs:
   mac-build:
     name: Build macOS - ${{ matrix.arch }}
-    
+
     runs-on: macos-14
     strategy:
       fail-fast: false
@@ -98,7 +98,7 @@ jobs:
       - name: Install dependencies
         run: |
           pnpm install
-        
+
       - name: Load surfer CI setup
         run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
 
diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
index 67832d0b7..b4a38764f 100644
--- a/.github/workflows/pr-test.yml
+++ b/.github/workflows/pr-test.yml
@@ -1,11 +1,10 @@
-
 name: Pull request test
 
 on:
   pull_request:
     branches:
       - dev
-    
+
 jobs:
   pr-test:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml
index baf55228f..1caecb41e 100644
--- a/.github/workflows/update-submodules.yml
+++ b/.github/workflows/update-submodules.yml
@@ -1,4 +1,3 @@
-
 name: Update Components Submodules
 
 on:
@@ -25,6 +24,6 @@ jobs:
 
       - uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit_message: "[skip ci] 📦 Update Submodules!"
+          commit_message: '[skip ci] 📦 Update Submodules!'
           commit_user_name: Zen Browser Robot
           commit_user_email: zen-browser-auto@users.noreply.github.com
diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml
index c1e881ee6..fbf3aa5f3 100644
--- a/.github/workflows/windows-profile-build.yml
+++ b/.github/workflows/windows-profile-build.yml
@@ -61,13 +61,13 @@ jobs:
           C:\MozillaBuildSetup-Latest.exe /S | out-null
       - name: Download firefox
         run: |
-          git config --global core.safecrlf false  
+          git config --global core.safecrlf false
           pnpm surfer download
 
       - name: Import patches
         env:
           SURFER_NO_BRANDING_PATCH: true
-        run: pnpm surfer import 
+        run: pnpm surfer import
 
       - name: Generate
         run: |
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index 681b98a6f..1f5a2541f 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         arch: [x86_64, x86_64-v3, aarch64]
-    
+
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
@@ -223,7 +223,7 @@ jobs:
             find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type d -not -name 'dist' -exec rm -rf {} \;
             find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type f -not -name 'dist' -exec rm -f {} \;
           fi
-          
+
       - name: Upload dist object
         if: ${{ !inputs.generate-gpo }}
         uses: actions/upload-artifact@v4
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 9f67aaa0e..964bd7b40 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -17,23 +17,23 @@ diverse, inclusive, and healthy community.
 Examples of behavior that contributes to a positive environment for our
 community include:
 
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
   and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
+- Focusing on what is best not just for us as individuals, but for the
   overall community
 
 Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery, and sexual attention or
+- The use of sexualized language or imagery, and sexual attention or
   advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
   address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
+- Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
 ## Enforcement Responsibilities
@@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban.
 ### 4. Permanent Ban
 
 **Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
+standards, including sustained inappropriate behavior, harassment of an
 individual, or aggression toward or disparagement of classes of individuals.
 
 **Consequence**: A permanent ban from any sort of public interaction within
diff --git a/README.md b/README.md
index bd476964b..ebdf296f0 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,6 @@
 [![Downloads](https://img.shields.io/github/downloads/zen-browser/desktop/total.svg)](https://github.com/zen-browser/desktop/releases)
 [![Crowdin](https://badges.crowdin.net/zen-browser/localized.svg)](https://crowdin.com/project/zen-browser)
 
-
 ✨ Experience tranquillity while browsing the web without people tracking you! Zen is a privacy-focused browser that blocks trackers, ads, and other unwanted content while offering the best browsing experience!
 
 <div flex="true">
@@ -87,7 +86,7 @@ yay -S zen-browser-avx2-bin
 ##### Other Linux distributions (AppImage with automated system integration)
 
 - `native` tarball install:
-```sudo bash <(curl -s https://updates.zen-browser.app/install.sh)```
+  `sudo bash <(curl -s https://updates.zen-browser.app/install.sh)`
 
 - `zsync` is required for the Update feature of the script below
 
@@ -95,7 +94,7 @@ yay -S zen-browser-avx2-bin
 bash <(curl https://updates.zen-browser.app/appimage.sh)
 ```
 
-* Again, if you don't see your OS listed above, that's because we already have it in our [downloads page](https://zen-browser.app/download)! 🔄
+- Again, if you don't see your OS listed above, that's because we already have it in our [downloads page](https://zen-browser.app/download)! 🔄
 
 To upgrade the browser to a newer version, use the embedded update functionality in `About Zen`.
 
diff --git a/docs/contribute.md b/docs/contribute.md
index ecc154a5f..b97056d49 100644
--- a/docs/contribute.md
+++ b/docs/contribute.md
@@ -1,4 +1,3 @@
-
 # Branch Structure
 
 The repository is structured as follows:
@@ -7,14 +6,14 @@ The repository is structured as follows:
 dev (main branch)
  | |
  | \--->-- stable (release branch)
- |   ^ 
+ |   ^
  ^   |
  |   \-<- Hotfix (hotfixes directly from stable)
  |
  \-<- (features branches)
 ```
 
-The `central` branch is the main branch of the repository, and it is the default branch for the repository. The `twilight` branch is the feature branch, and it is branched off from the `central` branch. The `stable` branch is the release branch, and it is branched off from the `central` branch. 
+The `central` branch is the main branch of the repository, and it is the default branch for the repository. The `twilight` branch is the feature branch, and it is branched off from the `central` branch. The `stable` branch is the release branch, and it is branched off from the `central` branch.
 
 The `stable` branch may have hotfixes directly from the `stable` branch, and the `twilight` branch may have feature branches branched off from the `twilight` branch. This is done so that we can apply hotfixes like security patches directly to the `stable` branch without having to merge the changes from the `twilight` branch.
 
@@ -34,4 +33,4 @@ To merge zen stable branch from the twilight branch, you can use the following c
 
 ```bash
 sh ./scripts/merge-to-branch.sh stable
-```
\ No newline at end of file
+```
diff --git a/package-lock.json b/package-lock.json
index 5abbe763f..f841be80d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "@zen-browser/surfer": "^1.3.21"
+        "@zen-browser/surfer": "^1.6.3"
       },
       "devDependencies": {
         "husky": "^9.1.5",
@@ -269,9 +269,10 @@
       "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="
     },
     "node_modules/@zen-browser/surfer": {
-      "version": "1.3.21",
-      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.3.21.tgz",
-      "integrity": "sha512-hFblYgr4/rlfoJ75kcRPY03wG8HA8XT6dRZLEwdD7e5b8YazCWRlXMof0NhFC5a1Z0e1FZ+sRCxMG52ZygoVzw==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.6.3.tgz",
+      "integrity": "sha512-OpBJu4c6AV4P1o9whtvp2BQjcqxS+fMbXJKtgKWuW7E8cfOLIMbHpuxCbTllO/LGz60T0aszxZRPbToTQuwPog==",
+      "license": "MPL-2.0",
       "dependencies": {
         "@resvg/resvg-js": "^1.4.0",
         "async-icns": "^1.0.2",
@@ -2818,9 +2819,9 @@
       "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="
     },
     "@zen-browser/surfer": {
-      "version": "1.3.21",
-      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.3.21.tgz",
-      "integrity": "sha512-hFblYgr4/rlfoJ75kcRPY03wG8HA8XT6dRZLEwdD7e5b8YazCWRlXMof0NhFC5a1Z0e1FZ+sRCxMG52ZygoVzw==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.6.3.tgz",
+      "integrity": "sha512-OpBJu4c6AV4P1o9whtvp2BQjcqxS+fMbXJKtgKWuW7E8cfOLIMbHpuxCbTllO/LGz60T0aszxZRPbToTQuwPog==",
       "requires": {
         "@resvg/resvg-js": "^1.4.0",
         "async-icns": "^1.0.2",
diff --git a/src/browser/base/content/ZenCustomizableUI.sys.mjs b/src/browser/base/content/ZenCustomizableUI.sys.mjs
index b4a22ae10..72973370b 100644
--- a/src/browser/base/content/ZenCustomizableUI.sys.mjs
+++ b/src/browser/base/content/ZenCustomizableUI.sys.mjs
@@ -34,7 +34,7 @@ export var ZenCustomizableUI = new (class {
   _addSidebarButtons(window) {
     const sidebarBox = window.MozXULElement.parseXULToFragment(`
       <toolbar id="zen-sidebar-top-buttons"
-        fullscreentoolbar="true" 
+        fullscreentoolbar="true"
         class="browser-toolbar customization-target zen-dont-hide-on-fullscreen"
         brighttext="true"
         data-l10n-id="tabs-toolbar"
@@ -70,7 +70,7 @@ export var ZenCustomizableUI = new (class {
   _moveWindowButtons(window) {
     const windowControls = window.document.getElementsByClassName('titlebar-buttonbox-container');
     const toolboxIcons = window.document.getElementById('zen-sidebar-top-buttons-customization-target');
-    if (window.AppConstants.platform === 'macosx'|| window.matchMedia('(-moz-gtk-csd-reversed-placement)').matches) {
+    if (window.AppConstants.platform === 'macosx' || window.matchMedia('(-moz-gtk-csd-reversed-placement)').matches) {
       for (let i = 0; i < windowControls.length; i++) {
         if (i === 0) {
           toolboxIcons.prepend(windowControls[i]);
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index dab220f85..e5827c416 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -6,13 +6,8 @@ var gZenUIManager = {
     document.addEventListener('popupshowing', this.onPopupShowing.bind(this));
     document.addEventListener('popuphidden', this.onPopupHidden.bind(this));
     XPCOMUtils.defineLazyPreferenceGetter(this, 'sidebarHeightThrottle', 'zen.view.sidebar-height-throttle', 500);
-    XPCOMUtils.defineLazyPreferenceGetter(
-      this,
-      'contentElementSeparation',
-      'zen.theme.content-element-separation',
-      0
-    );
-    
+    XPCOMUtils.defineLazyPreferenceGetter(this, 'contentElementSeparation', 'zen.theme.content-element-separation', 0);
+
     function throttle(f, delay) {
       let timer = 0;
       return function (...args) {
@@ -26,7 +21,6 @@ var gZenUIManager = {
     );
   },
 
-
   updateTabsToolbar() {
     // Set tabs max-height to the "toolbar-items" height
     const toolbarItems = document.getElementById('tabbrowser-tabs');
@@ -35,7 +29,7 @@ var gZenUIManager = {
     const toolbarRect = toolbarItems.getBoundingClientRect();
     let height = toolbarRect.height;
     // -5 for the controls padding
-    let totalHeight = toolbarRect.height - (this.contentElementSeparation * 2) - 5;
+    let totalHeight = toolbarRect.height - this.contentElementSeparation * 2 - 5;
     // remove the height from other elements that aren't hidden
     const otherElements = document.querySelectorAll('#tabbrowser-tabs > *:not([hidden="true"])');
     for (let tab of otherElements) {
@@ -88,7 +82,10 @@ var gZenUIManager = {
     for (const el of this._popupTrackingElements) {
       // target may be inside a shadow root, not directly under the element
       // we also ignore menus inside panels
-      if (!el.contains(showEvent.explicitOriginalTarget) || (showEvent.explicitOriginalTarget instanceof Element && showEvent.explicitOriginalTarget?.closest('panel'))) {
+      if (
+        !el.contains(showEvent.explicitOriginalTarget) ||
+        (showEvent.explicitOriginalTarget instanceof Element && showEvent.explicitOriginalTarget?.closest('panel'))
+      ) {
         continue;
       }
       document.removeEventListener('mousemove', this.__removeHasPopupAttribute);
@@ -138,7 +135,7 @@ var gZenVerticalTabsManager = {
     XPCOMUtils.defineLazyPreferenceGetter(this, 'canOpenTabOnMiddleClick', 'zen.tabs.newtab-on-middle-click', true);
 
     if (!this.isWindowsStyledButtons) {
-      document.documentElement.setAttribute("zen-window-buttons-reversed", true);
+      document.documentElement.setAttribute('zen-window-buttons-reversed', true);
     }
 
     if (tabs) {
@@ -226,19 +223,16 @@ var gZenVerticalTabsManager = {
     }
 
     // Check if the sidebar is in hover mode
-    if (
-      !this.navigatorToolbox.hasAttribute('zen-right-side') &&
-      !isCompactMode
-    ) {
+    if (!this.navigatorToolbox.hasAttribute('zen-right-side') && !isCompactMode) {
       this.navigatorToolbox.prepend(topButtons);
-    //  browser.prepend(this.navigatorToolbox);
+      //  browser.prepend(this.navigatorToolbox);
     } else {
-    //  customizationTarget.prepend(topButtons);
-    //  tabboxWrapper.prepend(this.navigatorToolbox);
+      //  customizationTarget.prepend(topButtons);
+      //  tabboxWrapper.prepend(this.navigatorToolbox);
     }
 
     if (!isVerticalTabs) {
-      document.getElementById("urlbar-container").after(document.getElementById('navigator-toolbox'));
+      document.getElementById('urlbar-container').after(document.getElementById('navigator-toolbox'));
     }
 
     let windowButtons = this.actualWindowButtons;
@@ -269,20 +263,22 @@ var gZenVerticalTabsManager = {
         titlebar.before(topButtons);
         titlebar.before(navBar);
       }
-      document.documentElement.setAttribute("zen-single-toolbar", true);
+      document.documentElement.setAttribute('zen-single-toolbar', true);
       this._hasSetSingleToolbar = true;
     } else if (this._hasSetSingleToolbar) {
       this._hasSetSingleToolbar = false;
       // Do the opposite
       this._navbarParent.prepend(navBar);
-      const elements = document.querySelectorAll('#zen-sidebar-top-buttons-customization-target > *:is(toolbarbutton, #stop-reload-button)');
+      const elements = document.querySelectorAll(
+        '#zen-sidebar-top-buttons-customization-target > *:is(toolbarbutton, #stop-reload-button)'
+      );
       for (const button of elements) {
         if (button.hasAttribute('zen-single-toolbar')) {
           button.removeAttribute('zen-single-toolbar');
           document.getElementById('nav-bar-customization-target').append(button);
         }
       }
-      document.documentElement.removeAttribute("zen-single-toolbar");
+      document.documentElement.removeAttribute('zen-single-toolbar');
       navBar.appendChild(document.getElementById('PanelUI-button'));
       this._toolbarOriginalParent.prepend(navBar);
       CustomizableUI.zenInternalCU._rebuildRegisteredAreas();
@@ -295,7 +291,7 @@ var gZenVerticalTabsManager = {
     }
 
     if (doNotChangeWindowButtons) {
-      document.getElementById("zen-sidebar-top-buttons-customization-target").appendChild(windowButtons);
+      document.getElementById('zen-sidebar-top-buttons-customization-target').appendChild(windowButtons);
     } else if (!isSingleToolbar && !isCompactMode) {
       if (this.isWindowsStyledButtons) {
         if (isRightSide) {
@@ -342,4 +338,4 @@ var gZenVerticalTabsManager = {
     const newVal = !Services.prefs.getBoolPref('zen.tabs.vertical.right-side');
     Services.prefs.setBoolPref('zen.tabs.vertical.right-side', newVal);
   },
-};
\ No newline at end of file
+};
diff --git a/src/browser/base/content/zen-popupset.inc.xhtml b/src/browser/base/content/zen-popupset.inc.xhtml
index 4b266399c..e15076159 100644
--- a/src/browser/base/content/zen-popupset.inc.xhtml
+++ b/src/browser/base/content/zen-popupset.inc.xhtml
@@ -35,7 +35,7 @@
       role="document"
       mainview-with-header="true"
       has-custom-header="true">
-      <box id="zenSplitViewModifierHeader"        
+      <box id="zenSplitViewModifierHeader"
         class="panel-header panel-header-with-additional-element panel-header-with-info-button">
         <html:h1>
           <html:span data-l10n-id="zen-split-view-modifier-header"></html:span>
@@ -96,7 +96,7 @@
       <toolbarbutton id="PanelUI-zen-profiles-privateWin" command="Tools:PrivateBrowsing" data-l10n-id="appmenuitem-new-private-window" class="subviewbutton"></toolbarbutton>
       <toolbarbutton id="PanelUI-zen-profiles-newProfile" oncommand="ZenProfileDialogUI.createProfileWizard();" data-l10n-id="appmenu-create-profile" class="subviewbutton"></toolbarbutton>
     </hbox>
-    <vbox id="PanelUI-zen-profiles-list">      
+    <vbox id="PanelUI-zen-profiles-list">
     </vbox>
   </vbox>
 </panelview>
diff --git a/src/browser/base/content/zen-sidebar-icons.inc.xhtml b/src/browser/base/content/zen-sidebar-icons.inc.xhtml
index 31a4e40ca..879a55cc4 100644
--- a/src/browser/base/content/zen-sidebar-icons.inc.xhtml
+++ b/src/browser/base/content/zen-sidebar-icons.inc.xhtml
@@ -1,13 +1,13 @@
-<toolbar brighttext="true" 
-  id="zen-sidebar-icons-wrapper" 
-  fullscreentoolbar="true" 
+<toolbar brighttext="true"
+  id="zen-sidebar-icons-wrapper"
+  fullscreentoolbar="true"
   class="browser-toolbar customization-target zen-dont-hide-on-fullscreen"
   data-l10n-id="tabs-toolbar"
   customizable="true"
   skipintoolbarset="true"
   context="toolbar-context-menu"
   mode="icons">
-  <toolbarbutton id="zen-profile-button" 
+  <toolbarbutton id="zen-profile-button"
     class="zen-sidebar-action-button toolbarbutton-1 chromeclass-toolbar-additional"
     delegatesanchor="true"
     onmousedown="ZenProfileDialogUI.showSubView(this, event)"
diff --git a/src/browser/base/content/zen-sidebar-panel.inc.xhtml b/src/browser/base/content/zen-sidebar-panel.inc.xhtml
index 41ba0257c..db85e178f 100644
--- a/src/browser/base/content/zen-sidebar-panel.inc.xhtml
+++ b/src/browser/base/content/zen-sidebar-panel.inc.xhtml
@@ -22,7 +22,7 @@
     </vbox>
     <toolbar mode="icons" flex="1" id="zen-sidebar-panels-wrapper" fullscreentoolbar="true">
       <toolbar mode="icons" flex="1" id="zen-sidebar-panels-sites" fullscreentoolbar="true">
-        
+
       </toolbar>
       <toolbarbutton id="zen-sidebar-add-panel-button" class="zen-sidebar-panel-button toolbarbutton-1 chromeclass-toolbar-additional" onclick="gZenBrowserManagerSidebar._openAddPanelDialog();"/>
     </toolbar>
diff --git a/src/browser/base/content/zen-styles/zen-animations.css b/src/browser/base/content/zen-styles/zen-animations.css
index b6fe193f6..64b073841 100644
--- a/src/browser/base/content/zen-styles/zen-animations.css
+++ b/src/browser/base/content/zen-styles/zen-animations.css
@@ -230,7 +230,7 @@
 
   70% {
     /* make the box grow to full width/height */
-    opacity: .5;
+    opacity: 0.5;
     transform: translate(-50%, -50%) translateZ(0);
     top: 50%;
     left: 50%;
@@ -307,7 +307,7 @@
   }
 
   90% {
-    width: 100%; 
+    width: 100%;
   }
 
   100% {
diff --git a/src/browser/base/content/zen-styles/zen-browser-container.css b/src/browser/base/content/zen-styles/zen-browser-container.css
index b165cd293..d176d499e 100644
--- a/src/browser/base/content/zen-styles/zen-browser-container.css
+++ b/src/browser/base/content/zen-styles/zen-browser-container.css
@@ -8,13 +8,13 @@
     border-radius: var(--zen-border-radius);
     overflow: hidden;
     margin: 1px;
-    
+
     :root[zen-right-side='true'] & {
       margin-right: 0;
       margin-left: var(--zen-element-separation);
     }
 
-    :root[zen-no-padding='true'] &:not([zen-split="true"]) {
+    :root[zen-no-padding='true'] &:not([zen-split='true']) {
       border-radius: 0 !important;
     }
   }
diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css
index 0d1055e55..3112f6059 100644
--- a/src/browser/base/content/zen-styles/zen-browser-ui.css
+++ b/src/browser/base/content/zen-styles/zen-browser-ui.css
@@ -1,4 +1,3 @@
-
 #tabbrowser-tabpanels {
   background: transparent !important;
 }
@@ -39,7 +38,6 @@
   border: none;
 }
 
-
 @supports (-moz-osx-font-smoothing: auto) {
   #zen-main-app-wrapper,
   #zen-appcontent-wrapper,
@@ -51,7 +49,7 @@
 #zen-main-app-wrapper {
   background: transparent;
   overflow: hidden;
-  
+
   & > * {
     z-index: 1;
   }
@@ -66,7 +64,7 @@
       bottom: 0;
       background: var(--zen-main-browser-background-old);
       backdrop-filter: blur(5px);
-      animation: zen-main-app-wrapper-animation .5s ease-in-out forwards;
+      animation: zen-main-app-wrapper-animation 0.5s ease-in-out forwards;
       border-radius: env(-moz-gtk-csd-titlebar-radius);
     }
   }
diff --git a/src/browser/base/content/zen-styles/zen-compact-mode.css b/src/browser/base/content/zen-styles/zen-compact-mode.css
index 6a8ec6903..cfe3c7b35 100644
--- a/src/browser/base/content/zen-styles/zen-compact-mode.css
+++ b/src/browser/base/content/zen-styles/zen-compact-mode.css
@@ -24,7 +24,9 @@
         --zen-compact-float: calc(var(--zen-element-separation) - 1px);
         position: absolute;
         z-index: 9;
-        transition: transform 0.2s ease-in-out, opacity 0.2s ease-in-out;
+        transition:
+          transform 0.2s ease-in-out,
+          opacity 0.2s ease-in-out;
         right: calc(100% - var(--zen-element-separation));
         top: 0;
         bottom: var(--zen-element-separation);
diff --git a/src/browser/base/content/zen-styles/zen-decks.css b/src/browser/base/content/zen-styles/zen-decks.css
index 1bb51b0b1..08aaf21e6 100644
--- a/src/browser/base/content/zen-styles/zen-decks.css
+++ b/src/browser/base/content/zen-styles/zen-decks.css
@@ -17,7 +17,7 @@
 }
 #zen-splitview-dropzone {
   border-radius: var(--zen-webview-border-radius, var(--zen-border-radius));
-  transition: inset ease-out .08s;
+  transition: inset ease-out 0.08s;
   display: none;
   background-color: color-mix(in srgb, var(--zen-colors-secondary) 30%, transparent 70%);
 }
@@ -25,7 +25,8 @@
   display: initial;
 }
 
-#tabbrowser-tabpanels[zen-split-view='true'] > [zen-split='true'], #zen-splitview-dropzone {
+#tabbrowser-tabpanels[zen-split-view='true'] > [zen-split='true'],
+#zen-splitview-dropzone {
   flex: 1;
   margin: calc(var(--zen-split-column-gap) / 2) calc(var(--zen-split-row-gap) / 2 + 1px);
   position: absolute !important;
@@ -53,12 +54,13 @@
   --zen-split-column-gap: calc(var(--zen-element-separation) + 1px);
 }
 
-#tabbrowser-tabpanels:has(> [zen-split='true']), #zen-splitview-overlay {
-  margin-right: calc(var(--zen-element-separation) - var(--zen-split-row-gap)/2);
-  margin-bottom: calc(var(--zen-element-separation) - var(--zen-split-column-gap)/2);
+#tabbrowser-tabpanels:has(> [zen-split='true']),
+#zen-splitview-overlay {
+  margin-right: calc(var(--zen-element-separation) - var(--zen-split-row-gap) / 2);
+  margin-bottom: calc(var(--zen-element-separation) - var(--zen-split-column-gap) / 2);
 
-  margin-left: calc(var(--zen-split-row-gap)/-2);
-  margin-top: calc(var(--zen-split-column-gap)/-2);
+  margin-left: calc(var(--zen-split-row-gap) / -2);
+  margin-top: calc(var(--zen-split-column-gap) / -2);
 
   @media (-moz-bool-pref: 'zen.view.compact') {
     :root:not([customizing]) & {
@@ -105,7 +107,6 @@
   pointer-events: all;
 }
 
-
 .zen-split-view-splitter[orient='vertical'] {
   width: var(--zen-split-row-gap);
   margin-left: calc(var(--zen-split-row-gap) / -2);
@@ -174,7 +175,7 @@
     border-radius: 3px;
     width: 100%;
     height: 100%;
-    transition: .1s;
+    transition: 0.1s;
   }
 
   &:hover box {
diff --git a/src/browser/base/content/zen-styles/zen-glance.css b/src/browser/base/content/zen-styles/zen-glance.css
index 2ec5956ff..d81caa89e 100644
--- a/src/browser/base/content/zen-styles/zen-glance.css
+++ b/src/browser/base/content/zen-styles/zen-glance.css
@@ -1,11 +1,12 @@
-
 .browserSidebarContainer:has([zen-glance-selected]),
 .browserSidebarContainer.zen-glance-overlay {
   visibility: inherit;
 }
 
 .zen-glance-background {
-  transition: transform 0.1s ease-in-out, opacity 0.1s ease-in-out;
+  transition:
+    transform 0.1s ease-in-out,
+    opacity 0.1s ease-in-out;
   transform: scale(0.98);
   backdrop-filter: blur(5px);
   opacity: 0.6;
@@ -28,7 +29,7 @@
 
     & .browserContainer {
       opacity: 1;
-      animation: zen-glance-content-animation-out .5s ease-in-out forwards !important;
+      animation: zen-glance-content-animation-out 0.5s ease-in-out forwards !important;
 
       & browser {
         opacity: 1 !important;
@@ -36,7 +37,7 @@
 
       & #zen-glance-sidebar-container {
         opacity: 0;
-        transition: opacity .1s ease-in-out;
+        transition: opacity 0.1s ease-in-out;
       }
     }
   }
@@ -110,7 +111,7 @@
     }
 
     &[animate='true'] {
-      animation: zen-glance-content-animation .4s ease-in-out forwards;
+      animation: zen-glance-content-animation 0.4s ease-in-out forwards;
 
       &:not([animate-end='true']) {
         pointer-events: none;
@@ -128,4 +129,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/browser/base/content/zen-styles/zen-gradient-generator.css b/src/browser/base/content/zen-styles/zen-gradient-generator.css
index 7d8cbeaab..d8a988734 100644
--- a/src/browser/base/content/zen-styles/zen-gradient-generator.css
+++ b/src/browser/base/content/zen-styles/zen-gradient-generator.css
@@ -1,4 +1,3 @@
-
 #PanelUI-zen-gradient-generator {
   --panel-width: 300px;
   --panel-padding: 10px;
@@ -39,7 +38,7 @@
       bottom: 2px;
       right: 0;
       border: 2px solid var(--zen-colors-border);
-      transition: transform .2s;
+      transition: transform 0.2s;
     }
 
     &[dragging='true']::after {
@@ -140,7 +139,7 @@
       padding: 2px 4px !important;
       margin: 0 !important;
       margin-left: auto !important;
-      transition: opacity .1s;
+      transition: opacity 0.1s;
       opacity: 0;
     }
 
@@ -234,8 +233,8 @@
     box-shadow: 0 0 0 2px var(--zen-themed-toolbar-bg);
     cursor: pointer;
     border: 2px solid #fff;
-    animation: zen-theme-picker-dot-animation .5s;
-    transition: transform .2s;
+    animation: zen-theme-picker-dot-animation 0.5s;
+    transition: transform 0.2s;
     transform: translate(-50%, -50%);
 
     &[dragging='true'] {
diff --git a/src/browser/base/content/zen-styles/zen-panels/print.css b/src/browser/base/content/zen-styles/zen-panels/print.css
index b517e5ab0..9a6d77b79 100644
--- a/src/browser/base/content/zen-styles/zen-panels/print.css
+++ b/src/browser/base/content/zen-styles/zen-panels/print.css
@@ -1,5 +1,3 @@
-
-
 .printSettingsBrowser {
   min-width: 350px;
 }
diff --git a/src/browser/base/content/zen-styles/zen-sidebar-panels.css b/src/browser/base/content/zen-styles/zen-sidebar-panels.css
index 891aac3f5..5cb50666a 100644
--- a/src/browser/base/content/zen-styles/zen-sidebar-panels.css
+++ b/src/browser/base/content/zen-styles/zen-sidebar-panels.css
@@ -70,7 +70,7 @@
   z-index: 1;
   width: calc(100% - var(--zen-sidebar-web-panel-spacing) * 3);
   margin: var(--zen-sidebar-web-panel-spacing);
-  /* Why times 3? 
+  /* Why times 3?
    *  + 1 for the top margin, making the element overflow the view.
    *  + 1 for the margin we want to add at the bottom
    *  + 1 so that the panel can be correctly spaced from the border of the webview
@@ -144,7 +144,8 @@
 }
 
 #zen-sidebar-web-panel-wrapper {
-  margin: var(--zen-element-separation) calc(var(--zen-element-separation) / 2) var(--zen-element-separation) var(--zen-element-separation);
+  margin: var(--zen-element-separation) calc(var(--zen-element-separation) / 2) var(--zen-element-separation)
+    var(--zen-element-separation);
 }
 
 #zen-sidebar-web-panel[pinned='true'] {
@@ -225,7 +226,7 @@
 }
 
 #zen-sidebar-web-panel-title {
-  font-size: .9em;
+  font-size: 0.9em;
   font-weight: 600;
   margin: 0 10px;
   padding: 0;
@@ -278,4 +279,3 @@
 #zen-sidebar-web-panel[hidden] {
   animation: better-sidebar-hide 0.15s ease-in-out forwards !important;
 }
-
diff --git a/src/browser/base/content/zen-styles/zen-sidebar.css b/src/browser/base/content/zen-styles/zen-sidebar.css
index 7536d0ecb..bb77cca39 100644
--- a/src/browser/base/content/zen-styles/zen-sidebar.css
+++ b/src/browser/base/content/zen-styles/zen-sidebar.css
@@ -1,4 +1,3 @@
-
 #zen-profile-button {
   & stack {
     padding: 0;
@@ -73,4 +72,4 @@
 /* Menubar */
 #toolbar-menubar {
   display: none !important;
-}
\ No newline at end of file
+}
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs-topbar.inc.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs-topbar.inc.css
index 8cf357944..de6b6f2de 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs-topbar.inc.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs-topbar.inc.css
@@ -1,8 +1,10 @@
 height: var(--zen-toolbar-height);
 
-@media (-moz-bool-pref: 'zen.view.hide-window-controls') { 
+@media (-moz-bool-pref: 'zen.view.hide-window-controls') {
   & {
-    transition: height 0.2s ease-out, opacity 0.2s ease-out;
+    transition:
+      height 0.2s ease-out,
+      opacity 0.2s ease-out;
     transition-delay: 0.05s;
   }
 
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index bf3adf184..29da28e33 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -12,8 +12,8 @@
     & #zen-sidebar-top-buttons {
       --zen-toolbar-height: 32px;
       height: var(--zen-toolbar-height);
-    } 
-    
+    }
+
     & #zen-sidebar-top-buttons .toolbarbutton-1 {
       & > .toolbarbutton-icon {
         padding: 5px;
@@ -134,8 +134,8 @@
       & #PersonalToolbar {
         width: -moz-available;
       }
-      
-      /* We enable this trick IF we follow any of theses conditions: 
+
+      /* We enable this trick IF we follow any of theses conditions:
         * - We are on a Mac
         * - We are on a Linux with reversed CSD
         * - If we are not in any of the above, we can still enable it if the user has bookmarks toolbar enabled
@@ -251,8 +251,8 @@
         }
         & label { display: none !important; }
         & .tab-close-button,
-        & .tab-reset-button { 
-          display: none !important; 
+        & .tab-reset-button {
+          display: none !important;
         }
 
         & .tab-icon-image {
@@ -341,11 +341,11 @@
         & .urlbar-input-container {
           padding-left: 2px;
         }
-        
+
         :root[zen-right-side='true'] & {
           margin-left: 0;
           margin-right: var(--zen-toolbox-padding);
-  
+
           & .urlbar-input-container {
             padding-right: 2px;
           }
diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index 56fb077a4..8909364c6 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -40,7 +40,7 @@
   ) !important;
   --in-content-primary-button-background-active: light-dark(
     color-mix(in srgb, var(--zen-primary-color) 50%, black 50%),
-    color-mix(in srgb, var(--zen-primary-color) 80%, rgba(255,255,255,.2) 20%)
+    color-mix(in srgb, var(--zen-primary-color) 80%, rgba(255, 255, 255, 0.2) 20%)
   ) !important;
   --in-content-primary-button-text-color: light-dark(white, black) !important;
   --in-content-primary-button-border-color: transparent !important;
@@ -123,7 +123,10 @@
   --fp-contextmenu-bgcolor: light-dark(Menu, rgb(43 42 51 / 0.95));
   --toolbar-bgcolor: transparent;
 
-  --toolbarbutton-active-background: light-dark(rgba(255, 255, 255, .9), color-mix(in srgb, var(--zen-primary-color) 50%, rgba(255, 255, 255, .1)));
+  --toolbarbutton-active-background: light-dark(
+    rgba(255, 255, 255, 0.9),
+    color-mix(in srgb, var(--zen-primary-color) 50%, rgba(255, 255, 255, 0.1))
+  );
 
   --input-bgcolor: var(--zen-colors-tertiary) !important;
   --input-border-color: var(--zen-input-border-color) !important;
@@ -132,7 +135,10 @@
 
   @supports (-moz-osx-font-smoothing: auto) {
     --zen-themed-toolbar-bg-transparency: 0.05;
-    --zen-themed-toolbar-bg-transparent: light-dark(rgba(255, 255, 255, var(--zen-themed-toolbar-bg-transparency)), rgba(0, 0, 0, var(--zen-themed-toolbar-bg-transparency)));
+    --zen-themed-toolbar-bg-transparent: light-dark(
+      rgba(255, 255, 255, var(--zen-themed-toolbar-bg-transparency)),
+      rgba(0, 0, 0, var(--zen-themed-toolbar-bg-transparency))
+    );
   }
 
   --toolbar-field-background-color: var(--zen-colors-input-bg) !important;
diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index 8491e2be1..c72a4a51a 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -35,7 +35,7 @@
   background: var(--zen-dialog-background) !important;
 }
 
-#urlbar:not([focused='true']):not([breakout-extend="true"]) > #urlbar-background {
+#urlbar:not([focused='true']):not([breakout-extend='true']) > #urlbar-background {
   background: light-dark(rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0.1)) !important;
   backdrop-filter: blur(10px);
 }
@@ -53,7 +53,7 @@
   outline-color: none !important;
 }
 
-#identity-box.chromeUI:not([pageproxystate="invalid"]) { 
+#identity-box.chromeUI:not([pageproxystate='invalid']) {
   & #identity-icon-box {
     background: light-dark(rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0.1)) !important;
   }
@@ -65,7 +65,7 @@
 
 #identity-permission-box:not(:hover):not(:focus-within) {
   background: transparent !important;
-} 
+}
 
 #urlbar:is([focused], [open]) > #urlbar-background,
 #searchbar:focus-within {
@@ -161,7 +161,7 @@
       padding: 0;
       margin-top: auto;
       margin-bottom: auto;
-    }    
+    }
   }
 }
 
@@ -279,7 +279,7 @@ button.popup-notification-dropmarker {
   align-items: center;
 }
 
-:root:not([zen-single-toolbar='true']) #nav-bar {  
+:root:not([zen-single-toolbar='true']) #nav-bar {
   margin-bottom: -1px;
 }
 
diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css
index ca7879c87..1e88925aa 100644
--- a/src/browser/base/content/zen-styles/zen-workspaces.css
+++ b/src/browser/base/content/zen-styles/zen-workspaces.css
@@ -60,7 +60,7 @@
           filter: grayscale(1);
           transition: opacity 0.2s;
         }
-        
+
         &[active='true'] {
           filter: none;
           opacity: 1;
@@ -337,7 +337,6 @@
   background-color: var(--toolbarbutton-icon-fill-attention);
 }
 
-
 #PanelUI-zen-workspaces-reorder-mode[active='true'] {
   color: var(--toolbarbutton-icon-fill-attention) !important;
 }
@@ -401,7 +400,7 @@
   font-weight: 600;
   align-items: center;
   position: relative;
-  
+
   & #zen-current-workspace-indicator-icon {
     font-size: 14px;
   }
@@ -419,7 +418,7 @@
     max-width: 100%;
   }
 
-  & #zen-current-workspace-indicator-icon:not([hidden]) + #zen-current-workspace-indicator-name  {
+  & #zen-current-workspace-indicator-icon:not([hidden]) + #zen-current-workspace-indicator-name {
     margin-left: 22px;
   }
 }
diff --git a/src/browser/base/content/zenThemeModifier.js b/src/browser/base/content/zenThemeModifier.js
index 6bd66e81b..c533aa744 100644
--- a/src/browser/base/content/zenThemeModifier.js
+++ b/src/browser/base/content/zenThemeModifier.js
@@ -76,9 +76,9 @@ var ZenThemeModifier = {
     const separation = Services.prefs.getIntPref('zen.theme.content-element-separation');
     document.documentElement.style.setProperty('--zen-element-separation', separation + 'px');
     if (separation == 0) {
-      document.documentElement.setAttribute("zen-no-padding", true);
+      document.documentElement.setAttribute('zen-no-padding', true);
     } else {
-      document.documentElement.removeAttribute("zen-no-padding");
+      document.documentElement.removeAttribute('zen-no-padding');
     }
   },
 
diff --git a/src/browser/base/zen-components/ZenActorsManager.mjs b/src/browser/base/zen-components/ZenActorsManager.mjs
index 404895247..13583156f 100644
--- a/src/browser/base/zen-components/ZenActorsManager.mjs
+++ b/src/browser/base/zen-components/ZenActorsManager.mjs
@@ -1,4 +1,3 @@
-
 // Utility to register JSWindowActors
 var gZenActorsManager = {
   _actors: new Set(),
@@ -16,4 +15,4 @@ var gZenActorsManager = {
       console.warn(`Failed to register JSWindowActor: ${e}`);
     }
   },
-}
+};
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index 8da863577..3a8d8d35a 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -1,6 +1,4 @@
-
 {
-
   class ZenGlanceManager extends ZenDOMOperatedFeature {
     #currentBrowser = null;
     #currentTab = null;
@@ -8,23 +6,19 @@
     #animating = false;
 
     init() {
-      document.documentElement.setAttribute("zen-glance-uuid", gZenUIManager.generateUuidv4());
-      window.addEventListener("keydown", this.onKeyDown.bind(this));
-      window.addEventListener("TabClose", this.onTabClose.bind(this));
+      document.documentElement.setAttribute('zen-glance-uuid', gZenUIManager.generateUuidv4());
+      window.addEventListener('keydown', this.onKeyDown.bind(this));
+      window.addEventListener('TabClose', this.onTabClose.bind(this));
 
-      ChromeUtils.defineLazyGetter(
-        this,
-        'sidebarButtons',
-        () => document.getElementById('zen-glance-sidebar-container')
-      );
+      ChromeUtils.defineLazyGetter(this, 'sidebarButtons', () => document.getElementById('zen-glance-sidebar-container'));
 
-      document.getElementById('tabbrowser-tabpanels').addEventListener("click", this.onOverlayClick.bind(this));
+      document.getElementById('tabbrowser-tabpanels').addEventListener('click', this.onOverlayClick.bind(this));
 
-      Services.obs.addObserver(this, "quit-application-requested");
+      Services.obs.addObserver(this, 'quit-application-requested');
     }
 
     onKeyDown(event) {
-      if (event.key === "Escape" && this.#currentBrowser) {
+      if (event.key === 'Escape' && this.#currentBrowser) {
         event.preventDefault();
         event.stopPropagation();
         this.closeGlance();
@@ -39,7 +33,7 @@
 
     observe(subject, topic) {
       switch (topic) {
-        case "quit-application-requested":
+        case 'quit-application-requested':
           this.onUnload();
           break;
       }
@@ -54,7 +48,7 @@
 
     createBrowserElement(url, currentTab) {
       const newTabOptions = {
-        userContextId: currentTab.getAttribute("usercontextid") || "",
+        userContextId: currentTab.getAttribute('usercontextid') || '',
         skipBackgroundNotify: true,
         insertTab: true,
         skipLoad: false,
@@ -64,8 +58,8 @@
       const newTab = gBrowser.addTrustedTab(Services.io.newURI(url).spec, newTabOptions);
 
       gBrowser.selectedTab = newTab;
-      currentTab.querySelector(".tab-content").appendChild(newTab);
-      newTab.setAttribute("zen-glance-tab", true);
+      currentTab.querySelector('.tab-content').appendChild(newTab);
+      newTab.setAttribute('zen-glance-tab', true);
       this.#currentBrowser = newTab.linkedBrowser;
       this.#currentTab = newTab;
       return this.#currentBrowser;
@@ -81,12 +75,12 @@
       const initialWidth = data.width;
       const initialHeight = data.height;
 
-      this.browserWrapper?.removeAttribute("animate");
-      this.browserWrapper?.removeAttribute("animate-end");
-      this.browserWrapper?.removeAttribute("animate-full");
-      this.browserWrapper?.removeAttribute("animate-full-end");
-      this.browserWrapper?.removeAttribute("has-finished-animation");
-      this.overlay?.removeAttribute("post-fade-out");
+      this.browserWrapper?.removeAttribute('animate');
+      this.browserWrapper?.removeAttribute('animate-end');
+      this.browserWrapper?.removeAttribute('animate-full');
+      this.browserWrapper?.removeAttribute('animate-full-end');
+      this.browserWrapper?.removeAttribute('has-finished-animation');
+      this.overlay?.removeAttribute('post-fade-out');
 
       const url = data.url;
       const currentTab = gBrowser.selectedTab;
@@ -94,29 +88,29 @@
       this.animatingOpen = true;
       const browserElement = this.createBrowserElement(url, currentTab);
 
-      this.overlay = browserElement.closest(".browserSidebarContainer");
-      this.browserWrapper = browserElement.closest(".browserContainer");
-      this.contentWrapper = browserElement.closest(".browserStack");
+      this.overlay = browserElement.closest('.browserSidebarContainer');
+      this.browserWrapper = browserElement.closest('.browserContainer');
+      this.contentWrapper = browserElement.closest('.browserStack');
 
       this.browserWrapper.prepend(this.sidebarButtons);
 
-      this.overlay.classList.add("zen-glance-overlay");
+      this.overlay.classList.add('zen-glance-overlay');
 
-      this.browserWrapper.removeAttribute("animate-end");
+      this.browserWrapper.removeAttribute('animate-end');
       window.requestAnimationFrame(() => {
         this.quickOpenGlance();
 
-        this.browserWrapper.style.setProperty("--initial-x", `${initialX}px`);
-        this.browserWrapper.style.setProperty("--initial-y", `${initialY}px`);
-        this.browserWrapper.style.setProperty("--initial-width", initialWidth + "px");
-        this.browserWrapper.style.setProperty("--initial-height", initialHeight + "px");
+        this.browserWrapper.style.setProperty('--initial-x', `${initialX}px`);
+        this.browserWrapper.style.setProperty('--initial-y', `${initialY}px`);
+        this.browserWrapper.style.setProperty('--initial-width', initialWidth + 'px');
+        this.browserWrapper.style.setProperty('--initial-height', initialHeight + 'px');
 
-        this.overlay.removeAttribute("fade-out");
-        this.browserWrapper.setAttribute("animate", true);
+        this.overlay.removeAttribute('fade-out');
+        this.browserWrapper.setAttribute('animate', true);
         this.#animating = true;
         setTimeout(() => {
-          this.browserWrapper.setAttribute("animate-end", true);
-          this.browserWrapper.setAttribute("has-finished-animation", true);
+          this.browserWrapper.setAttribute('animate-end', true);
+          this.browserWrapper.setAttribute('has-finished-animation', true);
           this.#animating = false;
           this.animatingOpen = false;
         }, 500);
@@ -128,7 +122,7 @@
         return;
       }
 
-      this.browserWrapper.removeAttribute("has-finished-animation");
+      this.browserWrapper.removeAttribute('has-finished-animation');
       if (noAnimation) {
         this.quickCloseGlance({ closeCurrentTab: false });
         this.#currentBrowser = null;
@@ -156,13 +150,13 @@
 
       // do NOT touch here, I don't know what it does, but it works...
       window.requestAnimationFrame(() => {
-        this.#currentTab.style.display = "none";
-        this.browserWrapper.removeAttribute("animate");
-        this.browserWrapper.removeAttribute("animate-end");
-        this.overlay.setAttribute("fade-out", true);
+        this.#currentTab.style.display = 'none';
+        this.browserWrapper.removeAttribute('animate');
+        this.browserWrapper.removeAttribute('animate-end');
+        this.overlay.setAttribute('fade-out', true);
         window.requestAnimationFrame(() => {
           this.quickCloseGlance({ justAnimateParent: true });
-          this.browserWrapper.setAttribute("animate", true);
+          this.browserWrapper.setAttribute('animate', true);
           setTimeout(() => {
             if (!this.currentParentTab) {
               return;
@@ -171,12 +165,12 @@
             if (!onTabClose || quikcCloseZen) {
               this.quickCloseGlance();
             }
-            this.overlay.removeAttribute("fade-out");
-            this.browserWrapper.removeAttribute("animate");
+            this.overlay.removeAttribute('fade-out');
+            this.browserWrapper.removeAttribute('animate');
 
             this.lastCurrentTab = this.#currentTab;
 
-            this.overlay.classList.remove("zen-glance-overlay");
+            this.overlay.classList.remove('zen-glance-overlay');
             gBrowser._getSwitcher().setTabStateNoAction(this.lastCurrentTab, gBrowser.AsyncTabSwitcher.STATE_UNLOADED);
 
             if (!onTabClose && gBrowser.selectedTab === this.lastCurrentTab) {
@@ -190,9 +184,9 @@
             this.overlay = null;
             this.contentWrapper = null;
 
-            this.lastCurrentTab.removeAttribute("zen-glance-tab");
+            this.lastCurrentTab.removeAttribute('zen-glance-tab');
             this.lastCurrentTab._closingGlance = true;
-              
+
             gBrowser.tabContainer._invalidateCachedTabs();
             gBrowser.removeTab(this.lastCurrentTab, { animate: true });
 
@@ -200,10 +194,10 @@
             this.#currentBrowser = null;
 
             this.lastCurrentTab = null;
-            this._duringOpening = false;            
+            this._duringOpening = false;
           }, 400);
         });
-      });  
+      });
     }
 
     quickOpenGlance() {
@@ -215,26 +209,28 @@
         gBrowser.selectedTab = this.#currentTab;
       } catch (e) {}
 
-      this.currentParentTab.linkedBrowser.closest(".browserSidebarContainer").classList.add("deck-selected", "zen-glance-background");
-      this.currentParentTab.linkedBrowser.closest(".browserSidebarContainer").classList.remove("zen-glance-overlay");
+      this.currentParentTab.linkedBrowser
+        .closest('.browserSidebarContainer')
+        .classList.add('deck-selected', 'zen-glance-background');
+      this.currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-overlay');
       this.currentParentTab.linkedBrowser.zenModeActive = true;
       this.#currentBrowser.zenModeActive = true;
       this.currentParentTab.linkedBrowser.docShellIsActive = true;
       this.#currentBrowser.docShellIsActive = true;
-      this.#currentBrowser.setAttribute("zen-glance-selected", true);
+      this.#currentBrowser.setAttribute('zen-glance-selected', true);
 
       this.currentParentTab._visuallySelected = true;
-      this.overlay.classList.add("deck-selected");
+      this.overlay.classList.add('deck-selected');
 
       this._duringOpening = false;
     }
 
     quickCloseGlance({ closeCurrentTab = true, closeParentTab = true, justAnimateParent = false } = {}) {
-      const parentHasBrowser = !!(this.currentParentTab.linkedBrowser);
-      if (!justAnimateParent) { 
+      const parentHasBrowser = !!this.currentParentTab.linkedBrowser;
+      if (!justAnimateParent) {
         if (parentHasBrowser) {
           if (closeParentTab) {
-            this.currentParentTab.linkedBrowser.closest(".browserSidebarContainer").classList.remove("deck-selected");
+            this.currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('deck-selected');
           }
           this.currentParentTab.linkedBrowser.zenModeActive = false;
         }
@@ -244,15 +240,15 @@
         }
         if (closeCurrentTab) {
           this.#currentBrowser.docShellIsActive = false;
-          this.overlay.classList.remove("deck-selected");
+          this.overlay.classList.remove('deck-selected');
         }
         if (!this.currentParentTab._visuallySelected && closeParentTab) {
           this.currentParentTab._visuallySelected = false;
         }
-        this.#currentBrowser.removeAttribute("zen-glance-selected");
+        this.#currentBrowser.removeAttribute('zen-glance-selected');
       }
       if (parentHasBrowser) {
-        this.currentParentTab.linkedBrowser.closest(".browserSidebarContainer").classList.remove("zen-glance-background");
+        this.currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
       }
     }
 
@@ -277,7 +273,7 @@
       }
     }
 
-    fullyOpenGlance() {            
+    fullyOpenGlance() {
       gBrowser._insertTabAtIndex(this.#currentTab, {
         index: this.#currentTab._tPos + 1,
       });
@@ -285,15 +281,15 @@
       this.animatingFullOpen = true;
       this.currentParentTab._visuallySelected = false;
 
-      this.browserWrapper.removeAttribute("has-finished-animation");
-      this.browserWrapper.setAttribute("animate-full", true);
-      this.#currentTab.removeAttribute("zen-glance-tab");
+      this.browserWrapper.removeAttribute('has-finished-animation');
+      this.browserWrapper.setAttribute('animate-full', true);
+      this.#currentTab.removeAttribute('zen-glance-tab');
       gBrowser.selectedTab = this.#currentTab;
-      this.currentParentTab.linkedBrowser.closest(".browserSidebarContainer").classList.remove("zen-glance-background");
+      this.currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
       setTimeout(() => {
         window.requestAnimationFrame(() => {
-          this.browserWrapper.setAttribute("animate-full-end", true);
-          this.overlay.classList.remove("zen-glance-overlay");
+          this.browserWrapper.setAttribute('animate-full-end', true);
+          this.overlay.classList.remove('zen-glance-overlay');
           setTimeout(() => {
             this.animatingFullOpen = false;
             this.closeGlance({ noAnimation: true });
@@ -313,7 +309,7 @@
         return;
       } else if (activationMethod === 'meta' && !event.metaKey) {
         return;
-      }else if (activationMethod === 'mantain' || typeof activationMethod === 'undefined') {
+      } else if (activationMethod === 'mantain' || typeof activationMethod === 'undefined') {
         return;
       }
 
@@ -338,13 +334,13 @@
   window.gZenGlanceManager = new ZenGlanceManager();
 
   function registerWindowActors() {
-    if (Services.prefs.getBoolPref("zen.glance.enabled", true)) {
-      gZenActorsManager.addJSWindowActor("ZenGlance", {
+    if (Services.prefs.getBoolPref('zen.glance.enabled', true)) {
+      gZenActorsManager.addJSWindowActor('ZenGlance', {
         parent: {
-          esModuleURI: "chrome://browser/content/zen-components/actors/ZenGlanceParent.sys.mjs",
+          esModuleURI: 'chrome://browser/content/zen-components/actors/ZenGlanceParent.sys.mjs',
         },
         child: {
-          esModuleURI: "chrome://browser/content/zen-components/actors/ZenGlanceChild.sys.mjs",
+          esModuleURI: 'chrome://browser/content/zen-components/actors/ZenGlanceChild.sys.mjs',
           events: {
             DOMContentLoaded: {},
           },
diff --git a/src/browser/base/zen-components/ZenGradientGenerator.mjs b/src/browser/base/zen-components/ZenGradientGenerator.mjs
index ddc8ddbc0..3acff7c19 100644
--- a/src/browser/base/zen-components/ZenGradientGenerator.mjs
+++ b/src/browser/base/zen-components/ZenGradientGenerator.mjs
@@ -18,8 +18,12 @@
 
       ChromeUtils.defineLazyGetter(this, 'panel', () => document.getElementById('PanelUI-zen-gradient-generator'));
       ChromeUtils.defineLazyGetter(this, 'toolbox', () => document.getElementById('TabsToolbar'));
-      ChromeUtils.defineLazyGetter(this, 'customColorInput', () => document.getElementById('PanelUI-zen-gradient-generator-custom-input'));
-      ChromeUtils.defineLazyGetter(this, 'customColorList', () => document.getElementById('PanelUI-zen-gradient-generator-custom-list'));    
+      ChromeUtils.defineLazyGetter(this, 'customColorInput', () =>
+        document.getElementById('PanelUI-zen-gradient-generator-custom-input')
+      );
+      ChromeUtils.defineLazyGetter(this, 'customColorList', () =>
+        document.getElementById('PanelUI-zen-gradient-generator-custom-list')
+      );
 
       XPCOMUtils.defineLazyPreferenceGetter(
         this,
@@ -27,7 +31,7 @@
         'zen.theme.color-prefs.use-workspace-colors',
         true,
         this.onDarkModeChange.bind(this)
-      )
+      );
 
       this.initRotation();
       this.initCanvas();
@@ -74,7 +78,6 @@
       this.image.onload = this.onImageLoad.bind(this);
     }
 
-    
     onImageLoad() {
       // resize the image to fit the panel
       const imageSize = 300 - 20; // 20 is the padding (10px)
@@ -92,7 +95,6 @@
       this.initContextMenu();
       this.initThemePicker();
 
-
       this._hasInitialized = true;
       this.onDarkModeChange(null);
     }
@@ -146,7 +148,7 @@
           x = event.clientX;
           y = event.clientY;
         }
-        const degrees = Math.round(Math.atan2(y - centerY, x - centerX) * 180 / Math.PI);
+        const degrees = Math.round((Math.atan2(y - centerY, x - centerX) * 180) / Math.PI);
         this.setRotationInput(degrees);
         this.updateCurrentWorkspace();
       }
@@ -164,11 +166,11 @@
       this.rotationInputDot.style.transform = `rotate(${degrees - 20}deg)`;
       this.rotationInputText.textContent = `${fixedRotation}°`;
     }
-    
+
     initCustomColorInput() {
       this.customColorInput.addEventListener('keydown', this.onCustomColorKeydown.bind(this));
     }
-    
+
     onCustomColorKeydown(event) {
       //checks for enter key for custom colors
       if (event.key === 'Enter') {
@@ -201,17 +203,17 @@
       // Check if there's an exact match
       for (const pixel of similarPixels) {
         const x = (pixel / 4) % this.canvas.width;
-        const y = Math.floor((pixel / 4) / this.canvas.width);
+        const y = Math.floor(pixel / 4 / this.canvas.width);
         const pixelColor = this.getColorFromPosition(x, y);
         if (pixelColor[0] === r && pixelColor[1] === g && pixelColor[2] === b) {
-          return {x: x / this.canvas.width, y: y / this.canvas.height};
+          return { x: x / this.canvas.width, y: y / this.canvas.height };
         }
       }
       // If there's no exact match, return the first similar pixel
       const pixel = similarPixels[0];
       const x = (pixel / 4) % this.canvas.width;
-      const y = Math.floor((pixel / 4) / this.canvas.width);
-      return {x: x / this.canvas.width, y: y / this.canvas.height};
+      const y = Math.floor(pixel / 4 / this.canvas.width);
+      return { x: x / this.canvas.width, y: y / this.canvas.height };
     }
 
     getColorFromPosition(x, y) {
@@ -246,19 +248,19 @@
 
     onThemePickerClick(event) {
       event.preventDefault();
-      
-      if (event.button !== 0 || this.dragging ) return;
-  
+
+      if (event.button !== 0 || this.dragging) return;
+
       const gradient = this.panel.querySelector('.zen-theme-picker-gradient');
       const rect = gradient.getBoundingClientRect();
       const padding = 90; // each side
-      
+
       const centerX = rect.left + rect.width / 2;
       const centerY = rect.top + rect.height / 2;
       const radius = (rect.width - padding) / 2;
       let pixelX = event.clientX;
       let pixelY = event.clientY;
-      
+
       // Check if the click is within the circle
       const distance = Math.sqrt((pixelX - centerX) ** 2 + (pixelY - centerY) ** 2);
       if (distance > radius) {
@@ -268,51 +270,45 @@
       // Check if we clicked on an existing dot
       const clickedElement = event.target;
       const isExistingDot = clickedElement.classList.contains('zen-theme-picker-dot');
-  
+
       // Only proceed if not clicking on an existing dot
       if (!isExistingDot) {
-        
         const relativeX = event.clientX - rect.left;
         const relativeY = event.clientY - rect.top;
-        
-        
+
         const color = this.getColorFromPosition(relativeX, relativeY);
-  
+
         // Create new dot
         const dot = document.createElement('div');
         dot.classList.add('zen-theme-picker-dot');
         dot.addEventListener('mousedown', this.onDotMouseDown.bind(this));
-  
+
         dot.style.left = `${relativeX}px`;
         dot.style.top = `${relativeY}px`;
         dot.style.setProperty('--zen-theme-picker-dot-color', `rgb(${color[0]}, ${color[1]}, ${color[2]})`);
-  
+
         gradient.appendChild(dot);
-  
+
         this.updateCurrentWorkspace(true);
       }
+    }
 
-  }
-  
-  
-
-  onDotMouseDown(event) {
-    event.preventDefault();
-    if (event.button === 2) {
-      return;
-    }
-    this.dragging = true;
-    this.draggedDot = event.target;
-    this.draggedDot.style.zIndex = 1;
-    this.draggedDot.classList.add('dragging');
-    
-    // Store the starting position of the drag
-    this.dragStartPosition = {
-      x: event.clientX,
-      y: event.clientY
-    };
-  }
+    onDotMouseDown(event) {
+      event.preventDefault();
+      if (event.button === 2) {
+        return;
+      }
+      this.dragging = true;
+      this.draggedDot = event.target;
+      this.draggedDot.style.zIndex = 1;
+      this.draggedDot.classList.add('dragging');
 
+      // Store the starting position of the drag
+      this.dragStartPosition = {
+        x: event.clientX,
+        y: event.clientY,
+      };
+    }
 
     onDotMouseMove(event) {
       if (this.dragging) {
@@ -320,15 +316,15 @@
         const rect = this.panel.querySelector('.zen-theme-picker-gradient').getBoundingClientRect();
         const padding = 90; // each side
         // do NOT let the ball be draged outside of an imaginary circle. You can drag it anywhere inside the circle
-        // if the distance between the center of the circle and the dragged ball is bigger than the radius, then the ball 
+        // if the distance between the center of the circle and the dragged ball is bigger than the radius, then the ball
         // should be placed on the edge of the circle. If it's inside the circle, then the ball just follows the mouse
-   
+
         const centerX = rect.left + rect.width / 2;
         const centerY = rect.top + rect.height / 2;
         const radius = (rect.width - padding) / 2;
         let pixelX = event.clientX;
         let pixelY = event.clientY;
-        const distance = Math.sqrt((pixelX - centerX)  **2 + (pixelY - centerY)  **2);
+        const distance = Math.sqrt((pixelX - centerX) ** 2 + (pixelY - centerY) ** 2);
         if (distance > radius) {
           const angle = Math.atan2(pixelY - centerY, pixelX - centerX);
           pixelX = centerX + Math.cos(angle) * radius;
@@ -358,18 +354,14 @@
       listItems.querySelector('.zen-theme-picker-dot-custom').style.setProperty('--zen-theme-picker-dot-color', color);
       listItems.querySelector('.zen-theme-picker-custom-list-item-label').textContent = color;
 
-      
       this.customColorList.appendChild(listItems);
     }
 
     async addCustomColor() {
-      
       const color = this.customColorInput.value;
       if (!color) {
-        
         return;
       }
-    
 
       // can be any color format, we just add it to the list as a dot, but hidden
       const dot = document.createElement('div');
@@ -381,50 +373,46 @@
       await this.updateCurrentWorkspace();
     }
 
-
-
     onThemePickerClick(event) {
       event.preventDefault();
-      
+
       if (event.button !== 0 || this.dragging) return;
-  
+
       const gradient = this.panel.querySelector('.zen-theme-picker-gradient');
       const rect = gradient.getBoundingClientRect();
       const padding = 90; // each side
-      
+
       const centerX = rect.left + rect.width / 2;
       const centerY = rect.top + rect.height / 2;
       const radius = (rect.width - padding) / 2;
       let pixelX = event.clientX;
       let pixelY = event.clientY;
-      
+
       // Check if the click is within the circle
       const distance = Math.sqrt((pixelX - centerX) ** 2 + (pixelY - centerY) ** 2);
       if (distance > radius) {
-        return; 
+        return;
       }
 
-      
       const clickedElement = event.target;
       const isExistingDot = clickedElement.classList.contains('zen-theme-picker-dot');
-  
-      
+
       if (!isExistingDot && this.numberOfDots < ZenThemePicker.MAX_DOTS) {
         const relativeX = event.clientX - rect.left;
         const relativeY = event.clientY - rect.top;
-        
+
         const color = this.getColorFromPosition(relativeX, relativeY);
-  
+
         const dot = document.createElement('div');
         dot.classList.add('zen-theme-picker-dot');
         dot.addEventListener('mousedown', this.onDotMouseDown.bind(this));
-  
+
         dot.style.left = `${relativeX}px`;
         dot.style.top = `${relativeY}px`;
         dot.style.setProperty('--zen-theme-picker-dot-color', `rgb(${color[0]}, ${color[1]}, ${color[2]})`);
-  
+
         gradient.appendChild(dot);
-  
+
         this.updateCurrentWorkspace(true);
       }
     }
@@ -438,11 +426,11 @@
       this.draggedDot = event.target;
       this.draggedDot.style.zIndex = 1;
       this.draggedDot.classList.add('dragging');
-      
+
       // Store the starting position of the drag
       this.dragStartPosition = {
         x: event.clientX,
-        y: event.clientY
+        y: event.clientY,
       };
     }
 
@@ -459,7 +447,7 @@
 
       if (this.dragging) {
         event.preventDefault();
-        event.stopPropagation(); 
+        event.stopPropagation();
         this.dragging = false;
         this.draggedDot.style.zIndex = 1;
         this.draggedDot.classList.remove('dragging');
@@ -471,19 +459,16 @@
       this.numberOfDots = this.panel.querySelectorAll('.zen-theme-picker-dot').length;
     }
 
-
     themedColors(colors) {
       const isDarkMode = this.isDarkMode;
       const factor = isDarkMode ? 0.5 : 1.1;
-      return colors.map(color => {
+      return colors.map((color) => {
         return {
-          c: color.isCustom ? color.c : [
-            Math.min(255, color.c[0] * factor),
-            Math.min(255, color.c[1] * factor),
-            Math.min(255, color.c[2] * factor),
-          ],
+          c: color.isCustom
+            ? color.c
+            : [Math.min(255, color.c[0] * factor), Math.min(255, color.c[1] * factor), Math.min(255, color.c[2] * factor)],
           isCustom: color.isCustom,
-        }
+        };
       });
     }
 
@@ -508,17 +493,17 @@
     getGradient(colors, forToolbar = false) {
       const themedColors = this.themedColors(colors);
       if (themedColors.length === 0) {
-        return forToolbar ? "var(--zen-themed-toolbar-bg)" : "var(--zen-themed-toolbar-bg-transparent)";
+        return forToolbar ? 'var(--zen-themed-toolbar-bg)' : 'var(--zen-themed-toolbar-bg-transparent)';
       } else if (themedColors.length === 1) {
         return this.getSingleRGBColor(themedColors[0], forToolbar);
       }
-      return `linear-gradient(${this.currentRotation}deg, ${themedColors.map(color => this.getSingleRGBColor(color, forToolbar)).join(', ')})`;
+      return `linear-gradient(${this.currentRotation}deg, ${themedColors.map((color) => this.getSingleRGBColor(color, forToolbar)).join(', ')})`;
     }
 
     getTheme(colors, opacity = 0.5, rotation = 45, texture = 0) {
       return {
         type: 'gradient',
-        gradientColors: colors.filter(color => color), // remove undefined
+        gradientColors: colors.filter((color) => color), // remove undefined
         opacity,
         rotation,
         texture,
@@ -535,43 +520,70 @@
         hex = hex.substring(1);
       }
       if (hex.length === 3) {
-        hex = hex.split('').map(char => char + char).join('');
+        hex = hex
+          .split('')
+          .map((char) => char + char)
+          .join('');
       }
-      return [
-        parseInt(hex.substring(0, 2), 16),
-        parseInt(hex.substring(2, 4), 16),
-        parseInt(hex.substring(4, 6), 16),
-      ];
-    }
-
-    pSBC=(p,c0,c1,l)=>{
-        let r,g,b,P,f,t,h,i=parseInt,m=Math.round,a=typeof(c1)=="string";
-        if(typeof(p)!="number"||p<-1||p>1||typeof(c0)!="string"||(c0[0]!='r'&&c0[0]!='#')||(c1&&!a))return null;
-        if(!this.pSBCr)this.pSBCr=(d)=>{
-          let n=d.length,x={};
-          if(n>9){
-            [r,g,b,a]=d=d.split(","),n=d.length;
-            if(n<3||n>4)return null;
-            x.r=i(r[3]=="a"?r.slice(5):r.slice(4)),x.g=i(g),x.b=i(b),x.a=a?parseFloat(a):-1
-          }else{
-            if(n==8||n==6||n<4)return null;
-            if(n<6)d="#"+d[1]+d[1]+d[2]+d[2]+d[3]+d[3]+(n>4?d[4]+d[4]:"");
-            d=i(d.slice(1),16);
-            if(n==9||n==5)x.r=d>>24&255,x.g=d>>16&255,x.b=d>>8&255,x.a=m((d&255)/0.255)/1000;
-            else x.r=d>>16,x.g=d>>8&255,x.b=d&255,x.a=-1
-          }return x};
-        h=c0.length>9,h=a?c1.length>9?true:c1=="c"?!h:false:h,f=this.pSBCr(c0),P=p<0,t=c1&&c1!="c"?this.pSBCr(c1):P?{r:0,g:0,b:0,a:-1}:{r:255,g:255,b:255,a:-1},p=P?p*-1:p,P=1-p;
-        if(!f||!t)return null;
-        if(l)r=m(P*f.r+p*t.r),g=m(P*f.g+p*t.g),b=m(P*f.b+p*t.b);
-        else r=m((P*f.r**2+p*t.r**2)**0.5),g=m((P*f.g**2+p*t.g**2)**0.5),b=m((P*f.b**2+p*t.b**2)**0.5);
-        a=f.a,t=t.a,f=a>=0||t>=0,a=f?a<0?t:t<0?a:a*P+t*p:0;
-        if(h)return"rgb"+(f?"a(":"(")+r+","+g+","+b+(f?","+m(a*1000)/1000:"")+")";
-        else return"#"+(4294967296+r*16777216+g*65536+b*256+(f?m(a*255):0)).toString(16).slice(1,f?undefined:-2)
-    }
+      return [parseInt(hex.substring(0, 2), 16), parseInt(hex.substring(2, 4), 16), parseInt(hex.substring(4, 6), 16)];
+    }
+
+    pSBC = (p, c0, c1, l) => {
+      let r,
+        g,
+        b,
+        P,
+        f,
+        t,
+        h,
+        i = parseInt,
+        m = Math.round,
+        a = typeof c1 == 'string';
+      if (typeof p != 'number' || p < -1 || p > 1 || typeof c0 != 'string' || (c0[0] != 'r' && c0[0] != '#') || (c1 && !a))
+        return null;
+      if (!this.pSBCr)
+        this.pSBCr = (d) => {
+          let n = d.length,
+            x = {};
+          if (n > 9) {
+            ([r, g, b, a] = d = d.split(',')), (n = d.length);
+            if (n < 3 || n > 4) return null;
+            (x.r = i(r[3] == 'a' ? r.slice(5) : r.slice(4))), (x.g = i(g)), (x.b = i(b)), (x.a = a ? parseFloat(a) : -1);
+          } else {
+            if (n == 8 || n == 6 || n < 4) return null;
+            if (n < 6) d = '#' + d[1] + d[1] + d[2] + d[2] + d[3] + d[3] + (n > 4 ? d[4] + d[4] : '');
+            d = i(d.slice(1), 16);
+            if (n == 9 || n == 5)
+              (x.r = (d >> 24) & 255), (x.g = (d >> 16) & 255), (x.b = (d >> 8) & 255), (x.a = m((d & 255) / 0.255) / 1000);
+            else (x.r = d >> 16), (x.g = (d >> 8) & 255), (x.b = d & 255), (x.a = -1);
+          }
+          return x;
+        };
+      (h = c0.length > 9),
+        (h = a ? (c1.length > 9 ? true : c1 == 'c' ? !h : false) : h),
+        (f = this.pSBCr(c0)),
+        (P = p < 0),
+        (t = c1 && c1 != 'c' ? this.pSBCr(c1) : P ? { r: 0, g: 0, b: 0, a: -1 } : { r: 255, g: 255, b: 255, a: -1 }),
+        (p = P ? p * -1 : p),
+        (P = 1 - p);
+      if (!f || !t) return null;
+      if (l) (r = m(P * f.r + p * t.r)), (g = m(P * f.g + p * t.g)), (b = m(P * f.b + p * t.b));
+      else
+        (r = m((P * f.r ** 2 + p * t.r ** 2) ** 0.5)),
+          (g = m((P * f.g ** 2 + p * t.g ** 2) ** 0.5)),
+          (b = m((P * f.b ** 2 + p * t.b ** 2) ** 0.5));
+      (a = f.a), (t = t.a), (f = a >= 0 || t >= 0), (a = f ? (a < 0 ? t : t < 0 ? a : a * P + t * p) : 0);
+      if (h) return 'rgb' + (f ? 'a(' : '(') + r + ',' + g + ',' + b + (f ? ',' + m(a * 1000) / 1000 : '') + ')';
+      else
+        return (
+          '#' +
+          (4294967296 + r * 16777216 + g * 65536 + b * 256 + (f ? m(a * 255) : 0)).toString(16).slice(1, f ? undefined : -2)
+        );
+    };
 
     getMostDominantColor(allColors) {
       const colors = this.themedColors(allColors);
-      const themedColors = colors.filter(color => !color.isCustom);
+      const themedColors = colors.filter((color) => !color.isCustom);
       if (themedColors.length === 0 || !this.allowWorkspaceColors) {
         return null;
       }
@@ -579,20 +591,22 @@
       let dominantColor = themedColors[0].c;
       let dominantColorCount = 0;
       for (const color of themedColors) {
-        const count = themedColors.filter(c => c.c[0] === color.c[0] && c.c[1] === color.c[1] && c.c[2] === color.c[2]).length;
+        const count = themedColors.filter(
+          (c) => c.c[0] === color.c[0] && c.c[1] === color.c[1] && c.c[2] === color.c[2]
+        ).length;
         if (count > dominantColorCount) {
           dominantColorCount = count;
           dominantColor = color.c;
         }
       }
       const result = this.pSBC(
-        this.isDarkMode ? 0.2 : -0.5, 
-        `rgb(${dominantColor[0]}, ${dominantColor[1]}, ${dominantColor[2]})`);
+        this.isDarkMode ? 0.2 : -0.5,
+        `rgb(${dominantColor[0]}, ${dominantColor[1]}, ${dominantColor[2]})`
+      );
       return result?.match(/\d+/g).map(Number);
     }
 
     async onWorkspaceChange(workspace, skipUpdate = false, theme = null) {
-      
       const uuid = workspace.uuid;
       // Use theme from workspace object or passed theme
       let workspaceTheme = theme || workspace.theme;
@@ -615,13 +629,13 @@
             dot.remove();
           }
         }
-    
 
         const appWrapper = browser.document.getElementById('zen-main-app-wrapper');
         if (!skipUpdate) {
           appWrapper.removeAttribute('animating');
           appWrapper.setAttribute('animating', 'true');
-          browser.document.body.style.setProperty('--zen-main-browser-background-old',
+          browser.document.body.style.setProperty(
+            '--zen-main-browser-background-old',
             browser.document.body.style.getPropertyValue('--zen-main-browser-background')
           );
           browser.window.requestAnimationFrame(() => {
@@ -648,14 +662,16 @@
 
         browser.gZenThemePicker.numberOfDots = workspaceTheme.gradientColors.length;
 
-        browser.document.getElementById('PanelUI-zen-gradient-generator-opacity').value = browser.gZenThemePicker.currentOpacity;
-        browser.document.getElementById('PanelUI-zen-gradient-generator-texture').value = browser.gZenThemePicker.currentTexture;
+        browser.document.getElementById('PanelUI-zen-gradient-generator-opacity').value =
+          browser.gZenThemePicker.currentOpacity;
+        browser.document.getElementById('PanelUI-zen-gradient-generator-texture').value =
+          browser.gZenThemePicker.currentTexture;
         browser.gZenThemePicker.setRotationInput(browser.gZenThemePicker.currentRotation);
 
         const gradient = browser.gZenThemePicker.getGradient(workspaceTheme.gradientColors);
         const gradientToolbar = browser.gZenThemePicker.getGradient(workspaceTheme.gradientColors, true);
         browser.gZenThemePicker.updateNoise(workspaceTheme.texture);
-        
+
         for (const dot of workspaceTheme.gradientColors) {
           if (dot.isCustom) {
             browser.gZenThemePicker.addColorToCustomList(dot.c);
@@ -667,7 +683,10 @@
 
         const dominantColor = this.getMostDominantColor(workspaceTheme.gradientColors);
         if (dominantColor) {
-          browser.document.documentElement.style.setProperty('--zen-primary-color', `rgb(${dominantColor[0]}, ${dominantColor[1]}, ${dominantColor[2]})`);
+          browser.document.documentElement.style.setProperty(
+            '--zen-primary-color',
+            `rgb(${dominantColor[0]}, ${dominantColor[1]}, ${dominantColor[2]})`
+          );
         }
 
         if (!skipUpdate) {
@@ -706,24 +725,23 @@
     }
 
     async updateCurrentWorkspace(skipSave = true) {
-
       this.updated = skipSave;
       const dots = this.panel.querySelectorAll('.zen-theme-picker-dot');
-      const colors = Array.from(dots).map(dot => {
+      const colors = Array.from(dots).map((dot) => {
         const color = dot.style.getPropertyValue('--zen-theme-picker-dot-color');
         if (color === 'undefined') {
           return;
         }
         const isCustom = dot.classList.contains('custom');
-        return {c: isCustom ? color : color.match(/\d+/g).map(Number), isCustom};
+        return { c: isCustom ? color : color.match(/\d+/g).map(Number), isCustom };
       });
       const gradient = this.getTheme(colors, this.currentOpacity, this.currentRotation, this.currentTexture);
       let currentWorkspace = await ZenWorkspaces.getActiveWorkspace();
 
-      if(!skipSave) {
+      if (!skipSave) {
         await ZenWorkspacesStorage.saveWorkspaceTheme(currentWorkspace.uuid, gradient);
         await ZenWorkspaces._propagateWorkspaceData();
-        ConfirmationHint.show(document.getElementById("PanelUI-menu-button"), "zen-panel-ui-gradient-generator-saved-message");
+        ConfirmationHint.show(document.getElementById('PanelUI-menu-button'), 'zen-panel-ui-gradient-generator-saved-message');
         currentWorkspace = await ZenWorkspaces.getActiveWorkspace();
       }
 
@@ -731,10 +749,9 @@
     }
 
     async handlePanelClose() {
-      if(this.updated) {
+      if (this.updated) {
         await this.updateCurrentWorkspace(false);
       }
-
     }
   }
 
diff --git a/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs b/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
index 288fa566f..3e1dd7760 100644
--- a/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
+++ b/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
@@ -198,9 +198,9 @@ class KeyShortcutModifiers {
       this.#shift == other.#shift &&
       this.#control == other.#control &&
       (AppConstants.platform == 'macosx'
-        ? ((this.#meta || this.#accel) == (other.#meta || other.#accel) && this.#control == other.#control)
-        // In other platforms, we can have control and accel counting as the same thing
-        : (this.#meta == other.#meta && (this.#control || this.#accel) == (other.#control || other.#accel)))
+        ? (this.#meta || this.#accel) == (other.#meta || other.#accel) && this.#control == other.#control
+        : // In other platforms, we can have control and accel counting as the same thing
+          this.#meta == other.#meta && (this.#control || this.#accel) == (other.#control || other.#accel))
     );
   }
 
@@ -820,7 +820,7 @@ var gZenKeyboardShortcutsManager = {
     // Create the main keyset before calling the async init function,
     // This is because other browser-sets needs this element and the JS event
     //  handled wont wait for the async function to finish.
-    void(this.getZenKeyset());
+    void this.getZenKeyset();
 
     this._hasCleared = Services.prefs.getBoolPref('zen.keyboard.shortcuts.disable-mainkeyset-clear', false);
 
@@ -874,7 +874,7 @@ var gZenKeyboardShortcutsManager = {
 
       browser.gZenKeyboardShortcutsManager._zenKeyset = browser.document.createXULElement('keyset');
       browser.gZenKeyboardShortcutsManager._zenKeyset.id = ZEN_KEYSET_ID;
-      
+
       const mainKeyset = browser.document.getElementById(ZEN_MAIN_KEYSET_ID);
       mainKeyset.after(browser.gZenKeyboardShortcutsManager._zenKeyset);
     }
@@ -1002,8 +1002,12 @@ var gZenKeyboardShortcutsManager = {
   },
 };
 
-document.addEventListener("MozBeforeInitialXULLayout", () => {
-  if (Services.prefs.getBoolPref('zen.keyboard.shortcuts.enabled', false)) {
-    gZenKeyboardShortcutsManager.beforeInit();
-  }
-}, { once: true });
+document.addEventListener(
+  'MozBeforeInitialXULLayout',
+  () => {
+    if (Services.prefs.getBoolPref('zen.keyboard.shortcuts.enabled', false)) {
+      gZenKeyboardShortcutsManager.beforeInit();
+    }
+  },
+  { once: true }
+);
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 6388bc761..24f16baf3 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -7,9 +7,19 @@
     #listeners = [];
 
     constructor() {
-      XPCOMUtils.defineLazyPreferenceGetter(lazy, 'zenPinnedTabRestorePinnedTabsToPinnedUrl', 'zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url', false);
-      XPCOMUtils.defineLazyPreferenceGetter(lazy, 'zenPinnedTabCloseShortcutBehavior', 'zen.pinned-tab-manager.close-shortcut-behavior', 'switch');
-      ChromeUtils.defineESModuleGetters(lazy, {E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs"});
+      XPCOMUtils.defineLazyPreferenceGetter(
+        lazy,
+        'zenPinnedTabRestorePinnedTabsToPinnedUrl',
+        'zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url',
+        false
+      );
+      XPCOMUtils.defineLazyPreferenceGetter(
+        lazy,
+        'zenPinnedTabCloseShortcutBehavior',
+        'zen.pinned-tab-manager.close-shortcut-behavior',
+        'switch'
+      );
+      ChromeUtils.defineESModuleGetters(lazy, { E10SUtils: 'resource://gre/modules/E10SUtils.sys.mjs' });
       this.#listenPinnedTabEvents();
     }
 
@@ -37,7 +47,6 @@
   }
 
   class ZenPinnedTabManager extends ZenDOMOperatedFeature {
-
     init() {
       if (!this.enabled) {
         return;
@@ -49,7 +58,6 @@
 
       this._zenClickEventListener = this._onTabClick.bind(this);
       ZenWorkspaces.addChangeListeners(this.onWorkspaceChange.bind(this));
-
     }
 
     async onWorkspaceChange(newWorkspace, onInit) {
@@ -57,7 +65,7 @@
         return;
       }
 
-      await this._refreshPinnedTabs(newWorkspace,{ init: onInit });
+      await this._refreshPinnedTabs(newWorkspace, { init: onInit });
     }
 
     get enabled() {
@@ -71,12 +79,12 @@
       return this._enabled;
     }
 
-    async _refreshPinnedTabs(currentWorkspace,{ init = false } = {}) {
-      if(init) {
+    async _refreshPinnedTabs(currentWorkspace, { init = false } = {}) {
+      if (init) {
         await ZenPinnedTabsStorage.init();
       }
       await this._initializePinsCache();
-      await this._initializePinnedTabs(init,currentWorkspace);
+      await this._initializePinnedTabs(init, currentWorkspace);
     }
 
     async _initializePinsCache() {
@@ -85,30 +93,31 @@
         const pins = await ZenPinnedTabsStorage.getPins();
 
         // Enhance pins with favicons
-        const enhancedPins = await Promise.all(pins.map(async pin => {
-          try {
-            const image = await this.getFaviconAsBase64(pin.url);
-            return {
-              ...pin,
-              iconUrl: image || null
-            };
-          } catch(ex) {
-            // If favicon fetch fails, continue without icon
-            return {
-              ...pin,
-              iconUrl: null
-            };
-          }
-        }));
+        const enhancedPins = await Promise.all(
+          pins.map(async (pin) => {
+            try {
+              const image = await this.getFaviconAsBase64(pin.url);
+              return {
+                ...pin,
+                iconUrl: image || null,
+              };
+            } catch (ex) {
+              // If favicon fetch fails, continue without icon
+              return {
+                ...pin,
+                iconUrl: null,
+              };
+            }
+          })
+        );
 
         this._pinsCache = enhancedPins.sort((a, b) => {
           if (!a.workspaceUuid && b.workspaceUuid) return -1;
           if (a.workspaceUuid && !b.workspaceUuid) return 1;
           return 0;
         });
-
       } catch (ex) {
-        console.error("Failed to initialize pins cache:", ex);
+        console.error('Failed to initialize pins cache:', ex);
         this._pinsCache = [];
       }
 
@@ -125,11 +134,11 @@
 
       const activeTab = gBrowser.selectedTab;
       const pinnedTabsByUUID = new Map();
-      const pinsToCreate = new Set(pins.map(p => p.uuid));
+      const pinsToCreate = new Set(pins.map((p) => p.uuid));
 
       // First pass: identify existing tabs and remove those without pins
       for (let tab of gBrowser.tabs) {
-        const pinId = tab.getAttribute("zen-pin-id");
+        const pinId = tab.getAttribute('zen-pin-id');
         if (!pinId) {
           continue;
         }
@@ -165,7 +174,7 @@
           userContextId: pin.containerTabId || 0,
           createLazyBrowser: true,
           skipLoad: true,
-          noInitialLabel: false
+          noInitialLabel: false,
         };
 
         // Create and initialize the tab
@@ -181,26 +190,28 @@
           gBrowser.setIcon(newTab, pin.iconUrl);
         }
 
-        newTab.setAttribute("zen-pin-id", pin.uuid);
+        newTab.setAttribute('zen-pin-id', pin.uuid);
 
         if (pin.workspaceUuid) {
-          newTab.setAttribute("zen-workspace-id", pin.workspaceUuid);
+          newTab.setAttribute('zen-workspace-id', pin.workspaceUuid);
         }
 
         if (pin.isEssential) {
-          newTab.setAttribute("zen-essential", "true");
+          newTab.setAttribute('zen-essential', 'true');
         }
 
         // Initialize browser state if needed
         if (!newTab.linkedBrowser._remoteAutoRemoved) {
           let state = {
-            entries: [{
-              url: pin.url,
-              title: pin.title,
-              triggeringPrincipal_base64: E10SUtils.SERIALIZED_SYSTEMPRINCIPAL
-            }],
+            entries: [
+              {
+                url: pin.url,
+                title: pin.title,
+                triggeringPrincipal_base64: E10SUtils.SERIALIZED_SYSTEMPRINCIPAL,
+              },
+            ],
             userContextId: pin.containerTabId || 0,
-            image: pin.iconUrl
+            image: pin.iconUrl,
           };
 
           SessionStore.setTabState(newTab, state);
@@ -208,7 +219,6 @@
 
         gBrowser.pinTab(newTab);
 
-
         newTab.initialize();
       }
 
@@ -223,8 +233,8 @@
     _shouldShowPin(pin, currentWorkspace, workspaces) {
       const isEssential = pin.isEssential;
       const pinWorkspaceUuid = pin.workspaceUuid;
-      const pinContextId = pin.containerTabId ? pin.containerTabId.toString() : "0";
-      const workspaceContextId = currentWorkspace.containerTabId?.toString() || "0";
+      const pinContextId = pin.containerTabId ? pin.containerTabId.toString() : '0';
+      const workspaceContextId = currentWorkspace.containerTabId?.toString() || '0';
       const containerSpecificEssentials = ZenWorkspaces.containerSpecificEssentials;
 
       // Handle essential pins
@@ -233,14 +243,16 @@
           return true; // Show all essential pins when containerSpecificEssentials is false
         }
 
-        if (workspaceContextId !== "0") {
+        if (workspaceContextId !== '0') {
           // In workspaces with default container: Show essentials that match the container
           return pinContextId === workspaceContextId;
         } else {
           // In workspaces without a default container: Show essentials that aren't in container-specific workspaces
           // or have userContextId="0" or no userContextId
-          return !pinContextId || pinContextId === "0" || !workspaces.workspaces.some(
-              workspace => workspace.containerTabId === parseInt(pinContextId, 10)
+          return (
+            !pinContextId ||
+            pinContextId === '0' ||
+            !workspaces.workspaces.some((workspace) => workspace.containerTabId === parseInt(pinContextId, 10))
           );
         }
       }
@@ -259,15 +271,15 @@
       if (!this.enabled) return;
       const tab = event.target;
       switch (action) {
-        case "TabPinned":
+        case 'TabPinned':
           tab._zenClickEventListener = this._zenClickEventListener;
-          tab.addEventListener("click", tab._zenClickEventListener);
+          tab.addEventListener('click', tab._zenClickEventListener);
           this._setPinnedAttributes(tab);
           break;
-        case "TabUnpinned":
+        case 'TabUnpinned':
           this._removePinnedAttributes(tab);
           if (tab._zenClickEventListener) {
-            tab.removeEventListener("click", tab._zenClickEventListener);
+            tab.removeEventListener('click', tab._zenClickEventListener);
             delete tab._zenClickEventListener;
           }
           break;
@@ -278,14 +290,13 @@
     }
 
     _onTabClick(e) {
-      const tab = e.target?.closest("tab");
+      const tab = e.target?.closest('tab');
       if (e.button === 1 && tab) {
         this._onCloseTabShortcut(e, tab);
       }
     }
 
     async resetPinnedTab(tab) {
-
       if (!tab) {
         tab = TabContextMenu.contextTab;
       }
@@ -299,23 +310,23 @@
 
     async replacePinnedUrlWithCurrent() {
       const tab = TabContextMenu.contextTab;
-      if (!tab || !tab.pinned || !tab.getAttribute("zen-pin-id")) {
+      if (!tab || !tab.pinned || !tab.getAttribute('zen-pin-id')) {
         return;
       }
 
       const browser = tab.linkedBrowser;
 
-      const pin = this._pinsCache.find(pin => pin.uuid === tab.getAttribute("zen-pin-id"));
+      const pin = this._pinsCache.find((pin) => pin.uuid === tab.getAttribute('zen-pin-id'));
 
       if (!pin) {
         return;
       }
 
-      const userContextId = tab.getAttribute("usercontextid");
+      const userContextId = tab.getAttribute('usercontextid');
 
       pin.title = tab.label || browser.contentTitle;
       pin.url = browser.currentURI.spec;
-      pin.workspaceUuid = tab.getAttribute("zen-workspace-id");
+      pin.workspaceUuid = tab.getAttribute('zen-workspace-id');
       pin.userContextId = userContextId ? parseInt(userContextId, 10) : 0;
 
       await ZenPinnedTabsStorage.savePin(pin);
@@ -324,20 +335,19 @@
     }
 
     async _setPinnedAttributes(tab) {
-
-      if (tab.hasAttribute("zen-pin-id")) {
+      if (tab.hasAttribute('zen-pin-id')) {
         return;
       }
 
       const browser = tab.linkedBrowser;
 
       const uuid = gZenUIManager.generateUuidv4();
-      const userContextId = tab.getAttribute("usercontextid");
+      const userContextId = tab.getAttribute('usercontextid');
 
       let entry = null;
 
-      if(tab.getAttribute("zen-pinned-entry")) {
-        entry = JSON.parse(tab.getAttribute("zen-pinned-entry"));
+      if (tab.getAttribute('zen-pinned-entry')) {
+        entry = JSON.parse(tab.getAttribute('zen-pinned-entry'));
       }
 
       await ZenPinnedTabsStorage.savePin({
@@ -345,15 +355,15 @@
         title: entry?.title || tab.label || browser.contentTitle,
         url: entry?.url || browser.currentURI.spec,
         containerTabId: userContextId ? parseInt(userContextId, 10) : 0,
-        workspaceUuid: tab.getAttribute("zen-workspace-id"),
-        isEssential: tab.getAttribute("zen-essential") === "true"
+        workspaceUuid: tab.getAttribute('zen-workspace-id'),
+        isEssential: tab.getAttribute('zen-essential') === 'true',
       });
 
-      tab.setAttribute("zen-pin-id", uuid);
+      tab.setAttribute('zen-pin-id', uuid);
 
       // This is used while migrating old pins to new system - we don't want to refresh when migrating
-      if (tab.getAttribute("zen-pinned-entry")) {
-        tab.removeAttribute("zen-pinned-entry");
+      if (tab.getAttribute('zen-pinned-entry')) {
+        tab.removeAttribute('zen-pinned-entry');
         return;
       }
       const currentWorkspace = await ZenWorkspaces.getActiveWorkspace();
@@ -361,18 +371,18 @@
     }
 
     async _removePinnedAttributes(tab, isClosing = false) {
-      if(!tab.getAttribute("zen-pin-id")) {
+      if (!tab.getAttribute('zen-pin-id')) {
         return;
       }
 
-      await ZenPinnedTabsStorage.removePin(tab.getAttribute("zen-pin-id"));
+      await ZenPinnedTabsStorage.removePin(tab.getAttribute('zen-pin-id'));
 
-      if(!isClosing) {
-        tab.removeAttribute("zen-pin-id");
+      if (!isClosing) {
+        tab.removeAttribute('zen-pin-id');
 
-        if (!tab.hasAttribute("zen-workspace-id") && ZenWorkspaces.workspaceEnabled) {
+        if (!tab.hasAttribute('zen-workspace-id') && ZenWorkspaces.workspaceEnabled) {
           const workspace = await ZenWorkspaces.getActiveWorkspace();
-          tab.setAttribute("zen-workspace-id", workspace.uuid);
+          tab.setAttribute('zen-workspace-id', workspace.uuid);
         }
       }
       const currentWorkspace = await ZenWorkspaces.getActiveWorkspace();
@@ -388,9 +398,7 @@
     }
 
     _onCloseTabShortcut(event, selectedTab = gBrowser.selectedTab) {
-      if (
-          !selectedTab?.pinned
-      ) {
+      if (!selectedTab?.pinned) {
         return;
       }
 
@@ -425,19 +433,19 @@
     }
 
     _handleTabSwitch(selectedTab) {
-      if(selectedTab !== gBrowser.selectedTab) {
+      if (selectedTab !== gBrowser.selectedTab) {
         return;
       }
       const findNextTab = (direction) =>
-          gBrowser.tabContainer.findNextTab(selectedTab, {
-            direction,
-            filter: tab => !tab.hidden && !tab.pinned,
-          });
+        gBrowser.tabContainer.findNextTab(selectedTab, {
+          direction,
+          filter: (tab) => !tab.hidden && !tab.pinned,
+        });
 
       let nextTab = findNextTab(1) || findNextTab(-1);
 
       if (!nextTab) {
-        ZenWorkspaces._createNewTabForWorkspace({ uuid: ZenWorkspaces.activeWorkspace  });
+        ZenWorkspaces._createNewTabForWorkspace({ uuid: ZenWorkspaces.activeWorkspace });
 
         nextTab = findNextTab(1) || findNextTab(-1);
       }
@@ -448,12 +456,12 @@
     }
 
     async _resetTabToStoredState(tab) {
-      const id = tab.getAttribute("zen-pin-id");
+      const id = tab.getAttribute('zen-pin-id');
       if (!id) {
         return;
       }
 
-      const pin = this._pinsCache.find(pin => pin.uuid === id);
+      const pin = this._pinsCache.find((pin) => pin.uuid === id);
       if (!pin) {
         return;
       }
@@ -461,11 +469,13 @@
       const tabState = SessionStore.getTabState(tab);
       const state = JSON.parse(tabState);
 
-      state.entries = [{
-        url: pin.url,
-        title: pin.title,
-        triggeringPrincipal_base64: lazy.E10SUtils.SERIALIZED_SYSTEMPRINCIPAL
-      }];
+      state.entries = [
+        {
+          url: pin.url,
+          title: pin.title,
+          triggeringPrincipal_base64: lazy.E10SUtils.SERIALIZED_SYSTEMPRINCIPAL,
+        },
+      ];
 
       state.image = pin.iconUrl || null;
       state.index = 0;
@@ -484,15 +494,15 @@
 
         // Convert to base64
         const base64String = btoa(
-            Array.from(array)
-                .map(b => String.fromCharCode(b))
-                .join('')
+          Array.from(array)
+            .map((b) => String.fromCharCode(b))
+            .join('')
         );
 
         // Return as a proper data URL
         return `data:${faviconData.mimeType};base64,${base64String}`;
       } catch (ex) {
-        console.error("Failed to get favicon:", ex);
+        console.error('Failed to get favicon:', ex);
         return null;
       }
     }
@@ -501,9 +511,9 @@
       const tabs = TabContextMenu.contextTab.multiselected ? gBrowser.selectedTabs : [TabContextMenu.contextTab];
       for (let i = 0; i < tabs.length; i++) {
         const tab = tabs[i];
-        tab.setAttribute("zen-essential", "true");
-        if(tab.hasAttribute("zen-workspace-id")) {
-          tab.removeAttribute("zen-workspace-id");
+        tab.setAttribute('zen-essential', 'true');
+        if (tab.hasAttribute('zen-workspace-id')) {
+          tab.removeAttribute('zen-workspace-id');
         }
         if (tab.pinned) {
           gBrowser.unpinTab(tab);
@@ -516,9 +526,9 @@
       const tabs = TabContextMenu.contextTab.multiselected ? gBrowser.selectedTabs : [TabContextMenu.contextTab];
       for (let i = 0; i < tabs.length; i++) {
         const tab = tabs[i];
-        tab.removeAttribute("zen-essential");
-        if(ZenWorkspaces.workspaceEnabled && ZenWorkspaces.getActiveWorkspaceFromCache.uuid) {
-          tab.setAttribute("zen-workspace-id", ZenWorkspaces.getActiveWorkspaceFromCache.uuid);
+        tab.removeAttribute('zen-essential');
+        if (ZenWorkspaces.workspaceEnabled && ZenWorkspaces.getActiveWorkspaceFromCache.uuid) {
+          tab.setAttribute('zen-workspace-id', ZenWorkspaces.getActiveWorkspaceFromCache.uuid);
         }
         gBrowser.unpinTab(tab);
       }
@@ -565,16 +575,18 @@
       if (!this.enabled) {
         return;
       }
-      const isVisible = contextTab.pinned  && !contextTab.multiselected;
-      document.getElementById("context_zen-reset-pinned-tab").hidden = !isVisible || !contextTab.getAttribute("zen-pin-id");
-      document.getElementById("context_zen-replace-pinned-url-with-current").hidden = !isVisible;
-      document.getElementById("context_zen-add-essential").hidden = contextTab.getAttribute("zen-essential");
-      document.getElementById("context_zen-remove-essential").hidden = !contextTab.getAttribute("zen-essential");
-      document.getElementById("context_unpinTab").hidden = document.getElementById("context_unpinTab").hidden || contextTab.getAttribute("zen-essential");
-      document.getElementById("context_unpinSelectedTabs").hidden = document.getElementById("context_unpinSelectedTabs").hidden || contextTab.getAttribute("zen-essential");
-      document.getElementById("context_zen-pinned-tab-separator").hidden = !isVisible;
+      const isVisible = contextTab.pinned && !contextTab.multiselected;
+      document.getElementById('context_zen-reset-pinned-tab').hidden = !isVisible || !contextTab.getAttribute('zen-pin-id');
+      document.getElementById('context_zen-replace-pinned-url-with-current').hidden = !isVisible;
+      document.getElementById('context_zen-add-essential').hidden = contextTab.getAttribute('zen-essential');
+      document.getElementById('context_zen-remove-essential').hidden = !contextTab.getAttribute('zen-essential');
+      document.getElementById('context_unpinTab').hidden =
+        document.getElementById('context_unpinTab').hidden || contextTab.getAttribute('zen-essential');
+      document.getElementById('context_unpinSelectedTabs').hidden =
+        document.getElementById('context_unpinSelectedTabs').hidden || contextTab.getAttribute('zen-essential');
+      document.getElementById('context_zen-pinned-tab-separator').hidden = !isVisible;
     }
   }
 
   window.gZenPinnedTabManager = new ZenPinnedTabManager();
-}
\ No newline at end of file
+}
diff --git a/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs b/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs
index a93aaffeb..b4476a592 100644
--- a/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs
@@ -25,7 +25,6 @@ var ZenPinnedTabsStorage = {
           )
       `);
 
-
       // Create indices
       await db.execute(`
         CREATE INDEX IF NOT EXISTS idx_zen_pins_uuid ON zen_pins(uuid)
@@ -76,17 +75,21 @@ var ZenPinnedTabsStorage = {
           newPosition = pin.position;
         } else {
           // Get the maximum position within the same parent group (or null for root level)
-          const maxPositionResult = await db.execute(`
+          const maxPositionResult = await db.execute(
+            `
             SELECT MAX("position") as max_position
             FROM zen_pins
             WHERE COALESCE(parent_uuid, '') = COALESCE(:parent_uuid, '')
-          `, { parent_uuid: pin.parentUuid || null });
+          `,
+            { parent_uuid: pin.parentUuid || null }
+          );
           const maxPosition = maxPositionResult[0].getResultByName('max_position') || 0;
           newPosition = maxPosition + 1000;
         }
 
         // Insert or replace the pin
-        await db.executeCached(`
+        await db.executeCached(
+          `
           INSERT OR REPLACE INTO zen_pins (
             uuid, title, url, container_id, workspace_uuid, position,
             is_essential, is_group, parent_uuid, created_at, updated_at
@@ -96,26 +99,31 @@ var ZenPinnedTabsStorage = {
             COALESCE((SELECT created_at FROM zen_pins WHERE uuid = :uuid), :now),
             :now
           )
-        `, {
-          uuid: pin.uuid,
-          title: pin.title,
-          url: pin.isGroup ? null : pin.url,
-          container_id: pin.containerTabId || null,
-          workspace_uuid: pin.workspaceUuid || null,
-          position: newPosition,
-          is_essential: pin.isEssential || false,
-          is_group: pin.isGroup || false,
-          parent_uuid: pin.parentUuid || null,
-          now
-        });
-
-        await db.execute(`
+        `,
+          {
+            uuid: pin.uuid,
+            title: pin.title,
+            url: pin.isGroup ? null : pin.url,
+            container_id: pin.containerTabId || null,
+            workspace_uuid: pin.workspaceUuid || null,
+            position: newPosition,
+            is_essential: pin.isEssential || false,
+            is_group: pin.isGroup || false,
+            parent_uuid: pin.parentUuid || null,
+            now,
+          }
+        );
+
+        await db.execute(
+          `
           INSERT OR REPLACE INTO zen_pins_changes (uuid, timestamp)
           VALUES (:uuid, :timestamp)
-        `, {
-          uuid: pin.uuid,
-          timestamp: Math.floor(now / 1000)
-        });
+        `,
+          {
+            uuid: pin.uuid,
+            timestamp: Math.floor(now / 1000),
+          }
+        );
 
         changedUUIDs.add(pin.uuid);
         await this.updateLastChangeTimestamp(db);
@@ -123,7 +131,7 @@ var ZenPinnedTabsStorage = {
     });
 
     if (notifyObservers) {
-      this._notifyPinsChanged("zen-pin-updated", Array.from(changedUUIDs));
+      this._notifyPinsChanged('zen-pin-updated', Array.from(changedUUIDs));
     }
   },
 
@@ -142,17 +150,20 @@ var ZenPinnedTabsStorage = {
       position: row.getResultByName('position'),
       isEssential: Boolean(row.getResultByName('is_essential')),
       isGroup: Boolean(row.getResultByName('is_group')),
-      parentUuid: row.getResultByName('parent_uuid')
+      parentUuid: row.getResultByName('parent_uuid'),
     }));
   },
 
   async getGroupChildren(groupUuid) {
     const db = await PlacesUtils.promiseDBConnection();
-    const rows = await db.executeCached(`
-      SELECT * FROM zen_pins 
-      WHERE parent_uuid = :groupUuid 
+    const rows = await db.executeCached(
+      `
+      SELECT * FROM zen_pins
+      WHERE parent_uuid = :groupUuid
       ORDER BY position ASC
-    `, { groupUuid });
+    `,
+      { groupUuid }
+    );
 
     return rows.map((row) => ({
       uuid: row.getResultByName('uuid'),
@@ -163,7 +174,7 @@ var ZenPinnedTabsStorage = {
       position: row.getResultByName('position'),
       isEssential: Boolean(row.getResultByName('is_essential')),
       isGroup: Boolean(row.getResultByName('is_group')),
-      parentUuid: row.getResultByName('parent_uuid')
+      parentUuid: row.getResultByName('parent_uuid'),
     }));
   },
 
@@ -173,10 +184,7 @@ var ZenPinnedTabsStorage = {
     await PlacesUtils.withConnectionWrapper('ZenPinnedTabsStorage.removePin', async (db) => {
       await db.executeTransaction(async () => {
         // Get all child UUIDs first for change tracking
-        const children = await db.execute(
-            `SELECT uuid FROM zen_pins WHERE parent_uuid = :uuid`,
-            { uuid }
-        );
+        const children = await db.execute(`SELECT uuid FROM zen_pins WHERE parent_uuid = :uuid`, { uuid });
 
         // Add child UUIDs to changedUUIDs array
         for (const child of children) {
@@ -184,27 +192,24 @@ var ZenPinnedTabsStorage = {
         }
 
         // Delete all children in a single statement
-        await db.execute(
-            `DELETE FROM zen_pins WHERE parent_uuid = :uuid`,
-            { uuid }
-        );
+        await db.execute(`DELETE FROM zen_pins WHERE parent_uuid = :uuid`, { uuid });
 
         // Delete the pin/group itself
-        await db.execute(
-            `DELETE FROM zen_pins WHERE uuid = :uuid`,
-            { uuid }
-        );
+        await db.execute(`DELETE FROM zen_pins WHERE uuid = :uuid`, { uuid });
 
         // Record the changes
         const now = Math.floor(Date.now() / 1000);
         for (const changedUuid of changedUUIDs) {
-          await db.execute(`
+          await db.execute(
+            `
             INSERT OR REPLACE INTO zen_pins_changes (uuid, timestamp)
             VALUES (:uuid, :timestamp)
-          `, {
-            uuid: changedUuid,
-            timestamp: now
-          });
+          `,
+            {
+              uuid: changedUuid,
+              timestamp: now,
+            }
+          );
         }
 
         await this.updateLastChangeTimestamp(db);
@@ -212,7 +217,7 @@ var ZenPinnedTabsStorage = {
     });
 
     if (notifyObservers) {
-      this._notifyPinsChanged("zen-pin-removed", changedUUIDs);
+      this._notifyPinsChanged('zen-pin-removed', changedUUIDs);
     }
   },
 
@@ -227,13 +232,16 @@ var ZenPinnedTabsStorage = {
   async markChanged(uuid) {
     await PlacesUtils.withConnectionWrapper('ZenPinnedTabsStorage.markChanged', async (db) => {
       const now = Date.now();
-      await db.execute(`
+      await db.execute(
+        `
         INSERT OR REPLACE INTO zen_pins_changes (uuid, timestamp)
         VALUES (:uuid, :timestamp)
-      `, {
-        uuid,
-        timestamp: Math.floor(now / 1000)
-      });
+      `,
+        {
+          uuid,
+          timestamp: Math.floor(now / 1000),
+        }
+      );
     });
   },
 
@@ -269,21 +277,27 @@ var ZenPinnedTabsStorage = {
 
     for (let i = 0; i < pins.length; i++) {
       const newPosition = (i + 1) * 1000; // Use large increments
-      await db.execute(`
+      await db.execute(
+        `
         UPDATE zen_pins
         SET position = :newPosition
         WHERE uuid = :uuid
-      `, { newPosition, uuid: pins[i].getResultByName('uuid') });
+      `,
+        { newPosition, uuid: pins[i].getResultByName('uuid') }
+      );
       changedUUIDs.add(pins[i].getResultByName('uuid'));
     }
   },
 
   async updateLastChangeTimestamp(db) {
     const now = Date.now();
-    await db.execute(`
+    await db.execute(
+      `
       INSERT OR REPLACE INTO moz_meta (key, value)
       VALUES ('zen_pins_last_change', :now)
-    `, { now });
+    `,
+      { now }
+    );
   },
 
   async getLastChangeTimestamp() {
@@ -305,29 +319,35 @@ var ZenPinnedTabsStorage = {
           const pin = pins[i];
           const newPosition = (i + 1) * 1000;
 
-          await db.execute(`
+          await db.execute(
+            `
             UPDATE zen_pins
             SET position = :newPosition
             WHERE uuid = :uuid
-          `, { newPosition, uuid: pin.uuid });
+          `,
+            { newPosition, uuid: pin.uuid }
+          );
 
           changedUUIDs.add(pin.uuid);
 
           // Record the change
-          await db.execute(`
+          await db.execute(
+            `
             INSERT OR REPLACE INTO zen_pins_changes (uuid, timestamp)
             VALUES (:uuid, :timestamp)
-          `, {
-            uuid: pin.uuid,
-            timestamp: Math.floor(now / 1000)
-          });
+          `,
+            {
+              uuid: pin.uuid,
+              timestamp: Math.floor(now / 1000),
+            }
+          );
         }
 
         await this.updateLastChangeTimestamp(db);
       });
     });
 
-    this._notifyPinsChanged("zen-pin-updated", Array.from(changedUUIDs));
+    this._notifyPinsChanged('zen-pin-updated', Array.from(changedUUIDs));
   },
 
   async __dropTables() {
@@ -335,5 +355,5 @@ var ZenPinnedTabsStorage = {
       await db.execute(`DROP TABLE IF EXISTS zen_pins`);
       await db.execute(`DROP TABLE IF EXISTS zen_pins_changes`);
     });
-  }
+  },
 };
diff --git a/src/browser/base/zen-components/ZenSidebarManager.mjs b/src/browser/base/zen-components/ZenSidebarManager.mjs
index d3a1011c9..193403bea 100644
--- a/src/browser/base/zen-components/ZenSidebarManager.mjs
+++ b/src/browser/base/zen-components/ZenSidebarManager.mjs
@@ -17,7 +17,7 @@ class ZenBrowserManagerSidebar extends ZenDOMOperatedFeature {
 
   DEFAULT_MOBILE_USER_AGENT = `Mozilla/5.0 (Android 12; Mobile; rv:129.0) Gecko/20100101 Firefox/${AppConstants.ZEN_FIREFOX_VERSION}`;
   MAX_SIDEBAR_PANELS = Services.prefs.getIntPref('zen.sidebar.max-webpanels');
-  
+
   init() {
     ChromeUtils.defineLazyGetter(this, 'sidebar', () => document.getElementById('zen-sidebar-web-panel'));
     ChromeUtils.defineLazyGetter(this, 'forwardButton', () => document.getElementById('zen-sidebar-web-panel-forward'));
@@ -615,7 +615,7 @@ class ZenBrowserManagerSidebar extends ZenDOMOperatedFeature {
       this._setPinnedToElements();
       this.moveToTabBox();
     }
-    this.update();  
+    this.update();
   }
 
   get sidebarElement() {
diff --git a/src/browser/base/zen-components/ZenThemesCommon.mjs b/src/browser/base/zen-components/ZenThemesCommon.mjs
index 11e030c21..8e3b0a474 100644
--- a/src/browser/base/zen-components/ZenThemesCommon.mjs
+++ b/src/browser/base/zen-components/ZenThemesCommon.mjs
@@ -38,10 +38,10 @@ var ZenThemesCommon = {
         await IOUtils.writeJSON(this.themesDataFile, {});
         this.themes = {};
         gNotificationBox.appendNotification(
-          "zen-themes-corrupted",
+          'zen-themes-corrupted',
           {
-            label: { "l10n-id": "zen-themes-corrupted" },
-            image: "chrome://browser/skin/notification-icons/persistent-storage-blocked.svg",
+            label: { 'l10n-id': 'zen-themes-corrupted' },
+            image: 'chrome://browser/skin/notification-icons/persistent-storage-blocked.svg',
             priority: gNotificationBox.PRIORITY_INFO_MEDIUM,
           },
           []
diff --git a/src/browser/base/zen-components/ZenThemesImporter.mjs b/src/browser/base/zen-components/ZenThemesImporter.mjs
index 9ac466c20..a9fa7e264 100644
--- a/src/browser/base/zen-components/ZenThemesImporter.mjs
+++ b/src/browser/base/zen-components/ZenThemesImporter.mjs
@@ -305,15 +305,15 @@ var gZenThemesImporter = new (class {
   }
 })();
 
-gZenActorsManager.addJSWindowActor("ZenThemeMarketplace", {
+gZenActorsManager.addJSWindowActor('ZenThemeMarketplace', {
   parent: {
-    esModuleURI: "chrome://browser/content/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs",
+    esModuleURI: 'chrome://browser/content/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs',
   },
   child: {
-    esModuleURI: "chrome://browser/content/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs",
+    esModuleURI: 'chrome://browser/content/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs',
     events: {
       DOMContentLoaded: {},
     },
   },
-  matches: ["https://*.zen-browser.app/*", "about:preferences"],
+  matches: ['https://*.zen-browser.app/*', 'about:preferences'],
 });
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index 3a97526fd..fb715e2a5 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -41,7 +41,7 @@ class SplitNode extends SplitLeafNode {
   }
 
   set children(children) {
-    if (children) children.forEach(c => c.parent = this);
+    if (children) children.forEach((c) => (c.parent = this));
     this._children = children;
   }
 
@@ -74,17 +74,9 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     XPCOMUtils.defineLazyPreferenceGetter(this, 'minResizeWidth', 'zen.splitView.min-resize-width', 7);
     XPCOMUtils.defineLazyPreferenceGetter(this, '_edgeHoverSize', 'zen.splitView.rearrange-edge-hover-size', 24);
 
-    ChromeUtils.defineLazyGetter(
-      this,
-      'overlay',
-      () => document.getElementById('zen-splitview-overlay')
-    );
+    ChromeUtils.defineLazyGetter(this, 'overlay', () => document.getElementById('zen-splitview-overlay'));
 
-    ChromeUtils.defineLazyGetter(
-      this,
-      'dropZone',
-      () => document.getElementById('zen-splitview-dropzone')
-    );
+    ChromeUtils.defineLazyGetter(this, 'dropZone', () => document.getElementById('zen-splitview-dropzone'));
 
     window.addEventListener('TabClose', this.handleTabClose.bind(this));
     this.initializeContextMenu();
@@ -150,7 +142,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     parent.children.splice(childIndex, 1);
     if (parent.children.length !== 1) {
       const otherNodeIncrease = 100 / (100 - toRemove.sizeInParent);
-      parent.children.forEach(c => c.sizeInParent *= otherNodeIncrease);
+      parent.children.forEach((c) => (c.sizeInParent *= otherNodeIncrease));
       return parent;
     }
     // node that is not a leaf cannot have less than 2 children, this makes for better resizing
@@ -164,8 +156,8 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
         parent.parent.children[idx] = leftOverChild;
       } else {
         // node cannot have same direction as it's parent
-        leftOverChild.children.forEach(c => {
-          c.sizeInParent *= leftOverChild.sizeInParent / 100
+        leftOverChild.children.forEach((c) => {
+          c.sizeInParent *= leftOverChild.sizeInParent / 100;
           c.parent = parent.parent;
         });
         parent.parent.children.splice(idx, 1, ...leftOverChild.children);
@@ -174,7 +166,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
       this._removeNodeSplitters(parent, false);
       return parent.parent;
     } else {
-      const viewData = Object.values(this._data).find(s => s.layoutTree === parent);
+      const viewData = Object.values(this._data).find((s) => s.layoutTree === parent);
       viewData.layoutTree = leftOverChild;
       leftOverChild.positionToRoot = null;
       leftOverChild.parent = null;
@@ -187,27 +179,27 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
    * @param {boolean} recursive
    * @private
    */
-  _removeNodeSplitters(node, recursive ) {
-    this.getSplitters(node)?.forEach(s => s.remove());
+  _removeNodeSplitters(node, recursive) {
+    this.getSplitters(node)?.forEach((s) => s.remove());
     this._splitNodeToSplitters.delete(node);
     if (!recursive) return;
-    if (node.children) node.children.forEach(c => this._removeNodeSplitters(c));
+    if (node.children) node.children.forEach((c) => this._removeNodeSplitters(c));
   }
 
   get rearangeActionTarget() {
-    return document.getElementById("urlbar-container");
+    return document.getElementById('urlbar-container');
   }
 
   afterRearangeAction() {
-    document.getElementById("zenSplitViewModifier").hidePopup();
-    ConfirmationHint.show(document.getElementById("zen-split-views-box"), "zen-split-view-modifier-enabled-toast", {
-      descriptionId: "zen-split-view-modifier-enabled-toast-description",
+    document.getElementById('zenSplitViewModifier').hidePopup();
+    ConfirmationHint.show(document.getElementById('zen-split-views-box'), 'zen-split-view-modifier-enabled-toast', {
+      descriptionId: 'zen-split-view-modifier-enabled-toast-description',
       showDescription: true,
     });
   }
 
   afterRearangeRemove() {
-    ConfirmationHint.show(document.getElementById("zen-split-views-box"), "zen-split-view-modifier-disabled-toast");
+    ConfirmationHint.show(document.getElementById('zen-split-views-box'), 'zen-split-view-modifier-disabled-toast');
   }
 
   toggleWrapperDisplay(value) {
@@ -222,20 +214,20 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     this.rearrangeViewEnabled = true;
     this.rearrangeViewView = this.currentView;
     if (!this._thumnailCanvas) {
-      this._thumnailCanvas = document.createElement("canvas");
+      this._thumnailCanvas = document.createElement('canvas');
       this._thumnailCanvas.width = 280 * devicePixelRatio;
       this._thumnailCanvas.height = 140 * devicePixelRatio;
     }
 
-    const browsers = this._data[this.currentView].tabs.map(t => t.linkedBrowser);
-    browsers.forEach(b => {
+    const browsers = this._data[this.currentView].tabs.map((t) => t.linkedBrowser);
+    browsers.forEach((b) => {
       b.style.pointerEvents = 'none';
       b.style.opacity = '.85';
     });
     this.tabBrowserPanel.addEventListener('dragstart', this.onBrowserDragStart);
     this.tabBrowserPanel.addEventListener('dragover', this.onBrowserDragOver);
     this.tabBrowserPanel.addEventListener('drop', this.onBrowserDrop);
-    this.tabBrowserPanel.addEventListener('dragend', this.onBrowserDragEnd)
+    this.tabBrowserPanel.addEventListener('dragend', this.onBrowserDragEnd);
     this.tabBrowserPanel.addEventListener('click', this.disableTabRearrangeView);
     window.addEventListener('keydown', this.disableTabRearrangeView);
     this.afterRearangeAction();
@@ -245,8 +237,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     if (!this.rearrangeViewEnabled) return;
     if (event) {
       // Click or "ESC" key
-      if (event.type === 'click' && event.button !== 0
-        || event.type === 'keydown' && event.key !== 'Escape') {
+      if ((event.type === 'click' && event.button !== 0) || (event.type === 'keydown' && event.key !== 'Escape')) {
         return;
       }
     }
@@ -260,15 +251,15 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     this.tabBrowserPanel.removeEventListener('drop', this.onBrowserDrop);
     this.tabBrowserPanel.removeEventListener('click', this.disableTabRearrangeView);
     window.removeEventListener('keydown', this.disableTabRearrangeView);
-    const browsers = this._data[this.rearrangeViewView].tabs.map(t => t.linkedBrowser);
-    browsers.forEach(b => {
+    const browsers = this._data[this.rearrangeViewView].tabs.map((t) => t.linkedBrowser);
+    browsers.forEach((b) => {
       b.style.pointerEvents = '';
       b.style.opacity = '';
     });
     this.rearrangeViewEnabled = false;
     this.rearrangeViewView = null;
     this.afterRearangeRemove();
-  }
+  };
 
   onBrowserDragStart = (event) => {
     if (!this.splitViewActive) return;
@@ -285,12 +276,9 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     let scale = window.devicePixelRatio;
     let canvas = this._dndCanvas;
     if (!canvas) {
-      this._dndCanvas = canvas = document.createElementNS(
-        "http://www.w3.org/1999/xhtml",
-        "canvas"
-      );
-      canvas.style.width = "100%";
-      canvas.style.height = "100%";
+      this._dndCanvas = canvas = document.createElementNS('http://www.w3.org/1999/xhtml', 'canvas');
+      canvas.style.width = '100%';
+      canvas.style.height = '100%';
     }
 
     canvas.width = 160 * scale;
@@ -298,15 +286,15 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     let toDrag = canvas;
     let dragImageOffset = -16;
     if (gMultiProcessBrowser) {
-      var context = canvas.getContext("2d");
-      context.fillStyle = "white";
+      var context = canvas.getContext('2d');
+      context.fillStyle = 'white';
       context.fillRect(0, 0, canvas.width, canvas.height);
 
       let captureListener;
       let platform = AppConstants.platform;
       // On Windows and Mac we can update the drag image during a drag
       // using updateDragImage. On Linux, we can use a panel.
-      if (platform === "win" || platform === "macosx") {
+      if (platform === 'win' || platform === 'macosx') {
         captureListener = function () {
           dt.updateDragImage(canvas, dragImageOffset, dragImageOffset);
         };
@@ -316,15 +304,12 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
         // the pointer while a dnd session is on.
         if (!this._dndPanel) {
           this._dndCanvas = canvas;
-          this._dndPanel = document.createXULElement("panel");
-          this._dndPanel.className = "dragfeedback-tab";
-          this._dndPanel.setAttribute("type", "drag");
-          let wrapper = document.createElementNS(
-            "http://www.w3.org/1999/xhtml",
-            "div"
-          );
-          wrapper.style.width = "160px";
-          wrapper.style.height = "90px";
+          this._dndPanel = document.createXULElement('panel');
+          this._dndPanel.className = 'dragfeedback-tab';
+          this._dndPanel.setAttribute('type', 'drag');
+          let wrapper = document.createElementNS('http://www.w3.org/1999/xhtml', 'div');
+          wrapper.style.width = '160px';
+          wrapper.style.height = '90px';
           wrapper.appendChild(canvas);
           this._dndPanel.appendChild(wrapper);
           document.documentElement.appendChild(this._dndPanel);
@@ -335,18 +320,16 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
       // since we can update the image during the dnd.
       PageThumbs.captureToCanvas(browser, canvas)
         .then(captureListener)
-        .catch(e => console.error(e));
+        .catch((e) => console.error(e));
     } else {
       // For the non e10s case we can just use PageThumbs
       // sync, so let's use the canvas for setDragImage.
-      PageThumbs.captureToCanvas(browser, canvas).catch(e =>
-        console.error(e)
-      );
+      PageThumbs.captureToCanvas(browser, canvas).catch((e) => console.error(e));
       dragImageOffset = dragImageOffset * scale;
     }
     dt.setDragImage(toDrag, dragImageOffset, dragImageOffset);
     return true;
-  }
+  };
 
   onBrowserDragOver = (event) => {
     event.preventDefault();
@@ -364,30 +347,29 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     }
     const splitNode = this.getSplitNodeFromTab(tab);
 
-    const posToRoot = {...splitNode.positionToRoot};
+    const posToRoot = { ...splitNode.positionToRoot };
     const browserRect = browser.getBoundingClientRect();
     const hoverSide = this.calculateHoverSide(event.clientX, event.clientY, browserRect);
 
     if (hoverSide !== 'center') {
       const isVertical = hoverSide === 'top' || hoverSide === 'bottom';
       const browserSize = 100 - (isVertical ? posToRoot.top + posToRoot.bottom : posToRoot.right + posToRoot.left);
-      const reduce= browserSize * .5;
+      const reduce = browserSize * 0.5;
 
       posToRoot[this._oppositeSide(hoverSide)] += reduce;
     }
-    const newInset =
-      `${posToRoot.top}% ${posToRoot.right}% ${posToRoot.bottom}% ${posToRoot.left}%`;
+    const newInset = `${posToRoot.top}% ${posToRoot.right}% ${posToRoot.bottom}% ${posToRoot.left}%`;
     if (this.dropZone.style.inset !== newInset) {
-      window.requestAnimationFrame(() => this.dropZone.style.inset = newInset);
+      window.requestAnimationFrame(() => (this.dropZone.style.inset = newInset));
     }
-  }
+  };
 
   onBrowserDragEnd = (event) => {
     this.dropZone.removeAttribute('enabled');
     const draggingBrowser = this._draggingTab.linkedBrowser;
     draggingBrowser.style.opacity = '.85';
     this._draggingTab = null;
-  }
+  };
 
   _oppositeSide(side) {
     if (side === 'top') return 'bottom';
@@ -397,8 +379,8 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
   }
 
   calculateHoverSide(x, y, elementRect) {
-    const hPixelHoverSize = (elementRect.right - elementRect.left) * this._edgeHoverSize / 100;
-    const vPixelHoverSize = (elementRect.bottom - elementRect.top) * this._edgeHoverSize / 100;
+    const hPixelHoverSize = ((elementRect.right - elementRect.left) * this._edgeHoverSize) / 100;
+    const vPixelHoverSize = ((elementRect.bottom - elementRect.top) * this._edgeHoverSize) / 100;
     if (x <= elementRect.left + hPixelHoverSize) return 'left';
     if (x > elementRect.right - hPixelHoverSize) return 'right';
     if (y <= elementRect.top + vPixelHoverSize) return 'top';
@@ -412,9 +394,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
 
     const droppedTab = this._draggingTab;
     if (!droppedTab) return;
-    const droppedOnTab = gBrowser.getTabForBrowser(
-      event.target.querySelector('browser')
-    );
+    const droppedOnTab = gBrowser.getTabForBrowser(event.target.querySelector('browser'));
     if (droppedTab === droppedOnTab) return;
 
     const hoverSide = this.calculateHoverSide(event.clientX, event.clientY, browserDroppedOn.getBoundingClientRect());
@@ -426,9 +406,9 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
       return;
     }
     this.removeNode(droppedSplitNode);
-    this.splitIntoNode(droppedOnSplitNode, droppedSplitNode, hoverSide, .5);
+    this.splitIntoNode(droppedOnSplitNode, droppedSplitNode, hoverSide, 0.5);
     this.activateSplitView(this._data[this.currentView], true);
-  }
+  };
 
   /**
    *
@@ -470,7 +450,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
         const nodeIndex = node.parent.children.indexOf(node);
         node.parent.children[nodeIndex] = newParent;
       } else {
-        const viewData = Object.values(this._data).find(s => s.layoutTree === node);
+        const viewData = Object.values(this._data).find((s) => s.layoutTree === node);
         viewData.layoutTree = newParent;
       }
       newParent.addChild(node);
@@ -484,9 +464,9 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
   }
 
   _swapField(fieldName, obj1, obj2) {
-   const swap = obj1[fieldName];
-   obj1[fieldName] = obj2[fieldName];
-   obj2[fieldName] = swap;
+    const swap = obj1[fieldName];
+    obj1[fieldName] = obj2[fieldName];
+    obj2[fieldName] = swap;
   }
 
   /**
@@ -595,7 +575,11 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
    * Splits a link in a new tab.
    */
   splitLinkInNewTab() {
-    const url = window.gContextMenu.linkURL || window.gContextMenu.mediaURL || window.gContextMenu.contentData.docLocation || window.gContextMenu.target.ownerDocument.location.href;
+    const url =
+      window.gContextMenu.linkURL ||
+      window.gContextMenu.mediaURL ||
+      window.gContextMenu.contentData.docLocation ||
+      window.gContextMenu.target.ownerDocument.location.href;
     const currentTab = window.gBrowser.selectedTab;
     const newTab = this.openAndSwitchToTab(url);
     this.splitTabs([currentTab, newTab]);
@@ -656,8 +640,8 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     if (existingSplitTab) {
       const groupIndex = this._data.findIndex((group) => group.tabs.includes(existingSplitTab));
       const group = this._data[groupIndex];
-      const gridTypeChange = gridType && (group.gridType !== gridType);
-      const newTabsAdded = tabs.find(t => !group.tabs.includes(t));
+      const gridTypeChange = gridType && group.gridType !== gridType;
+      const newTabsAdded = tabs.find((t) => !group.tabs.includes(t));
       if (gridTypeChange || !newTabsAdded) {
         // reset layout
         group.gridType = gridType;
@@ -680,7 +664,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
       tabs,
       gridType,
       layoutTree: this.calculateLayoutTree(tabs, gridType),
-    }
+    };
     this._data.push(splitData);
     window.gBrowser.selectedTab = tabs[0];
     this.activateSplitView(splitData);
@@ -688,7 +672,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
 
   addTabToSplit(tab, splitNode) {
     const reduce = splitNode.children.length / (splitNode.children.length + 1);
-    splitNode.children.forEach(c => c.sizeInParent *= reduce);
+    splitNode.children.forEach((c) => (c.sizeInParent *= reduce));
     splitNode.addChild(new SplitLeafNode(tab, (1 - reduce) * 100));
   }
 
@@ -757,16 +741,16 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     let rootNode;
     if (gridType === 'vsep' || (tabs.length === 2 && gridType === 'grid')) {
       rootNode = new SplitNode('row');
-      rootNode.children = tabs.map(tab => new SplitLeafNode(tab, 100 / tabs.length));
+      rootNode.children = tabs.map((tab) => new SplitLeafNode(tab, 100 / tabs.length));
     } else if (gridType === 'hsep') {
       rootNode = new SplitNode('column');
-      rootNode.children = tabs.map(tab => new SplitLeafNode(tab, 100 / tabs.length));
+      rootNode.children = tabs.map((tab) => new SplitLeafNode(tab, 100 / tabs.length));
     } else if (gridType === 'grid') {
       rootNode = new SplitNode('row');
       const rowWidth = 100 / Math.ceil(tabs.length / 2);
       for (let i = 0; i < tabs.length - 1; i += 2) {
         const columnNode = new SplitNode('column', rowWidth, 100);
-        columnNode.children = [new SplitLeafNode(tabs[i],  50), new SplitLeafNode(tabs[i + 1], 50)];
+        columnNode.children = [new SplitLeafNode(tabs[i], 50), new SplitLeafNode(tabs[i + 1], 50)];
         rootNode.addChild(columnNode);
       }
       if (tabs.length % 2 !== 0) {
@@ -798,7 +782,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
    */
   applyGridLayout(splitNode) {
     if (!splitNode.positionToRoot) {
-      splitNode.positionToRoot = {top: 0, bottom: 0, left: 0, right: 0};
+      splitNode.positionToRoot = { top: 0, bottom: 0, left: 0, right: 0 };
     }
     const nodeRootPosition = splitNode.positionToRoot;
     if (!splitNode.children) {
@@ -808,8 +792,8 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
       return;
     }
 
-    const rootToNodeWidthRatio = ((100 - nodeRootPosition.right) - nodeRootPosition.left) / 100;
-    const rootToNodeHeightRatio = ((100 - nodeRootPosition.bottom) - nodeRootPosition.top) / 100;
+    const rootToNodeWidthRatio = (100 - nodeRootPosition.right - nodeRootPosition.left) / 100;
+    const rootToNodeHeightRatio = (100 - nodeRootPosition.bottom - nodeRootPosition.top) / 100;
 
     const splittersNeeded = splitNode.children.length - 1;
     const currentSplitters = this.getSplitters(splitNode, splittersNeeded);
@@ -817,7 +801,12 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     let leftOffset = nodeRootPosition.left;
     let topOffset = nodeRootPosition.top;
     splitNode.children.forEach((childNode, i) => {
-      const childRootPosition = {top: topOffset, right: 100 - (leftOffset + childNode.widthInParent * rootToNodeWidthRatio), bottom: 100 - (topOffset + childNode.heightInParent * rootToNodeHeightRatio), left: leftOffset};
+      const childRootPosition = {
+        top: topOffset,
+        right: 100 - (leftOffset + childNode.widthInParent * rootToNodeWidthRatio),
+        bottom: 100 - (topOffset + childNode.heightInParent * rootToNodeHeightRatio),
+        left: leftOffset,
+      };
       childNode.positionToRoot = childRootPosition;
       this.applyGridLayout(childNode);
 
@@ -849,7 +838,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     splitter.className = 'zen-split-view-splitter';
     splitter.setAttribute('orient', orient);
     splitter.setAttribute('gridIdx', idx);
-    this.overlay.insertAdjacentElement("afterbegin", splitter);
+    this.overlay.insertAdjacentElement('afterbegin', splitter);
 
     splitter.addEventListener('mousedown', this.handleSplitterMouseDown);
     return splitter;
@@ -863,13 +852,11 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     let currentSplitters = this._splitNodeToSplitters.get(parentNode) || [];
     if (!splittersNeeded || currentSplitters.length === splittersNeeded) return currentSplitters;
     for (let i = currentSplitters?.length || 0; i < splittersNeeded; i++) {
-      currentSplitters.push(
-        this.createSplitter(parentNode.direction === 'column' ? 'horizontal' : 'vertical', parentNode, i)
-      );
+      currentSplitters.push(this.createSplitter(parentNode.direction === 'column' ? 'horizontal' : 'vertical', parentNode, i));
       currentSplitters[i].parentSplitNode = parentNode;
     }
     if (currentSplitters.length > splittersNeeded) {
-      currentSplitters.slice(splittersNeeded - currentSplitters.length).forEach(s => s.remove());
+      currentSplitters.slice(splittersNeeded - currentSplitters.length).forEach((s) => s.remove());
       currentSplitters = currentSplitters.slice(0, splittersNeeded);
     }
     this._splitNodeToSplitters.set(parentNode, currentSplitters);
@@ -877,7 +864,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
   }
 
   removeSplitters() {
-    [...this.overlay.children].filter(c => c.classList.contains('zen-split-view-splitter')).forEach(s => s.remove());
+    [...this.overlay.children].filter((c) => c.classList.contains('zen-split-view-splitter')).forEach((s) => s.remove());
     this._splitNodeToSplitters.clear();
   }
 
@@ -928,17 +915,21 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
     let rootToNodeSize;
     if (isVertical) rootToNodeSize = 100 / (100 - splitNode.positionToRoot.right - splitNode.positionToRoot.left);
     else rootToNodeSize = 100 / (100 - splitNode.positionToRoot.bottom - splitNode.positionToRoot.top);
-    const originalSizes = splitNode.children.map(c => c.sizeInParent);
+    const originalSizes = splitNode.children.map((c) => c.sizeInParent);
 
     const dragFunc = (dEvent) => {
       requestAnimationFrame(() => {
-        originalSizes.forEach((s, i) => splitNode.children[i].sizeInParent = s); // reset changes
+        originalSizes.forEach((s, i) => (splitNode.children[i].sizeInParent = s)); // reset changes
 
         const movement = dEvent[clientAxis] - startPosition;
-        let movementPercent = (movement / this.tabBrowserPanel.getBoundingClientRect()[dimension] * rootToNodeSize) * 100;
+        let movementPercent = (movement / this.tabBrowserPanel.getBoundingClientRect()[dimension]) * rootToNodeSize * 100;
 
         let reducingMovement = Math.max(movementPercent, -movementPercent);
-        for (let i = gridIdx + (movementPercent < 0 ? 0 : 1); 0 <= i && i < originalSizes.length; i += movementPercent < 0 ? -1 : 1) {
+        for (
+          let i = gridIdx + (movementPercent < 0 ? 0 : 1);
+          0 <= i && i < originalSizes.length;
+          i += movementPercent < 0 ? -1 : 1
+        ) {
           const current = originalSizes[i];
           const newSize = Math.max(this.minResizeWidth, current - reducingMovement);
           splitNode.children[i].sizeInParent = newSize;
@@ -946,21 +937,25 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
           reducingMovement -= amountReduced;
           if (reducingMovement <= 0) break;
         }
-        const increasingMovement = Math.max(movementPercent, - movementPercent) - reducingMovement;
+        const increasingMovement = Math.max(movementPercent, -movementPercent) - reducingMovement;
         const increaseIndex = gridIdx + (movementPercent < 0 ? 1 : 0);
         splitNode.children[increaseIndex].sizeInParent = originalSizes[increaseIndex] + increasingMovement;
         this.applyGridLayout(splitNode);
       });
-    }
+    };
 
     setCursor(isVertical ? 'ew-resize' : 'ns-resize');
     document.addEventListener('mousemove', dragFunc);
-    document.addEventListener('mouseup', () => {
-      document.removeEventListener('mousemove', dragFunc);
-      setCursor('auto');
-      this.tabBrowserPanel.removeAttribute('zen-split-resizing');
-    }, {once: true});
-  }
+    document.addEventListener(
+      'mouseup',
+      () => {
+        document.removeEventListener('mousemove', dragFunc);
+        setCursor('auto');
+        this.tabBrowserPanel.removeAttribute('zen-split-resizing');
+      },
+      { once: true }
+    );
+  };
 
   /**
    * Sets the docshell state for the tabs.
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 15c5272da..73de77637 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -9,7 +9,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   _swipeState = {
     isGestureActive: true,
     cumulativeDelta: 0,
-    direction: null
+    direction: null,
   };
   _hoveringSidebar = false;
   _lastScrollTime = 0;
@@ -35,16 +35,16 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       true
     );
     XPCOMUtils.defineLazyPreferenceGetter(
-        this,
-        'shouldOpenNewTabIfLastUnpinnedTabIsClosed',
-        'zen.workspaces.open-new-tab-if-last-unpinned-tab-is-closed',
-        false
+      this,
+      'shouldOpenNewTabIfLastUnpinnedTabIsClosed',
+      'zen.workspaces.open-new-tab-if-last-unpinned-tab-is-closed',
+      false
     );
     XPCOMUtils.defineLazyPreferenceGetter(
-        this,
-        'containerSpecificEssentials',
-        'zen.workspaces.container-specific-essentials-enabled',
-        false
+      this,
+      'containerSpecificEssentials',
+      'zen.workspaces.container-specific-essentials-enabled',
+      false
     );
     ChromeUtils.defineLazyGetter(this, 'tabContainer', () => document.getElementById('tabbrowser-tabs'));
     this._activeWorkspace = Services.prefs.getStringPref('zen.workspaces.active', '');
@@ -70,13 +70,13 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
   _setupAppCommandHandlers() {
     // Remove existing handler temporarily - this is needed so that _handleAppCommand is called before the original
-    window.removeEventListener("AppCommand", HandleAppCommandEvent, true);
+    window.removeEventListener('AppCommand', HandleAppCommandEvent, true);
 
     // Add our handler first
-    window.addEventListener("AppCommand", this._handleAppCommand.bind(this), true);
+    window.addEventListener('AppCommand', this._handleAppCommand.bind(this), true);
 
     // Re-add original handler
-    window.addEventListener("AppCommand", HandleAppCommandEvent, true);
+    window.addEventListener('AppCommand', HandleAppCommandEvent, true);
   }
 
   _handleAppCommand(event) {
@@ -85,12 +85,12 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
 
     switch (event.command) {
-      case "Forward":
+      case 'Forward':
         this.changeWorkspaceShortcut(1);
         event.stopImmediatePropagation();
         event.preventDefault();
         break;
-      case "Back":
+      case 'Back':
         this.changeWorkspaceShortcut(-1);
         event.stopImmediatePropagation();
         event.preventDefault();
@@ -112,33 +112,37 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     const scrollCooldown = 500; // Milliseconds to wait before allowing another scroll
     const scrollThreshold = 5; // Minimum scroll delta to trigger workspace change
 
-    toolbox.addEventListener('wheel', async (event) => {
-      if (!this.workspaceEnabled) return;
-      // Only process horizontal scroll (deltaX)
-      if (!event.deltaX) return;
+    toolbox.addEventListener(
+      'wheel',
+      async (event) => {
+        if (!this.workspaceEnabled) return;
+        // Only process horizontal scroll (deltaX)
+        if (!event.deltaX) return;
 
-      const currentTime = Date.now();
-      if (currentTime - this._lastScrollTime < scrollCooldown) {
-        return;
-      }
+        const currentTime = Date.now();
+        if (currentTime - this._lastScrollTime < scrollCooldown) {
+          return;
+        }
 
-      // Only process if the horizontal scroll is significant enough
-      if (Math.abs(event.deltaX) < scrollThreshold) {
-        return;
-      }
+        // Only process if the horizontal scroll is significant enough
+        if (Math.abs(event.deltaX) < scrollThreshold) {
+          return;
+        }
 
-      // Change workspace based on scroll direction
-      const direction = event.deltaX > 0 ? -1 : 1;
-      await this.changeWorkspaceShortcut(direction);
-      this._lastScrollTime = currentTime;
-    }, { passive: true });
+        // Change workspace based on scroll direction
+        const direction = event.deltaX > 0 ? -1 : 1;
+        await this.changeWorkspaceShortcut(direction);
+        this._lastScrollTime = currentTime;
+      },
+      { passive: true }
+    );
   }
 
   initializeGestureHandlers() {
     const elements = [
       document.getElementById('navigator-toolbox'),
       // event handlers do not work on elements inside shadow DOM so we need to attach them directly
-      document.getElementById("tabbrowser-arrowscrollbox").shadowRoot.querySelector("scrollbox"),
+      document.getElementById('tabbrowser-arrowscrollbox').shadowRoot.querySelector('scrollbox'),
     ];
 
     // Attach gesture handlers to each element
@@ -178,7 +182,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     this._swipeState = {
       isGestureActive: true,
       cumulativeDelta: 0,
-      direction: null
+      direction: null,
     };
   }
 
@@ -195,7 +199,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     if (Math.abs(this._swipeState.cumulativeDelta) > 0.25) {
       this._swipeState.direction = this._swipeState.cumulativeDelta > 0 ? 'right' : 'left';
     }
-
   }
 
   async _handleSwipeEnd(event) {
@@ -206,7 +209,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     if (this._swipeState.direction) {
       const workspaces = (await this._workspaces()).workspaces;
-      const currentIndex = workspaces.findIndex(w => w.uuid === this.activeWorkspace);
+      const currentIndex = workspaces.findIndex((w) => w.uuid === this.activeWorkspace);
 
       if (currentIndex !== -1) {
         const isRTL = document.documentElement.matches(':-moz-locale-dir(rtl)');
@@ -227,7 +230,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     this._swipeState = {
       isGestureActive: false,
       cumulativeDelta: 0,
-      direction: null
+      direction: null,
     };
   }
 
@@ -388,9 +391,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     const shouldOpenNewTabIfLastUnpinnedTabIsClosed = this.shouldOpenNewTabIfLastUnpinnedTabIsClosed;
 
-    let tabs = gBrowser.tabs.filter(t =>
+    let tabs = gBrowser.tabs.filter(
+      (t) =>
         t.getAttribute('zen-workspace-id') === workspaceID &&
-        (!shouldOpenNewTabIfLastUnpinnedTabIsClosed ||!t.pinned || t.getAttribute("pending") !== "true")
+        (!shouldOpenNewTabIfLastUnpinnedTabIsClosed || !t.pinned || t.getAttribute('pending') !== 'true')
     );
 
     if (tabs.length === 1 && tabs[0] === tab) {
@@ -404,7 +408,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   _createNewTabForWorkspace(window) {
     let tab = gZenUIManager.openAndChangeToTab(Services.prefs.getStringPref('browser.startup.homepage'));
 
-    if(window.uuid){
+    if (window.uuid) {
       tab.setAttribute('zen-workspace-id', window.uuid);
     }
     return tab;
@@ -658,7 +662,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
             <div class="zen-workspace-container" ${containerGroup ? '' : 'hidden="true"'}>
             </div>
           </vbox>
-            <image class="toolbarbutton-icon zen-workspace-actions-reorder-icon" ></image> 
+            <image class="toolbarbutton-icon zen-workspace-actions-reorder-icon" ></image>
           <toolbarbutton closemenu="none" class="toolbarbutton-1 zen-workspace-actions">
             <image class="toolbarbutton-icon" id="zen-workspace-actions-menu-icon"></image>
           </toolbarbutton>
@@ -706,53 +710,53 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
         element.className = 'zen-workspace-last-place-drop-target';
 
         element.addEventListener(
-            'dragover',
-            function (event) {
-              if (this.isReorderModeOn(browser) && this.draggedElement) {
-                event.preventDefault();
-                event.dataTransfer.dropEffect = 'move';
-              }
-            }.bind(browser.ZenWorkspaces)
+          'dragover',
+          function (event) {
+            if (this.isReorderModeOn(browser) && this.draggedElement) {
+              event.preventDefault();
+              event.dataTransfer.dropEffect = 'move';
+            }
+          }.bind(browser.ZenWorkspaces)
         );
 
         element.addEventListener(
-            'dragenter',
-            function (event) {
-              if (this.isReorderModeOn(browser) && this.draggedElement) {
-                element.classList.add('dragover');
-              }
-            }.bind(browser.ZenWorkspaces)
+          'dragenter',
+          function (event) {
+            if (this.isReorderModeOn(browser) && this.draggedElement) {
+              element.classList.add('dragover');
+            }
+          }.bind(browser.ZenWorkspaces)
         );
 
         element.addEventListener(
-            'dragleave',
-            function (event) {
-              element.classList.remove('dragover');
-            }.bind(browser.ZenWorkspaces)
+          'dragleave',
+          function (event) {
+            element.classList.remove('dragover');
+          }.bind(browser.ZenWorkspaces)
         );
 
         element.addEventListener(
-            'drop',
-            async function (event) {
-              event.preventDefault();
-              element.classList.remove('dragover');
+          'drop',
+          async function (event) {
+            event.preventDefault();
+            element.classList.remove('dragover');
 
-              if (this.isReorderModeOn(browser)) {
-                const draggedWorkspaceId = event.dataTransfer.getData('text/plain');
-                await this.moveWorkspaceToEnd(draggedWorkspaceId);
+            if (this.isReorderModeOn(browser)) {
+              const draggedWorkspaceId = event.dataTransfer.getData('text/plain');
+              await this.moveWorkspaceToEnd(draggedWorkspaceId);
 
-                if (this.draggedElement) {
-                  this.draggedElement.classList.remove('dragging');
-                  this.draggedElement = null;
-                }
+              if (this.draggedElement) {
+                this.draggedElement.classList.remove('dragging');
+                this.draggedElement = null;
               }
-            }.bind(browser.ZenWorkspaces)
+            }
+          }.bind(browser.ZenWorkspaces)
         );
 
         return element;
       };
 
-      if(clearCache) {
+      if (clearCache) {
         browser.ZenWorkspaces._workspaceCache = null;
       }
       let workspaces = await browser.ZenWorkspaces._workspaces();
@@ -838,11 +842,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     if (!this.workspaceEnabled) {
       return;
     }
-    let target = event.target.closest("#zen-current-workspace-indicator") || document.getElementById('zen-workspaces-button');
+    let target = event.target.closest('#zen-current-workspace-indicator') || document.getElementById('zen-workspaces-button');
     let panel = document.getElementById('PanelUI-zen-workspaces');
     await this._propagateWorkspaceData({
       ignoreStrip: true,
-      clearCache: false
+      clearCache: false,
     });
     PanelMultiView.openPopup(panel, target, {
       position: 'bottomright topright',
@@ -1015,7 +1019,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     document.documentElement.setAttribute('zen-workspace-id', window.uuid);
     let tabCount = 0;
     for (let tab of gBrowser.tabs) {
-      const isEssential = tab.getAttribute("zen-essential") === "true";
+      const isEssential = tab.getAttribute('zen-essential') === 'true';
       if (!tab.hasAttribute('zen-workspace-id') && !tab.pinned && !isEssential) {
         tab.setAttribute('zen-workspace-id', window.uuid);
         tabCount++;
@@ -1029,7 +1033,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   _createNewTabForWorkspace(window) {
     let tab = gZenUIManager.openAndChangeToTab(Services.prefs.getStringPref('browser.startup.homepage'));
 
-    if(window.uuid){
+    if (window.uuid) {
       tab.setAttribute('zen-workspace-id', window.uuid);
     }
   }
@@ -1123,15 +1127,14 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     await this._updateWorkspaceState(window, onInit);
   }
 
-
   _processTabVisibility(workspaceUuid, containerId, workspaces) {
     const visibleTabs = new Set();
     const lastSelectedTab = this._lastSelectedWorkspaceTabs[workspaceUuid];
 
     for (const tab of gBrowser.tabs) {
       const tabWorkspaceId = tab.getAttribute('zen-workspace-id');
-      const isEssential = tab.getAttribute("zen-essential") === "true";
-      const tabContextId = tab.getAttribute("usercontextid");
+      const isEssential = tab.getAttribute('zen-essential') === 'true';
+      const tabContextId = tab.getAttribute('usercontextid');
 
       // Always hide last selected tabs from other workspaces
       if (lastSelectedTab === tab && tabWorkspaceId !== workspaceUuid && !isEssential) {
@@ -1156,9 +1159,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   _shouldShowTab(tab, workspaceUuid, containerId, workspaces) {
-    const isEssential = tab.getAttribute("zen-essential") === "true";
+    const isEssential = tab.getAttribute('zen-essential') === 'true';
     const tabWorkspaceId = tab.getAttribute('zen-workspace-id');
-    const tabContextId = tab.getAttribute("usercontextid");
+    const tabContextId = tab.getAttribute('usercontextid');
 
     // Handle essential tabs
     if (isEssential) {
@@ -1172,8 +1175,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       } else {
         // In workspaces without a default container: Show essentials that aren't in container-specific workspaces
         // or have usercontextid="0" or no usercontextid
-        return !tabContextId || tabContextId === "0" || !workspaces.workspaces.some(
-            workspace => workspace.containerTabId === parseInt(tabContextId, 10)
+        return (
+          !tabContextId ||
+          tabContextId === '0' ||
+          !workspaces.workspaces.some((workspace) => workspace.containerTabId === parseInt(tabContextId, 10))
         );
       }
     }
@@ -1206,13 +1211,16 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       tabToSelect = currentSelectedTab;
     }
     // Try last selected tab if it is visible
-    else if (lastSelectedTab && this._shouldShowTab(lastSelectedTab, window.uuid, containerId, workspaces) && visibleTabs.has(lastSelectedTab)) {
+    else if (
+      lastSelectedTab &&
+      this._shouldShowTab(lastSelectedTab, window.uuid, containerId, workspaces) &&
+      visibleTabs.has(lastSelectedTab)
+    ) {
       tabToSelect = lastSelectedTab;
     }
     // Find first suitable tab
     else {
-      tabToSelect = Array.from(visibleTabs)
-          .find(tab => !tab.pinned);
+      tabToSelect = Array.from(visibleTabs).find((tab) => !tab.pinned);
     }
 
     const previousSelectedTab = gBrowser.selectedTab;
@@ -1234,7 +1242,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
   }
 
-
   async _updateWorkspaceState(window, onInit) {
     // Update document state
     document.documentElement.setAttribute('zen-workspace-id', window.uuid);
@@ -1253,7 +1260,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
 
     // Reset bookmarks toolbar
-    const placesToolbar = document.getElementById("PlacesToolbar");
+    const placesToolbar = document.getElementById('PlacesToolbar');
     if (placesToolbar?._placesView) {
       placesToolbar._placesView.invalidateContainer(placesToolbar._placesView._resultNode);
     }
@@ -1324,7 +1331,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
   async onTabBrowserInserted(event) {
     let tab = event.originalTarget;
-    const isEssential = tab.getAttribute("zen-essential") === "true";
+    const isEssential = tab.getAttribute('zen-essential') === 'true';
     if (tab.getAttribute('zen-workspace-id') || !this.workspaceEnabled || isEssential) {
       return;
     }
@@ -1344,7 +1351,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     const parent = browser.ownerGlobal;
     const tab = gBrowser.getTabForBrowser(browser);
     const workspaceID = tab.getAttribute('zen-workspace-id');
-    const isEssential = tab.getAttribute("zen-essential") === "true";
+    const isEssential = tab.getAttribute('zen-essential') === 'true';
     const activeWorkspace = await parent.ZenWorkspaces.getActiveWorkspace();
 
     // Only update last selected tab for non-essential tabs in their workspace
@@ -1498,7 +1505,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     if (this.shouldForceContainerTabsToWorkspace && typeof userContextId !== 'undefined' && this._workspaceCache?.workspaces) {
       // Find all workspaces that match the given userContextId
-      const matchingWorkspaces = this._workspaceCache.workspaces.filter((workspace) => workspace.containerTabId === userContextId);
+      const matchingWorkspaces = this._workspaceCache.workspaces.filter(
+        (workspace) => workspace.containerTabId === userContextId
+      );
 
       // Check if exactly one workspace matches
       if (matchingWorkspaces.length === 1) {
@@ -1537,8 +1546,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     let tags = bookmark.tags;
     // if any tag starts with "_workspace_id" and the workspace id doesnt match the active workspace id, return null
     if (tags) {
-      for (let tag of tags.split(",")) {
-        return  !!(tag.startsWith("zen_workspace_") && this.getActiveWorkspaceFromCache()?.uuid !== tag.split("_")[2]);
+      for (let tag of tags.split(',')) {
+        return !!(tag.startsWith('zen_workspace_') && this.getActiveWorkspaceFromCache()?.uuid !== tag.split('_')[2]);
       }
     }
   }
diff --git a/src/browser/base/zen-components/ZenWorkspacesStorage.mjs b/src/browser/base/zen-components/ZenWorkspacesStorage.mjs
index 8fda26d3f..9db434790 100644
--- a/src/browser/base/zen-components/ZenWorkspacesStorage.mjs
+++ b/src/browser/base/zen-components/ZenWorkspacesStorage.mjs
@@ -25,7 +25,7 @@ var ZenWorkspacesStorage = {
       // SQLite doesn't have a direct "ADD COLUMN IF NOT EXISTS" syntax,
       // so we need to check if the columns exist first
       const columns = await db.execute(`PRAGMA table_info(zen_workspaces)`);
-      const columnNames = columns.map(row => row.getResultByName('name'));
+      const columnNames = columns.map((row) => row.getResultByName('name'));
 
       // Helper function to add column if it doesn't exist
       const addColumnIfNotExists = async (columnName, definition) => {
@@ -106,7 +106,9 @@ var ZenWorkspacesStorage = {
         // Handle default workspace
         if (workspace.default) {
           await db.execute(`UPDATE zen_workspaces SET is_default = 0 WHERE uuid != :uuid`, { uuid: workspace.uuid });
-          const unsetDefaultRows = await db.execute(`SELECT uuid FROM zen_workspaces WHERE is_default = 0 AND uuid != :uuid`, { uuid: workspace.uuid });
+          const unsetDefaultRows = await db.execute(`SELECT uuid FROM zen_workspaces WHERE is_default = 0 AND uuid != :uuid`, {
+            uuid: workspace.uuid,
+          });
           for (const row of unsetDefaultRows) {
             changedUUIDs.add(row.getResultByName('uuid'));
           }
@@ -123,40 +125,46 @@ var ZenWorkspacesStorage = {
         }
 
         // Insert or replace the workspace
-        await db.executeCached(`
+        await db.executeCached(
+          `
           INSERT OR REPLACE INTO zen_workspaces (
           uuid, name, icon, is_default, container_id, created_at, updated_at, "position",
           theme_type, theme_colors, theme_opacity, theme_rotation, theme_texture
         ) VALUES (
-          :uuid, :name, :icon, :is_default, :container_id, 
+          :uuid, :name, :icon, :is_default, :container_id,
           COALESCE((SELECT created_at FROM zen_workspaces WHERE uuid = :uuid), :now),
           :now,
           :position,
           :theme_type, :theme_colors, :theme_opacity, :theme_rotation, :theme_texture
         )
-        `, {
-          uuid: workspace.uuid,
-          name: workspace.name,
-          icon: workspace.icon || null,
-          is_default: workspace.default ? 1 : 0,
-          container_id: workspace.containerTabId || null,
-          now,
-          position: newPosition,
-          theme_type: workspace.theme?.type || null,
-          theme_colors: workspace.theme ? JSON.stringify(workspace.theme.gradientColors) : null,
-          theme_opacity: workspace.theme?.opacity || null,
-          theme_rotation: workspace.theme?.rotation || null,
-          theme_texture: workspace.theme?.texture || null
-        });
+        `,
+          {
+            uuid: workspace.uuid,
+            name: workspace.name,
+            icon: workspace.icon || null,
+            is_default: workspace.default ? 1 : 0,
+            container_id: workspace.containerTabId || null,
+            now,
+            position: newPosition,
+            theme_type: workspace.theme?.type || null,
+            theme_colors: workspace.theme ? JSON.stringify(workspace.theme.gradientColors) : null,
+            theme_opacity: workspace.theme?.opacity || null,
+            theme_rotation: workspace.theme?.rotation || null,
+            theme_texture: workspace.theme?.texture || null,
+          }
+        );
 
         // Record the change
-        await db.execute(`
+        await db.execute(
+          `
           INSERT OR REPLACE INTO zen_workspaces_changes (uuid, timestamp)
         VALUES (:uuid, :timestamp)
-        `, {
-          uuid: workspace.uuid,
-          timestamp: Math.floor(now / 1000)
-        });
+        `,
+          {
+            uuid: workspace.uuid,
+            timestamp: Math.floor(now / 1000),
+          }
+        );
 
         changedUUIDs.add(workspace.uuid);
 
@@ -165,7 +173,7 @@ var ZenWorkspacesStorage = {
     });
 
     if (notifyObservers) {
-      this._notifyWorkspacesChanged("zen-workspace-updated", Array.from(changedUUIDs));
+      this._notifyWorkspacesChanged('zen-workspace-updated', Array.from(changedUUIDs));
     }
   },
 
@@ -181,13 +189,15 @@ var ZenWorkspacesStorage = {
       default: !!row.getResultByName('is_default'),
       containerTabId: row.getResultByName('container_id'),
       position: row.getResultByName('position'),
-      theme: row.getResultByName('theme_type') ? {
-        type: row.getResultByName('theme_type'),
-        gradientColors: JSON.parse(row.getResultByName('theme_colors')),
-        opacity: row.getResultByName('theme_opacity'),
-        rotation: row.getResultByName('theme_rotation'),
-        texture: row.getResultByName('theme_texture')
-      } : null
+      theme: row.getResultByName('theme_type')
+        ? {
+            type: row.getResultByName('theme_type'),
+            gradientColors: JSON.parse(row.getResultByName('theme_colors')),
+            opacity: row.getResultByName('theme_opacity'),
+            rotation: row.getResultByName('theme_rotation'),
+            texture: row.getResultByName('theme_texture'),
+          }
+        : null,
     }));
   },
 
@@ -196,27 +206,30 @@ var ZenWorkspacesStorage = {
 
     await PlacesUtils.withConnectionWrapper('ZenWorkspacesStorage.removeWorkspace', async (db) => {
       await db.execute(
-          `
+        `
             DELETE FROM zen_workspaces WHERE uuid = :uuid
           `,
-          { uuid }
+        { uuid }
       );
 
       // Record the removal as a change
       const now = Date.now();
-      await db.execute(`
+      await db.execute(
+        `
         INSERT OR REPLACE INTO zen_workspaces_changes (uuid, timestamp)
         VALUES (:uuid, :timestamp)
-      `, {
-        uuid,
-        timestamp: Math.floor(now / 1000)
-      });
+      `,
+        {
+          uuid,
+          timestamp: Math.floor(now / 1000),
+        }
+      );
 
       await this.updateLastChangeTimestamp(db);
     });
 
     if (notifyObservers) {
-      this._notifyWorkspacesChanged("zen-workspace-removed", changedUUIDs);
+      this._notifyWorkspacesChanged('zen-workspace-removed', changedUUIDs);
     }
   },
 
@@ -238,7 +251,9 @@ var ZenWorkspacesStorage = {
         await db.execute(`UPDATE zen_workspaces SET is_default = 0 WHERE uuid != :uuid`, { uuid });
 
         // Collect UUIDs of workspaces that were unset as default
-        const unsetDefaultRows = await db.execute(`SELECT uuid FROM zen_workspaces WHERE is_default = 0 AND uuid != :uuid`, { uuid });
+        const unsetDefaultRows = await db.execute(`SELECT uuid FROM zen_workspaces WHERE is_default = 0 AND uuid != :uuid`, {
+          uuid,
+        });
         for (const row of unsetDefaultRows) {
           changedUUIDs.push(row.getResultByName('uuid'));
         }
@@ -247,13 +262,16 @@ var ZenWorkspacesStorage = {
         await db.execute(`UPDATE zen_workspaces SET is_default = 1 WHERE uuid = :uuid`, { uuid });
 
         // Record the change for the specified workspace
-        await db.execute(`
+        await db.execute(
+          `
           INSERT OR REPLACE INTO zen_workspaces_changes (uuid, timestamp)
           VALUES (:uuid, :timestamp)
-        `, {
-          uuid,
-          timestamp: Math.floor(now / 1000)
-        });
+        `,
+          {
+            uuid,
+            timestamp: Math.floor(now / 1000),
+          }
+        );
 
         // Add the main workspace UUID to the changed set
         changedUUIDs.push(uuid);
@@ -263,27 +281,31 @@ var ZenWorkspacesStorage = {
     });
 
     if (notifyObservers) {
-      this._notifyWorkspacesChanged("zen-workspace-updated", changedUUIDs);
+      this._notifyWorkspacesChanged('zen-workspace-updated', changedUUIDs);
     }
   },
 
   async markChanged(uuid) {
     await PlacesUtils.withConnectionWrapper('ZenWorkspacesStorage.markChanged', async (db) => {
       const now = Date.now();
-      await db.execute(`
+      await db.execute(
+        `
         INSERT OR REPLACE INTO zen_workspaces_changes (uuid, timestamp)
         VALUES (:uuid, :timestamp)
-      `, {
-        uuid,
-        timestamp: Math.floor(now / 1000)
-      });
+      `,
+        {
+          uuid,
+          timestamp: Math.floor(now / 1000),
+        }
+      );
     });
   },
 
   async saveWorkspaceTheme(uuid, theme, notifyObservers = true) {
     const changedUUIDs = [uuid];
     await PlacesUtils.withConnectionWrapper('saveWorkspaceTheme', async (db) => {
-      await db.execute(`
+      await db.execute(
+        `
         UPDATE zen_workspaces
         SET
           theme_type = :type,
@@ -293,22 +315,24 @@ var ZenWorkspacesStorage = {
           theme_texture = :texture,
           updated_at = :now
         WHERE uuid = :uuid
-      `, {
-        type: theme.type,
-        colors: JSON.stringify(theme.gradientColors),
-        opacity: theme.opacity,
-        rotation: theme.rotation,
-        texture: theme.texture,
-        now: Date.now(),
-        uuid
-      });
+      `,
+        {
+          type: theme.type,
+          colors: JSON.stringify(theme.gradientColors),
+          opacity: theme.opacity,
+          rotation: theme.rotation,
+          texture: theme.texture,
+          now: Date.now(),
+          uuid,
+        }
+      );
 
       await this.markChanged(uuid);
       await this.updateLastChangeTimestamp(db);
     });
 
     if (notifyObservers) {
-      this._notifyWorkspacesChanged("zen-workspace-updated", changedUUIDs);
+      this._notifyWorkspacesChanged('zen-workspace-updated', changedUUIDs);
     }
   },
 
@@ -344,21 +368,27 @@ var ZenWorkspacesStorage = {
 
     for (let i = 0; i < workspaces.length; i++) {
       const newPosition = (i + 1) * 1000; // Use large increments
-      await db.execute(`
+      await db.execute(
+        `
         UPDATE zen_workspaces
         SET "position" = :newPosition
         WHERE uuid = :uuid
-      `, { newPosition, uuid: workspaces[i].getResultByName('uuid') });
+      `,
+        { newPosition, uuid: workspaces[i].getResultByName('uuid') }
+      );
       changedUUIDs.add(workspaces[i].getResultByName('uuid'));
     }
   },
 
   async updateLastChangeTimestamp(db) {
     const now = Date.now();
-    await db.execute(`
+    await db.execute(
+      `
       INSERT OR REPLACE INTO moz_meta (key, value)
     VALUES ('zen_workspaces_last_change', :now)
-    `, { now });
+    `,
+      { now }
+    );
   },
 
   async getLastChangeTimestamp() {
@@ -380,28 +410,34 @@ var ZenWorkspacesStorage = {
           const workspace = workspaces[i];
           const newPosition = (i + 1) * 1000;
 
-          await db.execute(`
+          await db.execute(
+            `
           UPDATE zen_workspaces
           SET "position" = :newPosition
           WHERE uuid = :uuid
-        `, { newPosition, uuid: workspace.uuid });
+        `,
+            { newPosition, uuid: workspace.uuid }
+          );
 
           changedUUIDs.add(workspace.uuid);
 
           // Record the change
-          await db.execute(`
+          await db.execute(
+            `
           INSERT OR REPLACE INTO zen_workspaces_changes (uuid, timestamp)
           VALUES (:uuid, :timestamp)
-        `, {
-            uuid: workspace.uuid,
-            timestamp: Math.floor(now / 1000)
-          });
+        `,
+            {
+              uuid: workspace.uuid,
+              timestamp: Math.floor(now / 1000),
+            }
+          );
         }
 
         await this.updateLastChangeTimestamp(db);
       });
     });
 
-    this._notifyWorkspacesChanged("zen-workspace-updated", Array.from(changedUUIDs));
+    this._notifyWorkspacesChanged('zen-workspace-updated', Array.from(changedUUIDs));
   },
 };
diff --git a/src/browser/base/zen-components/ZenWorkspacesSync.mjs b/src/browser/base/zen-components/ZenWorkspacesSync.mjs
index 822df6b21..d9c9df880 100644
--- a/src/browser/base/zen-components/ZenWorkspacesSync.mjs
+++ b/src/browser/base/zen-components/ZenWorkspacesSync.mjs
@@ -1,36 +1,34 @@
-var { Tracker, Store, SyncEngine } = ChromeUtils.importESModule("resource://services-sync/engines.sys.mjs");
-var { CryptoWrapper } = ChromeUtils.importESModule("resource://services-sync/record.sys.mjs");
-var { Utils } = ChromeUtils.importESModule("resource://services-sync/util.sys.mjs");
-var { SCORE_INCREMENT_XLARGE } = ChromeUtils.importESModule("resource://services-sync/constants.sys.mjs");
-
-
+var { Tracker, Store, SyncEngine } = ChromeUtils.importESModule('resource://services-sync/engines.sys.mjs');
+var { CryptoWrapper } = ChromeUtils.importESModule('resource://services-sync/record.sys.mjs');
+var { Utils } = ChromeUtils.importESModule('resource://services-sync/util.sys.mjs');
+var { SCORE_INCREMENT_XLARGE } = ChromeUtils.importESModule('resource://services-sync/constants.sys.mjs');
 
 // Define ZenWorkspaceRecord
 function ZenWorkspaceRecord(collection, id) {
-    CryptoWrapper.call(this, collection, id);
+  CryptoWrapper.call(this, collection, id);
 }
 
 ZenWorkspaceRecord.prototype = Object.create(CryptoWrapper.prototype);
 ZenWorkspaceRecord.prototype.constructor = ZenWorkspaceRecord;
 
-ZenWorkspaceRecord.prototype._logName = "Sync.Record.ZenWorkspace";
-
-Utils.deferGetSet(ZenWorkspaceRecord, "cleartext", [
-    "name",
-    "icon",
-    "default",
-    "containerTabId",
-    "position",
-    "theme_type",
-    "theme_colors",
-    "theme_opacity",
-    "theme_rotation",
-    "theme_texture"
+ZenWorkspaceRecord.prototype._logName = 'Sync.Record.ZenWorkspace';
+
+Utils.deferGetSet(ZenWorkspaceRecord, 'cleartext', [
+  'name',
+  'icon',
+  'default',
+  'containerTabId',
+  'position',
+  'theme_type',
+  'theme_colors',
+  'theme_opacity',
+  'theme_rotation',
+  'theme_texture',
 ]);
 
 // Define ZenWorkspacesStore
 function ZenWorkspacesStore(name, engine) {
-    Store.call(this, name, engine);
+  Store.call(this, name, engine);
 }
 
 ZenWorkspacesStore.prototype = Object.create(Store.prototype);
@@ -40,8 +38,8 @@ ZenWorkspacesStore.prototype.constructor = ZenWorkspacesStore;
  * Initializes the store by loading the current changeset.
  */
 ZenWorkspacesStore.prototype.initialize = async function () {
-    await Store.prototype.initialize.call(this);
-    // Additional initialization if needed
+  await Store.prototype.initialize.call(this);
+  // Additional initialization if needed
 };
 
 /**
@@ -49,17 +47,17 @@ ZenWorkspacesStore.prototype.initialize = async function () {
  * @returns {Object} An object mapping workspace UUIDs to true.
  */
 ZenWorkspacesStore.prototype.getAllIDs = async function () {
-    try {
-        const workspaces = await ZenWorkspacesStorage.getWorkspaces();
-        const ids = {};
-        for (const workspace of workspaces) {
-            ids[workspace.uuid] = true;
-        }
-        return ids;
-    } catch (error) {
-        this._log.error("Error fetching all workspace IDs", error);
-        throw error;
+  try {
+    const workspaces = await ZenWorkspacesStorage.getWorkspaces();
+    const ids = {};
+    for (const workspace of workspaces) {
+      ids[workspace.uuid] = true;
     }
+    return ids;
+  } catch (error) {
+    this._log.error('Error fetching all workspace IDs', error);
+    throw error;
+  }
 };
 
 /**
@@ -68,19 +66,19 @@ ZenWorkspacesStore.prototype.getAllIDs = async function () {
  * @param {String} newID - The new UUID.
  */
 ZenWorkspacesStore.prototype.changeItemID = async function (oldID, newID) {
-    try {
-        const workspaces = await ZenWorkspacesStorage.getWorkspaces();
-        const workspace = workspaces.find(ws => ws.uuid === oldID);
-        if (workspace) {
-            workspace.uuid = newID;
-            await ZenWorkspacesStorage.saveWorkspace(workspace,false);
-            // Mark the new ID as changed for sync
-            await ZenWorkspacesStorage.markChanged(newID);
-        }
-    } catch (error) {
-        this._log.error(`Error changing workspace ID from ${oldID} to ${newID}`, error);
-        throw error;
+  try {
+    const workspaces = await ZenWorkspacesStorage.getWorkspaces();
+    const workspace = workspaces.find((ws) => ws.uuid === oldID);
+    if (workspace) {
+      workspace.uuid = newID;
+      await ZenWorkspacesStorage.saveWorkspace(workspace, false);
+      // Mark the new ID as changed for sync
+      await ZenWorkspacesStorage.markChanged(newID);
     }
+  } catch (error) {
+    this._log.error(`Error changing workspace ID from ${oldID} to ${newID}`, error);
+    throw error;
+  }
 };
 
 /**
@@ -89,13 +87,13 @@ ZenWorkspacesStore.prototype.changeItemID = async function (oldID, newID) {
  * @returns {Boolean} True if the workspace exists, false otherwise.
  */
 ZenWorkspacesStore.prototype.itemExists = async function (id) {
-    try {
-        const workspaces = await ZenWorkspacesStorage.getWorkspaces();
-        return workspaces.some(ws => ws.uuid === id);
-    } catch (error) {
-        this._log.error(`Error checking if workspace exists with ID ${id}`, error);
-        throw error;
-    }
+  try {
+    const workspaces = await ZenWorkspacesStorage.getWorkspaces();
+    return workspaces.some((ws) => ws.uuid === id);
+  } catch (error) {
+    this._log.error(`Error checking if workspace exists with ID ${id}`, error);
+    throw error;
+  }
 };
 
 /**
@@ -105,34 +103,34 @@ ZenWorkspacesStore.prototype.itemExists = async function (id) {
  * @returns {ZenWorkspaceRecord} The workspace record.
  */
 ZenWorkspacesStore.prototype.createRecord = async function (id, collection) {
-    try {
-        const workspaces = await ZenWorkspacesStorage.getWorkspaces();
-        const workspace = workspaces.find(ws => ws.uuid === id);
-        const record = new ZenWorkspaceRecord(collection, id);
-
-        if (workspace) {
-            record.name = workspace.name;
-            record.icon = workspace.icon;
-            record.default = workspace.default;
-            record.containerTabId = workspace.containerTabId;
-            record.position = workspace.position;
-            if (workspace.theme) {
-                record.theme_type = workspace.theme.type;
-                record.theme_colors = JSON.stringify(workspace.theme.gradientColors);
-                record.theme_opacity = workspace.theme.opacity;
-                record.theme_rotation = workspace.theme.rotation;
-                record.theme_texture = workspace.theme.texture;
-            }
-            record.deleted = false;
-        } else {
-            record.deleted = true;
-        }
-
-        return record;
-    } catch (error) {
-        this._log.error(`Error creating record for workspace ID ${id}`, error);
-        throw error;
+  try {
+    const workspaces = await ZenWorkspacesStorage.getWorkspaces();
+    const workspace = workspaces.find((ws) => ws.uuid === id);
+    const record = new ZenWorkspaceRecord(collection, id);
+
+    if (workspace) {
+      record.name = workspace.name;
+      record.icon = workspace.icon;
+      record.default = workspace.default;
+      record.containerTabId = workspace.containerTabId;
+      record.position = workspace.position;
+      if (workspace.theme) {
+        record.theme_type = workspace.theme.type;
+        record.theme_colors = JSON.stringify(workspace.theme.gradientColors);
+        record.theme_opacity = workspace.theme.opacity;
+        record.theme_rotation = workspace.theme.rotation;
+        record.theme_texture = workspace.theme.texture;
+      }
+      record.deleted = false;
+    } else {
+      record.deleted = true;
     }
+
+    return record;
+  } catch (error) {
+    this._log.error(`Error creating record for workspace ID ${id}`, error);
+    throw error;
+  }
 };
 
 /**
@@ -140,28 +138,30 @@ ZenWorkspacesStore.prototype.createRecord = async function (id, collection) {
  * @param {ZenWorkspaceRecord} record - The workspace record to create.
  */
 ZenWorkspacesStore.prototype.create = async function (record) {
-    try {
-        this._validateRecord(record);
-        const workspace = {
-            uuid: record.id,
-            name: record.name,
-            icon: record.icon,
-            default: record.default,
-            containerTabId: record.containerTabId,
-            position: record.position,
-            theme: record.theme_type ? {
-                type: record.theme_type,
-                gradientColors: JSON.parse(record.theme_colors),
-                opacity: record.theme_opacity,
-                rotation: record.theme_rotation,
-                texture: record.theme_texture
-            } : null
-        };
-        await ZenWorkspacesStorage.saveWorkspace(workspace,false);
-    } catch (error) {
-        this._log.error(`Error creating workspace with ID ${record.id}`, error);
-        throw error;
-    }
+  try {
+    this._validateRecord(record);
+    const workspace = {
+      uuid: record.id,
+      name: record.name,
+      icon: record.icon,
+      default: record.default,
+      containerTabId: record.containerTabId,
+      position: record.position,
+      theme: record.theme_type
+        ? {
+            type: record.theme_type,
+            gradientColors: JSON.parse(record.theme_colors),
+            opacity: record.theme_opacity,
+            rotation: record.theme_rotation,
+            texture: record.theme_texture,
+          }
+        : null,
+    };
+    await ZenWorkspacesStorage.saveWorkspace(workspace, false);
+  } catch (error) {
+    this._log.error(`Error creating workspace with ID ${record.id}`, error);
+    throw error;
+  }
 };
 
 /**
@@ -169,13 +169,13 @@ ZenWorkspacesStore.prototype.create = async function (record) {
  * @param {ZenWorkspaceRecord} record - The workspace record to update.
  */
 ZenWorkspacesStore.prototype.update = async function (record) {
-    try {
-        this._validateRecord(record);
-        await this.create(record); // Reuse create for update
-    } catch (error) {
-        this._log.error(`Error updating workspace with ID ${record.id}`, error);
-        throw error;
-    }
+  try {
+    this._validateRecord(record);
+    await this.create(record); // Reuse create for update
+  } catch (error) {
+    this._log.error(`Error updating workspace with ID ${record.id}`, error);
+    throw error;
+  }
 };
 
 /**
@@ -183,24 +183,24 @@ ZenWorkspacesStore.prototype.update = async function (record) {
  * @param {ZenWorkspaceRecord} record - The workspace record to remove.
  */
 ZenWorkspacesStore.prototype.remove = async function (record) {
-    try {
-        await ZenWorkspacesStorage.removeWorkspace(record.id, false);
-    } catch (error) {
-        this._log.error(`Error removing workspace with ID ${record.id}`, error);
-        throw error;
-    }
+  try {
+    await ZenWorkspacesStorage.removeWorkspace(record.id, false);
+  } catch (error) {
+    this._log.error(`Error removing workspace with ID ${record.id}`, error);
+    throw error;
+  }
 };
 
 /**
  * Wipes all workspaces from the storage.
  */
 ZenWorkspacesStore.prototype.wipe = async function () {
-    try {
-        await ZenWorkspacesStorage.wipeAllWorkspaces();
-    } catch (error) {
-        this._log.error("Error wiping all workspaces", error);
-        throw error;
-    }
+  try {
+    await ZenWorkspacesStorage.wipeAllWorkspaces();
+  } catch (error) {
+    this._log.error('Error wiping all workspaces', error);
+    throw error;
+  }
 };
 
 /**
@@ -208,48 +208,48 @@ ZenWorkspacesStore.prototype.wipe = async function () {
  * @param {ZenWorkspaceRecord} record - The workspace record to validate.
  */
 ZenWorkspacesStore.prototype._validateRecord = function (record) {
-    if (!record.id || typeof record.id !== "string") {
-        throw new Error("Invalid workspace ID");
+  if (!record.id || typeof record.id !== 'string') {
+    throw new Error('Invalid workspace ID');
+  }
+  if (!record.name || typeof record.name !== 'string') {
+    throw new Error(`Invalid workspace name for ID ${record.id}`);
+  }
+  if (typeof record.default !== 'boolean') {
+    record.default = false;
+  }
+  if (record.icon != null && typeof record.icon !== 'string') {
+    throw new Error(`Invalid icon for workspace ID ${record.id}`);
+  }
+  if (record.containerTabId != null && typeof record.containerTabId !== 'number') {
+    throw new Error(`Invalid containerTabId for workspace ID ${record.id}`);
+  }
+  if (record.position != null && typeof record.position !== 'number') {
+    throw new Error(`Invalid position for workspace ID ${record.id}`);
+  }
+
+  // Validate theme properties if they exist
+  if (record.theme_type) {
+    if (typeof record.theme_type !== 'string') {
+      throw new Error(`Invalid theme_type for workspace ID ${record.id}`);
     }
-    if (!record.name || typeof record.name !== "string") {
-        throw new Error(`Invalid workspace name for ID ${record.id}`);
+    if (!record.theme_colors || typeof record.theme_colors !== 'string') {
+      throw new Error(`Invalid theme_colors for workspace ID ${record.id}`);
     }
-    if (typeof record.default !== "boolean") {
-        record.default = false;
+    try {
+      JSON.parse(record.theme_colors);
+    } catch (e) {
+      throw new Error(`Invalid theme_colors JSON for workspace ID ${record.id}`);
     }
-    if (record.icon != null && typeof record.icon !== "string") {
-        throw new Error(`Invalid icon for workspace ID ${record.id}`);
+    if (record.theme_opacity != null && typeof record.theme_opacity !== 'number') {
+      throw new Error(`Invalid theme_opacity for workspace ID ${record.id}`);
     }
-    if (record.containerTabId != null && typeof record.containerTabId !== "number") {
-        throw new Error(`Invalid containerTabId for workspace ID ${record.id}`);
+    if (record.theme_rotation != null && typeof record.theme_rotation !== 'number') {
+      throw new Error(`Invalid theme_rotation for workspace ID ${record.id}`);
     }
-    if(record.position != null && typeof record.position !== "number") {
-        throw new Error(`Invalid position for workspace ID ${record.id}`);
-    }
-
-    // Validate theme properties if they exist
-    if (record.theme_type) {
-        if (typeof record.theme_type !== "string") {
-            throw new Error(`Invalid theme_type for workspace ID ${record.id}`);
-        }
-        if (!record.theme_colors || typeof record.theme_colors !== "string") {
-            throw new Error(`Invalid theme_colors for workspace ID ${record.id}`);
-        }
-        try {
-            JSON.parse(record.theme_colors);
-        } catch (e) {
-            throw new Error(`Invalid theme_colors JSON for workspace ID ${record.id}`);
-        }
-        if (record.theme_opacity != null && typeof record.theme_opacity !== "number") {
-            throw new Error(`Invalid theme_opacity for workspace ID ${record.id}`);
-        }
-        if (record.theme_rotation != null && typeof record.theme_rotation !== "number") {
-            throw new Error(`Invalid theme_rotation for workspace ID ${record.id}`);
-        }
-        if (record.theme_texture != null && typeof record.theme_texture !== "number") {
-            throw new Error(`Invalid theme_texture for workspace ID ${record.id}`);
-        }
+    if (record.theme_texture != null && typeof record.theme_texture !== 'number') {
+      throw new Error(`Invalid theme_texture for workspace ID ${record.id}`);
     }
+  }
 };
 
 /**
@@ -257,24 +257,24 @@ ZenWorkspacesStore.prototype._validateRecord = function (record) {
  * @returns {Object} An object mapping workspace UUIDs to their change timestamps.
  */
 ZenWorkspacesStore.prototype.getChangedIDs = async function () {
-    try {
-        return await ZenWorkspacesStorage.getChangedIDs();
-    } catch (error) {
-        this._log.error("Error retrieving changed IDs from storage", error);
-        throw error;
-    }
+  try {
+    return await ZenWorkspacesStorage.getChangedIDs();
+  } catch (error) {
+    this._log.error('Error retrieving changed IDs from storage', error);
+    throw error;
+  }
 };
 
 /**
  * Clears all recorded changes after a successful sync.
  */
 ZenWorkspacesStore.prototype.clearChangedIDs = async function () {
-    try {
-        await ZenWorkspacesStorage.clearChangedIDs();
-    } catch (error) {
-        this._log.error("Error clearing changed IDs in storage", error);
-        throw error;
-    }
+  try {
+    await ZenWorkspacesStorage.clearChangedIDs();
+  } catch (error) {
+    this._log.error('Error clearing changed IDs in storage', error);
+    throw error;
+  }
 };
 
 /**
@@ -282,29 +282,28 @@ ZenWorkspacesStore.prototype.clearChangedIDs = async function () {
  * @param {String} uuid - The UUID of the workspace that changed.
  */
 ZenWorkspacesStore.prototype.markChanged = async function (uuid) {
-    try {
-        await ZenWorkspacesStorage.markChanged(uuid);
-    } catch (error) {
-        this._log.error(`Error marking workspace ${uuid} as changed`, error);
-        throw error;
-    }
+  try {
+    await ZenWorkspacesStorage.markChanged(uuid);
+  } catch (error) {
+    this._log.error(`Error marking workspace ${uuid} as changed`, error);
+    throw error;
+  }
 };
 
 /**
  * Finalizes the store by ensuring all pending operations are completed.
  */
 ZenWorkspacesStore.prototype.finalize = async function () {
-    await Store.prototype.finalize.call(this);
+  await Store.prototype.finalize.call(this);
 };
 
-
 // Define ZenWorkspacesTracker
 function ZenWorkspacesTracker(name, engine) {
-    Tracker.call(this, name, engine);
-    this._ignoreAll = false;
+  Tracker.call(this, name, engine);
+  this._ignoreAll = false;
 
-    // Observe profile-before-change to stop the tracker gracefully
-    Services.obs.addObserver(this.asyncObserver, "profile-before-change");
+  // Observe profile-before-change to stop the tracker gracefully
+  Services.obs.addObserver(this.asyncObserver, 'profile-before-change');
 }
 
 ZenWorkspacesTracker.prototype = Object.create(Tracker.prototype);
@@ -315,54 +314,54 @@ ZenWorkspacesTracker.prototype.constructor = ZenWorkspacesTracker;
  * @returns {Object} An object mapping workspace UUIDs to their change timestamps.
  */
 ZenWorkspacesTracker.prototype.getChangedIDs = async function () {
-    try {
-        return await this.engine._store.getChangedIDs();
-    } catch (error) {
-        this._log.error("Error retrieving changed IDs from store", error);
-        throw error;
-    }
+  try {
+    return await this.engine._store.getChangedIDs();
+  } catch (error) {
+    this._log.error('Error retrieving changed IDs from store', error);
+    throw error;
+  }
 };
 
 /**
  * Clears all recorded changes after a successful sync.
  */
 ZenWorkspacesTracker.prototype.clearChangedIDs = async function () {
-    try {
-        await this.engine._store.clearChangedIDs();
-    } catch (error) {
-        this._log.error("Error clearing changed IDs in store", error);
-        throw error;
-    }
+  try {
+    await this.engine._store.clearChangedIDs();
+  } catch (error) {
+    this._log.error('Error clearing changed IDs in store', error);
+    throw error;
+  }
 };
 
 /**
  * Called when the tracker starts. Registers observers to listen for workspace changes.
  */
 ZenWorkspacesTracker.prototype.onStart = function () {
-    if (this._started) {
-        return;
-    }
-    this._log.trace("Starting tracker");
-    // Register observers for workspace changes
-    Services.obs.addObserver(this.asyncObserver, "zen-workspace-added");
-    Services.obs.addObserver(this.asyncObserver, "zen-workspace-removed");
-    Services.obs.addObserver(this.asyncObserver, "zen-workspace-updated");
-    this._started = true;
+  if (this._started) {
+    return;
+  }
+  this._log.trace('Starting tracker');
+  // Register observers for workspace changes
+  Services.obs.addObserver(this.asyncObserver, 'zen-workspace-added');
+  Services.obs.addObserver(this.asyncObserver, 'zen-workspace-removed');
+  Services.obs.addObserver(this.asyncObserver, 'zen-workspace-updated');
+  this._started = true;
 };
 
 /**
  * Called when the tracker stops. Unregisters observers.
  */
 ZenWorkspacesTracker.prototype.onStop = function () {
-    if (!this._started) {
-        return;
-    }
-    this._log.trace("Stopping tracker");
-    // Unregister observers for workspace changes
-    Services.obs.removeObserver(this.asyncObserver, "zen-workspace-added");
-    Services.obs.removeObserver(this.asyncObserver, "zen-workspace-removed");
-    Services.obs.removeObserver(this.asyncObserver, "zen-workspace-updated");
-    this._started = false;
+  if (!this._started) {
+    return;
+  }
+  this._log.trace('Stopping tracker');
+  // Unregister observers for workspace changes
+  Services.obs.removeObserver(this.asyncObserver, 'zen-workspace-added');
+  Services.obs.removeObserver(this.asyncObserver, 'zen-workspace-removed');
+  Services.obs.removeObserver(this.asyncObserver, 'zen-workspace-updated');
+  this._started = false;
 };
 
 /**
@@ -372,68 +371,67 @@ ZenWorkspacesTracker.prototype.onStop = function () {
  * @param {String} data - Additional data (JSON stringified array of UUIDs).
  */
 ZenWorkspacesTracker.prototype.observe = async function (subject, topic, data) {
-    if (this.ignoreAll) {
-        return;
-    }
+  if (this.ignoreAll) {
+    return;
+  }
+
+  try {
+    switch (topic) {
+      case 'profile-before-change':
+        await this.stop();
+        break;
+      case 'zen-workspace-removed':
+      case 'zen-workspace-updated':
+      case 'zen-workspace-added':
+        let workspaceIDs;
+        if (data) {
+          try {
+            workspaceIDs = JSON.parse(data);
+            if (!Array.isArray(workspaceIDs)) {
+              throw new Error('Parsed data is not an array');
+            }
+          } catch (parseError) {
+            this._log.error(`Failed to parse workspace UUIDs from data: ${data}`, parseError);
+            return;
+          }
+        } else {
+          this._log.error(`No data received for event ${topic}`);
+          return;
+        }
 
-    try {
-        switch (topic) {
-            case "profile-before-change":
-                await this.stop();
-                break;
-            case "zen-workspace-removed":
-            case "zen-workspace-updated":
-            case "zen-workspace-added":
-                let workspaceIDs;
-                if (data) {
-                    try {
-                        workspaceIDs = JSON.parse(data);
-                        if (!Array.isArray(workspaceIDs)) {
-                            throw new Error("Parsed data is not an array");
-                        }
-                    } catch (parseError) {
-                        this._log.error(`Failed to parse workspace UUIDs from data: ${data}`, parseError);
-                        return;
-                    }
-                } else {
-                    this._log.error(`No data received for event ${topic}`);
-                    return;
-                }
-
-                this._log.trace(`Observed ${topic} for UUIDs: ${workspaceIDs.join(", ")}`);
-
-                // Process each UUID
-                for (const workspaceID of workspaceIDs) {
-                    if (typeof workspaceID === "string") {
-                        // Inform the store about the change
-                        await this.engine._store.markChanged(workspaceID);
-                    } else {
-                        this._log.warn(`Invalid workspace ID encountered: ${workspaceID}`);
-                    }
-                }
-
-                // Bump the score once after processing all changes
-                if (workspaceIDs.length > 0) {
-                    this.score += SCORE_INCREMENT_XLARGE;
-                }
-                break;
+        this._log.trace(`Observed ${topic} for UUIDs: ${workspaceIDs.join(', ')}`);
+
+        // Process each UUID
+        for (const workspaceID of workspaceIDs) {
+          if (typeof workspaceID === 'string') {
+            // Inform the store about the change
+            await this.engine._store.markChanged(workspaceID);
+          } else {
+            this._log.warn(`Invalid workspace ID encountered: ${workspaceID}`);
+          }
+        }
+
+        // Bump the score once after processing all changes
+        if (workspaceIDs.length > 0) {
+          this.score += SCORE_INCREMENT_XLARGE;
         }
-    } catch (error) {
-        this._log.error(`Error handling ${topic} in observe method`, error);
+        break;
     }
+  } catch (error) {
+    this._log.error(`Error handling ${topic} in observe method`, error);
+  }
 };
 
 /**
  * Finalizes the tracker by ensuring all pending operations are completed.
  */
 ZenWorkspacesTracker.prototype.finalize = async function () {
-    await Tracker.prototype.finalize.call(this);
+  await Tracker.prototype.finalize.call(this);
 };
 
-
 // Define ZenWorkspacesEngine
 function ZenWorkspacesEngine(service) {
-    SyncEngine.call(this, "Workspaces", service);
+  SyncEngine.call(this, 'Workspaces', service);
 }
 
 ZenWorkspacesEngine.prototype = Object.create(SyncEngine.prototype);
@@ -448,5 +446,3 @@ ZenWorkspacesEngine.prototype.syncPriority = 10;
 ZenWorkspacesEngine.prototype.allowSkippedRecord = false;
 
 Object.setPrototypeOf(ZenWorkspacesEngine.prototype, SyncEngine.prototype);
-
-
diff --git a/src/browser/base/zen-components/actors/ZenGlanceChild.sys.mjs b/src/browser/base/zen-components/actors/ZenGlanceChild.sys.mjs
index fc6c6eca5..79e945a6c 100644
--- a/src/browser/base/zen-components/actors/ZenGlanceChild.sys.mjs
+++ b/src/browser/base/zen-components/actors/ZenGlanceChild.sys.mjs
@@ -62,7 +62,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
       url = this.contentWindow.location.origin + url;
     }
     const rect = target.getBoundingClientRect();
-    this.sendAsyncMessage('ZenGlance:OpenGlance', { 
+    this.sendAsyncMessage('ZenGlance:OpenGlance', {
       url,
       x: rect.left,
       y: rect.top,
@@ -109,7 +109,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
       return;
     } else if (activationMethod === 'meta' && !event.metaKey) {
       return;
-    }else if (activationMethod === 'mantain' || typeof activationMethod === 'undefined') {
+    } else if (activationMethod === 'mantain' || typeof activationMethod === 'undefined') {
       return;
     }
     // get closest A element
@@ -117,7 +117,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
     if (target) {
       event.preventDefault();
       event.stopPropagation();
-      
+
       this.openGlance(target);
     }
   }
diff --git a/src/browser/base/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs b/src/browser/base/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs
index f670cec1c..6a0475c42 100644
--- a/src/browser/base/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs
+++ b/src/browser/base/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs
@@ -69,13 +69,9 @@ export class ZenThemeMarketplaceChild extends JSWindowActorChild {
   }
 
   injectMarkplaceAPI() {
-    Cu.exportFunction(
-      this.installTheme.bind(this),
-      this.contentWindow,
-      {
-        defineAs: "ZenInstallTheme",
-      }
-    );
+    Cu.exportFunction(this.installTheme.bind(this), this.contentWindow, {
+      defineAs: 'ZenInstallTheme',
+    });
   }
 
   async addIntallButtons() {
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index fddc69f39..bf31f677d 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -1022,33 +1022,33 @@ Preferences.addAll([
     default: false,
   },
   {
-    id: "zen.glance.activation-method",
-    type: "string",
-    default: "ctrl", 
+    id: 'zen.glance.activation-method',
+    type: 'string',
+    default: 'ctrl',
   },
   {
-    id: "zen.glance.enabled",
-    type: "bool",
+    id: 'zen.glance.enabled',
+    type: 'bool',
     default: true,
   },
   {
-    id: "zen.theme.color-prefs.use-workspace-colors",
-    type: "bool",
+    id: 'zen.theme.color-prefs.use-workspace-colors',
+    type: 'bool',
     default: false,
   },
   {
-    id: "zen.view.compact.color-toolbar",
-    type: "bool",
+    id: 'zen.view.compact.color-toolbar',
+    type: 'bool',
     default: true,
   },
   {
-    id: "zen.view.compact.color-sidebar",
-    type: "bool",
+    id: 'zen.view.compact.color-sidebar',
+    type: 'bool',
     default: true,
   },
   {
-    id: "zen.essentials.enabled",
-    type: "bool",
+    id: 'zen.essentials.enabled',
+    type: 'bool',
     default: true,
   },
   {
@@ -1057,18 +1057,18 @@ Preferences.addAll([
     default: false,
   },
   {
-    id: "zen.tabs.show-newtab-vertical",
-    type: "bool",
+    id: 'zen.tabs.show-newtab-vertical',
+    type: 'bool',
     default: true,
   },
   {
-    id: "zen.view.show-newtab-button-border-top",
-    type: "bool",
+    id: 'zen.view.show-newtab-button-border-top',
+    type: 'bool',
     default: false,
   },
   {
-    id: "zen.view.show-newtab-button-top",
-    type: "bool",
+    id: 'zen.view.show-newtab-button-top',
+    type: 'bool',
     default: true,
   },
 ]);
diff --git a/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml b/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml
index b1d0cc52c..05fd6910b 100644
--- a/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml
+++ b/src/browser/components/preferences/zenKeyboardShortcuts.inc.xhtml
@@ -11,7 +11,7 @@
       <label><html:h2 data-l10n-id="zen-settings-CKS-header"/></label>
       <description class="description-deemphasized" data-l10n-id="zen-settings-CKS-description" />
       <hbox>
-            <button id="zenCKSResetButton" data-l10n-id="zen-settings-CKS-reset-shortcuts" class="reset-button"/>      
+            <button id="zenCKSResetButton" data-l10n-id="zen-settings-CKS-reset-shortcuts" class="reset-button"/>
       </hbox>
       <vbox id="zenCKSOption-wrapper"></vbox>
 </groupbox>
diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
index d60d96d92..2c92b5fd5 100644
--- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
+++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
@@ -67,7 +67,7 @@
             </g>
         </g>
     </g>
-</svg>      
+</svg>
                         </div>
                         <div class="web-appearance-choice-footer">
                         <input type="radio" name="web-appearance" value="amoled" data-l10n-id="preferences-web-appearance-choice-input-auto"
@@ -112,7 +112,7 @@
             </g>
         </g>
     </g>
-</svg>      
+</svg>
                         </div>
                         <div class="web-appearance-choice-footer">
                         <input type="radio" name="web-appearance" value="default" data-l10n-id="preferences-web-appearance-choice-input-light"
@@ -157,7 +157,7 @@
             </g>
         </g>
     </g>
-</svg>      
+</svg>
                         </div>
                         <div class="web-appearance-choice-footer">
                         <input type="radio" name="web-appearance" value="colorful" data-l10n-id="preferences-web-appearance-choice-input-dark"
diff --git a/src/browser/components/preferences/zenTabsManagement.inc.xhtml b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
index b69d8e951..1bdaea5b8 100644
--- a/src/browser/components/preferences/zenTabsManagement.inc.xhtml
+++ b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
@@ -36,7 +36,7 @@
             <checkbox id="zenWorkspaceHideDeactivatedWorkspaces"
                   data-l10n-id="zen-settings-workspaces-hide-deactivated-workspaces"
                   preference="zen.workspaces.hide-deactivated-workspaces"/>
-            
+
       </vbox>
 </groupbox>
 
diff --git a/src/browser/components/zen-welcome/welcome.html b/src/browser/components/zen-welcome/welcome.html
index a5f65a89a..aa31a24ed 100644
--- a/src/browser/components/zen-welcome/welcome.html
+++ b/src/browser/components/zen-welcome/welcome.html
@@ -31,11 +31,11 @@
       <div class="page" id="welcome">
         <img class="icon" src="chrome://branding/content/about-logo.png" />
         <h1 data-l10n-id="welcome-dialog-welcome"></h1>
-  
+
         <p data-l10n-id="welcome-dialog-welcome-subtext"></p>
 
       </div>
-  
+
       <div class="page page-split" id="import">
         <div>
           <h1 data-l10n-id="welcome-dialog-import"></h1>
@@ -51,7 +51,7 @@ <h1 data-l10n-id="welcome-dialog-import"></h1>
           </hbox>
         </div>
       </div>
-  
+
       <div class="page page-split" id="theme">
         <div>
           <h1 data-l10n-id="welcome-dialog-theme"></h1>
@@ -120,11 +120,11 @@ <h2 data-l10n-id="welcome-dialog-theme-header-2"></h2>
               <rect width="700" height="700" fill="white"/>
               </clipPath>
               </defs>
-            </svg>                
+            </svg>
           </div>
         </div>
       </div>
-  
+
       <div class="page page-split" id="search">
         <div>
           <h1 data-l10n-id="welcome-dialog-search"></h1>
@@ -134,7 +134,7 @@ <h1 data-l10n-id="welcome-dialog-search"></h1>
           <div id="searchList" class="cardGroup"></div>
         </div>
       </div>
-  
+
       <div class="page" id="thanks">
         <h1 data-l10n-id="welcome-dialog-thanks"></h1>
         <p data-l10n-id="welcome-dialog-thanks-subtext"></p>
diff --git a/src/browser/themes/shared/preferences/zen-preferences.css b/src/browser/themes/shared/preferences/zen-preferences.css
index 5e147c8ec..f023b35b7 100644
--- a/src/browser/themes/shared/preferences/zen-preferences.css
+++ b/src/browser/themes/shared/preferences/zen-preferences.css
@@ -253,7 +253,7 @@ groupbox h2 {
   --zen-compact-mode-styles-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.1);
 
   @media not (prefers-color-scheme: dark) {
-    --zen-compact-mode-styles-shadow: 0 0 .5px .5px rgba(0, 0, 0, 0.1);
+    --zen-compact-mode-styles-shadow: 0 0 0.5px 0.5px rgba(0, 0, 0, 0.1);
   }
 
   box-shadow: var(--zen-compact-mode-styles-shadow);
@@ -609,5 +609,5 @@ groupbox h2 {
 
 .sync-engine-workspaces .checkbox-icon,
 .sync-engine-workspaces.sync-engine-image {
-  list-style-image: url("chrome://devtools/skin/images/tool-storage.svg");
+  list-style-image: url('chrome://devtools/skin/images/tool-storage.svg');
 }
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 55d41a2cf..111a14c17 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -581,7 +581,6 @@
   fill: white !important;
 }
 
-
 /* reload/stop animation */
 #stop-reload-button[animate]
   > #reload-button[displaystop]
diff --git a/surfer.json b/surfer.json
index 4fe49c2b7..057155737 100644
--- a/surfer.json
+++ b/surfer.json
@@ -48,10 +48,8 @@
     }
   },
   "license": {
-    "ignoredFiles": [
-      ".*\\.json"
-    ],
+    "ignoredFiles": [".*\\.json"],
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.zen-browser.app"
-}
\ No newline at end of file
+}