GTK+-3.20 Blue-Submarine gtk-widgets: port to 3.20

1 files changed, 2179 insertions, 2157 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 1a3fae15..376bcf74 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -7,29 +7,29 @@
 * {

     padding: 0;

     background-clip: padding-box;

-    -GtkButton-child-displacement-x: 1;

-    -GtkButton-child-displacement-y: 1;

+/*	-GtkButton-child-displacement-x: 1; deprecated */

+/*	-GtkButton-child-displacement-y: 1; deprecated */

     -GtkButton-default-border: 0;

     -GtkButton-image-spacing: 0;

     -GtkButton-interior-focus: true;

     -GtkButton-inner-border: 3;

-    -GtkButtonBox-child-min-height: 26;

-    -GtkCheckButton-indicator-size: 16;

-    -GtkCheckMenuItem-indicator-size: 12;

+/*	-GtkButtonBox-child-min-height: 26; deprecated */

+/*	-GtkCheckButton-indicator-size: 16; deprecated */

+/*	-GtkCheckMenuItem-indicator-size: 12; deprecated */

     -GtkComboBox-arrow-scaling: 0.75;

     -GtkDialog-button-spacing: 4; /* ie. logout dialog */

     -GtkDialog-action-area-border: 10; /* ie. logout dialog */

-    -GtkExpander-expander-size: 14;

+/*	-GtkExpander-expander-size: 14; deprecated */

     -GtkHTML-link-color: @link_color;

     -GtkIMHtml-hyperlink-color: @link_color;

-    -GtkMenu-horizontal-padding: 0;

-    -GtkMenu-vertical-padding: 0;

+/*	-GtkMenu-horizontal-padding: 0; */

+/*	-GtkMenu-vertical-padding: 0; */

     -GtkMenuBar-internal-padding: 0;

-    -GtkMenuItem-arrow-scaling: 0.7;

-    -GtkNotebook-tab-overlap: 1;

+/*    -GtkMenuItem-arrow-scaling: 0.7; */

+/*    -GtkNotebook-tab-overlap: 1; */

     -GtkPaned-handle-size: 1;

-    -GtkProgressBar-min-horizontal-bar-height: 16;

-    -GtkProgressBar-min-vertical-bar-width: 16;

+/*    -GtkProgressBar-min-horizontal-bar-height: 16;

+    -GtkProgressBar-min-vertical-bar-width: 16; */

     -GtkRange-trough-border: 1;

     -GtkRange-slider-width: 11;

     -GtkRange-stepper-size: 13;

@@ -51,30 +51,26 @@
     -GtkTreeView-expander-size: 12; /* arrow size in list/tree views */

     -GtkTreeView-horizontal-separator: 4;

     -GtkTreeView-vertical-separator: 4;

-    -GtkWidget-focus-padding: 2;

-    -GtkWidget-focus-line-width: 0;

-    -GtkWindow-resize-grip-default: true;

-    -GtkWindow-resize-grip-width: 13;

-    -GtkWindow-resize-grip-height: 13;

-    -GtkWidget-separator-width: 2px;

-    -GtkWidget-separator-height: 2px;

-    -GtkWidget-wide-separators: true;

+/*	-GtkWidget-focus-padding: 2;  deprecated */

+/*	-GtkWidget-focus-line-width: 0; */

+/*    -GtkWidget-separator-width: 2px;

+    -GtkWidget-separator-height: 2px; */

+/*    -GtkWidget-wide-separators: true; */

     -WnckTasklist-fade-overlay-rect: 0;

     /* Highlight drag-drop destination */

-    engine: none;

+/*    engine: none; */

     outline-color: alpha(@theme_selected_bg_color, 0.3);

     outline-style: dashed;

     outline-offset: -3px; /* 2px */

     outline-width: 0px; /* disable ugly focus-line */

-    outline-radius: 2px;

+    -gtk-outline-radius: 2px;

     -gtk-icon-style: regular; /* no symbolic icons */

 }

 

 /***************

  * Base States *

  ***************/

-

