From b348bf871b804028aadb71d9a1ec754f91967781 Mon Sep 17 00:00:00 2001
From: dragonwocky <thedragonring.bod@gmail.com>
Date: Tue, 11 Aug 2020 21:24:00 +1000
Subject: [PATCH] dark+ fixes, general slicking up

---
 CHANGELOG.md                 |   2 +-
 mods/core/css/dark.css       | 155 +--------------
 mods/core/css/light.css      | 145 +-------------
 mods/core/css/localised.css  | 373 +++++++++++++++++------------------
 mods/core/css/menu.css       | 106 +++++-----
 mods/core/css/shared.css     | 127 ++++++++++++
 mods/core/css/variables.css  |  34 ++--
 mods/core/css/variables.json |  34 ++--
 mods/core/menu.js            |   4 +-
 mods/dark+/styles.css        |  41 ++--
 mods/focus-mode/mod.js       |   2 +-
 mods/neutral/styles.css      |  32 +--
 12 files changed, 442 insertions(+), 613 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27bcf83..3832174 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@ complete rewrite with node.js.
 - bugfix: fix frameless window issue introduced by notion desktop 2.0.9.
 - extension: "custom inserts" = link files for small client-side tweaks..
 - extension: "bracketed links" = render links surrounded with \[\[brackets]] instead of underlined.
-- extension: "focus mode" = hide the titlebar/menubar when the sidebar is closed (will be shown on hover).
+- extension: "focus mode" = hide the titlebar/menubar if the sidebar is closed (will be shown on hover).
 - theme: "neutral" = smoother colours and fonts, designed to be more pleasing to the eye.
 - theme: "dark+" = a vivid-colour near-black theme.
 
diff --git a/mods/core/css/dark.css b/mods/core/css/dark.css
index 457eb8c..d671ee6 100644
--- a/mods/core/css/dark.css
+++ b/mods/core/css/dark.css
@@ -20,29 +20,6 @@
   background: var(--theme_dark--main) !important;
 }
 
-.notion-dark-theme [style*='background: rgba(15, 15, 15, 0.6)'] {
-  background: var(--theme_dark--overlay) !important;
-}
-
-.notion-dark-theme .notion-peek-renderer > div:nth-child(2) {
-  max-width: var(--theme_dark--preview-width) !important;
-}
-.notion-dark-theme
-  .notion-peek-renderer
-  .notion-scroller.vertical
-  > div:nth-child(1)
-  > div,
-.notion-dark-theme
-  .notion-peek-renderer
-  .notion-scroller.vertical
-  > div:nth-child(2),
-.notion-dark-theme .notion-peek-renderer .notion-page-view-discussion,
-.notion-dark-theme .notion-peek-renderer .notion-page-content {
-  padding-left: var(--theme_dark--preview-padding) !important;
-  padding-right: var(--theme_dark--preview-padding) !important;
-  width: 100%;
-}
-
 .notion-dark-theme
   .notion-peek-renderer
   .notion-scroller.vertical
@@ -62,31 +39,17 @@
   height: var(--theme_dark--page_banner-height) !important;
 }
 
-/* prevent block hover options overlaying topbar */
-.notion-dark-theme .notion-topbar {
-  background: var(--theme_dark--main);
-}
-
 /** databases **/
 
 .notion-dark-theme [style*='background: rgb(63, 68, 71)'] {
   background: var(--theme_dark--card) !important;
 }
-.notion-dark-theme .notion-frame [style*='background: rgb(63, 68, 71)'] {
-  border: 0.5px solid var(--theme_dark--card-border);
-}
 .notion-dark-theme
   .notion-page-content
   .notion-page-block.notion-collection-item
   [style*='background: rgba(255, 255, 255, 0.05)'] {
   background: var(--theme_dark--gallery) !important;
 }
-.notion-dark-theme
-  .notion-page-content
-  .notion-page-block.notion-collection-item:hover
-  [style*='background: rgba(255, 255, 255, 0.05)'] {
-  background: var(--theme_dark--gallery_hover) !important;
-}
 
 .notion-dark-theme [style*='box-shadow: rgb(47, 52, 55) -3px 0px 0px'] {
   box-shadow: var(--theme_dark--main) -3px 0px 0px !important;
@@ -169,26 +132,6 @@
 .notion-dark-theme [style*='background: rgb(235, 87, 87)'] {
   background: var(--theme_dark--primary_indicator) !important;
 }
-.notion-dark-theme .notion-to_do-block .checkboxSquare {
-  background: var(--theme_dark--option-background) !important;
-}
-.notion-dark-theme .notion-to_do-block .checkboxSquare path {
-  fill: var(--theme_dark--option-color) !important;
-}
-.notion-dark-theme .notion-to_do-block:hover .checkboxSquare,
-.notion-dark-theme .notion-to_do-block:hover .check {
-  background: var(--theme_dark--option_hover-background) !important;
-}
-.notion-dark-theme .notion-to_do-block:hover .checkboxSquare path,
-.notion-dark-theme .notion-to_do-block:hover .check polygon {
-  fill: var(--theme_dark--option_hover-color) !important;
-}
-.notion-dark-theme .notion-to_do-block .check {
-  background: var(--theme_dark--option_active-background) !important;
-}
-.notion-dark-theme .notion-to_do-block .check polygon {
-  fill: var(--theme_dark--option_active-color) !important;
-}
 
 .notion-dark-theme
   [style*='color: rgb(235, 87, 87); border: 1px solid rgba(235, 87, 87, 0.5);'] {
@@ -196,49 +139,7 @@
   border: 1px solid var(--theme_dark--danger_border) !important;
 }
 
-/* fonts */
-
-.notion-dark-theme,
-.notion-dark-theme [style*='Segoe UI'] {
-  font-family: var(--theme_dark--font_sans) !important;
-}
-.notion-dark-theme [style*='Georgia'] {
-  font-family: var(--theme_dark--font_serif) !important;
-}
-.notion-dark-theme [style*='iawriter-mono'] {
-  font-family: var(--theme_dark--font_mono) !important;
-}
-.notion-dark-theme [style*='SFMono-Regular'] {
-  font-family: var(--theme_dark--font_code) !important;
-}
-
-.notion-dark-theme
-  .notion-frame
-  .notion-scroller.vertical.horizontal
-  .notion-page-content {
-  font-size: var(--theme_dark--font-body_size) !important;
-}
-.notion-dark-theme
-  .notion-frame
-  .notion-scroller.vertical.horizontal
-  [style*='font-size: 14px'] {
-  font-size: var(--theme_dark--font-label_size) !important;
-}
-.notion-dark-theme
-  .notion-frame
-  .notion-page-block
-  div[placeholder='Untitled'] {
-  font-size: var(--theme_dark--font-title_size) !important;
-}
-.notion-dark-theme [placeholder='Heading 1'] {
-  font-size: var(--theme_dark--font-heading1_size) !important;
-}
-.notion-dark-theme [placeholder='Heading 2'] {
-  font-size: var(--theme_dark--font-heading2_size) !important;
-}
-.notion-dark-theme [placeholder='Heading 3'] {
-  font-size: var(--theme_dark--font-heading3_size) !important;
-}
+/* content colours */
 
 .notion-dark-theme,
 .notion-dark-theme .notion-page-content [style*='color: inherit;'],
@@ -260,8 +161,6 @@
   fill: var(--theme_dark--text_ui) !important;
 }
 
-/* content colours */
-
 .notion-dark-theme [style*='color:rgba(151,154,155,0.95)'] {
   color: var(--theme_dark--text_gray) !important;
 }
@@ -359,55 +258,3 @@
   color: var(--theme_dark--code_inline-text) !important;
   background: var(--theme_dark--code_inline-background) !important;
 }
-
-.notion-dark-theme .notion-page-content .notion-code-block {
-  background: var(--theme_dark--code-background) !important;
-}
-.notion-dark-theme .notion-code-block > div {
-  color: var(--theme_dark--code_text) !important;
-}
-.notion-dark-theme .notion-code-block [placeholder=' '] {
-  font-size: var(--theme_dark--font-code_size) !important;
-}
-.notion-dark-theme .notion-code-block .token.function {
-  color: var(--theme_dark--code_function) !important;
-}
-.notion-dark-theme .notion-code-block .token.keyword {
-  color: var(--theme_dark--code_keyword) !important;
-}
-.notion-dark-theme .notion-code-block .token.tag {
-  color: var(--theme_dark--code_tag) !important;
-}
-.notion-dark-theme .notion-code-block .token.operator {
-  color: var(--theme_dark--code_operator) !important;
-}
-.notion-dark-theme .notion-code-block .token.important {
-  color: var(--theme_dark--code_important) !important;
-}
-.notion-dark-theme .notion-code-block .token.property {
-  color: var(--theme_dark--code_property) !important;
-}
-.notion-dark-theme .notion-code-block .token.builtin {
-  color: var(--theme_dark--code_builtin) !important;
-}
-.notion-dark-theme .notion-code-block .token.attr-name {
-  color: var(--theme_dark--code_attr-name) !important;
-}
-.notion-dark-theme .notion-code-block .token.attr-value {
-  color: var(--theme_dark--code_attr-value) !important;
-}
-.notion-dark-theme .notion-code-block .token.comment {
-  color: var(--theme_dark--code_comment) !important;
-}
-.notion-dark-theme .notion-code-block .token.punctuation {
-  color: var(--theme_dark--code_punctuation) !important;
-}
-.notion-dark-theme .notion-code-block .token.doctype {
-  color: var(--theme_dark--code_doctype) !important;
-}
-.notion-dark-theme .notion-code-block .token.number {
-  color: var(--theme_dark--code_number) !important;
-}
-.notion-dark-theme .notion-code-block .token.string {
-  color: var(--theme_dark--code_string) !important;
-}
diff --git a/mods/core/css/light.css b/mods/core/css/light.css
index f7d8788..0588137 100644
--- a/mods/core/css/light.css
+++ b/mods/core/css/light.css
@@ -25,25 +25,6 @@
   background: var(--theme_light--overlay) !important;
 }
 
