3 files changed, 18 insertions, 3 deletions
diff --git a/common/gnome-shell/3.18/gnome-shell-dark.css b/common/gnome-shell/3.18/gnome-shell-dark.css
index 6e29ddc..99ef837 100644
--- a/common/gnome-shell/3.18/gnome-shell-dark.css
+++ b/common/gnome-shell/3.18/gnome-shell-dark.css
@@ -69,6 +69,7 @@ stage {
 StEntry {
   padding: 7px;
   caret-size: 1px;
+  caret-color: #D3DAE3;
   selection-background-color: #5294E2;
   selected-color: #ffffff;
   transition-duration: 300ms;
@@ -1919,6 +1920,7 @@ StScrollBar {
     spacing: 4px; }
 
 .lg-dialog StEntry {
+  caret-color: #ffffff;
   selection-background-color: #5294E2;
   selected-color: #ffffff;
   color: #BAC3CF;
@@ -1929,7 +1931,9 @@ StScrollBar {
     color: #ffffff;
     background-color: #5294E2;
     border: 1px solid rgba(26, 28, 34, 0.35);
-    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
+    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
+    selection-background-color: #ffffff;
+    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 80f818c..f44f397 100644
--- a/common/gnome-shell/3.18/gnome-shell.css
+++ b/common/gnome-shell/3.18/gnome-shell.css
@@ -69,6 +69,7 @@ stage {
 StEntry {
   padding: 7px;
   caret-size: 1px;
+  caret-color: #5c616c;
   selection-background-color: #5294E2;
   selected-color: #ffffff;
   transition-duration: 300ms;
@@ -1919,6 +1920,7 @@ StScrollBar {
     spacing: 4px; }
 
 .lg-dialog StEntry {
+  caret-color: #ffffff;
   selection-background-color: #5294E2;
   selected-color: #ffffff;
   color: #BAC3CF;
@@ -1929,7 +1931,9 @@ StScrollBar {
     color: #ffffff;
     background-color: #5294E2;
     border: 1px solid rgba(26, 28, 34, 0.35);
-    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
+    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
+    selection-background-color: #ffffff;
+    selected-color: #5294E2; }
 
 .lg-dialog .shell-link {
   color: #2679db; }
diff --git a/common/gnome-shell/3.18/sass/_common.scss b/common/gnome-shell/3.18/sass/_common.scss
index 6094af9..9b7eb61 100644
--- a/common/gnome-shell/3.18/sass/_common.scss
+++ b/common/gnome-shell/3.18/sass/_common.scss
@@ -81,6 +81,7 @@ stage {
 StEntry {
   padding: 7px;
   caret-size: 1px;
+  caret-color: $fg_color;
   selection-background-color: $selected_bg_color;
   selected-color: $selected_fg_color;
   transition-duration: 300ms;
@@ -2302,11 +2303,17 @@ $legacy_icon_size: 24px;
 .lg-dialog {
 
   StEntry {
+    caret-color: $selected_fg_color;
     selection-background-color: $selected_bg_color;
     selected-color: $selected_fg_color;
 
     @include entry(osd);
-    &:focus { @include entry(osd-focus); }
+    &:focus {
+      @include entry(osd-focus);
+
+      selection-background-color: $selected_fg_color;
+      selected-color: $selected_bg_color;
+    }
   }
   .shell-link {
     color: $link_color;