diff --git a/scripts/patch-desktop-app.mjs b/scripts/patch-desktop-app.mjs
index fefc114..9ed3cd5 100755
--- a/scripts/patch-desktop-app.mjs
+++ b/scripts/patch-desktop-app.mjs
@@ -18,7 +18,11 @@ const injectTriggerOnce = (scriptId, scriptContent) =>
     : "");
 
 const mainScript = ".webpack/main/index",
-  rendererScript = ".webpack/renderer/tab_browser_view/preload",
+  rendererScripts = [
+    ".webpack/renderer/tab_browser_view/preload",
+    ".webpack/renderer/draggable_tabs/preload",
+    ".webpack/renderer/tabs/preload",
+  ],
   patches = {
     [mainScript]: (scriptContent) => {
       scriptContent = injectTriggerOnce(mainScript, scriptContent);
@@ -35,7 +39,7 @@ const mainScript = ".webpack/main/index",
 
       // restore node integration in the renderer process
       // so the notion-enhancer can be require()-d into it
-      replace("spellcheck:!0,sandbox:!0", "spellcheck:!0,nodeIntegration:true");
+      replace(/sandbox:!0/g, `sandbox:!1,nodeIntegration:!0,session:require('electron').session.fromPartition("persist:notion")`);
 
       // bypass webRequest filter to load enhancer menu
       replace("r.top!==r?t({cancel:!0})", "r.top!==r?t({})");
@@ -67,8 +71,10 @@ const mainScript = ".webpack/main/index",
 
       return scriptContent;
     },
-    [rendererScript]: (scriptContent) =>
-      injectTriggerOnce(rendererScript, scriptContent),
+    ["*"]: (scriptId, scriptContent) => {
+      if (!rendererScripts.includes(scriptId)) return scriptContent;
+      return injectTriggerOnce(scriptId, scriptContent);
+    },
   };
 
 export default (scriptId, scriptContent) => {
diff --git a/src/_assets/colour-x128.png b/src/assets/colour-x128.png
similarity index 100%
rename from src/_assets/colour-x128.png
rename to src/assets/colour-x128.png
diff --git a/src/_assets/colour-x16.png b/src/assets/colour-x16.png
similarity index 100%
rename from src/_assets/colour-x16.png
rename to src/assets/colour-x16.png
diff --git a/src/_assets/colour-x256.png b/src/assets/colour-x256.png
similarity index 100%
rename from src/_assets/colour-x256.png
rename to src/assets/colour-x256.png
diff --git a/src/_assets/colour-x32.png b/src/assets/colour-x32.png
similarity index 100%
rename from src/_assets/colour-x32.png
rename to src/assets/colour-x32.png
diff --git a/src/_assets/colour-x48.png b/src/assets/colour-x48.png
similarity index 100%
rename from src/_assets/colour-x48.png
rename to src/assets/colour-x48.png
diff --git a/src/_assets/colour-x512.png b/src/assets/colour-x512.png
similarity index 100%
rename from src/_assets/colour-x512.png
rename to src/assets/colour-x512.png
diff --git a/src/_assets/colour-x64.png b/src/assets/colour-x64.png
similarity index 100%
rename from src/_assets/colour-x64.png
rename to src/assets/colour-x64.png
diff --git a/src/_assets/icons.svg.js b/src/assets/icons.svg.js
similarity index 100%
rename from src/_assets/icons.svg.js
rename to src/assets/icons.svg.js
diff --git a/src/_common/events.js b/src/common/events.js
similarity index 100%
rename from src/_common/events.js
rename to src/common/events.js
diff --git a/src/_common/markup.js b/src/common/markup.js
similarity index 100%
rename from src/_common/markup.js
rename to src/common/markup.js
diff --git a/src/_common/notion.js b/src/common/notion.js
similarity index 100%
rename from src/_common/notion.js
rename to src/common/notion.js
diff --git a/src/_common/registry.js b/src/common/registry.js
similarity index 100%
rename from src/_common/registry.js
rename to src/common/registry.js
diff --git a/src/_common/system.js b/src/common/system.js
similarity index 100%
rename from src/_common/system.js
rename to src/common/system.js
diff --git a/src/core/client.mjs b/src/core/client.mjs
index 5007881..d4c2a50 100644
--- a/src/core/client.mjs
+++ b/src/core/client.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 import { checkForUpdate } from "./updateCheck.mjs";
 import { sendTelemetryPing } from "./sendTelemetry.mjs";
 import { Modal, Frame } from "./islands/Modal.mjs";
diff --git a/src/core/electron.cjs b/src/core/electron.cjs
index 14b24ef..6ae65c4 100644
--- a/src/core/electron.cjs
+++ b/src/core/electron.cjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 const getPreference = (key) => {
     const { preferences = {} } = globalThis.__notionStore?.getState()?.app;
     return preferences[key];
diff --git a/src/core/islands/MenuButton.mjs b/src/core/islands/MenuButton.mjs
index f3b2501..b98690c 100644
--- a/src/core/islands/MenuButton.mjs
+++ b/src/core/islands/MenuButton.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 function MenuButton(
   { icon, notifications, themeOverridesLoaded, ...props },
   ...children
diff --git a/src/core/islands/Modal.mjs b/src/core/islands/Modal.mjs
index 6ce9f48..62c1f7a 100644
--- a/src/core/islands/Modal.mjs
+++ b/src/core/islands/Modal.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 function Modal(props, ...children) {
   const { html, extendProps, addKeyListener } = globalThis.__enhancerApi;
   extendProps(props, {
diff --git a/src/core/islands/Panel.mjs b/src/core/islands/Panel.mjs
index 40a8b01..64512a1 100644
--- a/src/core/islands/Panel.mjs
+++ b/src/core/islands/Panel.mjs
@@ -5,6 +5,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 import { Tooltip } from "./Tooltip.mjs";
 import { TopbarButton } from "./TopbarButton.mjs";
 import { Select } from "../menu/islands/Select.mjs";
diff --git a/src/core/islands/Tooltip.mjs b/src/core/islands/Tooltip.mjs
index fe6b355..34d94e0 100644
--- a/src/core/islands/Tooltip.mjs
+++ b/src/core/islands/Tooltip.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 function Tooltip(props, ...children) {
   const { html, extendProps } = globalThis.__enhancerApi;
   extendProps(props, {
diff --git a/src/core/islands/TopbarButton.mjs b/src/core/islands/TopbarButton.mjs
index 537d006..27bd018 100644
--- a/src/core/islands/TopbarButton.mjs
+++ b/src/core/islands/TopbarButton.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 function TopbarButton({ icon, ...props }) {
   const { html, extendProps, addMutationListener } = globalThis.__enhancerApi;
   extendProps(props, {
@@ -16,20 +18,20 @@ function TopbarButton({ icon, ...props }) {
     &[data-active]:bg-[color:var(--theme--bg-hover)]`,
   });
 
-  const notionTopbar = ".notion-topbar-favorite-button",
+  const topbarFavorite = ".notion-topbar-favorite-button",
     $button = html`<button ...${props}>
       <i
         class="i-${icon} w-[20px] h-[20px]
         fill-[color:var(--theme--fg-secondary)]"
       />
     </button>`,
-    addToTopbar = () => {
+    addToTopbar = (after = topbarFavorite) => {
       if (document.contains($button)) return;
-      document.querySelector(notionTopbar)?.after($button);
+      document.querySelector(after)?.after($button);
     };
-  $button.addToTopbar = () => {
-    addToTopbar();
-    addMutationListener(notionTopbar, addToTopbar);
+  $button.addToTopbar = (after = topbarFavorite) => {
+    addMutationListener(after, () => addToTopbar(after));
+    addToTopbar(after);
   };
   return $button;
 }
diff --git a/src/core/menu/index.html b/src/core/menu/index.html
index b5ed36e..9f81db7 100644
--- a/src/core/menu/index.html
+++ b/src/core/menu/index.html
@@ -6,8 +6,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>notion-enhancer menu</title>
     <link rel="stylesheet" href="./menu.css" />
-    <link rel="stylesheet" href="../../_vendor/coloris.min.css" />
-    <script src="../../_vendor/coloris.min.js" type="module"></script>
+    <link rel="stylesheet" href="../../vendor/coloris.min.css" />
+    <script src="../../vendor/coloris.min.js" type="module"></script>
     <script src="./menu.mjs" type="module" defer></script>
   </head>
   <body>
diff --git a/src/core/menu/islands/Banner.mjs b/src/core/menu/islands/Banner.mjs
index 246ae44..ffcda2e 100644
--- a/src/core/menu/islands/Banner.mjs
+++ b/src/core/menu/islands/Banner.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 import { Popup } from "./Popup.mjs";
 import { Button } from "./Button.mjs";
 import { Description } from "./Description.mjs";
diff --git a/src/core/menu/islands/Button.mjs b/src/core/menu/islands/Button.mjs
index 42ac31d..58c2281 100644
--- a/src/core/menu/islands/Button.mjs
+++ b/src/core/menu/islands/Button.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 function Button({ icon, variant, tagName, ...props }, ...children) {
   const { html, extendProps } = globalThis.__enhancerApi;
   extendProps(props, {
diff --git a/src/core/menu/islands/Checkbox.mjs b/src/core/menu/islands/Checkbox.mjs
index c101ddf..5784a5a 100644
--- a/src/core/menu/islands/Checkbox.mjs
+++ b/src/core/menu/islands/Checkbox.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 function Checkbox({ _get, _set, _requireReload = true, ...props }) {
   let _initialValue;
   const { html, extendProps, setState, useState } = globalThis.__enhancerApi,
diff --git a/src/core/menu/islands/Description.mjs b/src/core/menu/islands/Description.mjs
index 8c2757b..2d87478 100644
--- a/src/core/menu/islands/Description.mjs
+++ b/src/core/menu/islands/Description.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 function Description(props, ...children) {
   const { html, extendProps } = globalThis.__enhancerApi;
   extendProps(props, {
diff --git a/src/core/menu/islands/Footer.mjs b/src/core/menu/islands/Footer.mjs
index e22df9e..866a13f 100644
--- a/src/core/menu/islands/Footer.mjs
+++ b/src/core/menu/islands/Footer.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 import { Button } from "./Button.mjs";
 
 function Footer({ categories }) {
@@ -30,7 +32,7 @@ function Footer({ categories }) {
     });
 
   useState(["view"], ([view]) => {
-    let footerOpen = $reload.style.display !== "none";
+    let [footerOpen] = useState(["databaseUpdated"]);
     for (const [ids, $btn] of $categories) {
       const modInCategory = ids.some((id) => id === view);
       if (modInCategory) footerOpen = true;
@@ -40,7 +42,7 @@ function Footer({ categories }) {
   });
   useState(["databaseUpdated"], ([databaseUpdated]) => {
     $reload.style.display = databaseUpdated ? "" : "none";
-    setState({ footerOpen: true });
+    if (databaseUpdated) setState({ footerOpen: true });
   });
 
   return html`<footer
diff --git a/src/core/menu/islands/Heading.mjs b/src/core/menu/islands/Heading.mjs
index 763b138..d8eea03 100644
--- a/src/core/menu/islands/Heading.mjs
+++ b/src/core/menu/islands/Heading.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 function Heading(props, ...children) {
   const { html, extendProps } = globalThis.__enhancerApi;
   extendProps(props, {
diff --git a/src/core/menu/islands/Input.mjs b/src/core/menu/islands/Input.mjs
index c12b61e..b5ba1d7 100644
--- a/src/core/menu/islands/Input.mjs
+++ b/src/core/menu/islands/Input.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 const updateHotkey = (event) => {
     const keys = [];
     for (const modifier of ["metaKey", "ctrlKey", "altKey", "shiftKey"]) {
diff --git a/src/core/menu/islands/List.mjs b/src/core/menu/islands/List.mjs
index 94b9952..cf99197 100644
--- a/src/core/menu/islands/List.mjs
+++ b/src/core/menu/islands/List.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 import { Description } from "./Description.mjs";
 import { Input } from "./Input.mjs";
 import { Mod } from "./Mod.mjs";
diff --git a/src/core/menu/islands/Mod.mjs b/src/core/menu/islands/Mod.mjs
index 5bb0293..39c73a3 100644
--- a/src/core/menu/islands/Mod.mjs
+++ b/src/core/menu/islands/Mod.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 import { Description } from "./Description.mjs";
 import { Toggle } from "./Toggle.mjs";
 
diff --git a/src/core/menu/islands/Onboarding.mjs b/src/core/menu/islands/Onboarding.mjs
index 7117ef9..ad32b07 100644
--- a/src/core/menu/islands/Onboarding.mjs
+++ b/src/core/menu/islands/Onboarding.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 import { Heading } from "./Heading.mjs";
 import { Description } from "./Description.mjs";
 import { Checkbox } from "./Checkbox.mjs";
diff --git a/src/core/menu/islands/Options.mjs b/src/core/menu/islands/Options.mjs
index cd0729f..8d0e517 100644
--- a/src/core/menu/islands/Options.mjs
+++ b/src/core/menu/islands/Options.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 import { Heading } from "./Heading.mjs";
 import { Description } from "./Description.mjs";
 import { Input } from "./Input.mjs";
diff --git a/src/core/menu/islands/Popup.mjs b/src/core/menu/islands/Popup.mjs
index 94496e6..3dad1b1 100644
--- a/src/core/menu/islands/Popup.mjs
+++ b/src/core/menu/islands/Popup.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 function Popup(
   { trigger, mode = "left", width = 250, maxWidth, ...props },
   ...children
diff --git a/src/core/menu/islands/Profiles.mjs b/src/core/menu/islands/Profiles.mjs
index 0b82379..438ffa1 100644
--- a/src/core/menu/islands/Profiles.mjs
+++ b/src/core/menu/islands/Profiles.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 import { Heading } from "./Heading.mjs";
 import { Description } from "./Description.mjs";
 import { Checkbox } from "./Checkbox.mjs";
diff --git a/src/core/menu/islands/Select.mjs b/src/core/menu/islands/Select.mjs
index 991bc22..ad758d3 100644
--- a/src/core/menu/islands/Select.mjs
+++ b/src/core/menu/islands/Select.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 import { Popup } from "./Popup.mjs";
 
 function Option({ $icon = "", value = "", _get, _set }) {
diff --git a/src/core/menu/islands/Sidebar.mjs b/src/core/menu/islands/Sidebar.mjs
index 8a0a562..cbad8b0 100644
--- a/src/core/menu/islands/Sidebar.mjs
+++ b/src/core/menu/islands/Sidebar.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 import { Description } from "./Description.mjs";
 
 function SidebarHeading({}, ...children) {
diff --git a/src/core/menu/islands/Telemetry.mjs b/src/core/menu/islands/Telemetry.mjs
index 8aebc1e..91a5023 100644
--- a/src/core/menu/islands/Telemetry.mjs
+++ b/src/core/menu/islands/Telemetry.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 import { collectTelemetryData } from "../../sendTelemetry.mjs";
 import { Option } from "./Options.mjs";
 
diff --git a/src/core/menu/islands/Tile.mjs b/src/core/menu/islands/Tile.mjs
index f497dfb..534a416 100644
--- a/src/core/menu/islands/Tile.mjs
+++ b/src/core/menu/islands/Tile.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 function Tile({ icon, title, tagName, ...props }, ...children) {
   const { html, extendProps } = globalThis.__enhancerApi;
   extendProps(props, {
diff --git a/src/core/menu/islands/Toggle.mjs b/src/core/menu/islands/Toggle.mjs
index fea7b60..fa48a21 100644
--- a/src/core/menu/islands/Toggle.mjs
+++ b/src/core/menu/islands/Toggle.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 function Toggle({ _get, _set, _requireReload = true, ...props }) {
   let _initialValue;
   const { html, extendProps, setState, useState } = globalThis.__enhancerApi,
diff --git a/src/core/menu/islands/View.mjs b/src/core/menu/islands/View.mjs
index 1c6bdf3..3daf13c 100644
--- a/src/core/menu/islands/View.mjs
+++ b/src/core/menu/islands/View.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 function View({ id }, ...children) {
   const { html, setState, useState } = globalThis.__enhancerApi,
     // set padding on last child to maintain pad on overflow
diff --git a/src/core/menu/menu.mjs b/src/core/menu/menu.mjs
index 7fac552..999b726 100644
--- a/src/core/menu/menu.mjs
+++ b/src/core/menu/menu.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 import { checkForUpdate, isDevelopmentBuild } from "../updateCheck.mjs";
 import { Sidebar } from "./islands/Sidebar.mjs";
 import { Footer } from "./islands/Footer.mjs";
@@ -124,7 +126,7 @@ const renderMenu = async () => {
         categories=${categories}
       />`,
       $main = html`
-        <main class="flex-(& col) overflow-hidden transition-[height]">
+        <main class="flex-(& col) overflow-hidden transition-[height]" style="height: calc(100% + 65px)">
           <!-- wrappers necessary for transitions and breakpoints -->
           <div class="grow overflow-auto">
             <div class="relative h-full w-full">
@@ -182,7 +184,7 @@ const renderMenu = async () => {
 const importApi = () => {
     return (_apiImport ??= (async () => {
       const api = globalThis.__enhancerApi;
-      if (typeof api === "undefined") await import("../../_common/system.js");
+      if (typeof api === "undefined") await import("../../common/system.js");
       await import("../../load.mjs").then((i) => i.default);
     })());
   },
diff --git a/src/core/sendTelemetry.mjs b/src/core/sendTelemetry.mjs
index 1f533ae..9dae937 100644
--- a/src/core/sendTelemetry.mjs
+++ b/src/core/sendTelemetry.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 const pingEndpoint = "https://notion-enhancer.deno.dev/api/ping",
   collectTelemetryData = async () => {
     const { platform, version } = globalThis.__enhancerApi,
diff --git a/src/core/updateCheck.mjs b/src/core/updateCheck.mjs
index e8d7e84..f7f8a9a 100644
--- a/src/core/updateCheck.mjs
+++ b/src/core/updateCheck.mjs
@@ -4,6 +4,8 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+"use strict";
+
 let _release;
 const repo = "notion-enhancer/notion-enhancer",
   endpoint = `https://api.github.com/repos/${repo}/releases/latest`,
diff --git a/src/extensions/titlebar/buttons.css b/src/extensions/titlebar/buttons.css
deleted file mode 100644
index 3a59d9c..0000000
--- a/src/extensions/titlebar/buttons.css
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * notion-enhancer: integrated titlebar
- * (c) 2021 dragonwocky <thedragonring.bod@gmail.com> (https://dragonwocky.me/)
- * (https://notion-enhancer.github.io/) under the MIT license
- */
-
-.integrated_titlebar--dragarea {
-  width: 100%;
-  display: block;
-  -webkit-app-region: drag;
-  background: var(--theme--bg_secondary);
-  height: var(--integrated_titlebar--dragarea-height);
-}
-
-.integrated_titlebar--buttons {
-  display: flex;
-  align-items: center;
-}
-.sidebar > .integrated_titlebar--buttons {
-  margin: -0.5rem 0 0.75rem auto;
-}
-
-.integrated_titlebar--buttons button {
-  user-select: none;
-  transition: background 20ms ease-in 0s;
-  cursor: pointer;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  flex-shrink: 0;
-  border-radius: 3px;
-  height: 28px;
-  width: 33px;
-  padding: 0 0.25px 0 0;
-
-  margin-left: 2px;
-  border: none;
-  background: transparent;
-  font-size: 18px;
-  -webkit-app-region: no-drag;
-}
-.integrated_titlebar--buttons button svg {
-  display: block;
-  width: 20px;
-  height: 20px;
-  fill: var(--theme--icon);
-  color: var(--theme--icon);
-}
-
-.integrated_titlebar--buttons button:focus,
-.integrated_titlebar--buttons button:hover {
-  background: var(--theme--ui_interactive-hover);
-}
-.integrated_titlebar--buttons button:active {
-  background: var(--theme--ui_interactive-active);
-}
-#integrated_titlebar--close:focus,
-#integrated_titlebar--close:hover,
-#integrated_titlebar--close:active {
-  background: var(--theme--accent_red);
-  color: var(--theme--accent_red-text);
-}
-
-.notion-update-sidebar [style*='margin-top: 45px;'] {
-  margin-top: calc(45px + var(--integrated_titlebar--dragarea-height, 0px)) !important;
-}
-.notion-topbar {
-  height: calc(45px + var(--integrated_titlebar--dragarea-height, 0px)) !important;
-}
-.notion-frame {
-  height: calc(100vh - 45px - var(--integrated_titlebar--dragarea-height, 0px)) !important;
-}
-
-body > .body-container {
-  height: calc(100% - var(--integrated_titlebar--dragarea-height, 0px)) !important;
-}
diff --git a/src/extensions/titlebar/client.css b/src/extensions/titlebar/client.css
index 28141c1..b70a6ac 100644
--- a/src/extensions/titlebar/client.css
+++ b/src/extensions/titlebar/client.css
@@ -4,10 +4,12 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
+.notion-tabs,
 .notion-topbar {
   user-select: none;
   -webkit-app-region: drag;
 }
+.notion-tabs :is([aria-label], [draggable]),
 .notion-topbar > div > * {
   -webkit-app-region: no-drag;
 }
diff --git a/src/extensions/titlebar/client.mjs b/src/extensions/titlebar/client.mjs
index e51cd38..88b13a5 100644
--- a/src/extensions/titlebar/client.mjs
+++ b/src/extensions/titlebar/client.mjs
@@ -4,55 +4,28 @@
  * (https://notion-enhancer.github.io/) under the MIT license
  */
 
-'use strict';
+"use strict";
+
+import { TopbarButton } from "../../core/islands/TopbarButton.mjs";
 
 // import { createWindowButtons } from './buttons.mjs';
 
-export default async function (api, db) {
-  // const { web, registry, electron } = api,
-  //   tilingMode = await db.get(['tiling']),
-  //   dragareaHeight = await db.get(['dragarea_height']),
-  //   tabsEnabled = await registry.enabled('e1692c29-475e-437b-b7ff-3eee872e1a42'),
-  //   sidebarSelector = '.notion-sidebar',
-  //   panelSelector = '#enhancer--panel',
-  //   topbarSelector = '.notion-topbar',
-  //   topbarActionsSelector = '.notion-topbar-action-buttons';
-  // if (tilingMode || tabsEnabled) return;
-
-  // let sidebarWidth = '0px',
-  //   panelWidth = '0px';
-  // const updateDragareaOffsets = () => {
-  //   const $sidebar = document.querySelector(sidebarSelector),
-  //     newSidebarWidth =
-  //       !$sidebar || $sidebar.style.height === 'auto' ? '0px' : $sidebar.style.width,
-  //     $panel = document.querySelector(panelSelector),
-  //     newPanelWidth =
-  //       $panel && $panel.dataset.enhancerPanelPinned === 'true'
-  //         ? window
-  //             .getComputedStyle(document.documentElement)
-  //             .getPropertyValue('--component--panel-width')
-  //         : '0px';
-  //   if (newSidebarWidth !== sidebarWidth) {
-  //     sidebarWidth = newSidebarWidth;
-  //     electron.sendMessageToHost('sidebar-width', sidebarWidth);
-  //   }
-  //   if (newPanelWidth !== panelWidth) {
-  //     panelWidth = newPanelWidth;
-  //     electron.sendMessageToHost('panel-width', panelWidth);
-  //   }
-  // };
-  // web.addDocumentObserver(updateDragareaOffsets);
-
-  // await web.whenReady([topbarSelector, topbarActionsSelector]);
-  // const $topbar = document.querySelector(topbarSelector),
-  //   $dragarea = web.html`<div class="integrated_titlebar--dragarea"></div>`;
-  // $topbar.prepend($dragarea);
-  // document.documentElement.style.setProperty(
-  //   '--integrated_titlebar--dragarea-height',
-  //   dragareaHeight + 'px'
-  // );
-
-  // const $topbarActions = document.querySelector(topbarActionsSelector),
-  //   $windowButtons = await createWindowButtons(api, db);
-  // web.render($topbarActions.parentElement, $windowButtons);
+export default async function ({ html }, db) {
+  const topbarMore = ".notion-topbar-more-button";
+  const $minimizeButton = html`<${TopbarButton}
+      aria-label="Minimize window"
+      icon="minus"
+    />`,
+    $maximizeButton = html`<${TopbarButton}
+      aria-label="Maximize window"
+      icon="maximize"
+    />`,
+    $unmaximizeButton = html`<${TopbarButton}
+      aria-label="Unmaximize window"
+      icon="minimize"
+    />`,
+    $closeButton = html`<${TopbarButton} aria-label="Close window" icon="x" />`;
+  $closeButton.addToTopbar(topbarMore);
+  $maximizeButton.addToTopbar(topbarMore);
+  $minimizeButton.addToTopbar(topbarMore);
 }
diff --git a/src/extensions/titlebar/electron.cjs b/src/extensions/titlebar/electron.cjs
index 6e35175..e2c97a2 100644
--- a/src/extensions/titlebar/electron.cjs
+++ b/src/extensions/titlebar/electron.cjs
@@ -7,7 +7,6 @@
 "use strict";
 
 module.exports = async ({}, db) => {
-  const titlebarStyle = await db.get("titlebarStyle");
   Object.assign((globalThis.__notionConfig ??= {}), {
     titlebarStyle: "hidden",
   });
diff --git a/src/extensions/titlebar/frame.mjs b/src/extensions/titlebar/frame.mjs
deleted file mode 100644
index f0e7729..0000000
--- a/src/extensions/titlebar/frame.mjs
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * notion-enhancer: integrated titlebar
- * (c) 2021 dragonwocky <thedragonring.bod@gmail.com> (https://dragonwocky.me/)
- * (https://notion-enhancer.github.io/) under the MIT license
- */
-
-'use strict';
-
-import { createWindowButtons } from './buttons.mjs';
-
-export default async function (api, db) {
-  const { web, registry } = api,
-    tilingMode = await db.get(['tiling']),
-    dragareaHeight = await db.get(['dragarea_height']),
-    tabsEnabled = await registry.enabled('e1692c29-475e-437b-b7ff-3eee872e1a42');
-
-  if (tabsEnabled && !tilingMode) {
-    const windowActionsSelector = '#window-actions';
-    await web.whenReady([windowActionsSelector]);
-
-    const $topbarActions = document.querySelector(windowActionsSelector),
-      $windowButtons = await createWindowButtons(api, db);
-    web.render($topbarActions, $windowButtons);
-  } else {
-    const dragareaSelector = '[style*="-webkit-app-region: drag;"]';
-    await web.whenReady([dragareaSelector]);
-
-    const dragarea = document.querySelector(dragareaSelector);
-    dragarea.style.top = '2px';
-    dragarea.style.height = tilingMode ? '0' : `${dragareaHeight}px`;
-
-    document.getElementById('notion').addEventListener('ipc-message', (event) => {
-      switch (event.channel) {
-        case 'notion-enhancer:sidebar-width':
-          dragarea.style.left = event.args[0];
-          break;
-        case 'notion-enhancer:panel-width':
-          dragarea.style.right = event.args[0];
-          break;
-      }
-    });
-  }
-}
diff --git a/src/extensions/titlebar/menu.mjs b/src/extensions/titlebar/menu.mjs
deleted file mode 100644
index 2e015f3..0000000
--- a/src/extensions/titlebar/menu.mjs
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * notion-enhancer: integrated titlebar
- * (c) 2021 dragonwocky <thedragonring.bod@gmail.com> (https://dragonwocky.me/)
- * (https://notion-enhancer.github.io/) under the MIT license
- */
-
-'use strict';
-
-import { createWindowButtons } from './buttons.mjs';
-
-export default async function (api, db) {
-  const { web } = api,
-    tilingMode = await db.get(['tiling']),
-    dragareaHeight = await db.get(['dragarea_height']),
-    sidebarSelector = '.sidebar';
-  if (tilingMode) return;
-
-  await web.whenReady([sidebarSelector]);
-  const $dragarea = web.html`<div class="integrated_titlebar--dragarea"></div>`;
-  document.body.prepend($dragarea);
-  document.documentElement.style.setProperty(
-    '--integrated_titlebar--dragarea-height',
-    dragareaHeight + 'px'
-  );
-
-  const $sidebar = document.querySelector(sidebarSelector),
-    $windowButtons = await createWindowButtons(api, db);
-  $sidebar.prepend($windowButtons);
-}
diff --git a/src/extensions/titlebar/mod.json b/src/extensions/titlebar/mod.json
index c3dbd3d..b94047f 100644
--- a/src/extensions/titlebar/mod.json
+++ b/src/extensions/titlebar/mod.json
@@ -48,5 +48,9 @@
   ],
   "clientStyles": ["client.css"],
   "clientScripts": ["client.mjs"],
-  "electronScripts": [[".webpack/main/index", "electron.cjs"]]
+  "electronScripts": [
+    [".webpack/main/index", "electron.cjs"],
+    [".webpack/renderer/draggable_tabs/preload", "tabs.cjs"],
+    [".webpack/renderer/tabs/preload", "tabs.cjs"]
+  ]
 }
diff --git a/src/extensions/titlebar/tabs.cjs b/src/extensions/titlebar/tabs.cjs
new file mode 100644
index 0000000..3cd804f
--- /dev/null
+++ b/src/extensions/titlebar/tabs.cjs
@@ -0,0 +1,24 @@
+/**
+ * notion-enhancer: titlebar
+ * (c) 2024 dragonwocky <thedragonring.bod@gmail.com> (https://dragonwocky.me/)
+ * (https://notion-enhancer.github.io/) under the MIT license
+ */
+
+"use strict";
+
+module.exports = async ({ whenReady }, db) => {
+  const api = await whenReady(),
+    { addMutationListener } = api,
+    tabSelector = ".hide-scrollbar > div > div",
+    titlebarStyle = await db.get("titlebarStyle");
+
+  // only make area draggable if tabs are visible:
+  // otherwise dragarea overlaps regular app topbar
+  addMutationListener(".hide-scrollbar", () => {
+    const tabCount = document.querySelectorAll(tabSelector).length;
+    if (tabCount > 1) document.body.classList.add("notion-tabs");
+    else document.body.classList.remove("notion-tabs");
+  });
+
+  if (titlebarStyle === "Disabled") return;
+};
diff --git a/src/init.js b/src/init.js
index ecd73bb..3688b8b 100644
--- a/src/init.js
+++ b/src/init.js
@@ -6,16 +6,23 @@
 
 "use strict";
 
-const isElectron = () => {
-  try {
-    return typeof module !== "undefined";
-  } catch {}
-  return false;
-};
+globalThis.__enhancerApi ??= {};
+const whenReady = new Promise((res, rej) => {
+    globalThis.__enhancerApi.__isReady = res;
+  }),
+  isElectron = () => {
+    try {
+      return typeof module !== "undefined";
+    } catch {}
+    return false;
+  };
+Object.assign((globalThis.__enhancerApi ??= {}), {
+  whenReady: (callback) => whenReady.then(callback),
+});
 
 if (isElectron()) {
-  require("./_common/system.js");
-  require("./_common/registry.js");
+  require("./common/system.js");
+  require("./common/registry.js");
   const { enhancerUrl } = globalThis.__enhancerApi,
     { getMods, isEnabled, modDatabase } = globalThis.__enhancerApi;
 
@@ -24,7 +31,7 @@ if (isElectron()) {
 
   module.exports = async (target, __exports, __eval) => {
     if (target === mainScript) require("./worker.js");
-    if (target === rendererScript) {
+    else {
       // expose globalThis.__enhancerApi to scripts
       const { contextBridge } = require("electron"),
         __getEnhancerApi = () => globalThis.__enhancerApi;
@@ -52,6 +59,6 @@ if (isElectron()) {
     }
   };
 } else {
-  import(chrome.runtime.getURL("/_common/system.js")) //
+  import(chrome.runtime.getURL("/common/system.js")) //
     .then(() => import(chrome.runtime.getURL("/load.mjs")));
 }
diff --git a/src/load.mjs b/src/load.mjs
index 5d499a1..e4a0977 100644
--- a/src/load.mjs
+++ b/src/load.mjs
@@ -16,9 +16,10 @@ export default (async () => {
     signedIn = localStorage["LRU:KeyValueStore2:current-user-id"],
     pageLoaded = /(^\/$)|((-|\/)[0-9a-f]{32}((\?.+)|$))/.test(location.pathname),
     IS_MENU = location.href.startsWith(enhancerUrl("core/menu/index.html")),
+    IS_TABS = /\/app\/\.webpack\/renderer\/(draggable_)?tabs\/index.html$/.test(location.href),
     IS_ELECTRON = ['linux', 'win32', 'darwin'].includes(platform);
 
-  if (!IS_MENU) {
+  if (!IS_MENU && !IS_TABS) {
     if (!signedIn || !pageLoaded) return;
     console.log("notion-enhancer: loading...");
   }
@@ -43,15 +44,15 @@ export default (async () => {
 
   await Promise.all([
     // i.e. if (not_menu) or (is_menu && not_electron), then import
-    !(!IS_MENU || !IS_ELECTRON) || import(enhancerUrl("_assets/icons.svg.js")),
-    import(enhancerUrl("_vendor/twind.min.js")),
-    import(enhancerUrl("_vendor/lucide.min.js")),
-    import(enhancerUrl("_vendor/htm.min.js")),
+    !(!IS_MENU || !IS_ELECTRON) || import(enhancerUrl("assets/icons.svg.js")),
+    import(enhancerUrl("vendor/twind.min.js")),
+    import(enhancerUrl("vendor/lucide.min.js")),
+    import(enhancerUrl("vendor/htm.min.js")),
   ]);
   await Promise.all([
-    !(!IS_MENU || !IS_ELECTRON) || import(enhancerUrl("_common/registry.js")),
-    import(enhancerUrl("_common/events.js")),
-    import(enhancerUrl("_common/markup.js")),
+    !(!IS_MENU || !IS_ELECTRON) || import(enhancerUrl("common/registry.js")),
+    import(enhancerUrl("common/events.js")),
+    import(enhancerUrl("common/markup.js")),
   ]);
 
   const { getMods, isEnabled, modDatabase } = globalThis.__enhancerApi;
@@ -69,7 +70,7 @@ export default (async () => {
     }
 
     // clientScripts
-    if (IS_MENU) continue;
+    if (IS_MENU || IS_TABS) continue;
     const db = await modDatabase(mod.id);
     for (let script of mod.clientScripts ?? []) {
       script = await import(enhancerUrl(`${mod._src}/${script}`));
@@ -78,4 +79,5 @@ export default (async () => {
   }
 
   if (IS_MENU) console.log("notion-enhancer: ready");
+  globalThis.__enhancerApi.__isReady(globalThis.__enhancerApi);
 })();
diff --git a/src/manifest.json b/src/manifest.json
index afe1658..b6875ae 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -9,12 +9,12 @@
   "background": { "service_worker": "/worker.js" },
   "action": {},
   "icons": {
-    "16": "/_assets/colour-x16.png",
-    "32": "/_assets/colour-x32.png",
-    "48": "/_assets/colour-x48.png",
-    "128": "/_assets/colour-x128.png",
-    "256": "/_assets/colour-x256.png",
-    "512": "/_assets/colour-x512.png"
+    "16": "/assets/colour-x16.png",
+    "32": "/assets/colour-x32.png",
+    "48": "/assets/colour-x48.png",
+    "128": "/assets/colour-x128.png",
+    "256": "/assets/colour-x256.png",
+    "512": "/assets/colour-x512.png"
   },
   "permissions": [
     "tabs",
diff --git a/src/_vendor/coloris.min.css b/src/vendor/coloris.min.css
similarity index 100%
rename from src/_vendor/coloris.min.css
rename to src/vendor/coloris.min.css
diff --git a/src/_vendor/coloris.min.js b/src/vendor/coloris.min.js
similarity index 100%
rename from src/_vendor/coloris.min.js
rename to src/vendor/coloris.min.js
diff --git a/src/_vendor/content-types.min.js b/src/vendor/content-types.min.js
similarity index 100%
rename from src/_vendor/content-types.min.js
rename to src/vendor/content-types.min.js
diff --git a/src/_vendor/htm.min.js b/src/vendor/htm.min.js
similarity index 100%
rename from src/_vendor/htm.min.js
rename to src/vendor/htm.min.js
diff --git a/src/_vendor/lucide.min.js b/src/vendor/lucide.min.js
similarity index 100%
rename from src/_vendor/lucide.min.js
rename to src/vendor/lucide.min.js
diff --git a/src/_vendor/twind.min.js b/src/vendor/twind.min.js
similarity index 100%
rename from src/_vendor/twind.min.js
rename to src/vendor/twind.min.js