-.notion-light-theme .notion-peek-renderer > div:nth-child(2) {
-  max-width: var(--theme_light--preview-width) !important;
-}
-.notion-light-theme
-  .notion-peek-renderer
-  .notion-scroller.vertical
-  > div:nth-child(1)
-  > div,
-.notion-light-theme
-  .notion-peek-renderer
-  .notion-scroller.vertical
-  > div:nth-child(2),
-.notion-light-theme .notion-peek-renderer .notion-page-view-discussion,
-.notion-light-theme .notion-peek-renderer .notion-page-content {
-  padding-left: var(--theme_light--preview-padding) !important;
-  padding-right: var(--theme_light--preview-padding) !important;
-  width: 100%;
-}
-
 .notion-light-theme
   .notion-peek-renderer
   .notion-scroller.vertical
@@ -63,31 +44,17 @@
   height: var(--theme_light--page_banner-height) !important;
 }
 
-/* prevent block hover options overlaying topbar */
-.notion-light-theme .notion-topbar {
-  background: var(--theme_light--main);
-}
-
 /** databases **/
 
 .notion-light-theme [style*='background: rgb(247, 246, 243)'] {
   background: var(--theme_light--card) !important;
 }
-.notion-light-theme .notion-frame [style*='background: rgb(247, 246, 243)'] {
-  border: 0.5px solid var(--theme_light--card-border);
-}
 .notion-light-theme
   .notion-page-content
   .notion-page-block.notion-collection-item
   [style*='background: rgba(55, 53, 47, 0.024)'] {
   background: var(--theme_light--gallery) !important;
 }
-.notion-light-theme
-  .notion-page-content
-  .notion-page-block.notion-collection-item:hover
-  [style*='background: rgba(55, 53, 47, 0.024)'] {
-  background: var(--theme_light--gallery_hover) !important;
-}
 
 .notion-light-theme [style*='box-shadow: white -3px 0px 0px'] {
   box-shadow: var(--theme_light--main) -3px 0px 0px !important;
@@ -173,20 +140,6 @@
 .notion-light-theme .notion-to_do-block .checkboxSquare path {
   fill: var(--theme_light--option-color) !important;
 }
-.notion-light-theme .notion-to_do-block:hover .checkboxSquare,
-.notion-light-theme .notion-to_do-block:hover .check {
-  background: var(--theme_light--option_hover-background) !important;
-}
-.notion-light-theme .notion-to_do-block:hover .checkboxSquare path,
-.notion-light-theme .notion-to_do-block:hover .check polygon {
-  fill: var(--theme_light--option_hover-color) !important;
-}
-.notion-light-theme .notion-to_do-block .check {
-  background: var(--theme_light--option_active-background) !important;
-}
-.notion-light-theme .notion-to_do-block .check polygon {
-  fill: var(--theme_light--option_active-color) !important;
-}
 
 .notion-light-theme
   [style*='color: rgb(235, 87, 87); border: 1px solid rgba(235, 87, 87, 0.5);'] {
@@ -194,49 +147,7 @@
   border: 1px solid var(--theme_light--danger_border) !important;
 }
 
-/* fonts */
-
-.notion-light-theme,
-.notion-light-theme [style*='Segoe UI'] {
-  font-family: var(--theme_light--font_sans) !important;
-}
-.notion-light-theme [style*='Georgia'] {
-  font-family: var(--theme_light--font_serif) !important;
-}
-.notion-light-theme [style*='iawriter-mono'] {
-  font-family: var(--theme_light--font_mono) !important;
-}
-.notion-light-theme [style*='SFMono-Regular'] {
-  font-family: var(--theme_light--font_code) !important;
-}
-
-.notion-light-theme
-  .notion-frame
-  .notion-scroller.vertical.horizontal
-  .notion-page-content {
-  font-size: var(--theme_light--font-body_size) !important;
-}
-.notion-light-theme
-  .notion-frame
-  .notion-scroller.vertical.horizontal
-  [style*='font-size: 14px'] {
-  font-size: var(--theme_light--font-label_size) !important;
-}
-.notion-light-theme
-  .notion-frame
-  .notion-page-block
-  div[placeholder='Untitled'] {
-  font-size: var(--theme_light--font-title_size) !important;
-}
-.notion-light-theme [placeholder='Heading 1'] {
-  font-size: var(--theme_light--font-heading1_size) !important;
-}
-.notion-light-theme [placeholder='Heading 2'] {
-  font-size: var(--theme_light--font-heading2_size) !important;
-}
-.notion-light-theme [placeholder='Heading 3'] {
-  font-size: var(--theme_light--font-heading3_size) !important;
-}
+/* content colours */
 
 .notion-light-theme,
 .notion-light-theme .notion-page-content [style*='color: inherit;'],
@@ -258,8 +169,6 @@
   fill: var(--theme_light--text) !important;
 }
 
-/* content colours */
-
 .notion-light-theme [style*='color:rgb(155,154,151)'] {
   color: var(--theme_light--text_gray) !important;
 }
@@ -357,55 +266,3 @@
   color: var(--theme_light--code_inline-text) !important;
   background: var(--theme_light--code_inline-background) !important;
 }
