diff --git a/app/javascript/styles/chinwag_light/overrides.scss b/app/javascript/styles/chinwag_light/overrides.scss
index 7300f23d6..d145b1a5b 100644
--- a/app/javascript/styles/chinwag_light/overrides.scss
+++ b/app/javascript/styles/chinwag_light/overrides.scss
@@ -75,8 +75,12 @@ button.icon-button.disabled i.fa-retweet {
   background: darken($classic-base-color, 15%);
 }
 
-.autosuggest-textarea__textarea, 
-.spoiler-input__input {
+.drawer__inner__mastodon {
+  background: darken($classic-base-color, 15%) url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 234.80078 31.757813" width="234.80078" height="31.757812"><path d="M19.599609 0c-1.05 0-2.10039.375-2.90039 1.125L0 16.925781v14.832031h234.80078V17.025391l-16.5-15.900391c-1.6-1.5-4.20078-1.5-5.80078 0l-13.80078 13.099609c-1.6 1.5-4.19883 1.5-5.79883 0L179.09961 1.125c-1.6-1.5-4.19883-1.5-5.79883 0L159.5 14.224609c-1.6 1.5-4.20078 1.5-5.80078 0L139.90039 1.125c-1.6-1.5-4.20078-1.5-5.80078 0l-13.79883 13.099609c-1.6 1.5-4.20078 1.5-5.80078 0L100.69922 1.125c-1.600001-1.5-4.198829-1.5-5.798829 0l-13.59961 13.099609c-1.6 1.5-4.200781 1.5-5.800781 0L61.699219 1.125c-1.6-1.5-4.198828-1.5-5.798828 0L42.099609 14.224609c-1.6 1.5-4.198828 1.5-5.798828 0L22.5 1.125C21.7.375 20.649609 0 19.599609 0z" fill="#{hex-color($ui-base-color)}"/></svg>') no-repeat bottom / 100% auto;
+}
+
+.compose-form .autosuggest-textarea__textarea, 
+.compose-form .spoiler-input__input {
   color: $black;
 }
 
@@ -145,3 +149,13 @@ button.icon-button.disabled i.fa-retweet {
 .upload-progress__tracker {
   background: $classic-primary-color;
 }
+
+.activity-stream .status.light .display-name span {
+    color: $ui-highlight-color;
+}
+
+.activity-stream-tabs a.active,
+.activity-stream .status.light .status__content,
+.activity-stream .status.light .display-name strong {
+    color: $black;
+}
diff --git a/app/javascript/styles/chinwag_light/variables.scss b/app/javascript/styles/chinwag_light/variables.scss
index ad58c9395..00fbc5911 100644
--- a/app/javascript/styles/chinwag_light/variables.scss
+++ b/app/javascript/styles/chinwag_light/variables.scss
@@ -6,11 +6,11 @@ $error-red: #df405a;        // Cerise
 $warning-red: #ff5050;      // Sunset Orange
 $gold-star: #ca8f04;        // Dark Goldenrod
 
-// Values from the classic Mastodon UI
-$classic-base-color: #9c9c9c; //#282c37;         // Midnight Express
-$classic-primary-color: #282c37; //9baec8;      // Echo Blue
-$classic-secondary-color: #204c03; //d9e1e8;    // Pattens Blue
-$classic-highlight-color: #397313;    // Summer Sky
+// Chinwag Greens
+$classic-base-color: #e9f2e1; // Light Base
+$classic-primary-color: #28372c; // Very Dark
+$classic-secondary-color: #638f37; // Darker Green
+$classic-highlight-color: #85c04b; // Lighter Green
 
 // Variables for defaults in UI
 $base-shadow-color: $black !default;