diff --git a/about.json b/about.json
index c1c35bf..0f876d8 100644
--- a/about.json
+++ b/about.json
@@ -9,18 +9,30 @@
   "maximum_discourse_version": null,
   "assets": {},
   "modifiers": {},
+  "components": [
+    "https://github.com/discourse/discourse-sidebar-new-topic-button.git",
+    "https://github.com/discourse/discourse-search-banner.git"
+  ],
   "color_schemes": {
     "next_gen": {
       "primary": "1A1A1A",
-      "secondary": "F5F8FF",
-      "header_background": "F5F8FF",
-      "tertiary": "595bca"
+      "primary-low": "ebecf9",
+      "primary-500": "8591ad",
+      "secondary": "ffffff",
+      "header_background": "f5f8ff",
+      "tertiary": "595bca",
+      "tertiary-low": "d8d9f3",
+      "selected": "d8d9f3",
+      "hover": "ebebf9"
     },
     "next_gen_dark": {
-      "primary": "F5F8FF",
-      "secondary": "1A1A1A",
-      "header_background": "1A1A1A",
-      "tertiary": "595bca"
+      "primary": "f8f5ff",
+      "secondary": "1d0058",
+      "header_background": "00091d",
+      "header_primary": "F5F8FF",
+      "tertiary": "595bca",
+      "selected": "292f90",
+      "hover": "0f0031"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/locales/en.yml b/locales/en.yml
index bc8d319..e38fc70 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -1,5 +1,5 @@
 en:
   theme_metadata:
-    description: ''
+    description: ""
     settings:
       example_setting: A description of a setting.
diff --git a/scss/chat.scss b/scss/chat.scss
index 21126a0..5c3015c 100644
--- a/scss/chat.scss
+++ b/scss/chat.scss
@@ -1,6 +1,7 @@
 .full-page-chat.full-page-chat-sidebar-enabled {
   border-top-left-radius: var(--d-border-radius-large);
-  box-shadow: 0px 0px 1px 2px #e2e8f8, 0px 0px 24px 4px #e2e8f8;
+  box-shadow: 0px 0px 1px 2px var(--tertiary-50),
+    0px 0px 24px 4px var(--tertiary-50);
   border: none;
 }
 
diff --git a/scss/header.scss b/scss/header.scss
index 04d1461..6a18ce5 100644
--- a/scss/header.scss
+++ b/scss/header.scss
@@ -1,3 +1,4 @@
 .d-header {
   box-shadow: none;
+  background: var(--tertiary-50);
 }
diff --git a/scss/main.scss b/scss/main.scss
index a8b2180..2cbb410 100644
--- a/scss/main.scss
+++ b/scss/main.scss
@@ -1,5 +1,5 @@
 html:not(:has(.has-full-page-chat)) {
-  background-color: #f5f8ff;
+  background-color: var(--tertiary-50);
 }
 
 :root {
@@ -7,7 +7,7 @@ html:not(:has(.has-full-page-chat)) {
 }
 
 body:not(.has-full-page-chat) {
-  background-color: #f5f8ff;
+  background-color: var(--tertiary-50);
   #main-outlet-wrapper {
     // margin-top: 1.5rem;
     @media screen and (max-width: 485px) {
@@ -68,7 +68,8 @@ aside.onebox {
 }
 
 .d-editor-preview-wrapper {
-  box-shadow: 0px 0px 1px 2px #e2e8f8, 0px 0px 24px 4px #e2e8f8;
+  box-shadow: 0px 0px 1px 2px var(--tertiary-50),
+    0px 0px 24px 4px var(--tertiary-50);
   border-radius: var(--d-border-radius-large);
   padding: 1em;
   background-color: var(--d-content-background);
diff --git a/scss/search-banner.scss b/scss/search-banner.scss
index 430b1c9..b078803 100644
--- a/scss/search-banner.scss
+++ b/scss/search-banner.scss
@@ -7,7 +7,7 @@
   border-bottom: 1px solid var(--primary-300);
   padding: 1.5em 0 2.5em;
   margin-bottom: 0;
-  --search-color: #595bca;
+  --search-color: var(--tertiary-medium);
   @media screen and (max-width: 900px) {
     padding-bottom: 1em;
   }
@@ -19,7 +19,7 @@
     align-self: center;
     margin: 0;
     font-weight: 400;
-    color: #350c73;
+    color: var(--tertiary);
     @media screen and (max-width: 1028px) {
       font-size: var(--font-up-4);
       grid-column: 1/-1;
@@ -63,7 +63,7 @@
   }
   .search-input {
     background: var(--d-content-background);
-    border: 1px solid oklch(from var(--search-color) 80% calc(c * 2.5) h);
+    border: 1px solid var(--search-color);
     box-shadow: 0 4px 10px rgba(52, 6, 121, 15%);
   }
   .search-menu .search-input:focus-within,
diff --git a/scss/topic-cards.scss b/scss/topic-cards.scss
index e89d80e..494d2a1 100644
--- a/scss/topic-cards.scss
+++ b/scss/topic-cards.scss
@@ -1,7 +1,6 @@
 .topic-list-item {
   background: var(--d-content-background);
   &:hover {
-    background: oklch(from var(--d-content-background) 97% c h);
+    background: var(--primary-very-low);
   }
-  border: 1px solid #cedde3;
 }
diff --git a/scss/topic.scss b/scss/topic.scss
index 11b6f93..a172eef 100644
--- a/scss/topic.scss
+++ b/scss/topic.scss
@@ -62,7 +62,7 @@
   .more-topics__list
   .topic-list-body
   .topic-list-item:last-of-type {
-  border-bottom: 1px solid #cedde3;
+  border-bottom: 1px solid var(--primary-300);
 }
 
 .discourse-post-event .discourse-post-event-widget {
diff --git a/scss/variables.scss b/scss/variables.scss
index 40caf4f..0bbcb6d 100644
--- a/scss/variables.scss
+++ b/scss/variables.scss
@@ -4,18 +4,16 @@
   --d-input-border-radius: 6px;
   --accent-color: #3c41c3;
   --accent-text-color: #ffffff;
-  --d-content-background: #fff;
+  --d-content-background: var(--secondary);
   --d-nav-color--active: var(--accent-color);
-  --primary: #14171f;
-  --header-background: #f5f8ff;
   --d-post-control-background--hover: #ebecf9;
   --d-post-control-text-color--hover: #242775;
+  --d-sidebar-background: var(--tertiary-50);
+  --d-sidebar-footer-fade: rgba(var(--tertiary-50-rgb), 1);
   --d-sidebar-link-color: var(--primary);
   --d-sidebar-highlight-color: var(--primary);
-  --d-sidebar-link-icon-color: #8591ad;
+  --d-sidebar-highlight-background: var(--tertiary-300);
   --d-sidebar-section-link-icon-size: 1em;
-  --d-sidebar-highlight-background: #ebecf9;
-  --d-sidebar-active-background: #d8d9f3;
   --d-input-bg-color: var(--d-content-background);
   // --d-sidebar-row-height: 2.8em;
   //the idea is: block spacing can grow with font-size, but inline spacing should not to maintain horizontal (text) alignment