diff --git a/gnome-shell/_drawing.scss b/gnome-shell/_drawing.scss
index ef72e48..5c7330b 100755
--- a/gnome-shell/_drawing.scss
+++ b/gnome-shell/_drawing.scss
@@ -143,7 +143,7 @@
   //
 
     color: $fg_color;
-    background-color: $main_dark;
+    background-color: lighten(mix($bg_color, $base_color, 15%), 4%);
     box-shadow: none;
     border: 1px solid $borders_color;
     text-shadow: 0 1px black;
@@ -156,8 +156,8 @@
   //
     $_bg: if($c!=$osd_bg_color, transparentize($c, 0.5),
                           $osd_bg_color);
-
-    color: $selected_bg_color;
+		background-color: lighten(mix($bg_color, $base_color, 15%), 8%);
+    color: $selected_fg_color;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     box-shadow: none;
@@ -171,8 +171,8 @@
     $_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
                             lighten($main_dark, 2%));
 
-    color: $selected_bg_color;
-    background-color: $_bg;
+		background-color: lighten(mix($bg_color, $base_color, 15%), 7%);
+    color: $selected_fg_color;
     border: 1px solid $borders_color;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
diff --git a/gnome-shell/gnome-shell.css b/gnome-shell/gnome-shell.css
index 4a3f274..63058d8 100644
--- a/gnome-shell/gnome-shell.css
+++ b/gnome-shell/gnome-shell.css
@@ -10,7 +10,7 @@ stage {
 /* Buttons */
 .button {
   color: #bfc3cd;
-  background-color: #06070c;
+  background-color: #171b2e;
   box-shadow: none;
   border: 1px solid #0b0d16;
   text-shadow: 0 1px black;
@@ -20,7 +20,8 @@ stage {
   border-width: 0;
   padding: 4px 32px; }
   .button:focus {
-    color: #ff6a00;
+    background-color: #1e233b;
+    color: #fefefe;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     box-shadow: none;
@@ -39,8 +40,8 @@ stage {
     text-shadow: none;
     icon-shadow: none; }
   .button:hover {
-    color: #ff6a00;
-    background-color: #090b13;
+    background-color: #1c2138;
+    color: #fefefe;
     border: 1px solid #0b0d16;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black; }
@@ -67,20 +68,22 @@ stage {
     text-shadow: none;
     icon-shadow: none; }
   .modal-dialog-linked-button:focus {
-    color: #ff6a00;
+    background-color: #1e233b;
+    color: #fefefe;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     box-shadow: none;
     border: 1px solid #0b0d16; }
     .modal-dialog-linked-button:focus:hover {
-      color: #ff6a00;
+      background-color: #1e233b;
+      color: #fefefe;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
       box-shadow: none;
       border: 1px solid #0b0d16; }
   .modal-dialog-linked-button:hover {
-    color: #ff6a00;
-    background-color: #090b13;
+    background-color: #1c2138;
+    color: #fefefe;
     border: 1px solid #0b0d16;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black; }
@@ -1009,7 +1012,7 @@ StScrollBar {
 
 .message-list-clear-button.button {
   color: #bfc3cd;
-  background-color: #06070c;
+  background-color: #171b2e;
   box-shadow: none;
   border: 1px solid #0b0d16;
   text-shadow: 0 1px black;
@@ -1017,8 +1020,8 @@ StScrollBar {
   border: 1px solid #0b0d16;
   margin: 1.5em 1.5em 0; }
   .message-list-clear-button.button:hover, .message-list-clear-button.button:focus {
-    color: #ff6a00;
-    background-color: #090b13;
+    background-color: #1c2138;
+    color: #fefefe;
     border: 1px solid #0b0d16;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black; }
@@ -1709,7 +1712,7 @@ StScrollBar {
 
 .keyboard-key {
   color: #bfc3cd;
-  background-color: #06070c;
+  background-color: #171b2e;
   box-shadow: none;
   border: 1px solid #0b0d16;
   text-shadow: 0 1px black;
@@ -1722,14 +1725,15 @@ StScrollBar {
   font-weight: bold;
   border-radius: 5px; }
   .keyboard-key:focus {
-    color: #ff6a00;
+    background-color: #1e233b;
+    color: #fefefe;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     box-shadow: none;
     border: 1px solid #0b0d16; }
   .keyboard-key:hover, .keyboard-key:checked {
-    color: #ff6a00;
-    background-color: #090b13;
+    background-color: #1c2138;
+    color: #fefefe;
     border: 1px solid #0b0d16;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black; }
@@ -1813,15 +1817,15 @@ StScrollBar {
     padding: 3px 18px; }
     .login-dialog .modal-dialog-button:default {
       color: #bfc3cd;
-      background-color: #06070c;
+      background-color: #171b2e;
       box-shadow: none;
       border: 1px solid #0b0d16;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
       border: 1px solid #0b0d16; }
       .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus {
-        color: #ff6a00;
-        background-color: rgba(255, 106, 0, 0.7);
+        background-color: #1c2138;
+        color: #fefefe;
         border: 1px solid #0b0d16;
         text-shadow: 0 1px black;
         icon-shadow: 0 1px black; }
diff --git a/gnome-shell/v40/gnome-shell.css b/gnome-shell/v40/gnome-shell.css
index cfa5b5b..9ec8987 100644
--- a/gnome-shell/v40/gnome-shell.css
+++ b/gnome-shell/v40/gnome-shell.css
@@ -10,7 +10,7 @@ stage {
 /* Buttons */
 .button {
   color: #bfc3cd;
-  background-color: #06070c;
+  background-color: #171b2e;
   box-shadow: none;
   border: 1px solid #0b0d16;
   text-shadow: 0 1px black;
@@ -19,7 +19,8 @@ stage {
   border-radius: 4px;
   padding: 4px 32px; }
   .button:focus {
-    color: #ff6a00;
+    background-color: #1e233b;
+    color: #fefefe;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     box-shadow: none;
@@ -38,8 +39,8 @@ stage {
     text-shadow: none;
     icon-shadow: none; }
   .button:hover {
-    color: #ff6a00;
-    background-color: #090b13;
+    background-color: #1c2138;
+    color: #fefefe;
     border: 1px solid #0b0d16;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black; }
@@ -66,20 +67,22 @@ stage {
     text-shadow: none;
     icon-shadow: none; }
   .modal-dialog-linked-button:focus {
-    color: #ff6a00;
+    background-color: #1e233b;
+    color: #fefefe;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     box-shadow: none;
     border: 1px solid #0b0d16; }
     .modal-dialog-linked-button:focus:hover {
-      color: #ff6a00;
+      background-color: #1e233b;
+      color: #fefefe;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
       box-shadow: none;
       border: 1px solid #0b0d16; }
   .modal-dialog-linked-button:hover {
-    color: #ff6a00;
-    background-color: #090b13;
+    background-color: #1c2138;
+    color: #fefefe;
     border: 1px solid #0b0d16;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black; }
@@ -1670,7 +1673,7 @@ StScrollBar {
 
 .keyboard-key {
   color: #bfc3cd;
-  background-color: #06070c;
+  background-color: #171b2e;
   box-shadow: none;
   border: 1px solid #0b0d16;
   text-shadow: 0 1px black;
@@ -1683,14 +1686,15 @@ StScrollBar {
   font-weight: bold;
   border-radius: 5px; }
   .keyboard-key:focus {
-    color: #ff6a00;
+    background-color: #1e233b;
+    color: #fefefe;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
     box-shadow: none;
     border: 1px solid #0b0d16; }
   .keyboard-key:hover, .keyboard-key:checked {
-    color: #ff6a00;
-    background-color: #090b13;
+    background-color: #1c2138;
+    color: #fefefe;
     border: 1px solid #0b0d16;
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black; }
@@ -1774,15 +1778,15 @@ StScrollBar {
     padding: 3px 18px; }
     .login-dialog .modal-dialog-button:default {
       color: #bfc3cd;
-      background-color: #06070c;
+      background-color: #171b2e;
       box-shadow: none;
       border: 1px solid #0b0d16;
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
       border: 1px solid #0b0d16; }
       .login-dialog .modal-dialog-button:default:hover, .login-dialog .modal-dialog-button:default:focus {
-        color: #ff6a00;
-        background-color: rgba(255, 106, 0, 0.7);
+        background-color: #1c2138;
+        color: #fefefe;
         border: 1px solid #0b0d16;
         text-shadow: 0 1px black;
         icon-shadow: 0 1px black; }