don't use selected_fg_color in weird places

4 files changed, 153 insertions, 140 deletions

diff --git a/common/gnome-shell/3.18/gnome-shell-dark.css b/common/gnome-shell/3.18/gnome-shell-dark.css
index 9258d06..9b7463c 100644
--- a/common/gnome-shell/3.18/gnome-shell-dark.css
+++ b/common/gnome-shell/3.18/gnome-shell-dark.css
@@ -39,7 +39,7 @@ stage {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #D3DAE3;
     background-color: #444a58;
-    border: 1px solid #5294E2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 1px rgba(68, 74, 88, 0.05); }
   .button:hover, .notification-banner .notification-button:hover, .hotplug-notification-item:hover {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
@@ -51,12 +51,12 @@ stage {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #D3DAE3;
     background-color: #444a58;
-    border: 1px solid #5294E2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 1px rgba(68, 74, 88, 0.05); }
   .button:active, .notification-banner .notification-button:active, .hotplug-notification-item:active, .button:active:focus, .notification-banner .notification-button:active:focus, .hotplug-notification-item:active:focus {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #ffffff;
-    background-color: #5294E2;
+    background-color: #5294e2;
     border: 1px solid #2b2e39;
     box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); }
   .button:insensitive, .notification-banner .notification-button:insensitive, .hotplug-notification-item:insensitive {
@@ -70,7 +70,7 @@ StEntry {
   padding: 7px;
   caret-size: 1px;
   caret-color: #D3DAE3;
-  selection-background-color: #5294E2;
+  selection-background-color: #5294e2;
   selected-color: #ffffff;
   transition-duration: 300ms;
   border-radius: 3px;
@@ -81,7 +81,7 @@ StEntry {
   StEntry:focus, StEntry:hover {
     color: #D3DAE3;
     background-color: #404552;
-    border: 1px solid #5294E2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(64, 69, 82, 0.05); }
   StEntry:insensitive {
     color: rgba(211, 218, 227, 0.45);
@@ -115,13 +115,13 @@ StScrollBar {
     StScrollBar StButton#vhandle:hover, StScrollBar StButton#hhandle:hover {
       background-color: #676b78; }
     StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
-      background-color: #5294E2; }
+      background-color: #5294e2; }
 
 .slider {
   -slider-height: 4px;
   -slider-background-color: #2b2e39;
   -slider-border-color: transparent;
-  -slider-active-background-color: #5294E2;
+  -slider-active-background-color: #5294e2;
   -slider-active-border-color: transparent;
   -slider-border-width: 0;
   -slider-handle-radius: 0px;
@@ -197,10 +197,10 @@ StScrollBar {
     .modal-dialog-linked-button:hover {
       background-color: rgba(64, 69, 83, 0.95); }
     .modal-dialog-linked-button:focus {
-      color: #5294E2; }
+      color: #5294e2; }
     .modal-dialog-linked-button:active {
       color: #ffffff;
-      background-color: #5294E2; }
+      background-color: #5294e2; }
     .modal-dialog-linked-button:insensitive {
       color: rgba(186, 195, 207, 0.5);
       background-color: rgba(49, 52, 63, 0.95); }
@@ -275,13 +275,13 @@ StScrollBar {
     color: #e3e7ed;
     font-size: 8pt; }
   .end-session-dialog .modal-dialog-linked-button:last-child {
-    color: #ffffff;
+    color: white;
     background-color: #F04A50; }
     .end-session-dialog .modal-dialog-linked-button:last-child:hover {
-      color: #ffffff;
+      color: white;
       background-color: #f47479; }
     .end-session-dialog .modal-dialog-linked-button:last-child:active {
-      color: #ffffff;
+      color: white;
       background-color: #ee3239; }
 
 .shell-mount-operation-icon {
@@ -404,8 +404,8 @@ StScrollBar {
   border: 1px solid #2b2e39;
   border-radius: 3px; }
   .audio-selection-device:active, .audio-selection-device:hover, .audio-selection-device:focus {
-    background-color: #5294E2;
-    border-color: #5294E2; }
+    background-color: #5294e2;
+    border-color: #5294e2; }
 
 .audio-selection-device-box {
   padding: 20px;
@@ -512,7 +512,7 @@ StScrollBar {
   margin: 32px;
   min-width: 64px;
   min-height: 64px;
-  color: #ffffff;
+  color: white;
   background: none;
   border: none;
   border-radius: 5px;
@@ -524,7 +524,7 @@ StScrollBar {
     height: 4px;
     background-color: rgba(0, 0, 0, 0.5);
     border-radius: 2px;
-    color: #5294E2; }
+    color: #5294e2; }
 
 .resize-popup {
   color: #BAC3CF;
@@ -551,11 +551,11 @@ StScrollBar {
     border-radius: 2px; }
     .switcher-list .item-box:outlined {
       padding: 8px;
-      border: 1px solid #5294E2; }
+      border: 1px solid #5294e2; }
     .switcher-list .item-box:selected {
       color: #ffffff;
-      background-color: #5294E2;
-      border: 1px solid #5294E2; }
+      background-color: #5294e2;
+      border: 1px solid #5294e2; }
   .switcher-list .thumbnail-box {
     padding: 2px;
     spacing: 4px; }
@@ -569,7 +569,7 @@ StScrollBar {
   border-color: transparent;
   color: #BAC3CF; }
   .switcher-arrow:highlighted {
-    color: #ffffff; }
+    color: white; }
 
 .input-source-switcher-symbol {
   font-size: 34pt;
@@ -592,10 +592,10 @@ StScrollBar {
 
 .ws-switcher-active-up, .ws-switcher-active-down {
   height: 30px;
-  background-color: #5294E2;
+  background-color: #5294e2;
   background-size: 96px;
   border-radius: 2px;
-  border: 1px solid #5294E2; }
+  border: 1px solid #5294e2; }
 
 .ws-switcher-active-up {
   background-image: url("common-assets/misc/ws-switch-arrow-up.png"); }
@@ -611,7 +611,7 @@ StScrollBar {
 
 .tile-preview {
   background-color: rgba(82, 148, 226, 0.35);
-  border: 1px solid #5294E2; }
+  border: 1px solid #5294e2; }
   .tile-preview-left.on-primary {
     border-radius: 0px 0 0 0; }
   .tile-preview-right.on-primary {
@@ -651,7 +651,7 @@ StScrollBar {
     -natural-hpadding: 10px;
     -minimum-hpadding: 6px;
     font-weight: bold;
-    color: #ffffff;
+    color: white;
     transition-duration: 100ms;
     border-bottom-width: 1px;
     border-color: transparent; }
@@ -661,13 +661,13 @@ StScrollBar {
       margin-left: 0px;
       margin-right: 0px; }
     #panel .panel-button:hover {
-      color: #ffffff;
+      color: white;
       background-color: rgba(0, 0, 0, 0.17);
       border-bottom-width: 1px;
       border-color: transparent; }
     #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
       color: #ffffff;
-      background-color: #5294E2;
+      background-color: #5294e2;
       box-shadow: none;
       border-bottom-width: 1px;
       border-color: black; }
@@ -698,7 +698,7 @@ StScrollBar {
   #panel .screencast-indicator {
     color: #FC4138; }
   #panel .clock-display > * > *:last-child {
-    color: #5294E2;
+    color: #5294e2;
     margin-left: .3em; }
   #panel .popup-menu-arrow {
     width: 0; }
@@ -755,11 +755,11 @@ StScrollBar {
     padding: 13px;
     color: #D3DAE3;
     background-color: transparent;
-    border: 1px solid #5294E2; }
+    border: 1px solid #5294e2; }
   .system-menu-action:active {
     color: #ffffff;
-    background-color: #5294E2;
-    border: 1px solid #5294E2; }
+    background-color: #5294e2;
+    border: 1px solid #5294e2; }
   .system-menu-action > StIcon {
     icon-size: 16px; }
 
@@ -813,7 +813,7 @@ StScrollBar {
   .message-list-section-title:active {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #ffffff;
-    background-color: #5294E2;
+    background-color: #5294e2;
     border: 1px solid #2b2e39;
     box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); }
 
@@ -909,11 +909,11 @@ StScrollBar {
 .calendar-today:hover {
   font-weight: bold;
   color: #ffffff;
-  background-color: #5294E2;
+  background-color: #5294e2;
   border-width: 0; }
 
 .calendar-day-with-events {
-  color: #5294E2;
+  color: #5294e2;
   font-weight: bold; }
 
 .calendar-today.calendar-day-with-events {
@@ -1004,7 +1004,7 @@ StScrollBar {
   .message-media-control:hover {
     color: #D3DAE3; }
   .message-media-control:active {
-    color: #5294E2; }
+    color: #5294e2; }
 
 .media-message-cover-icon {
   icon-size: 32px; }
@@ -1082,7 +1082,7 @@ StScrollBar {
     padding: 12px;
     spacing: 0px; }
     .nm-dialog-item:selected {
-      background-color: #5294E2;
+      background-color: #5294e2;
       color: #ffffff; }
   .nm-dialog-icons {
     spacing: .5em; }
@@ -1138,9 +1138,9 @@ StScrollBar {
   .search-entry:hover, .search-entry:focus {
     color: #ffffff;
     caret-color: #ffffff;
-    background-color: #5294E2;
+    background-color: #5294e2;
     selection-background-color: #ffffff;
-    selected-color: #5294E2; }
+    selected-color: #5294e2; }
     .search-entry:hover .search-entry-icon, .search-entry:focus .search-entry-icon {
       color: #ffffff; }
 
@@ -1172,7 +1172,7 @@ StScrollBar {
 
 .list-search-result-title {
   font-size: 1.5em;
-  color: #ffffff; }
+  color: white; }
 
 .list-search-result-description {
   color: #cccccc; }
@@ -1220,7 +1220,7 @@ StScrollBar {
 .dash-label {
   border-radius: 3px;
   padding: 4px 12px;
-  color: #ffffff;
+  color: white;
   background-color: rgba(0, 0, 0, 0.7);
   text-align: center;
   -x-offset: 3px; }
@@ -1238,7 +1238,7 @@ StScrollBar {
 .right #dash .app-well-app:hover .overview-icon,
 .bottom #dash .app-well-app:hover .overview-icon,
 .top #dash .app-well-app:hover .overview-icon {
-  background-color: #5294E2; }
+  background-color: #5294e2; }
 
 #dash .app-well-app:active .overview-icon,
 .right #dash .app-well-app:active .overview-icon,
@@ -1251,7 +1251,7 @@ StScrollBar {
   width: 11px;
   height: 2px;
   margin-bottom: 6px;
-  background-color: #5294E2; }
+  background-color: #5294e2; }
 
 #dashtodockContainer .app-well-app-running-dot {
   background: none;
@@ -1278,14 +1278,14 @@ StScrollBar {
 
 .show-apps:hover .overview-icon {
   background-color: rgba(0, 0, 0, 0.7);
-  color: #5294E2; }
+  color: #5294e2; }
 
 .show-apps:active .overview-icon,
 .show-apps:active .show-apps-icon,
 .show-apps:checked .overview-icon,
 .show-apps:checked .show-apps-icon {
   color: #ffffff;
-  background-color: #5294E2;
+  background-color: #5294e2;
   box-shadow: none;
   transition-duration: 0ms; }
 
@@ -1314,7 +1314,7 @@ StScrollBar {
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
   .app-view-control:checked {
     color: #ffffff;
-    background-color: #5294E2; }
+    background-color: #5294e2; }
   .app-view-control:first-child:ltr, .app-view-control:last-child:rtl {
     border-radius: 2px 0 0 2px;
     border-right-width: 0; }
@@ -1341,7 +1341,7 @@ StScrollBar {
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
   background-color: rgba(31, 33, 40, 0.85);
-  box-shadow: inset 0 0 #5294E2; }
+  box-shadow: inset 0 0 #5294e2; }
 
 .app-well-app:hover .overview-icon,
 .app-well-app:focus .overview-icon,
@@ -1361,13 +1361,13 @@ StScrollBar {
   width: 20px;
   height: 2px;
   margin-bottom: 4px;
-  background-color: #5294E2; }
+  background-color: #5294e2; }
 
 .search-provider-icon,
 .list-search-result, .app-well-app .overview-icon,
 .app-well-app.app-folder .overview-icon,
 .grid-search-result .overview-icon {
-  color: #ffffff;
+  color: white;
   border-radius: 2px;
   padding: 6px;
   border: 1px solid transparent;
@@ -1382,11 +1382,12 @@ StScrollBar {
   background-color: rgba(60, 64, 78, 0.95); }
 
 .app-well-app.app-folder:active > .overview-icon, .app-well-app.app-folder:checked > .overview-icon {
-  background-color: #5294E2;
+  color: #ffffff;
+  background-color: #5294e2;
   box-shadow: none; }
 
 .app-well-app.app-folder:focus > .overview-icon {
-  background-color: #5294E2; }
+  background-color: #5294e2; }
 
 .app-folder-popup {
   -arrow-border-radius: 2px;
@@ -1521,7 +1522,7 @@ StScrollBar {
 
 .chat-sent {
   padding-left: 18pt;
-  color: #5294E2; }
+  color: #5294e2; }
   .chat-sent:rtl {
     padding-left: 0;
     padding-right: 18pt; }
@@ -1611,7 +1612,7 @@ StScrollBar {
   min-width: 155px; }
 
 .magnifier-zoom-region {
-  border: 2px solid #5294E2; }
+  border: 2px solid #5294e2; }
   .magnifier-zoom-region.full-screen {
     border-width: 0; }
 
@@ -1650,7 +1651,7 @@ StScrollBar {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #ffffff;
     border: 1px solid rgba(26, 28, 34, 0.35);
-    background-color: #5294E2;
+    background-color: #5294e2;
     box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); }
   .keyboard-key:grayed {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
@@ -1685,7 +1686,7 @@ StScrollBar {
   border-radius: 2px;
   color: #BAC3CF; }
   .candidate-box:selected, .candidate-box:hover {
-    background-color: #5294E2;
+    background-color: #5294e2;
     color: #ffffff; }
 
 .candidate-page-button-box {
@@ -1743,7 +1744,7 @@ StScrollBar {
       .login-dialog .modal-dialog-button:default:active {
         text-shadow: 0 1px rgba(64, 69, 82, 0);
         color: #ffffff;
-        background-color: #5294E2;
+        background-color: #5294e2;
         border: 1px solid #2b2e39;
         box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); }
       .login-dialog .modal-dialog-button:default:insensitive {
@@ -1791,10 +1792,10 @@ StScrollBar {
   padding: .2em;
   width: 23em; }
   .login-dialog-user-list:expanded .login-dialog-user-list-item:focus {
-    background-color: #5294E2;
+    background-color: #5294e2;
     color: #ffffff; }
   .login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {
-    border-right: 2px solid #5294E2; }
+    border-right: 2px solid #5294e2; }
 
 .login-dialog-user-list-item {
   border-radius: 5px;
@@ -1805,7 +1806,7 @@ StScrollBar {
   .login-dialog-user-list-item:rtl {
     padding-left: 1em; }
   .login-dialog-user-list-item:hover {
-    background-color: #5294E2;
+    background-color: #5294e2;
     color: #ffffff; }
   .login-dialog-user-list-item .login-dialog-timed-login-indicator {
     height: 2px;
@@ -1940,11 +1941,11 @@ StScrollBar {
     padding-left: .3em;
     padding-right: .3em; }
     #LookingGlassDialog .notebook-tab:hover {
-      color: #ffffff;
+      color: white;
       text-shadow: black 0px 2px 2px; }
     #LookingGlassDialog .notebook-tab:selected {
       border-bottom-width: 0px;
-      color: #5294E2;
+      color: #5294e2;
       text-shadow: black 0px 2px 2px; }
   #LookingGlassDialog StBoxLayout#EvalBox {
     padding: 4px;
@@ -1954,7 +1955,7 @@ StScrollBar {
 
 .lg-dialog StEntry {
   caret-color: #ffffff;
-  selection-background-color: #5294E2;
+  selection-background-color: #5294e2;
   selected-color: #ffffff;
   color: #BAC3CF;
   background-color: rgba(102, 109, 132, 0.35);
@@ -1962,11 +1963,11 @@ StScrollBar {
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
   .lg-dialog StEntry:focus {
     color: #ffffff;
-    background-color: #5294E2;
+    background-color: #5294e2;
     border: 1px solid rgba(26, 28, 34, 0.35);
     box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
     selection-background-color: #ffffff;
-    selected-color: #5294E2; }
+    selected-color: #5294e2; }
 
 .lg-dialog .shell-link {
   color: #a9caf1; }
diff --git a/common/gnome-shell/3.18/gnome-shell.css b/common/gnome-shell/3.18/gnome-shell.css
index 0d14820..761e9a7 100644
--- a/common/gnome-shell/3.18/gnome-shell.css
+++ b/common/gnome-shell/3.18/gnome-shell.css
@@ -39,7 +39,7 @@ stage {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: #fbfbfc;
-    border: 1px solid #5294E2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 1px rgba(251, 251, 252, 0.05); }
   .button:hover, .notification-banner .notification-button:hover, .hotplug-notification-item:hover {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
@@ -51,13 +51,13 @@ stage {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: #fbfbfc;
-    border: 1px solid #5294E2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 1px rgba(251, 251, 252, 0.05); }
   .button:active, .notification-banner .notification-button:active, .hotplug-notification-item:active, .button:active:focus, .notification-banner .notification-button:active:focus, .hotplug-notification-item:active:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #ffffff;
-    background-color: #5294E2;
-    border: 1px solid #5294E2;
+    background-color: #5294e2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); }
   .button:insensitive, .notification-banner .notification-button:insensitive, .hotplug-notification-item:insensitive {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
@@ -70,7 +70,7 @@ StEntry {
   padding: 7px;
   caret-size: 1px;
   caret-color: #5c616c;
-  selection-background-color: #5294E2;
+  selection-background-color: #5294e2;
   selected-color: #ffffff;
   transition-duration: 300ms;
   border-radius: 3px;
@@ -81,7 +81,7 @@ StEntry {
   StEntry:focus, StEntry:hover {
     color: #5c616c;
     background-color: #ffffff;
-    border: 1px solid #5294E2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); }
   StEntry:insensitive {
     color: rgba(92, 97, 108, 0.55);
@@ -115,13 +115,13 @@ StScrollBar {
     StScrollBar StButton#vhandle:hover, StScrollBar StButton#hhandle:hover {
       background-color: #c7c9cd; }
     StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
-      background-color: #5294E2; }
+      background-color: #5294e2; }
 
 .slider {
   -slider-height: 4px;
   -slider-background-color: #cfd6e6;
   -slider-border-color: transparent;
-  -slider-active-background-color: #5294E2;
+  -slider-active-background-color: #5294e2;
   -slider-active-border-color: transparent;
   -slider-border-width: 0;
   -slider-handle-radius: 0px;
@@ -197,10 +197,10 @@ StScrollBar {
     .modal-dialog-linked-button:hover {
       background-color: rgba(64, 69, 83, 0.95); }
     .modal-dialog-linked-button:focus {
-      color: #5294E2; }
+      color: #5294e2; }
     .modal-dialog-linked-button:active {
       color: #ffffff;
-      background-color: #5294E2; }
+      background-color: #5294e2; }
     .modal-dialog-linked-button:insensitive {
       color: rgba(186, 195, 207, 0.5);
       background-color: rgba(49, 52, 63, 0.95); }
@@ -275,13 +275,13 @@ StScrollBar {
     color: #686d7a;
     font-size: 8pt; }
   .end-session-dialog .modal-dialog-linked-button:last-child {
-    color: #ffffff;
+    color: white;
     background-color: #F04A50; }
     .end-session-dialog .modal-dialog-linked-button:last-child:hover {
-      color: #ffffff;
+      color: white;
       background-color: #f47479; }
     .end-session-dialog .modal-dialog-linked-button:last-child:active {
-      color: #ffffff;
+      color: white;
       background-color: #ee3239; }
 
 .shell-mount-operation-icon {
@@ -404,8 +404,8 @@ StScrollBar {
   border: 1px solid #dcdfe3;
   border-radius: 3px; }
   .audio-selection-device:active, .audio-selection-device:hover, .audio-selection-device:focus {
-    background-color: #5294E2;
-    border-color: #5294E2; }
+    background-color: #5294e2;
+    border-color: #5294e2; }
 
 .audio-selection-device-box {
   padding: 20px;
@@ -512,7 +512,7 @@ StScrollBar {
   margin: 32px;
   min-width: 64px;
   min-height: 64px;
-  color: #ffffff;
+  color: white;
   background: none;
   border: none;
   border-radius: 5px;
@@ -524,7 +524,7 @@ StScrollBar {
     height: 4px;
     background-color: rgba(0, 0, 0, 0.5);
     border-radius: 2px;
-    color: #5294E2; }
+    color: #5294e2; }
 
 .resize-popup {
   color: #BAC3CF;
@@ -551,11 +551,11 @@ StScrollBar {
     border-radius: 2px; }
     .switcher-list .item-box:outlined {
       padding: 8px;
-      border: 1px solid #5294E2; }
+      border: 1px solid #5294e2; }
     .switcher-list .item-box:selected {
       color: #ffffff;
-      background-color: #5294E2;
-      border: 1px solid #5294E2; }
+      background-color: #5294e2;
+      border: 1px solid #5294e2; }
   .switcher-list .thumbnail-box {
     padding: 2px;
     spacing: 4px; }
@@ -569,7 +569,7 @@ StScrollBar {
   border-color: transparent;
   color: #BAC3CF; }
   .switcher-arrow:highlighted {
-    color: #ffffff; }
+    color: white; }
 
 .input-source-switcher-symbol {
   font-size: 34pt;
@@ -592,10 +592,10 @@ StScrollBar {
 
 .ws-switcher-active-up, .ws-switcher-active-down {
   height: 30px;
-  background-color: #5294E2;
+  background-color: #5294e2;
   background-size: 96px;
   border-radius: 2px;
-  border: 1px solid #5294E2; }
+  border: 1px solid #5294e2; }
 
 .ws-switcher-active-up {
   background-image: url("common-assets/misc/ws-switch-arrow-up.png"); }
@@ -611,7 +611,7 @@ StScrollBar {
 
 .tile-preview {
   background-color: rgba(82, 148, 226, 0.35);
-  border: 1px solid #5294E2; }
+  border: 1px solid #5294e2; }
   .tile-preview-left.on-primary {
     border-radius: 0px 0 0 0; }
   .tile-preview-right.on-primary {
@@ -651,7 +651,7 @@ StScrollBar {
     -natural-hpadding: 10px;
     -minimum-hpadding: 6px;
     font-weight: bold;
-    color: #ffffff;
+    color: white;
     transition-duration: 100ms;
     border-bottom-width: 1px;
     border-color: transparent; }
@@ -661,13 +661,13 @@ StScrollBar {
       margin-left: 0px;
       margin-right: 0px; }
     #panel .panel-button:hover {
-      color: #ffffff;
+      color: white;
       background-color: rgba(0, 0, 0, 0.17);
       border-bottom-width: 1px;
       border-color: transparent; }
     #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
       color: #ffffff;
-      background-color: #5294E2;
+      background-color: #5294e2;
       box-shadow: none;
       border-bottom-width: 1px;
       border-color: black; }
@@ -698,7 +698,7 @@ StScrollBar {
   #panel .screencast-indicator {
     color: #FC4138; }
   #panel .clock-display > * > *:last-child {
-    color: #5294E2;
+    color: #5294e2;
     margin-left: .3em; }
   #panel .popup-menu-arrow {
     width: 0; }
@@ -755,11 +755,11 @@ StScrollBar {
     padding: 13px;
     color: #5c616c;
     background-color: transparent;
-    border: 1px solid #5294E2; }
+    border: 1px solid #5294e2; }
   .system-menu-action:active {
     color: #ffffff;
-    background-color: #5294E2;
-    border: 1px solid #5294E2; }
+    background-color: #5294e2;
+    border: 1px solid #5294e2; }
   .system-menu-action > StIcon {
     icon-size: 16px; }
 
@@ -813,8 +813,8 @@ StScrollBar {
   .message-list-section-title:active {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #ffffff;
-    background-color: #5294E2;
-    border: 1px solid #5294E2;
+    background-color: #5294e2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); }
 
 .datemenu-today-button .date-label {
@@ -909,11 +909,11 @@ StScrollBar {
 .calendar-today:hover {
   font-weight: bold;
   color: #ffffff;
-  background-color: #5294E2;
+  background-color: #5294e2;
   border-width: 0; }
 
 .calendar-day-with-events {
-  color: #5294E2;
+  color: #5294e2;
   font-weight: bold; }
 
 .calendar-today.calendar-day-with-events {
@@ -1004,7 +1004,7 @@ StScrollBar {
   .message-media-control:hover {
     color: #5c616c; }
   .message-media-control:active {
-    color: #5294E2; }
+    color: #5294e2; }
 
 .media-message-cover-icon {
   icon-size: 32px; }
@@ -1082,7 +1082,7 @@ StScrollBar {
     padding: 12px;
     spacing: 0px; }
     .nm-dialog-item:selected {
-      background-color: #5294E2;
+      background-color: #5294e2;
       color: #ffffff; }
   .nm-dialog-icons {
     spacing: .5em; }
@@ -1138,9 +1138,9 @@ StScrollBar {
   .search-entry:hover, .search-entry:focus {
     color: #ffffff;
     caret-color: #ffffff;
-    background-color: #5294E2;
+    background-color: #5294e2;
     selection-background-color: #ffffff;
-    selected-color: #5294E2; }
+    selected-color: #5294e2; }
     .search-entry:hover .search-entry-icon, .search-entry:focus .search-entry-icon {
       color: #ffffff; }
 
@@ -1172,7 +1172,7 @@ StScrollBar {
 
 .list-search-result-title {
   font-size: 1.5em;
-  color: #ffffff; }
+  color: white; }
 
 .list-search-result-description {
   color: #cccccc; }
@@ -1220,7 +1220,7 @@ StScrollBar {
 .dash-label {
   border-radius: 3px;
   padding: 4px 12px;
-  color: #ffffff;
+  color: white;
   background-color: rgba(0, 0, 0, 0.7);
   text-align: center;
   -x-offset: 3px; }
@@ -1238,7 +1238,7 @@ StScrollBar {
 .right #dash .app-well-app:hover .overview-icon,
 .bottom #dash .app-well-app:hover .overview-icon,
 .top #dash .app-well-app:hover .overview-icon {
-  background-color: #5294E2; }
+  background-color: #5294e2; }
 
 #dash .app-well-app:active .overview-icon,
 .right #dash .app-well-app:active .overview-icon,
@@ -1251,7 +1251,7 @@ StScrollBar {
   width: 11px;
   height: 2px;
   margin-bottom: 6px;
-  background-color: #5294E2; }
+  background-color: #5294e2; }
 
 #dashtodockContainer .app-well-app-running-dot {
   background: none;
@@ -1278,14 +1278,14 @@ StScrollBar {
 
 .show-apps:hover .overview-icon {
   background-color: rgba(0, 0, 0, 0.7);
-  color: #5294E2; }
+  color: #5294e2; }
 
 .show-apps:active .overview-icon,
 .show-apps:active .show-apps-icon,
 .show-apps:checked .overview-icon,
 .show-apps:checked .show-apps-icon {
   color: #ffffff;
-  background-color: #5294E2;
+  background-color: #5294e2;
   box-shadow: none;
   transition-duration: 0ms; }
 
@@ -1314,7 +1314,7 @@ StScrollBar {
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.05); }
   .app-view-control:checked {
     color: #ffffff;
-    background-color: #5294E2; }
+    background-color: #5294e2; }
   .app-view-control:first-child:ltr, .app-view-control:last-child:rtl {
     border-radius: 2px 0 0 2px;
     border-right-width: 0; }
@@ -1341,7 +1341,7 @@ StScrollBar {
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
   background-color: rgba(31, 33, 40, 0.85);
-  box-shadow: inset 0 0 #5294E2; }
+  box-shadow: inset 0 0 #5294e2; }
 
 .app-well-app:hover .overview-icon,
 .app-well-app:focus .overview-icon,
@@ -1361,13 +1361,13 @@ StScrollBar {
   width: 20px;
   height: 2px;
   margin-bottom: 4px;
-  background-color: #5294E2; }
+  background-color: #5294e2; }
 
 .search-provider-icon,
 .list-search-result, .app-well-app .overview-icon,
 .app-well-app.app-folder .overview-icon,
 .grid-search-result .overview-icon {
-  color: #ffffff;
+  color: white;
   border-radius: 2px;
   padding: 6px;
   border: 1px solid transparent;
@@ -1382,11 +1382,12 @@ StScrollBar {
   background-color: rgba(60, 64, 78, 0.95); }
 
 .app-well-app.app-folder:active > .overview-icon, .app-well-app.app-folder:checked > .overview-icon {
-  background-color: #5294E2;
+  color: #ffffff;
+  background-color: #5294e2;
   box-shadow: none; }
 
 .app-well-app.app-folder:focus > .overview-icon {
-  background-color: #5294E2; }
+  background-color: #5294e2; }
 
 .app-folder-popup {
   -arrow-border-radius: 2px;
@@ -1521,7 +1522,7 @@ StScrollBar {
 
 .chat-sent {
   padding-left: 18pt;
-  color: #5294E2; }
+  color: #5294e2; }
   .chat-sent:rtl {
     padding-left: 0;
     padding-right: 18pt; }
@@ -1611,7 +1612,7 @@ StScrollBar {
   min-width: 155px; }
 
 .magnifier-zoom-region {
-  border: 2px solid #5294E2; }
+  border: 2px solid #5294e2; }
   .magnifier-zoom-region.full-screen {
     border-width: 0; }
 
@@ -1650,7 +1651,7 @@ StScrollBar {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #ffffff;
     border: 1px solid rgba(26, 28, 34, 0.35);
-    background-color: #5294E2;
+    background-color: #5294e2;
     box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); }
   .keyboard-key:grayed {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
@@ -1685,7 +1686,7 @@ StScrollBar {
   border-radius: 2px;
   color: #BAC3CF; }
   .candidate-box:selected, .candidate-box:hover {
-    background-color: #5294E2;
+    background-color: #5294e2;
     color: #ffffff; }
 
 .candidate-page-button-box {
@@ -1743,8 +1744,8 @@ StScrollBar {
       .login-dialog .modal-dialog-button:default:active {
         text-shadow: 0 1px rgba(255, 255, 255, 0);
         color: #ffffff;
-        background-color: #5294E2;
-        border: 1px solid #5294E2;
+        background-color: #5294e2;
+        border: 1px solid #5294e2;
         box-shadow: inset 0 1px rgba(82, 148, 226, 0.05); }
       .login-dialog .modal-dialog-button:default:insensitive {
         text-shadow: 0 1px rgba(255, 255, 255, 0);
@@ -1791,10 +1792,10 @@ StScrollBar {
   padding: .2em;
   width: 23em; }
   .login-dialog-user-list:expanded .login-dialog-user-list-item:focus {
-    background-color: #5294E2;
+    background-color: #5294e2;
     color: #ffffff; }
   .login-dialog-user-list:expanded .login-dialog-user-list-item:logged-in {
-    border-right: 2px solid #5294E2; }
+    border-right: 2px solid #5294e2; }
 
 .login-dialog-user-list-item {
   border-radius: 5px;
@@ -1805,7 +1806,7 @@ StScrollBar {
   .login-dialog-user-list-item:rtl {
     padding-left: 1em; }
   .login-dialog-user-list-item:hover {
-    background-color: #5294E2;
+    background-color: #5294e2;
     color: #ffffff; }
   .login-dialog-user-list-item .login-dialog-timed-login-indicator {
     height: 2px;
@@ -1940,11 +1941,11 @@ StScrollBar {
     padding-left: .3em;
     padding-right: .3em; }
     #LookingGlassDialog .notebook-tab:hover {
-      color: #ffffff;
+      color: white;
       text-shadow: black 0px 2px 2px; }
     #LookingGlassDialog .notebook-tab:selected {
       border-bottom-width: 0px;
-      color: #5294E2;
+      color: #5294e2;
       text-shadow: black 0px 2px 2px; }
   #LookingGlassDialog StBoxLayout#EvalBox {
     padding: 4px;
@@ -1954,7 +1955,7 @@ StScrollBar {
 
 .lg-dialog StEntry {
   caret-color: #ffffff;
-  selection-background-color: #5294E2;
+  selection-background-color: #5294e2;
   selected-color: #ffffff;
   color: #BAC3CF;
   background-color: rgba(102, 109, 132, 0.35);
@@ -1962,11 +1963,11 @@ StScrollBar {
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
   .lg-dialog StEntry:focus {
     color: #ffffff;
-    background-color: #5294E2;
+    background-color: #5294e2;
     border: 1px solid rgba(26, 28, 34, 0.35);
     box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
     selection-background-color: #ffffff;
-    selected-color: #5294E2; }
+    selected-color: #5294e2; }
 
 .lg-dialog .shell-link {
   color: #2679db; }
diff --git a/common/gnome-shell/3.18/sass/_colors.scss b/common/gnome-shell/3.18/sass/_colors.scss
index 47daa0f..8d3a5f2 100644
--- a/common/gnome-shell/3.18/sass/_colors.scss
+++ b/common/gnome-shell/3.18/sass/_colors.scss
@@ -8,7 +8,7 @@ $bg_color: if($variant =='light', #F5F6F7, #383C4A);
 $fg_color: if($variant =='light', #5c616c, #D3DAE3);
 
 $selected_fg_color: #ffffff;
-$selected_bg_color: #5294E2;
+$selected_bg_color: #5294e2;
 $selected_borders_color: darken($selected_bg_color, 20%);
 $borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%));
 
@@ -18,11 +18,18 @@ $link_visited_color: if($variant == 'light', darken($selected_bg_color,20%),
                                      lighten($selected_bg_color,10%));
 
 $selection_mode_bg: if($transparency == 'true', transparentize($selected_bg_color, 0.05), $selected_bg_color);
+$selection_mode_fg: $selected_fg_color;
 $warning_color: #F27835;
 $error_color: #FC4138;
+$warning_fg_color: white;
+$error_fg_color: white;
 $success_color: #73d216;
 $destructive_color: #F04A50;
 $suggested_color: #4DADD4;
+$destructive_fg_color: white;
+$suggested_fg_color: white;
+
+$drop_target_color: #F08437;
 
 //insensitive state derived colors
 $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55));
diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss
index 59480ce..b573e9b 100644
--- a/common/gnome-shell/3.18/sass/_common.scss
+++ b/common/gnome-shell/3.18/sass/_common.scss
@@ -30,6 +30,7 @@ $font-family: Futura Bk bt, Cantarell, Sans-Serif;
 $_bubble_bg_color: opacify($osd_bg_color,0.25);
 $_bubble_fg_color: $osd_fg_color;
 $_bubble_borders_color: transparentize($osd_fg_color,0.8);
+$_shell_fg_color: white;
 
 stage {
   font-family: $font-family;
@@ -353,15 +354,15 @@ StScrollBar {
   }
 
   .modal-dialog-linked-button:last-child {
-    color: $selected_fg_color;
+    color: $destructive_fg_color;
     background-color: $destructive_color;
 
     &:hover {
-      color: $selected_fg_color;
+      color: $destructive_fg_color;
       background-color: lighten($destructive_color, 9%);
     }
     &:active {
-      color: $selected_fg_color;
+      color: $destructive_fg_color;
       background-color: darken($destructive_color, 5%);
     }
   }
@@ -685,7 +686,7 @@ StScrollBar {
   min-width: 64px;
   min-height: 64px;
 
-  color: $selected_fg_color;
+  color: $_shell_fg_color;
   background: none;
   border: none;
   border-radius: 5px;
@@ -765,7 +766,7 @@ StScrollBar {
   color: $osd_fg_color;
 
   &:highlighted {
-    color: $selected_fg_color;
+    color: $_shell_fg_color;
   }
 }
 
@@ -843,6 +844,8 @@ StScrollBar {
 // Top Bar
 //
 #panel {
+  $_panel_fg_color: $_shell_fg_color;
+
   font-weight: bold;
   height: 2.1em;
   min-height: 27px;
@@ -888,7 +891,7 @@ StScrollBar {
     -natural-hpadding: 10px;
     -minimum-hpadding: 6px;
     font-weight: bold;
-    color: $selected_fg_color;
+    color: $_panel_fg_color;
     transition-duration: 100ms;
     border-bottom-width: 1px;
     border-color: transparent;
@@ -901,7 +904,7 @@ StScrollBar {
     }
 
     &:hover {
-      color: $selected_fg_color;
+      color: $_panel_fg_color;
       background-color: transparentize(black, 0.83);
       border-bottom-width: 1px;
       border-color: transparent;
@@ -1521,9 +1524,9 @@ StScrollBar {
 
 .list-search-result-content { spacing: 12px; padding: 12px; }
 
-.list-search-result-title { font-size: 1.5em; color: $selected_fg_color; }
+.list-search-result-title { font-size: 1.5em; color: $_shell_fg_color; }
 
-.list-search-result-description { color: darken($selected_fg_color, 20%); }
+.list-search-result-description { color: darken($_shell_fg_color, 20%); }
 
 .search-provider-icon { padding: 15px; }
 .search-provider-icon-more {
@@ -1579,7 +1582,7 @@ StScrollBar {
 .dash-label {
   border-radius: 3px;
   padding: 4px 12px;
-  color: $selected_fg_color;
+  color: $_shell_fg_color;
   background-color: transparentize(black, 0.3);
   text-align: center;
   -x-offset: 3px;
@@ -1743,7 +1746,7 @@ StScrollBar {
 }
 
 %icon_tile {
-  color: $selected_fg_color;
+  color: $_shell_fg_color;
   border-radius: 2px;
   padding: 6px;
   border: 1px solid transparent;
@@ -1766,6 +1769,7 @@ StScrollBar {
   }
 
   &:active > .overview-icon, &:checked > .overview-icon {
+    color: $selected_fg_color;
     background-color: $selected_bg_color;
     box-shadow: none;
   }
@@ -2321,7 +2325,7 @@ $legacy_icon_size: 24px;
     padding-right: .3em;
 
     &:hover {
-      color: $selected_fg_color;
+      color: $_shell_fg_color;
       text-shadow: black 0px 2px 2px;
     }
     &:selected {