diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less
index 8efc73d6f..286b8f68d 100644
--- a/customize.dist/src/less2/include/colortheme-dark.less
+++ b/customize.dist/src/less2/include/colortheme-dark.less
@@ -134,6 +134,8 @@
 @cryptpad_color_dark_red: #9e0000;
 @cryptpad_color_black: #FFF-#000;
 @cryptpad_color_white: #FFF-#FFF;
+@cryptpad_color_light_green: #c5ffa8;
+@cryptpad_color_green: #5cb85c;
 
 @cryptpad_color_link: #FFF-#0275D8;
 
@@ -147,6 +149,13 @@
 @cp_loading-progress-bar-bg: @colortheme_logo-2;
 @cp_loading-spinner: @cryptpad_color_dark_grey;
 
+// Chat
+@cp_messenger-bg: @cryptpad_color_neutral2_grey;
+@cp_messenger-fg: @cryptpad_text_col;
+@cp_messenger-notif: @cryptpad_color_black;
+@cp_messenger-friend: @cryptpad_color_black;
+@cp_messenger-online: @cryptpad_color_light_green;
+
 // Alertify
 @cp_alertify-bg: @cryptpad_color_white;
 @cp_alertify-fg: @colortheme_logo-2;
@@ -292,6 +301,7 @@
 
 // Support
 @cp_support-bg: @cryptpad_color_lighter_grey;
+@cp_support-msg-fg: @cryptpad_text_col;
 @cp_support-msg-bg: @cryptpad_color_grey;
 @cp_support-header-bg: @cryptpad_color_help_grey;
 
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index ff76b03ee..4f38333b8 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -301,6 +301,7 @@
 
 // Support
 @cp_support-bg: @cryptpad_color_lighter_grey;
+@cp_support-msg-fg: @cryptpad_text_col;
 @cp_support-msg-bg: @cryptpad_color_grey;
 @cp_support-header-bg: @cryptpad_color_help_grey;
 
diff --git a/customize.dist/src/less2/include/support.less b/customize.dist/src/less2/include/support.less
index 2c06a7c4d..05dac86b8 100644
--- a/customize.dist/src/less2/include/support.less
+++ b/customize.dist/src/less2/include/support.less
@@ -58,6 +58,7 @@
                     float: right;
                 }
                 pre {
+                    color: @cp_support-msg-fg;
                     margin-bottom: 0;
                     white-space: pre-wrap;
                     &.cp-support-message-content {
diff --git a/customize.dist/src/less2/include/toolbar.less b/customize.dist/src/less2/include/toolbar.less
index 86df76523..ec6178973 100644
--- a/customize.dist/src/less2/include/toolbar.less
+++ b/customize.dist/src/less2/include/toolbar.less
@@ -15,8 +15,8 @@
     @bg-color: @colortheme_apps[default], // color of the toolbar background
 ) {
     @toolbar-bg-color: @bg-color;
-    @toolbar-bg-color-light: lighten(@bg-color, 30%);
-    @toolbar-bg-color-active: lighten(@bg-color, 20%);
+    @toolbar-bg-color-light: contrast(@cp_toolbar-fg, lighten(@bg-color, 30%), darken(@bg-color, 30%));
+    @toolbar-bg-color-active: contrast(@cp_toolbar-fg, lighten(@bg-color, 20%), darken(@bg-color, 20%));
 };
 
 .toolbar_main (