diff --git a/conversejs/custom/sass/_peertubetheme.scss b/conversejs/custom/sass/_peertubetheme.scss
index 830d2530..0efa2c48 100644
--- a/conversejs/custom/sass/_peertubetheme.scss
+++ b/conversejs/custom/sass/_peertubetheme.scss
@@ -37,6 +37,12 @@
   }
 
   .chat-msg__text {
+    // spoiler content more visible.
+    &.spoiler {
+      color: var(--peertube-grey-foreground) !important;
+      background-color: var(--peertube-grey-background) !important;
+    }
+
     // underline links in chat messages
     a[href] {
       text-decoration: underline;
@@ -47,6 +53,12 @@
     }
   }
 
+  .correcting {
+    // Fix color/background-color for correcting messages and textareas
+    color: var(--peertube-grey-foreground) !important;
+    background-color: var(--peertube-grey-background) !important;
+  }
+
   // hidding avatars when screen width is not big enough.
   @media screen and (max-width: 576px) {
     .message {
diff --git a/conversejs/custom/sass/_variables.scss b/conversejs/custom/sass/_variables.scss
index dd841d74..98745026 100644
--- a/conversejs/custom/sass/_variables.scss
+++ b/conversejs/custom/sass/_variables.scss
@@ -96,7 +96,7 @@
   --heading-color: #9b4d;
   --chatroom-badge-color: var(--peertube-button-background);
   --chatroom-badge-hover-color: var(--peertube-button-background);
-  --chatroom-correcting-color: #ffffc0;
+  --chatroom-correcting-color: var(--peertube-grey-background);
   --chatroom-head-bg-color-dark: #d24e2b;
   --chatroom-head-bg-color: var(--peertube-menu-background);
   --chatroom-head-border-bottom: 1px solid var(--peertube-grey-foreground);