diff --git a/mods/core/css/buttons.css b/mods/core/css/buttons.css
index 7cde184..163807c 100644
--- a/mods/core/css/buttons.css
+++ b/mods/core/css/buttons.css
@@ -34,8 +34,8 @@
 }
 
 .notion-dark-theme .window-button:hover {
-  background: var(--theme_dark--button_hover);
-  box-shadow: 0 0 0 0.5px var(--theme_dark--button_hover-border);
+  background: var(--theme_dark--interactive_hover);
+  box-shadow: 0 0 0 0.5px var(--theme_dark--interactive_hover-border);
 }
 .notion-dark-theme .window-button#btn-close:hover {
   background: var(--theme_dark--button_close);
@@ -51,6 +51,6 @@
   stroke: var(--theme_light--button_close-fill);
 }
 .notion-light-theme .window-button:hover {
-  background: var(--theme_light--button_hover);
-  box-shadow: 0 0 0 0.5px var(--theme_light--button_hover-border);
+  background: var(--theme_light--interactive_hover);
+  box-shadow: 0 0 0 0.5px var(--theme_light--interactive_hover-border);
 }
diff --git a/mods/core/css/dark.css b/mods/core/css/dark.css
index c92e989..457eb8c 100644
--- a/mods/core/css/dark.css
+++ b/mods/core/css/dark.css
@@ -75,6 +75,18 @@
 .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;
@@ -117,8 +129,8 @@
 .notion-dark-theme [style*='background: rgb(71, 76, 80)'],
 .notion-dark-theme [style*='background: rgb(80, 85, 88)'],
 .notion-dark-theme [style*='background: rgb(98, 102, 104)'] {
-  background: var(--theme_dark--button_hover) !important;
-  box-shadow: 0 0 0 0.5px var(--theme_dark--button_hover-border);
+  background: var(--theme_dark--interactive_hover) !important;
+  box-shadow: 0 0 0 0.5px var(--theme_dark--interactive_hover-border);
 }
 
 /** ui colours **/
@@ -157,20 +169,25 @@
 .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--todo_empty-border) !important;
+  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--todo_ticked-fill) !important;
-}
-.notion-dark-theme
-  .notion-to_do-block
-  [style*='background: rgb(46, 170, 220)'] {
-  background: var(--theme_dark--todo_ticked-background) !important;
-}
-.notion-dark-theme .notion-to_do-block [style*='background: rgb(71, 76, 80)'] {
-  background: var(--theme_dark--todo_hover-background) !important;
+  fill: var(--theme_dark--option_active-color) !important;
 }
 
 .notion-dark-theme
@@ -343,7 +360,7 @@
   background: var(--theme_dark--code_inline-background) !important;
 }
 
-.notion-dark-theme .notion-code-block {
+.notion-dark-theme .notion-page-content .notion-code-block {
   background: var(--theme_dark--code-background) !important;
 }
 .notion-dark-theme .notion-code-block > div {
diff --git a/mods/core/css/light.css b/mods/core/css/light.css
index b6fd0a6..f7d8788 100644
--- a/mods/core/css/light.css
+++ b/mods/core/css/light.css
@@ -76,6 +76,18 @@
 .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;
@@ -114,11 +126,8 @@
 
 .notion-light-theme [style*='background: rgba(55, 53, 47,'],
 .notion-light-theme [style*='background: rgb(239, 239, 238)'] {
-  background: var(--theme_light--button_hover) !important;
-  box-shadow: 0 0 0 0.5px var(--theme_light--button_hover-border);
-}
-.notion-light-theme [style*='background: rgba(242, 241, 238, 0.6)'] {
-  background: var(--theme_light--button) !important;
+  background: var(--theme_light--interactive_hover) !important;
+  box-shadow: 0 0 0 0.5px var(--theme_light--interactive_hover-border);
 }
 
 /** ui colours **/
@@ -158,21 +167,25 @@
   background: var(--theme_light--primary_indicator) !important;
 }
 
+.notion-light-theme .notion-to_do-block .checkboxSquare {
+  background: var(--theme_light--option-background) !important;
+}
 .notion-light-theme .notion-to_do-block .checkboxSquare path {
-  fill: var(--theme_light--todo_empty-border) !important;
+  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--todo_ticked-fill) !important;
-}
-.notion-light-theme
-  .notion-to_do-block
-  [style*='background: rgb(46, 170, 220)'] {
-  background: var(--theme_light--todo_ticked-background) !important;
-}
-.notion-light-theme
-  .notion-to_do-block
-  [style*='background: rgba(55, 53, 47, 0.08)'] {
-  background: var(--theme_light--todo_hover-background) !important;
+  fill: var(--theme_light--option_active-color) !important;
 }
 
 .notion-light-theme
