HC: contrasty buttons

3 files changed, 90 insertions, 276 deletions

diff --git a/themes/HighContrast/gtk-3.0/_common.scss b/themes/HighContrast/gtk-3.0/_common.scss
index 2d7be22a..d938c5bc 100644
--- a/themes/HighContrast/gtk-3.0/_common.scss
+++ b/themes/HighContrast/gtk-3.0/_common.scss
@@ -1166,7 +1166,7 @@ GtkTreeView.view.progressbar { //Progressbar in treeview cells
   -GtkRange-trough-border: 0;
   -GtkScrollbar-has-backward-stepper: false;
   -GtkScrollbar-has-forward-stepper: false;
-  -GtkRange-slider-width: 13;
+  -GtkRange-slider-width: 20;
   -GtkScrollbar-min-slider-length: 42; // minimum size for the slider.
                                        // sadly can't be in '.slider'
                                        // where it belongs
@@ -1180,12 +1180,12 @@ GtkTreeView.view.progressbar { //Progressbar in treeview cells
   &.slider {
     border-radius: 20px;
     border: 3px solid transparent; //margin :/
-    background-color: mix($bg_color, $fg_color, 70%);
+    background-color: mix($bg_color, $fg_color, 50%);
     &:backdrop, &:insensitive {
       background-color: mix($bg_color, $fg_color, 90%);
     }
     &:hover {
-      background-color: mix($bg_color, $fg_color, 50%);
+      background-color: mix($bg_color, $fg_color, 30%);
     }
     &:prelight:active {
       background-color: $selected_bg_color;
diff --git a/themes/HighContrast/gtk-3.0/_drawing.scss b/themes/HighContrast/gtk-3.0/_drawing.scss
index cfed585b..03b09bbd 100644
--- a/themes/HighContrast/gtk-3.0/_drawing.scss
+++ b/themes/HighContrast/gtk-3.0/_drawing.scss
@@ -124,11 +124,6 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
     @if $c!=$bg_color { @include _button_border_color($c); }
     @else { border-color: $borders_color; }
 
-    @include _button_text_shadow($tc,$c);
-    @if $noedge { box-shadow: inset 0 1px $_top_hilight; }
-    @else {
-      @include _shadows(inset 0 1px $_top_hilight, $widget_edge);
-    }
   }
 
   @else if $t==hover {
@@ -143,11 +138,6 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
                                       lighten($c,4%) 40%,
                                       $c);
 
-    @include _button_text_shadow($tc,lighten($c,4%));
-    @if $noedge { box-shadow: inset 0 1px $_top_hilight; }
-    @else {
-      @include _shadows(inset 0 1px $_top_hilight, $widget_edge);
-    }
   }
 
   @else if $t==active {
@@ -158,17 +148,8 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
     @if $c!=$bg_color { @include _button_border_color($c); }
     @else { border-color: $borders_color; }
     background-image: linear-gradient(to bottom,
-                                      darken($c,15%),
-                                      darken($c,11%) 3%,
-                                      darken($c,10%));
-    @include _button_text_shadow($tc,darken($c,10%));
-    @if $noedge {
-      box-shadow: inset 0 2px 3px -1px transparentize(black,0.7);
-    }
-    @else {
-      @include _shadows(inset 0 2px 3px -1px transparentize(black,0.7),
-                        $widget_edge);
-    }
+                                      lighten($tc,30%));
+    color: $c;
   }
   @else if $t==insensitive {
   //
@@ -179,15 +160,6 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
     background-image: linear-gradient(to bottom, $insensitive_bg_color);
     text-shadow: none;
     icon-shadow: none;
-    @if $noedge {
-      // white with 0 alpha to avoid an ugly transition, since no color means
-      // black with 0 alpha
-      box-shadow: inset 0 1px transparentize(white,1);
-    }
-    @else {
-      @include _shadows(inset 0 1px transparentize(white,1),
-                        $widget_edge);
-    }
   }
   @else if $t==insensitive-active {
   //
@@ -198,15 +170,6 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
     background-image: linear-gradient(to bottom,
                         mix($insensitive_borders_color,
                             $insensitive_bg_color, 10%));
-    @if $noedge {
-      // white with 0 alpha to avoid an ugly transition, since no color means
-      // black with 0 alpha
-      box-shadow: inset 0 1px transparentize(white,1);
-    }
-    @else {
-      @include _shadows(inset 0 1px transparentize(white,1),
-                        $widget_edge);
-    }
   }
 
   @else if $t==backdrop {
@@ -219,8 +182,6 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
                                       if($c!=bg_color,$c,$backdrop_bg_color));
     text-shadow: none;
     icon-shadow: none;
-    @include _shadows(inset 0 1px transparentize(white,1),
-                      0 1px transparentize(white,1));
   }
 
   @else if $t==backdrop-active {
@@ -231,8 +192,6 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
     border-color: $backdrop_borders_color;
     background-image: linear-gradient(to bottom,
                         mix($backdrop_borders_color,$backdrop_bg_color, 35%));
-    @include _shadows(inset 0 1px transparentize(white,1),
-                      0 1px transparentize(white,1));
   }
 
   @else if $t==backdrop-insensitive {
@@ -242,7 +201,6 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
     color: $backdrop_insensitive_color;
     border-color: $backdrop_borders_color;
     background-image: linear-gradient(to bottom, $backdrop_bg_color);
-    box-shadow: inset 0 1px transparentize(white,1);
   }
 
   @else if $t==backdrop-insensitive-active {
@@ -253,8 +211,6 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
     border-color: $backdrop_borders_color;
     background-image: linear-gradient(to bottom,
                         mix($backdrop_borders_color,$backdrop_bg_color, 8%));
-    @include _shadows(inset 0 1px transparentize(white,1),
-                      0 1px transparentize(white,1));
   }
   
   @else if $t==osd {
diff --git a/themes/HighContrast/gtk-3.0/gtk.css b/themes/HighContrast/gtk-3.0/gtk.css
index aff1618c..b923be55 100644
--- a/themes/HighContrast/gtk-3.0/gtk.css
+++ b/themes/HighContrast/gtk-3.0/gtk.css
@@ -241,29 +241,21 @@
   border-style: solid;
   color: black;
   background-image: linear-gradient(to bottom, white, white 40%, #f2f2f2);
-  border-color: #7f7f7f;
-  text-shadow: 0 1px white;
-  icon-shadow: 0 1px white;
-  box-shadow: inset 0 1px white, 0 1px white; }
+  border-color: #7f7f7f; }
   .button:hover, .button.flat:hover {
     border-width: 1px;
     border-style: solid;
     color: black;
     border-color: #7f7f7f;
     background-image: linear-gradient(to bottom, white, white 40%, white);
-    text-shadow: 0 1px white;
-    icon-shadow: 0 1px white;
-    box-shadow: inset 0 1px white, 0 1px white;
     -gtk-image-effect: highlight; }
   .button:active, .button.flat:active {
     border-width: 1px;
     border-style: solid;
     color: black;
     border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, #d9d9d9, #e3e3e3 3%, #e6e6e6);
-    text-shadow: 0 1px white;
-    icon-shadow: 0 1px white;
-    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white;
+    background-image: linear-gradient(to bottom, #4d4d4d);
+    color: white;
     transition-duration: 50ms; }
   .button:backdrop, .button.flat:backdrop {
     border-width: 1px;
@@ -272,29 +264,25 @@
     border-color: #8b8b8b;
     background-image: linear-gradient(to bottom, white);
     text-shadow: none;
-    icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    icon-shadow: none; }
     .button:backdrop:active, .button.flat:backdrop:active {
       border-width: 1px;
       border-style: solid;
       color: #191919;
       border-color: #8b8b8b;
-      background-image: linear-gradient(to bottom, #d6d6d6);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      background-image: linear-gradient(to bottom, #d6d6d6); }
     .button:backdrop:insensitive, .button.flat:backdrop:insensitive {
       border-width: 1px;
       border-style: solid;
       color: white;
       border-color: #8b8b8b;
-      background-image: linear-gradient(to bottom, white);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+      background-image: linear-gradient(to bottom, white); }
     .button:backdrop:insensitive:active, .button.flat:backdrop:insensitive:active {
       border-width: 1px;
       border-style: solid;
       color: white;
       border-color: #8b8b8b;
-      background-image: linear-gradient(to bottom, whitesmoke);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      background-image: linear-gradient(to bottom, whitesmoke); }
   .button:insensitive {
     border-width: 1px;
     border-style: solid;
@@ -302,15 +290,13 @@
     border-color: #7f7f7f;
     background-image: linear-gradient(to bottom, white);
     text-shadow: none;
-    icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
+    icon-shadow: none; }
     .button:insensitive:active, .button:insensitive.flat:active {
       border-width: 1px;
       border-style: solid;
       color: #7f7f7f;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, #f2f2f2);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
+      background-image: linear-gradient(to bottom, #f2f2f2); }
   .osd .button {
     padding: 6px;
     border-width: 1px 1px 2px 1px;
@@ -345,28 +331,20 @@
     border-style: solid;
     color: white;
     background-image: linear-gradient(to bottom, #0d0d0d, black 40%, black);
-    border-color: black;
-    text-shadow: 0 -1px black;
-    icon-shadow: 0 -1px black;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px white; }
+    border-color: black; }
     .button.suggested-action:hover {
       border-width: 1px;
       border-style: solid;
       color: white;
       border-color: black;
-      background-image: linear-gradient(to bottom, #242424, #0a0a0a 40%, black);
-      text-shadow: 0 -1px black;
-      icon-shadow: 0 -1px black;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px white; }
+      background-image: linear-gradient(to bottom, #242424, #0a0a0a 40%, black); }
     .button.suggested-action:active {
       border-width: 1px;
       border-style: solid;
       color: white;
       border-color: black;
-      background-image: linear-gradient(to bottom, black, black 3%, black);
-      text-shadow: 0 -1px black;
-      icon-shadow: 0 -1px black;
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white; }
+      background-image: linear-gradient(to bottom, white);
+      color: black; }
     .button.suggested-action:backdrop {
       border-width: 1px;
       border-style: solid;
@@ -374,15 +352,13 @@
       border-color: black;
       background-image: linear-gradient(to bottom, black);
       text-shadow: none;
-      icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      icon-shadow: none; }
       .button.suggested-action:backdrop:insensitive {
         border-width: 1px;
         border-style: solid;
         color: white;
         border-color: #8b8b8b;
-        background-image: linear-gradient(to bottom, white);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+        background-image: linear-gradient(to bottom, white); }
     .button.suggested-action:insensitive {
       border-width: 1px;
       border-style: solid;
@@ -390,35 +366,26 @@
       border-color: #7f7f7f;
       background-image: linear-gradient(to bottom, white);
       text-shadow: none;
-      icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
+      icon-shadow: none; }
   .button.destructive-action {
     border-width: 1px;
     border-style: solid;
     color: white;
     background-image: linear-gradient(to bottom, #f14141, #ef2929 40%, #ed1212);
-    border-color: #8e0b0b;
-    text-shadow: 0 -1px black;
-    icon-shadow: 0 -1px black;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px white; }
+    border-color: #8e0b0b; }
     .button.destructive-action:hover {
       border-width: 1px;
       border-style: solid;
       color: white;
       border-color: #8e0b0b;
-      background-image: linear-gradient(to bottom, #f46b6b, #f03c3c 40%, #ef2929);
-      text-shadow: 0 -1px black;
-      icon-shadow: 0 -1px black;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px white; }
+      background-image: linear-gradient(to bottom, #f46b6b, #f03c3c 40%, #ef2929); }
     .button.destructive-action:active {
       border-width: 1px;
       border-style: solid;
       color: white;
       border-color: #8e0b0b;
-      background-image: linear-gradient(to bottom, #bd0e0e, #d01010 3%, #d51010);
-      text-shadow: 0 -1px black;
-      icon-shadow: 0 -1px black;
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white; }
+      background-image: linear-gradient(to bottom, white);
+      color: #ef2929; }
     .button.destructive-action:backdrop {
       border-width: 1px;
       border-style: solid;
@@ -426,15 +393,13 @@
       border-color: #ef2929;
       background-image: linear-gradient(to bottom, #ef2929);
       text-shadow: none;
-      icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      icon-shadow: none; }
       .button.destructive-action:backdrop:insensitive {
         border-width: 1px;
         border-style: solid;
         color: white;
         border-color: #8b8b8b;
-        background-image: linear-gradient(to bottom, white);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+        background-image: linear-gradient(to bottom, white); }
     .button.destructive-action:insensitive {
       border-width: 1px;
       border-style: solid;
@@ -442,8 +407,7 @@
       border-color: #7f7f7f;
       background-image: linear-gradient(to bottom, white);
       text-shadow: none;
-      icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
+      icon-shadow: none; }
   .button.image-button {
     padding: 8px; }
   .button.text-button {
@@ -459,28 +423,20 @@
   border-style: solid;
   color: black;
   background-image: linear-gradient(to bottom, white, white 40%, #f2f2f2);
-  border-color: #7f7f7f;
-  text-shadow: 0 1px white;
-  icon-shadow: 0 1px white;
-  box-shadow: inset 0 1px white; }
+  border-color: #7f7f7f; }
   .inline-toolbar GtkToolButton > .button:hover {
     border-width: 1px;
     border-style: solid;
     color: black;
     border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, white, white 40%, white);
-    text-shadow: 0 1px white;
-    icon-shadow: 0 1px white;
-    box-shadow: inset 0 1px white; }
+    background-image: linear-gradient(to bottom, white, white 40%, white); }
   .inline-toolbar GtkToolButton > .button:active {
     border-width: 1px;
     border-style: solid;
     color: black;
     border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, #d9d9d9, #e3e3e3 3%, #e6e6e6);
-    text-shadow: 0 1px white;
-    icon-shadow: 0 1px white;
-    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); }
+    background-image: linear-gradient(to bottom, #4d4d4d);
+    color: white; }
   .inline-toolbar GtkToolButton > .button:insensitive {
     border-width: 1px;
     border-style: solid;
@@ -488,15 +444,13 @@
     border-color: #7f7f7f;
     background-image: linear-gradient(to bottom, white);
     text-shadow: none;
-    icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+    icon-shadow: none; }
   .inline-toolbar GtkToolButton > .button:insensitive:active {
     border-width: 1px;
     border-style: solid;
     color: #7f7f7f;
     border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, #f2f2f2);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+    background-image: linear-gradient(to bottom, #f2f2f2); }
   .inline-toolbar GtkToolButton > .button:backdrop {
     border-width: 1px;
     border-style: solid;
@@ -504,29 +458,25 @@
     border-color: #8b8b8b;
     background-image: linear-gradient(to bottom, white);
     text-shadow: none;
-    icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    icon-shadow: none; }
   .inline-toolbar GtkToolButton > .button:backdrop:active {
     border-width: 1px;
     border-style: solid;
     color: #191919;
     border-color: #8b8b8b;
-    background-image: linear-gradient(to bottom, #d6d6d6);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    background-image: linear-gradient(to bottom, #d6d6d6); }
   .inline-toolbar GtkToolButton > .button:backdrop:insensitive {
     border-width: 1px;
     border-style: solid;
     color: white;
     border-color: #8b8b8b;
-    background-image: linear-gradient(to bottom, white);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+    background-image: linear-gradient(to bottom, white); }
   .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active {
     border-width: 1px;
     border-style: solid;
     color: white;
     border-color: #8b8b8b;
-    background-image: linear-gradient(to bottom, whitesmoke);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    background-image: linear-gradient(to bottom, whitesmoke); }
 
 .inline-toolbar.toolbar GtkToolButton > .button.flat {
   border-radius: 0;
@@ -640,28 +590,20 @@ GtkColorButton.button {
     border-style: solid;
     color: black;
     background-image: linear-gradient(to bottom, white, white 40%, #f2f2f2);
-    border-color: #7f7f7f;
-    text-shadow: 0 1px white;
-    icon-shadow: 0 1px white;
-    box-shadow: inset 0 1px white; }
+    border-color: #7f7f7f; }
     .spinbutton.vertical .button:first-child:active {
       border-width: 1px;
       border-style: solid;
       color: black;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, #d9d9d9, #e3e3e3 3%, #e6e6e6);
-      text-shadow: 0 1px white;
-      icon-shadow: 0 1px white;
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); }
+      background-image: linear-gradient(to bottom, #4d4d4d);
+      color: white; }
     .spinbutton.vertical .button:first-child:hover {
       border-width: 1px;
       border-style: solid;
       color: black;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, white, white 40%, white);
-      text-shadow: 0 1px white;
-      icon-shadow: 0 1px white;
-      box-shadow: inset 0 1px white; }
+      background-image: linear-gradient(to bottom, white, white 40%, white); }
     .spinbutton.vertical .button:first-child:insensitive {
       border-width: 1px;
       border-style: solid;
@@ -669,8 +611,7 @@ GtkColorButton.button {
       border-color: #7f7f7f;
       background-image: linear-gradient(to bottom, white);
       text-shadow: none;
-      icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+      icon-shadow: none; }
     .spinbutton.vertical .button:first-child:backdrop {
       border-width: 1px;
       border-style: solid;
@@ -678,35 +619,26 @@ GtkColorButton.button {
       border-color: #8b8b8b;
       background-image: linear-gradient(to bottom, white);
       text-shadow: none;
-      icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      icon-shadow: none; }
   .spinbutton.vertical .button:last-child {
     border-width: 1px;
     border-style: solid;
     color: black;
     background-image: linear-gradient(to bottom, white, white 40%, #f2f2f2);
-    border-color: #7f7f7f;
-    text-shadow: 0 1px white;
-    icon-shadow: 0 1px white;
-    box-shadow: inset 0 1px white, 0 1px white; }
+    border-color: #7f7f7f; }
     .spinbutton.vertical .button:last-child:active {
       border-width: 1px;
       border-style: solid;
       color: black;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, #d9d9d9, #e3e3e3 3%, #e6e6e6);
-      text-shadow: 0 1px white;
-      icon-shadow: 0 1px white;
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white; }
+      background-image: linear-gradient(to bottom, #4d4d4d);
+      color: white; }
     .spinbutton.vertical .button:last-child:hover {
       border-width: 1px;
       border-style: solid;
       color: black;
       border-color: #7f7f7f;
-      background-image: linear-gradient(to bottom, white, white 40%, white);
-      text-shadow: 0 1px white;
-      icon-shadow: 0 1px white;
-      box-shadow: inset 0 1px white, 0 1px white; }
+      background-image: linear-gradient(to bottom, white, white 40%, white); }
     .spinbutton.vertical .button:last-child:insensitive {
       border-width: 1px;
       border-style: solid;
@@ -714,8 +646,7 @@ GtkColorButton.button {
       border-color: #7f7f7f;
       background-image: linear-gradient(to bottom, white);
       text-shadow: none;
-      icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
+      icon-shadow: none; }
     .spinbutton.vertical .button:last-child:backdrop {
       border-width: 1px;
       border-style: solid;
@@ -723,15 +654,13 @@ GtkColorButton.button {
       border-color: #8b8b8b;
       background-image: linear-gradient(to bottom, white);
       text-shadow: none;
-      icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      icon-shadow: none; }
   .spinbutton.vertical .button:backdrop:insensitive {
     border-width: 1px;
     border-style: solid;
     color: white;
     border-color: #8b8b8b;
-    background-image: linear-gradient(to bottom, white);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+    background-image: linear-gradient(to bottom, white); }
   .spinbutton.vertical.entry {
     border-radius: 0; }
   .spinbutton.vertical .button:first-child, .spinbutton.vertical .button:first-child:active, .spinbutton.vertical .button:first-child:hover, .spinbutton.vertical .button:first-child:insensitive, .spinbutton.vertical .button:first-child:backdrop {
@@ -857,30 +786,22 @@ GtkComboBox {
       border-style: solid;
       color: white;
       background-image: linear-gradient(to bottom, #0d0d0d, black 40%, black);
-      border-color: black;
-      text-shadow: 0 -1px black;
-      icon-shadow: 0 -1px black;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
+      border-color: black; }
       .titlebar.selection-mode .button:hover,
       .header-bar.selection-mode .button:hover {
         border-width: 1px;
         border-style: solid;
         color: white;
         border-color: black;
-        background-image: linear-gradient(to bottom, #242424, #0a0a0a 40%, black);
-        text-shadow: 0 -1px black;
-        icon-shadow: 0 -1px black;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
+        background-image: linear-gradient(to bottom, #242424, #0a0a0a 40%, black); }
       .titlebar.selection-mode .button:active,
       .header-bar.selection-mode .button:active {
         border-width: 1px;
         border-style: solid;
         color: white;
         border-color: black;
-        background-image: linear-gradient(to bottom, black, black 3%, black);
-        text-shadow: 0 -1px black;
-        icon-shadow: 0 -1px black;
-        box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); }
+        background-image: linear-gradient(to bottom, white);
+        color: black; }
       .titlebar.selection-mode .button:insensitive,
       .header-bar.selection-mode .button:insensitive {
         border-width: 1px;
@@ -889,8 +810,7 @@ GtkComboBox {
         border-color: #7f7f7f;
         background-image: linear-gradient(to bottom, white);
         text-shadow: none;
-        icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+        icon-shadow: none; }
       .titlebar.selection-mode .button:backdrop,
       .header-bar.selection-mode .button:backdrop {
         border-width: 1px;
@@ -900,7 +820,6 @@ GtkComboBox {
         background-image: linear-gradient(to bottom, black);
         text-shadow: none;
         icon-shadow: none;
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
         border-color: black; }
       .titlebar.selection-mode .button:backdrop:insensitive,
       .header-bar.selection-mode .button:backdrop:insensitive {
@@ -908,38 +827,29 @@ GtkComboBox {
         border-style: solid;
         color: white;
         border-color: #8b8b8b;
-        background-image: linear-gradient(to bottom, white);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+        background-image: linear-gradient(to bottom, white); }
       .titlebar.selection-mode .button.suggested-action,
       .header-bar.selection-mode .button.suggested-action {
         border-width: 1px;
         border-style: solid;
         color: black;
         background-image: linear-gradient(to bottom, white, white 40%, #f2f2f2);
-        border-color: #7f7f7f;
-        text-shadow: 0 1px white;
-        icon-shadow: 0 1px white;
-        box-shadow: inset 0 1px white; }
+        border-color: #7f7f7f; }
         .titlebar.selection-mode .button.suggested-action:hover,
         .header-bar.selection-mode .button.suggested-action:hover {
           border-width: 1px;
           border-style: solid;
           color: black;
           border-color: #7f7f7f;
-          background-image: linear-gradient(to bottom, white, white 40%, white);
-          text-shadow: 0 1px white;
-          icon-shadow: 0 1px white;
-          box-shadow: inset 0 1px white; }
+          background-image: linear-gradient(to bottom, white, white 40%, white); }
         .titlebar.selection-mode .button.suggested-action:active,
         .header-bar.selection-mode .button.suggested-action:active {
           border-width: 1px;
           border-style: solid;
           color: black;
           border-color: #7f7f7f;
-          background-image: linear-gradient(to bottom, #d9d9d9, #e3e3e3 3%, #e6e6e6);
-          text-shadow: 0 1px white;
-          icon-shadow: 0 1px white;
-          box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); }
+          background-image: linear-gradient(to bottom, #4d4d4d);
+          color: white; }
         .titlebar.selection-mode .button.suggested-action:insensitive,
         .header-bar.selection-mode .button.suggested-action:insensitive {
           border-width: 1px;
@@ -948,8 +858,7 @@ GtkComboBox {
           border-color: #7f7f7f;
           background-image: linear-gradient(to bottom, white);
           text-shadow: none;
-          icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+          icon-shadow: none; }
         .titlebar.selection-mode .button.suggested-action:backdrop,
         .header-bar.selection-mode .button.suggested-action:backdrop {
           border-width: 1px;
@@ -958,16 +867,14 @@ GtkComboBox {
           border-color: #8b8b8b;
           background-image: linear-gradient(to bottom, white);
           text-shadow: none;
-          icon-shadow: none;
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+          icon-shadow: none; }
         .titlebar.selection-mode .button.suggested-action:backdrop:insensitive,
         .header-bar.selection-mode .button.suggested-action:backdrop:insensitive {
           border-width: 1px;
           border-style: solid;
           color: white;
           border-color: #8b8b8b;
-          background-image: linear-gradient(to bottom, white);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+          background-image: linear-gradient(to bottom, white); }
     .titlebar.selection-mode .selection-menu,
     .header-bar.selection-mode .selection-menu {
       border-width: 0;
@@ -1357,9 +1264,6 @@ GtkTreeView.view.progressbar {
         color: black;
         border-color: #7f7f7f;
         background-image: linear-gradient(to bottom, white, white 40%, white);
-        text-shadow: 0 1px white;
-        icon-shadow: 0 1px white;
-        box-shadow: inset 0 1px white;
         background-image: none;
         box-shadow: none; }
       .notebook tab .button:active {
@@ -1367,10 +1271,8 @@ GtkTreeView.view.progressbar {
         border-style: solid;
         color: black;
         border-color: #7f7f7f;
-        background-image: linear-gradient(to bottom, #d9d9d9, #e3e3e3 3%, #e6e6e6);
-        text-shadow: 0 1px white;
-        icon-shadow: 0 1px white;
-        box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); }
+        background-image: linear-gradient(to bottom, #4d4d4d);
+        color: white; }
       .notebook tab .button:backdrop {
         color: rgba(25, 25, 25, 0.3);
         border-color: transparent; }
@@ -1387,7 +1289,7 @@ GtkTreeView.view.progressbar {
   -GtkRange-trough-border: 0;
   -GtkScrollbar-has-backward-stepper: false;
   -GtkScrollbar-has-forward-stepper: false;
-  -GtkRange-slider-width: 13;
+  -GtkRange-slider-width: 20;
   -GtkScrollbar-min-slider-length: 42;
   -GtkRange-stepper-spacing: 0;
   -GtkRange-trough-under-steppers: 1; }
@@ -1396,11 +1298,11 @@ GtkTreeView.view.progressbar {
   .scrollbar.slider {
     border-radius: 20px;
     border: 3px solid transparent;
-    background-color: #b2b2b2; }
+    background-color: #7f7f7f; }
     .scrollbar.slider:backdrop, .scrollbar.slider:insensitive {
       background-color: #e5e5e5; }
     .scrollbar.slider:hover {
-      background-color: #7f7f7f; }
+      background-color: #4c4c4c; }
     .scrollbar.slider:prelight:active {
       background-color: black; }
     .scrollbar.slider.fine-tune {
@@ -1463,9 +1365,6 @@ GtkSwitch {
     color: black;
     background-image: linear-gradient(to bottom, white, white 40%, #f2f2f2);
     border-color: #7f7f7f;
-    text-shadow: 0 1px white;
-    icon-shadow: 0 1px white;
-    box-shadow: inset 0 1px white;
     box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; }
     GtkSwitch.slider:hover {
       border-width: 1px;
@@ -1473,9 +1372,6 @@ GtkSwitch {
       color: black;
       border-color: #7f7f7f;
       background-image: linear-gradient(to bottom, white, white 40%, white);
-      text-shadow: 0 1px white;
-      icon-shadow: 0 1px white;
-      box-shadow: inset 0 1px white;
       box-shadow: inset 0 1px white, inset 0 -2px rgba(255, 255, 255, 0.6), inset 0 -1px #bfbfbf; }
     GtkSwitch.slider:active {
       border: 1px solid black; }
@@ -1486,8 +1382,7 @@ GtkSwitch {
       border-color: #7f7f7f;
       background-image: linear-gradient(to bottom, white);
       text-shadow: none;
-      icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+      icon-shadow: none; }
     GtkSwitch.slider:backdrop {
       border-width: 1px;
       border-style: solid;
@@ -1495,8 +1390,7 @@ GtkSwitch {
       border-color: #8b8b8b;
       background-image: linear-gradient(to bottom, white);
       text-shadow: none;
-      icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      icon-shadow: none; }
       GtkSwitch.slider:backdrop:active {
         border-color: black; }
       GtkSwitch.slider:backdrop:insensitive {
@@ -1504,8 +1398,7 @@ GtkSwitch {
         border-style: solid;
         color: white;
         border-color: #8b8b8b;
-        background-image: linear-gradient(to bottom, white);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+        background-image: linear-gradient(to bottom, white); }
 
 /*************************
  * Check and Radio items *
@@ -1544,9 +1437,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     color: black;
     background-image: linear-gradient(to bottom, white, white 40%, #f2f2f2);
     border-color: #7f7f7f;
-    text-shadow: 0 1px white;
-    icon-shadow: 0 1px white;
-    box-shadow: inset 0 1px white;
     border-radius: 50%;
     border-color: #777777;
     box-shadow: inset 0 1px white, inset 0 -2px white, inset 0 -1px #bfbfbf; }
@@ -1558,9 +1448,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
       color: black;
       border-color: #7f7f7f;
       background-image: linear-gradient(to bottom, white, white 40%, white);
-      text-shadow: 0 1px white;
-      icon-shadow: 0 1px white;
-      box-shadow: inset 0 1px white;
       border-color: #777777;
       border-radius: 50%;
       box-shadow: inset 0 1px white, inset 0 -2px white, inset 0 -1px #d8d8d8; }
@@ -1586,8 +1473,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
       border-style: solid;
       color: white;
       border-color: #8b8b8b;
-      background-image: linear-gradient(to bottom, white);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+      background-image: linear-gradient(to bottom, white); }
     .scale.slider:active,
     .scale.scale-has-marks-above.scale-has-marks-below.slider:active,
     .scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:active {
@@ -1855,28 +1741,20 @@ GtkMessageDialog .titlebar {
   border-style: solid;
   color: black;
   background-image: linear-gradient(to bottom, white, white 40%, #f2f2f2);
-  border-color: #7f7f7f;
-  text-shadow: 0 1px white;
-  icon-shadow: 0 1px white;
-  box-shadow: inset 0 1px white; }
+  border-color: #7f7f7f; }
   .dialog-action-area.linked .button:hover {
     border-width: 1px;
     border-style: solid;
     color: black;
     border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, white, white 40%, white);
-    text-shadow: 0 1px white;
-    icon-shadow: 0 1px white;
-    box-shadow: inset 0 1px white; }
+    background-image: linear-gradient(to bottom, white, white 40%, white); }
   .dialog-action-area.linked .button:active {
     border-width: 1px;
     border-style: solid;
     color: black;
     border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, #d9d9d9, #e3e3e3 3%, #e6e6e6);
-    text-shadow: 0 1px white;
-    icon-shadow: 0 1px white;
-    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); }
+    background-image: linear-gradient(to bottom, #4d4d4d);
+    color: white; }
   .dialog-action-area.linked .button:insensitive {
     border-width: 1px;
     border-style: solid;
@@ -1884,8 +1762,7 @@ GtkMessageDialog .titlebar {
     border-color: #7f7f7f;
     background-image: linear-gradient(to bottom, white);
     text-shadow: none;
-    icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+    icon-shadow: none; }
   .dialog-action-area.linked .button:backdrop {
     border-width: 1px;
     border-style: solid;
@@ -1893,15 +1770,13 @@ GtkMessageDialog .titlebar {
     border-color: #8b8b8b;
     background-image: linear-gradient(to bottom, white);
     text-shadow: none;
-    icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    icon-shadow: none; }
   .dialog-action-area.linked .button:backdrop:insensitive {
     border-width: 1px;
     border-style: solid;
     color: white;
     border-color: #8b8b8b;
-    background-image: linear-gradient(to bottom, white);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+    background-image: linear-gradient(to bottom, white); }
 .dialog-action-area.linked .button, .dialog-action-area.linked .button:hover, .dialog-action-area.linked .button:active, .dialog-action-area.linked .button:insensitive, .dialog-action-area.linked .button:backdrop, .dialog-action-area.linked .button:backdrop:insensitive {
   border-style: solid none none solid; }
 .dialog-action-area.linked .button:first-child {
@@ -1975,10 +1850,7 @@ GtkInfoBar {
     border-style: solid;
     color: white;
     background-image: linear-gradient(to bottom, #0d0d0d, black 40%, black);
-    border-color: black;
-    text-shadow: 0 -1px black;
-    icon-shadow: 0 -1px black;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
+    border-color: black; }
     .info .button:hover,
     .question .button:hover,
     .warning .button:hover,
@@ -1987,10 +1859,7 @@ GtkInfoBar {
       border-style: solid;
       color: white;
       border-color: black;
-      background-image: linear-gradient(to bottom, #242424, #0a0a0a 40%, black);
-      text-shadow: 0 -1px black;
-      icon-shadow: 0 -1px black;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); }
+      background-image: linear-gradient(to bottom, #242424, #0a0a0a 40%, black); }
     .info .button:active,
     .question .button:active,
     .warning .button:active,
@@ -1999,10 +1868,8 @@ GtkInfoBar {
       border-style: solid;
       color: white;
       border-color: black;
-      background-image: linear-gradient(to bottom, black, black 3%, black);
-      text-shadow: 0 -1px black;
-      icon-shadow: 0 -1px black;
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3); }
+      background-image: linear-gradient(to bottom, white);
+      color: black; }
     .info .button:insensitive,
     .question .button:insensitive,
     .warning .button:insensitive,
@@ -2013,8 +1880,7 @@ GtkInfoBar {
       border-color: #7f7f7f;
       background-image: linear-gradient(to bottom, white);
       text-shadow: none;
-      icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+      icon-shadow: none; }
     .info .button:backdrop,
     .question .button:backdrop,
     .warning .button:backdrop,
@@ -2025,8 +1891,7 @@ GtkInfoBar {
       border-color: black;
       background-image: linear-gradient(to bottom, black);
       text-shadow: none;
-      icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      icon-shadow: none; }
     .info .button:backdrop:insensitive,
     .question .button:backdrop:insensitive,
     .warning .button:backdrop:insensitive,
@@ -2035,8 +1900,7 @@ GtkInfoBar {
       border-style: solid;
       color: white;
       border-color: #8b8b8b;
-      background-image: linear-gradient(to bottom, white);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+      background-image: linear-gradient(to bottom, white); }
 
 /************
  * Tooltips *
@@ -2141,19 +2005,14 @@ GtkColorChooserWidget #add-color-button {
     border-style: solid;
     color: black;
     background-image: linear-gradient(to bottom, white, white 40%, #f2f2f2);
-    border-color: #7f7f7f;
-    text-shadow: 0 1px white;
-    icon-shadow: 0 1px white;
-    box-shadow: inset 0 1px white, 0 1px white; }
+    border-color: #7f7f7f; }
   .button.titlebutton:active {
     border-width: 1px;
     border-style: solid;
     color: black;
     border-color: #7f7f7f;
-    background-image: linear-gradient(to bottom, #d9d9d9, #e3e3e3 3%, #e6e6e6);
-    text-shadow: 0 1px white;
-    icon-shadow: 0 1px white;
-    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white; }
+    background-image: linear-gradient(to bottom, #4d4d4d);
+    color: white; }
   .button.titlebutton:backdrop {
     border-width: 1px;
     border-style: solid;
@@ -2162,6 +2021,5 @@ GtkColorChooserWidget #add-color-button {
     background-image: linear-gradient(to bottom, white);
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
     border-color: transparent;
     transition-property: border, box-shadow, color; }