diff --git a/app/styles/basics.scss b/app/styles/basics.scss
index 458526353..fd7f33ac1 100644
--- a/app/styles/basics.scss
+++ b/app/styles/basics.scss
@@ -159,7 +159,7 @@ button {
 }
 
 ::selection {
-  background: var(--brand-color);
+  background: var(--highlight-text-color);
   color: #ffffff;
 }
 
diff --git a/app/styles/components/compose-form.scss b/app/styles/components/compose-form.scss
index 52cb2c020..7091e42e1 100644
--- a/app/styles/components/compose-form.scss
+++ b/app/styles/components/compose-form.scss
@@ -153,7 +153,6 @@
     box-shadow: 4px 4px 6px rgba($base-shadow-color, 0.4);
     background: var(--background-color);
     border-radius: 0 0 4px 4px;
-    color: var(--inverted-text-color);
     font-size: 14px;
     padding: 6px;
     &.autosuggest-textarea__suggestions--visible {display: block;}
@@ -168,7 +167,7 @@
     &:focus,
     &:active,
     &.selected {
-      background: var(--background-color);
+      background: var(--brand-color-med);
     }
   }
 
@@ -191,7 +190,7 @@
   }
 
   .autosuggest-account .display-name__account {
-    color: var(--highlight-text-color-faint);
+    color: var(--primary-text-color-faint);
   }
 
   .compose-form__modifiers {
diff --git a/app/styles/forms.scss b/app/styles/forms.scss
index 53c8fc65f..3ef1ca2d9 100644
--- a/app/styles/forms.scss
+++ b/app/styles/forms.scss
@@ -318,7 +318,7 @@ code {
     outline: 0;
     font-family: inherit;
     resize: vertical;
-    background: var(--foreground-color);
+    background: var(--background-color);
     border: 1px solid var(--highlight-text-color);
     border-radius: 4px;
     padding: 10px;