diff --git a/src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss b/src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss
index 72a4c0b7..2dcd8136 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss
@@ -1,3 +1,7 @@
+// XXX: bleurgh, what is this? These classes totally break the component
+// naming scheme; it's completely unclear where or how they're being used
+// --Matthew
+
 .mx_UserPill {
     color: white;
     background-color: $accent-color;
@@ -25,13 +29,13 @@
     padding: .2em 0;
     margin: 0;
     font-size: 85%;
-    background-color: rgba(0,0,0,.04);
+    background-color: $rte-code-bg-color;
     border-radius: 3px;
 }
 
 .mx_Markdown_HR {
     display: block;
-    background: #e7e7e7;
+    background: $rte-bg-color;
 }
 
 .mx_Markdown_STRIKETHROUGH {
diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss
index cc725822..3a33df95 100644
--- a/src/skins/vector/css/themes/_base.scss
+++ b/src/skins/vector/css/themes/_base.scss
@@ -74,6 +74,9 @@ $settings-grey-fg-color: #a2a2a2;
 $voip-decline-color: #f48080;
 $voip-accept-color: #80f480;
 
+$rte-bg-color: #e9e9e9;
+$rte-code-bg-color: rgba(0, 0, 0, 0.04);
+
 // ********************
 
 $roomtile-name-color: rgba(69, 69, 69, 0.8);
diff --git a/src/skins/vector/css/themes/_dark.scss b/src/skins/vector/css/themes/_dark.scss
index a74d9f46..2e0e6607 100644
--- a/src/skins/vector/css/themes/_dark.scss
+++ b/src/skins/vector/css/themes/_dark.scss
@@ -74,6 +74,9 @@ $settings-grey-fg-color: #a2a2a2;
 $voip-decline-color: #f48080;
 $voip-accept-color: #80f480;
 
+$rte-bg-color: #353535;
+$rte-code-bg-color: #000;
+
 // ********************
 
 $roomtile-name-color: rgba(186, 186, 186, 0.8);