-
-.notion-light-theme .notion-page-content .notion-code-block {
-  background: var(--theme_light--code-background) !important;
-}
-.notion-light-theme .notion-code-block > div {
-  color: var(--theme_light--code_text) !important;
-}
-.notion-light-theme .notion-code-block [placeholder=' '] {
-  font-size: var(--theme_light--font-code_size) !important;
-}
-.notion-light-theme .notion-code-block .token.function {
-  color: var(--theme_light--code_function) !important;
-}
-.notion-light-theme .notion-code-block .token.keyword {
-  color: var(--theme_light--code_keyword) !important;
-}
-.notion-light-theme .notion-code-block .token.tag {
-  color: var(--theme_light--code_tag) !important;
-}
-.notion-light-theme .notion-code-block .token.operator {
-  color: var(--theme_light--code_operator) !important;
-}
-.notion-light-theme .notion-code-block .token.important {
-  color: var(--theme_light--code_important) !important;
-}
-.notion-light-theme .notion-code-block .token.property {
-  color: var(--theme_light--code_property) !important;
-}
-.notion-light-theme .notion-code-block .token.builtin {
-  color: var(--theme_light--code_builtin) !important;
-}
-.notion-light-theme .notion-code-block .token.attr-name {
-  color: var(--theme_light--code_attr-name) !important;
-}
-.notion-light-theme .notion-code-block .token.attr-value {
-  color: var(--theme_light--code_attr-value) !important;
-}
-.notion-light-theme .notion-code-block .token.comment {
-  color: var(--theme_light--code_comment) !important;
-}
-.notion-light-theme .notion-code-block .token.punctuation {
-  color: var(--theme_light--code_punctuation) !important;
-}
-.notion-light-theme .notion-code-block .token.doctype {
-  color: var(--theme_light--code_doctype) !important;
-}
-.notion-light-theme .notion-code-block .token.number {
-  color: var(--theme_light--code_number) !important;
-}
-.notion-light-theme .notion-code-block .token.string {
-  color: var(--theme_light--code_string) !important;
-}
diff --git a/mods/core/css/localised.css b/mods/core/css/localised.css
index 77b7878..16709b9 100644
--- a/mods/core/css/localised.css
+++ b/mods/core/css/localised.css
@@ -7,204 +7,197 @@
 @import './variables.css';
 
 .notion-dark-theme {
-  --theme_local--main: var(--theme_dark--main);
-  --theme_local--sidebar: var(--theme_dark--sidebar);
-  --theme_local--overlay: var(--theme_dark--overlay);
-  --theme_local--dragarea: var(--theme_dark--dragarea);
-  --theme_local--preview-width: var(--theme_dark--preview-width);
-  --theme_local--preview_banner-height: var(
-    --theme_dark--preview_banner-height
-  );
-  --theme_local--page_banner-height: var(--theme_dark--page_banner-height);
-
-  --theme_local--font_sans: var(--theme_dark--font_sans);
-  --theme_local--font_serif: var(--theme_dark--font_serif);
-  --theme_local--font_mono: var(--theme_dark--font_mono);
-  --theme_local--font_code: var(--theme_dark--font_code);
-
-  --theme_local--scrollbar: var(--theme_dark--scrollbar);
-  --theme_local--scrollbar-border: var(--theme_dark--scrollbar-border);
-  --theme_local--scrollbar_hover: var(--theme_dark--scrollbar_hover);
-
-  --theme_local--card: var(--theme_dark--card);
-  --theme_local--card-border: var(--theme_dark--card-border);
-  --theme_local--table-border: var(--theme_dark--table-border);
-  --theme_local--interactive_hover: var(--theme_dark--interactive_hover);
-  --theme_local--interactive_hover-border: var(
+  --theme--main: var(--theme_dark--main);
+  --theme--sidebar: var(--theme_dark--sidebar);
+  --theme--overlay: var(--theme_dark--overlay);
+  --theme--dragarea: var(--theme_dark--dragarea);
+  --theme--preview-width: var(--theme_dark--preview-width);
+  --theme--preview-padding: var(--theme_dark--preview-padding);
+  --theme--preview_banner-height: var(--theme_dark--preview_banner-height);
+  --theme--page_banner-height: var(--theme_dark--page_banner-height);
+  --theme--font_sans: var(--theme_dark--font_sans);
+  --theme--font_serif: var(--theme_dark--font_serif);
+  --theme--font_mono: var(--theme_dark--font_mono);
+  --theme--font_code: var(--theme_dark--font_code);
+  --theme--font_title-size: var(--theme_dark--font_title-size);
+  --theme--font_heading1-size: var(--theme_dark--font_heading1-size);
+  --theme--font_heading2-size: var(--theme_dark--font_heading2-size);
+  --theme--font_heading3-size: var(--theme_dark--font_heading3-size);
+  --theme--font_label-size: var(--theme_dark--font_label-size);
+  --theme--font_body-size: var(--theme_dark--font_body-size);
+  --theme--font_code-size: var(--theme_dark--font_code-size);
+  --theme--font_sidebar-size: var(--theme_dark--font_sidebar-size);
+  --theme--scrollbar: var(--theme_dark--scrollbar);
+  --theme--scrollbar-border: var(--theme_dark--scrollbar-border);
+  --theme--scrollbar_hover: var(--theme_dark--scrollbar_hover);
+  --theme--card: var(--theme_dark--card);
+  --theme--gallery: var(--theme_dark--gallery);
+  --theme--table-border: var(--theme_dark--table-border);
+  --theme--interactive_hover: var(--theme_dark--interactive_hover);
+  --theme--interactive_hover-border: var(
     --theme_dark--interactive_hover-border
   );
-  --theme_local--button_close: var(--theme_dark--button_close);
-  --theme_local--button_close-fill: var(--theme_dark--button_close-fill);
-
-  --theme_local--selected: var(--theme_dark--selected);
-  --theme_local--primary: var(--theme_dark--primary);
-  --theme_local--primary_hover: var(--theme_dark--primary_hover);
-  --theme_local--primary_click: var(--theme_dark--primary_click);
-  --theme_local--primary_indicator: var(--theme_dark--primary_indicator);
-
-  --theme_local--option_empty-border: var(--theme_dark--option_empty-border);
-  --theme_local--option_active: var(--theme_dark--option_active);
-  --theme_local--option_active-color: var(--theme_dark--option_active-color);
-  --theme_local--option_active-background: var(
+  --theme--button_close: var(--theme_dark--button_close);
+  --theme--button_close-fill: var(--theme_dark--button_close-fill);
+  --theme--selected: var(--theme_dark--selected);
+  --theme--primary: var(--theme_dark--primary);
+  --theme--primary_hover: var(--theme_dark--primary_hover);
+  --theme--primary_click: var(--theme_dark--primary_click);
+  --theme--primary_indicator: var(--theme_dark--primary_indicator);
+  --theme--option-color: var(--theme_dark--option-color);
+  --theme--option-background: var(--theme_dark--option-background);
+  --theme--option_active-color: var(--theme_dark--option_active-color);
+  --theme--option_active-background: var(
     --theme_dark--option_active-background
   );
-  --theme_local--option_hover-background: var(
-    --theme_dark--option_hover-background
-  );
-
-  --theme_local--danger_text: var(--theme_dark--danger_text);
-  --theme_local--danger_border: var(--theme_dark--danger_border);
-
-  --theme_local--text: var(--theme_dark--text);
-  --theme_local--text_ui: var(--theme_dark--text_ui);
-  --theme_local--text_ui_info: var(--theme_dark--text_ui_info);
-
-  --theme_local--text_gray: var(--theme_dark--text_gray);
-  --theme_local--text_brown: var(--theme_dark--text_brown);
-  --theme_local--text_orange: var(--theme_dark--text_orange);
-  --theme_local--text_yellow: var(--theme_dark--text_yellow);
-  --theme_local--text_green: var(--theme_dark--text_green);
-  --theme_local--text_blue: var(--theme_dark--text_blue);
-  --theme_local--text_purple: var(--theme_dark--text_purple);
-  --theme_local--text_pink: var(--theme_dark--text_pink);
-  --theme_local--text_red: var(--theme_dark--text_red);
-  --theme_local--bg_gray: var(--theme_dark--bg_gray);
-  --theme_local--bg_brown: var(--theme_dark--bg_brown);
-  --theme_local--bg_orange: var(--theme_dark--bg_orange);
-  --theme_local--bg_yellow: var(--theme_dark--bg_yellow);
-  --theme_local--bg_green: var(--theme_dark--bg_green);
-  --theme_local--bg_blue: var(--theme_dark--bg_blue);
-  --theme_local--bg_purple: var(--theme_dark--bg_purple);
-  --theme_local--bg_pink: var(--theme_dark--bg_pink);
-  --theme_local--bg_red: var(--theme_dark--bg_red);
-  --theme_local--line_gray: var(--theme_dark--line_gray);
-  --theme_local--line_brown: var(--theme_dark--line_brown);
-  --theme_local--line_orange: var(--theme_dark--line_orange);
-  --theme_local--line_yellow: var(--theme_dark--line_yellow);
-  --theme_local--line_green: var(--theme_dark--line_green);
-  --theme_local--line_blue: var(--theme_dark--line_blue);
-  --theme_local--line_purple: var(--theme_dark--line_purple);
-  --theme_local--line_pink: var(--theme_dark--line_pink);
-  --theme_local--line_red: var(--theme_dark--line_red);
-
-  --theme_local--code_inline-text: var(--theme_dark--code_inline-text);
-  --theme_local--code_inline-background: var(
-    --theme_dark--code_inline-background
-  );
-  --theme_local--code_text: var(--theme_dark--code_text);
-  --theme_local--code-background: var(--theme_dark--code-background);
-  --theme_local--code_function: var(--theme_dark--code_function);
-  --theme_local--code_keyword: var(--theme_dark--code_keyword);
-  --theme_local--code_tag: var(--theme_dark--code_tag);
-  --theme_local--code_operator: var(--theme_dark--code_operator);
-  --theme_local--code_property: var(--theme_dark--code_property);
-  --theme_local--code_builtin: var(--theme_dark--code_builtin);
-  --theme_local--code_attr-name: var(--theme_dark--code_attr-name);
-  --theme_local--code_comment: var(--theme_dark--code_comment);
-  --theme_local--code_punctuation: var(--theme_dark--code_punctuation);
-  --theme_local--code_doctype: var(--theme_dark--code_doctype);
-  --theme_local--code_number: var(--theme_dark--code_number);
-  --theme_local--code_string: var(--theme_dark--code_string);
-  --theme_local--code_attr-value: var(--theme_dark--code_attr-value);
+  --theme--option_hover-color: var(--theme_dark--option_hover-color);
+  --theme--option_hover-background: var(--theme_dark--option_hover-background);
+  --theme--danger_text: var(--theme_dark--danger_text);
+  --theme--danger_border: var(--theme_dark--danger_border);
+  --theme--text: var(--theme_dark--text);
+  --theme--text_ui: var(--theme_dark--text_ui);
+  --theme--text_ui_info: var(--theme_dark--text_ui_info);
+  --theme--text_gray: var(--theme_dark--text_gray);
+  --theme--text_brown: var(--theme_dark--text_brown);
+  --theme--text_orange: var(--theme_dark--text_orange);
+  --theme--text_yellow: var(--theme_dark--text_yellow);
+  --theme--text_green: var(--theme_dark--text_green);
+  --theme--text_blue: var(--theme_dark--text_blue);
+  --theme--text_purple: var(--theme_dark--text_purple);
+  --theme--text_pink: var(--theme_dark--text_pink);
+  --theme--text_red: var(--theme_dark--text_red);
+  --theme--bg_gray: var(--theme_dark--bg_gray);
+  --theme--bg_brown: var(--theme_dark--bg_brown);
+  --theme--bg_orange: var(--theme_dark--bg_orange);
+  --theme--bg_yellow: var(--theme_dark--bg_yellow);
+  --theme--bg_green: var(--theme_dark--bg_green);
+  --theme--bg_blue: var(--theme_dark--bg_blue);
+  --theme--bg_purple: var(--theme_dark--bg_purple);
+  --theme--bg_pink: var(--theme_dark--bg_pink);
+  --theme--bg_red: var(--theme_dark--bg_red);
+  --theme--line_gray: var(--theme_dark--line_gray);
+  --theme--line_brown: var(--theme_dark--line_brown);
+  --theme--line_orange: var(--theme_dark--line_orange);
+  --theme--line_yellow: var(--theme_dark--line_yellow);
+  --theme--line_green: var(--theme_dark--line_green);
+  --theme--line_blue: var(--theme_dark--line_blue);
+  --theme--line_purple: var(--theme_dark--line_purple);
+  --theme--line_pink: var(--theme_dark--line_pink);
+  --theme--line_red: var(--theme_dark--line_red);
+  --theme--code_inline-text: var(--theme_dark--code_inline-text);
+  --theme--code_inline-background: var(--theme_dark--code_inline-background);
+  --theme--code_text: var(--theme_dark--code_text);
+  --theme--code-background: var(--theme_dark--code-background);
+  --theme--code_function: var(--theme_dark--code_function);
+  --theme--code_keyword: var(--theme_dark--code_keyword);
+  --theme--code_tag: var(--theme_dark--code_tag);
+  --theme--code_operator: var(--theme_dark--code_operator);
+  --theme--code_important: var(--theme_dark--code_important);
+  --theme--code_property: var(--theme_dark--code_property);
+  --theme--code_builtin: var(--theme_dark--code_builtin);
+  --theme--code_attr-name: var(--theme_dark--code_attr-name);
+  --theme--code_comment: var(--theme_dark--code_comment);
+  --theme--code_punctuation: var(--theme_dark--code_punctuation);
+  --theme--code_doctype: var(--theme_dark--code_doctype);
+  --theme--code_number: var(--theme_dark--code_number);
+  --theme--code_string: var(--theme_dark--code_string);
+  --theme--code_attr-value: var(--theme_dark--code_attr-value);
 }
+
 .notion-light-theme {
-  --theme_local--main: var(--theme_light--main);
-  --theme_local--sidebar: var(--theme_light--sidebar);
-  --theme_local--overlay: var(--theme_light--overlay);
-  --theme_local--dragarea: var(--theme_light--dragarea);
-  --theme_local--preview-width: var(--theme_light--preview-width);
-  --theme_local--preview_banner-height: var(
-    --theme_light--preview_banner-height
-  );
-  --theme_local--page_banner-height: var(--theme_light--page_banner-height);
-
-  --theme_local--font_sans: var(--theme_light--font_sans);
-  --theme_local--font_serif: var(--theme_light--font_serif);
-  --theme_local--font_mono: var(--theme_light--font_mono);
-  --theme_local--font_code: var(--theme_light--font_code);
-
-  --theme_local--scrollbar: var(--theme_light--scrollbar);
-  --theme_local--scrollbar-border: var(--theme_light--scrollbar-border);
-  --theme_local--scrollbar_hover: var(--theme_light--scrollbar_hover);
-
-  --theme_local--card: var(--theme_light--card);
-  --theme_local--card-border: var(--theme_light--card-border);
-  --theme_local--table-border: var(--theme_light--table-border);
-  --theme_local--interactive_hover: var(--theme_light--interactive_hover);
-  --theme_local--interactive_hover-border: var(
+  --theme--main: var(--theme_light--main);
+  --theme--sidebar: var(--theme_light--sidebar);
+  --theme--overlay: var(--theme_light--overlay);
+  --theme--dragarea: var(--theme_light--dragarea);
+  --theme--preview-width: var(--theme_light--preview-width);
+  --theme--preview-padding: var(--theme_light--preview-padding);
+  --theme--preview_banner-height: var(--theme_light--preview_banner-height);
+  --theme--page_banner-height: var(--theme_light--page_banner-height);
+  --theme--font_sans: var(--theme_light--font_sans);
+  --theme--font_serif: var(--theme_light--font_serif);
+  --theme--font_mono: var(--theme_light--font_mono);
+  --theme--font_code: var(--theme_light--font_code);
+  --theme--font_title-size: var(--theme_light--font_title-size);
+  --theme--font_heading1-size: var(--theme_light--font_heading1-size);
+  --theme--font_heading2-size: var(--theme_light--font_heading2-size);
+  --theme--font_heading3-size: var(--theme_light--font_heading3-size);
+  --theme--font_label-size: var(--theme_light--font_label-size);
+  --theme--font_body-size: var(--theme_light--font_body-size);
+  --theme--font_code-size: var(--theme_light--font_code-size);
+  --theme--font_sidebar-size: var(--theme_light--font_sidebar-size);
+  --theme--scrollbar: var(--theme_light--scrollbar);
+  --theme--scrollbar-border: var(--theme_light--scrollbar-border);
+  --theme--scrollbar_hover: var(--theme_light--scrollbar_hover);
+  --theme--card: var(--theme_light--card);
+  --theme--gallery: var(--theme_light--gallery);
+  --theme--table-border: var(--theme_light--table-border);
+  --theme--interactive_hover: var(--theme_light--interactive_hover);
+  --theme--interactive_hover-border: var(
     --theme_light--interactive_hover-border
   );
-  --theme_local--button_close: var(--theme_light--button_close);
-  --theme_local--button_close-fill: var(--theme_light--button_close-fill);
-
-  --theme_local--selected: var(--theme_light--selected);
-  --theme_local--primary: var(--theme_light--primary);
-  --theme_local--primary_hover: var(--theme_light--primary_hover);
-  --theme_local--primary_click: var(--theme_light--primary_click);
-  --theme_local--primary_indicator: var(--theme_light--primary_indicator);
-
-  --theme_local--option_empty-border: var(--theme_light--option_empty-border);
-  --theme_local--option_active: var(--theme_light--option_active);
-  --theme_local--option_active-color: var(--theme_light--option_active-color);
-  --theme_local--option_active-background: var(
+  --theme--button_close: var(--theme_light--button_close);
+  --theme--button_close-fill: var(--theme_light--button_close-fill);
+  --theme--selected: var(--theme_light--selected);
+  --theme--primary: var(--theme_light--primary);
+  --theme--primary_hover: var(--theme_light--primary_hover);
+  --theme--primary_click: var(--theme_light--primary_click);
+  --theme--primary_indicator: var(--theme_light--primary_indicator);
+  --theme--option-color: var(--theme_light--option-color);
+  --theme--option-background: var(--theme_light--option-background);
+  --theme--option_hover-color: var(--theme_light--option_hover-color);
+  --theme--option_hover-background: var(--theme_light--option_hover-background);
+  --theme--option_active-color: var(--theme_light--option_active-color);
+  --theme--option_active-background: var(
     --theme_light--option_active-background
   );
-  --theme_local--option_hover-background: var(
-    --theme_light--option_hover-background
-  );
-
-  --theme_local--danger_text: var(--theme_light--danger_text);
-  --theme_local--danger_border: var(--theme_light--danger_border);
-
-  --theme_local--text: var(--theme_light--text);
-  --theme_local--text_ui: var(--theme_light--text_ui);
-  --theme_local--text_ui_info: var(--theme_light--text_ui_info);
-
-  --theme_local--text_gray: var(--theme_light--text_gray);
-  --theme_local--text_brown: var(--theme_light--text_brown);
-  --theme_local--text_orange: var(--theme_light--text_orange);
-  --theme_local--text_yellow: var(--theme_light--text_yellow);
-  --theme_local--text_green: var(--theme_light--text_green);
-  --theme_local--text_blue: var(--theme_light--text_blue);
-  --theme_local--text_purple: var(--theme_light--text_purple);
-  --theme_local--text_pink: var(--theme_light--text_pink);
-  --theme_local--text_red: var(--theme_light--text_red);
-  --theme_local--bg_gray: var(--theme_light--bg_gray);
-  --theme_local--bg_brown: var(--theme_light--bg_brown);
-  --theme_local--bg_orange: var(--theme_light--bg_orange);
-  --theme_local--bg_yellow: var(--theme_light--bg_yellow);
-  --theme_local--bg_green: var(--theme_light--bg_green);
-  --theme_local--bg_blue: var(--theme_light--bg_blue);
-  --theme_local--bg_purple: var(--theme_light--bg_purple);
-  --theme_local--bg_pink: var(--theme_light--bg_pink);
-  --theme_local--bg_red: var(--theme_light--bg_red);
-  --theme_local--line_gray: var(--theme_light--line_gray);
-  --theme_local--line_brown: var(--theme_light--line_brown);
-  --theme_local--line_orange: var(--theme_light--line_orange);
-  --theme_local--line_yellow: var(--theme_light--line_yellow);
-  --theme_local--line_green: var(--theme_light--line_green);
-  --theme_local--line_blue: var(--theme_light--line_blue);
-  --theme_local--line_purple: var(--theme_light--line_purple);
-  --theme_local--line_pink: var(--theme_light--line_pink);
-  --theme_local--line_red: var(--theme_light--line_red);
-
-  --theme_local--code_inline-text: var(--theme_light--code_inline-text);
-  --theme_local--code_inline-background: var(
-    --theme_light--code_inline-background
-  );
-  --theme_local--code_text: var(--theme_light--code_text);
-  --theme_local--code-background: var(--theme_light--code-background);
-  --theme_local--code_function: var(--theme_light--code_function);
-  --theme_local--code_keyword: var(--theme_light--code_keyword);
-  --theme_local--code_tag: var(--theme_light--code_tag);
-  --theme_local--code_operator: var(--theme_light--code_operator);
-  --theme_local--code_property: var(--theme_light--code_property);
-  --theme_local--code_builtin: var(--theme_light--code_builtin);
-  --theme_local--code_attr-name: var(--theme_light--code_attr-name);
-  --theme_local--code_comment: var(--theme_light--code_comment);
-  --theme_local--code_punctuation: var(--theme_light--code_punctuation);
-  --theme_local--code_doctype: var(--theme_light--code_doctype);
-  --theme_local--code_number: var(--theme_light--code_number);
-  --theme_local--code_string: var(--theme_light--code_string);
-  --theme_local--code_attr-value: var(--theme_light--code_attr-value);
+  --theme--danger_text: var(--theme_light--danger_text);
+  --theme--danger_border: var(--theme_light--danger_border);
+  --theme--text: var(--theme_light--text);
+  --theme--text_ui: var(--theme_light--text_ui);
+  --theme--text_ui_info: var(--theme_light--text_ui_info);
+  --theme--text_gray: var(--theme_light--text_gray);
+  --theme--text_brown: var(--theme_light--text_brown);
+  --theme--text_orange: var(--theme_light--text_orange);
+  --theme--text_yellow: var(--theme_light--text_yellow);
+  --theme--text_green: var(--theme_light--text_green);
+  --theme--text_blue: var(--theme_light--text_blue);
+  --theme--text_purple: var(--theme_light--text_purple);
+  --theme--text_pink: var(--theme_light--text_pink);
+  --theme--text_red: var(--theme_light--text_red);
+  --theme--bg_gray: var(--theme_light--bg_gray);
+  --theme--bg_brown: var(--theme_light--bg_brown);
+  --theme--bg_orange: var(--theme_light--bg_orange);
+  --theme--bg_yellow: var(--theme_light--bg_yellow);
+  --theme--bg_green: var(--theme_light--bg_green);
+  --theme--bg_blue: var(--theme_light--bg_blue);
+  --theme--bg_purple: var(--theme_light--bg_purple);
+  --theme--bg_pink: var(--theme_light--bg_pink);
+  --theme--bg_red: var(--theme_light--bg_red);
+  --theme--line_gray: var(--theme_light--line_gray);
+  --theme--line_brown: var(--theme_light--line_brown);
+  --theme--line_orange: var(--theme_light--line_orange);
+  --theme--line_yellow: var(--theme_light--line_yellow);
+  --theme--line_green: var(--theme_light--line_green);
+  --theme--line_blue: var(--theme_light--line_blue);
+  --theme--line_purple: var(--theme_light--line_purple);
+  --theme--line_pink: var(--theme_light--line_pink);
+  --theme--line_red: var(--theme_light--line_red);
+  --theme--code_inline-text: var(--theme_light--code_inline-text);
+  --theme--code_inline-background: var(--theme_light--code_inline-background);
+  --theme--code_text: var(--theme_light--code_text);
+  --theme--code-background: var(--theme_light--code-background);
+  --theme--code_function: var(--theme_light--code_function);
+  --theme--code_keyword: var(--theme_light--code_keyword);
+  --theme--code_tag: var(--theme_light--code_tag);
+  --theme--code_operator: var(--theme_light--code_operator);
+  --theme--code_important: var(--theme_light--code_important);
+  --theme--code_property: var(--theme_light--code_property);
+  --theme--code_builtin: var(--theme_light--code_builtin);
+  --theme--code_attr-name: var(--theme_light--code_attr-name);
+  --theme--code_comment: var(--theme_light--code_comment);
+  --theme--code_punctuation: var(--theme_light--code_punctuation);
+  --theme--code_doctype: var(--theme_light--code_doctype);
+  --theme--code_number: var(--theme_light--code_number);
+  --theme--code_string: var(--theme_light--code_string);
+  --theme--code_attr-value: var(--theme_light--code_attr-value);
 }
diff --git a/mods/core/css/menu.css b/mods/core/css/menu.css
index e888126..1df52d9 100644
--- a/mods/core/css/menu.css
+++ b/mods/core/css/menu.css
@@ -22,8 +22,8 @@
   word-break: break-word;
   text-decoration: none;
   text-size-adjust: 100%;
-  font-family: var(--theme_local--font_sans);
-  outline-color: var(--theme_local--card-border);
+  font-family: var(--theme--font_sans);
+  outline-color: var(--theme--table-border);
 }
 html,
 body {
@@ -32,8 +32,8 @@ body {
   margin: 0;
   padding: 0;
   overflow: hidden;
-  background: var(--theme_local--main);
-  color: var(--theme_local--text);
+  background: var(--theme--main);
+  color: var(--theme--text);
 }
 
 body:not([style]) > * {
@@ -67,13 +67,13 @@ main section {
 code {
   border-radius: 0.1em;
   padding: 0.2em 0.4em;
-  font: 0.85em var(--theme_local--font_code);
-  /* color: var(--theme_local--code_inline-text); */
-  background: var(--theme_local--code_inline-background);
+  font: 0.85em var(--theme--font_code);
+  /* color: var(--theme--code_inline-text); */
+  background: var(--theme--code_inline-background);
 }
 
 button {
-  color: var(--theme_local--text);
+  color: var(--theme--text);
 }
 
 u {
@@ -107,7 +107,7 @@ s {
   margin-left: auto;
 }
 #menu-titlebar {
-  background: var(--theme_local--dragarea);
+  background: var(--theme--dragarea);
 }
 
 /* alerts */
@@ -115,7 +115,7 @@ s {
 #alerts [role='alert'] {
   display: flex;
   padding: 0.75em;
-  /* border: 1px solid var(--theme_local--text_ui_info); */
+  /* border: 1px solid var(--theme--text_ui_info); */
 }
 #alerts [role='alert']::before {
   content: '!';
@@ -124,30 +124,30 @@ s {
   font-weight: bold;
   font-size: 1.2em;
   padding-right: 0.5rem;
-  color: var(--theme_local--text_ui_info);
+  color: var(--theme--text_ui_info);
 }
 #alerts [role='alert'] p {
   font-size: 1rem;
   margin: auto 0;
   padding-left: 0.5em;
-  color: var(--theme_local--text_ui);
+  color: var(--theme--text_ui);
 }
 
 #alerts .error {
-  background: var(--theme_local--bg_red);
+  background: var(--theme--bg_red);
 }
 #alerts .warning {
-  background: var(--theme_local--bg_yellow);
+  background: var(--theme--bg_yellow);
 }
 #alerts .info {
-  background: var(--theme_local--bg_blue);
+  background: var(--theme--bg_blue);
 }
 
 #alerts .success::before {
   content: '✓';
 }
 #alerts .success {
-  background: var(--theme_local--bg_green);
+  background: var(--theme--bg_green);
 }
 
 /* search */
