Merge branch 'testing'

18 files changed, 987 insertions, 563 deletions

diff --git a/common/gtk-3.0/3.14/_common.scss b/common/gtk-3.0/3.14/_common.scss
index 69830e2..9d858a1 100644
--- a/common/gtk-3.0/3.14/_common.scss
+++ b/common/gtk-3.0/3.14/_common.scss
@@ -350,11 +350,11 @@ GtkFlowBox .grid-child {
     }
   }
 
-//  .osd & {
-//    @include entry(osd);
-//    &:focus { @include entry(osd-focus); }
-//    &:insensitive { @include entry(osd-insensitive); }
-//  }
+  .osd & {
+    @include entry(osd);
+    &:focus { @include entry(osd-focus); }
+    &:insensitive { @include entry(osd-insensitive); }
+  }
 }
 
 /***********
diff --git a/common/gtk-3.0/3.14/_drawing.scss b/common/gtk-3.0/3.14/_drawing.scss
index dd32535..378e5d9 100644
--- a/common/gtk-3.0/3.14/_drawing.scss
+++ b/common/gtk-3.0/3.14/_drawing.scss
@@ -85,34 +85,32 @@
     background-image: linear-gradient(to bottom, transparentize($_header_entry_bg, 0.35));
   }
 
-  @if $t==osd {
-    color: $osd_text_color;
-    border-color: $osd_borders_color;
-    background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5));
-    background-clip: padding-box;
-
-    text-shadow: 0 1px black;
-    icon-shadow: 0 1px black;
+  @else if $t==osd {
+  //
+  // normal osd button
+  //
+    color: $osd_fg_color;
+    border-color: transparentize($osd_fg_color, 0.7);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%));
   }
 
-  @if $t==osd-focus {
-    color: $osd_text_color;
+  @else if $t==osd-focus {
+  //
+  // active osd button
+  //
+    color: $selected_bg_color;
     border-color: $selected_bg_color;
-    background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5));
-    background-clip: padding-box;
-
-    text-shadow: 0 1px black;
-    icon-shadow: 0 1px black;
+    background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%));
   }
 
-  @if $t==osd-insensitive {
+  @else if $t==osd-insensitive {
+  //
+  // insensitive osd button
+  //
     color: $osd_insensitive_fg_color;
-    border-color: $osd_borders_color;
+    border-color: transparentize($osd_fg_color, 0.8);
     background-image: linear-gradient(to bottom, $osd_insensitive_bg_color);
-    background-clip: padding-box;
-
-    text-shadow: none;
-    icon-shadow: none;
   }
 }
 
diff --git a/common/gtk-3.0/3.14/_transparent_widgets.scss b/common/gtk-3.0/3.14/_transparent_widgets.scss
index 4d3e220..16bf819 100644
--- a/common/gtk-3.0/3.14/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.14/_transparent_widgets.scss
@@ -2,8 +2,6 @@
   color: $header_border;  //fixes separator in gnome-tweak-tool
 }
 
-GtkFileChooserDialog .dialog-action-box { background-color: $bg_color }  // fix for non gnome environments
-
 NemoWindow GtkEventBox { background-color: $bg_color; } // fixes nemo statusbar
 
 GtkFileChooserDialog *,
@@ -85,8 +83,35 @@ MarlinViewWindow {
   .pane-separator { background-color: $dark_sidebar_border; }
 }
 
-// Yeah, this is ugly, but prevents a transparent background in the image preview box
-GtkFileChooserDialog GtkPaned > .vertical > .horizontal { background-color: $bg_color; }
+GtkFileChooserDialog {
+
+  &.background.csd, .background { background-color: $dark_sidebar_bg }
+  .sidebar { background-color: transparent }
+
+  // Yeah, this is ugly, but prevents a transparent background in the image preview box
+  GtkPaned > .vertical > .horizontal { background-color: $bg_color; }
+
+  // fix for non gnome environments
+  .dialog-action-box { background-color: $bg_color }
+
+  .dialog-vbox > .frame {
+    color: $dark_sidebar_fg;
+    border-color: transparent;
+  }
+  .action-bar.frame {
+    background-color: transparent;
+    border-color: if($variant =='light', darken($dark_sidebar_bg, 7%), darken($dark_sidebar_bg, 15%));
+  }
+
+  .action-bar.frame,
+  .dialog-vbox > .frame {
+
+    .button { @extend %dark_sidebar_button; }
+    .entry { @extend %dark_sidebar_entry; }
+
+    GtkLabel, GtkComboBox { color: $dark_sidebar_fg; }
+  }
+}
 
 // Gedit sidebar
 GeditWindow.background.csd {
@@ -180,15 +205,7 @@ GeditWindow.background.csd GeditFileBrowserWidget {
     background-color: transparent;
     border-color: darken($dark_sidebar_bg, 7%);
 
-    .button {
-      @include button(undecorated);
-      color: $dark_sidebar_fg;
-      border: 1px solid transparent;
-
-      &:hover { border: 1px solid $selected_bg_color; }
-      &:active, &:checked { @include button(active); }
-      &:insensitive { color: transparentize($dark_sidebar_fg, 0.6); }
-    }
+    .button { @extend %dark_sidebar_button; }
     GtkComboBox { color: $dark_sidebar_fg; }
   }
 }
@@ -204,24 +221,17 @@ GeditWindow.background.csd GeditFileBrowserView.view {
   }
 }
 
-// Filechooser bottom bar
-GtkFileChooserDialog .action-bar.frame {
-  background-color: darken($dark_sidebar_bg, 2%);
-  border-color: if($variant =='light', darken($dark_sidebar_bg, 7%), darken($dark_sidebar_bg, 15%));
-
-  GtkLabel { color: $dark_sidebar_fg; }
+%dark_sidebar_button {
+  @include button(osd);
 
-  .button {
-    @include button(undecorated);
+  &:hover { @include button(osd-hover) }
+  &:active, &:checked { @include button(osd-active); }
+  &:insensitive { @include button(osd-insensitive); }
+}
 
-    &:hover { border: 1px solid $selected_bg_color; }
-    &:active, &:checked {
-      border: 1px solid $selected_bg_color;
-      color: $selected_fg_color;
-      background-color: $selected_bg_color;
-    }
-    &:insensitive { color: transparentize($dark_sidebar_fg, 0.6); }
-  }
+%dark_sidebar_entry {
+  @include entry(osd);
 
-  GtkComboBox { color: $dark_sidebar_fg; }
+  &:focus { @include entry(osd-focus) }
+  &:insensitive { @include entry(osd-insensitive); }
 }
diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css
index c278ae3..8e50123 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -238,6 +238,19 @@ GtkFlowBox .grid-child {
         box-shadow: 0 -1px 0 0 #5294E2; }
       .linked.vertical > .entry:last-child:insensitive {
         border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
+    color: #A8ADB5;
+    border-color: rgba(168, 173, 181, 0.3);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:focus {
+      color: #5294E2;
+      border-color: #5294E2;
+      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:insensitive {
+      color: #5c6069;
+      border-color: rgba(168, 173, 181, 0.2);
+      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /***********
  * Buttons *
@@ -3360,9 +3373,6 @@ GtkListBox .h4 {
 .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator {
   color: rgba(36, 39, 45, 0.97); }
 
-GtkFileChooserDialog .dialog-action-box {
-  background-color: #444852; }
-
 NemoWindow GtkEventBox {
   background-color: #444852; }
 
@@ -3601,8 +3611,24 @@ NemoWindow .pane-separator,
 MarlinViewWindow .pane-separator {
   background-color: rgba(46, 49, 56, 0.95); }
 
+GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background {
+  background-color: rgba(69, 74, 84, 0.95); }
+GtkFileChooserDialog .sidebar {
+  background-color: transparent; }
 GtkFileChooserDialog GtkPaned > .vertical > .horizontal {
   background-color: #444852; }
+GtkFileChooserDialog .dialog-action-box {
+  background-color: #444852; }
+GtkFileChooserDialog .dialog-vbox > .frame {
+  color: #A8ADB5;
+  border-color: transparent; }
+GtkFileChooserDialog .action-bar.frame {
+  background-color: transparent;
+  border-color: rgba(35, 37, 42, 0.95); }
+GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox,
+GtkFileChooserDialog .dialog-vbox > .frame GtkLabel,
+GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox {
+  color: #A8ADB5; }
 
 GeditWindow.background.csd {
   background-color: transparent; }
@@ -3674,21 +3700,6 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: rgba(53, 57, 65, 0.95); }
-    GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
-      border-color: transparent;
-      background-color: transparent;
-      background-image: none;
-      color: #A8ADB5;
-      border: 1px solid transparent; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
-        border: 1px solid #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
-        background-color: #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
-        color: rgba(168, 173, 181, 0.4); }
     GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox {
       color: #A8ADB5; }
 
@@ -3700,25 +3711,48 @@ GeditWindow.background.csd GeditFileBrowserView.view {
     GeditWindow.background.csd GeditFileBrowserView.view.expander:hover {
       color: #5294E2; }
 
-GtkFileChooserDialog .action-bar.frame {
-  background-color: rgba(65, 69, 79, 0.95);
-  border-color: rgba(35, 37, 42, 0.95); }
-  GtkFileChooserDialog .action-bar.frame GtkLabel {
-    color: #A8ADB5; }
-  GtkFileChooserDialog .action-bar.frame .button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none; }
-    GtkFileChooserDialog .action-bar.frame .button:hover {
-      border: 1px solid #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked {
-      border: 1px solid #5294E2;
-      color: #ffffff;
-      background-color: #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:insensitive {
-      color: rgba(168, 173, 181, 0.4); }
-  GtkFileChooserDialog .action-bar.frame GtkComboBox {
-    color: #A8ADB5; }
+GtkFileChooserDialog .action-bar.frame .button,
+GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
+  color: #A8ADB5;
+  outline-color: rgba(168, 173, 181, 0.3);
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:hover,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
+    color: #5294E2;
+    outline-color: rgba(168, 173, 181, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:active,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
+    color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, #5294E2); }
+  GtkFileChooserDialog .action-bar.frame .button:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+
+GtkFileChooserDialog .action-bar.frame .entry,
+GtkFileChooserDialog .dialog-vbox > .frame .entry {
+  color: #A8ADB5;
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:focus,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
+    color: #5294E2;
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #D3DAE3;
diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css
index 8efb7d2..2c64d5b 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -238,6 +238,19 @@ GtkFlowBox .grid-child {
         box-shadow: 0 -1px 0 0 #5294E2; }
       .linked.vertical > .entry:last-child:insensitive {
         border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
+    color: #A8ADB5;
+    border-color: rgba(168, 173, 181, 0.3);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:focus {
+      color: #5294E2;
+      border-color: #5294E2;
+      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:insensitive {
+      color: #5c6069;
+      border-color: rgba(168, 173, 181, 0.2);
+      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /***********
  * Buttons *
@@ -3361,9 +3374,6 @@ GtkListBox .h4 {
 .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator {
   color: rgba(31, 34, 39, 0.97); }
 
-GtkFileChooserDialog .dialog-action-box {
-  background-color: #F5F6F7; }
-
 NemoWindow GtkEventBox {
   background-color: #F5F6F7; }
 
@@ -3593,8 +3603,24 @@ NemoWindow .pane-separator,
 MarlinViewWindow .pane-separator {
   background-color: rgba(60, 64, 73, 0.95); }
 
+GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background {
+  background-color: rgba(60, 64, 73, 0.95); }
+GtkFileChooserDialog .sidebar {
+  background-color: transparent; }
 GtkFileChooserDialog GtkPaned > .vertical > .horizontal {
   background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-action-box {
+  background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-vbox > .frame {
+  color: #A8ADB5;
+  border-color: transparent; }
+GtkFileChooserDialog .action-bar.frame {
+  background-color: transparent;
+  border-color: rgba(44, 47, 53, 0.95); }
+GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox,
+GtkFileChooserDialog .dialog-vbox > .frame GtkLabel,
+GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox {
+  color: #A8ADB5; }
 
 GeditWindow.background.csd {
   background-color: transparent; }
@@ -3666,21 +3692,6 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: rgba(44, 47, 53, 0.95); }
-    GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
-      border-color: transparent;
-      background-color: transparent;
-      background-image: none;
-      color: #A8ADB5;
-      border: 1px solid transparent; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
-        border: 1px solid #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
-        background-color: #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
-        color: rgba(168, 173, 181, 0.4); }
     GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox {
       color: #A8ADB5; }
 
@@ -3692,25 +3703,48 @@ GeditWindow.background.csd GeditFileBrowserView.view {
     GeditWindow.background.csd GeditFileBrowserView.view.expander:hover {
       color: #5294E2; }
 
-GtkFileChooserDialog .action-bar.frame {
-  background-color: rgba(55, 59, 67, 0.95);
-  border-color: rgba(44, 47, 53, 0.95); }
-  GtkFileChooserDialog .action-bar.frame GtkLabel {
-    color: #A8ADB5; }
-  GtkFileChooserDialog .action-bar.frame .button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none; }
-    GtkFileChooserDialog .action-bar.frame .button:hover {
-      border: 1px solid #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked {
-      border: 1px solid #5294E2;
-      color: #ffffff;
-      background-color: #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:insensitive {
-      color: rgba(168, 173, 181, 0.4); }
-  GtkFileChooserDialog .action-bar.frame GtkComboBox {
-    color: #A8ADB5; }
+GtkFileChooserDialog .action-bar.frame .button,
+GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
+  color: #A8ADB5;
+  outline-color: rgba(168, 173, 181, 0.3);
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:hover,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
+    color: #5294E2;
+    outline-color: rgba(168, 173, 181, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:active,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
+    color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, #5294E2); }
+  GtkFileChooserDialog .action-bar.frame .button:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+
+GtkFileChooserDialog .action-bar.frame .entry,
+GtkFileChooserDialog .dialog-vbox > .frame .entry {
+  color: #A8ADB5;
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:focus,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
+    color: #5294E2;
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #5c616c;
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
index ce02657..e6d5c87 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
@@ -238,6 +238,19 @@ GtkFlowBox .grid-child {
         box-shadow: 0 -1px 0 0 #5294E2; }
       .linked.vertical > .entry:last-child:insensitive {
         border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
+    color: #A8ADB5;
+    border-color: rgba(168, 173, 181, 0.3);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:focus {
+      color: #5294E2;
+      border-color: #5294E2;
+      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:insensitive {
+      color: #5c6069;
+      border-color: rgba(168, 173, 181, 0.2);
+      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /***********
  * Buttons *
@@ -3360,9 +3373,6 @@ GtkListBox .h4 {
 .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator {
   color: #24272d; }
 
-GtkFileChooserDialog .dialog-action-box {
-  background-color: #444852; }
-
 NemoWindow GtkEventBox {
   background-color: #444852; }
 
@@ -3601,8 +3611,24 @@ NemoWindow .pane-separator,
 MarlinViewWindow .pane-separator {
   background-color: #2e3138; }
 
+GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background {
+  background-color: #454a54; }
+GtkFileChooserDialog .sidebar {
+  background-color: transparent; }
 GtkFileChooserDialog GtkPaned > .vertical > .horizontal {
   background-color: #444852; }
+GtkFileChooserDialog .dialog-action-box {
+  background-color: #444852; }
+GtkFileChooserDialog .dialog-vbox > .frame {
+  color: #A8ADB5;
+  border-color: transparent; }
+GtkFileChooserDialog .action-bar.frame {
+  background-color: transparent;
+  border-color: #23252a; }
+GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox,
+GtkFileChooserDialog .dialog-vbox > .frame GtkLabel,
+GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox {
+  color: #A8ADB5; }
 
 GeditWindow.background.csd {
   background-color: transparent; }
@@ -3674,21 +3700,6 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: #353941; }
-    GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
-      border-color: transparent;
-      background-color: transparent;
-      background-image: none;
-      color: #A8ADB5;
-      border: 1px solid transparent; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
-        border: 1px solid #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
-        background-color: #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
-        color: rgba(168, 173, 181, 0.4); }
     GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox {
       color: #A8ADB5; }
 
@@ -3700,25 +3711,48 @@ GeditWindow.background.csd GeditFileBrowserView.view {
     GeditWindow.background.csd GeditFileBrowserView.view.expander:hover {
       color: #5294E2; }
 
-GtkFileChooserDialog .action-bar.frame {
-  background-color: #41454f;
-  border-color: #23252a; }
-  GtkFileChooserDialog .action-bar.frame GtkLabel {
-    color: #A8ADB5; }
-  GtkFileChooserDialog .action-bar.frame .button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none; }
-    GtkFileChooserDialog .action-bar.frame .button:hover {
-      border: 1px solid #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked {
-      border: 1px solid #5294E2;
-      color: #ffffff;
-      background-color: #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:insensitive {
-      color: rgba(168, 173, 181, 0.4); }
-  GtkFileChooserDialog .action-bar.frame GtkComboBox {
-    color: #A8ADB5; }
+GtkFileChooserDialog .action-bar.frame .button,
+GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
+  color: #A8ADB5;
+  outline-color: rgba(168, 173, 181, 0.3);
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:hover,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
+    color: #5294E2;
+    outline-color: rgba(168, 173, 181, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:active,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
+    color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, #5294E2); }
+  GtkFileChooserDialog .action-bar.frame .button:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+
+GtkFileChooserDialog .action-bar.frame .entry,
+GtkFileChooserDialog .dialog-vbox > .frame .entry {
+  color: #A8ADB5;
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:focus,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
+    color: #5294E2;
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #D3DAE3;
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
index 99c4e75..7314c0d 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
@@ -238,6 +238,19 @@ GtkFlowBox .grid-child {
         box-shadow: 0 -1px 0 0 #5294E2; }
       .linked.vertical > .entry:last-child:insensitive {
         border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
+    color: #A8ADB5;
+    border-color: rgba(168, 173, 181, 0.3);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:focus {
+      color: #5294E2;
+      border-color: #5294E2;
+      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:insensitive {
+      color: #5c6069;
+      border-color: rgba(168, 173, 181, 0.2);
+      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /***********
  * Buttons *
@@ -3361,9 +3374,6 @@ GtkListBox .h4 {
 .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator {
   color: #1f2227; }
 
-GtkFileChooserDialog .dialog-action-box {
-  background-color: #F5F6F7; }
-
 NemoWindow GtkEventBox {
   background-color: #F5F6F7; }
 
@@ -3593,8 +3603,24 @@ NemoWindow .pane-separator,
 MarlinViewWindow .pane-separator {
   background-color: #3c4049; }
 
+GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background {
+  background-color: #3c4049; }
+GtkFileChooserDialog .sidebar {
+  background-color: transparent; }
 GtkFileChooserDialog GtkPaned > .vertical > .horizontal {
   background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-action-box {
+  background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-vbox > .frame {
+  color: #A8ADB5;
+  border-color: transparent; }
+GtkFileChooserDialog .action-bar.frame {
+  background-color: transparent;
+  border-color: #2c2f35; }
+GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox,
+GtkFileChooserDialog .dialog-vbox > .frame GtkLabel,
+GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox {
+  color: #A8ADB5; }
 
 GeditWindow.background.csd {
   background-color: transparent; }
@@ -3666,21 +3692,6 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: #2c2f35; }
-    GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
-      border-color: transparent;
-      background-color: transparent;
-      background-image: none;
-      color: #A8ADB5;
-      border: 1px solid transparent; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
-        border: 1px solid #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
-        background-color: #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
-        color: rgba(168, 173, 181, 0.4); }
     GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox {
       color: #A8ADB5; }
 
@@ -3692,25 +3703,48 @@ GeditWindow.background.csd GeditFileBrowserView.view {
     GeditWindow.background.csd GeditFileBrowserView.view.expander:hover {
       color: #5294E2; }
 
-GtkFileChooserDialog .action-bar.frame {
-  background-color: #373b43;
-  border-color: #2c2f35; }
-  GtkFileChooserDialog .action-bar.frame GtkLabel {
-    color: #A8ADB5; }
-  GtkFileChooserDialog .action-bar.frame .button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none; }
-    GtkFileChooserDialog .action-bar.frame .button:hover {
-      border: 1px solid #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked {
-      border: 1px solid #5294E2;
-      color: #ffffff;
-      background-color: #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:insensitive {
-      color: rgba(168, 173, 181, 0.4); }
-  GtkFileChooserDialog .action-bar.frame GtkComboBox {
-    color: #A8ADB5; }
+GtkFileChooserDialog .action-bar.frame .button,
+GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
+  color: #A8ADB5;
+  outline-color: rgba(168, 173, 181, 0.3);
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:hover,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
+    color: #5294E2;
+    outline-color: rgba(168, 173, 181, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:active,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
+    color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, #5294E2); }
+  GtkFileChooserDialog .action-bar.frame .button:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+
+GtkFileChooserDialog .action-bar.frame .entry,
+GtkFileChooserDialog .dialog-vbox > .frame .entry {
+  color: #A8ADB5;
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:focus,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
+    color: #5294E2;
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #5c616c;
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index 05f86bf..746dca6 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -238,6 +238,19 @@ GtkFlowBox .grid-child {
         box-shadow: 0 -1px 0 0 #5294E2; }
       .linked.vertical > .entry:last-child:insensitive {
         border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
+    color: #A8ADB5;
+    border-color: rgba(168, 173, 181, 0.3);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:focus {
+      color: #5294E2;
+      border-color: #5294E2;
+      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:insensitive {
+      color: #5c6069;
+      border-color: rgba(168, 173, 181, 0.2);
+      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /***********
  * Buttons *
@@ -3360,9 +3373,6 @@ GtkListBox .h4 {
 .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator {
   color: #d4d5db; }
 
-GtkFileChooserDialog .dialog-action-box {
-  background-color: #F5F6F7; }
-
 NemoWindow GtkEventBox {
   background-color: #F5F6F7; }
 
@@ -3592,8 +3602,24 @@ NemoWindow .pane-separator,
 MarlinViewWindow .pane-separator {
   background-color: #3c4049; }
 
+GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background {
+  background-color: #3c4049; }
+GtkFileChooserDialog .sidebar {
+  background-color: transparent; }
 GtkFileChooserDialog GtkPaned > .vertical > .horizontal {
   background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-action-box {
+  background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-vbox > .frame {
+  color: #A8ADB5;
+  border-color: transparent; }
+GtkFileChooserDialog .action-bar.frame {
+  background-color: transparent;
+  border-color: #2c2f35; }
+GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox,
+GtkFileChooserDialog .dialog-vbox > .frame GtkLabel,
+GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox {
+  color: #A8ADB5; }
 
 GeditWindow.background.csd {
   background-color: transparent; }
@@ -3665,21 +3691,6 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: #2c2f35; }
-    GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
-      border-color: transparent;
-      background-color: transparent;
-      background-image: none;
-      color: #A8ADB5;
-      border: 1px solid transparent; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
-        border: 1px solid #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
-        background-color: #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
-        color: rgba(168, 173, 181, 0.4); }
     GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox {
       color: #A8ADB5; }
 
@@ -3691,25 +3702,48 @@ GeditWindow.background.csd GeditFileBrowserView.view {
     GeditWindow.background.csd GeditFileBrowserView.view.expander:hover {
       color: #5294E2; }
 
-GtkFileChooserDialog .action-bar.frame {
-  background-color: #373b43;
-  border-color: #2c2f35; }
-  GtkFileChooserDialog .action-bar.frame GtkLabel {
-    color: #A8ADB5; }
-  GtkFileChooserDialog .action-bar.frame .button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none; }
-    GtkFileChooserDialog .action-bar.frame .button:hover {
-      border: 1px solid #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked {
-      border: 1px solid #5294E2;
-      color: #ffffff;
-      background-color: #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:insensitive {
-      color: rgba(168, 173, 181, 0.4); }
-  GtkFileChooserDialog .action-bar.frame GtkComboBox {
-    color: #A8ADB5; }
+GtkFileChooserDialog .action-bar.frame .button,
+GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
+  color: #A8ADB5;
+  outline-color: rgba(168, 173, 181, 0.3);
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:hover,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
+    color: #5294E2;
+    outline-color: rgba(168, 173, 181, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:active,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
+    color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, #5294E2); }
+  GtkFileChooserDialog .action-bar.frame .button:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+
+GtkFileChooserDialog .action-bar.frame .entry,
+GtkFileChooserDialog .dialog-vbox > .frame .entry {
+  color: #A8ADB5;
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:focus,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
+    color: #5294E2;
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #5c616c;
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index daa2d38..786052f 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -238,6 +238,19 @@ GtkFlowBox .grid-child {
         box-shadow: 0 -1px 0 0 #5294E2; }
       .linked.vertical > .entry:last-child:insensitive {
         border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
+    color: #A8ADB5;
+    border-color: rgba(168, 173, 181, 0.3);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:focus {
+      color: #5294E2;
+      border-color: #5294E2;
+      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:insensitive {
+      color: #5c6069;
+      border-color: rgba(168, 173, 181, 0.2);
+      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /***********
  * Buttons *
@@ -3360,9 +3373,6 @@ GtkListBox .h4 {
 .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator {
   color: rgba(212, 213, 219, 0.95); }
 
-GtkFileChooserDialog .dialog-action-box {
-  background-color: #F5F6F7; }
-
 NemoWindow GtkEventBox {
   background-color: #F5F6F7; }
 
@@ -3592,8 +3602,24 @@ NemoWindow .pane-separator,
 MarlinViewWindow .pane-separator {
   background-color: rgba(60, 64, 73, 0.95); }
 
+GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background {
+  background-color: rgba(60, 64, 73, 0.95); }
+GtkFileChooserDialog .sidebar {
+  background-color: transparent; }
 GtkFileChooserDialog GtkPaned > .vertical > .horizontal {
   background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-action-box {
+  background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-vbox > .frame {
+  color: #A8ADB5;
+  border-color: transparent; }
+GtkFileChooserDialog .action-bar.frame {
+  background-color: transparent;
+  border-color: rgba(44, 47, 53, 0.95); }
+GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox,
+GtkFileChooserDialog .dialog-vbox > .frame GtkLabel,
+GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox {
+  color: #A8ADB5; }
 
 GeditWindow.background.csd {
   background-color: transparent; }
@@ -3665,21 +3691,6 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: rgba(44, 47, 53, 0.95); }
-    GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
-      border-color: transparent;
-      background-color: transparent;
-      background-image: none;
-      color: #A8ADB5;
-      border: 1px solid transparent; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
-        border: 1px solid #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
-        background-color: #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
-        color: rgba(168, 173, 181, 0.4); }
     GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox {
       color: #A8ADB5; }
 
@@ -3691,25 +3702,48 @@ GeditWindow.background.csd GeditFileBrowserView.view {
     GeditWindow.background.csd GeditFileBrowserView.view.expander:hover {
       color: #5294E2; }
 
-GtkFileChooserDialog .action-bar.frame {
-  background-color: rgba(55, 59, 67, 0.95);
-  border-color: rgba(44, 47, 53, 0.95); }
-  GtkFileChooserDialog .action-bar.frame GtkLabel {
-    color: #A8ADB5; }
-  GtkFileChooserDialog .action-bar.frame .button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none; }
-    GtkFileChooserDialog .action-bar.frame .button:hover {
-      border: 1px solid #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked {
-      border: 1px solid #5294E2;
-      color: #ffffff;
-      background-color: #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:insensitive {
-      color: rgba(168, 173, 181, 0.4); }
-  GtkFileChooserDialog .action-bar.frame GtkComboBox {
-    color: #A8ADB5; }
+GtkFileChooserDialog .action-bar.frame .button,
+GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
+  color: #A8ADB5;
+  outline-color: rgba(168, 173, 181, 0.3);
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:hover,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
+    color: #5294E2;
+    outline-color: rgba(168, 173, 181, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:active,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
+    color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, #5294E2); }
+  GtkFileChooserDialog .action-bar.frame .button:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+
+GtkFileChooserDialog .action-bar.frame .entry,
+GtkFileChooserDialog .dialog-vbox > .frame .entry {
+  color: #A8ADB5;
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:focus,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
+    color: #5294E2;
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #5c616c;
diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss
index 3f394df..f9ae8f0 100644
--- a/common/gtk-3.0/3.16/_common.scss
+++ b/common/gtk-3.0/3.16/_common.scss
@@ -350,11 +350,11 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
     }
   }
 
-//  .osd & {
-//    @include entry(osd);
-//    &:focus { @include entry(osd-focus); }
-//    &:insensitive { @include entry(osd-insensitive); }
-//  }
+  .osd & {
+    @include entry(osd);
+    &:focus { @include entry(osd-focus); }
+    &:insensitive { @include entry(osd-insensitive); }
+  }
 }
 
 /***********
diff --git a/common/gtk-3.0/3.16/_drawing.scss b/common/gtk-3.0/3.16/_drawing.scss
index dd32535..378e5d9 100644
--- a/common/gtk-3.0/3.16/_drawing.scss
+++ b/common/gtk-3.0/3.16/_drawing.scss
@@ -85,34 +85,32 @@
     background-image: linear-gradient(to bottom, transparentize($_header_entry_bg, 0.35));
   }
 
-  @if $t==osd {
-    color: $osd_text_color;
-    border-color: $osd_borders_color;
-    background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5));
-    background-clip: padding-box;
-
-    text-shadow: 0 1px black;
-    icon-shadow: 0 1px black;
+  @else if $t==osd {
+  //
+  // normal osd button
+  //
+    color: $osd_fg_color;
+    border-color: transparentize($osd_fg_color, 0.7);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%));
   }
 
-  @if $t==osd-focus {
-    color: $osd_text_color;
+  @else if $t==osd-focus {
+  //
+  // active osd button
+  //
+    color: $selected_bg_color;
     border-color: $selected_bg_color;
-    background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5));
-    background-clip: padding-box;
-
-    text-shadow: 0 1px black;
-    icon-shadow: 0 1px black;
+    background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%));
   }
 
-  @if $t==osd-insensitive {
+  @else if $t==osd-insensitive {
+  //
+  // insensitive osd button
+  //
     color: $osd_insensitive_fg_color;
-    border-color: $osd_borders_color;
+    border-color: transparentize($osd_fg_color, 0.8);
     background-image: linear-gradient(to bottom, $osd_insensitive_bg_color);
-    background-clip: padding-box;
-
-    text-shadow: none;
-    icon-shadow: none;
   }
 }
 
diff --git a/common/gtk-3.0/3.16/_transparent_widgets.scss b/common/gtk-3.0/3.16/_transparent_widgets.scss
index 3d609ea..67f5b6c 100644
--- a/common/gtk-3.0/3.16/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.16/_transparent_widgets.scss
@@ -2,8 +2,6 @@
   color: $header_border;  //fixes separator in gnome-tweak-tool
 }
 
-GtkFileChooserDialog .dialog-action-box { background-color: $bg_color }  // fix for non gnome environments
-
 NemoWindow GtkEventBox { background-color: $bg_color; } // fixes nemo statusbar
 
 GtkFileChooserDialog *,
@@ -84,8 +82,35 @@ MarlinViewWindow {
   .pane-separator { background-color: $dark_sidebar_border; }
 }
 
-// Yeah, this is ugly, but prevents a transparent background in the image preview box
-GtkFileChooserDialog GtkPaned > .vertical > .horizontal { background-color: $bg_color; }
+GtkFileChooserDialog {
+
+  &.background.csd, .background { background-color: $dark_sidebar_bg }
+  .sidebar { background-color: transparent }
+
+  // Yeah, this is ugly, but prevents a transparent background in the image preview box
+  GtkPaned > .vertical > .horizontal { background-color: $bg_color; }
+
+  // fix for non gnome environments
+  .dialog-action-box { background-color: $bg_color }
+
+  .dialog-vbox > .frame {
+    color: $dark_sidebar_fg;
+    border-color: transparent;
+  }
+  .action-bar.frame {
+    background-color: transparent;
+    border-color: if($variant =='light', darken($dark_sidebar_bg, 7%), darken($dark_sidebar_bg, 15%));
+  }
+
+  .action-bar.frame,
+  .dialog-vbox > .frame {
+
+    .button { @extend %dark_sidebar_button; }
+    .entry { @extend %dark_sidebar_entry; }
+
+    GtkLabel, GtkComboBox { color: $dark_sidebar_fg; }
+  }
+}
 
 // Gedit sidebar
 GeditWindow.background.csd {
@@ -160,7 +185,7 @@ GeditWindow.background.csd GeditFileBrowserWidget {
     .slider {
       background-color: transparentize(lighten($dark_sidebar_fg, 15%), 0.3);
 
-      &:hover { background-color: lighten($dark_sidebar_fg, 20%); }
+      &:hover { background-color: lighten($dark_sidebar_fg, 15%); }
 
       &:prelight:active { background-color: $selected_bg_color; }
 
@@ -174,15 +199,7 @@ GeditWindow.background.csd GeditFileBrowserWidget {
     background-color: transparent;
     border-color: darken($dark_sidebar_bg, 7%);
 
-    .button {
-      @include button(undecorated);
-      color: $dark_sidebar_fg;
-      border: 1px solid transparent;
-
-      &:hover { border: 1px solid $selected_bg_color; }
-      &:active, &:checked { @include button(active); }
-      &:insensitive { color: transparentize($dark_sidebar_fg, 0.6); }
-    }
+    .button { @extend %dark_sidebar_button; }
     GtkComboBox { color: $dark_sidebar_fg; }
   }
 }
@@ -198,24 +215,17 @@ GeditWindow.background.csd GeditFileBrowserView.view {
   }
 }
 
-// Filechooser bottom bar
-GtkFileChooserDialog .action-bar.frame {
-  background-color: darken($dark_sidebar_bg, 2%);
-  border-color: if($variant =='light', darken($dark_sidebar_bg, 7%), darken($dark_sidebar_bg, 15%));
-
-  GtkLabel { color: $dark_sidebar_fg; }
+%dark_sidebar_button {
+  @include button(osd);
 
-  .button {
-    @include button(undecorated);
+  &:hover { @include button(osd-hover) }
+  &:active, &:checked { @include button(osd-active); }
+  &:insensitive { @include button(osd-insensitive); }
+}
 
-    &:hover { border: 1px solid $selected_bg_color; }
-    &:active, &:checked {
-      border: 1px solid $selected_bg_color;
-      color: $selected_fg_color;
-      background-color: $selected_bg_color;
-    }
-    &:insensitive { color: transparentize($dark_sidebar_fg, 0.6); }
-  }
+%dark_sidebar_entry {
+  @include entry(osd);
 
-  GtkComboBox { color: $dark_sidebar_fg; }
+  &:focus { @include entry(osd-focus) }
+  &:insensitive { @include entry(osd-insensitive); }
 }
diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index 7f64b0d..6183d10 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -238,6 +238,19 @@ GtkTextView {
         box-shadow: 0 -1px 0 0 #5294E2; }
       .linked.vertical > .entry:last-child:insensitive {
         border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
+    color: #A8ADB5;
+    border-color: rgba(168, 173, 181, 0.3);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:focus {
+      color: #5294E2;
+      border-color: #5294E2;
+      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:insensitive {
+      color: #5c6069;
+      border-color: rgba(168, 173, 181, 0.2);
+      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /***********
  * Buttons *
@@ -3306,9 +3319,6 @@ GtkListBox .h4 {
 .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator {
   color: rgba(36, 39, 45, 0.97); }
 
-GtkFileChooserDialog .dialog-action-box {
-  background-color: #444852; }
-
 NemoWindow GtkEventBox {
   background-color: #444852; }
 
@@ -3473,8 +3483,24 @@ NemoWindow .pane-separator,
 MarlinViewWindow .pane-separator {
   background-color: rgba(46, 49, 56, 0.95); }
 
+GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background {
+  background-color: rgba(69, 74, 84, 0.95); }
+GtkFileChooserDialog .sidebar {
+  background-color: transparent; }
 GtkFileChooserDialog GtkPaned > .vertical > .horizontal {
   background-color: #444852; }
+GtkFileChooserDialog .dialog-action-box {
+  background-color: #444852; }
+GtkFileChooserDialog .dialog-vbox > .frame {
+  color: #A8ADB5;
+  border-color: transparent; }
+GtkFileChooserDialog .action-bar.frame {
+  background-color: transparent;
+  border-color: rgba(35, 37, 42, 0.95); }
+GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox,
+GtkFileChooserDialog .dialog-vbox > .frame GtkLabel,
+GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox {
+  color: #A8ADB5; }
 
 GeditWindow.background.csd {
   background-color: transparent; }
@@ -3530,7 +3556,7 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider {
     background-color: rgba(209, 212, 216, 0.7); }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:hover {
-      background-color: #dfe1e4; }
+      background-color: #d1d4d8; }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:prelight:active {
       background-color: #5294E2; }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:insensitive {
@@ -3538,21 +3564,6 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: rgba(53, 57, 65, 0.95); }
-    GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
-      border-color: transparent;
-      background-color: transparent;
-      background-image: none;
-      color: #A8ADB5;
-      border: 1px solid transparent; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
-        border: 1px solid #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
-        background-color: #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
-        color: rgba(168, 173, 181, 0.4); }
     GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox {
       color: #A8ADB5; }
 
@@ -3564,25 +3575,48 @@ GeditWindow.background.csd GeditFileBrowserView.view {
     GeditWindow.background.csd GeditFileBrowserView.view.expander:hover {
       color: #5294E2; }
 
-GtkFileChooserDialog .action-bar.frame {
-  background-color: rgba(65, 69, 79, 0.95);
-  border-color: rgba(35, 37, 42, 0.95); }
-  GtkFileChooserDialog .action-bar.frame GtkLabel {
-    color: #A8ADB5; }
-  GtkFileChooserDialog .action-bar.frame .button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none; }
-    GtkFileChooserDialog .action-bar.frame .button:hover {
-      border: 1px solid #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked {
-      border: 1px solid #5294E2;
-      color: #ffffff;
-      background-color: #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:insensitive {
-      color: rgba(168, 173, 181, 0.4); }
-  GtkFileChooserDialog .action-bar.frame GtkComboBox {
-    color: #A8ADB5; }
+GtkFileChooserDialog .action-bar.frame .button,
+GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
+  color: #A8ADB5;
+  outline-color: rgba(168, 173, 181, 0.3);
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:hover,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
+    color: #5294E2;
+    outline-color: rgba(168, 173, 181, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:active,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
+    color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, #5294E2); }
+  GtkFileChooserDialog .action-bar.frame .button:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+
+GtkFileChooserDialog .action-bar.frame .entry,
+GtkFileChooserDialog .dialog-vbox > .frame .entry {
+  color: #A8ADB5;
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:focus,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
+    color: #5294E2;
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #D3DAE3;
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index 5f13af0..bf9b4a8 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -238,6 +238,19 @@ GtkTextView {
         box-shadow: 0 -1px 0 0 #5294E2; }
       .linked.vertical > .entry:last-child:insensitive {
         border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
+    color: #A8ADB5;
+    border-color: rgba(168, 173, 181, 0.3);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:focus {
+      color: #5294E2;
+      border-color: #5294E2;
+      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:insensitive {
+      color: #5c6069;
+      border-color: rgba(168, 173, 181, 0.2);
+      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /***********
  * Buttons *
@@ -3307,9 +3320,6 @@ GtkListBox .h4 {
 .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator {
   color: rgba(31, 34, 39, 0.97); }
 
-GtkFileChooserDialog .dialog-action-box {
-  background-color: #F5F6F7; }
-
 NemoWindow GtkEventBox {
   background-color: #F5F6F7; }
 
@@ -3465,8 +3475,24 @@ NemoWindow .pane-separator,
 MarlinViewWindow .pane-separator {
   background-color: rgba(60, 64, 73, 0.95); }
 
+GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background {
+  background-color: rgba(60, 64, 73, 0.95); }
+GtkFileChooserDialog .sidebar {
+  background-color: transparent; }
 GtkFileChooserDialog GtkPaned > .vertical > .horizontal {
   background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-action-box {
+  background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-vbox > .frame {
+  color: #A8ADB5;
+  border-color: transparent; }
+GtkFileChooserDialog .action-bar.frame {
+  background-color: transparent;
+  border-color: rgba(44, 47, 53, 0.95); }
+GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox,
+GtkFileChooserDialog .dialog-vbox > .frame GtkLabel,
+GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox {
+  color: #A8ADB5; }
 
 GeditWindow.background.csd {
   background-color: transparent; }
@@ -3522,7 +3548,7 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider {
     background-color: rgba(209, 212, 216, 0.7); }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:hover {
-      background-color: #dfe1e4; }
+      background-color: #d1d4d8; }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:prelight:active {
       background-color: #5294E2; }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:insensitive {
@@ -3530,21 +3556,6 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: rgba(44, 47, 53, 0.95); }
-    GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
-      border-color: transparent;
-      background-color: transparent;
-      background-image: none;
-      color: #A8ADB5;
-      border: 1px solid transparent; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
-        border: 1px solid #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
-        background-color: #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
-        color: rgba(168, 173, 181, 0.4); }
     GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox {
       color: #A8ADB5; }
 
@@ -3556,25 +3567,48 @@ GeditWindow.background.csd GeditFileBrowserView.view {
     GeditWindow.background.csd GeditFileBrowserView.view.expander:hover {
       color: #5294E2; }
 
-GtkFileChooserDialog .action-bar.frame {
-  background-color: rgba(55, 59, 67, 0.95);
-  border-color: rgba(44, 47, 53, 0.95); }
-  GtkFileChooserDialog .action-bar.frame GtkLabel {
-    color: #A8ADB5; }
-  GtkFileChooserDialog .action-bar.frame .button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none; }
-    GtkFileChooserDialog .action-bar.frame .button:hover {
-      border: 1px solid #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked {
-      border: 1px solid #5294E2;
-      color: #ffffff;
-      background-color: #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:insensitive {
-      color: rgba(168, 173, 181, 0.4); }
-  GtkFileChooserDialog .action-bar.frame GtkComboBox {
-    color: #A8ADB5; }
+GtkFileChooserDialog .action-bar.frame .button,
+GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
+  color: #A8ADB5;
+  outline-color: rgba(168, 173, 181, 0.3);
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:hover,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
+    color: #5294E2;
+    outline-color: rgba(168, 173, 181, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:active,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
+    color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, #5294E2); }
+  GtkFileChooserDialog .action-bar.frame .button:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+
+GtkFileChooserDialog .action-bar.frame .entry,
+GtkFileChooserDialog .dialog-vbox > .frame .entry {
+  color: #A8ADB5;
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:focus,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
+    color: #5294E2;
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #5c616c;
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index cd6af48..d00e280 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -238,6 +238,19 @@ GtkTextView {
         box-shadow: 0 -1px 0 0 #5294E2; }
       .linked.vertical > .entry:last-child:insensitive {
         border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
+    color: #A8ADB5;
+    border-color: rgba(168, 173, 181, 0.3);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:focus {
+      color: #5294E2;
+      border-color: #5294E2;
+      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:insensitive {
+      color: #5c6069;
+      border-color: rgba(168, 173, 181, 0.2);
+      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /***********
  * Buttons *
@@ -3306,9 +3319,6 @@ GtkListBox .h4 {
 .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator {
   color: #24272d; }
 
-GtkFileChooserDialog .dialog-action-box {
-  background-color: #444852; }
-
 NemoWindow GtkEventBox {
   background-color: #444852; }
 
@@ -3473,8 +3483,24 @@ NemoWindow .pane-separator,
 MarlinViewWindow .pane-separator {
   background-color: #2e3138; }
 
+GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background {
+  background-color: #454a54; }
+GtkFileChooserDialog .sidebar {
+  background-color: transparent; }
 GtkFileChooserDialog GtkPaned > .vertical > .horizontal {
   background-color: #444852; }
+GtkFileChooserDialog .dialog-action-box {
+  background-color: #444852; }
+GtkFileChooserDialog .dialog-vbox > .frame {
+  color: #A8ADB5;
+  border-color: transparent; }
+GtkFileChooserDialog .action-bar.frame {
+  background-color: transparent;
+  border-color: #23252a; }
+GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox,
+GtkFileChooserDialog .dialog-vbox > .frame GtkLabel,
+GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox {
+  color: #A8ADB5; }
 
 GeditWindow.background.csd {
   background-color: transparent; }
@@ -3530,7 +3556,7 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider {
     background-color: rgba(209, 212, 216, 0.7); }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:hover {
-      background-color: #dfe1e4; }
+      background-color: #d1d4d8; }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:prelight:active {
       background-color: #5294E2; }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:insensitive {
@@ -3538,21 +3564,6 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: #353941; }
-    GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
-      border-color: transparent;
-      background-color: transparent;
-      background-image: none;
-      color: #A8ADB5;
-      border: 1px solid transparent; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
-        border: 1px solid #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
-        background-color: #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
-        color: rgba(168, 173, 181, 0.4); }
     GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox {
       color: #A8ADB5; }
 
@@ -3564,25 +3575,48 @@ GeditWindow.background.csd GeditFileBrowserView.view {
     GeditWindow.background.csd GeditFileBrowserView.view.expander:hover {
       color: #5294E2; }
 
-GtkFileChooserDialog .action-bar.frame {
-  background-color: #41454f;
-  border-color: #23252a; }
-  GtkFileChooserDialog .action-bar.frame GtkLabel {
-    color: #A8ADB5; }
-  GtkFileChooserDialog .action-bar.frame .button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none; }
-    GtkFileChooserDialog .action-bar.frame .button:hover {
-      border: 1px solid #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked {
-      border: 1px solid #5294E2;
-      color: #ffffff;
-      background-color: #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:insensitive {
-      color: rgba(168, 173, 181, 0.4); }
-  GtkFileChooserDialog .action-bar.frame GtkComboBox {
-    color: #A8ADB5; }
+GtkFileChooserDialog .action-bar.frame .button,
+GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
+  color: #A8ADB5;
+  outline-color: rgba(168, 173, 181, 0.3);
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:hover,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
+    color: #5294E2;
+    outline-color: rgba(168, 173, 181, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:active,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
+    color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, #5294E2); }
+  GtkFileChooserDialog .action-bar.frame .button:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+
+GtkFileChooserDialog .action-bar.frame .entry,
+GtkFileChooserDialog .dialog-vbox > .frame .entry {
+  color: #A8ADB5;
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:focus,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
+    color: #5294E2;
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #D3DAE3;
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
index caf38d3..43b8663 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
@@ -238,6 +238,19 @@ GtkTextView {
         box-shadow: 0 -1px 0 0 #5294E2; }
       .linked.vertical > .entry:last-child:insensitive {
         border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
+    color: #A8ADB5;
+    border-color: rgba(168, 173, 181, 0.3);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:focus {
+      color: #5294E2;
+      border-color: #5294E2;
+      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:insensitive {
+      color: #5c6069;
+      border-color: rgba(168, 173, 181, 0.2);
+      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /***********
  * Buttons *
@@ -3307,9 +3320,6 @@ GtkListBox .h4 {
 .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator {
   color: #1f2227; }
 
-GtkFileChooserDialog .dialog-action-box {
-  background-color: #F5F6F7; }
-
 NemoWindow GtkEventBox {
   background-color: #F5F6F7; }
 
@@ -3465,8 +3475,24 @@ NemoWindow .pane-separator,
 MarlinViewWindow .pane-separator {
   background-color: #3c4049; }
 
+GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background {
+  background-color: #3c4049; }
+GtkFileChooserDialog .sidebar {
+  background-color: transparent; }
 GtkFileChooserDialog GtkPaned > .vertical > .horizontal {
   background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-action-box {
+  background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-vbox > .frame {
+  color: #A8ADB5;
+  border-color: transparent; }
+GtkFileChooserDialog .action-bar.frame {
+  background-color: transparent;
+  border-color: #2c2f35; }
+GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox,
+GtkFileChooserDialog .dialog-vbox > .frame GtkLabel,
+GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox {
+  color: #A8ADB5; }
 
 GeditWindow.background.csd {
   background-color: transparent; }
@@ -3522,7 +3548,7 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider {
     background-color: rgba(209, 212, 216, 0.7); }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:hover {
-      background-color: #dfe1e4; }
+      background-color: #d1d4d8; }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:prelight:active {
       background-color: #5294E2; }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:insensitive {
@@ -3530,21 +3556,6 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: #2c2f35; }
-    GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
-      border-color: transparent;
-      background-color: transparent;
-      background-image: none;
-      color: #A8ADB5;
-      border: 1px solid transparent; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
-        border: 1px solid #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
-        background-color: #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
-        color: rgba(168, 173, 181, 0.4); }
     GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox {
       color: #A8ADB5; }
 
@@ -3556,25 +3567,48 @@ GeditWindow.background.csd GeditFileBrowserView.view {
     GeditWindow.background.csd GeditFileBrowserView.view.expander:hover {
       color: #5294E2; }
 
-GtkFileChooserDialog .action-bar.frame {
-  background-color: #373b43;
-  border-color: #2c2f35; }
-  GtkFileChooserDialog .action-bar.frame GtkLabel {
-    color: #A8ADB5; }
-  GtkFileChooserDialog .action-bar.frame .button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none; }
-    GtkFileChooserDialog .action-bar.frame .button:hover {
-      border: 1px solid #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked {
-      border: 1px solid #5294E2;
-      color: #ffffff;
-      background-color: #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:insensitive {
-      color: rgba(168, 173, 181, 0.4); }
-  GtkFileChooserDialog .action-bar.frame GtkComboBox {
-    color: #A8ADB5; }
+GtkFileChooserDialog .action-bar.frame .button,
+GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
+  color: #A8ADB5;
+  outline-color: rgba(168, 173, 181, 0.3);
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:hover,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
+    color: #5294E2;
+    outline-color: rgba(168, 173, 181, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:active,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
+    color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, #5294E2); }
+  GtkFileChooserDialog .action-bar.frame .button:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+
+GtkFileChooserDialog .action-bar.frame .entry,
+GtkFileChooserDialog .dialog-vbox > .frame .entry {
+  color: #A8ADB5;
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:focus,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
+    color: #5294E2;
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #5c616c;
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index 8a3f725..a70d412 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -238,6 +238,19 @@ GtkTextView {
         box-shadow: 0 -1px 0 0 #5294E2; }
       .linked.vertical > .entry:last-child:insensitive {
         border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
+    color: #A8ADB5;
+    border-color: rgba(168, 173, 181, 0.3);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:focus {
+      color: #5294E2;
+      border-color: #5294E2;
+      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:insensitive {
+      color: #5c6069;
+      border-color: rgba(168, 173, 181, 0.2);
+      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /***********
  * Buttons *
@@ -3306,9 +3319,6 @@ GtkListBox .h4 {
 .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator {
   color: #d4d5db; }
 
-GtkFileChooserDialog .dialog-action-box {
-  background-color: #F5F6F7; }
-
 NemoWindow GtkEventBox {
   background-color: #F5F6F7; }
 
@@ -3464,8 +3474,24 @@ NemoWindow .pane-separator,
 MarlinViewWindow .pane-separator {
   background-color: #3c4049; }
 
+GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background {
+  background-color: #3c4049; }
+GtkFileChooserDialog .sidebar {
+  background-color: transparent; }
 GtkFileChooserDialog GtkPaned > .vertical > .horizontal {
   background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-action-box {
+  background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-vbox > .frame {
+  color: #A8ADB5;
+  border-color: transparent; }
+GtkFileChooserDialog .action-bar.frame {
+  background-color: transparent;
+  border-color: #2c2f35; }
+GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox,
+GtkFileChooserDialog .dialog-vbox > .frame GtkLabel,
+GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox {
+  color: #A8ADB5; }
 
 GeditWindow.background.csd {
   background-color: transparent; }
@@ -3521,7 +3547,7 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider {
     background-color: rgba(209, 212, 216, 0.7); }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:hover {
-      background-color: #dfe1e4; }
+      background-color: #d1d4d8; }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:prelight:active {
       background-color: #5294E2; }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:insensitive {
@@ -3529,21 +3555,6 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: #2c2f35; }
-    GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
-      border-color: transparent;
-      background-color: transparent;
-      background-image: none;
-      color: #A8ADB5;
-      border: 1px solid transparent; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
-        border: 1px solid #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
-        background-color: #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
-        color: rgba(168, 173, 181, 0.4); }
     GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox {
       color: #A8ADB5; }
 
@@ -3555,25 +3566,48 @@ GeditWindow.background.csd GeditFileBrowserView.view {
     GeditWindow.background.csd GeditFileBrowserView.view.expander:hover {
       color: #5294E2; }
 
-GtkFileChooserDialog .action-bar.frame {
-  background-color: #373b43;
-  border-color: #2c2f35; }
-  GtkFileChooserDialog .action-bar.frame GtkLabel {
-    color: #A8ADB5; }
-  GtkFileChooserDialog .action-bar.frame .button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none; }
-    GtkFileChooserDialog .action-bar.frame .button:hover {
-      border: 1px solid #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked {
-      border: 1px solid #5294E2;
-      color: #ffffff;
-      background-color: #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:insensitive {
-      color: rgba(168, 173, 181, 0.4); }
-  GtkFileChooserDialog .action-bar.frame GtkComboBox {
-    color: #A8ADB5; }
+GtkFileChooserDialog .action-bar.frame .button,
+GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
+  color: #A8ADB5;
+  outline-color: rgba(168, 173, 181, 0.3);
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:hover,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
+    color: #5294E2;
+    outline-color: rgba(168, 173, 181, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:active,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
+    color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, #5294E2); }
+  GtkFileChooserDialog .action-bar.frame .button:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+
+GtkFileChooserDialog .action-bar.frame .entry,
+GtkFileChooserDialog .dialog-vbox > .frame .entry {
+  color: #A8ADB5;
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:focus,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
+    color: #5294E2;
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #5c616c;
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index f4f2a89..53a693d 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -238,6 +238,19 @@ GtkTextView {
         box-shadow: 0 -1px 0 0 #5294E2; }
       .linked.vertical > .entry:last-child:insensitive {
         border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
+    color: #A8ADB5;
+    border-color: rgba(168, 173, 181, 0.3);
+    background-color: transparent;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:focus {
+      color: #5294E2;
+      border-color: #5294E2;
+      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    .osd .entry:insensitive {
+      color: #5c6069;
+      border-color: rgba(168, 173, 181, 0.2);
+      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /***********
  * Buttons *
@@ -3306,9 +3319,6 @@ GtkListBox .h4 {
 .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator {
   color: rgba(212, 213, 219, 0.95); }
 
-GtkFileChooserDialog .dialog-action-box {
-  background-color: #F5F6F7; }
-
 NemoWindow GtkEventBox {
   background-color: #F5F6F7; }
 
@@ -3464,8 +3474,24 @@ NemoWindow .pane-separator,
 MarlinViewWindow .pane-separator {
   background-color: rgba(60, 64, 73, 0.95); }
 
+GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background {
+  background-color: rgba(60, 64, 73, 0.95); }
+GtkFileChooserDialog .sidebar {
+  background-color: transparent; }
 GtkFileChooserDialog GtkPaned > .vertical > .horizontal {
   background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-action-box {
+  background-color: #F5F6F7; }
+GtkFileChooserDialog .dialog-vbox > .frame {
+  color: #A8ADB5;
+  border-color: transparent; }
+GtkFileChooserDialog .action-bar.frame {
+  background-color: transparent;
+  border-color: rgba(44, 47, 53, 0.95); }
+GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox,
+GtkFileChooserDialog .dialog-vbox > .frame GtkLabel,
+GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox {
+  color: #A8ADB5; }
 
 GeditWindow.background.csd {
   background-color: transparent; }
@@ -3521,7 +3547,7 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider {
     background-color: rgba(209, 212, 216, 0.7); }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:hover {
-      background-color: #dfe1e4; }
+      background-color: #d1d4d8; }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:prelight:active {
       background-color: #5294E2; }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:insensitive {
@@ -3529,21 +3555,6 @@ GeditWindow.background.csd GeditFileBrowserWidget {
   GeditWindow.background.csd GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: rgba(44, 47, 53, 0.95); }
-    GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
-      border-color: transparent;
-      background-color: transparent;
-      background-image: none;
-      color: #A8ADB5;
-      border: 1px solid transparent; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
-        border: 1px solid #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        border-color: #5294E2;
-        background-color: #5294E2; }
-      GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
-        color: rgba(168, 173, 181, 0.4); }
     GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox {
       color: #A8ADB5; }
 
@@ -3555,25 +3566,48 @@ GeditWindow.background.csd GeditFileBrowserView.view {
     GeditWindow.background.csd GeditFileBrowserView.view.expander:hover {
       color: #5294E2; }
 
-GtkFileChooserDialog .action-bar.frame {
-  background-color: rgba(55, 59, 67, 0.95);
-  border-color: rgba(44, 47, 53, 0.95); }
-  GtkFileChooserDialog .action-bar.frame GtkLabel {
-    color: #A8ADB5; }
-  GtkFileChooserDialog .action-bar.frame .button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none; }
-    GtkFileChooserDialog .action-bar.frame .button:hover {
-      border: 1px solid #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked {
-      border: 1px solid #5294E2;
-      color: #ffffff;
-      background-color: #5294E2; }
-    GtkFileChooserDialog .action-bar.frame .button:insensitive {
-      color: rgba(168, 173, 181, 0.4); }
-  GtkFileChooserDialog .action-bar.frame GtkComboBox {
-    color: #A8ADB5; }
+GtkFileChooserDialog .action-bar.frame .button,
+GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
+  color: #A8ADB5;
+  outline-color: rgba(168, 173, 181, 0.3);
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:hover,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
+    color: #5294E2;
+    outline-color: rgba(168, 173, 181, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .button:active,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
+    color: #ffffff;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, #5294E2); }
+  GtkFileChooserDialog .action-bar.frame .button:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+
+GtkFileChooserDialog .action-bar.frame .entry,
+GtkFileChooserDialog .dialog-vbox > .frame .entry {
+  color: #A8ADB5;
+  border-color: rgba(168, 173, 181, 0.3);
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:focus,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
+    color: #5294E2;
+    border-color: #5294E2;
+    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  GtkFileChooserDialog .action-bar.frame .entry:insensitive,
+  GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
+    color: #5c6069;
+    border-color: rgba(168, 173, 181, 0.2);
+    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
 
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #5c616c;