diff --git a/web/components/ui/Sidebar/Sidebar.module.scss b/web/components/ui/Sidebar/Sidebar.module.scss
index 42e3d6944..7d3fdae62 100644
--- a/web/components/ui/Sidebar/Sidebar.module.scss
+++ b/web/components/ui/Sidebar/Sidebar.module.scss
@@ -1,5 +1,5 @@
 .root {
-  background-color: var(--theme-color-components-chat-background);
+  background-color: var(--theme-color-background-chat);
   display: none;
   --header-h: 64px;
 }
diff --git a/web/style-definitions/tokens/color/default-theme.yaml b/web/style-definitions/tokens/color/default-theme.yaml
index 8dda3fc89..3ffeb70e5 100644
--- a/web/style-definitions/tokens/color/default-theme.yaml
+++ b/web/style-definitions/tokens/color/default-theme.yaml
@@ -98,6 +98,9 @@ theme:
       header:
         value: 'var(--theme-color-palette-0)'
         comment: '{theme.color.palette.0.comment}'
+      chat:
+        value: 'var(--theme-color-palette-4)'
+        comment: '{theme.color.palette.4.comment}'
     action:
       value: 'var(--theme-color-palette-6)'
       comment: '{theme.color.palette.6.comment}'
diff --git a/web/styles/theme.less b/web/styles/theme.less
index 9d2fa3815..54cdb502f 100644
--- a/web/styles/theme.less
+++ b/web/styles/theme.less
@@ -1,6 +1,6 @@
 
 // Do not edit directly
-// Generated on Sun, 11 Sep 2022 05:30:09 GMT
+// Generated on Fri, 30 Sep 2022 07:36:16 GMT
 // 
 // How to edit these values:
 // Edit the corresponding token file under the style-definitions directory
@@ -17,7 +17,6 @@
 @border-radius-base: var(--theme-rounded-corners);
 @background-color-light: var(--theme-color-background-main);
 @modal-close-color: var(--theme-color-background-main);
-@modal-close-hover: var(--theme-color-action);
 @primary-color: #7a5cf3; // Text link/secondary light text
 @primary-color-hover: #2386e2; // Fun color 1
 @primary-color-active: #5d38f3; // Text link hover
@@ -62,6 +61,7 @@
 @theme-color-palette-warning: var(--color-owncast-palette-warning); // Warning
 @theme-color-background-main: var(--theme-color-palette-3); // Light primary
 @theme-color-background-header: var(--theme-color-palette-0); // Dark primary
+@theme-color-background-chat: var(--theme-color-palette-4); // Light secondary
 @theme-color-action: var(--theme-color-palette-6); // Text link/secondary light text
 @theme-color-action-hover: var(--theme-color-palette-7); // Text link hover
 @theme-color-action-disabled: var(--theme-color-palette-8); // Disabled background
diff --git a/web/styles/variables.css b/web/styles/variables.css
index a5fc972dd..5e669a5a5 100644
--- a/web/styles/variables.css
+++ b/web/styles/variables.css
@@ -1,6 +1,6 @@
 /**
  * Do not edit directly
- * Generated on Sun, 11 Sep 2022 05:30:09 GMT
+ * Generated on Fri, 30 Sep 2022 07:36:16 GMT
  * 
  * How to edit these values:
  * Edit the corresponding token file under the style-definitions directory
@@ -19,7 +19,6 @@
   --border-radius-base: var(--theme-rounded-corners);
   --background-color-light: var(--theme-color-background-main);
   --modal-close-color: var(--theme-color-background-main);
-  --modal-close-hover: var(--theme-color-action);
   --primary-color: #7a5cf3; /* Text link/secondary light text */
   --primary-color-hover: #2386e2; /* Fun color 1 */
   --primary-color-active: #5d38f3; /* Text link hover */
@@ -36,12 +35,8 @@
   --theme-rounded-corners: 0.5rem; /* How much corners are rounded in places in the UI. */
   --theme-unknown-1: green; /* This should never be used and it means something is wrong. */
   --theme-unknown-2: red; /* This should never be used and it means something is wrong. */
-  --theme-text-body-font-family: var(
-    --font-owncast-body
-  ); /* The font family used for the body text. */
-  --theme-text-display-font-family: var(
-    --font-owncast-display
-  ); /* The font family used for the display/header text. */
+  --theme-text-body-font-family: var(--font-owncast-body); /* The font family used for the body text. */
+  --theme-text-display-font-family: var(--font-owncast-display); /* The font family used for the display/header text. */
   --theme-color-users-0: var(--color-owncast-user-0);
   --theme-color-users-1: var(--color-owncast-user-1);
   --theme-color-users-2: var(--color-owncast-user-2);
@@ -68,6 +63,7 @@
   --theme-color-palette-warning: var(--color-owncast-palette-warning); /* Warning */
   --theme-color-background-main: var(--theme-color-palette-3); /* Light primary */
   --theme-color-background-header: var(--theme-color-palette-0); /* Dark primary */
+  --theme-color-background-chat: var(--theme-color-palette-4); /* Light secondary */
   --theme-color-action: var(--theme-color-palette-6); /* Text link/secondary light text */
   --theme-color-action-hover: var(--theme-color-palette-7); /* Text link hover */
   --theme-color-action-disabled: var(--theme-color-palette-8); /* Disabled background */
