diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 2d9061bffc3..69e111f445e 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -15,12 +15,12 @@ body img.emoji {
   margin-top: -100px;
   left: 50%;
   top: 50%;
-  background-color: #dadada;
+  background-color: dark-light-choose(#dadada, blend-primary-secondary(5%));
 }
 
 .emoji-page td {
   border: 1px solid transparent;
-  background-color: white;
+  background-color: dark-light-choose(white, $secondary);
 }
 
 .emoji-page a {
@@ -30,13 +30,13 @@ body img.emoji {
 }
 
 .emoji-page a:hover {
-  background-color: rgb(210, 236, 252);
+  background-color: dark-light-choose(rgb(210, 236, 252), rgb(45, 19, 3));
 }
 
 .emoji-table-wrapper {
   min-width: 442px;
   min-height: 185px;
-  background-color: white;
+  background-color: $secondary;
 }
 
 .emoji-modal-wrapper {
@@ -46,7 +46,7 @@ body img.emoji {
   top: 0;
   width: 100%;
   height: 100%;
-  opacity: 0.8;
+  opacity: dark-light-choose(0.8, 0.5);
   background-color: black;
 }
 
@@ -61,11 +61,11 @@ body img.emoji {
 
 .emoji-modal .toolbar li a {
   padding: 8px;
-  background-color: #dadada;
+  background-color: dark-light-choose(#dadada, blend-primary-secondary(5%));
 }
 
 .emoji-modal .toolbar li a.selected {
-  background-color: #fff;
+  background-color: $secondary;
 }
 
 .emoji-modal .info {
@@ -78,6 +78,7 @@ body img.emoji {
 .emoji-modal .info span {
   margin-left: 5px;
   font-weight: bold;
+  color: $primary;
 }
 
 .emoji-modal .info {
@@ -89,10 +90,10 @@ body img.emoji {
 }
 
 .emoji-modal .nav span {
-  color: #aaa;
+  color: dark-light-choose(#aaa, #555);
   margin-right: 10px;
 }
 
 .emoji-modal .nav a {
-  color: #333;
+  color: dark-light-choose(#333, #ccc);
 }
diff --git a/app/assets/stylesheets/common/base/pagedown.scss b/app/assets/stylesheets/common/base/pagedown.scss
index 8cac61a14ff..d7d411f6311 100644
--- a/app/assets/stylesheets/common/base/pagedown.scss
+++ b/app/assets/stylesheets/common/base/pagedown.scss
@@ -133,6 +133,8 @@
 
 .wmd-prompt-dialog > form > input[type="button"] {
   border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
+  background: dark-light-choose(initial, blend-primary-secondary(50%));
+  color: dark-light-choose(inherit, $secondary);
   font-family: trebuchet MS, helvetica, sans-serif;
   font-size: 0.8em;
   font-weight: bold;
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index ab1437c0685..1ff8dc3d4b8 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -276,7 +276,7 @@ table.md-table {
       font-size: 35px;
       width: 45px;
       text-align: center;
-      color: dark-light-diff($primary, $secondary, 75%, 20%);
+      color: dark-light-diff($primary, $secondary, 75%, -20%);
     }
   }
 
@@ -286,7 +286,7 @@ table.md-table {
     text-transform: uppercase;
     font-weight: bold;
     font-size: 0.9em;
-    color: dark-light-diff($primary, $secondary, 50%, 0%);
+    color: dark-light-diff($primary, $secondary, 50%, -30%);
 
     .custom-message {
       text-transform: none;
diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss
index d83ea438d93..67c361ff202 100644
--- a/app/assets/stylesheets/common/components/badges.css.scss
+++ b/app/assets/stylesheets/common/components/badges.css.scss
@@ -236,16 +236,16 @@
   font-size: 11px;
   line-height: 1;
   text-align: center;
-  background-color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 30%));
+  background-color: dark-light-choose(scale-color($primary, $lightness: 70%), scale-color($secondary, $lightness: 70%));
   &[href] {
-  color: $secondary;
+    color: $secondary;
   }
 
   // New posts
 
   &.new-posts, &.unread-posts {
-    background-color: dark-light-choose(scale-color($tertiary, $lightness: 50%), scale-color($tertiary, $lightness: 20%));
-    color: $secondary;
+    background-color: dark-light-choose(scale-color($tertiary, $lightness: 50%), $tertiary);
+    color: dark-light-choose($secondary, $secondary);
     font-weight: dark-light-choose(normal, bold);
   }
 
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index e25653136a8..5e250612c12 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -77,13 +77,11 @@ body {
 
   .grippie {
     width: 100%;
-    border: 1px solid;
-    border-right-width: 0;
-    border-left-width: 0;
     cursor: row-resize;
     height: 11px;
     overflow: hidden;
     display:block;
+    border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
     background: image-url("grippie.png") dark-light-diff($primary, $secondary, 90%, -60%) no-repeat center 3px;
   }
 }
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index 4823de49ab3..c8a39b3799e 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -484,7 +484,7 @@
       text-overflow: ellipsis;
     }
     .edit-reason {
-      background-color: scale-color($highlight, $lightness: 25%);
+      background-color: dark-light-choose(scale-color($highlight, $lightness: 25%), scale-color($highlight, $lightness: -50%));
       padding: 3px 5px 5px 5px;
     }
     .remove-bookmark {