@@ -165,26 +165,26 @@ s {
   left: 1em;
 }
 #search > svg path {
-  fill: var(--theme_local--text_ui_info);
+  fill: var(--theme--text_ui_info);
 }
 #search > input {
   width: 100%;
   padding: 1em 1.4em 1em 2.8em;
   font: 1em var(--font);
-  background: var(--theme_local--card);
-  border: 1px solid var(--theme_local--table-border);
-  color: var(--theme_local--text);
+  background: var(--theme--card);
+  border: 1px solid var(--theme--table-border);
+  color: var(--theme--text);
   border-radius: 2px;
 }
 #search > input::placeholder {
   font-weight: bold;
-  color: var(--theme_local--text_ui_info);
+  color: var(--theme--text_ui_info);
 }
 #search > input:focus {
-  box-shadow: var(--theme_local--table-border) 0.04em 0.04em,
-    var(--theme_local--table-border) -0.04em -0.04em,
-    var(--theme_local--table-border) -0.04em 0.04em,
-    var(--theme_local--table-border) 0.04em -0.04em;
+  box-shadow: var(--theme--table-border) 0.04em 0.04em,
+    var(--theme--table-border) -0.04em -0.04em,
+    var(--theme--table-border) -0.04em 0.04em,
+    var(--theme--table-border) 0.04em -0.04em;
   outline: none;
 }
 