-GtkWindow {

+window {

     color: @theme_fg_color;

 }

 

@@ -85,7 +81,7 @@ GtkWindow {
 

 .background:backdrop {

     text-shadow: none;

-    icon-shadow: none;

+    -gtk-icon-shadow: none;

 }

 

 /* Ugly hack to fix unexpected background colours (e.g. combo box arrow)

@@ -99,17 +95,17 @@ GtkWindow {
     background-color: alpha(shade(@theme_selected_bg_color, 1.90), 0.015);

 }

 

-*:hover:active:insensitive {

+*:hover:active:disabled {

 }

 

-*:active:insensitive {

+*:active:disabled {

 }

 

 *:hover {

      background-color: alpha(shade(@menu_bg_color, 1.05), 0.0);

 }

 

-*:hover:insensitive {

+*:hover:disabled {

 }

 

 *:selected,

@@ -118,7 +114,7 @@ GtkWindow {
     color: @theme_selected_fg_color;

 }

 

-*:insensitive {

+*:disabled {

     /* inherit the color from parent by default */

     background-color: inherit;

     color: @insensitive_fg_color;

@@ -134,7 +130,7 @@ GtkWindow {
     color: @theme_fg_color;

 }

 

-.gtkstyle-fallback:prelight {

+.gtkstyle-fallback:hover {

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

     color: @theme_fg_color;

 }

@@ -144,7 +140,7 @@ GtkWindow {
     color: @theme_fg_color;

 }

 

-.gtkstyle-fallback:insensitive {

+.gtkstyle-fallback:disabled {

     background-color: @insensitive_bg_color;

     color: @insensitive_fg_color;

 }

@@ -158,13 +154,13 @@ GtkWindow {
  * label *

  *********/

 

-GtkLabel,

-GtkLabel:insensitive {

+label,

+label:disabled {

     background-color: transparent;

 }

 

-.tooltip,

-.tooltip.background {

+tooltip,

+tooltip.background {

     padding: 4px 4px;

     color: shade(@theme_tooltip_fg_color, 0.90);

     border-width: 1px;

@@ -176,7 +172,11 @@ GtkLabel:insensitive {
     box-shadow: 0 1px 5px shade (@theme_selected_bg_color, 1.3);

 }

 

-.tooltip * {

+tooltip decoration {

+    background-color: transparent;

+}

+

+tooltip * {

     background-color: transparent;

     padding: 4px 4px;

 }

@@ -186,8 +186,8 @@ GtkLabel:insensitive {
     background-image: url("assets/resize-grip.svg");

 }

 

-.view.rubberband,

-.rubberband {

+view.rubberband,

+rubberband {

     background-color: alpha (@theme_selected_bg_color, 0.35);

     border-color: @theme_selected_bg_color;

     border-style: solid;

@@ -199,7 +199,7 @@ GtkLabel:insensitive {
  * separator *

  *************/

 

-.separator {

+separator {

     border-width: 1px;

     border-style: solid;

     border-image: none;

@@ -208,60 +208,45 @@ GtkLabel:insensitive {
     border-right-color:  alpha (shade (@theme_bg_color, 1.26), 0.15);

 }

 

-GtkTreeView.view.separator,

-GtkTreeView.separator,

-GtkTreeView.view.separator:hover,

-GtkTreeView.separator:hover,

-.separator,

-.separator:prelight {

+treeview.view.separator,

+treeview.separator,

+treeview.view.separator:hover,

+treeview.separator:hover,

+separator,

+separator:hover {

     color: shade (@theme_bg_color, 0.92);

     border-color:  mix(@theme_fg_color, @theme_bg_color, 0.95);

     border-image: none;

 }

 

-.separator.horizontal {

+separator.horizontal {

     border-width: 1px 0 1px 0;

 }

 

-.separator.vertical {

+separator.vertical {

     border-width: 0 1px 0 1px;

 }

 

-GtkComboBox .separator {

-    -GtkWidget-wide-separators: true;

-    -GtkWidget-horizontal-separator: 0;

-    -GtkWidget-vertical-separator: 0;

-}

-

-.button .separator,

-.button.separator {

+button separator,

+button.separator {

     border-color: alpha (#000, 0.00);

 }

 

-.button .separator:insensitive,

-.button.separator:insensitive {

+button separator:disabled,

+button.separator:disabled {

     border-color: alpha (#000, 0.00);

 }

 

-.pane-separator {

-    color: shade (@sidebar_background, 0.95);

-}

-

-.pane-separator:prelight,

-.pane-separator:selected {

-    color: shade (@sidebar_background, 0.95);

-}

-

-GtkStatusbar {

-    padding: 5px;

+statusbar {

+    padding: 0px;

+    margin: -2px 0 -2px 0;

     color: @theme_fg_color;

     -GtkStatusbar-shadow-type: none;

     font-size: smaller;

 }

 

-GtkStatusbar .frame {

-    padding: 0px;

-    border-width: 0;

+statusbar frame {

+    border-style: none;

 }

 

 .dnd {

@@ -271,12 +256,45 @@ GtkStatusbar .frame {
     border-radius: 0px;

 }

 

+/*********

+ * Paned *

+ *********/

+

+/* the small line between sidebar and view */

+paned > separator {

+    min-width: 3px;

+    min-height: 3px;

+    -gtk-icon-source: none;

+    border-style: none;

+    background-color: @theme_bg_color;

+    background-size: 1px 1px;

+ }

+

+paned > separator:hover,

+paned > separator:selected {

+    background-color: transparent;

+}

+

+paned > separator:backdrop {

+}

+

+paned > separator.wide {

+    margin: 0;

+    padding: 0;

+    min-width: 5px;

+    min-height: 5px;

+    background-size: 1px 1px, 1px 1px;

+}

+

+paned > separator.wide:backdrop {

+}

+

 /****************

  * Text Entries *

  ****************/

 

-.entry,

-.combobox-entry .entry {

+entry,

+entry.combo {

 /* Look out !

 This is the background color of mate-control-center 'too' */

     background-color: shade (@bg_color, 1.1);

@@ -310,14 +328,15 @@ This is the background color of mate-control-center 'too' */
                 inset  0px -1px shade(@button_border, 1.05);

 }

 

-.entry:focus {

+entry:focus {

     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);

 }

 

-.entry:insensitive {

+entry:disabled,

+entry.combo:disabled {

     color: @insensitive_fg_color;

     background-image: none;

     background-color: @insensitive_bg_color;

@@ -331,43 +350,71 @@ This is the background color of mate-control-center 'too' */
                 inset  0px -1px @insensitive_border_color;

 }

 

-.entry:selected,

-.entry:selected:focus {

+entry selection,

+entry selection:focus {

     background-color: @theme_selected_bg_color;

     color: @theme_selected_fg_color;

 }

 

-.entry.progressbar {

+entry progressbar {

     background-color: @theme_selected_bg_color;

     color: @theme_selected_fg_color;

     border-width: 1px;

     border-radius: 3px;

 }

 

-/*******************

- * Symbolic images *

- *******************/

+/****************

+ * Progress bar *

+ ****************/

 

-.image {

-    color: @internal_element_color;

+progressbar {

+	border-radius: 3px;

+	padding: 0;

+	font-size: smaller;

 }

 

-.image:prelight {

-    color: @internal_element_prelight;

+progressbar.horizontal {

+    min-height: 16px;

 }

 

-/****************

- * Progress bar *

- ****************/

+progressbar.vertical {

+    min-width: 16px;

+}

 

 /* progress component */

-.progressbar,

-.toolbar .progressbar,

-.entry.progressbar,

-.progressbar row,

-.progressbar row:hover,

-.progressbar row:selected,

-.progressbar row:selected:focus {

+progressbar.horizontal trough,

+progressbar.horizontal progress {

+    min-height: 16px;

+    border-radius: 3px;

+}

+

+progressbar.vertical trough,

+progressbar.vertical progress {

+    min-width: 16px;

+    border-radius: 3px;

+}

+

+progressbar progress.left {

+    border-top-left-radius: 3px;

+    border-bottom-left-radius: 3px;

+}

+

+progressbar progress.right {

+    border-top-right-radius: 3px;

+    border-bottom-right-radius: 3px;

+}

+

+progressbar progress.top {

+    border-top-right-radius: 3px;

+    border-top-left-radius: 3px;

+}

+

+progressbar progress.bottom {

+    border-bottom-right-radius: 3px;

+    border-bottom-left-radius: 3px;

+}

+

+progressbar.horizontal progress {

     background-image: linear-gradient(to right,

                                       alpha (#000, 0.00),

                                       alpha (#000, 0.00) 48%,

@@ -396,12 +443,9 @@ This is the background color of mate-control-center 'too' */
     border-left-color:   shade(@button_border_active, 0.85);

     border-right-color:  shade(@button_border_active, 0.85);

     border-bottom-color: shade(@button_border_active, 1.00);

-/* Label font color of progressbar*/

-    color: @theme_fg_color;

-    text-shadow: none;

 }

 

-.progressbar.vertical {

+progressbar.vertical progress {

     background-image: linear-gradient(to top,

                                       alpha (#000, 0.00),

                                       alpha (#000, 0.00) 48%,

@@ -430,32 +474,9 @@ This is the background color of mate-control-center 'too' */
     border-left-color:   shade(@button_border_active, 0.80);

     border-right-color:  shade(@button_border_active, 1.00);

     border-bottom-color: shade(@button_border_active, 0.85);

-/* Label font color of progressbar*/

-    color: @theme_fg_color;

-    text-shadow: none;

 }

 

-GtkProgressBar {

-    /* FIXME - Not working 3.14 */

-    -GtkProgressBar-min-horizontal-bar-height: 16;

-    -GtkProgressBar-min-vertical-bar-width: 16;

-    border-radius: 2px;

-    padding: 0 0 1px 0;

-    text-shadow: none;

-}

-

-/* through component */

-.trough row {

-    padding: 0px;

-    text-shadow: none;

-    border-radius: 2px;

-    padding: 0 0 1px 0;

-}

-

-.trough,

-.toolbar .trough,

-.trough row,

-.trough row:hover {

+progressbar trough {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (alpha (#000, 0.18)),

@@ -470,7 +491,7 @@ GtkProgressBar {
     text-shadow: none;

 }

 

-.trough.vertical {

+progressbar.vertical trough {

     background-image: -gtk-gradient (linear,

                                      left top, right top,

                                      from (alpha (#000, 0.18)),

@@ -481,31 +502,30 @@ GtkProgressBar {
     text-shadow: none;

 }

 

-.trough row:selected,

-.trough row:selected:focus {

-    background-image: -gtk-gradient (linear,

-                                     left top, left bottom,

-                                     from (mix (@trough_bg_color_a, @theme_selected_bg_color, 0.25)),

-                                     to   (mix (@trough_bg_color_b, @theme_selected_bg_color, 0.25)));

-}

-

 /* level bars as used for password quality or remaining power */

-GtkLevelBar {

-    -GtkLevelBar-min-block-width: 34;

-    -GtkLevelBar-min-block-height: 3;

+levelbar {

+    min-width: 34px;

+    min-height: 3px;

 }

 

-GtkLevelBar.vertical {

-    -GtkLevelBar-min-block-width: 3;

-    -GtkLevelBar-min-block-height: 34;

+levelbar.vertical {

+    min-width: 3px;

+    min-height: 34px;

 }

 

-.level-bar.trough {

-    padding: 2px;

+levelbar trough {

+	padding: 2px;

+	border-radius: 2px;

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

+		@trough_bg_color_a,

+		@trough_bg_color_b);

+	background-color: transparent;

+    box-shadow: inset  1px  1px alpha(#000, 0.15),

+                inset -1px -1px alpha(#000, 0.15);

 }

 

-.level-bar.fill-block {

-    border-width: 1px;

+levelbar block.filled {

+    border-width: 2px;

     border-style: solid;

     border-color: @button_border_active;

     background-image: -gtk-gradient (linear,

@@ -516,23 +536,19 @@ GtkLevelBar.vertical {
                                      to (shade (@button_bg_active, 1.20)));

 }

 

-.level-bar.indicator-continuous.fill-block {

-    padding: 2px;

+levelbar.continuous block.filled {

+    padding: 1px;

     border-radius: 2px;

 }

 

-.level-bar.indicator-discrete.fill-block.horizontal {

+levelbar.discrete.horizontal block.filled {

     margin: 0 1px;

 }

 

-.level-bar.indicator-discrete.fill-block.vertical {

+levelbar.discrete.vertical block.filled {

     margin: 1px 0;

 }

 

-/* discrete indicator border rounding,

-   uncomment when :nth-child will be working

-   on the widget

-

 .level-bar.indicator-discrete.fill-block.horizontal:first-child {

     border-radius: 2px 0 0 2px;

 }

@@ -548,9 +564,16 @@ GtkLevelBar.vertical {
 .level-bar.indicator-discrete.fill-block.vertical:last-child {

     border-radius: 0 0 2px 2px;

 }

-*/

 

-.level-bar.fill-block.level-high {

+levelbar block.low {

+	border-color: shade(@warning_color, 0.80);

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

+                                      shade(@warning_color, 1.3),

+                                      @warning_color 75%,

+                                      shade(@warning_color, 0.90));

+}

+

+levelbar block.high {

     border-color: shade(@success_color, 0.85);

     background-image: linear-gradient(to bottom,

                                       shade(@success_color, 1.2),

@@ -558,39 +581,39 @@ GtkLevelBar.vertical {
                                       shade(@success_color, 0.95));

 }

 

-.level-bar.fill-block.level-low {

-    border-color: shade(@warning_bg_color, 0.80);

+levelbar block.full {

+    border-color: shade(@success_color, 0.95);

     background-image: linear-gradient(to bottom,

-                                      shade(@warning_bg_color, 1.3),

-                                      @warning_bg_color 75%,

-                                      shade(@warning_bg_color, 0.90));

+                                      shade(@success_color, 1.2),

+                                      @success_color 75%,

+                                      shade(@success_color, 0.95));

 }

 

-.level-bar.fill-block.empty-fill-block {

+levelbar block.empty {

+    border: 1px solid #2a76c6;

+    border-radius: 1px;

     background-color: transparent;

-    background-image: none;

-    border-color: alpha(@theme_fg_color, 0.1);

+    border-color: rgba(46, 52, 54, 0.2);

+    box-shadow: none;

 }

 

-.level-bar.fill-block.empty-fill-block:backdrop {

-    border-color: transparent;

-    background-color: transparent;

+levelbar block.empty:backdrop {

+    border-color: rgba(139, 142, 143, 0.15); 

 }

 

 /************

  * GtkScale *

  ************/

 

-.scale {

+scale {

     -GtkScale-slider-length: 16;

     -GtkRange-slider-width: 16;

     -GtkRange-trough-border: 0;

-    -GtkWidget-focus-line-width: 0;

 }

 

-.scale.slider,

-.scale.slider:hover,

-.scale.slider:insensitive {

+scale slider,

+scale slider:hover,

+scale slider:disabled {

     border-width: 1px;

     border-radius: 8px;

     border-style: none;

@@ -600,17 +623,22 @@ GtkLevelBar.vertical {
     background-position: center;

 }

 

-.scale.slider.fine-tune:active,

-.scale.slider.fine-tune:hover:active,

-.scale.slider.fine-tune.horizontal:active,

-.scale.slider.fine-tune.horizontal:hover:active {

+scale.horizontal.fine-tune slider:active,

+scale.horizontal.fine-tune slider:hover:active {

+    background-size: 80%;

+    background-repeat: no-repeat;

+    background-position: center;

+}

+

+/* Why different values ? */

+scale.vertical.fine-tune slider:active,

+scale.vertical.fine-tune slider:hover:active {

     background-size: 98%;

     background-repeat: no-repeat;

     background-position: center;

 }

 

-.toolbar .scale.trough,

-.scale.trough {

+scale trough {

     border-radius: 8px;

     border-style: solid;

     border-width: 1px;

@@ -624,61 +652,54 @@ GtkLevelBar.vertical {
                 inset -1px -1px alpha(#000, 0.08);

 }

 

-.scale.trough {

+scale trough {

     margin: 6px 0;

 }

 

-.scale.trough.vertical {

+scale.vertical trough {

     margin: 0 6px;

 }

 

-.scale.trough,

-.scale.trough.vertical {

+scale trough,

+scale.vertical trough {

     border-color: @scale_border_b;

 }

 

-.scale.trough.highlight,

-.scale.trough.highlight.vertical {

-    border-style: none;

-}

-

-.scale.trough,

-.scale.trough.vertical {

-    border-color: @scale_border_b;

-}

-

-.scale.trough.highlight,

-.scale.trough.highlight.vertical {

-    border-color: @scale_highlight_border;

-}

-

-.scale.trough:insensitive {

+scale trough:disabled {

     background-image: -gtk-gradient (linear,

                                      left top,

                                      left bottom,

                                      from (alpha (#000, 0.03)),

                                      to   (alpha (#000, 0.03)));

     border-style: none;

+    box-shadow: inset  1px  1px alpha(#000, 0.15),

+                          inset -1px -1px alpha(#000, 0.15);

 }

 

-.scale.progressbar {

-    background-color: @scale_progress_fill;

-    border-width: 1px;

-    border-radius: 3px;

-    border-style: none;

+scale trough highlight,

+scale.vertical trough highlight,

+scale.horizontal trough highlight {

+    border-style: solid;

+    border-color: @scale_highlight_border;

+    border-radius: 8px;

+    background-color: @scale_highlight_bg;

 }

 

-.scale:insensitive,

-.vertical.scale:insensitive {

+scale trough highlight:disabled,

+scale.vertical trough highlight:disabled {

     background-color: transparent;

 }

 

-.scale.mark {

+scale:disabled,

+scale.vertical:disabled {

+    background-color: transparent;

+}

+

+scale marks {

     color: mix(@theme_bg_color, @theme_text_color, 0.56);

 }

 

-.menubar .menuitem .scale.highlight.left,

-.scale.highlight.left {

+scale highlight.left {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade (@scale_fill, 0.90)),

@@ -692,8 +713,7 @@ GtkLevelBar.vertical {
     text-shadow: none;

 }

 

-.menubar .menuitem .scale.highlight.bottom,

-.scale.highlight.bottom {

+scale highlight.bottom {

     background-image: -gtk-gradient (linear,

                                      left top, right top,

                                      from (shade (@scale_fill, 0.90)),

@@ -707,7 +727,7 @@ GtkLevelBar.vertical {
     text-shadow: none;

 }

 

-.scale.highlight.left:insensitive {

+scale highlight.left:disabled {

     background-image: -gtk-gradient (linear, left top, left bottom,

                                      from (shade (@theme_bg_color, 0.85)),

                                      to (shade (@theme_bg_color, 0.85)));

@@ -715,7 +735,7 @@ GtkLevelBar.vertical {
                 inset -1px -1px alpha(#000, 0.02);

 }

 

-.scale.highlight.bottom:insensitive {

+scale highlight.bottom:disabled {

     background-image: -gtk-gradient (linear,  left top, right top,

                                      from (shade (@theme_bg_color, 0.85)),

                                      to (shade (@theme_bg_color, 0.85)));

@@ -727,7 +747,7 @@ GtkLevelBar.vertical {
  * Frames *

  **********/

 

-.frame {

+frame {

     padding: 2px;

     border-width: 1px;

     border-radius: 4px;

@@ -741,7 +761,7 @@ GtkLevelBar.vertical {
 }

 

 /* only render frames in a GtkScrolledWindow */

-GtkScrolledWindow.frame {

+scrolledwindow.frame {

     border-width:  1px;

     border-radius: 0;

     border-style:  solid;

@@ -753,15 +773,17 @@ GtkScrolledWindow.frame {
  * Buttons *

  ***********/

 

-.button.menuitem.menubar {

+button menuitem menubar {

     padding: 4px 8px;

 }

 

-.button {

+button {

     padding: 4px;

+    min-height: 16px;

+    min-width: 16px;

 }

 

-.button {

+button {

     transition: all 400ms ease-out;

     -GtkButton-image-spacing: 4;

     -GtkButton-interior-focus: true;

@@ -796,14 +818,14 @@ GtkScrolledWindow.frame {
     text-shadow: 0px 1px @theme_shadow_color;

 }

 

-.button.default {

+button.default {

     transition: all 400ms ease-out;

     text-shadow: none;

     color: @theme_fg_color;

 }

 

 /* ie. mate-control-center */

-.button.flat {

+button.flat {

     transition: all 400ms ease-out;

     padding: 0px;

     border-color: transparent;

@@ -811,18 +833,18 @@ GtkScrolledWindow.frame {
     background-image: none;

     box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);

     text-shadow: none;

-    icon-shadow: none;

+    -gtk-icon-shadow: none;

     border-image: none;

 }

 

 /* ie. controls gnome-mplayer, virtual-manager */

-.button.flat.image-button,

-.button.flat.image-button:hover,

-GtkVolumeButton.button.flat {

+button.flat.image-button,

+button.flat.image-button:hover,

+button.flat.scale {

 	padding: 4px;

 }

 

-.button:hover {

+button:hover {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@button_gradient1, 1.03)),

@@ -835,11 +857,11 @@ GtkVolumeButton.button.flat {
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-.button:hover:active,

-.button:focus:hover:active,

-.button:checked,

-.button:checked:hover,

-.button:checked:hover:active {

+button:hover:active,

+button:focus:hover:active,

+button:checked,

+button:checked:hover,

+button:checked:hover:active {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade (@theme_bg_color, 1.20)),

@@ -853,8 +875,8 @@ GtkVolumeButton.button.flat {
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-.button:focus,

-.button.default {

+button:focus,

+button.default {

     border-color: transparent;

     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),

                 inset  1px  0px shade (@theme_selected_bg_color, 1.3),

@@ -862,15 +884,15 @@ GtkVolumeButton.button.flat {
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-.button *:hover:active,

-.button *:checked,

-.button *:checked:hover,

-.button *:checked:hover:active {

+button *:hover:active,

+button *:checked,

+button *:checked:hover,

+button *:checked:hover:active {

     color: @theme_selected_fg_color;

     text-shadow: 1px 1px @theme_selected_shadow_color;

 }

 

-.button:insensitive {

+button:disabled {

     background-image: none;

     background-color: @insensitive_bg_color;

     border-color: alpha (#000, 0.00);

@@ -882,83 +904,83 @@ GtkVolumeButton.button.flat {
                 inset  0px -1px @insensitive_border_color;

 }

 

-.button *:insensitive {

+button *:disabled {

     color: @insensitive_fg_color;

     text-shadow: none;

 }

 

-.toolbar.vertical .image-button.flat.button {

+toolbar.vertical button.image-button.flat {

     padding: 5px;

 }

 

-.button.text-button,

-.button.text-button:hover,

-GtkFileChooserButton .button {

+button.text-button,

+button.text-button:hover,

+button.file {

     padding: 5px 4px;

 }

 

-GtkComboBox GtkToggleButton.button,

-GtkComboBox GtkToggleButton.button:hover {

+combobox button.combo,

+combobox button.combo:hover {

     padding: 4px;

 }

 

-GtkFontButton.button,

-GtkColorButton.button {

+button.font,

+button.color {

     padding: 6px 4px;

 }

 

-.path-bar .button,

-.path-bar .button GtkImage,

-.path-bar .button GtkLabel {

+.path-bar button,

+.path-bar button image,

+.path-bar button label {

     padding: 2px;

 }

 

-.path-bar .button {

+.path-bar button {

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

 }

 

-.path-bar .button:hover:checked {

+.path-bar button:hover:checked {

     border-left-width: 1px;

 }

 

 /* linked path-bar buttons */

 

-.path-bar.linked .button:dir(ltr),

-.path-bar.linked .button:dir(ltr):hover,

-.path-bar.linked .button:dir(ltr):hover:active,

-.path-bar.linked .button:dir(ltr):checked,

-.path-bar.linked .button:dir(ltr):checked:hover,

-.path-bar.linked .button:dir(ltr):checked:hover:active {

+.linked.path-bar button:dir(ltr),

+.linked.path-bar button:dir(ltr):hover,

+.linked.path-bar button:dir(ltr):hover:active,

+.linked.path-bar button:dir(ltr):checked,

+.linked.path-bar button:dir(ltr):checked:hover,

+.linked.path-bar button:dir(ltr):checked:hover:active {

     border-radius: 0px;

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

 }

 

-.path-bar.linked .button:dir(ltr):first-child,

-.path-bar.linked .button:dir(ltr):hover:first-child,

-.path-bar.linked .button:dir(ltr):hover:active:first-child,

-.path-bar.linked .button:dir(ltr):checked:first-child,

-.path-bar.linked .button:dir(ltr):checked:hover:first-child,

-.path-bar.linked .button:dir(ltr):checked:hover:active:first-child {

+.linked.path-bar button:dir(ltr):first-child,

+.linked.path-bar button:dir(ltr):hover:first-child,

+.linked.path-bar button:dir(ltr):hover:active:first-child,

+.linked.path-bar button:dir(ltr):checked:first-child,

+.linked.path-bar button:dir(ltr):checked:hover:first-child,

+.linked.path-bar button:dir(ltr):checked:hover:active:first-child {

     border-radius: 6px 0px 0px 6px;

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

 }

 

-.path-bar.linked .button:dir(ltr):last-child,

-.path-bar.linked .button:dir(ltr):hover:last-child,

-.path-bar.linked .button:dir(ltr):hover:active:last-child,

-.path-bar.linked .button:dir(ltr):checked:last-child,

-.path-bar.linked .button:dir(ltr):checked:hover:last-child,

-.path-bar.linked .button:dir(ltr):checked:hover:active:last-child {

+.linked.path-bar button:dir(ltr):last-child,

+.linked.path-bar button:dir(ltr):hover:last-child,

+.linked.path-bar button:dir(ltr):hover:active:last-child,

+.linked.path-bar button:dir(ltr):checked:last-child,

+.linked.path-bar button:dir(ltr):checked:hover:last-child,

+.linked.path-bar button:dir(ltr):checked:hover:active:last-child {

     border-radius: 0px 6px 6px 0px;

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

 }

 

-.path-bar.linked .button:dir(ltr):only-child,

-.path-bar.linked .button:dir(ltr):hover:only-child,

-.path-bar.linked .button:dir(ltr):hover:active:only-child,

-.path-bar.linked .button:dir(ltr):checked:only-child,

-.path-bar.linked .button:dir(ltr):checked:hover:only-child,

-.path-bar.linked .button:dir(ltr):checked:hover:active:only-child {

+.linked.path-bar button:dir(ltr):only-child,

+.linked.path-bar button:dir(ltr):hover:only-child,

+.linked.path-bar button:dir(ltr):hover:active:only-child,

+.linked.path-bar button:dir(ltr):checked:only-child,

+.linked.path-bar button:dir(ltr):checked:hover:only-child,

+.linked.path-bar button:dir(ltr):checked:hover:active:only-child {

     border-radius: 6px;

     border-width: 1px;

 }

@@ -968,53 +990,53 @@ GtkColorButton.button {
 /***************************/

 

 /* Middle toolbar-button */

-.toolbar.menubar .linked .button,

-.toolbar.menubar .linked .button:focus,

-.toolbar.menubar .linked .button:hover,

-.toolbar.menubar .linked .button:hover:active,

-.toolbar.menubar .linked .button:checked,

-.toolbar.menubar .linked .button:checked:focus,

-.toolbar.menubar .linked .button:checked:hover,

-.toolbar.menubar .linked .button:checked:hover:active,

-.toolbar.menubar .linked .button:insensitive,

-.toolbar .button.raised.linked,

-.toolbar .button.raised.linked:focus,

-.toolbar .button.raised.linked:hover,

-.toolbar .button.raised.linked:hover:active,

-.toolbar .button.raised.linked:checked,

-.toolbar .button.raised.linked:checked:focus,

-.toolbar .button.raised.linked:checked:hover,

-.toolbar .button.raised.linked:checked:hover:active,

-.toolbar .button.raised.linked:insensitive,

-.toolbar .raised.linked .button,

-.toolbar .raised.linked .button:focus,

-.toolbar .raised.linked .button:hover,

-.toolbar .raised.linked .button:hover:active,

-.toolbar .raised.linked .button:checked,

-.toolbar .raised.linked .button:checked:focus,

-.toolbar .raised.linked .button:checked:hover,

-.toolbar .raised.linked .button:checked:hover:active,

-.toolbar .raised.linked .button:insensitive,

-.primary-toolbar .linked .entry,

-.primary-toolbar .linked .entry:insensitive,

-.primary-toolbar .linked .button,

-.primary-toolbar .linked .button:focus,

-.primary-toolbar .linked .button:hover,

-.primary-toolbar .linked .button:hover:active,

-.primary-toolbar .linked .button:checked,

-.primary-toolbar .linked .button:checked:focus,

-.primary-toolbar .linked .button:checked:hover,

-.primary-toolbar .linked .button:checked:hover:active,

-.primary-toolbar .linked .button:insensitive {

+toolbar menubar .linked button,

+toolbar menubar .linked button:focus,

+toolbar menubar .linked button:hover,

+toolbar menubar .linked button:hover:active,

+toolbar menubar .linked button:checked,

+toolbar menubar .linked button:checked:focus,

+toolbar menubar .linked button:checked:hover,

+toolbar menubar .linked button:checked:hover:active,

+toolbar menubar .linked button:disabled,

+toolbar button.raised.linked,

+toolbar button.raised.linked:focus,

+toolbar button.raised.linked:hover,

+toolbar button.raised.linked:hover:active,

+toolbar button.raised.linked:checked,

+toolbar button.raised.linked:checked:focus,

+toolbar button.raised.linked:checked:hover,

+toolbar button.raised.linked:checked:hover:active,

+toolbar button.raised.linked:disabled,

+toolbar .raised.linked button,

+toolbar .raised.linked button:focus,

+toolbar .raised.linked button:hover,

+toolbar .raised.linked button:hover:active,

+toolbar .raised.linked button:checked,

+toolbar .raised.linked button:checked:focus,

+toolbar .raised.linked button:checked:hover,

+toolbar .raised.linked button:checked:hover:active,

+toolbar .raised.linked button:disabled,

+toolbar.primary-toolbar .linked entry,

+toolbar.primary-toolbar .linked entry:disabled,

+toolbar.primary-toolbar .linked button,

+toolbar.primary-toolbar .linked button:focus,

+toolbar.primary-toolbar .linked button:hover,

+toolbar.primary-toolbar .linked button:hover:active,

+toolbar.primary-toolbar .linked button:checked,

+toolbar.primary-toolbar .linked button:checked:focus,

+toolbar.primary-toolbar .linked button:checked:hover,

+toolbar.primary-toolbar .linked button:checked:hover:active,

+toolbar.primary-toolbar .linked button:disabled {

     padding: 2px 4px 4px 2px;

     border-radius: 0px;

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

 }

 

 /* Middle toolbar-button hover */

-.toolbar.menubar .linked .button:hover,

-.toolbar .raised.linked .button:hover,

-.primary-toolbar .linked .button:hover {

+toolbar menubar .linked button:hover,

+toolbar .raised.linked button:hover,

+toolbar.primary-toolbar .linked button:hover {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -1026,38 +1048,38 @@ GtkColorButton.button {
 }

 

 /* Middle toolbar-button active */

-.toolbar.menubar .linked .button:hover:active,

-.toolbar.menubar .linked .button:checked,

-.toolbar.menubar .linked .button:checked:focus,

-.toolbar.menubar .linked .button:checked:hover,

-.toolbar.menubar .linked .button:checked:hover:active,

-.toolbar .button.raised.linked:hover:active,

-.toolbar .button.raised.linked:checked,

-.toolbar .button.raised.linked:checked:focus,

-.toolbar .button.raised.linked:checked:hover,

-.toolbar .button.raised.linked:checked:hover:active,

-.toolbar .raised.linked .button:hover:active,

-.toolbar .raised.linked .button:checked,

-.toolbar .raised.linked .button:checked:focus,

-.toolbar .raised.linked .button:checked:hover,

-.toolbar .raised.linked .button:checked:hover:active,

-.primary-toolbar .linked .button:hover:active,

-.primary-toolbar .linked .button:checked,

-.primary-toolbar .linked .button:checked:focus,

-.primary-toolbar .linked .button:checked:hover,

-.primary-toolbar .linked .button:checked:hover:active {

+toolbar menubar .linked button:hover:active,

+toolbar menubar .linked button:checked,

+toolbar menubar .linked button:checked:focus,

+toolbar menubar .linked button:checked:hover,

+toolbar menubar .linked button:checked:hover:active,

+toolbar button.raised.linked:hover:active,

+toolbar button.raised.linked:checked,

+toolbar button.raised.linked:checked:focus,

+toolbar button.raised.linked:checked:hover,

+toolbar button.raised.linked:checked:hover:active,

+toolbar .raised.linked button:hover:active,

+toolbar .raised.linked button:checked,

+toolbar .raised.linked button:checked:focus,

+toolbar .raised.linked button:checked:hover,

+toolbar .raised.linked button:checked:hover:active,

+toolbar.primary-toolbar .linked button:hover:active,

+toolbar.primary-toolbar .linked button:checked,

+toolbar.primary-toolbar .linked button:checked:focus,

+toolbar.primary-toolbar .linked button:checked:hover,

+toolbar.primary-toolbar .linked button:checked:hover:active {

     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);

 }

 

-/* Middle toolbar-button insensitive */

-.toolbar.menubar .linked .button:insensitive,

-.toolbar .button.raised.linked:insensitive,

-.toolbar .raised.linked .button:insensitive,

-.primary-toolbar .linked .button:insensitive,

-.primary-toolbar .linked .entry:insensitive {

+/* Middle toolbar-button disabled */

+toolbar menubar .linked button:disabled,

+toolbar button.raised.linked:disabled,

+toolbar .raised.linked button:disabled,

+toolbar.primary-toolbar .linked button:disabled,

+toolbar.primary-toolbar .linked entry:disabled {

      /* remove outer */

     border-color: alpha (#fff, 0.00);

     /* Remove right border */

@@ -1067,53 +1089,53 @@ GtkColorButton.button {
 }

 

 /* Leftmost toolbars-button */

-.toolbar.menubar .linked .button:first-child,

-.toolbar.menubar .linked .button:focus:first-child,

-.toolbar.menubar .linked .button:hover:first-child,

-.toolbar.menubar .linked .button:hover:active:first-child,

-.toolbar.menubar .linked .button:checked:first-child,

-.toolbar.menubar .linked .button:checked:focus:first-child,

-.toolbar.menubar .linked .button:checked:hover:first-child,

-.toolbar.menubar .linked .button:checked:hover:active:first-child,

-.toolbar.menubar .linked .button:insensitive:first-child,

-.toolbar .button.raised.linked:first-child,

-.toolbar .button.raised.linked:focus:first-child,

-.toolbar .button.raised.linked:hover:first-child,

-.toolbar .button.raised.linked:hover:active:first-child,

-.toolbar .button.raised.linked:checked:first-child,

-.toolbar .button.raised.linked:checked:focus:first-child,

-.toolbar .button.raised.linked:checked:hover:first-child,

-.toolbar .button.raised.linked:checked:hover:active:first-child,

-.toolbar .button.raised.linked:insensitive:first-child,

-.toolbar .raised.linked .button:first-child,

-.toolbar .raised.linked .button:focus:first-child,

-.toolbar .raised.linked .button:hover:first-child,

-.toolbar .raised.linked .button:hover:active:first-child,

-.toolbar .raised.linked .button:checked:first-child,

-.toolbar .raised.linked .button:checked:focus:first-child,

-.toolbar .raised.linked .button:checked:hover:first-child,

-.toolbar .raised.linked .button:checked:hover:active:first-child,

-.toolbar .raised.linked .button:insensitive:first-child,

-.primary-toolbar .linked .entry:first-child,

-.primary-toolbar .linked .button:first-child,

-.primary-toolbar .linked .button:focus:first-child,

-.primary-toolbar .linked .button:hover:first-child,

-.primary-toolbar .linked .button:hover:active:first-child,

-.primary-toolbar .linked .button:checked:first-child,

-.primary-toolbar .linked .button:checked:focus:first-child,

-.primary-toolbar .linked .button:checked:hover:first-child,

-.primary-toolbar .linked .button:checked:hover:active:first-child,

-.primary-toolbar .linked .button:insensitive:first-child,

-.primary-toolbar .linked .entry:insensitive:first-child {

+toolbar menubar .linked button:first-child,

+toolbar menubar .linked button:focus:first-child,

+toolbar menubar .linked button:hover:first-child,

+toolbar menubar .linked button:hover:active:first-child,

+toolbar menubar .linked button:checked:first-child,

+toolbar menubar .linked button:checked:focus:first-child,

+toolbar menubar .linked button:checked:hover:first-child,

+toolbar menubar .linked button:checked:hover:active:first-child,

+toolbar menubar .linked button:disabled:first-child,

+toolbar button.raised.linked:first-child,

+toolbar button.raised.linked:focus:first-child,

+toolbar button.raised.linked:hover:first-child,

+toolbar button.raised.linked:hover:active:first-child,

+toolbar button.raised.linked:checked:first-child,

+toolbar button.raised.linked:checked:focus:first-child,

+toolbar button.raised.linked:checked:hover:first-child,

+toolbar button.raised.linked:checked:hover:active:first-child,

+toolbar button.raised.linked:disabled:first-child,

+toolbar .raised.linked button:first-child,

+toolbar .raised.linked button:focus:first-child,

+toolbar .raised.linked button:hover:first-child,

+toolbar .raised.linked button:hover:active:first-child,

+toolbar .raised.linked button:checked:first-child,

+toolbar .raised.linked button:checked:focus:first-child,

+toolbar .raised.linked button:checked:hover:first-child,

+toolbar .raised.linked button:checked:hover:active:first-child,

+toolbar .raised.linked button:disabled:first-child,

+toolbar.primary-toolbar .linked entry:first-child,

+toolbar.primary-toolbar .linked button:first-child,

+toolbar.primary-toolbar .linked button:focus:first-child,

+toolbar.primary-toolbar .linked button:hover:first-child,

+toolbar.primary-toolbar .linked button:hover:active:first-child,

+toolbar.primary-toolbar .linked button:checked:first-child,

+toolbar.primary-toolbar .linked button:checked:focus:first-child,

+toolbar.primary-toolbar .linked button:checked:hover:first-child,

+toolbar.primary-toolbar .linked button:checked:hover:active:first-child,

+toolbar.primary-toolbar .linked button:disabled:first-child,

+toolbar.primary-toolbar .linked entry:disabled:first-child {

     padding: 2px 4px 4px 2px;

     border-radius: 6px 0px 0px 6px;

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

 }

 

 /* Leftmost toolbars-button hover */

-.toolbar.menubar .linked .button:hover:first-child,

-.toolbar .raised.linked .button:hover:first-child,

-.primary-toolbar .linked .button:hover:first-child {

+toolbar menubar .linked button:hover:first-child,

+toolbar .raised.linked button:hover:first-child,

+toolbar.primary-toolbar .linked button:hover:first-child {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -1125,38 +1147,38 @@ GtkColorButton.button {
 }

 

 /* Leftmost toolbars-button active */

-.toolbar.menubar .linked .button:hover:active:first-child,

-.toolbar.menubar .linked .button:checked:first-child,

-.toolbar.menubar .linked .button:checked:focus:first-child,

-.toolbar.menubar .linked .button:checked:hover:first-child,

-.toolbar.menubar .linked .button:checked:hover:active:first-child,

-.toolbar .button.raised.linked:hover:active:first-child,

-.toolbar .button.raised.linked:checked:first-child,

-.toolbar .button.raised.linked:checked:focus:first-child,

-.toolbar .button.raised.linked:checked:hover:first-child,

-.toolbar .button.raised.linked:checked:hover:active:first-child,

-.toolbar .raised.linked .button:hover:active:first-child,

-.toolbar .raised.linked .button:checked:first-child,

-.toolbar .raised.linked .button:checked:focus:first-child,

-.toolbar .raised.linked .button:checked:hover:first-child,

-.toolbar .raised.linked .button:checked:hover:active:first-child,

-.primary-toolbar .linked .button:hover:active:first-child,

-.primary-toolbar .linked .button:checked:first-child,

-.primary-toolbar .linked .button:checked:focus:first-child,

-.primary-toolbar .linked .button:checked:hover:first-child,

-.primary-toolbar .linked .button:checked:hover:active:first-child {

+toolbar menubar .linked button:hover:active:first-child,

+toolbar menubar .linked button:checked:first-child,

+toolbar menubar .linked button:checked:focus:first-child,

+toolbar menubar .linked button:checked:hover:first-child,

+toolbar menubar .linked button:checked:hover:active:first-child,

+toolbar button.raised.linked:hover:active:first-child,

+toolbar button.raised.linked:checked:first-child,

+toolbar button.raised.linked:checked:focus:first-child,

+toolbar button.raised.linked:checked:hover:first-child,

+toolbar button.raised.linked:checked:hover:active:first-child,

+toolbar .raised.linked button:hover:active:first-child,

+toolbar .raised.linked button:checked:first-child,

+toolbar .raised.linked button:checked:focus:first-child,

+toolbar .raised.linked button:checked:hover:first-child,

+toolbar .raised.linked button:checked:hover:active:first-child,

+toolbar.primary-toolbar .linked button:hover:active:first-child,

+toolbar.primary-toolbar .linked button:checked:first-child,

+toolbar.primary-toolbar .linked button:checked:focus:first-child,

+toolbar.primary-toolbar .linked button:checked:hover:first-child,

+toolbar.primary-toolbar .linked button:checked:hover:active:first-child {

     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);

 }

 

-/* Leftmost toolbars-button insensitive */

-.toolbar.menubar .linked .button:insensitive:first-child,

-.toolbar .button.raised.linked:insensitive:first-child,

-.toolbar .raised.linked .button:insensitive:first-child,

-.primary-toolbar .linked .button:insensitive:first-child,

-.primary-toolbar .linked .entry:insensitive:first-child {

+/* Leftmost toolbars-button disabled */

+toolbar menubar .linked button:disabled:first-child,

+toolbar button.raised.linked:disabled:first-child,

+toolbar .raised.linked button:disabled:first-child,

+toolbar.primary-toolbar .linked button:disabled:first-child,

+toolbar.primary-toolbar .linked entry:disabled:first-child {

      /* remove outer */

     border-color: alpha (#fff, 0.00);

     /* Remove right border */

@@ -1166,53 +1188,53 @@ GtkColorButton.button {
 }

 

 /* Rightmost toolbar-button */

-.toolbar.menubar .linked .button:last-child,

-.toolbar.menubar .linked .button:focus:last-child,

-.toolbar.menubar .linked .button:hover:last-child,

-.toolbar.menubar .linked .button:hover:active:last-child,

-.toolbar.menubar .linked .button:checked:last-child,

-.toolbar.menubar .linked .button:checked:focus:last-child,

-.toolbar.menubar .linked .button:checked:hover:last-child,

-.toolbar.menubar .linked .button:checked:hover:active:last-child,

-.toolbar.menubar .linked .button:insensitive:last-child,

-.toolbar .button.raised.linked:last-child,

-.toolbar .button.raised.linked:focus:last-child,

-.toolbar .button.raised.linked:hover:last-child,

-.toolbar .button.raised.linked:hover:active:last-child,

-.toolbar .button.raised.linked:checked:last-child,

-.toolbar .button.raised.linked:checked:focus:last-child,

-.toolbar .button.raised.linked:checked:hover:last-child,

-.toolbar .button.raised.linked:checked:hover:active:last-child,

-.toolbar .button.raised.linked:insensitive:last-child,

-.toolbar .raised.linked .button:last-child,

-.toolbar .raised.linked .button:focus:last-child,

-.toolbar .raised.linked .button:hover:last-child,

-.toolbar .raised.linked .button:hover:active:last-child,

-.toolbar .raised.linked .button:checked:last-child,

-.toolbar .raised.linked .button:checked:focus:last-child,

-.toolbar .raised.linked .button:checked:hover:last-child,

-.toolbar .raised.linked .button:checked:hover:active:last-child,

-.toolbar .raised.linked .button:insensitive:last-child,

-.primary-toolbar .linked .entry:last-child,

-.primary-toolbar .linked .button:last-child,

-.primary-toolbar .linked .button:focus:last-child,

-.primary-toolbar .linked .button:hover:last-child,

-.primary-toolbar .linked .button:hover:active:last-child,

-.primary-toolbar .linked .button:checked:last-child,

-.primary-toolbar .linked .button:checked:focus:last-child,

-.primary-toolbar .linked .button:checked:hover:last-child,

-.primary-toolbar .linked .button:checked:hover:active:last-child,

-.primary-toolbar .linked .button:insensitive:last-child,

-.primary-toolbar .linked .entry:insensitive:last-child {

+toolbar menubar .linked button:last-child,

+toolbar menubar .linked button:focus:last-child,

+toolbar menubar .linked button:hover:last-child,

+toolbar menubar .linked button:hover:active:last-child,

+toolbar menubar .linked button:checked:last-child,

+toolbar menubar .linked button:checked:focus:last-child,

+toolbar menubar .linked button:checked:hover:last-child,

+toolbar menubar .linked button:checked:hover:active:last-child,

+toolbar menubar .linked button:disabled:last-child,

+toolbar button.raised.linked:last-child,

+toolbar button.raised.linked:focus:last-child,

+toolbar button.raised.linked:hover:last-child,

+toolbar button.raised.linked:hover:active:last-child,

+toolbar button.raised.linked:checked:last-child,

+toolbar button.raised.linked:checked:focus:last-child,

+toolbar button.raised.linked:checked:hover:last-child,

+toolbar button.raised.linked:checked:hover:active:last-child,

+toolbar button.raised.linked:disabled:last-child,

+toolbar .raised.linked button:last-child,

+toolbar .raised.linked button:focus:last-child,

+toolbar .raised.linked button:hover:last-child,

+toolbar .raised.linked button:hover:active:last-child,

+toolbar .raised.linked button:checked:last-child,

+toolbar .raised.linked button:checked:focus:last-child,

+toolbar .raised.linked button:checked:hover:last-child,

+toolbar .raised.linked button:checked:hover:active:last-child,

+toolbar .raised.linked button:disabled:last-child,

+toolbar.primary-toolbar .linked entry:last-child,

+toolbar.primary-toolbar .linked button:last-child,

+toolbar.primary-toolbar .linked button:focus:last-child,

+toolbar.primary-toolbar .linked button:hover:last-child,

+toolbar.primary-toolbar .linked button:hover:active:last-child,

+toolbar.primary-toolbar .linked button:checked:last-child,

+toolbar.primary-toolbar .linked button:checked:focus:last-child,

+toolbar.primary-toolbar .linked button:checked:hover:last-child,

+toolbar.primary-toolbar .linked button:checked:hover:active:last-child,

+toolbar.primary-toolbar .linked button:disabled:last-child,

+toolbar.primary-toolbar .linked entry:disabled:last-child {

     padding: 2px 4px 4px 2px;

     border-radius: 0px 6px 6px  0px;

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

 }

 

 /* Rightmost toolbars-button hover */

-.toolbar.menubar .linked .button:hover:last-child,

-.toolbar .raised.linked .button:hover:last-child,

-.primary-toolbar .linked .button:hover:last-child {

+toolbar menubar .linked button:hover:last-child,

+toolbar .raised.linked button:hover:last-child,

+toolbar.primary-toolbar .linked button:hover:last-child {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -1224,38 +1246,38 @@ GtkColorButton.button {
 }

 

 /* Rightmost toolbar-button active */

-.toolbar.menubar .linked .button:hover:active:last-child,

-.toolbar.menubar .linked .button:checked:last-child,

-.toolbar.menubar .linked .button:checked:focus:last-child,

-.toolbar.menubar .linked .button:checked:hover:last-child,

-.toolbar.menubar .linked .button:checked:hover:active:last-child,

-.toolbar .button.raised.linked:hover:active:last-child,

-.toolbar .button.raised.linked:checked:last-child,

-.toolbar .button.raised.linked:checked:focus:last-child,

-.toolbar .button.raised.linked:checked:hover:last-child,

-.toolbar .button.raised.linked:checked:hover:active:last-child,

-.toolbar .raised.linked .button:hover:active:last-child,

-.toolbar .raised.linked .button:checked:last-child,

-.toolbar .raised.linked .button:checked:focus:last-child,

-.toolbar .raised.linked .button:checked:hover:last-child,

-.toolbar .raised.linked .button:checked:hover:active:last-child,

-.primary-toolbar .linked .button:hover:active:last-child,

-.primary-toolbar .linked .button:checked:last-child,

-.primary-toolbar .linked .button:checked:focus:last-child,

-.primary-toolbar .linked .button:checked:hover:last-child,

-.primary-toolbar .linked .button:checked:hover:active:last-child {

+toolbar menubar .linked button:hover:active:last-child,

+toolbar menubar .linked button:checked:last-child,

+toolbar menubar .linked button:checked:focus:last-child,

+toolbar menubar .linked button:checked:hover:last-child,

+toolbar menubar .linked button:checked:hover:active:last-child,

+toolbar button.raised.linked:hover:active:last-child,

+toolbar button.raised.linked:checked:last-child,

+toolbar button.raised.linked:checked:focus:last-child,

+toolbar button.raised.linked:checked:hover:last-child,

+toolbar button.raised.linked:checked:hover:active:last-child,

+toolbar .raised.linked button:hover:active:last-child,

+toolbar .raised.linked button:checked:last-child,

+toolbar .raised.linked button:checked:focus:last-child,

+toolbar .raised.linked button:checked:hover:last-child,

+toolbar .raised.linked button:checked:hover:active:last-child,

+toolbar.primary-toolbar .linked button:hover:active:last-child,

+toolbar.primary-toolbar .linked button:checked:last-child,

+toolbar.primary-toolbar .linked button:checked:focus:last-child,

+toolbar.primary-toolbar .linked button:checked:hover:last-child,

+toolbar.primary-toolbar .linked button:checked:hover:active:last-child {

     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);

 }

 

-/* Rightmost toolbar-button insensitive */

-.toolbar.menubar .linked .button:insensitive:last-child,

-.toolbar .button.raised.linked:insensitive:last-child,

-.toolbar .raised.linked .button:insensitive:last-child,

-.primary-toolbar .linked .button:insensitive:last-child,

-.primary-toolbar .linked .entry:insensitive:last-child {

+/* Rightmost toolbar-button disabled */

+toolbar menubar .linked button:disabled:last-child,

+toolbar button.raised.linked:disabled:last-child,

+toolbar .raised.linked button:disabled:last-child,

+toolbar.primary-toolbar .linked button:disabled:last-child,

+toolbar.primary-toolbar .linked entry:disabled:last-child {

     border-color: alpha (#fff, 0.00); /* Quita outer */

     box-shadow: inset  0px  1px shade(@theme_button_border_dark, 1.10),

                 inset  1px  0px shade(@theme_button_border_dark, 1.05),

@@ -1264,49 +1286,49 @@ GtkColorButton.button {
 }

 

 /* Linked single toolbar-button */

-.toolbar.menubar .linked .button:only-child,

-.toolbar.menubar .linked .button:hover:only-child,

-.toolbar.menubar .linked .button:hover:active:only-child,

-.toolbar.menubar .linked .button:checked:only-child,

-.toolbar.menubar .linked .button:checked:focus:only-child,

-.toolbar.menubar .linked .button:checked:hover:only-child,

-.toolbar.menubar .linked .button:checked:hover:active:only-child,

-.toolbar.menubar .linked .button:insensitive:only-child,

-.toolbar .button.raised.linked:only-child,

-.toolbar .button.raised.linked:hover:only-child,

-.toolbar .button.raised.linked:hover:active:only-child,

-.toolbar .button.raised.linked:checked:only-child,

-.toolbar .button.raised.linked:checked:focus:only-child,

-.toolbar .button.raised.linked:checked:hover:only-child,

-.toolbar .button.raised.linked:checked:hover:active:only-child,

-.toolbar .button.raised.linked:insensitive:only-child,

-.toolbar .raised.linked .button:only-child,

-.toolbar .raised.linked .button:hover:only-child,

-.toolbar .raised.linked .button:hover:active:only-child,

-.toolbar .raised.linked .button:checked:only-child,

-.toolbar .raised.linked .button:checked:focus:only-child,

-.toolbar .raised.linked .button:checked:hover:only-child,

-.toolbar .raised.linked .button:checked:hover:active:only-child,

-.toolbar .raised.linked .button:insensitive:only-child,

-.primary-toolbar .linked .entry:only-child,

-.primary-toolbar .linked .button:only-child,

-.primary-toolbar .linked .button:hover:only-child,

-.primary-toolbar .linked .button:hover:active:only-child,

-.primary-toolbar .linked .button:checked:only-child,

-.primary-toolbar .linked .button:checked:focus:only-child,

-.primary-toolbar .linked .button:checked:hover:only-child,

-.primary-toolbar .linked .button:checked:hover:active:only-child,

-.primary-toolbar .linked .entry:insensitive:only-child,

-.primary-toolbar .linked .button:insensitive:only-child {

+toolbar menubar .linked button:only-child,

+toolbar menubar .linked button:hover:only-child,

+toolbar menubar .linked button:hover:active:only-child,

+toolbar menubar .linked button:checked:only-child,

+toolbar menubar .linked button:checked:focus:only-child,

+toolbar menubar .linked button:checked:hover:only-child,

+toolbar menubar .linked button:checked:hover:active:only-child,

+toolbar menubar .linked button:disabled:only-child,

+toolbar button.raised.linked:only-child,

+toolbar button.raised.linked:hover:only-child,

+toolbar button.raised.linked:hover:active:only-child,

+toolbar button.raised.linked:checked:only-child,

+toolbar button.raised.linked:checked:focus:only-child,

+toolbar button.raised.linked:checked:hover:only-child,

+toolbar button.raised.linked:checked:hover:active:only-child,

+toolbar button.raised.linked:disabled:only-child,

+toolbar .raised.linked button:only-child,

+toolbar .raised.linked button:hover:only-child,

+toolbar .raised.linked button:hover:active:only-child,

+toolbar .raised.linked button:checked:only-child,

+toolbar .raised.linked button:checked:focus:only-child,

+toolbar .raised.linked button:checked:hover:only-child,

+toolbar .raised.linked button:checked:hover:active:only-child,

+toolbar .raised.linked button:disabled:only-child,

+toolbar.primary-toolbar .linked entry:only-child,

+toolbar.primary-toolbar .linked button:only-child,

+toolbar.primary-toolbar .linked button:hover:only-child,

+toolbar.primary-toolbar .linked button:hover:active:only-child,

+toolbar.primary-toolbar .linked button:checked:only-child,

+toolbar.primary-toolbar .linked button:checked:focus:only-child,

+toolbar.primary-toolbar .linked button:checked:hover:only-child,

+toolbar.primary-toolbar .linked button:checked:hover:active:only-child,

+toolbar.primary-toolbar .linked entry:disabled:only-child,

+toolbar.primary-toolbar .linked button:disabled:only-child {

     border-width: 1px;

     border-radius: 6px;

     padding: 2px 4px 4px 2px;

 }

 

 /* Linked single toolbar-button hover */

-.toolbar .raised.linked .button:hover:only-child,

-.toolbar.menubar .linked .button:hover:only-child,

-.primary-toolbar .linked .button:hover:only-child {

+toolbar .raised.linked button:hover:only-child,

+toolbar menubar .linked button:hover:only-child,

+toolbar.primary-toolbar .linked button:hover:only-child {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -1318,38 +1340,38 @@ GtkColorButton.button {
 }

 

 /* Linked single toolbar-button active */

-.toolbar.menubar .linked .button:hover:active:only-child,

-.toolbar.menubar .linked .button:checked:only-child,

-.toolbar.menubar .linked .button:checked:focus:only-child,

-.toolbar.menubar .linked .button:checked:hover:only-child,

-.toolbar.menubar .linked .button:checked:hover:active:only-child,

-.toolbar .button.raised.linked:hover:active:only-child,

-.toolbar .button.raised.linked:checked:only-child,

-.toolbar .button.raised.linked:checked:focus:only-child,

-.toolbar .button.raised.linked:checked:hover:only-child,

-.toolbar .button.raised.linked:checked:hover:active:only-child,

-.toolbar .raised.linked .button:hover:active:only-child,

-.toolbar .raised.linked .button:checked:only-child,

-.toolbar .raised.linked .button:checked:focus:only-child,

-.toolbar .raised.linked .button:checked:hover:only-child,

-.toolbar .raised.linked .button:checked:hover:active:only-child,

-.primary-toolbar .linked .button:hover:active:only-child,

-.primary-toolbar .linked .button:checked:only-child,

-.primary-toolbar .linked .button:checked:focus:only-child,

-.primary-toolbar .linked .button:checked:hover:only-child,

-.primary-toolbar .linked .button:checked:hover:active:only-child {

+toolbar menubar .linked button:hover:active:only-child,

+toolbar menubar .linked button:checked:only-child,

+toolbar menubar .linked button:checked:focus:only-child,

+toolbar menubar .linked button:checked:hover:only-child,

+toolbar menubar .linked button:checked:hover:active:only-child,

+toolbar button.raised.linked:hover:active:only-child,

+toolbar button.raised.linked:checked:only-child,

+toolbar button.raised.linked:checked:focus:only-child,

+toolbar button.raised.linked:checked:hover:only-child,

+toolbar button.raised.linked:checked:hover:active:only-child,

+toolbar .raised.linked button:hover:active:only-child,

+toolbar .raised.linked button:checked:only-child,

+toolbar .raised.linked button:checked:focus:only-child,

+toolbar .raised.linked button:checked:hover:only-child,

+toolbar .raised.linked button:checked:hover:active:only-child,

+toolbar.primary-toolbar .linked button:hover:active:only-child,

+toolbar.primary-toolbar .linked button:checked:only-child,

+toolbar.primary-toolbar .linked button:checked:focus:only-child,

+toolbar.primary-toolbar .linked button:checked:hover:only-child,

+toolbar.primary-toolbar .linked button:checked:hover:active:only-child {

     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);

 }

 

-/* Linked single toolbar-button insensitive */

-.toolbar.menubar .linked .button:insensitive:only-child,

-.toolbar .button.raised.linked:insensitive:only-child,

-.toolbar .raised.linked .button:insensitive:only-child,

-.primary-toolbar .linked .entry:insensitive:only-child,

-.primary-toolbar .linked .button:insensitive:only-child {

+/* Linked single toolbar-button disabled */

+toolbar menubar .linked button:disabled:only-child,

+toolbar button.raised.linked:disabled:only-child,

+toolbar .raised.linked button:disabled:only-child,

+toolbar.primary-toolbar .linked entry:disabled:only-child,

+toolbar.primary-toolbar .linked button:disabled:only-child {

     border-color: alpha (#fff, 0.00); /* Quita outer */

     box-shadow: inset  0px  1px shade(@theme_button_border_dark, 1.10),

                 inset  1px  0px shade(@theme_button_border_dark, 1.05),

@@ -1358,104 +1380,96 @@ GtkColorButton.button {
 }

 

 /* nth-child for linked areas */

-.toolbar .raised.linked.button,

-.toolbar .raised.linked.button:hover:active,

-.toolbar .raised.linked.button:checked,

-.toolbar .raised.linked.button:checked:hover,

-.toolbar .raised.linked.button:checked:hover:active,

-.toolbar .raised.linked .button,

-.toolbar .raised.linked .button:hover:active,

-.toolbar .raised.linked .button:checked,

-.toolbar .raised.linked .button:checked:hover,

-.toolbar .raised.linked .button:checked:hover:active {

-}

-

-.toolbar .raised.linked.button:nth-child(first) ,

-.toolbar .raised.linked.button:hover:active:nth-child(first),

-.toolbar .raised.linked.button:checked:nth-child(first),

-.toolbar .raised.linked.button:checked:hover:nth-child(first),

-.toolbar .raised.linked:nth-child(first) .button,

-.toolbar .raised.linked:nth-child(first) .button:hover:active,

-.toolbar .raised.linked:nth-child(first) .button:checked,

-.toolbar .raised.linked:nth-child(first) .button:checked:hover {

-}

-

-.toolbar .raised.linked.button:nth-child(last),

-.toolbar .raised.linked.button:hover:active:nth-child(last),

-.toolbar .raised.linked.button:checked:nth-child(last),

-.toolbar .raised.linked.button:checked:hover:nth-child(last),

-.toolbar .raised.linked:nth-child(last) .button,

-.toolbar .raised.linked:nth-child(last) .button:hover:active,

-.toolbar .raised.linked:nth-child(last) .button:checked,

-.toolbar .raised.linked:nth-child(last) .button:checked:hover {

+toolbar .raised.linked.button,

+toolbar .raised.linked.button:hover:active,

+toolbar .raised.linked.button:checked,

+toolbar .raised.linked.button:checked:hover,

+toolbar .raised.linked.button:checked:hover:active,

+toolbar .raised.linked button,

+toolbar .raised.linked button:hover:active,

+toolbar .raised.linked button:checked,

+toolbar .raised.linked button:checked:hover,

+toolbar .raised.linked button:checked:hover:active {

+}

+

+toolbar .raised.linked.button:nth-child(first) ,

+toolbar .raised.linked.button:hover:active:nth-child(first),

+toolbar .raised.linked.button:checked:nth-child(first),

+toolbar .raised.linked.button:checked:hover:nth-child(first),

+toolbar .raised.linked:nth-child(first) button,

+toolbar .raised.linked:nth-child(first) button:hover:active,

+toolbar .raised.linked:nth-child(first) button:checked,

+toolbar .raised.linked:nth-child(first) button:checked:hover {

+}

+

+toolbar .raised.linked.button:nth-child(last),

+toolbar .raised.linked.button:hover:active:nth-child(last),

+toolbar .raised.linked.button:checked:nth-child(last),

+toolbar .raised.linked.button:checked:hover:nth-child(last),

+toolbar .raised.linked:nth-child(last) button,

+toolbar .raised.linked:nth-child(last) button:hover:active,

+toolbar .raised.linked:nth-child(last) button:checked,

+toolbar .raised.linked:nth-child(last) button:checked:hover {

 }

 

 /***************************/

 /* Linked standard buttons */

 /***************************/

 

-.linked .entry,

-.linked > GtkComboBox > .button,

-.linked > GtkComboBox > .button:focus

-.linked > GtkComboBox > .button:checked,

-.linked > GtkComboBox > .button:hover,

-.linked > GtkComboBox > .button:focus:hover,

-.linked > GtkComboBox > .button:insensitive,

-.linked .button,

-.linked .button:focus,

-.linked .button:checked,

-.linked .button:hover,

-.linked .button:focus:hover,

-.linked .button:hover:active,

-.linked .button:checked:hover,

-.linked .button:checked:hover:active,

-.linked .button:insensitive {

+.linked entry,

+.linked > combobox > button.combo,

+.linked > combobox > button.combo:focus

+.linked > combobox > button.combo:checked,

+.linked > combobox > button.combo:hover,

+.linked > combobox > button.combo:focus:hover,

+.linked > combobox > button.combo:disabled,

+.linked button,

+.linked button:focus,

+.linked button:checked,

+.linked button:hover,

+.linked button:focus:hover,

+.linked button:hover:active,

+.linked button:checked:hover,

+.linked button:checked:hover:active,

+.linked button:disabled {

     background-color: transparent;

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

+    border-width: 1px;

     border-radius: 6px;

     color: @theme_fg_color;

     text-shadow: none;

     box-shadow: none;

 }

 

-.linked .entry {

-    padding: 5px 4px;

-}

-

-.linked > GtkComboBox > .button,

-.linked > GtkComboBox > .button:focus,

-.linked > GtkComboBox > .button:hover,

-.linked > GtkComboBox > .button:checked,

-.linked > GtkComboBox > .button:focus:hover,

-.linked > GtkComboBox > .button:insensitive {

+.linked entry {

     padding: 5px 6px;

 }

 

-.linked .button,

-.linked .button:focus,

-.linked .button:hover,

-.linked .button:checked,

-.linked .button:focus:active,

-.linked .button:focus:hover:active,

-.linked .button:hover:active,

-.linked .button:checked:hover,

-.linked .button:checked:hover:active,

-.linked .button:insensitive {

+.linked button,

+.linked button:focus,

+.linked button:hover,

+.linked button:checked,

+.linked button:focus:active,

+.linked button:focus:hover:active,

+.linked button:hover:active,

+.linked button:checked:hover,

+.linked button:checked:hover:active,

+.linked button:disabled {

     padding: 4px;

 }

 

-.linked > GtkComboBox > .button:insensitive,

-.linked .button:insensitive {

+.linked > combobox > button.combo:disabled,

+.linked button:disabled {

+    background-image: none;

     background-color: @insensitive_bg_color;

     border-color: alpha (#000, 0.00);

     border-bottom-color: alpha (#000, 0.00);

     color: @insensitive_fg_color;

 }

 

-.linked > GtkComboBox > .button,

-.linked > GtkComboBox > .button:focus,

-.linked .button,

-.linked .button:focus {

+.linked > combobox > button.combo,

+.linked > combobox > button.combo:focus,

+.linked button,

+.linked button:focus {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (@button_gradient1),

@@ -1465,11 +1479,11 @@ GtkColorButton.button {
 

 }

 

-.linked > GtkComboBox > .button:hover,

-.linked > GtkComboBox > .button:focus:hover,

-.linked .button:hover,

-.linked .button:focus:hover,

-.linked .button:checked:hover {

+.linked > combobox > button.combo:hover,

+.linked > combobox > button.combo:focus:hover,

+.linked button:hover,

+.linked button:focus:hover,

+.linked button:checked:hover {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@button_gradient1, 1.03)),

@@ -1478,10 +1492,10 @@ GtkColorButton.button {
                                      to   (shade(@button_gradient4, 1.01)));

 }

 

-.linked > GtkComboBox > .button:checked,

-.linked > GtkComboBox > .button:checked:hover:active,

-.linked .button:checked,

-.linked .button:checked:hover:active {

+.linked > combobox > button.combo:checked,

+.linked > combobox > button.combo:checked:hover:active,

+.linked button:checked,

+.linked button:checked:hover:active {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade (@theme_bg_color, 1.20)),

@@ -1491,20 +1505,20 @@ GtkColorButton.button {
 }

 

 /* default button */

-.linked .button.default,

-.linked .button.default:focus,

-.linked .button.default:first-child,

-.linked .button.default:focus:first-child {

+.linked button.default,

+.linked button.default:focus,

+.linked button.default:first-child,

+.linked button.default:focus:first-child {

     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

                 inset  1px  0px shade(@selected_bg_color, 1.3),

                 inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),

                 inset  0px -1px shade(@selected_bg_color, 1.3);

 }

 

-.linked .button.default:last-child,

-.linked .button.default:focus:last-child,

-.linked .button.default:only-child,

-.linked .button.default:focus:only-child {

+.linked button.default:last-child,

+.linked button.default:focus:last-child,

+.linked button.default:only-child,

+.linked button.default:focus:only-child {

     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

                 inset  1px  0px shade(@selected_bg_color, 1.3),

                 inset -1px  0px shade(@selected_bg_color, 1.3),

@@ -1512,27 +1526,26 @@ GtkColorButton.button {
 }

 

 /* Middle button */

-.linked .entry,

-.linked > GtkComboBox > .button:last-child,

-.linked > GtkComboBox > .button:focus:last-child,

-.linked .button,

-.linked .button:focus {

+.linked entry,

+.linked button,

+.linked button:focus {

     box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

                 inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

                 inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),

                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

+    border-width: 1px;

     border-right-width: 0px;

     border-left-width: 0px;

     border-radius: 0;

 }

 

- /* Middle Button active */

-.linked > GtkComboBox > .button:checked:last-child,

-.linked > GtkComboBox > .button:checked:hover:active:last-child,

-.linked .button:focus:active,

-.linked .button:hover:active,

-.linked .button:checked,

-.linked .button:checked:hover:active {

+ /* Middle Button active/hover */

+.linked button:hover,

+.linked button:checked:hover,

+.linked button:focus:active,

+.linked button:hover:active,

+.linked button:checked,

+.linked button:checked:hover:active {

      box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

                  inset  1px  0px shade(@selected_bg_color, 1.3),

                  inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),

@@ -1542,23 +1555,8 @@ GtkColorButton.button {
      border-radius: 0;

 }

 

-/* Middle button hover */

-.linked > GtkComboBox > .button:hover:last-child,

-.linked > GtkComboBox > .button:focus:hover:last-child,

-.linked .button:hover,

-.linked .button:checked:hover {

-    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

-                inset  1px  0px shade(@selected_bg_color, 1.3),

-                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),

-                inset  0px -1px shade(@selected_bg_color, 1.3);

-    border-right-width: 0px;

-    border-left-width: 0px;

-    border-radius: 0;

-}

-

-/* Middle button insensitive */

-.linked > GtkComboBox > .button:insensitive:last-child,

-.linked .button:insensitive {

+/* Middle button disabled */

+.linked button:disabled {

     box-shadow: inset  0px  1px @insensitive_border_color,

                 inset  1px  0px @insensitive_border_color,

                 inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),

@@ -1569,39 +1567,25 @@ GtkColorButton.button {
 }

 

 /* Leftmost button */

-.linked .entry:first-child,

-.linked > GtkComboBox:first-child > .button:last-child,

-.linked > GtkComboBox:first-child > .button:focus:last-child,

-.linked .button:first-child,

-.linked .button:focus:first-child {

+.linked entry:first-child,

+.linked button:first-child,

+.linked button:focus:first-child {

     box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

                 inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

                 inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),

                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

     border-radius: 6px 0 0 6px;

+    border-width: 1px;

     border-right-width: 0;

 }

 

-/* Leftmost button active */

-.linked > GtkComboBox:first-child > .button:checked:first-child:last-child,

-.linked > GtkComboBox:first-child > .button:checked:hover:active:last-child,

-.linked .button:focus:active:first-child,

-.linked .button:hover:active:first-child,

-.linked .button:checked:first-child,

-.linked .button:checked:hover:active:first-child {

-    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

-                inset  1px  0px shade(@selected_bg_color, 1.3),

-                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),

-                inset  0px -1px shade(@selected_bg_color, 1.3);

-    border-radius: 6px 0 0 6px;

-    border-right-width: 0;

-}

-

-/* Leftmost button hover */

-.linked > GtkComboBox:first-child > .button:hover:last-child,

-.linked > GtkComboBox:first-child > .button:hover:focus:last-child,

-.linked .button:hover:first-child,

-.linked .button:checked:hover:first-child {

+/* Leftmost button active/hover */

+.linked button:hover:first-child,

+.linked button:checked:hover:first-child,

+.linked button:focus:active:first-child,

+.linked button:hover:active:first-child,

+.linked button:checked:first-child,

+.linked button:checked:hover:active:first-child {

     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

                 inset  1px  0px shade(@selected_bg_color, 1.3),

                 inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),

@@ -1610,9 +1594,8 @@ GtkColorButton.button {
     border-right-width: 0;

 }

 

-/* Leftmost button insensitive */

-.linked > GtkComboBox:first-child > .button:insensitive:last-child,

-.linked .button:insensitive:first-child {

+/* Leftmost button disabled */

+.linked button:disabled:first-child {

     box-shadow: inset  0px  1px @insensitive_border_color,

                 inset  1px  0px @insensitive_border_color,

                 inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),

@@ -1623,38 +1606,23 @@ GtkColorButton.button {
 

 /* Rightmost button */

 .linked .entry:last-child,

-.linked > GtkComboBox:last-child > .button:last-child,

-.linked > GtkComboBox:last-child > .button:focus:last-child,

-.linked .button:last-child,

-.linked .button:focus:last-child {

+.linked button:last-child,

+.linked button:focus:last-child {

      box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

                  inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

                  inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),

                  inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

     border-radius: 0 6px 6px 0;

-    border-left-width: 0;

-}

-

-/* Rightmost button active */

-.linked > GtkComboBox:last-child > .button:checked:last-child,

-.linked > GtkComboBox:last-child > .button:checked:hover:active:last-child,

-.linked .button:focus:active:last-child,

-.linked .button:hover:active:last-child,

-.linked .button:checked:last-child,

-.linked .button:checked:hover:active:last-child {

-    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

-                inset  1px  0px shade(@selected_bg_color, 1.3),

-                inset -1px  0px shade(@selected_bg_color, 1.3),

-                inset  0px -1px shade(@selected_bg_color, 1.3);

-    border-radius: 0 6px 6px 0;

-    border-left-width: 0;

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

 }

 

-/* Rightmost button hover */

-.linked > GtkComboBox:last-child > .button:hover:last-child,

-.linked > GtkComboBox:last-child > .button:hover:focus:last-child,

-.linked .button:hover:last-child,

-.linked .button:checked:hover:last-child {

+/* Rightmost button active/hover */

+.linked button:hover:last-child,

+.linked button:checked:hover:last-child,

+.linked button:focus:active:last-child,

+.linked button:hover:active:last-child,

+.linked button:checked:last-child,

+.linked button:checked:hover:active:last-child {

     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

                 inset  1px  0px shade(@selected_bg_color, 1.3),

                 inset -1px  0px shade(@selected_bg_color, 1.3),

@@ -1663,9 +1631,8 @@ GtkColorButton.button {
     border-left-width: 0;

 }

 

-/* Rightmost button insensitive */

-.linked > GtkComboBox:last-child > .button:insensitive:last-child,

-.linked .button:insensitive:last-child {

+/* Rightmost button disabled */

+.linked button.combo:disabled:last-child {

     box-shadow: inset  0px  1px @insensitive_border_color,

                 inset  1px  0px @insensitive_border_color,

                 inset -1px  0px @insensitive_border_color,

@@ -1674,24 +1641,20 @@ GtkColorButton.button {
     border-left-width: 0;

 }

 

-/* Linked single button */

-.linked .entry:only-child,

-.linked > GtkComboBox:only-child > .button:last-child,

-.linked > GtkComboBox:only-child > .button:focus:last-child,

-.linked .button:only-child,

-.linked .button:focus:only-child {

+/* Linked single button.combo */

+.linked entry:only-child,

+.linked button:only-child,

+.linked button:focus:only-child {

     border-radius: 6px;

+    border-width: 1px;

 }

 

-.linked > GtkComboBox:only-child > .button:hover:last-child,

-.linked > GtkComboBox:only-child > .button:checked:last-child,

-.linked > GtkComboBox:only-child > .button:focus:hover:last-child,

-.linked .button:hover:only-child,

-.linked .button:hover:active:only-child,

-.linked .button:focus:active:only-child,

-.linked .button:checked:only-child,

-.linked .button:checked:hover:only-child,

-.linked .button:checked:hover:active:only-child {

+.linked button:hover:only-child,

+.linked button:hover:active:only-child,

+.linked button:focus:active:only-child,

+.linked button:checked:only-child,

+.linked button:checked:hover:only-child,

+.linked button:checked:hover:active:only-child {

     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

                 inset  1px  0px shade(@selected_bg_color, 1.3),

                 inset -1px  0px shade(@selected_bg_color, 1.3),

@@ -1699,9 +1662,8 @@ GtkColorButton.button {
     border-radius: 6px;

 }

 

-/* Linked single button insensitive */

-.linked > GtkComboBox:only-child > .button:insensitive:last-child,

-.linked .button:insensitive:only-child {

+/* Linked single button disabled */

+.linked button:disabled:only-child {

     box-shadow: inset  0px  1px @insensitive_border_color,

                 inset  1px  0px @insensitive_border_color,

                 inset -1px  0px @insensitive_border_color,

@@ -1711,10 +1673,10 @@ GtkColorButton.button {
 

 /* vertical */

 /* Middle button */

-.vertical.linked > GtkComboBox > .button:last-child,

-.vertical.linked > GtkComboBox > .button:focus:last-child,

-.vertical.linked .button,

-.vertical.linked .button:focus {

+.vertical.linked > combobox > button.combo:last-child,

+.vertical.linked > combobox > button.combo:focus:last-child,

+.vertical.linked button,

+.vertical.linked button:focus {

     box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.90),

                 inset  1px  0px alpha(shade(@button_border, 0.94), 0.90),

                 inset -1px  0px alpha(shade(@button_border, 0.88), 0.90),

@@ -1723,16 +1685,16 @@ GtkColorButton.button {
     border-width: 0px 1px 1px 1px;

 }

 

-.vertical.linked > GtkComboBox > .button:hover:last-child,

-.vertical.linked > GtkComboBox > .button:focus:hover:last-child,

-.vertical.linked > GtkComboBox > .button:checked:last-child,

-.vertical.linked .button:hover,

-.vertical.linked .button:checked,

-.vertical.linked .button:focus:hover,

-.vertical.linked .button:focus:hover:active,

-.vertical.linked .button:hover:active,

-.vertical.linked .button:checked:active,

-.vertical.linked .button:checked:hover:active {

+.vertical.linked > combobox > button.combo:hover:last-child,

+.vertical.linked > combobox > button.combo:focus:hover:last-child,

+.vertical.linked > combobox > button.combo:checked:last-child,

+.vertical.linked button:hover,

+.vertical.linked button:checked,

+.vertical.linked button:focus:hover,

+.vertical.linked button:focus:hover:active,

+.vertical.linked button:hover:active,

+.vertical.linked button:checked:active,

+.vertical.linked button:checked:hover:active {

     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

                 inset  1px  0px shade(@selected_bg_color, 1.3),

                 inset -1px  0px shade(@selected_bg_color, 1.3),

@@ -1741,8 +1703,8 @@ GtkColorButton.button {
     border-width: 0px 1px 1px 1px;

 }

 

-.vertical.linked > GtkComboBox > .button:insensitive:last-child,

-.vertical.linked .button:insensitive {

+.vertical.linked > combobox > button.combo:disabled:last-child,

+.vertical.linked button:disabled {

     box-shadow: inset  0px  1px @insensitive_border_color,

                 inset  1px  0px @insensitive_border_color,

                 inset -1px  0px @insensitive_border_color,

@@ -1753,10 +1715,10 @@ GtkColorButton.button {
 

 /* Top button */

 

-.vertical.linked > GtkComboBox:first-child > .button:last-child,

-.vertical.linked > GtkComboBox:first-child > .button:focus:last-child,

-.vertical.linked .button:first-child,

-.vertical.linked .button:focus:first-child {

+.vertical.linked > combobox:first-child > button.combo:last-child,

+.vertical.linked > combobox:first-child > button.combo:focus:last-child,

+.vertical.linked button:first-child,

+.vertical.linked button:focus:first-child {

     box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

                 inset  1px  0px alpha(shade(@button_border, 0.94), 0.90),

                 inset  -1px 0px alpha(shade(@button_border, 0.88), 0.90);

@@ -1764,16 +1726,16 @@ GtkColorButton.button {
     border-width: 1px 1px 1px 1px;

 }

 

-.vertical.linked > GtkComboBox:first-child > .button:hover:last-child,

-.vertical.linked > GtkComboBox:first-child > .button:focus:hover:last-child,

-.vertical.linked > GtkComboBox:first-child > .button:checked:last-child,

-.vertical.linked .button:hover:first-child,

-.vertical.linked .button:checked:first-child,

-.vertical.linked .button:focus:hover:first-child,

-.vertical.linked .button:focus:hover:active:first-child,

-.vertical.linked .button:hover:active:first-child,

-.vertical.linked .button:checked:active:first-child,

-.vertical.linked .button:checked:hover:active:first-child {

+.vertical.linked > combobox:first-child > button.combo:hover:last-child,

+.vertical.linked > combobox:first-child > button.combo:focus:hover:last-child,

+.vertical.linked > combobox:first-child > button.combo:checked:last-child,

+.vertical.linked button:hover:first-child,

+.vertical.linked button:checked:first-child,

+.vertical.linked button:focus:hover:first-child,

+.vertical.linked button:focus:hover:active:first-child,

+.vertical.linked button:hover:active:first-child,

+.vertical.linked button:checked:active:first-child,

+.vertical.linked button:checked:hover:active:first-child {

     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

                 inset  1px  0px shade(@selected_bg_color, 1.3),

                 inset  -1px 0px shade(@selected_bg_color, 1.3);

@@ -1781,8 +1743,8 @@ GtkColorButton.button {
     border-width: 1px 1px 1px 1px;

 }

 

-.vertical.linked > GtkComboBox:first-child > .button:insensitive:last-child,

-.vertical.linked .button:insensitive:first-child {

+.vertical.linked > combobox:first-child > button.combo:disabled:last-child,

+.vertical.linked button:disabled:first-child {

     box-shadow: inset  0px  1px @insensitive_border_color,

                 inset  1px  0px @insensitive_border_color,

                 inset -1px  0px @insensitive_border_color;

@@ -1792,10 +1754,10 @@ GtkColorButton.button {
 

 /* Bottom button */

 

-.vertical.linked > GtkComboBox:last-child > .button:last-child,

-.vertical.linked > GtkComboBox:last-child > .button:focus:last-child,

-.vertical.linked .button:last-child,

-.vertical.linked .button:focus:last-child {

+.vertical.linked > combobox:last-child > button.combo:last-child,

+.vertical.linked > combobox:last-child > button.combo:focus:last-child,

+.vertical.linked button:last-child,

+.vertical.linked button:focus:last-child {

      box-shadow: inset  1px  0px alpha(shade(@button_border, 0.94), 0.90),

                  inset -1px  0px alpha(shade(@button_border, 0.94), 0.90),

                  inset  0px -1px alpha(shade(@button_border, 0.88), 0.70);

@@ -1803,16 +1765,16 @@ GtkColorButton.button {
     border-width: 0px 1px 1px 1px;

 }

 

-.vertical.linked > GtkComboBox:last-child > .button:hover:last-child,

-.vertical.linked > GtkComboBox:last-child > .button:focus:hover:last-child,

-.vertical.linked > GtkComboBox:last-child > .button:checked:last-child,

-.vertical.linked .button:hover:last-child,

-.vertical.linked .button:checked:last-child,

-.vertical.linked .button:focus:hover:last-child,

-.vertical.linked .button:focus:hover:active:last-child,

-.vertical.linked .button:hover:active:last-child,

-.vertical.linked .button:checked:active:last-child,

-.vertical.linked .button:checked:hover:active:last-child {

+.vertical.linked > combobox:last-child > button.combo:hover:last-child,

+.vertical.linked > combobox:last-child > button.combo:focus:hover:last-child,

+.vertical.linked > combobox:last-child > button.combo:checked:last-child,

+.vertical.linked button:hover:last-child,

+.vertical.linked button:checked:last-child,

+.vertical.linked button:focus:hover:last-child,

+.vertical.linked button:focus:hover:active:last-child,

+.vertical.linked button:hover:active:last-child,

+.vertical.linked button:checked:active:last-child,

+.vertical.linked button:checked:hover:active:last-child {

     box-shadow: inset  1px  0px shade(@selected_bg_color, 1.3),

                 inset -1px  0px shade(@selected_bg_color, 1.3),

                 inset  0px -1px shade(@selected_bg_color, 1.3);

@@ -1820,8 +1782,8 @@ GtkColorButton.button {
     border-width: 0px 1px 1px 1px;

 }

 

-.vertical.linked > GtkComboBox:last-child > .button:insensitive:last-child,

-.vertical.linked .button:insensitive:last-child {

+.vertical.linked > combobox:last-child > button.combo:disabled:last-child,

+.vertical.linked button:disabled:last-child {

     box-shadow: inset  1px  0px @insensitive_border_color,

                 inset -1px  0px @insensitive_border_color,

                 inset  0px -1px @insensitive_border_color;

@@ -1831,10 +1793,10 @@ GtkColorButton.button {
 

 /* Single button */

 

-.vertical.linked > GtkComboBox:only-child > .button:last-child,

-.vertical.linked > GtkComboBox:only-child > .button:focus:last-child,

-.vertical.linked .button:only-child,

-.vertical.linked .button:focus:only-child {

+.vertical.linked > combobox:only-child > button.combo:last-child,

+.vertical.linked > combobox:only-child > button.combo:focus:last-child,

+.vertical.linked button:only-child,

+.vertical.linked button:focus:only-child {

     box-shadow: inset  0px  1px alpha(shade(@button_border, 0.94), 0.90),

                 inset  1px  0px alpha(shade(@button_border, 0.94), 0.90),

                 inset -1px  0px alpha(shade(@button_border, 0.94), 0.90),

@@ -1843,16 +1805,16 @@ GtkColorButton.button {
     border-width: 1px;

 }

 

-.vertical.linked > GtkComboBox:only-child > .button:hover:last-child,

-.vertical.linked > GtkComboBox:only-child > .button:focus:hover:last-child,

-.vertical.linked > GtkComboBox:only-child > .button:checked:last-child,

-.vertical.linked .button:hover:only-child,

-.vertical.linked .button:checked:only-child,

-.vertical.linked .button:focus:hover:only-child,

-.vertical.linked .button:focus:hover:active:only-child,

-.vertical.linked .button:hover:active:only-child,

-.vertical.linked .button:checked:active:only-child,

-.vertical.linked .button:checked:hover:active:only-child {

+.vertical.linked > combobox:only-child > button.combo:hover:last-child,

+.vertical.linked > combobox:only-child > button.combo:focus:hover:last-child,

+.vertical.linked > combobox:only-child > button.combo:checked:last-child,

+.vertical.linked button:hover:only-child,

+.vertical.linked button:checked:only-child,

+.vertical.linked button:focus:hover:only-child,

+.vertical.linked button:focus:hover:active:only-child,

+.vertical.linked button:hover:active:only-child,

+.vertical.linked button:checked:active:only-child,

+.vertical.linked button:checked:hover:active:only-child {

     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

                 inset  1px  0px shade(@selected_bg_color, 1.3),

                 inset -1px  0px shade(@selected_bg_color, 1.3),

@@ -1861,8 +1823,8 @@ GtkColorButton.button {
     border-width: 1px;

 }

 

-.vertical.linked > GtkComboBox:only-child > .button:insensitive:last-child,

-.vertical.linked .button:insensitive:only-child {

+.vertical.linked > combobox:only-child > button.combo:disabled:last-child,

+.vertical.linked button:disabled:only-child {

     box-shadow: inset  0px  1px @insensitive_border_color,

                 inset  1px  0px @insensitive_border_color,

                 inset -1px  0px @insensitive_border_color,

@@ -1876,12 +1838,12 @@ GtkColorButton.button {
 /*************************/

 

 /* Middle button */

-.inline-toolbar.toolbar .button,

-.inline-toolbar.toolbar .button:checked,

-.inline-toolbar.toolbar .button:insensitive,

-.inline-toolbar.toolbar GtkToolButton > .button,

-.inline-toolbar.toolbar GtkToolButton > .button:checked,

-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {

+toolbar.inline-toolbar button,

+toolbar.inline-toolbar button:checked,

+toolbar.inline-toolbar button:disabled,

+toolbar.inline-toolbar GtkToolButton > button,

+toolbar.inline-toolbar GtkToolButton > button:checked,

+toolbar.inline-toolbar GtkToolButton > button:disabled {

     /* outer */

     border-width: 0px;

     border-right-width: 0px;

@@ -1895,11 +1857,11 @@ GtkColorButton.button {
                 inset  0px -1px alpha(#fff, 0.05);

 }

 

-.inline-toolbar.toolbar .button:hover:active,

-.inline-toolbar.toolbar .button:checked,

-.inline-toolbar.toolbar .button:checked:hover,

-.inline-toolbar.toolbar .button:checked:hover:active,

-.inline-toolbar.toolbar GtkToolButton > .button:checked {

+toolbar.inline-toolbar button:hover:active,

+toolbar.inline-toolbar button:checked,

+toolbar.inline-toolbar button:checked:hover,

+toolbar.inline-toolbar button:checked:hover:active,

+toolbar.inline-toolbar GtkToolButton > button:checked {

     background-color: transparent;

     box-shadow: inset  0px  1px alpha(#000, 0.05),

                 inset  2px  0px alpha(#000, 0.03),

@@ -1908,18 +1870,18 @@ GtkColorButton.button {
                 inset  0px -1px alpha(#000, 0.02);

 }

 

-.inline-toolbar.toolbar .button:insensitive,

-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {

+toolbar.inline-toolbar button:disabled,

+toolbar.inline-toolbar GtkToolButton > button:disabled {

     box-shadow: inset  1px  0px shade(@button_border, 1.10);

 }

 

 /* Leftmost button */

-.inline-toolbar.toolbar .button:first-child,

-.inline-toolbar.toolbar .button:checked:first-child,

-.inline-toolbar.toolbar .button:insensitive:first-child,

-.inline-toolbar.toolbar GtkToolButton:first-child > .button,

-.inline-toolbar.toolbar GtkToolButton:first-child > .button:checked,

-.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive {

+toolbar.inline-toolbar button:first-child,

+toolbar.inline-toolbar button:checked:first-child,

+toolbar.inline-toolbar button:disabled:first-child,

+toolbar.inline-toolbar GtkToolButton:first-child > button,

+toolbar.inline-toolbar GtkToolButton:first-child > button:checked,

+toolbar.inline-toolbar GtkToolButton:first-child > button:disabled {

     border-width: 0px;

     border-radius: 0px;

     box-shadow: inset  0px  1px alpha(#fff, 0.09),

@@ -1928,11 +1890,11 @@ GtkColorButton.button {
                 inset  0px -1px alpha(#fff, 0.05);

 }

 

-.inline-toolbar.toolbar .button:hover:active:first-child,

-.inline-toolbar.toolbar .button:checked:first-child,

-.inline-toolbar.toolbar .button:checked:hover:first-child,

-.inline-toolbar.toolbar .button:checked:hover:active:first-child,

-.inline-toolbar.toolbar GtkToolButton:first-child > .button:checked {

+toolbar.inline-toolbar button:hover:active:first-child,

+toolbar.inline-toolbar button:checked:first-child,

+toolbar.inline-toolbar button:checked:hover:first-child,

+toolbar.inline-toolbar button:checked:hover:active:first-child,

+toolbar.inline-toolbar GtkToolButton:first-child > button:checked {

     background-color: transparent;

     box-shadow: inset  0px  1px alpha(#000, 0.05),

                 inset  1px  0px alpha(#000, 0.03),

@@ -1940,18 +1902,18 @@ GtkColorButton.button {
                 inset  0px -1px alpha(#000, 0.02);

 }

 

-.inline-toolbar.toolbar .button:insensitive:first-child,

-.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive {

+toolbar.inline-toolbar button:disabled:first-child,

+toolbar.inline-toolbar GtkToolButton:first-child > button:disabled {

     box-shadow: none;

 }

 

 /* Rightmost button */

-.inline-toolbar.toolbar .button:last-child,

-.inline-toolbar.toolbar .button:checked:last-child,

-.inline-toolbar.toolbar .button:insensitive:last-child,

-.inline-toolbar.toolbar GtkToolButton:last-child > .button,

-.inline-toolbar.toolbar GtkToolButton:last-child > .button:checked,

-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive {

+toolbar.inline-toolbar button:last-child,

+toolbar.inline-toolbar button:checked:last-child,

+toolbar.inline-toolbar button:disabled:last-child,

+toolbar.inline-toolbar GtkToolButton:last-child > button,

+toolbar.inline-toolbar GtkToolButton:last-child > button:checked,

+toolbar.inline-toolbar GtkToolButton:last-child > button:disabled {

     border-width: 0px;

     border-radius: 0px;

     box-shadow: inset  0px  1px alpha(#fff, 0.09),

@@ -1962,11 +1924,11 @@ GtkColorButton.button {
                 inset  0px -1px alpha(#fff, 0.05);

 }

 

-.inline-toolbar.toolbar .button:hover:active:last-child,

-.inline-toolbar.toolbar .button:checked:last-child,

-.inline-toolbar.toolbar .button:checked:hover:last-child,

-.inline-toolbar.toolbar .button:checked:hover:active:last-child,

-.inline-toolbar.toolbar GtkToolButton:last-child > .button:checked {

+toolbar.inline-toolbar button:hover:active:last-child,

+toolbar.inline-toolbar button:checked:last-child,

+toolbar.inline-toolbar button:checked:hover:last-child,

+toolbar.inline-toolbar button:checked:hover:active:last-child,

+toolbar.inline-toolbar GtkToolButton:last-child > button:checked {

     background-color: transparent;

     box-shadow: inset  0px  1px alpha(#000, 0.05),

                 inset  2px  0px alpha(#000, 0.03),

@@ -1976,19 +1938,19 @@ GtkColorButton.button {
                 inset  0px -1px alpha(#000, 0.02);

 }

 

-.inline-toolbar.toolbar .button:insensitive:last-child,

-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive {

+toolbar.inline-toolbar button:disabled:last-child,

+toolbar.inline-toolbar GtkToolButton:last-child > button:disabled {

     box-shadow: inset  1px  0px shade(@button_border, 1.10),

                 inset -1px  0px shade(@button_border, 1.10);

 }

 

 /* Single button */

-.inline-toolbar.toolbar .button:only-child,

-.inline-toolbar.toolbar .button:checked:only-child,

-.inline-toolbar.toolbar .button:insensitive:only-child,

-.inline-toolbar.toolbar GtkToolButton:only-child > .button,

-.inline-toolbar.toolbar GtkToolButton:only-child > .button:checked,

-.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive {

+toolbar.inline-toolbar button:only-child,

+toolbar.inline-toolbar button:checked:only-child,

+toolbar.inline-toolbar button:disabled:only-child,

+toolbar.inline-toolbar GtkToolButton:only-child > button,

+toolbar.inline-toolbar GtkToolButton:only-child > button:checked,

+toolbar.inline-toolbar GtkToolButton:only-child > button:disabled {

     border-radius: 0px;

     border-width: 0px;

     box-shadow: inset  0px  1px alpha(#fff, 0.09),

@@ -1997,11 +1959,11 @@ GtkColorButton.button {
                 inset  1px  0px shade(@button_border, 1.10);

 }

 

-.inline-toolbar.toolbar .button:hover:active:only-child,

-.inline-toolbar.toolbar .button:checked:only-child,

-.inline-toolbar.toolbar .button:checked:hover:only-child,

-.inline-toolbar.toolbar .button:checked:hover:active:only-child,

-.inline-toolbar.toolbar GtkToolButton:only-child > .button:checked {

+toolbar.inline-toolbar button:hover:active:only-child,

+toolbar.inline-toolbar button:checked:only-child,

+toolbar.inline-toolbar button:checked:hover:only-child,

+toolbar.inline-toolbar button:checked:hover:active:only-child,

+toolbar.inline-toolbar GtkToolButton:only-child > button:checked {

     background-color: transparent;

     box-shadow: inset  0px  1px alpha(#000, 0.05),

                 inset -1px  0px alpha(#000, 0.03),

@@ -2009,8 +1971,8 @@ GtkColorButton.button {
                 inset  1px  0px shade(@button_border, 0.80);

 }

 

-.inline-toolbar.toolbar .button:insensitive:only-child,

-.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive {

+toolbar.inline-toolbar button:disabled:only-child,

+toolbar.inline-toolbar GtkToolButton:only-child > button:disabled {

     box-shadow: inset  1px  0px shade(@button_border, 1.10);

 }

 

@@ -2018,29 +1980,29 @@ GtkColorButton.button {
  * ComboBoxes *

  **************/

 

-GtkComboBox {

+combobox {

     padding: 0px;

-    -GtkWidget-focus-padding: 0;

-    -GtkWidget-focus-line-width: 0;

+/*    -GtkWidget-focus-padding: 0; */

+/*    -GtkWidget-focus-line-width: 0; */

     -GtkComboBox-arrow-scaling: 0.5;

     -GtkComboBox-shadow-type: none;

 }

 

-GtkComboBox .cell {

+combobox .cell {

     /* color combobox read-only */

     color: @theme_fg_color;

     text-shadow: 0 1px @theme_shadow_color;

 }

 

-GtkComboBox .separator {

+combobox separator {

     /* always disable separators */

-    -GtkWidget-wide-separators: true;

+/*    -GtkWidget-wide-separators: true; */

     -GtkWidget-horizontal-separator: 0;

     -GtkWidget-vertical-separator: 0;

 }

 

-GtkComboBox .entry,

-GtkComboBox .entry:nth-child(first) {

+combobox entry,

+combobox entry:nth-child(first) {

     border-width: 2px 0px 2px 2px; /* remove right-outer */

     border-radius: 4px 0px 0px 4px;

     /* remove right-border */

@@ -2055,7 +2017,7 @@ GtkComboBox .entry:nth-child(first) {
 }

 

 

-GtkComboBox .entry:focus {

+combobox entry:focus {

     border-width: 2px 0px 2px 2px; /* remove right-outer */

     /* border */

     box-shadow: inset  0px  3px alpha(#000, 0.03),

@@ -2069,35 +2031,35 @@ GtkComboBox .entry:focus {
 }

 

 /* for RTL languages */

-GtkComboBox .entry:nth-child(last) {

+combobox entry:nth-child(last) {

     border-width: 2px 2px 2px 0px;

     border-radius: 0px 5px 5px 0px;

     border-image-width: 2px 2px 2px 0px;

 }

 

-GtkComboBox .button {

+combobox button {

     color: @internal_element_color;

     padding: 2px 3px 2px 6px;

 }

 

-GtkComboBox .button *:prelight {

+combobox button *:hover {

     color: @theme_text_color;

 }

 

-.toolbar GtkComboBox .cell {

+toolbar combobox .cell {

     /* color combobox read-only */

     color: shade(@toolbar_fg_color, 0.94);

     text-shadow: 0 1px @toolbar_shadow_color;

 }

 

-.primary-toolbar GtkComboBox .cell {

+toolbar.primary-toolbar combobox .cell {

     /* color combobox read-only */

     color: shade(@theme_fg_dark_color, 0.94);

     text-shadow: 0 1px @theme_shadow_dark_color;

 }

 

-.toolbar GtkComboBox .entry,

-.toolbar GtkComboBox .entry:focus {

+toolbar combobox entry.combo,

+toolbar combobox entry.combo:focus {

     border-width: 1px 0px 1px 1px; /* remove rightr */

     border-top-color:    shade(@toolbar_gradient_base, 0.60);

     border-left-color:   shade(@toolbar_gradient_base, 0.70);

@@ -2109,7 +2071,7 @@ GtkComboBox .button *:prelight {
                 inset -1px  0px alpha(#000, 0.05);

 }

 

-.toolbar GtkComboBox.combobox-entry .button {

+toolbar combobox button.combo {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (alpha(#fff, 0.04)),

@@ -2120,7 +2082,7 @@ GtkComboBox .button *:prelight {
     border-bottom-color: alpha (#000, 0.25);

 }

 

-.toolbar GtkComboBox.combobox-entry .button:checked {

+toolbar combobox button.combo:checked {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (alpha(#000, 0.20)),

@@ -2138,16 +2100,16 @@ GtkComboBox .button *:prelight {
                 inset  0px -1px alpha(#fff, 0.01);

 }

 

-.toolbar GtkComboBox.combobox-entry .button,

-.toolbar GtkComboBox.combobox-entry .button:hover,

-.toolbar GtkComboBox.combobox-entry .button:checked,

-.toolbar GtkComboBox.combobox-entry .button:insensitive,

-.toolbar GtkComboBox.combobox-entry .button:nth-child(last),

-.primary-toolbar GtkComboBox.combobox-entry .button,

-.primary-toolbar GtkComboBox.combobox-entry .button:hover,

-.primary-toolbar GtkComboBox.combobox-entry .button:checked,

-.primary-toolbar GtkComboBox.combobox-entry .button:insensitive,

-.primary-toolbar GtkComboBox.combobox-entry .button:nth-child(last) {

+toolbar combobox button.combo,

+toolbar combobox button.combo:hover,

+toolbar combobox button.combo:checked,

+toolbar combobox button.combo:disabled,

+toolbar combobox button.combo:nth-child(last),

+toolbar.primary-toolbar combobox button.combo,

+toolbar.primary-toolbar combobox button.combo:hover,

+toolbar.primary-toolbar combobox button.combo:checked,

+toolbar.primary-toolbar combobox button.combo:disabled,

+toolbar.primary-toolbar combobox button.combo:nth-child(last) {

     border-top-left-radius: 0px;

     border-bottom-left-radius: 0px;

     border-top-right-radius: 4px;

@@ -2156,67 +2118,185 @@ GtkComboBox .button *:prelight {
     padding: 2px 3px;

 }

 

-GtkComboBox.combobox-entry .button,

-GtkComboBox.combobox-entry .button:hover,

-GtkComboBox.combobox-entry .button:checked,

-GtkComboBox.combobox-entry .button:insensitive,

-GtkComboBox.combobox-entry .button:nth-child(last) {

-    border-color: transparent;

-    border-top-left-radius: 0px;

-    border-bottom-left-radius: 0px;

-    border-top-right-radius: 5px;

-    border-bottom-right-radius: 5px;

-    border-width: 2px 2px 2px 0px;

-    padding: 2px 3px;

+combobox button.combo,

+combobox button.combo:focus,

+combobox button.combo:focus:hover,

+combobox button.combo:hover,

+combobox button.combo:hover:active,

+combobox button.combo:checked,

+combobox button.combo:checked:hover,

+combobox button.combo:checked:hover:active,

+combobox button.combo:disabled {

+    border-width: 1px;

+    border-radius: 6px;

+    border-width: 1px;

+    padding: 5px 6px;

 }

 

-GtkComboBox.combobox-entry .button:hover {

-    border-top-left-radius: 0px;

-    border-bottom-left-radius: 0px;

-    border-top-right-radius: 5px;

-    border-bottom-right-radius: 5px;

-    border-width: 2px 2px 2px 0px;

+/* button left from entry */

+combobox.linked button.combo,

+combobox.linked button.combo:focus,

+combobox.linked button.combo:focus:hover,

+combobox.linked button.combo:hover,

+combobox.linked button.combo:hover:active,

+combobox.linked button.combo:checked,

+combobox.linked button.combo:checked:hover,

+combobox.linked button.combo:checked:hover:active,

+combobox.linked button:disabled

+combobox.linked button.combo {

+    padding: 5px 4px;

+    border-radius: 0px 6px 6px 0px;

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

+}

+

+combobox.linked button.combo:checked {

     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

                 inset  1px  0px shade(@selected_bg_color, 1.3),

-                inset  0px -1px shade(@selected_bg_color, 1.3),

-                inset -1px  0px shade(@selected_bg_color, 1.3);

-    border-color: transparent;

+                inset -1px  0px shade(@selected_bg_color, 1.3),

+                inset  0px -1px shade(@selected_bg_color, 1.3);

 }

 

-/* for RTL languages */

-GtkComboBox.combobox-entry .button:nth-child(first) {

-    border-width: 2px 0px 2px 2px;

-    border-radius: 4px 0px 0px 4px;

+/* Middle button */

+.linked combobox button.combo,

+.linked combobox button.combo:focus {

+    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

+                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),

+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

+    border-right-width: 0px;

+    border-left-width: 0px;

+    border-radius: 0;

 }

 

-.primary-toolbar GtkComboBox.combobox-entry .button:nth-child(first) {

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

-    border-radius: 4px 0px 0px 4px;

+ /* Middle Button active/hover */

+.linked combobox button.combo:hover,

+.linked combobox button.combo:focus:hover,

+.linked combobox button.combo:hover:active,

+.linked combobox button.combo:checked,

+.linked combobox button.combo:checked:hover,

+.linked combobox button.combo:checked:hover:active {

+     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

+                 inset  1px  0px shade(@selected_bg_color, 1.3),

+                 inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),

+                 inset  0px -1px shade(@selected_bg_color, 1.3);

+     border-right-width: 0px;

+     border-left-width: 0px;

+     border-radius: 0;

+}

+

+/* Middle button disabled */

+.linked combobox button.combo:disabled {

+    box-shadow: inset  0px  1px @insensitive_border_color,

+                inset  1px  0px @insensitive_border_color,

+                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),

+                inset  0px -1px @insensitive_border_color;

+    border-right-width: 0px;

+    border-left-width: 0px;

+    border-radius: 0;

+}

+

+/* Leftmost button */

+.linked combobox:first-child button.combo:first-child,

+.linked combobox:first-child button.combo:focus:first-child {

+    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

+                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),

+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

+    border-radius: 6px 0 0 6px;

+    border-right-width: 0;

+}

+

+/* Leftmost button active/active */

+.linked combobox:first-child button.combo:hover:first-child,

+.linked combobox:first-child button.combo:focus:hover:first-child,

+.linked combobox:first-child button.combo:hover:active:first-child,

+.linked combobox:first-child button.combo:checked:first-child,

+.linked combobox:first-child button.combo:checked:hover:first-child,

+.linked combobox:first-child button.combo:checked:hover:active:first-child {

+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

+                inset  1px  0px shade(@selected_bg_color, 1.3),

+                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),

+                inset  0px -1px shade(@selected_bg_color, 1.3);

+    border-radius: 6px 0 0 6px;

+    border-right-width: 0;

+}

+

+/* Leftmost button disabled */

+.linked combobox:first-child button.combo:disabled:first-child {

+    box-shadow: inset  0px  1px @insensitive_border_color,

+                inset  1px  0px @insensitive_border_color,

+                inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),

+                inset  0px -1px @insensitive_border_color;

+    border-radius: 6px 0 0 6px;

+    border-right-width: 0;

+}

+

+/* Rightmost button */

+.linked combobox:last-child button.combo:last-child,

+.linked combobox:last-child button.combo:focus:last-child {

+     box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

+                 inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

+                 inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),

+                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

+    border-radius: 0 6px 6px 0;

+    border-left-width: 0;

 }

 

-GtkComboBox.combobox-entry .button *:checked,

-GtkComboBox.combobox-entry .button *:prelight {

+/* Rightmost button active */

+.linked combobox:last-child button.combo:hover:last-child,

+.linked combobox:last-child button.combo:focus:hover:last-child,

+.linked combobox:last-child button.combo:hover:active:last-child,

+.linked combobox:last-child button.combo:checked:last-child,

+.linked combobox:last-child button.combo:checked:hover:last-child,

+.linked combobox:last-child button.combo:checked:hover:active:last-child {

+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.3),

+                inset  1px  0px shade(@selected_bg_color, 1.3),

+                inset -1px  0px shade(@selected_bg_color, 1.3),

+                inset  0px -1px shade(@selected_bg_color, 1.3);

+    border-radius: 0 6px 6px 0;

+    border-left-width: 0;

+}

+

+/* Rightmost button disabled */

+.linked combobox:last-child button.combo:last-child {

+    box-shadow: inset  0px  1px @insensitive_border_color,

+                inset  1px  0px @insensitive_border_color,

+                inset -1px  0px @insensitive_border_color,

+                inset  0px -1px @insensitive_border_color;

+    border-radius: 0 6px 6px 0;

+    border-left-width: 0;

+}

+

+combobox button.combo *:checked,

+combobox button.combo *:hover {

     color: @internal_element_prelight;

 }

 

-.toolbar GtkComboBox.combobox-entry .button *:checked,

-.toolbar GtkComboBox.combobox-entry .button *:prelight,

-.primary-toolbar GtkComboBox.combobox-entry .button *:checked,

-.primary-toolbar GtkComboBox.combobox-entry .button *:prelight {

+toolbar combobox button.combo *:checked,

+toolbar combobox button.combo *:hover,

+toolbar.primary-toolbar combobox button.combo *:checked,

+toolbar.primary-toolbar combobox button.combo *:hover {

     color: @theme_text_dark_color;

 }

 

+combobox arrow {

+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");

+    color: @theme_fg_color;

+    min-height: 16px;

+    min-width: 16px;

+}

+

 /************

  * Toolbars *

  ************/

 

-.toolbar * {

+toolbar * {

     background-image: none;

     background-color: alpha (@theme_base_color, 0.0);

 }

 

 GtkHandleBox,

-.toolbar  {

+toolbar  {

     padding: 2px 4px;

     background-color: @toolbar_gradient_base;

     background-image: -gtk-gradient (linear,

@@ -2230,7 +2310,7 @@ GtkHandleBox,
     color: @toolbar_fg_color;

 }

 

-.toolbar.vertical {

+toolbar.vertical {

     border-radius: 4px 0 0 4px;

     padding: 2px;

 }

@@ -2239,7 +2319,7 @@ GtkHandleBox,
  * Menubar Toolbars *

  ********************/

 

-.toolbar.menubar {

+toolbar menubar {

     padding: 2px 4px 5px 3px;

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

@@ -2263,7 +2343,7 @@ GtkHandleBox,
  * hint on the containing vbox, so we need to handle both these cases here.

  */

 

-.primary-toolbar.toolbar {

+toolbar.primary-toolbar {

    background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@theme_bg_dark_color, 1.00)),

@@ -2280,7 +2360,7 @@ GtkHandleBox,
     color: @theme_fg_dark_color;

 }

 

-.primary-toolbar.toolbar:insensitive {

+toolbar.primary-toolbar:disabled {

     background-image: none;

     background-color: shade (@theme_bg_dark_color, 0.97);

     border-image: none;

@@ -2289,9 +2369,9 @@ GtkHandleBox,
 }

 

 /* primary toolbar buttons */

-.toolbar .button,

-.primary-toolbar.toolbar .button {

-    -GtkWidget-focus-line-width: 0;

+toolbar button,

+toolbar.primary-toolbar button {

+/*    -GtkWidget-focus-line-width: 0; */

     border-image: none;

     border-style: solid;

     border-color: transparent;

@@ -2300,12 +2380,12 @@ GtkHandleBox,
     background-color: alpha (@theme_base_color, 0.0);

 }

 

-.toolbar .button {

+toolbar button {

     color: shade(@toolbar_fg_color, 1.00);

     text-shadow: 0px 1px @toolbar_shadow_color;

 }

 

-.toolbar GtkComboBox .button {

+toolbar combobox button {

     /* color combobox read-only */

     color: shade(@toolbar_fg_color, 1.00);

     text-shadow: 0px 1px @toolbar_shadow_color;

@@ -2323,38 +2403,38 @@ GtkHandleBox,
                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

 }

 

-.toolbar GtkComboBox .button:hover {

+toolbar combobox button:hover {

     border-radius: 5px

 }

 

-.primary-toolbar.toolbar .button {

+toolbar.primary-toolbar button {

     color: @theme_fg_dark_color;

     text-shadow: 0px 1px @theme_shadow_dark_color;

 }

 

-.primary-toolbar .linked .button:focus {

+toolbar.primary-toolbar .linked button:focus {

    box-shadow: none;

 }

 

-.toolbar .button:insensitive,

-.primary-toolbar.toolbar .button:insensitive {

+toolbar button:disabled,

+toolbar.primary-toolbar button:disabled {

     background-image: none;

     background-color: alpha (@theme_base_color, 0.0);

     border-color: transparent;

     /* -GtkWidget-focus-line-width: 0; */

 }

 

-.toolbar .button *:insensitive {

+toolbar button *:disabled {

     color: mix(@toolbar_gradient_base, @toolbar_fg_color, 0.60);

     text-shadow: none;

 }

 

-.primary-toolbar.toolbar .button *:insensitive {

+toolbar.primary-toolbar button *:disabled {

     color: mix(@theme_bg_dark_color, @theme_fg_dark_color, 0.60);

     text-shadow: none;

 }

 

-.toolbar .button:hover {

+toolbar button:hover {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -2365,11 +2445,11 @@ GtkHandleBox,
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-.toolbar .button:hover:active,

-.toolbar .button:checked,

-.toolbar .button:checked:focus,

-.toolbar .button:checked:hover,

-.toolbar .button:checked:hover:active {

+toolbar button:hover:active,

+toolbar button:checked,

+toolbar button:checked:focus,

+toolbar button:checked:hover,

+toolbar button:checked:hover:active {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -2383,12 +2463,12 @@ GtkHandleBox,
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-.primary-toolbar.toolbar .button:hover,

-.primary-toolbar.toolbar .button:hover:active,

-.primary-toolbar.toolbar .button:checked,

-.primary-toolbar.toolbar .button:checked:focus,

-.primary-toolbar.toolbar .button:checked:hover,

-.primary-toolbar.toolbar .button:checked:hover:active {

+toolbar.primary-toolbar button:hover,

+toolbar.primary-toolbar button:hover:active,

+toolbar.primary-toolbar button:checked,

+toolbar.primary-toolbar button:checked:focus,

+toolbar.primary-toolbar button:checked:hover,

+toolbar.primary-toolbar button:checked:hover:active {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -2402,50 +2482,50 @@ GtkHandleBox,
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-.toolbar .button *:hover,

-.toolbar .button *:active,

-.toolbar .button *:checked {

+toolbar button *:hover,

+toolbar button *:active,

+toolbar button *:checked {

 /* edge */

     color: shade(@toolbar_fg_color, 0.90);

     text-shadow: 0px 1px @toolbar_shadow_color;

 }

 

 /* arrangement epiphany (toolbar.menubar) */

-.primary-toolbar.toolbar .button *:hover,

-.primary-toolbar.toolbar .button *:active,

-.primary-toolbar.toolbar .button *:hover:active,

-.primary-toolbar.toolbar .button *:active:active,

-.primary-toolbar.toolbar .button *:checked,

-.primary-toolbar.toolbar .button *:checked:hover,

-.primary-toolbar.toolbar .button *:checked:checked {

+toolbar.primary-toolbar button *:hover,

+toolbar.primary-toolbar button *:active,

+toolbar.primary-toolbar button *:hover:active,

+toolbar.primary-toolbar button *:active:active,

+toolbar.primary-toolbar button *:checked,

+toolbar.primary-toolbar button *:checked:hover,

+toolbar.primary-toolbar button *:checked:checked {

     color: @theme_text_dark_color;

     text-shadow: 0px 1px @theme_shadow_dark_color;

 }

 

-.toolbar .button:active:insensitive,

-.toolbar .button:checked:insensitive,

-.primary-toolbar.toolbar .button:checked:insensitive {

+toolbar button:active:disabled,

+toolbar button:checked:disabled,

+toolbar.primary-toolbar button:checked:disabled {

     background-image: none;

     background-color: alpha (@theme_base_color, 0.0);

     border-color: transparent;

-    icon-shadow: none;

+    -gtk-icon-shadow: none;

     text-shadow: none;

 }

 

-.toolbar GtkLabel {

+toolbar label {

     color: shade(@theme_fg_color, 1.10);

     text-shadow: 0px 1px @theme_shadow_color;

 }

 

-.toolbar.menubar GtkLabel,

-.primary-toolbar.toolbar GtkLabel {

+toolbar menubar label,

+toolbar.primary-toolbar label {

     color: @theme_fg_dark_color;

     text-shadow: 0px 1px @theme_shadow_dark_color;

 }

 

-.toolbar GtkSeparatorToolItem,

-.toolbar .separator,

-.toolbar .separator:insensitive {

+toolbar GtkSeparatorToolItem,

+toolbar separator,

+toolbar separator:disabled {

     border-color:        alpha (#000, 0.24);

     border-bottom-color: alpha (#fff, 0.08);

     border-right-color:  alpha (#fff, 0.08); 

@@ -2455,26 +2535,26 @@ GtkHandleBox,
     primary toolbar raised buttons

 *************************************/

 

-.toolbar .raised .button,

-.toolbar .raised.button {

+toolbar .raised button,

+toolbar button.raised {

     padding: 2px;

 }

 

-.toolbar.menubar .button {

+toolbar menubar button {

     padding: 2px 2px;

 }

 

-.toolbar.menubar .linked .button {

+toolbar menubar .linked button {

     padding: 3px 4px;

 }

 

-.toolbar.menubar .button {

+toolbar menubar button {

     padding: 2px 4px;

 }

 

-.toolbar.menubar .button,

-.toolbar .raised .button,

-.toolbar .raised.button {

+toolbar menubar button,

+toolbar .raised button,

+toolbar button.raised {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (@button_raised_gradient_color_a),

@@ -2483,25 +2563,25 @@ GtkHandleBox,
     /* outer */

     border-color: transparent;

     /* border and inset */

-    -GtkWidget-focus-line-width: 0;

+/*    -GtkWidget-focus-line-width: 0; */

     color: shade(@theme_fg_dark_color, 1.00);

 }

 

-.toolbar .button.raised.linked:insensitive,

-.toolbar .raised.linked .button:insensitive,

-.toolbar .button.raised.linked:insensitive:active,

-.toolbar .raised.linked .button:insensitive:active,

-.toolbar .button.raised.linked:insensitive:checked,

-.toolbar .raised.linked .button:insensitive:checked,

-.toolbar.menubar .button:insensitive,

-.toolbar.menubar .button:insensitive:active,

-.toolbar.menubar .button:insensitive:checked,

-.toolbar .raised .button:insensitive,

-.toolbar .raised.button:insensitive,

-.toolbar .raised .button:insensitive:active,

-.toolbar .raised.button:insensitive:active,

-.toolbar .raised .button:insensitive:checked,

-.toolbar .raised.button:insensitive:checked {

+toolbar button.raised.linked:disabled,

+toolbar .raised.linked button:disabled,

+toolbar button.raised.linked:disabled:active,

+toolbar .raised.linked button:disabled:active,

+toolbar button.raised.linked:disabled:checked,

+toolbar .raised.linked button:disabled:checked,

+toolbar menubar button:disabled,

+toolbar menubar button:disabled:active,

+toolbar menubar button:disabled:checked,

+toolbar .raised button:disabled,

+toolbar button.raised:disabled,

+toolbar .raised button:disabled:active,

+toolbar button.raised:disabled:active,

+toolbar .raised button:disabled:checked,

+toolbar button.raised:disabled:checked {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@button_raised_gradient_color_a, 0.88)),

@@ -2511,9 +2591,9 @@ GtkHandleBox,
     color: mix(@theme_bg_dark_color, @theme_fg_dark_color, 0.50);

 }

 

-.toolbar.menubar .button:hover,

-.toolbar .raised .button:hover,

-.toolbar .raised.button:hover {

+toolbar menubar button:hover,

+toolbar .raised button:hover,

+toolbar button.raised:hover {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -2529,13 +2609,13 @@ GtkHandleBox,
     color: shade(@theme_fg_dark_color, 1.00);

 }

 

-.toolbar .raised .button:hover:active,

-.toolbar .raised.button:hover:active,

-.toolbar.menubar .button:checked,

-.toolbar .raised .button:checked,

-.toolbar .raised .button:checked:hover,

-.toolbar .raised.button:checked:hover,

-.toolbar .raised.button:checked {

+toolbar .raised button:hover:active,

+toolbar button.raised:hover:active,

+toolbar menubar button:checked,

+toolbar .raised button:checked,

+toolbar .raised button:checked:hover,

+toolbar button.raised:checked:hover,

+toolbar button.raised:checked {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -2551,40 +2631,40 @@ GtkHandleBox,
 }

 

 /* setup shadows */

-.toolbar .raised .button GtkLabel,

-.toolbar .raised.button GtkLabel {

+toolbar .raised button label,

+toolbar button.raised label {

     color: @theme_fg_dark_color;

     text-shadow: 0px 1px @theme_shadow_dark_color;

 }

 

-.toolbar .raised .button,

-.toolbar .raised.button {

-    icon-shadow:  1px  1px @theme_shadow_dark_color;

+toolbar .raised button,

+toolbar button.raised {

+    -gtk-icon-shadow:  1px  1px @theme_shadow_dark_color;

 }

 

-.toolbar.menubar .button *:hover,

-.toolbar .raised .button *:hover,

-.toolbar .raised.button *:hover,

-.toolbar .raised .button *:hover:active,

-.toolbar .raised.button *:hover:active,

-.toolbar.menubar .button *:checked,

-.toolbar .raised .button *:checked,

-.toolbar .raised.button *:checked,

-.toolbar .raised .button *:checked:hover,

-.toolbar .raised.button *:checked:hover {

+toolbar menubar button *:hover,

+toolbar .raised button *:hover,

+toolbar button.raised *:hover,

+toolbar .raised button *:hover:active,

+toolbar button.raised *:hover:active,

+toolbar menubar button *:checked,

+toolbar .raised button *:checked,

+toolbar button.raised *:checked,

+toolbar .raised button *:checked:hover,

+toolbar button.raised *:checked:hover {

     color: @theme_text_dark_color;

     text-shadow: 0px 1px @theme_shadow_dark_color;

 }

 

-.toolbar.menubar .button *:insensitive,

-.toolbar .raised .button *:insensitive,

-.toolbar .raised.button *:insensitive {

-    icon-shadow: none;

+toolbar menubar button *:disabled,

+toolbar .raised button *:disabled,

+toolbar button.raised *:disabled {

+    -gtk-icon-shadow: none;

     text-shadow: none;

     color: mix(@theme_bg_dark_color, @theme_fg_dark_color, 0.50);

 }

 

-.toolbar .entry {

+toolbar .entry {

     padding: 4px 4px 4px 6px;

     color:  shade(@toolbar_fg_color, 1.0);

     background-image: -gtk-gradient (linear,

@@ -2594,12 +2674,11 @@ GtkHandleBox,
                                      to   (shade(@toolbar_gradient_base, 1.15)));

 }

 

-.toolbar .entry,

-.toolbar.menubar .entry,

-.toolbar .raised .entry,

-.toolbar .raised.entry,

-.primary-toolbar .toolbar .entry,

-.primary-toolbar.toolbar .entry {

+toolbar entry,

+toolbar menubar entry,

+toolbar .raised entry,

+toolbar .raised.entry,

+toolbar.primary-toolbar entry {

     padding: 4px 4px 4px 6px;

     color:  @entry_text_dark_color;

     background-image: -gtk-gradient (linear,

@@ -2627,11 +2706,11 @@ GtkHandleBox,
                 inset  0px -1px shade(@theme_entry_border_dark, 1.10);

 }

 

-.toolbar .entry:focus,

-.toolbar.menubar .entry:focus,

-.toolbar .raised .entry:focus,

-.toolbar .raised.entry:focus,

-.primary-toolbar.toolbar .entry:focus {

+toolbar entry:focus,

+toolbar menubar entry:focus,

+toolbar .raised entry:focus,

+toolbar .raised.entry:focus,

+toolbar.primary-toolbar entry:focus {

     /* outer */

     border-top-color:    @focused_dark_entry_outer;

     border-right-color:  alpha(@focused_dark_entry_outer, 0.90);

@@ -2649,17 +2728,17 @@ GtkHandleBox,
                 inset  0px -1px shade(@focused_dark_entry_border, 1.00);

 }

 

-.toolbar .entry:selected,

-.toolbar.menubar .entry:selected,

-.toolbar .raised .entry:selected,

-.toolbar .raised.entry:selected,

-.primary-toolbar.toolbar .entry:selected {

+toolbar entry:selected,

+toolbar menubar entry:selected,

+toolbar .raised entry:selected,

+toolbar .raised.entry:selected,

+toolbar.primary-toolbar entry:selected {

     background-color: @theme_selected_bg_color;

     color: @theme_selected_fg_color;

 }

 

 /* progressbars on primary toolbar entries are special */

-.primary-toolbar.toolbar .entry.progressbar {

+toolbar.primary-toolbar entry.progressbar {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade (@button_bg_active, 1.35)),

@@ -2679,7 +2758,7 @@ GtkHandleBox,
  * Buttons + dialog open *

  ****************************/

 

-.inline-toolbar.toolbar {

+toolbar.inline-toolbar {

     -GtkToolbar-button-relief: normal;

     padding: 0px;

     background-color: alpha(@button_base, 0.0);

@@ -2703,7 +2782,7 @@ GtkHandleBox,
                 inset  0px -1px alpha(#fff, 0.05);

 }

 

-.inline-toolbar.toolbar .button {

+toolbar.inline-toolbar button {

     padding: 2px 6px;

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

@@ -2717,13 +2796,13 @@ GtkHandleBox,
     box-shadow:  none;

     color:       @theme_fg_color;

     text-shadow: 0 1px @theme_shadow_color;

-    icon-shadow: 1px 1px @theme_shadow_color;

+    -gtk-icon-shadow: 1px 1px @theme_shadow_color;

 }

 

-.inline-toolbar.toolbar .button:hover:active,

-.inline-toolbar.toolbar .button:checked,

-.inline-toolbar.toolbar .button:checked:hover,

-.inline-toolbar.toolbar .button:checked:hover:active {

+toolbar.inline-toolbar button:hover:active,

+toolbar.inline-toolbar button:checked,

+toolbar.inline-toolbar button:checked:hover,

+toolbar.inline-toolbar button:checked:hover:active {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@button_base, 0.50)),

@@ -2737,7 +2816,7 @@ GtkHandleBox,
                 inset  0px -1px shade(@button_border, 0.78);

 }

 

-.inline-toolbar.toolbar .button:hover {

+toolbar.inline-toolbar button:hover {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@button_base, 1.03)),

@@ -2747,60 +2826,60 @@ GtkHandleBox,
     color: @theme_text_color;

 }

 

-.inline-toolbar.toolbar .button:insensitive {

+toolbar.inline-toolbar button:disabled {

     box-shadow: none;

     background-color: mix(@button_base, @theme_fg_color, 0.10);

     background-image: none;

 }

 

-.inline-toolbar.toolbar .button *:insensitive {

+toolbar.inline-toolbar button *:disabled {

     color: @insensitive_fg_color;

     text-shadow: none;

-    icon-shadow: none;

+    -gtk-icon-shadow: none;

 }

 

-.inline-toolbar.toolbar .button *:hover {

+toolbar.inline-toolbar button *:hover {

     color: @theme_text_color;

     text-shadow: 0 1px @theme_shadow_color;

-    icon-shadow: 1px 1px @theme_shadow_color;

+    -gtk-icon-shadow: 1px 1px @theme_shadow_color;

 }

 

-.inline-toolbar.toolbar .button *:active,

-.inline-toolbar.toolbar .button *:checked {

+toolbar.inline-toolbar button *:active,

+toolbar.inline-toolbar button *:checked {

     color: @theme_selected_fg_color;

     text-shadow: 0 1px @theme_selected_shadow_color;

-    icon-shadow: 1px 1px @theme_selected_shadow_color;

+    -gtk-icon-shadow: 1px 1px @theme_selected_shadow_color;

 }

 

 /* Stack switcher */

-.stack-switcher > .button > GtkLabel,

-.header-bar .stack-switcher > .button.titlebutton > GtkLabel,

-.titlebar .stack-switcher > .button.titlebutton > GtkLabel,

-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkLabel {

+stackswitcher > button > label,

+headerbar stackswitcher > button.titlebutton > label,

+headerbar.titlebar stackswitcher > button.titlebutton > label,

+calendar.header stackswitcher > button.titlebutton > label {

     padding-left: 6px;

     padding-right: 6px;

 }

 

-.stack-switcher > .button > GtkImage,

-.header-bar .stack-switcher > .button.titlebutton > GtkImage,

-.titlebar .stack-switcher > .button.titlebutton > GtkImage,

-GtkCalendar.header .stack-switcher > .button.titlebutton > GtkImage {

+stackswitcher > button > image,

+headerbar stackswitcher > button.titlebutton > image,

+headerbar.titlebar stackswitcher > button.titlebutton > image,

+calendar.header stackswitcher > button.titlebutton > image {

     padding-left: 6px;

     padding-right: 6px;

     padding-top: 3px;

     padding-bottom: 3px;

 }

 

-.stack-switcher > .button.text-button,

-.stack-switcher > .button.image-button,

-.header-bar .stack-switcher > .titlebutton.button,

-.titlebar .stack-switcher > .titlebutton.button,

-GtkCalendar.header .stack-switcher > .titlebutton.button {

+stackswitcher > button.text-button.radio,

+stackswitcher > button.image-button,

+headerbar stackswitcher > button.titlebutton,

+headerbar.titlebar stackswitcher > button.titlebutton,

+calendar.header stackswitcher > button.titlebutton {

     padding: 4px 2px;

 }

 

-.stack-switcher > .button.needs-attention > GtkLabel,

-.stack-switcher > .button.needs-attention > GtkImage {

+stackswitcher > button.needs-attention > label,

+stackswitcher > button.needs-attention > image {

     animation: needs_attention 150ms ease-in;

     background-color: @theme_bg_color; /* FIXME: ? */

     background-size: 6px 6px, 6px 6px;

@@ -2808,18 +2887,18 @@ GtkCalendar.header .stack-switcher > .titlebutton.button {
     background-position: right 3px, right 4px;

 }

 

-.stack-switcher > .button.needs-attention > GtkLabel:backdrop,

-.stack-switcher > .button.needs-attention > GtkImage:backdrop {

+stackswitcher > button.needs-attention > label:backdrop,

+stackswitcher > button.needs-attention > image:backdrop {

     background-size: 6px 6px, 0 0;

 }

 

-.stack-switcher > .button.needs-attention > GtkLabel:dir(rtl),

-.stack-switcher > .button.needs-attention > GtkImage:dir(rtl) {

+stackswitcher > button.needs-attention > label:dir(rtl),

+stackswitcher > button.needs-attention > image:dir(rtl) {

     background-position: left 3px, left 4px;

 }

 

-.stack-switcher > .button.needs-attention:checked > GtkLabel,

-.stack-switcher > .button.needs-attention:checked > GtkImage {

+stackswitcher > button.needs-attention:checked > label,

+stackswitcher > button.needs-attention:checked > image {

     animation: none;

     background-image: none;

 }

@@ -2828,11 +2907,11 @@ GtkCalendar.header .stack-switcher > .titlebutton.button {
  * GtkActionBar *

  ****************/

 

-GtkActionBar .frame.action-bar .horizontal.linked.stack-switcher .button.image-button {

+actionbar.frame .horizontal.linked stackswitcher button.image-button {

     padding: 4px 2px;

 }

 

-GtkActionBar .frame.action-bar .button.image-button {

+actionbar.frame button.image-button {

     padding: 8px;

 }

 

@@ -2840,45 +2919,41 @@ GtkActionBar .frame.action-bar .button.image-button {
  * GtkSpinButton *

  *****************/

 

-.horizontal.entry.spinbutton {

-   padding: 4px 5px;

+spinbutton,

+spinbutton:focus,

+spinbutton.vertical,

+spinbutton.vertical:focus {

+    border-color: @button_border;

+    border-width: 1px;

+    border-style: solid;

+    border-radius: 3px;

+    padding: 0px;

 }

 

-.spinbutton .button {

-    color: @internal_element_color;

-    border-width: 0;

-    border-radius: 0;

+spinbutton.horizontal entry {

+    padding: 0px 10px 0px 3px;

+    box-shadow: none;

+    border-radius: 3px 0px 0px 3px;

     border-style: none;

-    border-image: none;

-    background-color: transparent;

-    background-image: none;

 }

 

-.spinbutton .button:insensitive,

-.spinbutton .button:insensitive:last-child,

-.spinbutton .button:insensitive:first-child,

-.spinbutton .button:insensitive:only-child,

-.spinbutton .vertical .button:insensitive,

-.spinbutton .vertical .button:insensitive:last-child,

-.spinbutton .vertical .button:insensitive:first-child,

-.spinbutton .vertical .button:insensitive:only-child {

+spinbutton button:disabled,

+spinbutton button:disabled:last-child,

+spinbutton.vertical button:disabled,

+spinbutton.vertical button:disabled:last-child {

     color: @internal_element_insensitive;

-    box-shadow: inset  1px  0px shade(@insensitive_border_color, 0.97);

     border-color: @insensitive_border_color;

 }

 

-.spinbutton .button,

-.spinbutton .button:hover,

-.spinbutton .button:focus,

-.spinbutton .button:checked {

-    border-radius: 0px 0px 0px 0px;

+spinbutton button,

+spinbutton button:hover,

+spinbutton button:focus,

+spinbutton button:active {

+    -gtk-icon-shadow: 0 1px @button_text_shadow;

     color: @internal_element_prelight;

-    box-shadow: inset  0px  1px 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);

 }

 

-.spinbutton .button:hover {

+spinbutton button:hover {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@button_gradient1, 1.03)),

@@ -2887,7 +2962,7 @@ GtkActionBar .frame.action-bar .button.image-button {
                                      to   (shade(@button_gradient4, 1.01)));

 }

 

-.spinbutton .button:checked {

+spinbutton button:active {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade (@theme_bg_color, 1.20)),

@@ -2896,172 +2971,98 @@ GtkActionBar .frame.action-bar .button.image-button {
                                      to (shade (@theme_bg_color, 0.80)));

 }

 

-.spinbutton .button,

-.spinbutton .button:hover,

-.spinbutton .button:checked,

-.spinbutton .button:insensitive {

-    border-radius: 0px 0 0 0px;

-    border-image: none;

-    padding: 6px 3px;

-}

-

-.spinbutton .button:first-child,

-.spinbutton .button:hover:first-child,

-.spinbutton .button:checked:first-child {

-    border-radius: 3px 0 0 3px;

-    border-image: none;

-    padding: 6px 3px;

+spinbutton button,

+spinbutton button:focus,

+spinbutton button:hover,

+spinbutton button:active,

+spinbutton button:disabled {

+    border-radius: 0px;

+    padding: 0px 5px;

+    box-shadow: none;

+    border-style: solid;

+    border-color: @button_border;

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

 }

 

-.spinbutton .button:last-child,

-.spinbutton .button:hover:last-child,

-.spinbutton .button:checked:last-child {

+spinbutton button:last-child,

+spinbutton button:hover:last-child,

+spinbutton button:active:last-child,

+spinbutton button:disabled:last-child {

     border-radius: 0 3px 3px 0;

-    border-image: none;

-    padding: 6px 3px;

+    border-width: 0px;

 }

 

-.spinbutton .button:first-child,

-.spinbutton .button:hover:first-child,

-.spinbutton .button:checked:first-child,

-.spinbutton .button:last-child,

-.spinbutton .button:hover:last-child,

-.spinbutton .button:checked:last-child {

+spinbutton.horizontal button:hover,

+spinbutton.horizontal button:active {

     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);

 }

 

-.spinbutton .button:dir(rtl) {

-    box-shadow: inset -1px 0 @inset_dark_color;

-}

-

-.spinbutton.vertical .button {

-    padding: 4px;

-    icon-shadow: 0 1px @button_text_shadow;

-}

-

-.spinbutton.vertical .button,

-.spinbutton.vertical .button:hover {

-    color: @theme_fg_color;

-}

-

-.spinbutton.vertical .button:insensitive {

-    color: @insensitive_fg_color;

-}

-

-.spinbutton.vertical .button:checked {

-    color: @theme_fg_color;

-    icon-shadow: 0 1px @button_active_text_shadow;

-}

-

-/* :insensitive:insensitive to override the dark overriden style for

-   normal spinbutton buttons, yeah we lack !important */

-.spinbutton.vertical .button:insensitive:insensitive {

-    icon-shadow: none;

+spinbutton button:hover:last-child,

+spinbutton button:active:last-child {

+    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);

 }

 

-/* :active:active to override the dark overriden style for

-   normal spinbutton buttons, yeah we lack !important */

-.spinbutton.vertical .button,

-.spinbutton.vertical .button:active:active,

-.spinbutton.vertical .button:checked:checked {

+spinbutton.vertical entry {

+    border-style: none;

+    border-radius: 0;

+    padding: 5px 1px;

     box-shadow: none;

 }

 

-.spinbutton.vertical .button:first-child {

-    padding: 6px 4px;

-    border-image-width: 3px 3px 0 3px;

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

+spinbutton.vertical button,

+spinbutton.vertical button:focus,

+spinbutton.vertical button:active  {

+    border-style: solid;

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

     border-radius: 4px 4px 0px 0px;

-    box-shadow: inset  0px  2px alpha(#fff, 0.11),

-                inset  2px  0px alpha(#fff, 0.09),

-                inset -2px  0px alpha(#fff, 0.09),

-                inset  0px -2px alpha(#fff, 0.07),

-                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

-                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

-                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),

-                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

+    padding: 6px 0px;

 }

 

-.spinbutton.vertical .button:hover:first-child,

-.spinbutton.vertical .button:checked:first-child {

-    border-radius: 4px 4px 0px 0;

-    border-image: none;

-    color: @internal_element_prelight;

-    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);

-}

-

-.spinbutton.vertical .button:last-child {

-    padding: 6px 4px;

-    border-image-width: 0 3px 4px 3px;

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

+spinbutton.vertical button:last-child {

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

     border-radius: 0px 0px 4px 4px;

-    box-shadow: inset  0px  2px alpha(#fff, 0.11),

-                inset  2px  0px alpha(#fff, 0.09),

-                inset -2px  0px alpha(#fff, 0.09),

-                inset  0px -2px alpha(#fff, 0.07),

-                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

-                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

-                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),

-                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

 }

 

-.spinbutton.vertical .button:hover:last-child,

-.spinbutton.vertical .button:checked:last-child {

-    border-radius: 0px 0px 4px 4px;

-    border-image: none;

-    color: @internal_element_prelight;

+spinbutton.vertical button:hover,

+spinbutton.vertical button:active {

     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);

-}

-

-.spinbutton.vertical.entry {

-   border-image: none;

-    border-color: alpha(@borders, 0.1);

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

-    border-style: none;

-    border-radius: 0;

-    padding: 4px 1px 4px 1px;

-    box-shadow: inset  0px  2px alpha(#fff, 0.11),

-                inset  2px  0px alpha(#fff, 0.09),

-                inset -2px  0px alpha(#fff, 0.09),

-                inset  0px -2px alpha(#fff, 0.07),

-                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

-                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80);

+                inset -1px  0px shade (@theme_selected_bg_color, 1.3);

 }

 

-.spinbutton.vertical.entry:insensitive {

-    padding: 4px 1px 4px 1px;

-    border-color: alpha(@borders, 0.1);

-    box-shadow: inset 1px  0px alpha(@borders, 0.4),

-                inset -1px 0px alpha(@borders, 0.4);

+spinbutton.vertical button:hover:last-child,

+spinbutton.vertical button:active:last-child {

+    box-shadow: 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);

 }

 

-.spinbutton.vertical.entry:focus {

+spinbutton.horizontal entry:focus,

+spinbutton.vertical entry:focus {

     border-color: alpha(@borders, 0.1);

-    box-shadow: inset 1px 0 0 0 @theme_selected_bg_color,

-                inset -1px 0 0 0 @theme_selected_bg_color;

+    box-shadow: inset  0px  1px 0 0 shade (@theme_selected_bg_color, 1.3),

+                inset  1px  0px 0 0 shade (@theme_selected_bg_color, 1.3),

+                inset -1px  0px 0 0 shade (@theme_selected_bg_color, 1.3),

+                inset  0px -1px 0 0 shade (@theme_selected_bg_color, 1.3);

 }

 

 /* volume button */

-GtkGrid .button,

-GtkGrid .button.flat {

+GtkGrid button,

+GtkGrid button.flat {

     transition: all 600ms ease-out;

 }

 

-GtkGrid .button,

-GtkGrid .button.flat,

-GtkGrid .button:hover,

-GtkGrid .button:insensitive,

-GtkGrid .button.flat:hover,

-GtkGrid .button.flat:insensitive {

+GtkGrid button,

+GtkGrid button.flat,

+GtkGrid button:hover,

+GtkGrid button:disabled,

+GtkGrid button.flat:hover,

+GtkGrid button.flat:disabled {

     padding: 5px 4px;

     border-radius: 6px;

     border-color: transparent;

@@ -3084,10 +3085,7 @@ GtkFlowBox .grid-child:selected {
   color: @link_color;

 }

 

-GtkLinkButton,

-GtkLinkButton:hover,

-GtkLinkButton.button.flat,

-GtkLinkButton.button.flat:hover {

+button.flat.link.text-button {

      padding: 4px;

      border-color: transparent;

 }

@@ -3097,132 +3095,93 @@ GtkLinkButton.button.flat:hover {
  * tabs          *

  *****************/

 

-.notebook {

+notebook {

     padding: 0;

     background-clip: border-box;

     background-color: shade (@theme_bg_color, 1.1);

     border-style: solid;

     border-color: @notebook_border;

     border-width: 1px;

-    -GtkNotebook-initial-gap: 0;

-    -GtkNotebook-arrow-spacing: 0;

-    -GtkNotebook-tab-curvature: 0;

-    -GtkNotebook-tab-overlap: 1;

-    -GtkNotebook-has-tab-gap: false;

-    /* FIXME, why this doesn't work? */

-	-GtkNotebook-arrow-scaling: 0.3;

-    -GtkWidget-focus-padding: 0;

-    -GtkWidget-focus-line-width: 0;

-}

-

-.notebook :hover {

-    -gtk-image-effect: highlight;

-    color: @theme_fg_color;

 }

 

-.notebook.frame.top {

-    border-top: 0px;

-    border-radius: 0px 0px 4px 4px;

+notebook.frame:nth-child(even) {

+    border-radius: 0px 4px 4px 0px;

 }

 

-.notebook.frame.bottom {

-    border-bottom: 0px;

-    border-radius: 4px 4px 0px 0px;

+notebook.frame:nth-child(odd){

+    border-radius: 0px 0px 4px 4px;

 }

 

-.notebook.frame.left {

-    border-left: 0px;

-    border-radius: 0px 4px 4px 0px;

+notebook.frame:nth-child(first)  {

+    border-radius: 4px 4px 0px 0px;

 }

 

-.notebook.frame.right {

-    border-right: 0px;

+notebook.frame:nth-child(last){

     border-radius: 4px 0px 0px 4px;

 }

 

-.notebook.header {

+notebook header.top {

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

     background-image: linear-gradient(to bottom,

                                       shade(@theme_bg_color, 0.86),

                                       shade(@theme_bg_color, 1.05));

-    border-radius: 0px;

 }

 

-.notebook.header.top {

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

-}

-

-.notebook.header.bottom {

+notebook header.bottom {

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

+    background-image: linear-gradient(to top,

+                                      shade(@theme_bg_color, 0.86),

+                                      shade(@theme_bg_color, 1.05));

 }

 

-.notebook.header.left {

+notebook header.left {

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

+    background-image: linear-gradient(to right,

+                                      shade(@theme_bg_color, 0.86),

+                                      shade(@theme_bg_color, 1.05));

 }

 

-.notebook.header.right {

+notebook header.right {

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

+    background-image: linear-gradient(to left,

+                                      shade(@theme_bg_color, 0.86),

+                                      shade(@theme_bg_color, 1.05));

 }

 

-/* tabs in view areas, ie. pluma-, caja-tabs */

-GtkPaned.horizontal .notebook.header.top {

-    border-width: 0px;

-}

-

-.notebook.header.frame.top {

-    border-radius: 4px 4px 0px 0px;

-}

-

-.notebook.header.frame.bottom {

-    border-radius: 0px 0px 4px 4px;

-}

-

-.notebook.header.frame.left {

-    border-radius: 4px 0px 0px 4px;

-}

-

-.notebook.header.frame.right {

-    border-radius: 0px 4px 4px 0px;

-}

-

-.notebook tab {

+notebook header tab {

     border-color: transparent;

     border-width: 0px;

     background-image: none;

     background-color: transparent;

 }

 

-.notebook tab GtkLabel {

+notebook header tab label {

     color: mix (@theme_fg_color, @theme_bg_color, 0.40);

     font-weight: normal;

 }

 

-.notebook .prelight-page,

-.notebook .prelight-page GtkLabel {

+notebook header .prelight-page,

+notebook header .prelight-page label {

     color: mix (@theme_fg_color, @theme_bg_color, 0.15);

 }

 

-.notebook .active-page,

-.notebook tab .active-page GtkLabel {

+notebook header .active-page,

+notebook header tab .active-page label {

     color: @theme_fg_color;

 }

 

-/* horizontal tabs */

-

-.notebook tab.top,

-.notebook tab.bottom {

-    padding: 5px 20px 6px;

-}

-

-GtkPaned.horizontal .notebook tab.top {

-    padding: 5px 4px;

+/* tabs in view areas, ie. pluma-, caja-tabs */

+paned.horizontal notebook header tab {

+    padding: 4px;

 }

 

-.notebook tab.top {

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

+paned.horizontal notebook header.top {

+    border-radius: 0px;

+    border-width: 0px;

 }

 

-.notebook tab.top:active,

-.notebook tab.top:hover:active {

+paned.horizontal notebook header.top tab:active,

+paned.horizontal notebook header.top tab:hover:active {

     background-image: linear-gradient(to bottom,

                                       shade(@theme_bg_color, 1.18),

                                       shade(@theme_bg_color, 1.1));

@@ -3233,23 +3192,51 @@ GtkPaned.horizontal .notebook tab.top {
     box-shadow: none;

 }

 

-.notebook tab.top:hover {

+paned.horizontal notebook header.top tab:hover {

     background-image: linear-gradient(to bottom,

                                       alpha(@theme_base_color, 0.0),

                                       alpha(@theme_base_color, 0.3));

     border-radius: 4px 4px 0 0;

+    border-style: none;

+    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80);

+}

+

+/* tabs in dialog windows */

+/* horizontal tabs */

+notebook.frame header.top tab,

+notebook.frame header.bottom tab {

+    padding: 5px 20px 6px;

+}

+

+notebook.frame header.top tab:active,

+notebook.frame header.top tab:hover:active {

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

+                                      shade(@theme_bg_color, 1.18),

+                                      shade(@theme_bg_color, 1.1));

+    border-radius: 4px 4px 0 0;

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

     border-style: solid;

     border-color: @notebook_border;

     box-shadow: none;

 }

 

-.notebook tab.top:active {

-    border-bottom-color: @notebook_active_tab_border;

+notebook.frame header.top tab:hover {

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

+                                      alpha(@theme_base_color, 0.0),

+                                      alpha(@theme_base_color, 0.3));

+    border-radius: 4px 4px 0 0;

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

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

+    border-style: none;

+    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80);

 }

 

-.notebook tab.bottom:active,

-.notebook tab.bottom:hover:active {

+notebook.frame header.bottom tab:active,

+notebook.frame header.bottom tab:hover:active {

     background-image: linear-gradient(to top,

                                       shade(@theme_bg_color, 1.18),

                                       shade(@theme_bg_color, 1.1));

@@ -3260,26 +3247,26 @@ GtkPaned.horizontal .notebook tab.top {
     box-shadow: none;

 }

 

-.notebook tab.bottom:hover {

+notebook.frame header.bottom tab:hover {

     background-image: linear-gradient(to top,

                                       alpha(@theme_base_color, 0.0),

                                       alpha(@theme_base_color, 0.3));

     border-radius: 0 0 4px 4px;

-    border-style: solid;

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

-    border-color: @notebook_border;

+    border-style: none;

     box-shadow: none;

+    box-shadow: inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),

+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

 }

 

 /* vertical tabs */

-

-.notebook tab.left,

-.notebook tab.right {

+notebook.frame header.left tab,

+notebook.frame header.right tab {

     padding: 5px 20px;

 }

 

-.notebook tab.left:active,

-.notebook tab.left:hover:active {

+notebook header.left tab:active,

+notebook header.left tab:hover:active {

     background-image: linear-gradient(to right,

                                       shade(@theme_bg_color, 1.18),

                                       shade(@theme_bg_color, 1.1));

@@ -3287,20 +3274,23 @@ GtkPaned.horizontal .notebook tab.top {
     border-width: 1px 0px 1px 1px;

     border-color: @notebook_border;

     border-radius: 4px 0px 0px 4px;

+    box-shadow: none;

 }

 

-.notebook tab.left:hover {

+notebook header.left tab:hover {

     background-image: linear-gradient(to right,

                                       alpha(@theme_base_color, 0.0),

                                       alpha(@theme_base_color, 0.3));

-    border-style: solid;

+    border-style: none;

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

-    border-color: @notebook_border;

     border-radius: 4px 0px 0px 4px;

+    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

+                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

 }

 

-.notebook tab.right:active,

-.notebook tab.right:hover:active {

+notebook header.right tab:active,

+notebook header.right tab:hover:active {

     background-image: linear-gradient(to left,

                                       shade(@theme_bg_color, 1.18),

                                       shade(@theme_bg_color, 1.1));

@@ -3308,19 +3298,22 @@ GtkPaned.horizontal .notebook tab.top {
     border-width: 1px 1px 1px 0px;

     border-color: @notebook_border;

     border-radius: 0px 4px 4px 0px;

+    box-shadow: none;

 }

 

-.notebook tab.right:hover {

+notebook header.right tab:hover {

     background-image: linear-gradient(to left,

                                       alpha(@theme_base_color, 0.0),

                                       alpha(@theme_base_color, 0.3));

-    border-style: solid;

+    border-style: none;

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

-    border-color: @notebook_border;

     border-radius: 0px 4px 4px 0px;

+    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

+                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),

+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

 }

 

-.notebook tab.reorderable-page:hover {

+notebook tab.reorderable-page:hover {

     background-image: linear-gradient(to bottom,

                                       alpha(@theme_base_color, 0.0),

                                       alpha(@theme_base_color, 0.3));

@@ -3329,7 +3322,7 @@ GtkPaned.horizontal .notebook tab.top {
     border-style: none;

 }

 

-.notebook tab.reorderable-page:active {

+notebook tab.reorderable-page:active {

     background-image: linear-gradient(to bottom,

                                       shade(@theme_bg_color, 1.18),

                                       shade(@theme_bg_color, 1.1));

@@ -3340,7 +3333,8 @@ GtkPaned.horizontal .notebook tab.top {
 

 /* close button styling */

 

-.notebook tab .button {

+notebook button.flat,

+notebook button.flat.small-button {

     color: mix (@theme_fg_color, @theme_bg_color, 0.85);

     border-image: none;

     background-image: none;

@@ -3350,28 +3344,29 @@ GtkPaned.horizontal .notebook tab.top {
     border-color: transparent;

     border-width: 1px;

     padding: 1px;

-    icon-shadow: none;

+    -gtk-icon-shadow: none;

 }

 

-.notebook .prelight-page .button,

-.notebook tab.prelight-page .button,

-.notebook .active-page .button,

-.notebook tab.active-page .button {

+notebook .prelight-page button.flat.small-button,

+notebook .active-page button.flat.small-button {

 	color: mix(@theme_fg_color, @theme_base_color, 0.6);

-	icon-shadow: 0 1px @button_text_shadow;

+	-gtk-icon-shadow: 0 1px @button_text_shadow;

 }

 

-.notebook tab .button:hover {

+notebook button.flat:active,

+notebook button.flat:active:hover,

+notebook button.flat.small-button:active,

+notebook button.flat.small-button:active:hover {

 	color: @theme_fg_color;

 	border-color: alpha(black, 0.1);

 }

 

-.notebook tab .button:active,

-.notebook tab .button:hover:active {

+notebook tab button:active,

+notebook tab button:hover:active {

 	color:  @button_active_text;

 	background-color: alpha(black, 0.08);

 	box-shadow: inset 0 1px alpha(black, 0.05);

-	icon-shadow: 0 1px @button_active_text_shadow;

+	-gtk-icon-shadow: 0 1px @button_active_text_shadow;

 

 	border-color: alpha(black, 0.27)

 		alpha(black, 0.13)

@@ -3379,24 +3374,48 @@ GtkPaned.horizontal .notebook tab.top {
 		alpha(black, 0.13);

 }

 

-.notebook.arrow {

+notebook header.top tabs arrow.up,

+notebook header.bottom tabs arrow.up {

+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");

     color: @theme_fg_color;

 }

 

-.notebook.arrow:hover,

-.notebook.arrow:active {

+notebook header.top tabs arrow.down,

+notebook header.bottom tabs arrow.down {

+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");

+    color: @theme_fg_color;

+}

+

+notebook header.left tabs arrow.up,

+notebook header.right tabs arrow.up {

+    -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");

+    color: @theme_fg_color;

+}

+

+notebook header.left tabs arrow.down,

+notebook header.right tabs arrow.down {

+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");

+    color: @theme_fg_color;

+}

+

+notebook header tabs arrow {

+    color: @theme_fg_color;

+}

+

+notebook header tabs arrow:hover,

+notebook header tabs arrow:active {

     color: @theme_selected_bg_color;

 }

 

-.notebook.arrow:insensitive {

+notebook header tabs arrow:disabled {

     color: rgba(141, 144, 145, 0.3);

 }

 

-.notebook.arrow:backdrop {

+notebook header tabs arrow:backdrop {

     color: rgba(84, 89, 90, 0.4);

 }

 

-.notebook.arrow:backdrop:insensitive {

+notebook header tabs arrow:backdrop:disabled {

     color: #c7c7c7;

 }

 

@@ -3404,28 +3423,35 @@ GtkPaned.horizontal .notebook tab.top {
  * Check and Radio items *

  *************************/

 

-.check,

-.radio,

-.check:insensitive,

-.radio:insensitive {

+check,

+radio,

+check:disabled,

+radio:disabled {

     background-color: transparent;

     border-style: none;

 }

 

-GtkCheckButton,

-GtkCheckButton:hover,

-GtkCheckButton:focus,

-GtkCheckButton:focus:hover,

-GtkCheckButton:focus:hover:active,

-GtkCheckButton:checked,

-GtkCheckButton:checked:hover,

-GtkCheckButton:checked:focus,

-GtkCheckButton:checked:focus:hover,

-GtkCheckButton:checked:focus:hover:active {

+/* move label to the right */

+check,

+radio {

+	padding: 0px 6px 0px 0px;

+}

+

+checkbutton,

+checkbutton:hover,

+checkbutton:focus,

+checkbutton:focus:hover,

+checkbutton:focus:hover:active,

+checkbutton:checked,

+checkbutton:checked:hover,

+checkbutton:checked:focus,

+checkbutton:checked:focus:hover,

+checkbutton:checked:focus:hover:active {

     background-color: transparent;

 }

 

-GtkCheckButton.text-button, GtkRadioButton.text-button {

+checkbutton.text-button,

+radiobutton.text-button {

   padding: 1px;

   outline-offset: 0; }

 

@@ -3433,7 +3459,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
  * Header bars *

  ***************/

 

-.header-bar {

+headerbar {

     border-width: 0 0 1px;

     border-style: solid;

     border-color: shade(@borders, 0.90);

@@ -3443,7 +3469,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     padding: 6px 6px 5px 6px;

 }

 

-.header-bar:backdrop {

+headerbar:backdrop {

     border-image: linear-gradient(to top,

                                   @unfocused_borders,

                                   @unfocused_borders 1px,

@@ -3452,19 +3478,24 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     background-color: @theme_bg_dark_color;

 }

 

-.header-bar .button,

-.header-bar .button:last-child,

-.header-bar .button:first-child,

-.header-bar .button:only-child {

+headerbar button,

+headerbar button:last-child,

+headerbar button:first-child,

+headerbar button:only-child,

+headerbar .linked button,

+headerbar .linked button:last-child,

+headerbar .linked button:first-child,

+headerbar .linked button:only-child {

     background-image: none;

     text-shadow: none;

-    icon-shadow: none;

+    -gtk-icon-shadow: none;

     color: @theme_fg_dark_color;

     border-width: 1px;

     border-radius: 5px;

+    box-shadow: none;

 }

 

-.header-bar:backdrop .button {

+headerbar:backdrop button {

     border-width: 1px;

     border-radius: 5px;

     padding-left:  4px;

@@ -3476,21 +3507,47 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
                                      to   (shade(@theme_unfocused_bg_color, 0.85)));

 }

 

-.header-bar .button:hover:first-child,

-.header-bar .button:checked:first-child,

-.header-bar .button:hover:active:first-child,

-.header-bar .button:checked:hover:first-child,

-.header-bar .button:checked:hover:active:first-child,

-.header-bar .button:hover:last-child,

-.header-bar .button:checked:last-child,

-.header-bar .button:hover:active:last-child,

-.header-bar .button:checked:hover:last-child,

-.header-bar .button:checked:hover:active:last-child,

-.header-bar .button:hover:only-child,

-.header-bar .button:checked:only-child,

-.header-bar .button:hover:active:last-child,

-.header-bar .button:checked:hover:only-child,

-.header-bar .button:checked:hover:active:only-child {

+headerbar button:hover,

+headerbar button:checked,

+headerbar button:hover:active,

+headerbar button:checked:hover,

+headerbar button:checked:hover:active,

+headerbar button:hover:first-child,

+headerbar button:checked:first-child,

+headerbar button:hover:active:first-child,

+headerbar button:checked:hover:first-child,

+headerbar button:checked:hover:active:first-child,

+headerbar button:hover:last-child,

+headerbar button:checked:last-child,

+headerbar button:hover:active:last-child,

+headerbar button:checked:hover:last-child,

+headerbar button:checked:hover:active:last-child,

+headerbar button:hover:only-child,

+headerbar button:checked:only-child,

+headerbar button:hover:active:last-child,

+headerbar button:checked:hover:only-child,

+headerbar button:checked:hover:active:only-child,

+headerbar .linked button:hover,

+headerbar .linked button:checked,

+headerbar .linked button:hover:active,

+headerbar .linked button:checked:hover,

+headerbar .linked button:checked:hover:active,

+headerbar .linked button:hover:first-child,

+headerbar .linked button:checked:first-child,

+headerbar .linked button:hover:active:first-child,

+headerbar .linked button:checked:hover:first-child,

+headerbar .linked button:checked:hover:active:first-child,

+headerbar .linked button:hover:last-child,

+headerbar .linked button:checked:last-child,

+headerbar .linked button:hover:active:last-child,

+headerbar .linked button:checked:hover:last-child,

+headerbar .linked button:checked:hover:active:last-child,

+headerbar .linked button:hover:only-child,

+headerbar .linked button:checked:only-child,

+headerbar .linked button:hover:active:last-child,

+headerbar .linked button:checked:hover:only-child,

+headerbar .linked button:checked:hover:active:only-child {

+    color: shade (@theme_selected_bg_color, 1.6);

     border-width: 1px;

     border-radius: 5px;

     background-image: -gtk-gradient (linear,

@@ -3507,46 +3564,67 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-.header-bar .button:insensitive,

-.header-bar .button:insensitive:last-child,

-.header-bar .button:insensitive:first-child {

+headerbar button:disabled,

+headerbar button:disabled:last-child,

+headerbar button:disabled:first-child {

     color: @theme_text_dark_color;

     background-image: none;

     background-color: @theme_bg_dark_color;

     border-color: @theme_button_border_dark;

     box-shadow: none;

     text-shadow: none;

-    icon-shadow: none;

+    -gtk-icon-shadow: none;

 }

 

-.header-bar .button *:insensitive {

+headerbar button *:disabled {

     background-color: transparent;

     text-shadow: none;

-    icon-shadow: none;

+    -gtk-icon-shadow: none;

 }

 

-.header-bar .button.text-button {

-    padding: 2px 6px;

+headerbar button.text-button,

+headerbar button.text-button.radio,

+headerbar .linked button.text-button,

+headerbar .linked button.text-button.radio {

+    padding: 4px 6px;

 }

  

-.header-bar .button.image-button {

+headerbar button.image-button {

     padding: 5px 5px 6px 5px;

 }

+

+headerbar stackswitcher.linked.stack-switcher button.text-button.radio {

+    border-right-width: 0px;

+    border-left-width:  0px;

+    border-radius: 0px;

+}

+

+headerbar stackswitcher.linked.stack-switcher button.text-button.radio:first-child {

+    border-radius: 6px 0 0 6px;

+    border-width: 1px;

+    border-right-width: 0px;

+}

+

+headerbar stackswitcher.linked.stack-switcher button.text-button.radio:last-child {

+    border-radius: 0 6px 6px 0;

+    border-width: 1px;

+    border-left-width: 0px;

+}

  

-.header-bar .title {

+headerbar title {

     font: Bold 11;

     color: @theme_text_dark_color;

 }

  

-.header-bar .subtitle {

+headerbar .subtitle {

     font: 9;

     color: @theme_text_dark_color;

 }

 

-.header-bar GtkSeparatorToolItem,

-.header-bar .separator,

-.header-bar .separator:insensitive,

-.header-bar .pane-separator {

+headerbar GtkSeparatorToolItem,

+headerbar separator,

+headerbar separator:disabled,

+headerbar paned > separator {

     border-color: alpha (shade(@theme_bg_dark_color, 0.2), 0.24);

     border-bottom-color: @theme_bg_dark_color;

     border-right-color:  @theme_bg_dark_color; 

@@ -3556,12 +3634,12 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
  * GtkAssistant *

  ****************/

 

-GtkAssistant .sidebar .highlight {

+assistant .sidebar highlight {

     color: @theme_text_color;

     font: bold;

 }

 

-GtkAssistant .sidebar {

+assistant .sidebar {

     padding: 5px;

     background-color: shade (@theme_bg_color, 0.97);

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

@@ -3575,23 +3653,12 @@ GtkAssistant .sidebar {
  * Switch *

  **********/

 

-GtkSwitch {

-    padding: 8px; /* 8px to avoid padding list-row issue if active */

-    -GtkSwitch-slider-width: 45px;

+switch,

+switch:backdrop {

+    padding:  4px;

     font-weight: bold;

     font-size: smaller;

-    box-shadow: inset  0px  2px alpha(#fff, 0.11),

-                inset  2px  0px alpha(#fff, 0.09),

-                inset -2px  0px alpha(#fff, 0.09),

-                inset  0px -2px alpha(#fff, 0.07),

-                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

-                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

-                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),

-                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

-}

-

-GtkSwitch.trough,

-GtkSwitch.trough:backdrop {

+    border-radius: 4px;

     border: 1px solid ;

     border-radius: 6px;

     color: @theme_fg_color;

@@ -3613,16 +3680,16 @@ GtkSwitch.trough:backdrop {
     text-shadow: 0 1px rgba(0, 0, 0, 0.1);

 }

 

-GtkSwitch.trough:active,

-GtkSwitch.trough:backdrop:active {

+switch:active,

+switch:backdrop:active {

     background-image: linear-gradient(to bottom,

                                       @theme_selected_bg_color 2px,

                                       shade(@theme_selected_bg_color, 1.2));

     color: white;

 }

 

-GtkSwitch.trough:insensitive,

-GtkSwitch.trough:backdrop:insensitive {

+switch:disabled,

+switch:backdrop:disabled {

     color: @insensitive_fg_color;

     border-color: @insensitive_border_color;

     background-image: none;

@@ -3634,11 +3701,10 @@ GtkSwitch.trough:backdrop:insensitive {
     text-shadow: none;

 }

 

-GtkSwitch.slider,

-GtkSwitch.slider:backdrop {

+switch slider,

+switch slider:backdrop {

     border: 1px solid;

-    border-radius: 6px;

-    color: @theme_fg_color;

+    border-radius: 4px;

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (@button_gradient1),

@@ -3657,14 +3723,13 @@ GtkSwitch.slider:backdrop {
                 inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

                 inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),

                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

-    padding: 2px 4px 2px 2px;

+    padding: 2px;

+    margin: -3px 0px -3px -3px;

 }

 

-GtkSwitch.slider:active,

-GtkSwitch.slider:backdrop:active {

-    color: @theme_fg_color;

+switch:active slider,

+switch:active slider:backdrop {

     border-color: transparent;

-    border-radius: 6px;

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade (@theme_bg_color, 1.20)),

@@ -3675,11 +3740,11 @@ GtkSwitch.slider:backdrop:active {
                 inset  1px  0px shade (@theme_fg_color, 1.0),

                 inset -1px  0px shade (@theme_fg_color, 1.0),

                 inset  0px -1px shade (@theme_fg_color, 1.0);

-    padding: 1px 3px 1px 1px;

+    margin: -3px -3px -3px 0px;

 }

 

-GtkSwitch.slider:insensitive,

-GtkSwitch.slider:backdrop:insensitive {

+switch:disabled slider,

+switch:disabled slider:backdrop {

     background-image: none;

     background-color: @insensitive_bg_color;

     border-color: alpha (#000, 0.00);

@@ -3691,29 +3756,29 @@ GtkSwitch.slider:backdrop:insensitive {
                 inset  0px -1px @insensitive_border_color;

 }

 

-GtkSwitch.slider:insensitive > GtkLabel,

-GtkSwitch.slider:backdrop:insensitive > GtkLabel {

+switch slider:disabled > label,

+switch slider:backdrop:disabled > label {

     color: inherit;

 }

 

-.list-row GtkSwitch,

-.list-row GtkSwitch:backdrop,

-.list-row:selected GtkSwitch,

-.list-row:selected GtkSwitch:backdrop {

+list-row switch,

+list-row switch:backdrop,

+list-row:selected switch,

+list-row:selected switch:backdrop {

     box-shadow: none;

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

 }

 

-.list-row:selected GtkSwitch.slider:dir(rtl) {

+list-row:selected switch.slider:dir(rtl) {

     border-left-color: @borders;

 }

 

-.list-row:selected GtkSwitch.slider:dir(ltr) {

+list-row:selected switch.slider:dir(ltr) {

     border-right-color: @borders;

 }

 

-.list-row:selected GtkSwitch.slider,

-.list-row:selected GtkSwitch.slider:active {

+list-row:selected switch.slider,

+list-row:selected switch.slider:active {

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

 }

 

@@ -3721,8 +3786,8 @@ GtkSwitch.slider:backdrop:insensitive > GtkLabel {
  * image *

  *********/

 

-GtkImage,

-GtkImage:insensitive {

+image,

+image:disabled {

     background-color: transparent;

 }

 

@@ -3734,14 +3799,14 @@ GtkImage:insensitive {
  * viewport *

  ************/

 

-GtkViewport {

+viewport {

     border-width: 0px;

     border-style: none;

     /* Background color and system config gnome-tweak-tools */

     background-color: shade(@theme_bg_color, 1.00);

 }

 

-GtkViewport.frame {

+viewport.frame {

     border-width: 0px;

     border-style: none;

     padding: 0px;

@@ -3751,31 +3816,31 @@ GdMainIconView.content-view {
     -GdMainIconView-icon-size: 40;

 }

 

-GtkIconView.content-view.check {

+iconview.content-view.check {

     background-image: url("assets/grid-selection-unchecked.svg");

     background-color: transparent;

 }

 

-GtkIconView.content-view.check:active {

+iconview.content-view.check:active {

     background-image: url("assets/grid-selection-checked.svg");

     background-color: transparent;

 }

 

-GtkIconView,

-GtkViewport {

+iconview,

+viewport {

     /* avoid resizing theme thumbnails in mate-appearance-properties */

     padding: 0px;

 }

 

-GtkIconView {

+iconview {

     border-width: 0px;

     border-style: none;

     /* background view mate-appearance-properties */

     background-color: @base_color;

 }

 

-GtkIconView.view.cell:selected,

-GtkIconView.view.cell:selected:focus {

+iconview.view.cell:selected,

+iconview.view.cell:selected:focus {

     /* eg. Configuration center */

     background-color: alpha(@theme_selected_bg_color, 0.90);    

     background-image: -gtk-gradient (linear,

@@ -3796,25 +3861,37 @@ GtkIconView.view.cell:selected:focus {
                 inset  1px  0px alpha(#fff, 0.07),

                 inset -1px  0px alpha(#fff, 0.07),

                 inset  0px -1px alpha(#fff, 0.06);

-    -GtkWidget-focus-line-width: 0;

+/*    -GtkWidget-focus-line-width: 0; */

     text-shadow: 0px 1px @theme_selected_shadow_color;

 }

 

-GtkIconView.view.cell:hover,

-GtkIconView.view.cell:hover:focus {

+iconview.view.cell:hover,

+iconview.view.cell:hover:focus {

     background-color: alpha(@theme_selected_bg_color, 0.10);

     border-style: none;

     border-radius: 4px;

 }

 

-.view {

+view,

+.view, 

+view text,

+.view text,

+iconview text,

+textview text {

     background-color: @theme_base_color;

     color: @theme_fg_color;

     text-shadow: 0px 1px @theme_shadow_color;

 }

 

+view,

+view:selected,

+view:selected:focus, 

 .view:selected,

-.view:selected:focus {

+.view:selected:focus, 

+view text selection,

+.view text selection,

+view text selection:focus,

+.view text selection:focus {

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

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

@@ -3825,25 +3902,28 @@ GtkIconView.view.cell:hover:focus {
     text-shadow: none;

 }

 

+.view text selection:focus,

 .view:selected:focus {

     text-shadow: 0px 1px @theme_selected_shadow_color;

 }

 

-GtkTreeView {

-    -GtkWidget-focus-line-width: 0;

-    -GtkWidget-focus-padding: 1;

+treeview {

+/*    -GtkWidget-focus-line-width: 0;

+    -GtkWidget-focus-padding: 1;*/

 }

 

-GtkTreeView.dnd {

+treeview.dnd {

     border-color: @internal_element_color;

     border-radius: 2px;

     border-width: 1px;

     border-style: solid;

 }

 

-GtkTreeView row:nth-child(odd):selected:hover,

-GtkTreeView row:nth-child(even):selected:hover,

-.notebook GtkContainer GtkTreeView row:selected {

+treeview:selected:hover,

+/*does not work in recent GTK versions

+treeview row:nth-child(odd):selected:hover,

+treeview row:nth-child(even):selected:hover,*/

+notebook container treeview:selected {

     background-image: -gtk-gradient (linear,

                                      left top,

                                      left bottom,

@@ -3853,16 +3933,18 @@ GtkTreeView row:nth-child(even):selected:hover,
     color: @theme_selected_fg_color;

 }

 

-GtkTreeView.view row,

-GtkTreeView.view row:focus {

+treeview.view,

+treeview.view:focus {

     background-color: @theme_base_color;

     border-style: none;

 }

 

 .view row:hover,

-GtkTreeView row:nth-child(odd):hover,

-GtkTreeView row:nth-child(even):hover,

-.notebook GtkContainer GtkTreeView row:hover {

+/*does not work in recent GTK versions

+treeview row:nth-child(odd):hover,

+treeview row:nth-child(even):hover,*/

+treeview:hover,

+notebook container treeview:hover {

     background-image: -gtk-gradient (linear,

                                      left top,

                                      left bottom,

@@ -3873,14 +3955,19 @@ GtkTreeView row:nth-child(even):hover,
     text-shadow: none;

 }

 

-column-header {

+/*Keep treeviews from jumping, separators drawn at 0 by default until hovered*/

+treeview.view.separator {

+    min-height: 2px; 

+}

+

+treeview header {

     padding: 0px 2px;

 }

 

-column-header .button,

-column-header .button:focus {

+treeview header button,

+treeview header button:focus {

     padding: 0px 4px 1px;

-    -GtkWidget-focus-line-width: 0; 

+/*    -GtkWidget-focus-line-width: 0; */ 

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@button_base, 1.00)),

@@ -3901,7 +3988,7 @@ column-header .button:focus {
                 inset  0px -1px alpha(#fff, 0.05);

 }

 

-column-header .button:hover {

+treeview header button:hover {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@button_gradient1, 1.03)),

@@ -3921,7 +4008,7 @@ column-header .button:hover {
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-column-header .button:focus:hover:active {

+treeview header button:focus:hover:active {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade (@theme_bg_color, 1.20)),

@@ -3932,7 +4019,7 @@ column-header .button:focus:hover:active {
     box-shadow: none;

 }

 

-column-header .button:insensitive {

+treeview header button:disabled {

     background-image: none;

     background-color: @insensitive_bg_color;

     border-color: @insensitive_border_color;

@@ -3940,15 +4027,15 @@ column-header .button:insensitive {
     box-shadow: none;

 }

 

-column-header .button GtkArrow {

+treeview header button arrow {

     color: @internal_element_color;

 }

 

-column-header:nth-child(last) .button {

+treeview header:nth-child(last) button {

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

 }

 

-row:insensitive {

+row:disabled {

     border-width: 0px;

 }

 

@@ -4001,14 +4088,14 @@ row:selected:focus:backdrop {
     background-image: none;

 }

 

-.app-notification .button,

-.app-notification .header-bar .button.titlebutton,

-.header-bar .app-notification .button.titlebutton,

-.app-notification .titlebar .button.titlebutton,

-.titlebar .app-notification .button.titlebutton,

-.app-notification GtkCalendar.header .button.titlebutton,

-GtkCalendar.header .app-notification .button.titlebutton,

-.app-notification.frame .button {

+.app-notification button,

+.app-notification headerbar button.titlebutton,

+headerbar .app-notification button.titlebutton,

+.app-notification .titlebar button.titlebutton,

+.titlebar .app-notification button.titlebutton,

+.app-notification calendar.header button.titlebutton,

+calendar.header .app-notification button.titlebutton,

+.app-notification.frame button {

     color: @theme_dark_fg_color;

     border-color: rgba(37, 88, 128, 0.7);

     background-image: linear-gradient(to bottom,

@@ -4016,32 +4103,32 @@ GtkCalendar.header .app-notification .button.titlebutton,
     background-clip: padding-box;

     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);

     text-shadow: none;

-    icon-shadow: 0 1px black;

+    -gtk-icon-shadow: 0 1px black;

     outline-color: rgba(238, 238, 236, 0.3);

     border-radius: 3px;

     padding: 0 0px 2px 0px;

 }

 

-.app-notification .button.flat,

-.app-notification .header-bar .titlebutton.button,

-.header-bar .app-notification .titlebutton.button,

-.app-notification .titlebar .titlebutton.button,

-.titlebar .app-notification .titlebutton.button,

-.app-notification GtkCalendar.header .titlebutton.button,

-GtkCalendar.header .app-notification .titlebutton.button,

-.app-notification.frame .button.flat,

-.app-notification.frame .header-bar .titlebutton.button,

-.header-bar .app-notification.frame .titlebutton.button,

-.app-notification.frame .titlebar .titlebutton.button,

-.titlebar .app-notification.frame .titlebutton.button,

-.app-notification.frame GtkCalendar.header .titlebutton.button,

-GtkCalendar.header .app-notification.frame .titlebutton.button {

-    icon-shadow: 0 1px black;

+.app-notification button.flat,

+.app-notification headerbar button.titlebutton,

+headerbar .app-notification button.titlebutton,

+.app-notification .titlebar button.titlebutton,

+.titlebar .app-notification button.titlebutton,

+.app-notification calendar.header button.titlebutton,

+calendar.header .app-notification button.titlebutton,

+.app-notification.frame button.flat,

+.app-notification.frame headerbar button.titlebutton,

+headerbar .app-notification.frame button.titlebutton,

+.app-notification.frame .titlebar button.titlebutton,

+.titlebar .app-notification.frame button.titlebutton,

+.app-notification.frame calendar.header button.titlebutton,

+calendar.header .app-notification.frame button.titlebutton {

+    -gtk-icon-shadow: 0 1px black;

     text-shadow: 0 1px black;

 }

 

-.app-notification .button:hover,

-.app-notification.frame .button:hover {

+.app-notification button:hover,

+.app-notification.frame button:hover {

     color: black;

     border-color: rgba(0, 0, 0, 0.7);

     background-image: linear-gradient(to bottom,

@@ -4049,16 +4136,16 @@ GtkCalendar.header .app-notification.frame .titlebutton.button {
     background-clip: padding-box;

     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);

     text-shadow: none;

-    icon-shadow: 0 1px black;

+    -gtk-icon-shadow: 0 1px black;

     outline-color: rgba(238, 238, 236, 0.3);

     border-radius: 3px;

     padding: 0 0px 2px 0px;

 }

 

-.app-notification .button:checked,

-.app-notification .button:backdrop:checked,

-.app-notification.frame .button:checked,

-.app-notification.frame .button:backdrop:active {

+.app-notification button:checked,

+.app-notification button:backdrop:checked,

+.app-notification.frame button:checked,

+.app-notification.frame button:backdrop:active {

     color: white;

     border-color: rgba(0, 0, 0, 0.7);

     background-image: linear-gradient(to bottom,

@@ -4066,15 +4153,15 @@ GtkCalendar.header .app-notification.frame .titlebutton.button {
     background-clip: padding-box;

     box-shadow: none;

     text-shadow: none;

-    icon-shadow: none;

+    -gtk-icon-shadow: none;

     outline-color: rgba(238, 238, 236, 0.3);

     border-radius: 3px;

 }

 

-.app-notification .button:insensitive,

-.app-notification .button:backdrop:insensitive,

-.app-notification.frame .button:insensitive,

-.app-notification.frame .button:backdrop:insensitive {

+.app-notification button:disabled,

+.app-notification button:backdrop:disabled,

+.app-notification.frame button:disabled,

+.app-notification.frame button:backdrop:disabled {

     color: #878989;

     border-color: rgba(0, 0, 0, 0.7);

     background-image: linear-gradient(to bottom,

@@ -4082,13 +4169,13 @@ GtkCalendar.header .app-notification.frame .titlebutton.button {
     background-clip: padding-box;

     box-shadow: none;

     text-shadow: none;

-    icon-shadow: none;

+    -gtk-icon-shadow: none;

     border-radius: 3px;

     padding: 0px;

 }

 

-.app-notification .button:backdrop,

-.app-notification.frame .button:backdrop {

+.app-notification button:backdrop,

+.app-notification.frame button:backdrop {

     color: #eeeeec;

     border-color: rgba(0, 0, 0, 0.7);

     background-image: linear-gradient(to bottom,

@@ -4096,7 +4183,7 @@ GtkCalendar.header .app-notification.frame .titlebutton.button {
     background-clip: padding-box;

     box-shadow: none;

     text-shadow: none;

-    icon-shadow: none;

+    -gtk-icon-shadow: none;

     border-radius: 3px;

     padding: 0px;

 }

@@ -4105,67 +4192,71 @@ GtkCalendar.header .app-notification.frame .titlebutton.button {
  * Expanders *

  *************/

 

-GtkTreeView.view.expander {

+treeview.view.expander {

     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");

     color: @theme_fg_color;

 }

 

- GtkTreeView.view.expander:dir(rtl) {

+treeview.view.expander:dir(rtl) {

      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");

 }

 

-GtkTreeView.view.expander:checked {

+treeview.view.expander:checked {

     -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");

  }

 

-GtkTreeView.view.expander:hover {

+treeview.view.expander:hover {

     color: @theme_selected_bg_color;

 }

 

-GtkTreeView.view.expander:selected,

-GtkTreeView.view.expander:selected:hover {

+treeview.view.expander:selected,

+treeview.view.expander:selected:hover {

     color: @theme_selected_fg_color;

 }

 

-GtkExpander {

+expander arrow {

     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");

 }

 

-GtkExpander:dir(rtl) {

+expander arrow:dir(rtl) {

     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");

 }

 

-GtkExpander:hover {

+expander arrow:hover {

     color: @internal_element_color;

 }

 

-GtkExpander:checked {

+expander arrow:checked {

     -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");

 }

 

 /* why this weird padding, possible issue with gtk+-3.18 ? */

-GtkExpander {

+expander arrow {

+    min-width: 16px;

+    min-height: 16px;

     -GtkExpander-expander-size: 14;

     padding: 0px 4px 0px 0px;

 }

 

-.expander {

+expander {

     color: @theme_fg_color;

     border-color: @theme_fg_color;

 }

 

-.expander:checked {

+expander:checked {

     color: @theme_selected_bg_color;

     border-color: @theme_selected_bg_color;

 }

 

-.expander:hover {

+expander:hover {

     color: @internal_element_color;

     border-color: @internal_element_color;

 }

 

-.expander row:selected,

-.expander row:selected:focus {

+expander title:selected,

+expander title:selected:focus,

+.expander title:selected,

+.expander title:selected:focus {

     border-style: solid;

     border-width: 1px;

     border-color: @expander_row_selected_color;

@@ -4173,8 +4264,10 @@ GtkExpander {
     background-color: @theme_selected_bg_color;

 }

 

-.expander row:selected:hover,

-.expander row:selected:focus:hover {

+expander title:selected:hover,

+expander title:selected:focus:hover,

+.expander title:selected:hover,

+.expander title:selected:focus:hover {

     color: @theme_selected_fg_color;

     border-color: @theme_selected_fg_color;

 }

@@ -4183,23 +4276,25 @@ GtkExpander {
  * List boxes *

  **************/

 

-.list {

+list {

     background-color: @list_box_bg;

 }

 

-.list .separator.horizontal {

+list .separator.horizontal {

     background-color: @theme_base_color;

     border-width: 0px;

 }

 

-.list-row {

+list row,

+list row.activatable {

     padding: 2px;

     transition: all 200ms ease-in;

     background-image: none;

     background-color: @theme_base_color;

 }

 

-.list-row:hover {

+list row:hover,

+list row.activatable:hover {

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

     background-image: -gtk-gradient (linear,

                                      left top,

@@ -4212,15 +4307,18 @@ GtkExpander {
                 inset -1px  0px shade (@theme_selected_bg_color, 1.3),

                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

     text-shadow: none;

-    icon-shadow: none;

+    -gtk-icon-shadow: none;

     border-image: none;

     border-radius: 6px;

     border-style: solid;

 }

 

-.list-row:selected,

-.list-row:selected:hover,

-.list-row:selected:hover:active {

+list row:selected,

+list row:selected:hover,

+list row:selected:hover:active,

+list row.activatable:selected,

+list row.activatable:selected:hover,

+list row.activatable:selected:hover:active {

     border-width: 0;

     border-radius: 0px;

     border-style: none;

@@ -4232,8 +4330,10 @@ GtkExpander {
     color: @theme_selected_fg_color;

 }

 

-.list-row:selected:backdrop,

-.list-row:selected:backdrop:hover {

+list row:selected:backdrop,

+list row:selected:backdrop:hover,

+list row.activatable:selected:backdrop,

+list row.activatable:selected:backdrop:hover {

     border-width: 0;

     border-style: solid;

     border-color: shade (@theme_bg_color, 0.85);

@@ -4249,20 +4349,20 @@ GtkExpander {
  * Calendar   *

  **************/

 

-GtkCalendar {

+calendar {

     border-radius: 3px;

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

     padding: 1px 1px 3px 1px;

 }

 

-GtkCalendar.view {

+calendar.view {

     border-radius: 3px;

     border-style: solid;

     border-width: 1px;

     padding: 2px;

 }

 

-GtkCalendar.header {

+calendar.header {

     border-radius: 3px 3px 0px 0px;

     background-image: linear-gradient(to bottom,

                                       shade(@theme_bg_color, 1.04),

@@ -4270,10 +4370,10 @@ GtkCalendar.header {
     border-width: 0;

 }

 

-GtkCalendar.expander,

-GtkCalendar.button,

-GtkCalendar.button.flat,

-GtkCalendar.button:insensitive {

+calendar.expander,

+calendar.button,

+calendar.button.flat,

+calendar.button:disabled {

     border-color: transparent;

     background-image: none;

     background-color: transparent;

@@ -4282,15 +4382,15 @@ GtkCalendar.button:insensitive {
 }

 

 /* disable shadows and button background on arrows */

-GtkCalendar.button:first-child,

-GtkCalendar.button:last-child {

+calendar.button:first-child,

+calendar.button:last-child {

     box-shadow: none;

     background-image: none;

 }

 

 /* disable button background on arrows */

-GtkCalendar.button:hover:first-child,

-GtkCalendar.button:hover:last-child {

+calendar.button:hover:first-child,

+calendar.button:hover:last-child {

     background-image: none;

     border-radius: 3px;

     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),

@@ -4299,8 +4399,8 @@ GtkCalendar.button:hover:last-child {
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-.highlight,

-GtkCalendar.highlight {

+highlight,

+calendar.highlight {

     background-color: @theme_selected_bg_color;

     color: @theme_selected_fg_color;

     border-radius: 0px;

@@ -4309,10 +4409,10 @@ GtkCalendar.highlight {
     border-color: transparent;

 }

 

-.menuitem GtkCalendar,

-.menuitem GtkCalendar.button,

-.menuitem GtkCalendar.header,

-.menuitem GtkCalendar.view {

+menuitem calendar,

+menuitem calendar.button,

+menuitem calendar.header,

+menuitem calendar.view {

     background-color: shade(@theme_bg_dark_color, 0.82);

     background-image: none;

     border-radius: 0px;

@@ -4322,7 +4422,7 @@ GtkCalendar.highlight {
     color: @theme_base_color;

 }

 

-.menuitem GtkCalendar {

+menuitem calendar {

     background-color: shade (@menu_bg_color, 1.3);

     background-image: none;

 }

@@ -4331,7 +4431,7 @@ GtkCalendar.highlight {
  * GtkInfoBar *

  **************/

 

-GtkInfoBar {

+infobar {

     border-width: 0;

     border-style: none;

 }

@@ -4350,54 +4450,54 @@ GtkInfoBar {
     color: @warning_fg_color;

 }

 

-.info .button.close,

-.warning .button.close,

-.question .button.close,

-.error .button.close {

+.info button.close,

+.warning button.close,

+.question button.close,

+.error button.close {

     color: @theme_fg_color;

-    icon-shadow: none;

+    -gtk-icon-shadow: none;

 }

 

-.info .button.close:hover,

-.warning .button.close:hover,

-.question .button.close:hover,

-.error .button.close:hover {

+.info button.close:hover,

+.warning button.close:hover,

+.question button.close:hover,

+.error button.close:hover {

     background-image: linear-gradient(to bottom,

                                       alpha(white, 0.3),

                                       alpha(white, 0.2) 30%,

                                       alpha(black, 0.02));

 }

 

-.info .button.close:checked,

-.warning .button.close:checked,

-.question .button.close:checked,

-.error .button.close:checked {

+.info button.close:checked,

+.warning button.close:checked,

+.question button.close:checked,

+.error button.close:checked {

     color: @infobar_fg_color;

     background-image: linear-gradient(to bottom,

                                       alpha(black, 0.1),

                                       transparent);

 }

 

-.info .entry,

-.info .entry:focus,

-.info .button,

-.info .button:insensitive,

-.info .button:checked,

-.warning .entry,

-.warning .entry:focus,

-.warning .button,

-.warning .button:insensitive,

-.warning .button:checked,

-.error .entry,

-.error .entry:focus,

-.error .button,

-.error .button:insensitive,

-.error .button:checked,

-.question .entry,

-.question .entry:focus,

-.question .button,

-.question .button:insensitive,

-.question .button:checked {

+entry.info,

+entry.info:focus,

+.info button,

+.info button:disabled,

+.info button:checked,

+entry.warning,

+entry.warning:focus,

+.warning button,

+.warning button:disabled,

+.warning button:checked,

+entry.error,

+entry.error:focus,

+.error button,

+.error button:disabled,

+.error button:checked,

+entry.question,

+entry.question:focus,

+.question button,

+.question button:disabled,

+.question button:checked {

     color: @theme_fg_color;

     border-color: darker(@info_bg_color);

     border-style: solid;

@@ -4405,7 +4505,7 @@ GtkInfoBar {
 }

 

 /* Warning Bar */

-GtkInfoBar.horizontal.error {

+infobar.horizontal.error {

     background-color: @error_bg_color;

     color: @error_fg_color;

     border-color: darker(@error_bg_color);

@@ -4414,14 +4514,14 @@ GtkInfoBar.horizontal.error {
 }

 

 /* Question Bar */

-GtkInfoBar.horizontal.info .horizontal {

+infobar.horizontal.info .horizontal {

     background-color: @question_bg_color;

     color: @question_fg_color;

 }

 

-GtkInfoBar.horizontal.info .horizontal .button.flat.raised.close,

-GtkInfoBar.horizontal.info .horizontal .button.flat.raised.close:hover,

-GtkInfoBar.horizontal.info .horizontal .button.flat.raised.close:checked {

+infobar.horizontal.info .horizontal button.flat.raised.close,

+infobar.horizontal.info .horizontal button.flat.raised.close:hover,

+infobar.horizontal.info .horizontal button.flat.raised.close:checked {

     border-radius: 3px;

     box-shadow: none;

 }

@@ -4431,7 +4531,7 @@ GtkInfoBar.horizontal.info .horizontal .button.flat.raised.close:checked {
  ***************/

 

 .prompt,

-GtkMessageDialog {

+messagedialog {

     -GtkDialog-content-area-border: 0;

     -GtkDialog-action-area-border: 12;

     -GtkDialog-button-spacing: 0;

@@ -4440,18 +4540,18 @@ GtkMessageDialog {
 }

 

 /* ie. mate-keyboard-properties option window */

-GtkDialog GtkScrolledWindow.frame {

+dialog scrolledwindow.frame {

     border-color: @notebook_border;

     border-style: solid;

     border-width: 1px;

     border-radius: 2px;

 }

 

-GtkDialog GtkScrolledWindow.frame GtkViewport .vertical {

+dialog scrolledwindow.frame viewport .vertical {

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

 }

 

-GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical {

+dialog scrolledwindow.frame viewport .vertical expander .vertical {

     background-color: @theme_base_color;

     border-radius: 3px;

     border-color: @notebook_border;

@@ -4460,71 +4560,71 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical {
 }

 

 /* middle buttons */

-.dialog-action-area.linked .button,

-.dialog-action-area.linked .button:focus,

-.dialog-action-area.linked .button:hover,

-.dialog-action-area.linked .button:focus:hover,

-.dialog-action-area.linked .button:focus:hover:active,

-.dialog-action-area.linked .button:checked,

-.dialog-action-area.linked .button:checked:hover,

-.dialog-action-area.linked .button:checked:hover:active,

-.dialog-action-area.linked .button:insensitive {

+.dialog-action-area.linked button,

+.dialog-action-area.linked button:focus,

+.dialog-action-area.linked button:hover,

+.dialog-action-area.linked button:focus:hover,

+.dialog-action-area.linked button:focus:hover:active,

+.dialog-action-area.linked button:checked,

+.dialog-action-area.linked button:checked:hover,

+.dialog-action-area.linked button:checked:hover:active,

+.dialog-action-area.linked button:disabled {

     border-right-width: 0px;

     border-left-width:  0px;

     border-width: 1px 0;

     border-radius: 0;

-    padding: 1px 2px;

+    padding: 6px 4px;

 }

 

 /* left button */

-.dialog-action-area.linked .button:first-child,

-.dialog-action-area.linked .button:focus:first-child,

-.dialog-action-area.linked .button:hover:first-child,

-.dialog-action-area.linked .button:focus:hover:first-child,

-.dialog-action-area.linked .button:focus:hover:active:first-child,

-.dialog-action-area.linked .button:checked:first-child,

-.dialog-action-area.linked .button:checked:hover:first-child,

-.dialog-action-area.linked .button:checked:hover:active:first-child,

-.dialog-action-area.linked .button:insensitive:first-child {

+.dialog-action-area.linked button:first-child,

+.dialog-action-area.linked button:focus:first-child,

+.dialog-action-area.linked button:hover:first-child,

+.dialog-action-area.linked button:focus:hover:first-child,

+.dialog-action-area.linked button:focus:hover:active:first-child,

+.dialog-action-area.linked button:checked:first-child,

+.dialog-action-area.linked button:checked:hover:first-child,

+.dialog-action-area.linked button:checked:hover:active:first-child,

+.dialog-action-area.linked button:disabled:first-child {

     border-radius: 6px 0 0 6px;

     border-width: 1px;

     border-right-width: 0;

-    padding: 1px 2px;

+    padding: 6px 4px;

 }

 

 /* right button */

-.dialog-action-area.linked .button:last-child,

-.dialog-action-area.linked .button:focus:last-child,

-.dialog-action-area.linked .button:hover:last-child,

-.dialog-action-area.linked .button:focus:hover:last-child,

-.dialog-action-area.linked .button:focus:hover:active:last-child,

-.dialog-action-area.linked .button:checked:last-child,

-.dialog-action-area.linked .button:checked:hover:last-child,

-.dialog-action-area.linked .button:checked:hover:active:last-child,

-.dialog-action-area.linked .button:insensitive:last-child {

+.dialog-action-area.linked button:last-child,

+.dialog-action-area.linked button:focus:last-child,

+.dialog-action-area.linked button:hover:last-child,

+.dialog-action-area.linked button:focus:hover:last-child,

+.dialog-action-area.linked button:focus:hover:active:last-child,

+.dialog-action-area.linked button:checked:last-child,

+.dialog-action-area.linked button:checked:hover:last-child,

+.dialog-action-area.linked button:checked:hover:active:last-child,

+.dialog-action-area.linked button:disabled:last-child {

     border-width: 1px;

     border-radius: 0 6px 6px 0;

     border-left-width: 0;

-    padding: 1px 2px;

+    padding: 6px 4px;

 }

 

 /* single button */

-.dialog-action-area.linked .button:only-child,

-.dialog-action-area.linked .button:focus:only-child,

-.dialog-action-area.linked .button:hover:only-child,

-.dialog-action-area.linked .button:focus:hover:only-child,

-.dialog-action-area.linked .button:focus:hover:active:only-child,

-.dialog-action-area.linked .button:checked:only-child,

-.dialog-action-area.linked .button:checked:hover:only-child,

-.dialog-action-area.linked .button:checked:hover:active:only-child,

-.dialog-action-area.linked .button:insensitive:last-child {

+.dialog-action-area.linked button:only-child,

+.dialog-action-area.linked button:focus:only-child,

+.dialog-action-area.linked button:hover:only-child,

+.dialog-action-area.linked button:focus:hover:only-child,

+.dialog-action-area.linked button:focus:hover:active:only-child,

+.dialog-action-area.linked button:checked:only-child,

+.dialog-action-area.linked button:checked:hover:only-child,

+.dialog-action-area.linked button:checked:hover:active:only-child,

+.dialog-action-area.linked button:disabled:last-child {

     padding-left:  6px;

     padding-right: 6px;

     border-width: 1px;

     border-radius: 6px;

 }

 

-.dialog-action-area.linked .button:only-child {

+.dialog-action-area.linked button:only-child {

     border-width: 0px;

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

@@ -4542,14 +4642,14 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical {
                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

 }

 

-.dialog-action-area.linked .button:focus:only-child {

+.dialog-action-area.linked button:focus:only-child {

     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);

 }

 

-.dialog-action-area.linked .button:hover:only-child {

+.dialog-action-area.linked button:hover:only-child {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@button_gradient1, 1.03)),

@@ -4558,7 +4658,7 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical {
                                      to   (shade(@button_gradient4, 1.01)));

 }

 

-.dialog-action-area.linked .button:active:only-child {

+.dialog-action-area.linked button:active:only-child {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade (@theme_bg_color, 1.20)),

@@ -4567,10 +4667,10 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical {
                                      to (shade (@theme_bg_color, 0.80)));

 }

 

-.dialog-action-area.linked .button.suggested-action,

-.dialog-action-area.linked .button.suggested-action:active,

-.dialog-action-area.linked .button.suggested-action:checked,

-.dialog-action-area.linked .button.suggested-action:insensitive {

+.dialog-action-area.linked button.suggested-action,

+.dialog-action-area.linked button.suggested-action:active,

+.dialog-action-area.linked button.suggested-action:checked,

+.dialog-action-area.linked button.suggested-action:disabled {

     box-shadow: none;

 }

 

@@ -4618,15 +4718,11 @@ GtkOverlay.osd {
     background-origin: border-box;

 }

 

-.osd.button:focus,

-.osd.button:checked,

-.osd.button:hover:active,

-.osd.button:focus:hover:active,

-.osd .button,

-.osd .button:focus,

-.osd .button:checked,

-.osd .button:hover:active,

-.osd .button:focus:hover:active {

+.osd button,

+.osd button:focus,

+.osd button:checked,

+.osd button:hover:active,

+.osd button:focus:hover:active {

     border-width: 1px;

     border-style: solid;

     border-image: none;

@@ -4635,23 +4731,21 @@ GtkOverlay.osd {
     box-shadow: none;

 }

 

-.osd.button,

-.osd.button:hover,

-.osd.button:checked {

+.osd button,

+.osd button:hover,

+.osd button:checked {

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

     border-radius: 5px;

     border-color: @osd_button_border;

 }

 

-.osd .button,

-.osd .button:hover,

-.osd .button:checked {

+.osd button:hover,

+.osd button:checked {

     background-color: transparent;

     box-shadow: none;

 }

 

-.osd.button:insensitive,

-.osd .button:insensitive {

+.osd button:disabled {

     background-image: none;

     border-color: @osd_button_bg_insensitive;

     background-color: transparent;

@@ -4659,17 +4753,14 @@ GtkOverlay.osd {
     color: @osd_button_fg_insensitive;

 }

 

-.osd.button:checked:insensitive,

-.osd .button:checked:insensitive {

+.osd button:checked:disabled {

     background-image: none;

     background-color: @osd_button_bg_insensitive_active;

     color: @osd_button_fg_insensitive;

 }

 

-.osd.button,

-.osd.button:focus,

-.osd .button,

-.osd .button:focus {

+.osd button,

+.osd button:focus {

     padding: 4px;

     background-image: linear-gradient(to bottom,

                                       @osd_button_bg_a,

@@ -4677,12 +4768,11 @@ GtkOverlay.osd {
                                       @osd_button_bg_c);

     color: @osd_button_fg;

     text-shadow: 0 -1px @osd_button_shadow;

-    icon-shadow: 0 -1px @osd_button_shadow;

+    -gtk-icon-shadow: 0 -1px @osd_button_shadow;

 }

 

-.osd.button:hover,

-.osd .button:hover,

-.osd .linked .button:hover {

+.osd button:hover,

+.osd .linked button:hover {

     background-image: linear-gradient(to bottom,

                                       @osd_button_bg_hover_a,

                                       @osd_button_bg_hover_b 68%,

@@ -4690,17 +4780,12 @@ GtkOverlay.osd {
     color: @osd_button_fg_hover;

 }

 

-.osd.button:checked,

-.osd.button:checked:hover,

-.osd.button:checked:hover:active,

-.osd.button:hover:active,

-.osd.button:focus:hover:active,

-.osd .button:checked,

-.osd .button:checked:hover,

-.osd .button:checked:hover:active,

-.osd .button:hover:active,

-.osd .button:focus:hover:active,

-.osd GtkMenuButton.button:checked {

+.osd button:checked,

+.osd button:checked:hover,

+.osd button:checked:hover:active,

+.osd button:hover:active,

+.osd button:focus:hover:active,

+.osd button.menu-button:checked {

     background-image: linear-gradient(to bottom,

                                       @osd_button_bg_active_a,

                                       @osd_button_bg_active_b 68%,

@@ -4709,13 +4794,13 @@ GtkOverlay.osd {
     text-shadow: 0 -1px @osd_button_shadow;

 }

 

-.osd GtkMenuButton.button:checked {

+.osd button.menu-button:checked {

     background-color: transparent;

     border-color: @osd_button_border;

 }

 

 /* gnome-weather */

-.linked.stack-switcher.osd .button {

+.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));

@@ -4723,7 +4808,7 @@ GtkOverlay.osd {
     box-shadow: none;

 }

 

-.linked.stack-switcher.osd .button:hover {

+.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));

@@ -4731,34 +4816,34 @@ GtkOverlay.osd {
 

 }

 

-.linked.stack-switcher.osd .button {

+.linked stackswitcher.osd button {

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

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

 }

 

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

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

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

 }

 

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

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

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

 }

 

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

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

     border-width: 1px;

 }

 

 /* ie. parole media-player */

 /* previous/play/next */

-.osd .horizontal .horizontal .button {

+.osd .horizontal .horizontal button {

     padding: 5px 8px;

 }

 

-.osd .horizontal .horizontal .button:insensitive {

-    border-color: @osd_button_bg_insensitive;

+.osd .horizontal .horizontal button:disabled {

+    border-color: @osd_button_bg_disabled;

 }

 

-.osd .horizontal .horizontal .label {

+.osd .horizontal .horizontal label {

     padding: 5px 5px;

     background-color: transparent;

     background-image: linear-gradient(to bottom,

@@ -4772,12 +4857,12 @@ GtkOverlay.osd {
 }

 

 /* ie. volume button */

-.osd .horizontal .button,

-.osd .horizontal .button:hover {

+.osd .horizontal button,

+.osd .horizontal button:hover {

     padding: 5px 8px;

 }

 

-.osd.toolbar {

+toolbar.osd {

     color: @osd_fg;

     text-shadow: 0 1px @osd_text_shadow;

     padding: 10px;

@@ -4792,62 +4877,62 @@ GtkOverlay.osd {
     -GtkToolbar-button-relief: normal;

 }

 

-.osd.toolbar .button,

-.osd.toolbar .button:hover,

-.osd.toolbar .linked .button {

+toolbar.osd button,

+toolbar.osd button:hover,

+toolbar.osd .linked button {

     padding: 6px;

     border-width: 1px;

     border-radius: 5px;

 }

 

-.osd.toolbar .button:first-child,

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

+toolbar.osd button:first-child,

+toolbar.osd .linked button:first-child {

     border-radius: 5px 0 0 5px;

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

     box-shadow: inset -1px 0 @osd_button_inset;

 }

 

-.osd.toolbar .button:last-child,

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

+toolbar.osd button:last-child,

+toolbar.osd .linked button:last-child {

     box-shadow: none;

     border-radius: 0 5px 5px 0;

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

 }

 

-.osd.toolbar .button:only-child,

-.osd.toolbar .linked .button:only-child,

-.osd.toolbar GtkToolButton .button,

-.osd.toolbar GtkToolButton:only-child .button,

-.osd.toolbar GtkToolButton:last-child .button,

-.osd.toolbar GtkToolButton:first-child .button {

+toolbar.osd button:only-child,

+toolbar.osd .linked button:only-child,

+toolbar.osd toolitem button,

+toolbar.osd toolitem button:only-child,

+toolbar.osd toolitem button:last-child,

+toolbar.osd toolitem button:first-child {

     border-width: 1px;

     border-radius: 5px;

     border-style: solid;

     box-shadow: none;

 }

 

-.osd.toolbar .separator {

+toolbar.osd separator {

     color: shade(@osd_lowlight, 0.80);

 }

 

 /* used by gnome-settings-daemon's media-keys OSD

    and Epiphany */

-.osd.trough {

+.osd trough {

     background-color: @osd_trough_bg;

     border-width: 0;

 }

 

-.osd.progressbar {

+.osd progressbar {

     background-color: @osd_fg;

 }

 

-.osd .scale.trough:insensitive,

-.osd .scale.trough.highlight:insensitive {

+.osd scale trough:disabled,

+.osd scale trough.highlight:disabled {

     background-image: none;

     background-color: transparent;

 }

 

-.osd .scale-popup.popover.background {

+.osd popover.background.scale-popup {

     color: @osd_fg;

     border-style: solid;

     border-width: 1px;

@@ -4859,7 +4944,7 @@ GtkOverlay.osd {
     background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4);

 }

 

-.osd .popover.scale-popup .flat.button.image-button {

+.osd popover.background.scale-popup button.flat.image-button {

     background-image: linear-gradient(to bottom,

                                       @osd_button_bg_a,

                                       @osd_button_bg_b 68%,

@@ -4871,16 +4956,16 @@ GtkOverlay.osd {
     padding: 2px;

 }

 

-.osd .popover.scale-popup .flat.button.image-button:hover {

+.osd popover.background.scale-popup button.flat.image-button:hover {

     background-image: linear-gradient(to bottom,

                                       @osd_button_bg_hover_a,

                                       @osd_button_bg_hover_b 68%,

                                       @osd_button_bg_hover_c);

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

-    -gtk-image-effect: highlight;

+/*    -gtk-image-effect: highlight; */

 }

 

-.osd .popover.scale-popup .flat.button.image-button:insensitive {

+.osd popover.background.scale-popup button.flat.image-button:disabled {

     background-image: none;

     background-color: transparent;

     border-image: none;

@@ -4888,16 +4973,16 @@ GtkOverlay.osd {
     box-shadow: none;

 }

 

-.osd GtkProgressBar,

-GtkProgressBar.osd {

+.osd progressbar,

+progressbar .osd {

     padding: 0;

     -GtkProgressBar-xspacing: 0;

     -GtkProgressBar-yspacing: 3px;

     -GtkProgressBar-min-horizontal-bar-height: 3px;

 }

 

-.osd GtkProgressBar.trough,

-GtkProgressBar.osd.trough {

+.osd progressbar trough,

+progressbar .osd trough {

     padding: 0;

     border-image: none;

     border-style: none;

@@ -4907,37 +4992,36 @@ GtkProgressBar.osd.trough {
     border-radius: 0;

 }

 

-.osd GtkProgressBar.progressbar,

-GtkProgressBar.osd.progressbar {

+.osd progressbar,

+progressbar .osd {

     border-style: none;

     background-color: @theme_selected_bg_color;

     background-image: none;

     border-radius: 0;

 }

 

-.osd .view,

-.osd.view {

+.osd view {

     background-color: @osd_view_bg;

 }

 

-.osd .scrollbar.trough {

+.osd scrollbar trough.trough {

     background-color: @osd_scrollbar_trough;

 }

 

-.osd .scrollbar.slider {

+.osd scrollbar trough.slider {

     background-color: @osd_scrollbar_slider;

 }

 

-.osd .scrollbar.slider:hover {

+.osd scrollbar trough.slider:hover {

     background-color: @osd_scrollbar_slider_prelight;

 }

 

-.osd .scrollbar.slider:active {

+.osd scrollbar trough.slider:active {

     background-color: @osd_scrollbar_slider_active;

 }

 

-.osd GtkIconView.cell:selected,

-.osd GtkIconView.cell:selected:focus {

+.osd iconview.cell:selected,

+.osd iconview.cell:selected:focus {

     background-color: transparent;

     border-style: solid;

     border-radius: 15px;

@@ -4959,7 +5043,7 @@ GtkProgressBar.osd.progressbar {
  * Popovers *

  *************/

 

-.popover {

+popover {

     background-clip: initial;

     margin: 10px;

     padding: 2px;

@@ -4970,42 +5054,41 @@ GtkProgressBar.osd.progressbar {
     background-color: @bg_dark_color;

     box-shadow: 0 1px 5px @wm_shadow;

     text-shadow: none;

-    icon-shadow: none;

-}

-

-.popover > .list,

-.popover > .view,

-.popover > .toolbar .popover.osd > .toolbar,

-.popover > .inline-toolbar .popover.osd > .toolbar,

-.popover > .search-bar .popover.osd > .toolbar,

-.popover > .location-bar .popover.osd > .toolbar,

-.popover > .toolbar .popover.osd > .inline-toolbar,

-.popover > .inline-toolbar .popover.osd > .inline-toolbar,

-.popover > .search-bar .popover.osd > .inline-toolbar,

-.popover > .location-bar .popover.osd > .inline-toolbar,

-.popover > .toolbar .popover.osd > .search-bar,

-.popover > .inline-toolbar .popover.osd > .search-bar,

-.popover > .search-bar .popover.osd > .search-bar,

-.popover > .location-bar .popover.osd > .search-bar,

-.popover > .toolbar .popover.osd > .location-bar,

-.popover > .inline-toolbar .popover.osd > .location-bar,

-.popover > .search-bar .popover.osd > .location-bar,

-.popover > .location-bar .popover.osd > .location-bar {

+    -gtk-icon-shadow: none;

+}

+

+popover > list,

+popover > .view,

+popover > toolbar popover.osd > toolbar,

+popover > .inline-toolbar popover.osd > toolbar,

+popover > searchbar popover.osd > toolbar,

+popover > .location-bar popover.osd > toolbar,

+popover > toolbar popover.osd > .inline-toolbar,

+popover > .inline-toolbar .popover.osd > .inline-toolbar,

+popover > searchbar popover.osd > .inline-toolbar,

+popover > .location-bar popover.osd > .inline-toolbar,

+popover > toolbar popover.osd > searchbar,

+popover > .inline-toolbar popover.osd > searchbar,

+popover > searchbar popover.osd > searchbar,

+popover > .location-bar popover.osd > searchbar

+popover > .inline-toolbar popover.osd > .location-bar,

+popover > searchbar popover.osd > .location-bar,

+popover > .location-bar popover.osd > .location-bar {

     border-style: none;

     background-color: transparent;

 }

 

-.popover .separator {

+popover separator {

     font-size: 80%;

     font-weight: bold;

     color: alpha(@theme_fg_dark_color,0.6);

     text-shadow: none;

     background-color: transparent;

-    icon-shadow: none;

+    -gtk-icon-shadow: none;

     border: 0;

 }

 

-.popover.osd {

+popover.osd {

     background-image: none;

     background-color: alpha(shade(#3D3E40, 0.85), 0.75);

     border: 1px solid black;

@@ -5013,27 +5096,27 @@ GtkProgressBar.osd.progressbar {
     color: @theme_selected_fg_color;

 }

 

-.popover.osd .toolbar {

+popover.osd toolbar {

     background-image: none;

     background-color: transparent;

     border: none;

     box-shadow: none;

 }

 

-.popover.osd .button {

+popover.osd button {

     text-shadow: 0 -1px @osd_text_shadow;

-    icon-shadow: 0 -1px @osd_text_shadow;

+    -gtk-icon-shadow: 0 -1px @osd_text_shadow;

 }

 

-.popover.osd .button:checked {

+popover.osd button:checked {

     box-shadow: none;

 }

 

-.popover.osd .button:insensitive {

+popover.osd button:disabled {

     color: alpha(@theme_selected_fg_color, 0.4);

 }

 

-.popover.scale-popup .flat.button.image-button:insensitive {

+popover.background.scale-popup button.flat.image-button:disabled {

     background-image: none;

     background-color: transparent;

     border-image: none;

@@ -5041,7 +5124,7 @@ GtkProgressBar.osd.progressbar {
     box-shadow: none;

 }

 

-.popover.scale-popup .flat.button.image-button {

+popover.background.scale-popup button.flat.image-button {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -5053,20 +5136,20 @@ GtkProgressBar.osd.progressbar {
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-.popover.scale-popup .flat.button.image-button:hover {

-    -gtk-image-effect: highlight;

+popover.background.scale-popup button.flat.image-button:hover {

+/*    -gtk-image-effect: highlight; */

 }

 

-.popover.scale-popup .scale .trough,

-.popover.scale-popup .scale .trough.vertical {

+popover.background.scale-popup scale .trough,

+popover.background.scale-popup scale .trough.vertical {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade (@scale_border_a, 1.10)),

                                      to (shade (@scale_border_a, 1.51)));

 }

 

-.popover.scale-popup .scale .trough.highlight,

-.popover.scale-popup .scale .trough.highlight.vertical {

+popover.background.scale-popup scale .trough.highlight,

+popover.background.scale-popup scale .trough.highlight.vertical {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade (@theme_selected_bg_color, 1.31)),

@@ -5075,7 +5158,7 @@ GtkProgressBar.osd.progressbar {
 

 /* needs to be here to avoid a override by .popover.scale-popup */

 .osd .scale.trough,

-.osd .scale-popup.popover .scale.trough {

+.osd popover.background.scale-popup scale trough {

     border-color: @osd_scale_border;

     border-image: none;

     background-image: linear-gradient(to bottom,

@@ -5085,18 +5168,18 @@ GtkProgressBar.osd.progressbar {
 }

 

 .osd .scale.trough.highlight,

-.osd .scale-popup.popover .scale.trough.highlight {

+.osd popover.background.scale-popup scale trough highlight {

     background-image: none;

     background-color: @theme_selected_bg_color;

     border-color: @scale_highlight_border;

 }

 

-.popover .list {

+popover .list {

     background-color: @theme_base_color;

 }

 

 /* more/less volume button */

-.popover .image-button:hover {

+popover button.image-button:hover {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -5107,7 +5190,7 @@ GtkProgressBar.osd.progressbar {
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-.popover .image-button:insensitive {

+popover button.image-button:disabled {

     background-image: none;

     background-color: transparent;

     box-shadow: inset  0px  1px @insensitive_border_color,

@@ -5116,45 +5199,45 @@ GtkProgressBar.osd.progressbar {
                 inset  0px -1px @insensitive_border_color;

 }

 

-GtkModelButton.button,

-GtkModelButton.button:first-child,

-GtkModelButton.button:last-child,

-GtkModelButton.button:only-child {

+modelbutton button,

+modelbutton button:first-child,

+modelbutton button:last-child,

+modelbutton button:only-child {

     background-image: none;

     color: @theme_fg_dark_color;

     border-radius: 3px;

 }

 

-GtkModelButton.button:checked,

-GtkModelButton.button:insensitive,

-GtkModelButton.button:checked:insensitive,

-GtkModelButton.button,

-GtkModelButton.button:focus,

-GtkModelButton.button:checked:focus,

-GtkModelButton.button:checked:first-child,

-GtkModelButton.button:insensitive:first-child,

-GtkModelButton.button:checked:insensitive:first-child,

-GtkModelButton.button:first-child,

-GtkModelButton.button:focus:first-child,

-GtkModelButton.button:checked:focus:first-child,

-GtkModelButton.button:checked:last-child,

-GtkModelButton.button:insensitive:last-child,

-GtkModelButton.button:checked:insensitive:last-child,

-GtkModelButton.button:last-child,

-GtkModelButton.button:focus:last-child,

-GtkModelButton.button:checked:focus:last-child,

-GtkModelButton.button:checked:only-child,

-GtkModelButton.button:insensitive:only-child,

-GtkModelButton.button:checked:insensitive:only-child,

-GtkModelButton.button:only-child,

-GtkModelButton.button:focus:only-child,

-GtkModelButton.button:checked:focus:only-child,

-.linked GtkModelButton.button,

-.linked GtkModelButton.button:focus,

-.linked GtkModelButton.button:first-child,

-.linked GtkModelButton.button:focus:first-child,

-.linked GtkModelButton.button:last-child,

-.linked GtkModelButton.button:focus:last-child {

+modelbutton button:checked,

+modelbutton button:disabled,

+modelbutton button:checked:disabled,

+modelbutton button,

+modelbutton button:focus,

+modelbutton button:checked:focus,

+modelbutton button:checked:first-child,

+modelbutton button:disabled:first-child,

+modelbutton button:checked:disabled:first-child,

+modelbutton button:first-child,

+modelbutton button:focus:first-child,

+modelbutton button:checked:focus:first-child,

+modelbutton button:checked:last-child,

+modelbutton button:disabled:last-child,

+modelbutton button:checked:disabled:last-child,

+modelbutton button:last-child,

+modelbutton button:focus:last-child,

+modelbutton button:checked:focus:last-child,

+modelbutton button:checked:only-child,

+modelbutton button:disabled:only-child,

+modelbutton button:checked:disabled:only-child,

+modelbutton button:only-child,

+modelbutton button:focus:only-child,

+modelbutton button:checked:focus:only-child,

+.linked modelbutton button,

+.linked modelbutton button:focus,

+.linked modelbutton button:first-child,

+.linked modelbutton button:focus:first-child,

+.linked modelbutton button:last-child,

+.linked modelbutton button:focus:last-child {

     background-color: shade (@theme_bg_dark_color, 1.0);

     background-image: none;

     border-color: transparent;

@@ -5164,42 +5247,42 @@ GtkModelButton.button:checked:focus:only-child,
     border-radius: 3px;

 }

 

-GtkModelButton.button:checked:hover:only-child,

-GtkModelButton.button:checked:hover:active:only-child,

-GtkModelButton.button:focus:hover:active:only-child,

-GtkModelButton.button:hover:active:only-child,

-GtkModelButton.button:hover:only-child,

-GtkModelButton.button:selected:only-child,

-GtkModelButton.button:checked:hover:first-child,

-GtkModelButton.button:checked:hover:active:first-child,

-GtkModelButton.button:focus:hover:active:first-child,

-GtkModelButton.button:hover:active:first-child,

-GtkModelButton.button:hover:first-child,

-GtkModelButton.button:selected:first-child,

-GtkModelButton.button:checked:hover:last-child,

-GtkModelButton.button:checked:hover:active:last-child,

-GtkModelButton.button:focus:hover:active:last-child,

-GtkModelButton.button:hover:active:last-child,

-GtkModelButton.button:hover:last-child,

-GtkModelButton.button:selected:last-child,

-GtkModelButton.button:checked:hover,

-GtkModelButton.button:checked:hover:active,

-GtkModelButton.button:focus:hover:active,

-GtkModelButton.button:hover:active,

-GtkModelButton.button:hover,

-GtkModelButton.button:selected,

-.linked GtkModelButton.button:hover,

-.linked GtkModelButton.button:hover:active,

-.linked GtkModelButton.button:checked:hover,

-.linked GtkModelButton.button:checked:hover:active,

-.linked GtkModelButton.button:hover:first-child,

-.linked GtkModelButton.button:hover:active:first-child,

-.linked GtkModelButton.button:checked:hover:first-child,

-.linked GtkModelButton.button:checked:hover:active:first-child,

-.linked GtkModelButton.button:hover:last-child,

-.linked GtkModelButton.button:hover:active:last-child,

-.linked GtkModelButton.button:checked:hover:last-child,

-.linked GtkModelButton.button:checked:hover:active:last-child {

+modelbutton button:checked:hover:only-child,

+modelbutton button:checked:hover:active:only-child,

+modelbutton button:focus:hover:active:only-child,

+modelbutton button:hover:active:only-child,

+modelbutton button:hover:only-child,

+modelbutton button:selected:only-child,

+modelbutton button:checked:hover:first-child,

+modelbutton button:checked:hover:active:first-child,

+modelbutton button:focus:hover:active:first-child,

+modelbutton button:hover:active:first-child,

+modelbutton button:hover:first-child,

+modelbutton button:selected:first-child,

+modelbutton button:checked:hover:last-child,

+modelbutton button:checked:hover:active:last-child,

+modelbutton button:focus:hover:active:last-child,

+modelbutton button:hover:active:last-child,

+modelbutton button:hover:last-child,

+modelbutton button:selected:last-child,

+modelbutton button:checked:hover,

+modelbutton button:checked:hover:active,

+modelbutton button:focus:hover:active,

+modelbutton button:hover:active,

+modelbutton button:hover,

+modelbutton button:selected,

+.linked modelbutton button:hover,

+.linked modelbutton button:hover:active,

+.linked modelbutton button:checked:hover,

+.linked modelbutton button:checked:hover:active,

+.linked modelbutton button:hover:first-child,

+.linked modelbutton button:hover:active:first-child,

+.linked modelbutton button:checked:hover:first-child,

+.linked modelbutton button:checked:hover:active:first-child,

+.linked modelbutton button:hover:last-child,

+.linked modelbutton button:hover:active:last-child,

+.linked modelbutton button:checked:hover:last-child,

+.linked modelbutton button:checked:hover:active:last-child {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -5216,11 +5299,11 @@ GtkModelButton.button:selected,
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-.csd .popover .linked GtkModelButton.button:checked,

-.csd .popover .linked GtkModelButton.button:hover,

-.csd .popover .linked GtkModelButton.button:hover:active,

-.csd .popover .linked GtkModelButton.button:checked:hover,

-.csd .popover .linked GtkModelButton.button:checked:hover:active {

+.csd .popover .linked modelbutton button:checked,

+.csd .popover .linked modelbutton button:hover,

+.csd .popover .linked modelbutton button:hover:active,

+.csd .popover .linked modelbutton button:checked:hover,

+.csd .popover .linked modelbutton button:checked:hover:active {

     color: @fg_dark_color;

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

@@ -5233,34 +5316,34 @@ GtkModelButton.button:selected,
 }

 

 /* middle button*/

-.linked GtkModelButton.button:hover,

-.linked GtkModelButton.button:hover:active,

-.linked GtkModelButton.button:checked:hover,

-.linked GtkModelButton.button:checked:hover:active {

+.linked modelbutton button:hover,

+.linked modelbutton button:hover:active,

+.linked modelbutton button:checked:hover,

+.linked modelbutton button:checked:hover:active {

     border-right-width: 0px;

     border-left-width:  0px;

     border-radius: 0;

 }

 

 /* left button*/

-.linked GtkModelButton.button:hover:first-child,

-.linked GtkModelButton.button:hover:active:first-child,

-.linked GtkModelButton.button:checked:hover:first-child,

-.linked GtkModelButton.button:checked:hover:active:first-child {

+.linked modelbutton button:hover:first-child,

+.linked modelbutton button:hover:active:first-child,

+.linked modelbutton button:checked:hover:first-child,

+.linked modelbutton button:checked:hover:active:first-child {

     border-right-width: 0px;

     border-radius: 6px 0 0 6px;

 }

 

 /* right button*/

-.linked GtkModelButton.button:hover:last-child,

-.linked GtkModelButton.button:hover:active:last-child,

-.linked GtkModelButton.button:checked:hover:last-child,

-.linked GtkModelButton.button:checked:hover:active:last-child {

+.linked modelbutton button:hover:last-child,

+.linked modelbutton button:hover:active:last-child,

+.linked modelbutton button:checked:hover:last-child,

+.linked modelbutton button:checked:hover:active:last-child {

     border-left-width:  0px;

     border-radius: 0 6px 6px 0;

 }

 

-.popover .button.default.text-button.suggested-action {

+popover button.default.text-button.suggested-action {

     background-image: none;

     color: @theme_fg_dark_color;

     text-shadow: none;

@@ -5270,7 +5353,7 @@ GtkModelButton.button:selected,
     padding: 5px 4px;

 }

 

-.popover .button.default.text-button.suggested-action:hover {

+popover button.default.text-button.suggested-action:hover {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -5287,7 +5370,7 @@ GtkModelButton.button:selected,
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-.entry.cursor-handle,

+entry.cursor-handle,

 .cursor-handle {

     background-color: transparent;

     background-image: none;

@@ -5295,12 +5378,12 @@ GtkModelButton.button:selected,
     border-style: none;

 }

 

-.entry.cursor-handle.top,

+entry.cursor-handle.top,

 .cursor-handle.top {

     -gtk-icon-source: -gtk-icontheme("selection-start-symbolic");

 }

 

-.entry.cursor-handle.bottom,

+entry.cursor-handle.bottom,

 .cursor-handle.bottom {

     -gtk-icon-source: -gtk-icontheme("selection-end-symbolic");

 }

@@ -5347,11 +5430,11 @@ GtkModelButton.button:selected,
     background-color: @theme_bg_dark_color;

 }

 

-.titlebar .button,

-.titlebar .button:first-child,

-.titlebar .button:last-child,

-.titlebar .button:only-child {

-    icon-shadow: 0px 1px @theme_shadow_dark_color;

+.titlebar button.titlebutton,

+.titlebar button.titlebutton:first-child,

+.titlebar button.titlebutton:last-child,

+.titlebar button.titlebutton:only-child {

+    -gtk-icon-shadow: 0px 1px @theme_shadow_dark_color;

     color: @wm_title;

     background: none;

     padding: 5px 5px 6px 5px;

@@ -5366,8 +5449,8 @@ GtkModelButton.button:selected,
                 inset -1px  0px shade(@theme_bg_dark_color, 0.93);

 }

 

-.titlebar .titlebutton {

-    icon-shadow: 0px 1px @theme_shadow_dark_color;

+.titlebar button.titlebutton {

+    -gtk-icon-shadow: 0px 1px @theme_shadow_dark_color;

     color: @wm_title;

     padding: 5px 5px 6px 5px;

     border-style: solid;

@@ -5379,16 +5462,11 @@ GtkModelButton.button:selected,
     background-color: transparent;

 }

 

-.titlebar .button:hover,

-.titlebar .button:focus:hover,

-.titlebar .button:focus:hover:active,

-.titlebar .button:checked,

-.titlebar .button:checked:focus,

-.titlebar .titlebutton:hover,

-.titlebar .titlebutton:hover:focus,

-.titlebar .titlebutton:hover:focus:active,

-.titlebar .titlebutton:checked,

-.titlebar .titlebutton:checked:focus {

+.titlebar button.titlebutton:hover,

+.titlebar button.titlebutton:focus:hover,

+.titlebar button.titlebutton:focus:hover:active,

+.titlebar button.titlebutton:checked,

+.titlebar button.titlebutton:checked:focus {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -5403,23 +5481,20 @@ GtkModelButton.button:selected,
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-.titlebar .titlebutton:backdrop {

+.titlebar button.titlebutton:backdrop {

     background: none;

     color: @theme_text_dark_color;

     border-image: none;

-    icon-shadow: none;

+    -gtk-icon-shadow: none;

 }

 

 /* Middle titlebar-button */

-.titlebar .linked .button,

-.titlebar .linked .button:focus,

-.titlebar .linked .button:insensitive,

-.titlebar .button.raised.linked,

-.titlebar .button.raised.linked:focus,

-.titlebar .button.raised.linked:insensitive,

-.titlebar .raised.linked .button,

-.titlebar .raised.linked .button:focus,

-.titlebar .raised.linked .button:insensitive {

+.titlebar .linked button.titlebutton,

+.titlebar .linked button.titlebutton:focus,

+.titlebar .linked button.titlebutton:disabled,

+.titlebar .raised.linked button.titlebutton,

+.titlebar .raised.linked button.titlebutton:focus,

+.titlebar .raised.linked button.titlebutton:disabled {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@button_raised_gradient_color_b, 0.90)),

@@ -5432,21 +5507,16 @@ GtkModelButton.button:selected,
     padding: 5px 5px 6px 5px;

 }

 

-.titlebar .linked .button:hover,

-.titlebar .linked .button:checked,

-.titlebar .linked .button:focus:hover:active,

-.titlebar .linked .button:checked:hover,

-.titlebar .linked .button:checked:focus:hover:active,

-.titlebar .button.raised.linked:hover,

-.titlebar .button.raised.linked:checked,

-.titlebar .button.raised.linked:focus:hover:active,

-.titlebar .button.raised.linked:checked:hover,

-.titlebar .button.raised.linked:checked:focus:hover:active,

-.titlebar .raised.linked .button:hover,

-.titlebar .raised.linked .button:checked,

-.titlebar .raised.linked .button:focus:hover:active,

-.titlebar .raised.linked .button:checked:hover,

-.titlebar .raised.linked .button:checked:focus:hover:active {

+.titlebar .linked button.titlebutton:hover,

+.titlebar .linked button.titlebutton:checked,

+.titlebar .linked button.titlebutton:focus:hover:active,

+.titlebar .linked button.titlebutton:checked:hover,

+.titlebar .linked button.titlebutton:checked:focus:hover:active,

+.titlebar .raised.linked button.titlebutton:hover,

+.titlebar .raised.linked button.titlebutton:checked,

+.titlebar .raised.linked button.titlebutton:focus:hover:active,

+.titlebar .raised.linked button.titlebutton:checked:hover,

+.titlebar .raised.linked button.titlebutton:checked:focus:hover:active {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -5465,15 +5535,12 @@ GtkModelButton.button:selected,
 }

 

 /* Leftmost titlebar-button */

-.titlebar .linked .button:first-child,

-.titlebar .linked .button:focus:first-child,

-.titlebar .linked .button:insensitive:first-child,

-.titlebar .button.raised.linked:first-child,

-.titlebar .button.raised.linked:focus:first-child,

-.titlebar .button.raised.linked:insensitive:first-child,

-.titlebar .raised.linked .button:first-child,

-.titlebar .raised.linked .button:focus:first-child,

-.titlebar .raised.linked .button:insensitive:first-child {

+.titlebar .linked button.titlebutton:first-child,

+.titlebar .linked button.titlebutton:focus:first-child,

+.titlebar .linked button.titlebutton:disabled:first-child,

+.titlebar .raised.linked button.titlebutton:first-child,

+.titlebar .raised.linked button.titlebutton:focus:first-child,

+.titlebar .raised.linked button.titlebutton:disabled:first-child {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@button_raised_gradient_color_b, 0.90)),

@@ -5487,21 +5554,16 @@ GtkModelButton.button:selected,
     padding: 5px 5px 6px 5px;

 }

 

-.titlebar .linked .button:hover:first-child,

-.titlebar .linked .button:checked:first-child,

-.titlebar .linked .button:focus:hover:active:first-child,

-.titlebar .linked .button:checked:hover:first-child,

-.titlebar .linked .button:checked:focus:hover:active:first-child,

-.titlebar .button.raised.linked:hover:first-child,

-.titlebar .button.raised.linked:checked:first-child,

-.titlebar .button.raised.linked:focus:hover:active:first-child,

-.titlebar .button.raised.linked:checked:hover:first-child,

-.titlebar .button.raised.linked:checked:focus:hover:active:first-child,

-.titlebar .raised.linked .button:hover:first-child,

-.titlebar .raised.linked .button:checked:first-child,

-.titlebar .raised.linked .button:focus:hover:active:first-child,

-.titlebar .raised.linked .button:checked:hover:first-child,

-.titlebar .raised.linked .button:checked:focus:hover:active:first-child {

+.titlebar .linked button.titlebutton:hover:first-child,

+.titlebar .linked button.titlebutton:checked:first-child,

+.titlebar .linked button.titlebutton:focus:hover:active:first-child,

+.titlebar .linked button.titlebutton:checked:hover:first-child,

+.titlebar .linked button.titlebutton:checked:focus:hover:active:first-child,

+.titlebar .raised.linked button.titlebutton:hover:first-child,

+.titlebar .raised.linked button.titlebutton:checked:first-child,

+.titlebar .raised.linked button.titlebutton:focus:hover:active:first-child,

+.titlebar .raised.linked button.titlebutton:checked:hover:first-child,

+.titlebar .raised.linked button.titlebutton:checked:focus:hover:active:first-child {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -5521,15 +5583,12 @@ GtkModelButton.button:selected,
 }

 

 /* rightmost titlebar-button */

-.titlebar .linked .button:last-child,

-.titlebar .linked .button:focus:last-child,

-.titlebar .linked .button:insensitive:last-child,

-.titlebar .button.raised.linked:last-child,

-.titlebar .button.raised.linked:focus:last-child,

-.titlebar .button.raised.linked:insensitive:last-child,

-.titlebar .raised.linked .button:last-child,

-.titlebar .raised.linked .button:focus:last-child,

-.titlebar .raised.linked .button:insensitive:last-child {

+.titlebar .linked button.titlebutton:last-child,

+.titlebar .linked button.titlebutton:focus:last-child,

+.titlebar .linked button.titlebutton:disabled:last-child,

+.titlebar .raised.linked button.titlebutton:last-child,

+.titlebar .raised.linked button.titlebutton:focus:last-child,

+.titlebar .raised.linked button.titlebutton:disabled:last-child {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@button_raised_gradient_color_b, 0.90)),

@@ -5543,21 +5602,16 @@ GtkModelButton.button:selected,
     padding: 5px 5px 6px 5px;

 }

 

-.titlebar .linked .button:hover:last-child,

-.titlebar .linked .button:checked:last-child,

-.titlebar .linked .button:focus:hover:active:last-child,

-.titlebar .linked .button:checked:hover:last-child,

-.titlebar .linked .button:checked:focus:hover:active:last-child,

-.titlebar .button.raised.linked:hover:last-child,

-.titlebar .button.raised.linked:checked:last-child,

-.titlebar .button.raised.linked:focus:hover:active:last-child,

-.titlebar .button.raised.linked:checked:hover:last-child,

-.titlebar .button.raised.linked:checked:focus:hover:active:last-child,

-.titlebar .raised.linked .button:hover:last-child,

-.titlebar .raised.linked .button:checked:last-child,

-.titlebar .raised.linked .button:focus:hover:active:last-child,

-.titlebar .raised.linked .button:checked:hover:last-child,

-.titlebar .raised.linked .button:checked:focus:hover:active:last-child {

+.titlebar .linked button.titlebutton:hover:last-child,

+.titlebar .linked button.titlebutton:checked:last-child,

+.titlebar .linked button.titlebutton:focus:hover:active:last-child,

+.titlebar .linked button.titlebutton:checked:hover:last-child,

+.titlebar .linked button.titlebutton:checked:focus:hover:active:last-child,

+.titlebar .raised.linked button.titlebutton:hover:last-child,

+.titlebar .raised.linked button.titlebutton:checked:last-child,

+.titlebar .raised.linked button.titlebutton:focus:hover:active:last-child,

+.titlebar .raised.linked button.titlebutton:checked:hover:last-child,

+.titlebar .raised.linked button.titlebutton:checked:focus:hover:active:last-child {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -5577,15 +5631,12 @@ GtkModelButton.button:selected,
 }

 

 /* Linked single titlebar-button */

-.titlebar .linked .button:only-child,

-.titlebar .linked .button:focus:only-child,

-.titlebar .linked .button:insensitive:only-child,

-.titlebar .button.raised.linked:only-child,

-.titlebar .button.raised.linked:focus:only-child,

-.titlebar .button.raised.linked:insensitive:only-child,

-.titlebar .raised.linked .button:only-child,

-.titlebar .raised.linked .button:focus:only-child,

-.titlebar .raised.linked .button:insensitive:only-child {

+.titlebar .linked button.titlebutton:only-child,

+.titlebar .linked button.titlebutton:focus:only-child,

+.titlebar .linked button.titlebutton:disabled:only-child,

+.titlebar .raised.linked button.titlebutton:only-child,

+.titlebar .raised.linked button.titlebutton:focus:only-child,

+.titlebar .raised.linked button.titlebutton:disabled:only-child {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@button_raised_gradient_color_b, 0.90)),

@@ -5596,21 +5647,16 @@ GtkModelButton.button:selected,
     padding: 5px 5px 6px 5px;

 }

 

-.titlebar .linked .button:hover:only-child,

-.titlebar .linked .button:checked:only-child,

-.titlebar .linked .button:focus:hover:active:only-child,

-.titlebar .linked .button:checked:hover:only-child,

-.titlebar .linked .button:checked:focus:hover:active:only-child,

-.titlebar .button.raised.linked:hover:only-child,

-.titlebar .button.raised.linked:checked:only-child,

-.titlebar .button.raised.linked:focus:hover:active:only-child,

-.titlebar .button.raised.linked:checked:hover:only-child,

-.titlebar .button.raised.linked:checked:focus:hover:active:only-child,

-.titlebar .raised.linked .button:hover:only-child,

-.titlebar .raised.linked .button:checked:only-child,

-.titlebar .raised.linked .button:focus:hover:active:only-child,

-.titlebar .raised.linked .button:checked:hover:only-child,

-.titlebar .raised.linked .button:checked:focus:hover:active:only-child {

+.titlebar .linked button.titlebutton:hover:only-child,

+.titlebar .linked button.titlebutton:checked:only-child,

+.titlebar .linked button.titlebutton:focus:hover:active:only-child,

+.titlebar .linked button.titlebutton:checked:hover:only-child,

+.titlebar .linked button.titlebutton:checked:focus:hover:active:only-child,

+.titlebar .raised.linked button.titlebutton:hover:only-child,

+.titlebar .raised.linked button.titlebutton:checked:only-child,

+.titlebar .raised.linked button.titlebutton:focus:hover:active:only-child,

+.titlebar .raised.linked button.titlebutton:checked:hover:only-child,

+.titlebar .raised.linked button.titlebutton:checked:focus:hover:active:only-child {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -5627,11 +5673,11 @@ GtkModelButton.button:selected,
 }

 

 /* workaround to avoid unwanted black frames if switching compositor on/off */

-.background .window-frame  {

+.background decoration  {

     box-shadow: none;

 }

 

-.background.csd .window-frame {

+.background.csd decoration {

     border-color: darker(@theme_bg_dark_color);

     border-radius: 7px 7px 0 0;

     border-width: 1px;

@@ -5643,22 +5689,22 @@ GtkModelButton.button:selected,
 }

  

 /* workaround to avoid unwanted black frames if switching compositor on/off */

-.window-frame:backdrop {

+decoration:backdrop {

     background-color: @theme_bg_dark_color;

 /*    box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;*/

     box-shadow: none;

 }

 

-.window-frame.tiled {

+.tiled decoration {

     border-radius: 0;

     background-color: @theme_bg_color;

 }

 

-.window-frame.ssd {

+.ssd decoration {

     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23);

 }

 

-.window-frame.solid-csd {

+.solid-csd decoration {

     border-radius: 0;

     margin: 1px;

     background-color: @wm_bg_a;

@@ -5666,18 +5712,18 @@ GtkModelButton.button:selected,
     box-shadow: none;

 }

 

-.window-frame.csd.popup {

+.csd.popup decoration {

     border-radius: 0;

     box-shadow: none;

 }

 

-.window-frame.csd.tooltip {

+tooltip.csd decoration {

     border-radius: 3px;

     box-shadow: 0 1px 5px shade (@theme_selected_bg_color, 1.3);

     padding: 4px 4px;

 }

 

-.window-frame.csd.message-dialog {

+messagedialog.csd decoration {

     border-radius: 7px;

     box-shadow: 0 1px 5px shade (@theme_selected_bg_color, 1.3);

 }

@@ -5688,27 +5734,22 @@ GtkModelButton.button:selected,
 /* This is could be CPU-intensive */

 

 @keyframes spin {

-    to { -gtk-icon-transform: rotate(1turn); }

+	to { -gtk-icon-transform: rotate(1turn); }

 }

 

-.spinner {

-    background-image: none;

-    background-color: blue;

-    opacity: 0;

-    -gtk-icon-source: -gtk-icontheme("process-working-symbolic");

+spinner {

+	background: none;

+	opacity: 0;

+	-gtk-icon-source: -gtk-icontheme("process-working-symbolic");

 }

 

-.spinner:active {

-    opacity: 1;

-    animation: spin 1s linear infinite;

+spinner:checked {

+	opacity: 1;

+	animation: spin 1s linear infinite;

 }

 

-.spinner:active:insensitive {

-    opacity: 0.5;

-}

-

-.button .spinner:active {

-    color: @theme_fg_color;

+spinner:checked:disabled {

+	opacity: 0.5;

 }

 

 /************************

@@ -5716,7 +5757,7 @@ GtkModelButton.button:selected,
  ************************/

 

 /* displays at end of mouse scrolling */

-.overshoot.top {

+overshoot.top {

     background-image: -gtk-gradient(radial,

                                     center top, 0,

                                     center top, 0.5,

@@ -5735,7 +5776,7 @@ GtkModelButton.button:selected,
     box-shadow: none;

 }

 

-.overshoot.top:backdrop {

+overshoot.top:backdrop {

     background-image: -gtk-gradient(radial,

                                     center top, 0,

                                     center top, 0.5,

@@ -5749,7 +5790,7 @@ GtkModelButton.button:selected,
     box-shadow: none;

 }

 

-.overshoot.bottom {

+overshoot.bottom {

     background-image: -gtk-gradient(radial,

                                     center bottom, 0,

                                     center bottom, 0.5,

@@ -5768,7 +5809,7 @@ GtkModelButton.button:selected,
     box-shadow: none;

 }

 

-.overshoot.bottom:backdrop {

+overshoot.bottom:backdrop {

     background-image: -gtk-gradient(radial,

                                     center bottom, 0,

                                     center bottom, 0.5,

@@ -5782,7 +5823,7 @@ GtkModelButton.button:selected,
     box-shadow: none;

 }

 

-.overshoot.left {

+overshoot.left {

     background-image: -gtk-gradient(radial,

                                     left center, 0,

                                     left center, 0.5,

@@ -5801,7 +5842,7 @@ GtkModelButton.button:selected,
     box-shadow: none;

 }

 

-.overshoot.left:backdrop {

+overshoot.left:backdrop {

     background-image: -gtk-gradient(radial,

                                     left center, 0,

                                     left center, 0.5,

@@ -5815,7 +5856,7 @@ GtkModelButton.button:selected,
     box-shadow: none;

 }

 

-.overshoot.right {

+overshoot.right {

     background-image: -gtk-gradient(radial,

                                     right center, 0,

                                     right center, 0.5,

@@ -5834,7 +5875,7 @@ GtkModelButton.button:selected,
     box-shadow: none;

 }

 

-.overshoot.right:backdrop {

+overshoot.right:backdrop {

     background-image: -gtk-gradient(radial,

                                     right center, 0,

                                     right center, 0.5,

@@ -5849,7 +5890,7 @@ GtkModelButton.button:selected,
 }

 

 /* result is disable undershoot */

-.undershoot.top {

+undershoot.top {

     background-color: transparent;

     background-image: linear-gradient(to left,

                                       rgba(255, 255, 255, 0.2) 50%,

@@ -5860,7 +5901,7 @@ GtkModelButton.button:selected,
     background-position: center top;

 }

 

-.undershoot.bottom {

+undershoot.bottom {

     background-color: transparent;

     background-image: linear-gradient(to left,

                                       rgba(255, 255, 255, 0.2) 50%,

@@ -5871,7 +5912,7 @@ GtkModelButton.button:selected,
     background-position: center bottom;

 }

 

-.undershoot.left {

+undershoot.left {

     background-color: transparent;

     background-image: linear-gradient(to top,

                                       rgba(255, 255, 255, 0.2) 50%,

@@ -5882,7 +5923,7 @@ GtkModelButton.button:selected,
     background-position: left center;

 }

 

-.undershoot.right {

+undershoot.right {

     background-color: transparent;

     background-image: linear-gradient(to top,

                                       rgba(255, 255, 255, 0.2) 50%,

@@ -5897,17 +5938,17 @@ GtkModelButton.button:selected,
  * GtkStack *

  ************/

 

-GtkStack .horizontal .vertical .frame {

+stack .horizontal .vertical frame {

     background-color: shade (@theme_bg_color, 1.1);

     border-width: 1px;

     border-color: @notebook_border;

 }

 

-GtkStackSidebar.sidebar .separator.horizontal {

-    -GtkWidget-separator-height: 0px;

+stacksidebar.sidebar separator.horizontal {

+/*    -GtkWidget-separator-height: 0px; */

 }

 

-GtkStack .linked.vertical .entry {

+stack .linked.vertical entry {

     border-radius: 5px;

     border-style: solid;

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

@@ -5922,103 +5963,108 @@ GtkStack .linked.vertical .entry {
 }

 

 

-GtkStack .vertical.linked > GtkComboBox > GtkToggleButton.button:last-child,

-GtkStack .vertical.linked > GtkComboBox > GtkToggleButton.button:hover:last-child,

-GtkStack .vertical.linked > GtkComboBox > GtkToggleButton.button:focus:last-child,

-GtkStack .vertical.linked > GtkComboBox > GtkToggleButton.button:focus:hover:last-child,

-GtkStack .vertical.linked > GtkComboBox > GtkToggleButton.button:checked:last-child,

-GtkStack .vertical.linked > GtkComboBox > GtkToggleButton.button:insensitive:last-child,

-GtkStack .linked.vertical GtkToggleButton.button,

-GtkStack .linked.vertical GtkToggleButton.button:hover,

-GtkStack .linked.vertical GtkToggleButton.button:focus,

-GtkStack .linked.vertical GtkToggleButton.button:focus:hover,

-GtkStack .linked.vertical GtkToggleButton.button:checked,

-GtkStack .linked.vertical GtkToggleButton.button:insensitive {

+stack .vertical.linked > combobox > button.combo:last-child,

+stack .vertical.linked > combobox > button.combo:hover:last-child,

+stack .vertical.linked > combobox > button.combo:focus:last-child,

+stack .vertical.linked > combobox > button.combo:focus:hover:last-child,

+stack .vertical.linked > combobox > button.combo:checked:last-child,

+stack .vertical.linked > combobox > button.combo:disabled:last-child,

+stack .linked.vertical button.combo,

+stack .linked.vertical button.combo:hover,

+stack .linked.vertical button.combo:focus,

+stack .linked.vertical button.combo:focus:hover,

+stack .linked.vertical button.combo:checked,

+stack .linked.vertical button.combo:disabled {

     border-radius: 5px 5px 0 0;

     border-width: 1px;

-    border-bottom-width: 1px;

     border-style: solid;

+    border-color: shade(@notebook_border, 1.0);

     padding: 3px 5px;

+    box-shadow: none;

 }

 

-GtkStack .linked.vertical .button:last-child,

-GtkStack .linked.vertical .button:hover:last-child,

-GtkStack .linked.vertical .button:focus:last-child,

-GtkStack .linked.vertical .button:focus:hover:last-child,

-GtkStack .linked.vertical .button:checked:last-child,

-GtkStack .linked.vertical .button:insensitive:last-child {

+stack .linked.vertical button:last-child,

+stack .linked.vertical button:hover:last-child,

+stack .linked.vertical button:focus:last-child,

+stack .linked.vertical button:focus:hover:last-child,

+stack .linked.vertical button:checked:last-child,

+stack .linked.vertical button:disabled:last-child {

     border-radius: 0 0 5px 5px;

-    border-width: 1px;

     border-top-width: 0;

     border-style: solid;

+    border-color: shade(@notebook_border, 1.0);

     padding: 5px 5px;

+    box-shadow: none;

 }

 

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton:hover,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton:focus,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton:active,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton:checked,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton:insensitive {

+stack .linked.vertical spinbutton.horizontal entry,

+stack .linked.vertical spinbutton.horizontal entry:hover,

+stack .linked.vertical spinbutton.horizontal entry:focus,

+stack .linked.vertical spinbutton.horizontal entry:active,

+stack .linked.vertical spinbutton.horizontal entry:checked,

+stack .linked.vertical spinbutton.horizontal entry:disabled {

     border-radius: 0px;

-    border-width: 1px;

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

     border-style: solid;

-    padding: 6px 5px;

-}

-

-/* all to zero */

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover:active,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover:active:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover:active,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover:active:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:hover,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:hover:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:focus:hover:active,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:focus:hover:active:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:insensitive,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:first-child:insensitive {

+    border-color: shade(@notebook_border, 1.0);

+    padding: 0px 5px;

+    box-shadow: none;

+}

+

+stack .linked.vertical spinbutton.horizontal button,

+stack .linked.vertical spinbutton.horizontal button:last-child,

+stack .linked.vertical spinbutton.horizontal button:hover,

+stack .linked.vertical spinbutton.horizontal button:hover:last-child,

+stack .linked.vertical spinbutton.horizontal button:hover:active,

+stack .linked.vertical spinbutton.horizontal button:hover:active:last-child,

+stack .linked.vertical spinbutton.horizontal button:focus,

+stack .linked.vertical spinbutton.horizontal button:focus:last-child,

+stack .linked.vertical spinbutton.horizontal button:focus:hover,

+stack .linked.vertical spinbutton.horizontal button:focus:hover:last-child,

+stack .linked.vertical spinbutton.horizontal button:focus:hover:active,

+stack .linked.vertical spinbutton.horizontal button:focus:hover:active:last-child,

+stack .linked.vertical spinbutton.horizontal button:checked,

+stack .linked.vertical spinbutton.horizontal button:checked:last-child,

+stack .linked.vertical spinbutton.horizontal button:checked:hover,

+stack .linked.vertical spinbutton.horizontal button:checked:hover:last-child,

+stack .linked.vertical spinbutton.horizontal button:checked:focus:hover:active,

+stack .linked.vertical spinbutton.horizontal button:checked:focus:hover:active:last-child,

+stack .linked.vertical spinbutton.horizontal button:disabled,

+stack .linked.vertical spinbutton.horizontal button:first-child:disabled {

     border-radius: 0px;

     border-width: 0px;

     border-style: none;

-    padding: 6px 5px;

+    padding: 0px 6px;

     background-color: transparent;

     background-image: none;

     border-image: none;

     box-shadow: none;

 }

 

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked {

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

+stack .linked.vertical spinbutton.horizontal button,

+stack .linked.vertical spinbutton.horizontal button:hover,

+stack .linked.vertical spinbutton.horizontal button:focus:hover,

+stack .linked.vertical spinbutton.horizontal button:focus,

+stack .linked.vertical spinbutton.horizontal button:checked {

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

     border-style: solid;

     border-color: shade(@notebook_border, 1.0);

 }

 

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:last-child {

-    border-width: 0px;

+stack .linked.vertical spinbutton.horizontal button:last-child,

+stack .linked.vertical spinbutton.horizontal button:hover:last-child,

+stack .linked.vertical spinbutton.horizontal button:focus:hover:last-child,

+stack .linked.vertical spinbutton.horizontal button:focus:last-child,

+stack .linked.vertical spinbutton.horizontal button:checked:last-child {

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

+    border-style: solid;

+    border-color: shade(@notebook_border, 1.0);

 }

 

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover:last-child {

+stack .linked.vertical spinbutton.horizontal button:hover,

+stack .linked.vertical spinbutton.horizontal button:focus:hover,

+stack .linked.vertical spinbutton.horizontal button:hover:last-child,

+stack .linked.vertical spinbutton.horizontal button:focus:hover:last-child {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@button_gradient1, 1.03)),

@@ -6027,8 +6073,8 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focu
                                      to   (shade(@button_gradient4, 1.01)));

 }

 

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active:last-child {

+stack .linked.vertical spinbutton.horizontal button:active,

+stack .linked.vertical spinbutton.horizontal button:active:last-child {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade (@theme_bg_color, 1.20)),

@@ -6037,56 +6083,56 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:acti
                                      to (shade (@theme_bg_color, 0.80)));

 }

 

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover {

+stack .linked.vertical spinbutton.horizontal button:active,

+stack .linked.vertical spinbutton.horizontal button:hover,

+stack .linked.vertical spinbutton.horizontal button:focus:hover {

     border-width: 1px;

     border-style: solid;

     border-color: shade(@button_border_active, 1.0);

 }

 

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover:last-child,

-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover:last-child {

-    border-width: 1px;

+stack .linked.vertical spinbutton.horizontal button:active:last-child,

+stack .linked.vertical spinbutton.horizontal button:hover:last-child,

+stack .linked.vertical spinbutton.horizontal button:focus:hover:last-child {

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

     border-style: solid;

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

+    border-color: shade(@button_border_active, 1.0);

 }

 

 /****************

  * print dialog *

  ****************/

 

-GtkPrintUnixDialog.background .vertical.view.dialog-vbox {

+printdialog.background .vertical.view.dialog-vbox {

     background-color: shade (@theme_bg_color, 1.0);

 }

 

-GtkPrintUnixDialog.background .notebook {

+printdialog.background notebook {

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

     border-radius: 0px 0px 4px 4px;

 }

 

-GtkPrintUnixDialog.background .notebook.header {

+printdialog.background notebook.header {

     border-radius: 0px;

 }

 

-GtkPrintUnixDialog.background .notebook tab GtkLabel {

+printdialog.background notebook tab label {

     color: mix (@theme_fg_color, @theme_bg_color, 0.40);

     font-weight: normal;

 }

 

-GtkPrintUnixDialog.background .notebook .prelight-page,

-GtkPrintUnixDialog.background .notebook .prelight-page GtkLabel {

+printdialog.background notebook .prelight-page,

+printdialog.background notebook .prelight-page label {

     color: mix (@theme_fg_color, @theme_bg_color, 0.15);

 }

 

-GtkPrintUnixDialog.background .notebook .active-page,

-.notebook tab .active-page GtkLabel {

+printdialog.background notebook .active-page,

+notebook tab .active-page label {

     color: @theme_fg_color;

 }

 

-GtkPrintUnixDialog.background .notebook tab.top:active,

-GtkPrintUnixDialog.background .notebook tab.top:hover:active {

+printdialog.background notebook tab.top:active,

+printdialog.background notebook tab.top:hover:active {

     background-image: linear-gradient(to bottom,

                                       shade(@theme_bg_color, 1.18),

                                       shade(@theme_bg_color, 1.1));

@@ -6097,7 +6143,7 @@ GtkPrintUnixDialog.background .notebook tab.top:hover:active {
     box-shadow: none;

 }

 

-GtkPrintUnixDialog.background .notebook tab.top:hover {

+printdialog.background notebook tab.top:hover {

     background-image: linear-gradient(to bottom,

                                       alpha(@theme_base_color, 0.0),

                                       alpha(@theme_base_color, 0.3));

@@ -6108,15 +6154,15 @@ GtkPrintUnixDialog.background .notebook tab.top:hover {
     box-shadow: none;

 }

 

-GtkPrintUnixDialog.background .notebook tab.top:active {

+printdialog.background notebook tab.top:active {

     border-bottom-color: @notebook_active_tab_border;

 }

 

-GtkPrintUnixDialog.background .notebook .text-button {

+printdialog.background notebook button.text-button {

     background-color: transparent;

 }

 

-GtkPrintUnixDialog.background .vertical.view.dialog-vbox .notebook GtkToggleButton.button {

+printdialog.background .vertical.view.dialog-vbox notebook button.combo {

     padding: 4px;

     border-radius: 4px;

 }

@@ -6125,37 +6171,13 @@ GtkPrintUnixDialog.background .vertical.view.dialog-vbox .notebook GtkToggleButt
  * GtkFileChooser *

  ******************/

 

-GtkFileChooserWidget.vertical GtkPaned.horizontal {

-    -GtkPaned-handle-size: 3px;

+filechooser.vertical paned > separator {

+    min-width: 3px;

+    min-height: 3px;

     border-color: transparent;

 }

 

-/* workaround for broken first/last-child logic with linked buttons

-   in pathbar with gtk+-3.18 */

-.path-bar.linked .button:dir(ltr),

-.path-bar.linked .button:dir(ltr):hover,

-.path-bar.linked .button:dir(ltr):hover:active,

-.path-bar.linked .button:dir(ltr):checked,

-.path-bar.linked .button:dir(ltr):checked:hover,

-.path-bar.linked .button:dir(ltr):checked:hover:active,

-.path-bar.linked .button:dir(ltr):first-child,

-.path-bar.linked .button:dir(ltr):hover:first-child,

-.path-bar.linked .button:dir(ltr):hover:active:first-child,

-.path-bar.linked .button:dir(ltr):checked:first-child,

-.path-bar.linked .button:dir(ltr):checked:hover:first-child,

-.path-bar.linked .button:dir(ltr):checked:hover:active:first-child,

-.path-bar.linked .button:dir(ltr):last-child,

-.path-bar.linked .button:dir(ltr):hover:last-child,

-.path-bar.linked .button:dir(ltr):hover:active:last-child,

-.path-bar.linked .button:dir(ltr):checked:last-child,

-.path-bar.linked .button:dir(ltr):checked:hover:last-child,

-.path-bar.linked .button:dir(ltr):checked:hover:active:last-child {

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

-	border-radius: 3px;

-    padding: 0px 4px;

-}

-

-.path-bar.linked .button  {

+.linked.path-bar button  {

     box-shadow: inset  0px  2px alpha(#fff, 0.11),

                 inset  2px  0px alpha(#fff, 0.09),

                 inset -2px  0px alpha(#fff, 0.09),

@@ -6166,9 +6188,9 @@ GtkFileChooserWidget.vertical GtkPaned.horizontal {
                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

 }

 

-.path-bar.linked .button:hover,

-.path-bar.linked .button:checked,

-.path-bar.linked .button:checked:active {

+.linked.path-bar button:hover,

+.linked.path-bar button:checked,

+.linked.path-bar button:checked:active {

     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),