@@ -345,7 +358,7 @@
   background: var(--theme_light--code_inline-background) !important;
 }
 
-.notion-light-theme .notion-code-block {
+.notion-light-theme .notion-page-content .notion-code-block {
   background: var(--theme_light--code-background) !important;
 }
 .notion-light-theme .notion-code-block > div {
diff --git a/mods/core/css/localised.css b/mods/core/css/localised.css
index 7a52639..77b7878 100644
--- a/mods/core/css/localised.css
+++ b/mods/core/css/localised.css
@@ -29,8 +29,10 @@
   --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--button_hover: var(--theme_dark--button_hover);
-  --theme_local--button_hover-border: var(--theme_dark--button_hover-border);
+  --theme_local--interactive_hover: var(--theme_dark--interactive_hover);
+  --theme_local--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);
 
@@ -40,14 +42,14 @@
   --theme_local--primary_click: var(--theme_dark--primary_click);
   --theme_local--primary_indicator: var(--theme_dark--primary_indicator);
 
-  --theme_local--todo_empty-border: var(--theme_dark--todo_empty-border);
-  --theme_local--todo_ticked: var(--theme_dark--todo_ticked);
-  --theme_local--todo_ticked-fill: var(--theme_dark--todo_ticked-fill);
-  --theme_local--todo_ticked-background: var(
-    --theme_dark--todo_ticked-background
+  --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_dark--option_active-background
   );
-  --theme_local--todo_hover-background: var(
-    --theme_dark--todo_hover-background
+  --theme_local--option_hover-background: var(
+    --theme_dark--option_hover-background
   );
 
   --theme_local--danger_text: var(--theme_dark--danger_text);
@@ -128,8 +130,10 @@
   --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--button_hover: var(--theme_light--button_hover);
-  --theme_local--button_hover-border: var(--theme_light--button_hover-border);
+  --theme_local--interactive_hover: var(--theme_light--interactive_hover);
+  --theme_local--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);
 
@@ -139,14 +143,14 @@
   --theme_local--primary_click: var(--theme_light--primary_click);
   --theme_local--primary_indicator: var(--theme_light--primary_indicator);
 
-  --theme_local--todo_empty-border: var(--theme_light--todo_empty-border);
-  --theme_local--todo_ticked: var(--theme_light--todo_ticked);
-  --theme_local--todo_ticked-fill: var(--theme_light--todo_ticked-fill);
-  --theme_local--todo_ticked-background: var(
-    --theme_light--todo_ticked-background
+  --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_light--option_active-background
   );
-  --theme_local--todo_hover-background: var(
-    --theme_light--todo_hover-background
+  --theme_local--option_hover-background: var(
+    --theme_light--option_hover-background
   );
 
   --theme_local--danger_text: var(--theme_light--danger_text);
diff --git a/mods/core/css/menu.css b/mods/core/css/menu.css
index e48b0c9..e888126 100644
--- a/mods/core/css/menu.css
+++ b/mods/core/css/menu.css
@@ -22,7 +22,6 @@
   word-break: break-word;
   text-decoration: none;
   text-size-adjust: 100%;
-  color: var(--theme_local--text);
   font-family: var(--theme_local--font_sans);
   outline-color: var(--theme_local--card-border);
 }
@@ -34,6 +33,7 @@ body {
   padding: 0;
   overflow: hidden;
   background: var(--theme_local--main);
+  color: var(--theme_local--text);
 }
 
 body:not([style]) > * {
@@ -72,6 +72,10 @@ code {
   background: var(--theme_local--code_inline-background);
 }
 
+button {
+  color: var(--theme_local--text);
+}
+
 u {
   text-decoration: underline;
 }
@@ -111,6 +115,7 @@ s {
 #alerts [role='alert'] {
   display: flex;
   padding: 0.75em;
+  /* border: 1px solid var(--theme_local--text_ui_info); */
 }
 #alerts [role='alert']::before {
   content: '!';
@@ -119,6 +124,7 @@ s {
   font-weight: bold;
   font-size: 1.2em;
   padding-right: 0.5rem;
+  color: var(--theme_local--text_ui_info);
 }
 #alerts [role='alert'] p {
   font-size: 1rem;
@@ -127,44 +133,21 @@ s {
   color: var(--theme_local--text_ui);
 }
 
-#alerts .error::before {
-  color: var(--theme_local--bg_red);
-}
 #alerts .error {
-  border: 1px solid var(--theme_local--bg_red);
-  background: var(--theme_local--line_red);
-}
-
-#alerts .warning::before {
-  color: var(--theme_local--bg_yellow);
+  background: var(--theme_local--bg_red);
 }
 #alerts .warning {
