3 files changed, 27 insertions, 6 deletions
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gnome-applications.css b/desktop-themes/Blue-Submarine/gtk-3.0/gnome-applications.css
index 8658e049..37b6f6ad 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gnome-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gnome-applications.css
@@ -89,3 +89,16 @@ window.background.dconf-editor popover.menu {
     padding: 4px;
 }
 
+/**********************
+ * gnome-disk-utility *
+ **********************/
+
+/* fixes for backdrop/foreground state */
+window.background.csd > box > paned > notebook box > widget > box > box > box widget:selected {
+	color: @theme_selected_fg_color;
+}
+
+window.background.csd > box > paned > notebook box > widget > box > box > box widget:backdrop:selected {
+	color: @theme_fg_color;
+}
+
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
index e8fe8f62..0e324792 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -5562,7 +5562,7 @@ popover.background {
     color: @theme_fg_dark_color;
     margin: 10px;
     padding: 2px;
-    border-color: @borders;
+    border-color: @borders_headerbar;
     border-width: 1px;
     border-style: solid;
     border-radius: 6px;
@@ -5973,7 +5973,7 @@ headerbar.titlebar,
 .background.solid-csd > paned.horizontal.titlebar {
     border-width: 0px 0px 1px 0px;
     border-style: solid;
-    border-color: shade(@borders, 0.90);
+    border-color: shade(@borders_headerbar, 0.90);
     border-radius: 7px 7px 0px 0px;
     padding: 6px 6px 5px 6px;
 }
@@ -6013,8 +6013,8 @@ dialog.background.solid-csd > headerbar.titlebar  {
 
 headerbar.titlebar:backdrop {
     border-image: linear-gradient(to top,
-                                  @unfocused_borders,
-                                  @unfocused_borders 1px,
+                                  @unfocused_borders_headerbar,
+                                  @unfocused_borders_headerbar 1px,
                                   @theme_unfocused_bg_color 1px) 0 0 2;
     background-color: @theme_bg_dark_color;
     text-shadow: none;
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css
index 2cccca0e..a95dabb9 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css
@@ -253,8 +253,8 @@
 @define-color osd_popover_bg alpha(@osd_base, 0.90);
 
 /* GTKHeaderBar colours */
-@define-color borders @theme_bg_dark_color;
-@define-color unfocused_borders @theme_bg_dark_color;
+@define-color borders_headerbar @theme_bg_dark_color;
+@define-color unfocused_borders_headerbar @theme_bg_dark_color;
 @define-color theme_unfocused_bg_color @theme_bg_dark_color;
 @define-color button_hover_gradient_color_a @button_raised_gradient_color_a;
 @define-color button_hover_gradient_color_b @button_raised_gradient_color_b;
@@ -264,6 +264,14 @@
 @define-color wm_bg_a @theme_bg_dark_color;
 @define-color wm_bg_b @theme_bg_dark_color;
 
+@define-color borders shade(@theme_bg_color, 0.75);
+@define-color theme_unfocused_selected_bg_color shade(@theme_bg_color, 0.95);
+@define-color theme_unfocused_selected_fg_color @theme_selected_fg_color;
+@define-color unfocused_borders @borders;
+@define-color unfocused_insensitive_borders mix(@theme_unfocused_bg_color, @unfocused_borders, 0.5);
+@define-color unfocused_insensitive_fg_color mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.5);
+@define-color unfocused_insensitive_bg_color mix(@theme_unfocused_bg_color, @theme_unfocused_base_color, 0.5);
+
 /* terminal view color*/
 @define-color terminal_background_color #32424C;