@@ -194,8 +194,8 @@ s {
   font-size: 0.8em;
   padding: 0.2em 0.5em;
   margin-top: 0.5em;
-  background: var(--theme_local--option-background);
-  color: var(--theme_local--option-color);
+  background: var(--theme--option-background);
+  color: var(--theme--option-color);
   border-radius: 2px;
   transition: color 200ms, background 200ms;
   user-select: none;
@@ -204,25 +204,25 @@ s {
   margin-right: 0.5em;
 }
 #search #tags > span:hover {
-  background: var(--theme_local--option_hover-background);
-  color: var(--theme_local--option_hover-color);
+  background: var(--theme--option_hover-background);
+  color: var(--theme--option_hover-color);
 }
 #search #tags > .selected {
-  background: var(--tag_color, var(--theme_local--option_active-background));
-  color: var(--theme_local--option_active-color);
+  background: var(--tag_color, var(--theme--option_active-background));
+  color: var(--theme--option_active-color);
 }
 
 /* module meta */
 
 #modules section {
-  background: var(--theme_local--sidebar);
-  border: 1px solid var(--theme_local--table-border);
+  background: var(--theme--sidebar);
+  border: 1px solid var(--theme--table-border);
 }
 #modules section > div {
   padding: 0.75em;
 }
 .notion-light-theme #modules section {