-  border: 1px solid var(--theme_local--bg_yellow);
-  background: var(--theme_local--line_yellow);
-}
-
-#alerts .info::before {
-  color: var(--theme_local--bg_blue);
+  background: var(--theme_local--bg_yellow);
 }
 #alerts .info {
-  border: 1px solid var(--theme_local--bg_blue);
-  background: var(--theme_local--line_blue);
+  background: var(--theme_local--bg_blue);
 }
 
 #alerts .success::before {
   content: '✓';
-  color: var(--theme_local--bg_green);
 }
 #alerts .success {
-  border: 1px solid var(--theme_local--bg_green);
-  background: var(--theme_local--line_green);
-}
-
-.notion-light-theme #alerts [role='alert']::before {
-  color: rgba(0, 0, 0, 0.2);
-}
-.notion-light-theme #alerts [role='alert'] {
-  border: 1px solid rgba(0, 0, 0, 0.1);
+  background: var(--theme_local--bg_green);
 }
 
 /* search */
@@ -211,17 +194,22 @@ s {
   font-size: 0.8em;
   padding: 0.2em 0.5em;
   margin-top: 0.5em;
-  background: var(--theme_local--card);
-  color: var(--theme_local--overlay);
+  background: var(--theme_local--option-background);
+  color: var(--theme_local--option-color);
   border-radius: 2px;
-  transition: background 200ms;
+  transition: color 200ms, background 200ms;
   user-select: none;
 }
 #search #tags > span:not(:last-child) {
   margin-right: 0.5em;
 }
+#search #tags > span:hover {
+  background: var(--theme_local--option_hover-background);
+  color: var(--theme_local--option_hover-color);
+}
 #search #tags > .selected {
-  background: var(--tag_colour, var(--theme_local--primary_hover));
+  background: var(--tag_color, var(--theme_local--option_active-background));
+  color: var(--theme_local--option_active-color);
 }
 
 /* module meta */
