GTK+-3.20 submarine themes: adjust OSD, gnome-weather, rhythmbox and cleanup gnome-applications

4 files changed, 128 insertions, 770 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 48fe8c50..d7bf7a60 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gnome-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gnome-applications.css
@@ -13,359 +13,29 @@
      border-radius: 0px 4px 4px 0px;
 }
 
-EphyWindow {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_bg_dark_color, 0.95)),
-                                     to   (shade(@theme_bg_dark_color, 0.92)));
-}
-
-/* gedit line numbers */
-GeditView {
-    background-color: shade (@bg_color, 1.07);
-}
-
-GeditViewFrame .gedit-search-slider {
-    background-image: none;
-    background-color: @theme_bg_color;
-    padding: 6px;
-    border-color: shade (@theme_bg_color, 0.72);
-    border-radius: 0 0 3px 3px;
-    border-width: 0 1px 1px 1px;
-    border-style: solid;
-}
-
-GeditViewFrame .gedit-search-slider .not-found {
-    color: @error_fg_color;
-    background-image: none;
-    background-color: @error_bg_color;
-}
-
-TerminalWindow .menubar,
-EphyToolbar.toolbar.menubar,
-GeditWindow .primary-toolbar.toolbar {
-    /* line 3D  (dark) */
-    box-shadow: none;
-    /* linea 3D (clear) */
-    border-bottom-width:  0px;
-}
-
-EphyToolbar.toolbar .raised .button *:hover,
-EphyToolbar.toolbar .raised.button *:hover,
-EphyToolbar.toolbar .raised .button *:active,
-EphyToolbar.toolbar .raised.button *:active,
-EphyToolbar.toolbar .raised .button *:active:hover,
-EphyToolbar.toolbar .raised.button *:active:hover,
-EphyToolbar.toolbar .raised .button *:checked,
-EphyToolbar.toolbar .raised.button *:checked,
-EphyToolbar.toolbar .raised .button *:checked:hover,
-EphyToolbar.toolbar .raised.button *:checked:hover {
-    color: @theme_text_dark_color;
-    text-shadow: 0px 1px @theme_shadow_dark_color;
-}
-
-TerminalWindow,
-TerminalWindow .notebook {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_bg_dark_color, 0.95)),
-                                     to   (shade(@theme_bg_dark_color, 0.95)));
-}
-
-TerminalWindow .notebook,
-GeditWindow .notebook,
-EphyNotebook.notebook {
-    border-style: solid;
-    border-width: 1px 0px 0px 0px;
-    border-radius: 0px;
-    border-top-color: @theme_mdi_border_color;
-    border-image: none;
-    background-color: shade(@theme_bg_color, 0.97);
-    background-image: none;
-}
-
-GeditWindow .notebook tab,
-EphyNotebook.notebook tab {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_bg_dark_color, 0.95)),
-                                     to   (shade(@theme_bg_dark_color, 0.93)));
-    border-top-color: @theme_mdi_border_color;
-}
-
-TerminalWindow .notebook tab {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_bg_dark_color, 1.00)),
-                                     to   (shade(@theme_bg_dark_color, 0.97)));
-    border-top-color: shade(@theme_mdi_border_color, 1.05);
-}
-
-TerminalWindow .notebook tab,
-GeditWindow .notebook tab,
-EphyNotebook.notebook tab {
-    padding: 2px 4px;
-    border-width: 1px 1px 0px 1px;
-    border-style: solid;
-    border-left-color:   @theme_mdi_border_color;
-    border-bottom-color: @theme_mdi_border_color;
-    border-right-color:  @theme_mdi_border_color;
-    border-image: none;
-    box-shadow: inset  0px  1px @theme_highlight_color,
-                inset  1px  0px @theme_highlight_color,
-                inset -1px  0px @theme_highlight_color;
-}
-
-GeditWindow.notebook tab.top.
-EphyNotebook.notebook tab.top {
-    padding: 3px 4px;
-}
-
-TerminalWindow .notebook tab:active,
-GeditWindow .notebook tab:active,
-EphyNotebook.notebook tab:active,
-TerminalWindow .notebook tab:checked,
-GeditWindow .notebook tab:checked,
-EphyNotebook.notebook tab:checked {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_mdi_bg_color, 0.90)),
-                                     color-stop (0.66, shade(@theme_mdi_bg_color, 0.95)),
-                                     to (shade(@theme_mdi_bg_color, 1.03)));
-    border-width: 1px 1px 0px 1px;
-    border-style: solid; 
-    /* border-radius: 4px; */
-    border-top-color:   shade(@theme_mdi_border_color, 0.85);
-    border-left-color:  shade(@theme_mdi_border_color, 0.88);
-    border-right-color: shade(@theme_mdi_border_color, 0.88);
-    border-image: none;
-    box-shadow: inset  0px  4px alpha(#000, 0.01),
-                inset  0px  3px alpha(#000, 0.02),
-                inset  0px  2px alpha(#000, 0.03),
-                inset  0px  1px alpha(#000, 0.04),
-                inset  4px  0px alpha(#000, 0.01),
-                inset  3px  0px alpha(#000, 0.02),
-                inset  2px  0px alpha(#000, 0.03),
-                inset  1px  0px alpha(#000, 0.04),
-                inset -4px  0px alpha(#000, 0.01),
-                inset -3px  0px alpha(#000, 0.02),
-                inset -2px  0px alpha(#000, 0.03),
-                inset -1px  0px alpha(#000, 0.04);
-}
-
-GeditWindow .notebook tab:first-child,
-EphyNotebook.notebook tab:first-child,
-GeditWindow .notebook tab:first-child:active,
-EphyNotebook.notebook tab:first-child:active,
-TerminalWindow .notebook tab:first-child,
-TerminalWindow .notebook tab:first-child:active,
-GeditWindow .notebook tab:first-child:checked,
-EphyNotebook.notebook tab:first-child:checked,
-TerminalWindow .notebook tab:first-child:checked {
-    border-left-width: 0px;
-    border-radius: 0px;
-}
-
-TerminalWindow .notebook tab:last-child,
-TerminalWindow .notebook tab:last-child:active {
-    border-right-width: 0px;
-    border-radius: 0px;
-}
-
-/* to compensate for the use of tabs-themed-dark.css */
-GeditWindow .notebook tab:first-child,
-EphyNotebook.notebook tab:first-child,
-TerminalWindow .notebook tab:first-child,
-GeditWindow .notebook tab:last-child,
-EphyNotebook.notebook tab:last-child,
-TerminalWindow .notebook tab:last-child {
-    border-left-color: @theme_mdi_border_color;
-    border-right-color: @theme_mdi_border_color;
-}
-
-GeditWindow .notebook tab:first-child:active,
-EphyNotebook.notebook tab:first-child:active,
-TerminalWindow .notebook tab:first-child:active,
-GeditWindow .notebook tab:last-child:active,
-EphyNotebook.notebook tab:last-child:active,
-TerminalWindow .notebook tab:last-child:active,
-GeditWindow .notebook tab:first-child:checked,
-EphyNotebook.notebook tab:first-child:checked,
-TerminalWindow .notebook tab:first-child:checked,
-GeditWindow .notebook tab:last-child:checked,
-EphyNotebook.notebook tab:last-child:checked,
-TerminalWindow .notebook tab:last-child:checked {
-    border-left-color: shade(@theme_mdi_border_color, 0.88);
-    border-right-color: shade(@theme_mdi_border_color, 0.88);
-}
-
-GeditWindow .notebook tab:first-child,
-EphyNotebook.notebook tab:first-child,
-GeditWindow .notebook tab:first-child:hover,
-EphyNotebook.notebook tab:first-child:hover,
-GeditWindow .notebook tab:first-child:active,
-EphyNotebook.notebook tab:first-child:active,
-GeditWindow .notebook tab:first-child:checked,
-EphyNotebook.notebook tab:first-child:checked {
-    border-radius: 0px;
-}
-
-GeditWindow .notebook tab:last-child,
-EphyNotebook.notebook tab:last-child,
-GeditWindow .notebook tab:last-child:hover,
-EphyNotebook.notebook tab:last-child:hover,
-GeditWindow .notebook tab:last-child:active,
-EphyNotebook.notebook tab:last-child:active,
-GeditWindow .notebook tab:last-child:checked,
-EphyNotebook.notebook tab:last-child:checked {
-    border-radius: 0px;
-}
-
-TerminalWindow .notebook tab:only-child {
-    border-radius: 0px;
-}
-
-GeditWindow .notebook tab:only-child,
-GeditWindow .notebook tab:only-child:active,
-GeditWindow .notebook tab:only-child:hover,
-GeditWindow .notebook tab:only-child:checked,
-EphyNotebook.notebook tab:only-child {
-    border-radius: 0px;
-}
-
-TerminalWindow .notebook tab GtkLabel,
-EphyNotebook.notebook tab GtkLabel,
-GeditWindow .notebook tab GtkLabel,
-GeditWindow.notebook tab GtkLabel {
-    padding: 1px 4px;
-    color: @theme_fg_dark_color;
-    text-shadow: 0px 1px @theme_shadow_dark_color;
-}
-
-/* gnome-terminal */
-TerminalScreen {
-    -TerminalScreen-background-darkness: 0.95;
-    background-color: @terminal_background_color;
-    color: @selected_fg_color;
-}
-
 /*************
  * rhythmbox *
  *************/
 
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:active,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:hover {
+toolbar.primary-toolbar.horizontal > toolitem > grid.horizontal > button.scale.flat,
+toolbar.primary-toolbar.horizontal > toolitem > grid.horizontal > button.scale.flat:hover,
+toolbar.primary-toolbar.horizontal > toolitem > grid.horizontal > button.scale.flat:hover:active {
 	padding: 0px 8px;
 }
 
-RBDisplayPageTree.frame {
-    border-width: 0px 1px 1px 0px;
-}
-
-RBDisplayPageTree .cell,
-RBDisplayPageTree .cell:hover {
-    /* background-image: none; */
-    background-color: @sidebar_background;
-}
-
-RBSource .toolbar {
-    background-image: none;
-    background-color: transparent;
-    padding: 2px 4px;
-}
-
-RBSource .toolbar .button {
-    padding: 0px 3px;
-    color:  shade(@theme_fg_color, 0.95);
-    text-shadow: 0 1px @theme_shadow_color;
-}
-
-RBSource .toolbar .button *:hover {
-    color:  shade(@theme_text_color, 0.95);
-    text-shadow: 0 1px @theme_shadow_color;
-}
-
-RBSource .toolbar .button *:active,
-RBSource .toolbar .button *:active:hover,
-RBSource .toolbar .button *:checked,
-RBSource .toolbar .button *:checked:hover {
-    color:  shade(@theme_text_color, 0.95);
-    text-shadow: 0 1px @theme_shadow_color;
-}
-
-ApDocView, /* Abiword */
-EogScrollView, /* Eog */
-CheeseThumbView /* Cheese */
-{
-    background-color: @chrome_bg_color;
-}
-
-.documents-counter {
-    background-image: url('assets/dnd-counter.svg');
-    background-size: contain;
-    background-color: transparent;
-    color: @theme_base_color;
-    font: bold;
-}
-
-RemminaConnectionWindow .toolbar,
-RemminaMain .toolbar {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_bg_dark_color, 1.00)),
-                                     to   (shade(@theme_bg_dark_color, 0.95)));
-}
-
-RemminaMain .toolbar {
-    border-bottom-color:  shade(@theme_bg_dark_color, 0.73);
-    border-image: none;
-}
-
-RemminaConnectionWindow .toolbar {
-    border-width: 0px;
-    border-style: none;
-    border-image: none;
-}
-
-/* dconf editor sidebar */
-DConfDirView.view {
-    background-color: shade (@theme_bg_color, 1.08);
-}
-
-/* yelp without headerbar, since gtk+-3.18 */
-
-YelpWindow .horizontal.toolbar.primary-toolbar {
-    padding: 3px;
-}
-
-YelpWindow .horizontal.toolbar.primary-toolbar .button.image-button {
-    padding: 6px;
-}
-
-YelpWindow .horizontal.toolbar.primary-toolbar .button.image-button:focus {
-    box-shadow: none;
-}
-
-YelpWindow .horizontal.toolbar.primary-toolbar .button.image-button:hover {
-    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
-                inset  1px  0px shade (@theme_selected_bg_color, 1.3),
-                inset -1px  0px shade (@theme_selected_bg_color, 1.3),
-                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
-}
-
-YelpWindow .horizontal.toolbar.primary-toolbar .button.image-button:first-child {
-    border-radius: 5px 0px 0px 5px;
-    border-right-width: 0px;
+/* gnome-weather */
+#weather-page {
+    padding: 0px;
+    margin: -2px -2px -2px 0px;
 }
 
-YelpWindow .horizontal.toolbar.primary-toolbar .button.image-button:last-child {
-    border-radius: 0px 5px 5px 0px;
-    border-left-width: 0px;
+#weather-page > frame {
+    border-radius: 0px;
+    margin: 0px 0px 0px -1px;
+    border-color: transparent;
 }
 
-/* gnome-weather */
-Gjs_WeatherWidget.frame.flat GtkStack GtkScrolledWindow .frame {
+#weather-page stack > scrolledwindow > .frame {
     background-color: transparent;
     background-image: linear-gradient(to bottom,
                                       alpha(shade(@theme_selected_bg_color, 1.2), 0.1),
@@ -373,25 +43,21 @@ Gjs_WeatherWidget.frame.flat GtkStack GtkScrolledWindow .frame {
     border-color: @osd_button_border;
 }
 
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-clear .linked.stack-switcher.osd .button:hover,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-clear .linked.stack-switcher.osd .button:checked,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-fog .linked.stack-switcher.osd .button:checked,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-few-clouds .linked.stack-switcher.osd .button:checked,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-clear GtkStack GtkScrolledWindow .frame {
+#weather-page frame.weather-clear stack > scrolledwindow > .frame {
     color: @theme_fg_color;
     text-shadow: none;
 }
 
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-clear .linked.stack-switcher.osd .button:hover {
+#weather-page frame.weather-few-clouds-night .linked.stack-switcher.osd > button:checked,
+#weather-page frame.weather-few-clouds-night stack > scrolledwindow > .frame label,
+#weather-page frame.weather-clear-night .linked.stack-switcher.osd > button:checked,
+#weather-page frame.weather-clear-night stack > scrolledwindow > .frame label,
+#weather-page frame.weather-storm .linked.stack-switcher.osd > button:checked,
+#weather-page frame.weather-storm stack > scrolledwindow > .frame label,
+#weather-page frame.weather-showers .linked.stack-switcher.osd > button:checked,
+#weather-page frame.weather-showers stack > scrolledwindow > .frame label,
+#weather-page frame.weather-overcast .linked.stack-switcher.osd > button:checked,
+#weather-page frame.weather-overcast stack > scrolledwindow > .frame label {
     color: @osd_button_fg_hover;
 }
 
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-clear-night .linked.stack-switcher.osd .button:hover,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-clear-night GtkStack GtkScrolledWindow .frame,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-storm GtkStack GtkScrolledWindow .frame,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-showers GtkStack GtkScrolledWindow .frame,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-few-clouds-night GtkStack GtkScrolledWindow .frame,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-overcast GtkStack GtkScrolledWindow .frame {
-    color: @osd_button_fg_active;
-}
-
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 3f4c1916..775e83d5 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -4905,7 +4905,12 @@ GtkOverlay.osd {
 .osd button:focus,

 .osd button:checked,

 .osd button:hover:active,

-.osd button:focus:hover:active {

+.osd button:focus:hover:active,

+button.osd,

+button.osd:focus,

+button.osd:checked,

+button.osd:hover:active,

+button.osd:focus:hover:active {

     border-width: 1px;

     border-style: solid;

     border-image: none;

@@ -4916,19 +4921,25 @@ GtkOverlay.osd {
 

 .osd button,

 .osd button:hover,

-.osd button:checked {

+.osd button:checked,

+button.osd,

+button.osd:hover,

+button.osd:checked {

     background-color: shade(@osd_bg, 1.10);

     border-radius: 5px;

     border-color: @osd_button_border;

 }

 

 .osd button:hover,

-.osd button:checked {

+.osd button:checked,

+button.osd:hover,

+button.osd:checked {

     background-color: transparent;

     box-shadow: none;

 }

 

-.osd button:disabled {

+.osd button:disabled,

+button.osd:disabled {

     background-image: none;

     border-color: @osd_button_bg_insensitive;

     background-color: transparent;

@@ -4936,14 +4947,17 @@ GtkOverlay.osd {
     color: @osd_button_fg_insensitive;

 }

 

-.osd button:checked:disabled {

+.osd button:checked:disabled,

+button.osd:checked:disabled {

     background-image: none;

     background-color: @osd_button_bg_insensitive_active;

     color: @osd_button_fg_insensitive;

 }

 

 .osd button,

-.osd button:focus {

+.osd button:focus,

+button.osd,

+button.osd:focus {

     padding: 4px;

     background-image: linear-gradient(to bottom,

                                       @osd_button_bg_a,

@@ -4955,6 +4969,7 @@ GtkOverlay.osd {
 }

 

 .osd button:hover,

+button.osd:hover,

 .osd .linked button:hover {

     background-image: linear-gradient(to bottom,

                                       @osd_button_bg_hover_a,

@@ -4968,7 +4983,13 @@ GtkOverlay.osd {
 .osd button:checked:hover:active,

 .osd button:hover:active,

 .osd button:focus:hover:active,

-.osd button.menu-button:checked {

+.osd button.menu-button:checked,

+button.osd:checked,

+button.osd:checked:hover,

+button.osd:checked:hover:active,

+button.osd:hover:active,

+button.osd:focus:hover:active,

+button.osd.menu-button:checked {

     background-image: linear-gradient(to bottom,

                                       @osd_button_bg_active_a,

                                       @osd_button_bg_active_b 68%,

@@ -4982,37 +5003,26 @@ GtkOverlay.osd {
     border-color: @osd_button_border;

 }

 

-/* gnome-weather */

-.linked stackswitcher.osd button {

-    background-image: linear-gradient(to bottom,

-                                      alpha(shade(@theme_selected_bg_color, 1.2), 0.1),

-                                      alpha(shade(@theme_selected_bg_color, 0.95), 0.1));

-    background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4);

-    box-shadow: none;

-}

-

-.linked stackswitcher.osd button:hover {

-    background-image: linear-gradient(to bottom,

-                                      alpha(shade(@theme_selected_bg_color, 1.2), 0.4),

-                                      alpha(shade(@theme_selected_bg_color, 0.95), 0.4));

-    background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4);

-

+/* ie. gnome-weather */

+.linked.stack-switcher.osd button {

+    border-width: 1px 0 1px 0px;

+    color: @osd_button_fg_hover;

+    text-shadow: none;

 }

 

-.linked stackswitcher.osd button {

-    border-width: 1px 0 1px 0px;

-    border-color: shade (@theme_selected_bg_color, 0.8);

+.linked.stack-switcher.osd button:checked {

+    color: shade(@theme_fg_color, 1.00);

 }

 

-.linked stackswitcher.osd button:first-child {

+.linked.stack-switcher.osd button:first-child {

     border-width: 1px 1px 1px 1px;

 }

 

-.linked stackswitcher.osd button:last-child {

+.linked.stack-switcher.osd button:last-child {

     border-width: 1px 1px 1px 0px;

 }

 

-.linked stackswitcher.osd button:only-child {

+.linked.stack-switcher.osd button:only-child {

     border-width: 1px;

 }

 

@@ -5272,6 +5282,12 @@ popover.background {
     -gtk-icon-shadow: none;

 }

 

+popover .dim-label,

+popover .dim-label:hover,

+popover .dim-label:focus {

+    color: @theme_fg_dark_color;

+}

+

 popover > list,

 popover > .view,

 popover > toolbar popover.osd > toolbar,

diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gnome-applications.css b/desktop-themes/Green-Submarine/gtk-3.0/gnome-applications.css
index 6764df1a..d7bf7a60 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gnome-applications.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gnome-applications.css
@@ -13,359 +13,29 @@
      border-radius: 0px 4px 4px 0px;
 }
 
-EphyWindow {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_bg_dark_color, 0.95)),
-                                     to   (shade(@theme_bg_dark_color, 0.92)));
-}
-
-/* gedit line numbers */
-GeditView {
-    background-color: shade (@bg_color, 1.07);
-}
-
-GeditViewFrame .gedit-search-slider {
-    background-image: none;
-    background-color: @theme_bg_color;
-    padding: 6px;
-    border-color: shade (@theme_bg_color, 0.72);
-    border-radius: 0 0 3px 3px;
-    border-width: 0 1px 1px 1px;
-    border-style: solid;
-}
-
-GeditViewFrame .gedit-search-slider .not-found {
-    color: @error_fg_color;
-    background-image: none;
-    background-color: @error_bg_color;
-}
-
-TerminalWindow .menubar,
-EphyToolbar.toolbar.menubar,
-GeditWindow .primary-toolbar.toolbar {
-    /* line 3D  (dark) */
-    box-shadow: none;
-    /* linea 3D (clear) */
-    border-bottom-width:  0px;
-}
-
-EphyToolbar.toolbar .raised .button *:hover,
-EphyToolbar.toolbar .raised.button *:hover,
-EphyToolbar.toolbar .raised .button *:active,
-EphyToolbar.toolbar .raised.button *:active,
-EphyToolbar.toolbar .raised .button *:active:hover,
-EphyToolbar.toolbar .raised.button *:active:hover,
-EphyToolbar.toolbar .raised .button *:checked,
-EphyToolbar.toolbar .raised.button *:checked,
-EphyToolbar.toolbar .raised .button *:checked:hover,
-EphyToolbar.toolbar .raised.button *:checked:hover {
-    color: @theme_text_dark_color;
-    text-shadow: 0px 1px @theme_shadow_dark_color;
-}
-
-TerminalWindow,
-TerminalWindow .notebook {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_bg_dark_color, 0.95)),
-                                     to   (shade(@theme_bg_dark_color, 0.95)));
-}
-
-TerminalWindow .notebook,
-GeditWindow .notebook,
-EphyNotebook.notebook {
-    border-style: solid;
-    border-width: 1px 0px 0px 0px;
-    border-radius: 0px;
-    border-top-color: @theme_mdi_border_color;
-    border-image: none;
-    background-color: shade(@theme_bg_color, 0.97);
-    background-image: none;
-}
-
-GeditWindow .notebook tab,
-EphyNotebook.notebook tab {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_bg_dark_color, 0.95)),
-                                     to   (shade(@theme_bg_dark_color, 0.93)));
-    border-top-color: @theme_mdi_border_color;
-}
-
-TerminalWindow .notebook tab {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_bg_dark_color, 1.00)),
-                                     to   (shade(@theme_bg_dark_color, 0.97)));
-    border-top-color: shade(@theme_mdi_border_color, 1.05);
-}
-
-TerminalWindow .notebook tab,
-GeditWindow .notebook tab,
-EphyNotebook.notebook tab {
-    padding: 2px 4px;
-    border-width: 1px 1px 0px 1px;
-    border-style: solid;
-    border-left-color:   @theme_mdi_border_color;
-    border-bottom-color: @theme_mdi_border_color;
-    border-right-color:  @theme_mdi_border_color;
-    border-image: none;
-    box-shadow: inset  0px  1px @theme_highlight_color,
-                inset  1px  0px @theme_highlight_color,
-                inset -1px  0px @theme_highlight_color;
-}
-
-GeditWindow.notebook tab.top.
-EphyNotebook.notebook tab.top {
-    padding: 3px 4px;
-}
-
-TerminalWindow .notebook tab:active,
-GeditWindow .notebook tab:active,
-EphyNotebook.notebook tab:active,
-TerminalWindow .notebook tab:checked,
-GeditWindow .notebook tab:checked,
-EphyNotebook.notebook tab:checked {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_mdi_bg_color, 0.90)),
-                                     color-stop (0.66, shade(@theme_mdi_bg_color, 0.95)),
-                                     to (shade(@theme_mdi_bg_color, 1.03)));
-    border-width: 1px 1px 0px 1px;
-    border-style: solid; 
-    /* border-radius: 4px; */
-    border-top-color:   shade(@theme_mdi_border_color, 0.85);
-    border-left-color:  shade(@theme_mdi_border_color, 0.88);
-    border-right-color: shade(@theme_mdi_border_color, 0.88);
-    border-image: none;
-    box-shadow: inset  0px  4px alpha(#000, 0.01),
-                inset  0px  3px alpha(#000, 0.02),
-                inset  0px  2px alpha(#000, 0.03),
-                inset  0px  1px alpha(#000, 0.04),
-                inset  4px  0px alpha(#000, 0.01),
-                inset  3px  0px alpha(#000, 0.02),
-                inset  2px  0px alpha(#000, 0.03),
-                inset  1px  0px alpha(#000, 0.04),
-                inset -4px  0px alpha(#000, 0.01),
-                inset -3px  0px alpha(#000, 0.02),
-                inset -2px  0px alpha(#000, 0.03),
-                inset -1px  0px alpha(#000, 0.04);
-}
-
-GeditWindow .notebook tab:first-child,
-EphyNotebook.notebook tab:first-child,
-GeditWindow .notebook tab:first-child:active,
-EphyNotebook.notebook tab:first-child:active,
-TerminalWindow .notebook tab:first-child,
-TerminalWindow .notebook tab:first-child:active,
-GeditWindow .notebook tab:first-child:checked,
-EphyNotebook.notebook tab:first-child:checked,
-TerminalWindow .notebook tab:first-child:checked {
-    border-left-width: 0px;
-    border-radius: 0px;
-}
-
-TerminalWindow .notebook tab:last-child,
-TerminalWindow .notebook tab:last-child:active {
-    border-right-width: 0px;
-    border-radius: 0px;
-}
-
-/* to compensate for the use of tabs-themed-dark.css */
-GeditWindow .notebook tab:first-child,
-EphyNotebook.notebook tab:first-child,
-TerminalWindow .notebook tab:first-child,
-GeditWindow .notebook tab:last-child,
-EphyNotebook.notebook tab:last-child,
-TerminalWindow .notebook tab:last-child {
-    border-left-color: @theme_mdi_border_color;
-    border-right-color: @theme_mdi_border_color;
-}
-
-GeditWindow .notebook tab:first-child:active,
-EphyNotebook.notebook tab:first-child:active,
-TerminalWindow .notebook tab:first-child:active,
-GeditWindow .notebook tab:last-child:active,
-EphyNotebook.notebook tab:last-child:active,
-TerminalWindow .notebook tab:last-child:active,
-GeditWindow .notebook tab:first-child:checked,
-EphyNotebook.notebook tab:first-child:checked,
-TerminalWindow .notebook tab:first-child:checked,
-GeditWindow .notebook tab:last-child:checked,
-EphyNotebook.notebook tab:last-child:checked,
-TerminalWindow .notebook tab:last-child:checked {
-    border-left-color: shade(@theme_mdi_border_color, 0.88);
-    border-right-color: shade(@theme_mdi_border_color, 0.88);
-}
-
-GeditWindow .notebook tab:first-child,
-EphyNotebook.notebook tab:first-child,
-GeditWindow .notebook tab:first-child:hover,
-EphyNotebook.notebook tab:first-child:hover,
-GeditWindow .notebook tab:first-child:active,
-EphyNotebook.notebook tab:first-child:active,
-GeditWindow .notebook tab:first-child:checked,
-EphyNotebook.notebook tab:first-child:checked {
-    border-radius: 0px;
-}
-
-GeditWindow .notebook tab:last-child,
-EphyNotebook.notebook tab:last-child,
-GeditWindow .notebook tab:last-child:hover,
-EphyNotebook.notebook tab:last-child:hover,
-GeditWindow .notebook tab:last-child:active,
-EphyNotebook.notebook tab:last-child:active,
-GeditWindow .notebook tab:last-child:checked,
-EphyNotebook.notebook tab:last-child:checked {
-    border-radius: 0px;
-}
-
-TerminalWindow .notebook tab:only-child {
-    border-radius: 0px;
-}
-
-GeditWindow .notebook tab:only-child,
-GeditWindow .notebook tab:only-child:active,
-GeditWindow .notebook tab:only-child:hover,
-GeditWindow .notebook tab:only-child:checked,
-EphyNotebook.notebook tab:only-child {
-    border-radius: 0px;
-}
-
-TerminalWindow .notebook tab GtkLabel,
-EphyNotebook.notebook tab GtkLabel,
-GeditWindow .notebook tab GtkLabel,
-GeditWindow.notebook tab GtkLabel {
-    padding: 1px 4px;
-    color: @theme_fg_dark_color;
-    text-shadow: 0px 1px @theme_shadow_dark_color;
-}
-
-/* gnome-terminal */
-TerminalScreen {
-    -TerminalScreen-background-darkness: 0.95;
-    background-color: @terminal_background_color;
-    color: @selected_fg_color;
-}
-
 /*************
  * rhythmbox *
  *************/
 
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:active,
-.primary-toolbar.toolbar.horizontal RBHeader.horizontal GtkVolumeButton.button.flat:hover {
+toolbar.primary-toolbar.horizontal > toolitem > grid.horizontal > button.scale.flat,
+toolbar.primary-toolbar.horizontal > toolitem > grid.horizontal > button.scale.flat:hover,
+toolbar.primary-toolbar.horizontal > toolitem > grid.horizontal > button.scale.flat:hover:active {
 	padding: 0px 8px;
 }
 
-RBDisplayPageTree.frame {
-    border-width: 0px 1px 1px 0px;
-}
-
-RBDisplayPageTree .cell,
-RBDisplayPageTree .cell:hover {
-    /* background-image: none; */
-    background-color: @sidebar_background;
-}
-
-RBSource .toolbar {
-    background-image: none;
-    background-color: transparent;
-    padding: 2px 4px;
-}
-
-RBSource .toolbar .button {
-    padding: 0px 3px;
-    color:  shade(@theme_fg_color, 0.95);
-    text-shadow: 0 1px @theme_shadow_color;
-}
-
-RBSource .toolbar .button *:hover {
-    color:  shade(@theme_text_color, 0.95);
-    text-shadow: 0 1px @theme_shadow_color;
-}
-
-RBSource .toolbar .button *:active,
-RBSource .toolbar .button *:active:hover,
-RBSource .toolbar .button *:checked,
-RBSource .toolbar .button *:checked:hover {
-    color:  shade(@theme_text_color, 0.95);
-    text-shadow: 0 1px @theme_shadow_color;
-}
-
-ApDocView, /* Abiword */
-EogScrollView, /* Eog */
-CheeseThumbView /* Cheese */
-{
-    background-color: @chrome_bg_color;
-}
-
-.documents-counter {
-    background-image: url('assets/dnd-counter.svg');
-    background-size: contain;
-    background-color: transparent;
-    color: @theme_base_color;
-    font: bold;
-}
-
-RemminaConnectionWindow .toolbar,
-RemminaMain .toolbar {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_bg_dark_color, 1.00)),
-                                     to   (shade(@theme_bg_dark_color, 0.95)));
-}
-
-RemminaMain .toolbar {
-    border-bottom-color:  shade(@theme_bg_dark_color, 0.73);
-    border-image: none;
-}
-
-RemminaConnectionWindow .toolbar {
-    border-width: 0px;
-    border-style: none;
-    border-image: none;
-}
-
-/* dconf editor sidebar */
-DConfDirView.view {
-    background-color: shade (@theme_bg_color, 1.08);
-}
-
-/* yelp without headerbar, since gtk+-3.18 */
-
-YelpWindow .horizontal.toolbar.primary-toolbar {
-    padding: 3px;
-}
-
-YelpWindow .horizontal.toolbar.primary-toolbar .button.image-button {
-    padding: 6px;
-}
-
-YelpWindow .horizontal.toolbar.primary-toolbar .button.image-button:focus {
-    box-shadow: none;
-}
-
-YelpWindow .horizontal.toolbar.primary-toolbar .button.image-button:hover {
-    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
-                inset  1px  0px shade(@selected_bg_color, 0.97),
-                inset -1px  0px shade(@selected_bg_color, 0.93),
-                inset  0px -1px shade(@selected_bg_color, 0.93);
-}
-
-YelpWindow .horizontal.toolbar.primary-toolbar .button.image-button:first-child {
-    border-radius: 5px 0px 0px 5px;
-    border-right-width: 0px;
+/* gnome-weather */
+#weather-page {
+    padding: 0px;
+    margin: -2px -2px -2px 0px;
 }
 
-YelpWindow .horizontal.toolbar.primary-toolbar .button.image-button:last-child {
-    border-radius: 0px 5px 5px 0px;
-    border-left-width: 0px;
+#weather-page > frame {
+    border-radius: 0px;
+    margin: 0px 0px 0px -1px;
+    border-color: transparent;
 }
 
-/* gnome-weather */
-Gjs_WeatherWidget.frame.flat GtkStack GtkScrolledWindow .frame {
+#weather-page stack > scrolledwindow > .frame {
     background-color: transparent;
     background-image: linear-gradient(to bottom,
                                       alpha(shade(@theme_selected_bg_color, 1.2), 0.1),
@@ -373,25 +43,21 @@ Gjs_WeatherWidget.frame.flat GtkStack GtkScrolledWindow .frame {
     border-color: @osd_button_border;
 }
 
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-clear .linked.stack-switcher.osd .button:hover,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-clear .linked.stack-switcher.osd .button:checked,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-fog .linked.stack-switcher.osd .button:checked,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-few-clouds .linked.stack-switcher.osd .button:checked,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-clear GtkStack GtkScrolledWindow .frame {
+#weather-page frame.weather-clear stack > scrolledwindow > .frame {
     color: @theme_fg_color;
     text-shadow: none;
 }
 
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-clear .linked.stack-switcher.osd .button:hover {
+#weather-page frame.weather-few-clouds-night .linked.stack-switcher.osd > button:checked,
+#weather-page frame.weather-few-clouds-night stack > scrolledwindow > .frame label,
+#weather-page frame.weather-clear-night .linked.stack-switcher.osd > button:checked,
+#weather-page frame.weather-clear-night stack > scrolledwindow > .frame label,
+#weather-page frame.weather-storm .linked.stack-switcher.osd > button:checked,
+#weather-page frame.weather-storm stack > scrolledwindow > .frame label,
+#weather-page frame.weather-showers .linked.stack-switcher.osd > button:checked,
+#weather-page frame.weather-showers stack > scrolledwindow > .frame label,
+#weather-page frame.weather-overcast .linked.stack-switcher.osd > button:checked,
+#weather-page frame.weather-overcast stack > scrolledwindow > .frame label {
     color: @osd_button_fg_hover;
 }
 
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-clear-night .linked.stack-switcher.osd .button:hover,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-clear-night GtkStack GtkScrolledWindow .frame,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-storm GtkStack GtkScrolledWindow .frame,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-showers GtkStack GtkScrolledWindow .frame,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-few-clouds-night GtkStack GtkScrolledWindow .frame,
-Gjs_WeatherWidget.frame.flat .frame.flat.weather-overcast GtkStack GtkScrolledWindow .frame {
-    color: @osd_button_fg_active;
-}
-
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 47d78302..6273325b 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
@@ -4904,7 +4904,12 @@ GtkOverlay.osd {
 .osd button:focus,

 .osd button:checked,

 .osd button:hover:active,

-.osd button:focus:hover:active {

+.osd button:focus:hover:active,

+button.osd,

+button.osd:focus,

+button.osd:checked,

+button.osd:hover:active,

+button.osd:focus:hover:active {

     border-width: 1px;

     border-style: solid;

     border-image: none;

@@ -4915,19 +4920,25 @@ GtkOverlay.osd {
 

 .osd button,

 .osd button:hover,

-.osd button:checked {

+.osd button:checked,

+button.osd,

+button.osd:hover,

+button.osd:checked {

     background-color: shade(@osd_bg, 1.10);

     border-radius: 5px;

     border-color: @osd_button_border;

 }

 

 .osd button:hover,

-.osd button:checked {

+.osd button:checked,

+button.osd:hover,

+button.osd:checked {

     background-color: transparent;

     box-shadow: none;

 }

 

-.osd button:disabled {

+.osd button:disabled,

+button.osd:disabled {

     background-image: none;

     border-color: @osd_button_bg_insensitive;

     background-color: transparent;

@@ -4935,14 +4946,17 @@ GtkOverlay.osd {
     color: @osd_button_fg_insensitive;

 }

 

-.osd button:checked:disabled {

+.osd button:checked:disabled,

+button.osd:checked:disabled {

     background-image: none;

     background-color: @osd_button_bg_insensitive_active;

     color: @osd_button_fg_insensitive;

 }

 

 .osd button,

-.osd button:focus {

+.osd button:focus,

+button.osd,

+button.osd:focus {

     padding: 4px;

     background-image: linear-gradient(to bottom,

                                       @osd_button_bg_a,

@@ -4954,6 +4968,7 @@ GtkOverlay.osd {
 }

 

 .osd button:hover,

+button.osd:hover,

 .osd .linked button:hover {

     background-image: linear-gradient(to bottom,

                                       @osd_button_bg_hover_a,

@@ -4967,7 +4982,13 @@ GtkOverlay.osd {
 .osd button:checked:hover:active,

 .osd button:hover:active,

 .osd button:focus:hover:active,

-.osd button.menu-button:checked {

+.osd button.menu-button:checked,

+button.osd:checked,

+button.osd:checked:hover,

+button.osd:checked:hover:active,

+button.osd:hover:active,

+button.osd:focus:hover:active,

+button.osd.menu-button:checked {

     background-image: linear-gradient(to bottom,

                                       @osd_button_bg_active_a,

                                       @osd_button_bg_active_b 68%,

@@ -4981,37 +5002,26 @@ GtkOverlay.osd {
     border-color: @osd_button_border;

 }

 

-/* gnome-weather */

-.linked stackswitcher.osd button {

-    background-image: linear-gradient(to bottom,

-                                      alpha(shade(@theme_selected_bg_color, 1.2), 0.1),

-                                      alpha(shade(@theme_selected_bg_color, 0.95), 0.1));

-    background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4);

-    box-shadow: none;

-}

-

-.linked stackswitcher.osd button:hover {

-    background-image: linear-gradient(to bottom,

-                                      alpha(shade(@theme_selected_bg_color, 1.2), 0.4),

-                                      alpha(shade(@theme_selected_bg_color, 0.95), 0.4));

-    background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4);

-

+/* ie. gnome-weather */

+.linked.stack-switcher.osd button {

+    border-width: 1px 0 1px 0px;

+    color: @osd_button_fg_hover;

+    text-shadow: none;

 }

 

-.linked stackswitcher.osd button {

-    border-width: 1px 0 1px 0px;

-    border-color: shade (@theme_selected_bg_color, 0.8);

+.linked.stack-switcher.osd button:checked {

+    color: shade(@theme_fg_color, 1.00);

 }

 

-.linked stackswitcher.osd button:first-child {

+.linked.stack-switcher.osd button:first-child {

     border-width: 1px 1px 1px 1px;

 }

 

-.linked stackswitcher.osd button:last-child {

+.linked.stack-switcher.osd button:last-child {

     border-width: 1px 1px 1px 0px;

 }

 

-.linked stackswitcher.osd button:only-child {

+.linked.stack-switcher.osd button:only-child {

     border-width: 1px;

 }