-  background: var(--theme_local--main);
+  background: var(--theme--main);
 }
 
 #modules section h3,
@@ -234,15 +234,15 @@ s {
 /* #modules section .meta .toggle input + label .switch::before {
   background: linear-gradient(
     90deg,
-    var(--theme_local--text_green),
-    var(--theme_local--bg_green)
+    var(--theme--text_green),
+    var(--theme--bg_green)
   );
 }
 #modules section .meta .toggle input + label .switch {
   background: linear-gradient(
     90deg,
-    var(--theme_local--text_red),
-    var(--theme_local--bg_red)
+    var(--theme--text_red),
+    var(--theme--bg_red)
   );
 } */
 
@@ -256,7 +256,7 @@ s {
 }
 #modules section .desc blockquote {
   margin: 0.3em 0;
-  border-left: 0.3em solid var(--theme_local--table-border);
+  border-left: 0.3em solid var(--theme--table-border);
   padding-left: 0.7em;
 }
 
@@ -291,7 +291,7 @@ s {
 #modules section .tags,
 #modules section .version {
   font-size: 0.85em;
-  color: var(--theme_local--text_ui);
+  color: var(--theme--text_ui);
 }
 
 /* module options */
@@ -300,15 +300,15 @@ s {
   display: none;
 }
 #modules section .options {
-  border-top: 1px solid var(--theme_local--table-border);
-  background: var(--theme_local--card);
+  border-top: 1px solid var(--theme--table-border);
+  background: var(--theme--card);
 }
 #modules section .options p {
   font-size: 0.9em;
 }
 #modules section .options p:not(:last-child) {
   padding-bottom: 0.5em;
-  border-bottom: 0.5px solid var(--theme_local--table-border);
+  border-bottom: 0.5px solid var(--theme--table-border);
   margin-bottom: 0.5em;
 }
 