@@ -431,7 +419,7 @@ s {
   border-radius: 50%;
   transform: translateX(var(--menu--toggle_offset, 0));
   transition: transform 350ms, box-shadow 350ms;
-  background: var(--theme_local--todo_ticked-fill);
+  background: var(--theme_local--option_active-color);
   box-shadow: 2px 1px 4px var(--theme_local--table-border);
 }
 .toggle input[type='checkbox']:checked:focus + label .switch {
diff --git a/mods/core/css/shared.css b/mods/core/css/shared.css
index 7799a5c..19011ab 100644
--- a/mods/core/css/shared.css
+++ b/mods/core/css/shared.css
@@ -37,6 +37,9 @@
 .notion-page-content .notion-collection_view-block {
   width: 100% !important;
 }
+.notion-page-content
+  .notion-collection_view-block
+  [style*='padding-left: 50px'],
 .notion-page-content
   .notion-collection_view-block
   [style*='padding-left: 96px'],
@@ -45,6 +48,17 @@
   [style*='padding-left: 126px'] {
   padding-left: 0 !important;
 }
+.notion-page-content
+  .notion-collection_view-block
+  [style*='padding-right: 50px'],
+.notion-page-content
+  .notion-collection_view-block
+  [style*='padding-right: 96px'],
+.notion-page-content
+  .notion-collection_view-block
+  [style*='padding-right: 126px'] {
+  padding-right: 0 !important;
+}
 .notion-page-content
   .notion-collection_view-block
   [style*='min-width: calc(100% - 192px);'],
diff --git a/mods/core/css/variables.css b/mods/core/css/variables.css
index ecec26d..469303d 100644
--- a/mods/core/css/variables.css
+++ b/mods/core/css/variables.css
@@ -43,9 +43,11 @@
 
   --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--button_hover: rgb(71, 76, 80);
-  --theme_dark--button_hover-border: transparent;
+  --theme_dark--interactive_hover: rgb(71, 76, 80);
+  --theme_dark--interactive_hover-border: transparent;
   --theme_dark--button_close: #e81123;
   --theme_dark--button_close-fill: white;
 
@@ -55,11 +57,12 @@
   --theme_dark--primary_click: rgb(0, 141, 190);
   --theme_dark--primary_indicator: rgb(235, 87, 87);
 
-  --theme_dark--todo_empty-border: currentColor;
-  --theme_dark--todo_ticked: currentColor;
-  --theme_dark--todo_ticked-fill: white;
-  --theme_dark--todo_ticked-background: var(--theme_dark--primary);
-  --theme_dark--todo_hover-background: rgb(71, 76, 80);
+  --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--danger_text: rgb(235, 87, 87);
   --theme_dark--danger_border: rgba(235, 87, 87, 0.5);
@@ -150,9 +153,11 @@
 
   --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--button_hover: rgba(55, 53, 47, 0.08);
-  --theme_light--button_hover-border: transparent;
+  --theme_light--interactive_hover: rgba(55, 53, 47, 0.08);
+  --theme_light--interactive_hover-border: transparent;
   --theme_light--button_close: #e81123;
   --theme_light--button_close-fill: white;
 
@@ -162,11 +167,12 @@
   --theme_light--primary_click: rgb(0, 141, 190);
   --theme_light--primary_indicator: rgb(235, 87, 87);
 
-  --theme_light--todo_empty-border: currentColor;
-  --theme_light--todo_ticked: currentColor;
-  --theme_light--todo_ticked-fill: white;
-  --theme_light--todo_ticked-background: var(--theme_light--primary);
-  --theme_light--todo_hover-background: rgba(55, 53, 47, 0.08);
+  --theme_light--option-color: black;
+  --theme_light--option-background: transparent;
+  --theme_light--option_hover-color: black;
+  --theme_light--option_hover-background: rgba(55, 53, 47, 0.08);
+  --theme_light--option_active-color: white;
+  --theme_light--option_active-background: var(--theme_light--primary);
 
   --theme_light--danger_text: rgb(235, 87, 87);
   --theme_light--danger_border: rgba(235, 87, 87, 0.5);
diff --git a/mods/core/css/variables.json b/mods/core/css/variables.json
index 491b9f3..5ad757e 100644
--- a/mods/core/css/variables.json
+++ b/mods/core/css/variables.json
@@ -4,20 +4,30 @@
   "--theme_dark--overlay",
   "--theme_dark--dragarea",
   "--theme_dark--preview-width",
+  "--theme_dark--preview-padding",
   "--theme_dark--preview_banner-height",
   "--theme_dark--page_banner-height",
   "--theme_dark--font_sans",
   "--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--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--button_hover",
-  "--theme_dark--button_hover-border",
+  "--theme_dark--interactive_hover",
+  "--theme_dark--interactive_hover-border",
   "--theme_dark--button_close",
   "--theme_dark--button_close-fill",
   "--theme_dark--selected",
@@ -25,11 +35,12 @@
   "--theme_dark--primary_hover",
   "--theme_dark--primary_click",
   "--theme_dark--primary_indicator",
-  "--theme_dark--todo_empty-border",
-  "--theme_dark--todo_ticked",
-  "--theme_dark--todo_ticked-fill",
-  "--theme_dark--todo_ticked-background",
-  "--theme_dark--todo_hover-background",
+  "--theme_dark--option-color",
+  "--theme_dark--option-background",
+  "--theme_dark--option_active-color",
+  "--theme_dark--option_active-background",
+  "--theme_dark--option_hover-color",
+  "--theme_dark--option_hover-background",
   "--theme_dark--danger_text",
   "--theme_dark--danger_border",
   "--theme_dark--text",
@@ -70,6 +81,7 @@
   "--theme_dark--code_keyword",
   "--theme_dark--code_tag",
   "--theme_dark--code_operator",
+  "--theme_dark--code_important",
   "--theme_dark--code_property",
   "--theme_dark--code_builtin",
   "--theme_dark--code_attr-name",
@@ -84,20 +96,30 @@
   "--theme_light--overlay",
   "--theme_light--dragarea",
   "--theme_light--preview-width",
+  "--theme_light--preview-padding",
   "--theme_light--preview_banner-height",
   "--theme_light--page_banner-height",
   "--theme_light--font_sans",
   "--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--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--button_hover",
-  "--theme_light--button_hover-border",
+  "--theme_light--interactive_hover",
+  "--theme_light--interactive_hover-border",
   "--theme_light--button_close",
   "--theme_light--button_close-fill",
   "--theme_light--selected",
@@ -105,11 +127,12 @@
   "--theme_light--primary_hover",
   "--theme_light--primary_click",
   "--theme_light--primary_indicator",
-  "--theme_light--todo_empty-border",
-  "--theme_light--todo_ticked",
-  "--theme_light--todo_ticked-fill",
-  "--theme_light--todo_ticked-background",
-  "--theme_light--todo_hover-background",
+  "--theme_light--option-color",
+  "--theme_light--option-background",
+  "--theme_light--option_hover-color",
+  "--theme_light--option_hover-background",
+  "--theme_light--option_active-color",
+  "--theme_light--option_active-background",
   "--theme_light--danger_text",
   "--theme_light--danger_border",
   "--theme_light--text",
@@ -150,6 +173,7 @@
   "--theme_light--code_keyword",
   "--theme_light--code_tag",
   "--theme_light--code_operator",
+  "--theme_light--code_important",
   "--theme_light--code_property",
   "--theme_light--code_builtin",
   "--theme_light--code_attr-name",
diff --git a/mods/core/menu.js b/mods/core/menu.js
index c2d1748..958cf00 100644
--- a/mods/core/menu.js
+++ b/mods/core/menu.js
@@ -161,14 +161,14 @@ window['__start'] = async () => {
   }
   document.querySelector('#search > input').addEventListener('input', search);
 
-  function createTag(tagname, onclick, colour) {
+  function createTag(tagname, onclick, color) {
     if (!tagname)
       throw Error('<notion-enhancer> @ createTag: no tagname specified');
     if (!onclick)
       throw Error('<notion-enhancer> @ createTag: no action specified');
     const el = createElement(
       `<span class="selected" ${
-        colour ? `style="--tag_colour: ${colour}" ` : ''
+        color ? `style="--tag_color: ${color}" ` : ''
       }tabindex="0">${tagname}</span>`
     );
     document.querySelector('#tags').append(el);
diff --git a/mods/dark+/styles.css b/mods/dark+/styles.css
index 970eb41..52adb38 100644
--- a/mods/dark+/styles.css
+++ b/mods/dark+/styles.css
@@ -36,17 +36,17 @@
   --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--button: rgb(15, 15, 15);
-  --theme_dark--button_hover: rgb(32, 32, 32);
+  --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--todo_empty-border: currentColor;
-  --theme_dark--todo_ticked: currentColor;
-  --theme_dark--todo_ticked-fill: white;
-  --theme_dark--todo_ticked-background: var(--theme_dark--primary);
-  --theme_dark--todo_hover-background: rgb(71, 76, 80); */
+  /* --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--danger_text: rgb(235, 87, 87);
   --theme_dark--danger_border: rgba(235, 87, 87, 0.5); */
diff --git a/mods/neutral/styles.css b/mods/neutral/styles.css
index 0a1530d..57af053 100644
--- a/mods/neutral/styles.css
+++ b/mods/neutral/styles.css
@@ -44,11 +44,12 @@
   --theme_dark--scrollbar-border: transparent;
   --theme_dark--scrollbar_hover: #373838;
 
-  --theme_dark--card: #252525;
+  --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--button_hover: rgb(15, 15, 15);
-  --theme_dark--button_hover-border: transparent;
+  --theme_dark--interactive_hover: rgb(15, 15, 15);
+  --theme_dark--interactive_hover-border: transparent;
   --theme_dark--button_close: #e81123;
   --theme_dark--button_close-fill: white;
 
@@ -58,11 +59,12 @@
   --theme_dark--primary_click: #f3f3f3;
   --theme_dark--primary_indicator: #6d6d6d;
 
-  --theme_dark--todo_empty-border: currentColor;
-  --theme_dark--todo_ticked: currentColor;
-  --theme_dark--todo_ticked-fill: white;
-  --theme_dark--todo_ticked-background: var(--theme_dark--primary);
-  --theme_dark--todo_hover-background: #484848;
+  /* --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: #484848;
 
   --theme_dark--danger_text: #ce535f;
   --theme_dark--danger_border: #8c3d3d;
@@ -76,8 +78,8 @@
   --theme_dark--text_orange: #ec9873;
   --theme_dark--text_yellow: #e2c06f;
   --theme_dark--text_green: #92b178;
-  --theme_dark--text_blue: #88c5c5;
-  --theme_dark--text_purple: #719cca;
+  --theme_dark--text_blue: #719cca;
+  --theme_dark--text_purple: #a173b3;
   --theme_dark--text_pink: #d285aa;
   --theme_dark--text_red: #ce535f;
   --theme_dark--bg_gray: #585858;
@@ -85,8 +87,8 @@
   --theme_dark--bg_orange: #9a5a3f;
   --theme_dark--bg_yellow: #b58a46;
   --theme_dark--bg_green: #657953;
-  --theme_dark--bg_blue: #3a6d6d;
-  --theme_dark--bg_purple: #355475;
+  --theme_dark--bg_blue: #355475;
+  --theme_dark--bg_purple: #704481;
   --theme_dark--bg_pink: #8e4b63;
   --theme_dark--bg_red: #8c3d3d;
   --theme_dark--line_gray: #585858;
@@ -94,8 +96,8 @@
   --theme_dark--line_orange: #9a5a3f;
   --theme_dark--line_yellow: #b58a46;
   --theme_dark--line_green: #657953;
-  --theme_dark--line_blue: #3a6d6d;
-  --theme_dark--line_purple: #355475;
+  --theme_dark--line_blue: #355475;
+  --theme_dark--line_purple: #704481;
   --theme_dark--line_pink: #8e4b63;
   --theme_dark--line_red: #8c3d3d;
 
@@ -103,7 +105,7 @@
   --theme_dark--code_inline-background: #333333;
   --theme_dark--code_text: var(--theme_dark--text);
   --theme_dark--code-background: #0e0e0e;
-  --theme_dark--code_function: var(--theme_dark--text_purple);
+  --theme_dark--code_function: var(--theme_dark--text_blue);
   --theme_dark--code_keyword: var(--theme_dark--text_pink);
   --theme_dark--code_tag: var(--theme_dark--text_pink);
   --theme_dark--code_operator: var(--theme_dark--text_yellow);
@@ -114,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: var(--theme_dark--text_blue);
+  --theme_dark--code_number: #88c5c5;
   --theme_dark--code_string: var(--theme_dark--text_orange);
   --theme_dark--code_attr-value: var(--theme_dark--text_orange);
 }
@@ -125,16 +127,16 @@
   padding: 3px 1px !important;
 }
 
-.notion-quote-block {
+/* commented out for the time being because they mess with the + :: */
+/* .notion-quote-block {
   padding-top: 10px;
   padding-right: 2px;
   padding-bottom: 12px;
   padding-left: 2px;
 }
-
 .notion-selectable.notion-text-block {
-  margin-top: 5px !important;
-}
+  padding-top: 5px !important;
+} */
 
 /* increase page width */
 .notion-frame .notion-scroller [style*='width: 900px;'] {