diff --git a/gtk-3.20/scss/_global.scss b/gtk-3.20/scss/_global.scss
index 1c732c1..9f940d5 100755
--- a/gtk-3.20/scss/_global.scss
+++ b/gtk-3.20/scss/_global.scss
@@ -12,7 +12,7 @@ $selected_fg_color: #fff;
 $tooltip_bg_color: #444;
 $tooltip_fg_color: #eee;
 
-$selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));
+$selected_borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));
 $borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));
 $borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
 
@@ -75,7 +75,7 @@ $panel_fg_color: $dark_fg_color;
 
 $osd_base: $dark_bg_color;
 $osd_fg: $dark_fg_color;
-$osd_bg: alpha($osd_base, 0.8);
+$osd_bg: alpha($osd_base, .8);
 
 $lightdm_bg_color: $dark_bg_color;
 $lightdm_fg_color: $dark_fg_color;
diff --git a/gtk-3.20/scss/widgets/_entry.scss b/gtk-3.20/scss/widgets/_entry.scss
index af42fed..74d8d9d 100755
--- a/gtk-3.20/scss/widgets/_entry.scss
+++ b/gtk-3.20/scss/widgets/_entry.scss
@@ -31,7 +31,7 @@
 }
 
 %entry {
-    padding: ($spacing - 1px) $spacing;
+    padding: $spacing;
     border-width: 1px;
     border-style: solid;
     border-radius: $roundness;
@@ -56,7 +56,13 @@
         color: $selected_fg_color;
     }
 
-    &.image.left { padding-right: $spacing; }
+    & image.left { padding-right: $spacing; }
+    & image.right { padding-left: $spacing; }
+
+    selection {
+        background-color: $selected_bg_color;
+        color: $selected_fg_color;
+    }
 }
 
 @mixin entry($bg, $fg) {
@@ -66,7 +72,7 @@
 
     color: $fg;
 
-    &:focus, &:active { border-color: $selected_bg_color; }
+    &:focus, &:active { border-color: border_focus($selected_borders_color); }
 
     &:disabled {
         @include linear-gradient(shade($bg, .9), to top);
diff --git a/gtk-3.20/scss/widgets/_notebook.scss b/gtk-3.20/scss/widgets/_notebook.scss
index f3360d4..57e40ba 100644
--- a/gtk-3.20/scss/widgets/_notebook.scss
+++ b/gtk-3.20/scss/widgets/_notebook.scss
@@ -260,10 +260,8 @@
             }
         }
 
-        viewport {
-            border-width: 0;
+        stack {
             background-color: $base_color;
-            color: $text_color;
         }
     }
 }