2 files changed, 58 insertions, 13 deletions
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 fc105e93..62f148ae 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -70,12 +70,6 @@ window {
 *:hover:disabled {
 }
 
-*:selected,
-*:selected:focus {
-/*    background-color: shade(@theme_selected_bg_color, 1.0);
-    color: @theme_selected_fg_color;*/
-}
-
 *:disabled {
     /* inherit the color from parent by default */
     background-color: inherit;
@@ -2091,6 +2085,26 @@ toolbar.primary-toolbar combobox cellview:hover {
     color: shade (@theme_selected_bg_color, 1.6);
 }
 
+toolbar combobox button.combo:disabled,
+toolbar.primary-toolbar combobox button.combo:disabled,
+toolbar combobox .linked button.combo:disabled,
+toolbar.primary-toolbar combobox .linked button.combo:disabled,
+toolbar combobox .linked button.combo:disabled:first-child,
+toolbar.primary-toolbar .linked combobox button.combo:disabled:first-child,
+toolbar combobox .linked button.combo:disabled:last-child,
+toolbar.primary-toolbar combobox .linked button.combo:disabled:last-child,
+toolbar combobox .linked button.combo:disabled:only-child,
+toolbar.primary-toolbar combobox button.combo:disabled:only-child {
+    color: shade (@insensitive_fg_color, 1.0);
+    background-color: transparent;
+    box-shadow: none;
+}
+
+toolbar toolitem entry:disabled,
+toolbar.primary-toolbar toolitem entry:disabled {
+    color: shade (@insensitive_fg_color, 1.0);
+    background-color: transparent;
+}
 
 toolbar combobox entry.combo,
 toolbar combobox entry.combo:focus {
@@ -4657,13 +4671,20 @@ messagedialog {
 }
 
 /* ie. mate-keyboard-properties option window */
-dialog scrolledwindow.frame {
+dialog notebook.frame box.vertical > box.vertical > scrolledwindow.frame {
     border-color: @notebook_border;
     border-style: solid;
     border-width: 1px;
     border-radius: 2px;
 }
 
+/* ie. caja properties-window notes tab */
+dialog notebook.frame scrolledwindow.frame {
+    border-style: none;
+    border-width: 0px;
+    border-radius: 0px;
+}
+
 /* credits in GtkAbout windows */
 dialog .dialog-vbox scrolledwindow.frame > viewport.view.frame {
     background-color: shade (@theme_bg_color, 1.10);
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
index 5e48bd5a..359ada05 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
@@ -72,11 +72,6 @@ window {
 *:hover:disabled {
 }
 
-*:selected,
-*:selected:focus {
-/*    background-color: shade(@theme_selected_bg_color, 1.0);
-    color: @theme_selected_fg_color;*/
-
 }
 
 *:disabled {
@@ -2094,6 +2089,27 @@ toolbar.primary-toolbar combobox cellview:hover {
     color: shade (@theme_selected_bg_color, 1.1);
 }
 
+toolbar combobox button.combo:disabled,
+toolbar.primary-toolbar combobox button.combo:disabled,
+toolbar combobox .linked button.combo:disabled,
+toolbar.primary-toolbar combobox .linked button.combo:disabled,
+toolbar combobox .linked button.combo:disabled:first-child,
+toolbar.primary-toolbar .linked combobox button.combo:disabled:first-child,
+toolbar combobox .linked button.combo:disabled:last-child,
+toolbar.primary-toolbar combobox .linked button.combo:disabled:last-child,
+toolbar combobox .linked button.combo:disabled:only-child,
+toolbar.primary-toolbar combobox button.combo:disabled:only-child {
+    color: shade (@insensitive_fg_color, 1.0);
+    background-color: transparent;
+    box-shadow: none;
+}
+
+toolbar toolitem entry:disabled,
+toolbar.primary-toolbar toolitem entry:disabled {
+    color: shade (@insensitive_fg_color, 1.0);
+    background-color: transparent;
+}
+
 toolbar combobox entry.combo,
 toolbar combobox entry.combo:focus {
     border-width: 1px 0px 1px 1px; /* remove rightr */
@@ -3297,6 +3313,7 @@ dialog.background.solid-csd > box.vertical.dialog-vbox > notebook {
     background-color: shade (@theme_bg_color, 1.1);
 }
 
+
 notebook header.top {
     border-radius: 4px 4px 0px 0px;
     border-width: 0px 0px 1px 0px;
@@ -4657,13 +4674,20 @@ messagedialog {
 }
 
 /* ie. mate-keyboard-properties option window */
-dialog scrolledwindow.frame {
+dialog notebook.frame box.vertical > box.vertical > scrolledwindow.frame {
     border-color: @notebook_border;
     border-style: solid;
     border-width: 1px;
     border-radius: 2px;
 }
 
+/* ie. caja properties-window notes tab */
+dialog notebook.frame scrolledwindow.frame {
+    border-style: none;
+    border-width: 0px;
+    border-radius: 0px;
+}
+
 /* credits in GtkAbout windows */
 dialog .dialog-vbox scrolledwindow.frame > viewport.view.frame {
     background-color: shade (@theme_bg_color, 1.10);