@@ -327,15 +327,15 @@ s {
   font-size: 0.9rem;
   padding: 0.4rem 0.2rem;
   border: none;
-  color: var(--theme_local--text);
-  background: var(--theme_local--main);
+  color: var(--theme--text);
+  background: var(--theme--main);
 }
 .select select:focus,
 .input input[type='text']:focus,
 .input input[type='number']:focus,
 .file input[type='file']:focus + label .choose,
 .file input[type='file'] + label .choose:hover {
-  outline: var(--theme_local--table-border) solid 2px;
+  outline: var(--theme--table-border) solid 2px;
 }
 .file input[type='file'],
 .toggle input[type='checkbox'] {
@@ -365,7 +365,7 @@ s {
   right: 0;
   width: 1em;
   height: 0.1em;
-  border: 0.35em solid var(--theme_local--card);
+  border: 0.35em solid var(--theme--card);
   background: currentColor;
 }
 .file input[type='file'] + label .choose {
@@ -391,7 +391,7 @@ s {
   float: right;
   height: 0.65em;
   width: 2em;
-  background: var(--theme_local--main);
+  background: var(--theme--main);
   border-radius: 5px;
   transition: background 300ms;
 }
@@ -405,8 +405,8 @@ s {
   border-radius: inherit;
   background: linear-gradient(
     90deg,
-    var(--theme_local--primary),
-    var(--theme_local--primary_click)
+    var(--theme--primary),
+    var(--theme--primary_click)
   );
   opacity: var(--menu--toggle_opacity, 0);
   transition: opacity 300ms;
@@ -419,15 +419,15 @@ s {
   border-radius: 50%;
   transform: translateX(var(--menu--toggle_offset, 0));
   transition: transform 350ms, box-shadow 350ms;
-  background: var(--theme_local--option_active-color);
-  box-shadow: 2px 1px 4px var(--theme_local--table-border);
+  background: var(--theme--option_active-color);
+  box-shadow: 2px 1px 4px var(--theme--table-border);
 }
 .toggle input[type='checkbox']:checked:focus + label .switch {
   background: none !important;
 }
 .toggle input[type='checkbox']:focus + label .switch::before,
 .toggle input[type='checkbox']:focus + label .switch .dot {
-  border: 1px solid var(--theme_local--card-border);
+  border: 1px solid var(--theme--table-border);
 }
 .toggle input[type='checkbox']:checked + label {
   --menu--toggle_offset: 1em;
diff --git a/mods/core/css/shared.css b/mods/core/css/shared.css
index 19011ab..2d0ab61 100644
--- a/mods/core/css/shared.css
+++ b/mods/core/css/shared.css
@@ -7,6 +7,8 @@
  * under the MIT license
  */
 
+@import './localised.css';
+
 /* prevent block hover options overlaying topbar */
 *:not([style*='z-index']) {
   z-index: 1;
@@ -89,3 +91,128 @@
   padding-left: 15px !important;
   padding-right: 15px !important;
 }
+
+/* page preview sizing */
+.notion-peek-renderer > div:nth-child(2) {
+  max-width: var(--theme--preview-width) !important;
+}
+
+.notion-peek-renderer .notion-scroller.vertical > div:nth-child(1) > div,
+.notion-peek-renderer .notion-scroller.vertical > div:nth-child(2),
+.notion-peek-renderer .notion-page-view-discussion,
+.notion-peek-renderer .notion-page-content {
+  padding-left: var(--theme--preview-padding) !important;
+  padding-right: var(--theme--preview-padding) !important;
+  width: 100%;
+}
+
+/* prevent block hover options overlaying topbar */
+.notion-topbar {
+  background: var(--theme--main);
+}
+
+/* checkboxes */
+.notion-to_do-block > div [role='button']:hover,
+.notion-to_do-block > div [role='button']:hover .checkboxSquare,
+.notion-to_do-block > div [role='button']:hover .check {
+  background: var(--theme--option_hover-background) !important;
+}
+.notion-to_do-block > div [role='button']:hover .checkboxSquare path,
+.notion-to_do-block > div [role='button']:hover .check polygon {
+  fill: var(--theme--option_hover-color) !important;
+}
+.notion-to_do-block > div [role='button']:not(:hover) .check {
+  background: var(--theme--option_active-background) !important;
+}
+.notion-to_do-block > div [role='button']:not(:hover) .check polygon {
+  fill: var(--theme--option_active-color) !important;
+}
+
+/* fonts */
+.notion-app-inner,
+[style*='Segoe UI'] {
+  font-family: var(--theme--font_sans) !important;
+}
+[style*='Georgia'] {
+  font-family: var(--theme--font_serif) !important;
+}
+[style*='iawriter-mono'] {
+  font-family: var(--theme--font_mono) !important;
+}
+[style*='SFMono-Regular'] {
+  font-family: var(--theme--font_code) !important;
+}
+.notion-frame .notion-page-block div[placeholder='Untitled'] {
+  font-size: var(--theme--font_title-size) !important;
+}
+[placeholder='Heading 1'] {
+  font-size: var(--theme--font_heading1-size) !important;
+}
+[placeholder='Heading 2'] {
+  font-size: var(--theme--font_heading2-size) !important;
+}
+[placeholder='Heading 3'] {
+  font-size: var(--theme--font_heading3-size) !important;
+}
+.notion-frame .notion-scroller.vertical.horizontal [style*='font-size: 14px'] {
+  font-size: var(--theme--font_label-size) !important;
+}
+.notion-frame .notion-scroller.vertical.horizontal .notion-page-content {
+  font-size: var(--theme--font_body-size) !important;
+}
+.notion-code-block [placeholder=' '] {
+  font-size: var(--theme--font_code-size) !important;
+}
+.notion-sidebar [style*='font-size: 14px'] {
+  font-size: var(--theme--font_sidebar-size) !important;
+}
+
+/* code */
+.notion-page-content .notion-code-block {
+  background: var(--theme--code-background) !important;
+}
+.notion-code-block > div {
+  color: var(--theme--code_text) !important;
+}
+.notion-code-block .token.function {
+  color: var(--theme--code_function) !important;
+}
+.notion-code-block .token.keyword {
+  color: var(--theme--code_keyword) !important;
+}
+.notion-code-block .token.tag {
+  color: var(--theme--code_tag) !important;
+}
+.notion-code-block .token.operator {
+  color: var(--theme--code_operator) !important;
+}
+.notion-code-block .token.important {
+  color: var(--theme--code_important) !important;
+}
+.notion-code-block .token.property {
+  color: var(--theme--code_property) !important;
+}
+.notion-code-block .token.builtin {
+  color: var(--theme--code_builtin) !important;
+}
+.notion-code-block .token.attr-name {
+  color: var(--theme--code_attr-name) !important;
+}
+.notion-code-block .token.attr-value {
+  color: var(--theme--code_attr-value) !important;
+}
+.notion-code-block .token.comment {
+  color: var(--theme--code_comment) !important;
+}
+.notion-code-block .token.punctuation {
+  color: var(--theme--code_punctuation) !important;
+}
+.notion-code-block .token.doctype {
+  color: var(--theme--code_doctype) !important;
+}
+.notion-code-block .token.number {
+  color: var(--theme--code_number) !important;
+}
+.notion-code-block .token.string {
+  color: var(--theme--code_string) !important;
+}
diff --git a/mods/core/css/variables.css b/mods/core/css/variables.css
index 469303d..f21f4a9 100644
--- a/mods/core/css/variables.css
+++ b/mods/core/css/variables.css
@@ -29,22 +29,21 @@
   --theme_dark--font_code: SFMono-Regular, Consolas, 'Liberation Mono', Menlo,
     Courier, monospace;
 
-  --theme_dark--font-title_size: 40px;
-  --theme_dark--font-heading1_size: 30px;
-  --theme_dark--font-heading2_size: 24px;
-  --theme_dark--font-heading3_size: 20px;
-  --theme_dark--font-label_size: 14px;
-  --theme_dark--font-body_size: 16px;
-  --theme_dark--font-code_size: 12.75px;
+  --theme_dark--font_title-size: 40px;
+  --theme_dark--font_heading1-size: 30px;
+  --theme_dark--font_heading2-size: 24px;
+  --theme_dark--font_heading3-size: 20px;
+  --theme_dark--font_label-size: 14px;
+  --theme_dark--font_body-size: 16px;
+  --theme_dark--font_code-size: 12.75px;
+  --theme_dark--font_sidebar-size: 14px;
 
   --theme_dark--scrollbar: #505457;
   --theme_dark--scrollbar-border: transparent;
   --theme_dark--scrollbar_hover: #696d6f;
 
   --theme_dark--card: rgb(63, 68, 71);
-  --theme_dark--card-border: none;
   --theme_dark--gallery: rgba(255, 255, 255, 0.05);
-  --theme_dark--gallery_hover: transparent;
   --theme_dark--table-border: rgba(255, 255, 255, 0.1);
   --theme_dark--interactive_hover: rgb(71, 76, 80);
   --theme_dark--interactive_hover-border: transparent;
@@ -139,22 +138,21 @@
   --theme_light--font_code: SFMono-Regular, Consolas, 'Liberation Mono', Menlo,
     Courier, monospace;
 
-  --theme_light--font-title_size: 40px;
-  --theme_light--font-heading1_size: 30px;
-  --theme_light--font-heading2_size: 24px;
-  --theme_light--font-heading3_size: 20px;
-  --theme_light--font-label_size: 14px;
-  --theme_light--font-body_size: 16px;
-  --theme_light--font-code_size: 12.75px;
+  --theme_light--font_title-size: 40px;
+  --theme_light--font_heading1-size: 30px;
+  --theme_light--font_heading2-size: 24px;
+  --theme_light--font_heading3-size: 20px;
+  --theme_light--font_label-size: 14px;
+  --theme_light--font_body-size: 16px;
+  --theme_light--font_code-size: 12.75px;
+  --theme_light--font_sidebar-size: 14px;
 
   --theme_light--scrollbar: #d9d8d6;
   --theme_light--scrollbar-border: #cacac8;
   --theme_light--scrollbar_hover: #cacac8;
 
   --theme_light--card: rgb(247, 246, 243);
-  --theme_light--card-border: none;
   --theme_light--gallery: rgba(55, 53, 47, 0.024);
-  --theme_light--gallery_hover: transparent;
   --theme_light--table-border: rgba(55, 53, 47, 0.16);
   --theme_light--interactive_hover: rgba(55, 53, 47, 0.08);
   --theme_light--interactive_hover-border: transparent;
diff --git a/mods/core/css/variables.json b/mods/core/css/variables.json
index 5ad757e..19e7fd4 100644
--- a/mods/core/css/variables.json
+++ b/mods/core/css/variables.json
@@ -11,20 +11,19 @@
   "--theme_dark--font_serif",
   "--theme_dark--font_mono",
   "--theme_dark--font_code",
-  "--theme_dark--font-title_size",
-  "--theme_dark--font-heading1_size",
-  "--theme_dark--font-heading2_size",
-  "--theme_dark--font-heading3_size",
-  "--theme_dark--font-label_size",
-  "--theme_dark--font-body_size",
-  "--theme_dark--font-code_size",
+  "--theme_dark--font_title-size",
+  "--theme_dark--font_heading1-size",
+  "--theme_dark--font_heading2-size",
+  "--theme_dark--font_heading3-size",
+  "--theme_dark--font_label-size",
+  "--theme_dark--font_body-size",
+  "--theme_dark--font_code-size",
+  "--theme_dark--font_sidebar-size",
   "--theme_dark--scrollbar",
   "--theme_dark--scrollbar-border",
   "--theme_dark--scrollbar_hover",
   "--theme_dark--card",
-  "--theme_dark--card-border",
   "--theme_dark--gallery",
-  "--theme_dark--gallery_hover",
   "--theme_dark--table-border",
   "--theme_dark--interactive_hover",
   "--theme_dark--interactive_hover-border",
@@ -103,20 +102,19 @@
   "--theme_light--font_serif",
   "--theme_light--font_mono",
   "--theme_light--font_code",
-  "--theme_light--font-title_size",
-  "--theme_light--font-heading1_size",
-  "--theme_light--font-heading2_size",
-  "--theme_light--font-heading3_size",
-  "--theme_light--font-label_size",
-  "--theme_light--font-body_size",
-  "--theme_light--font-code_size",
+  "--theme_light--font_title-size",
+  "--theme_light--font_heading1-size",
+  "--theme_light--font_heading2-size",
+  "--theme_light--font_heading3-size",
+  "--theme_light--font_label-size",
+  "--theme_light--font_body-size",
+  "--theme_light--font_code-size",
+  "--theme_light--font_sidebar-size",
   "--theme_light--scrollbar",
   "--theme_light--scrollbar-border",
   "--theme_light--scrollbar_hover",
   "--theme_light--card",
-  "--theme_light--card-border",
   "--theme_light--gallery",
-  "--theme_light--gallery_hover",
   "--theme_light--table-border",
   "--theme_light--interactive_hover",
   "--theme_light--interactive_hover-border",
diff --git a/mods/core/menu.js b/mods/core/menu.js
index 958cf00..389d513 100644
--- a/mods/core/menu.js
+++ b/mods/core/menu.js
@@ -181,12 +181,12 @@ window['__start'] = async () => {
   createTag(
     'enabled',
     (state) => [(search_query.enabled = state), search()]
-    // 'var(--theme_local--bg_green)'
+    // 'var(--theme--bg_green)'
   );
   createTag(
     'disabled',
     (state) => [(search_query.disabled = state), search()]
-    // 'var(--theme_local--bg_red)'
+    // 'var(--theme--bg_red)'
   );
   for (let tag of search_query.tags)
     createTag(`#${tag}`, (state) => [
diff --git a/mods/dark+/styles.css b/mods/dark+/styles.css
index 52adb38..0ebdb34 100644
--- a/mods/dark+/styles.css
+++ b/mods/dark+/styles.css
@@ -8,8 +8,9 @@
   --theme_dark--main: rgb(5, 5, 5);
   --theme_dark--sidebar: rgb(1, 1, 1);
   /* --theme_dark--overlay: rgba(15, 15, 15, 0.6); */
-  --theme_dark--dragarea: #030303;
+  --theme_dark--dragarea: #000;
   /* --theme_dark--preview-width: 977px;
+  --theme_dark--preview-padding: 8em;
   --theme_dark--preview_banner-height: 20vh;
   --theme_dark--page_banner-height: 30vh; */
 
@@ -23,38 +24,46 @@
   --theme_dark--font_code: SFMono-Regular, Consolas, 'Liberation Mono', Menlo,
     Courier, monospace; */
 
+  /* --theme_dark--font_title-size: 40px;
+  --theme_dark--font_heading1-size: 30px;
+  --theme_dark--font_heading2-size: 24px;
+  --theme_dark--font_heading3-size: 20px;
+  --theme_dark--font_label-size: 14px;
+  --theme_dark--font_body-size: 16px;
+  --theme_dark--font_code-size: 12.75px; */
+
   --theme_dark--scrollbar: #232425;
   --theme_dark--scrollbar-border: transparent;
   --theme_dark--scrollbar_hover: #373838;
 
+  --theme_dark--card: #1717175e;
+  --theme_dark--gallery: rgba(26, 26, 26, 0.3);
+  --theme_dark--table-border: rgba(46, 46, 46, 0.7);
+  --theme_dark--interactive_hover: #020202;
+  /* --theme_dark--interactive_hover-border: transparent;
+  --theme_dark--button_close: #e81123;
+  --theme_dark--button_close-fill: white; */
+
   --theme_dark--selected: rgba(241, 91, 91, 0.2);
   --theme_dark--primary: rgb(177, 24, 24);
   --theme_dark--primary_hover: rgb(202, 26, 26);
   --theme_dark--primary_click: rgb(219, 41, 41);
   --theme_dark--primary_indicator: rgb(202, 26, 26);
 
-  --theme_dark--card: rgb(4, 4, 4);
-  --theme_dark--card-border: rgba(10, 10, 10, 0.7);
-  --theme_dark--table-border: rgba(255, 255, 255, 0.1);
-  --theme_dark--interactive_hover: rgb(32, 32, 32);
-  --theme_dark--button-border: rgba(78, 78, 78, 0.7);
-  /* --theme_dark--button_close: #e81123;
-  --theme_dark--button_close-fill: white; */
-
   /* --theme_dark--option-color: white;
   --theme_dark--option-background: transparent;
   --theme_dark--option_active-color: white;
   --theme_dark--option_active-background: var(--theme_dark--primary);
-  --theme_dark--option_hover-color: white;
-  --theme_dark--option_hover-background: rgb(71, 76, 80); */
+  --theme_dark--option_hover-color: white; */
+  --theme_dark--option_hover-background: rgb(32, 32, 32);
 
   /* --theme_dark--danger_text: rgb(235, 87, 87);
   --theme_dark--danger_border: rgba(235, 87, 87, 0.5); */
 
-  /* --theme_dark--font-title_size: 40px;
-  --theme_dark--font-heading1_size: 30px;
-  --theme_dark--font-heading2_size: 24px;
-  --theme_dark--font-heading3_size: 20px; */
+  /* --theme_dark--font_title-size: 40px;
+  --theme_dark--font_heading1-size: 30px;
+  --theme_dark--font_heading2-size: 24px;
+  --theme_dark--font_heading3-size: 20px; */
 
   --theme_dark--text: rgb(228, 228, 228);
   --theme_dark--text_ui: rgba(211, 211, 211, 0.637);
@@ -90,7 +99,7 @@
 
   --theme_dark--code_inline-text: #7dc582;
   --theme_dark--code_inline-background: rgb(8, 8, 8);
-  --theme_dark--code_text: var(--theme_dark--text);
+  /* --theme_dark--code_text: var(--theme_dark--text); */
   --theme_dark--code-background: rgb(8, 8, 8);
   --theme_dark--code_function: #c7e1ff;
   --theme_dark--code_keyword: #c397d8;
diff --git a/mods/focus-mode/mod.js b/mods/focus-mode/mod.js
index 8692aaa..d5eee7f 100644
--- a/mods/focus-mode/mod.js
+++ b/mods/focus-mode/mod.js
@@ -12,7 +12,7 @@ module.exports = {
   tags: ['extension'],
   name: 'focus mode',
   desc:
-    'hide the titlebar/menubar when the sidebar is closed (will be shown on hover).',
+    'hide the titlebar/menubar if the sidebar is closed (will be shown on hover).',
   version: '0.0.1',
   author: 'arecsu',
 };
diff --git a/mods/neutral/styles.css b/mods/neutral/styles.css
index 57af053..78fce15 100644
--- a/mods/neutral/styles.css
+++ b/mods/neutral/styles.css
@@ -14,7 +14,7 @@
   --theme_dark--main: #131313;
   --theme_dark--sidebar: #171717;
   --theme_dark--overlay: rgba(15, 15, 15, 0.6);
-  --theme_dark--dragarea: rgb(15, 15, 15);
+  --theme_dark--dragarea: #111111;
   /* --theme_dark--preview-width: 977px;
   --theme_dark--preview-padding: 8em;
   --theme_dark--preview_banner-height: 20vh;
@@ -32,26 +32,26 @@
     'Liberation Mono', Menlo, Courier, monospace;
 
   /* 1.3 supreme ratio. https://www.modularscale.com/ */
-  --theme_dark--font-title_size: 33px;
-  --theme_dark--font-heading1_size: 33px;
-  --theme_dark--font-heading2_size: 25.3px;
-  --theme_dark--font-heading3_size: 19.5px;
-  --theme_dark--font-label_size: 13.5px;
-  --theme_dark--font-body_size: 15px;
-  --theme_dark--font-code_size: 13.5px;
+  --theme_dark--font_title-size: 33px;
+  --theme_dark--font_heading1-size: 33px;
+  --theme_dark--font_heading2-size: 25.3px;
+  --theme_dark--font_heading3-size: 19.5px;
+  --theme_dark--font_label-size: 13px;
+  --theme_dark--font_body-size: 15px;
+  --theme_dark--font_code-size: 13.5px;
+  --theme_dark--font_sidebar-size: 14px;
 
   --theme_dark--scrollbar: #232425;
   --theme_dark--scrollbar-border: transparent;
   --theme_dark--scrollbar_hover: #373838;
 
   --theme_dark--card: #171717;
-  --theme_dark--card-border: none;
   --theme_dark--gallery: rgba(105, 105, 105, 0.05);
   --theme_dark--table-border: rgba(78, 78, 78, 0.7);
-  --theme_dark--interactive_hover: rgb(15, 15, 15);
-  --theme_dark--interactive_hover-border: transparent;
+  --theme_dark--interactive_hover: rgb(29, 29, 29);
+  /* --theme_dark--interactive_hover-border: transparent;
   --theme_dark--button_close: #e81123;
-  --theme_dark--button_close-fill: white;
+  --theme_dark--button_close-fill: white; */
 
   --theme_dark--selected: #52525244;
   --theme_dark--primary: #404040;
@@ -79,7 +79,7 @@
   --theme_dark--text_yellow: #e2c06f;
   --theme_dark--text_green: #92b178;
   --theme_dark--text_blue: #719cca;
-  --theme_dark--text_purple: #a173b3;
+  --theme_dark--text_purple: #ab82bb;
   --theme_dark--text_pink: #d285aa;
   --theme_dark--text_red: #ce535f;
   --theme_dark--bg_gray: #585858;
@@ -88,7 +88,7 @@
   --theme_dark--bg_yellow: #b58a46;
   --theme_dark--bg_green: #657953;
   --theme_dark--bg_blue: #355475;
-  --theme_dark--bg_purple: #704481;
+  --theme_dark--bg_purple: #775186;
   --theme_dark--bg_pink: #8e4b63;
   --theme_dark--bg_red: #8c3d3d;
   --theme_dark--line_gray: #585858;
@@ -97,7 +97,7 @@
   --theme_dark--line_yellow: #b58a46;
   --theme_dark--line_green: #657953;
   --theme_dark--line_blue: #355475;
-  --theme_dark--line_purple: #704481;
+  --theme_dark--line_purple: #775186;
   --theme_dark--line_pink: #8e4b63;
   --theme_dark--line_red: #8c3d3d;
 
@@ -116,7 +116,7 @@
   --theme_dark--code_comment: var(--theme_dark--text_gray);
   --theme_dark--code_punctuation: var(--theme_dark--text_gray);
   --theme_dark--code_doctype: var(--theme_dark--text_gray);
-  --theme_dark--code_number: #88c5c5;
+  --theme_dark--code_number: var(--theme_dark--text_purple);
   --theme_dark--code_string: var(--theme_dark--text_orange);
   --theme_dark--code_attr-value: var(--theme_dark--text_orange);
 }