@@ -75,59 +71,31 @@
   --theme-color-warning: var(--theme-color-palette-warning); /* Warning */
   --theme-color-components-text-on-light: var(--theme-color-palette-0); /* Dark primary */
   --theme-color-components-text-on-dark: var(--theme-color-palette-3); /* Light primary */
-  --theme-color-components-primary-button-background: var(
-    --theme-color-action
-  ); /* Text link/secondary light text */
-  --theme-color-components-primary-button-background-disabled: var(
-    --theme-color-action-disabled
-  ); /* Disabled background */
+  --theme-color-components-primary-button-background: var(--theme-color-action); /* Text link/secondary light text */
+  --theme-color-components-primary-button-background-disabled: var(--theme-color-action-disabled); /* Disabled background */
   --theme-color-components-primary-button-text: var(--theme-color-palette-4); /* Light secondary */
-  --theme-color-components-primary-button-text-disabled: var(
-    --theme-color-palette-10
-  ); /* Neutral gray light */
-  --theme-color-components-primary-button-border: var(
-    --theme-color-palette-4
-  ); /* Light secondary */
-  --theme-color-components-primary-button-border-disabled: var(
-    --theme-color-action-disabled
-  ); /* Disabled background */
-  --theme-color-components-secondary-button-background: var(
-    --theme-color-palette-4
-  ); /* Light secondary */
+  --theme-color-components-primary-button-text-disabled: var(--theme-color-palette-10); /* Neutral gray light */
+  --theme-color-components-primary-button-border: var(--theme-color-palette-4); /* Light secondary */
+  --theme-color-components-primary-button-border-disabled: var(--theme-color-action-disabled); /* Disabled background */
+  --theme-color-components-secondary-button-background: var(--theme-color-palette-4); /* Light secondary */
   --theme-color-components-secondary-button-background-disabled: transparent;
-  --theme-color-components-secondary-button-text: var(
-    --theme-color-action-disabled
-  ); /* Disabled background */
-  --theme-color-components-secondary-button-text-disabled: var(
-    --theme-color-action-disabled
-  ); /* Disabled background */
-  --theme-color-components-secondary-button-border: var(
-    --theme-color-action
-  ); /* Text link/secondary light text */
-  --theme-color-components-secondary-button-border-disabled: var(
-    --theme-color-action-disabled
-  ); /* Disabled background */
+  --theme-color-components-secondary-button-text: var(--theme-color-action-disabled); /* Disabled background */
+  --theme-color-components-secondary-button-text-disabled: var(--theme-color-action-disabled); /* Disabled background */
+  --theme-color-components-secondary-button-border: var(--theme-color-action); /* Text link/secondary light text */
+  --theme-color-components-secondary-button-border-disabled: var(--theme-color-action-disabled); /* Disabled background */
   --theme-color-components-chat-background: var(--theme-color-palette-1); /* Dark secondary */
   --theme-color-components-chat-text: var(--theme-color-palette-3); /* Light primary */
-  --theme-color-components-modal-header-background: var(
-    --theme-color-palette-1
-  ); /* Dark secondary */
+  --theme-color-components-modal-header-background: var(--theme-color-palette-1); /* Dark secondary */
   --theme-color-components-modal-header-text: var(--theme-color-palette-3); /* Light primary */
-  --theme-color-components-modal-content-background: var(
-    --theme-color-palette-3
-  ); /* Light primary */
+  --theme-color-components-modal-content-background: var(--theme-color-palette-3); /* Light primary */
   --theme-color-components-modal-content-text: var(--theme-color-palette-0); /* Dark primary */
   --theme-color-components-menu-background: var(--theme-color-palette-3); /* Light primary */
   --theme-color-components-menu-item-text: var(--theme-color-palette-0); /* Dark primary */
   --theme-color-components-menu-item-bg: transparent;
   --theme-color-components-menu-item-hover-bg: rgba(0, 0, 0, 0.05);
   --theme-color-components-menu-item-focus-bg: rgba(0, 0, 0, 0.1);
-  --theme-color-components-form-field-background: var(
-    --theme-color-palette-4
-  ); /* Light secondary */
-  --theme-color-components-form-field-placeholder: var(
-    --theme-color-action-disabled
-  ); /* Disabled background */
+  --theme-color-components-form-field-background: var(--theme-color-palette-4); /* Light secondary */
+  --theme-color-components-form-field-placeholder: var(--theme-color-action-disabled); /* Disabled background */
   --theme-color-components-form-field-text: var(--theme-color-palette-0); /* Dark primary */
   --theme-color-components-form-field-border: var(--theme-color-palette-0); /* Dark primary */
   --theme-color-components-video-background: var(--theme-color-palette-2); /* Dark alternate */
@@ -158,10 +126,6 @@
   --color-owncast-palette-13: #42bea6; /* Fun color 3 */
   --color-owncast-palette-error: #ff4b39; /* Error */
   --color-owncast-palette-warning: #ffc655; /* Warning */
-  --font-owncast-body: 'Open Sans', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
-    'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
-    'Segoe UI Symbol', 'Noto Color Emoji';
-  --font-owncast-display: 'Poppins', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
-    'Segoe UI Symbol', 'Noto Color Emoji';
+  --font-owncast-body: 'Open Sans', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+  --font-owncast-display: 'Poppins', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
 }