diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less
index 598197d9d..3be7c29d6 100644
--- a/customize.dist/src/less2/include/colortheme-dark.less
+++ b/customize.dist/src/less2/include/colortheme-dark.less
@@ -79,8 +79,8 @@
 @cp_messenger-online: @cryptpad_color_light_green;
 
 // Alertify
-@cp_alertify-bg: @cryptpad_color_white;
-@cp_alertify-fg: @cryptpad_color_brand;
+@cp_alertify-bg: @cryptpad_color_light_grey;
+@cp_alertify-fg: lighten(@cryptpad_color_brand, 30%);
 @cp_alertify-hover: fade(@cp_alertify-fg, 25%);
 @cp_alertify-overlay: fade(@cryptpad_text_col, 50%);
 @cp_alertify-log-bg: fade(@cryptpad_color_brand, 90%);
@@ -90,7 +90,7 @@
 
 // Forms
 @cp_forms-fg: @cryptpad_text_col;
-@cp_forms-bg: @cryptpad_color_white;
+@cp_forms-bg: @cryptpad_color_toolbar_grey; // XXX
 @cp_forms-border: @cryptpad_color_brand;
 @cp_forms-placeholder: @cryptpad_color_dark_grey;
 @cp_forms-readonly: fade(@cryptpad_color_brand, 25%);
diff --git a/customize.dist/src/less2/include/forms.less b/customize.dist/src/less2/include/forms.less
index 26ba00d96..6cdba7ec1 100644
--- a/customize.dist/src/less2/include/forms.less
+++ b/customize.dist/src/less2/include/forms.less
@@ -11,6 +11,7 @@
     input:not(.form-control):not([type="checkbox"]), textarea, div.cp-textarea {
         // background-color: @alertify-input-fg;
         color: @cp_forms-fg;
+        background-color: @cp_forms-bg;
         border: 1px solid @cp_forms-border;
         width: 100%;
         font-size: 100%;
@@ -53,7 +54,6 @@
     div.cp-textarea {
         height: 60px;
         width: 100%;
-        background-color: white;
         cursor: text;
         outline: none;
         white-space: pre-wrap;
diff --git a/www/pad/app-pad.less b/www/pad/app-pad.less
index d06b72554..c51fcc603 100644
--- a/www/pad/app-pad.less
+++ b/www/pad/app-pad.less
@@ -133,7 +133,6 @@ body.cp-app-pad {
         #cp-app-pad-comments {
             order: 3;
             width: 330px;
-            //background-color: white;
             margin: 0px 20px;
             .comments_main();
         }