diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index 7170b0921..ad4004264 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -26,7 +26,7 @@
 
       .number, .time-read {
         font-size: 1.4em;
-        color: dark-light-diff($primary, $secondary, 50%, -50%);
+        color: dark-light-diff($primary, $secondary, 50%, -20%);
       }
     }
 
@@ -35,7 +35,7 @@
         background-color: dark-light-diff($highlight, $secondary, 70%, -80%);
 
         .username a, .name, .title, .number, .time-read {
-          color: scale-color($highlight, $lightness: -50%);
+          color: dark-light-choose(scale-color($highlight, $lightness: -50%), scale-color($highlight, $lightness: 50%));
         }
       }
     }
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 0013fab8c..f0eee220a 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -129,6 +129,11 @@ aside.quote {
   }
 }
 
+.topic-body {
+  &.highlighted {
+    background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
+  }
+}
 .wiki .topic-body {
   background-color: dark-light-diff($wiki, $secondary, 95%, -50%);
 }
@@ -269,7 +274,7 @@ table.md-table {
       font-size: 35px;
       width: 45px;
       text-align: center;
-      color: lighten($primary, 75%);
+      color: dark-light-diff($primary, $secondary, 75%, 20%);
     }
   }
 
@@ -279,7 +284,7 @@ table.md-table {
     text-transform: uppercase;
     font-weight: bold;
     font-size: 0.9em;
-    color: lighten($primary, 50%);
+    color: dark-light-diff($primary, $secondary, 50%, 0%);
 
     .custom-message {
       text-transform: none;
diff --git a/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss b/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss
index 1aa845d89..aeff2b777 100644
--- a/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss
+++ b/app/assets/stylesheets/common/components/keyboard_shortcuts.css.scss
@@ -28,18 +28,13 @@
     }
 
     b {
-      color: #000;
-      background: #eee;
-      border-style: solid;
-      border-color: #ccc #aaa #888 #bbb;
       padding: 2px 6px;
       border-radius: 4px;
-      box-shadow: 0 2px 0 rgba(0,0,0,0.2),0 0 0 1px #fff inset;
-      background-color: #fafafa;
-      border-color: #ccc #ccc #fff;
-      border-style: solid solid none;
-      border-width: 1px 1px medium;
-      color: #444;
+      box-shadow: 0 2px 0 rgba(0,0,0,0.2),0 0 0 1px dark-light-choose(#fff,#000) inset;
+      background: dark-light-choose(#fafafa, #333);
+      border: 1px solid dark-light-choose(#ccc, #555);
+      border-bottom: medium none dark-light-choose(#fff, #000);
+      color: dark-light-choose(#444, #aaa);
       white-space: nowrap;
       display: inline-block;
     }
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 181d06551..b97435341 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -699,9 +699,6 @@ $topic-avatar-width: 45px;
   z-index: 2;
   border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
   padding: 12px $topic-body-width-padding 15px $topic-body-width-padding;
-  &.highlighted {
-    background-color: dark-light-diff($tertiary, $secondary, 85%, -65%);
-  }
 }
 .topic-avatar {
   border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index 027beaa53..2f5af264d 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -214,7 +214,6 @@
     width: 100%;
     margin-bottom: 10px;
     overflow: hidden;
-    color: $secondary;
 
     &.group {
       .details {
@@ -269,7 +268,7 @@
     .details {
       padding: 15px 15px 4px 15px;
       margin-top: -200px;
-      background: rgba($primary, .85);
+      background: dark-light-choose(rgba($primary, .85), rgba($secondary, .85));
       transition: margin .15s linear;
 
       h1 {
@@ -316,20 +315,20 @@
         width: 100%;
         position: relative;
         float: left;
-        color: $secondary;
+        color: dark-light-choose($secondary, lighten($primary, 10%));
 
         h1 {font-weight: bold;}
 
         .primary-textual {
           padding: 3px;
           a[href] {
-            color: $secondary;
+            color: dark-light-choose($secondary, lighten($primary, 10%));
 
           }
         }
 
         .bio {
-          color: $secondary;
+          color: dark-light-choose($secondary, lighten($primary, 10%));
           max-height: 300px;
           overflow: auto;
           max-width: 750px;
@@ -396,7 +395,7 @@
     .details {
       padding: 12px 15px 2px 15px;
       margin-top: 0;
-      background: rgba($primary, 1);
+      background: dark-light-choose(rgba($primary, 1), scale-color($secondary, $lightness: 40%));
       .bio { display: none; }
 
       .primary {
@@ -533,21 +532,21 @@
   .staff-counters {
     text-align: left;
     background: $primary;
+    color: $secondary;
+    a {
+      color: $secondary;
+    }
     > div {
       margin: 0 10px 0 0;
       display: inline-block;
       padding: 5px 0;
       &:first-of-type {
         padding-left: 10px;
-        }
+      }
       span {
         padding: 1px 5px;
         border-radius: 10px;
-        }
-
-    }
-    a {
-      color: $secondary;
+      }
     }
     .active {
       font-weight: bold;
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 77b634c92..fbde0923a 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -463,12 +463,8 @@ blockquote {
 
 .posts-wrapper {  position: relative; }
 
-.topic-body.highlighted {
-  background-color: scale-color($tertiary, $lightness: 75%);
-}
-
 span.highlighted {
-  background-color: scale-color($highlight, $lightness: 70%);
+  background-color: dark-light-choose(scale-color($highlight, $lightness: 70%), $highlight);
 }
 
 .topic-avatar {