Merge pull request #8 from mate-desktop/master

Merge master 2-26-2016

18 files changed, 4202 insertions, 4915 deletions

diff --git a/desktop-themes/BlackMATE/index.theme.in b/desktop-themes/BlackMATE/index.theme.in
index 2ca91686..8be84fa4 100644
--- a/desktop-themes/BlackMATE/index.theme.in
+++ b/desktop-themes/BlackMATE/index.theme.in
@@ -14,5 +14,5 @@ MetacityTheme=BlackMATE
 IconTheme=mate
 CursorTheme=mate
 CursorSize=24
-NotificationTheme=Coco
+NotificationTheme=coco
 
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gnome-applications.css b/desktop-themes/Blue-Submarine/gtk-3.0/gnome-applications.css
index de570982..4e3c1e3b 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gnome-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gnome-applications.css
@@ -280,338 +280,6 @@ RBSource .toolbar .button *:checked:hover {
     text-shadow: 0 1px @theme_shadow_color;
 }
 
-/************
- * Nautilus *
- ************/
-
-.info,
-.question,
-NautilusFloatingBar,
-NautilusTrashBar.info,
-NautilusTrashBar,
-NautilusXContentBar.info,
-NautilusSearchBar.info,
-NautilusQueryEditor.info {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.00)),
-                                     to   (shade(@nautilus_cluebar_color, 1.00)));
-    border-radius: 0px;
-    border-width: 0px 0px 1px 0px;
-    border-style: solid;
-    border-color: transparent @nautilus_cluebar_color shade(@nautilus_cluebar_color, 0.75);
-    box-shadow: inset  0px  1px alpha(#fff, 0.06),
-                inset  1px  0px alpha(#fff, 0.06),
-                inset -1px  0px alpha(#fff, 0.06),
-                inset  0px -1px alpha(#fff, 0.06);
-}
-
-/* avoid unwanted background color */
-NautilusQueryEditor .search-bar .linked.raised .button:focus:checked:first-child,
-NautilusQueryEditor .search-bar .linked.raised .button:focus:checked:last-child {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@menu_bg_dark_color, 2.03)),
-                                     to   (shade(@menu_bg_dark_color, 1.17)));
-}
-
-/* remove right shadow */
-NautilusQueryEditor .search-bar .linked.raised .button.text-button:hover:first-child,
-NautilusQueryEditor .search-bar .linked.raised .button.text-button:checked: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 alpha(shade(@theme_selected_bg_color, 0.94), 0.80),
-                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
-}
-
-NautilusSearchBar .entry,
-NautilusSearchBar .entry:focus {
-    -GtkEntry-inner-border: 1;
-}
-
-NautilusSearchBar .entry.image {
-    color: shade(@nautilus_cluebar_color, 0.60);
-}
-
-NautilusTrashBar GtkLabel {
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0 1px @theme_shadow_color;
-}
-
-.info
-.nautilus-cluebar-label {
-    font: bold;
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0 1px @theme_shadow_color;
-}
-
-.question .button,
-.question .button:hover,
-NautilusTrashBar .button,
-NautilusTrashBar .button:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.08)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 1.02)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.96)),
-                                     to   (shade(@nautilus_cluebar_color, 0.92)));
-    box-shadow: inset  0px  2px alpha(#fff, 0.09),
-                inset  2px  0px alpha(#fff, 0.07),
-                inset -2px  0px alpha(#fff, 0.07),
-                inset  0px -2px alpha(#fff, 0.05),
-                inset  0px  1px shade(@nautilus_cluebar_color, 0.80),
-                inset  1px  0px shade(@nautilus_cluebar_color, 0.70),
-                inset -1px  0px shade(@nautilus_cluebar_color, 0.70),
-                inset  0px -1px shade(@nautilus_cluebar_color, 0.60);
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_color;
-}
-
-.question .button:active,
-.question .button:active:hover,
-NautilusTrashBar .button:active,
-NautilusTrashBar .button:active:hover,
-.question .button:checked,
-.question .button:checked:hover,
-NautilusTrashBar .button:checked,
-NautilusTrashBar .button:checked:hover {
-/* .button:active:hover */
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.00)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 0.95)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.91)),
-                                     to   (shade(@nautilus_cluebar_color, 0.87)));
-    /* outer */
-    border-top-color:    alpha(@focused_entry_border, 0.20);
-    border-right-color:  alpha(@focused_entry_border, 0.25);
-    border-left-color:   alpha(@focused_entry_border, 0.25);
-    border-bottom-color: alpha(#fff, 0.10);
-    box-shadow: inset  0px  2px alpha(#fff, 0.09),
-                inset  2px  0px alpha(#fff, 0.07),
-                inset -2px  0px alpha(#fff, 0.07),
-                inset  0px -2px alpha(#fff, 0.05),
-                inset  0px  1px shade(@nautilus_cluebar_color, 0.75),
-                inset  1px  0px shade(@nautilus_cluebar_color, 0.65),
-                inset -1px  0px shade(@nautilus_cluebar_color, 0.65),
-                inset  0px -1px shade(@nautilus_cluebar_color, 0.55);
-}
-
-.question .button *:active,
-.question .button *:active:hover,
-NautilusTrashBar .button *:active,
-NautilusTrashBar .button *:active:hover,
-.question .button *:checked,
-.question .button *:checked:hover,
-NautilusTrashBar .button *:checked,
-NautilusTrashBar .button *:checked:hover {
-    color: shade(@theme_text_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_color;
-}
-
-.question .button:insensitive,
-NautilusTrashBar .button:insensitive {
-/* .button:active:hover */
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 0.95)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 0.90)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.88)),
-                                     to   (shade(@nautilus_cluebar_color, 0.89)));
-    box-shadow: inset  0px  1px shade(@nautilus_cluebar_color, 0.85),
-                inset  1px  0px shade(@nautilus_cluebar_color, 0.81),
-                inset -1px  0px shade(@nautilus_cluebar_color, 0.81),
-                inset  0px -1px shade(@nautilus_cluebar_color, 0.78);
-}
-
-.question .button *:insensitive,
-NautilusTrashBar .button *:insensitive {
-    color: mix(@nautilus_cluebar_color, @theme_fg_color, 0.50);
-    text-shadow: none;
-}
-
-NautilusWindow .sidebar .scrollbar {
-    background-image: none;
-    border-style: solid;
-    -GtkRange-stepper-size: 16;
-    -GtkRange-stepper-spacing: 0;
-    -GtkRange-trough-border: 1;
-    -GtkRange-arrow-scaling: 0.666;
-    -GtkRange-slider-width: 13;
-    -GtkRange-trough-under-steppers: 1;
-    -GtkScrollbar-has-backward-stepper: true;
-    -GtkScrollbar-has-forward-stepper: true;
-    -GtkScrollbar-activate-slider: 1;
-    -GtkScrollbar-min-slider-length: 31;
-    -GtkScrollbar-slider-width: 11;
-    -GtkScrolledWindow-scrollbar-spacing: 0;
-    -GtkScrolledWindow-scrollbars-within-bevel: 1;
-}
-
-NautilusWindow .sidebar .scrollbar.trough,
-NautilusWindow .sidebar .scrollbar.trough.vertical {
-    border-radius: 0;
-    border-width: 0 0px 0 1px;
-    border-style: solid;
-    border-color: shade (@theme_bg_color, 0.96);
-}
-
-/* the small line between sidebar and view */
-NautilusWindow GtkPaned.horizontal {
-    border-color: shade(@theme_bg_color, 0.80);
-    border-style: solid;
-    border-width: 0px 1px 0px 0px;
-    -GtkPaned-handle-size: 4px;
-}
-
-NautilusWindow .sidebar .frame {
-    border-width: 0px;
-    border-style: none;
-    border-top-width: 0;
-    border-bottom-width: 0;
-}
-
-/* frame icons nautilus view */
-NautilusView.frame {
-    border-top-width: 0;
-    border-right-width: 0;
-    border-left-width: 0;
-    border-bottom-width: 0;
-    box-shadow: none;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_base_color, 1.00)),
-                                     to   (shade(@theme_base_color, 1.00)));
-}
-
-NautilusWindow .notebook {
-    -GtkNotebook-initial-gap: 0;
-    background-color: @theme_base_color;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_base_color, 1.00)),
-                                     to   (shade(@theme_base_color, 1.00)));
-    border-width: 0px;
-    border-style: none;
-    border-left-style: none;
-    border-right-style: none;
-    border-radius: 0px;
-    border-top-color: shade(@notebook_border, 1.00);
-    border-left-color: @transparent;
-    border-bottom-color: @transparent;
-    border-right-color: @transparent;
-    box-shadow: none;
-}
-
-NautilusWindow .notebook tab {
-    border-width: 0px 1px;
-    border-style: solid;
-    border-color:       shade(@notebook_border, 1.00);
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@sidebar_background, 0.90)),
-                                     color-stop (0.15, shade(@sidebar_background, 1.00)),
-                                     to   (shade(@sidebar_background, 1.00)));
-    box-shadow: inset  0px  1px alpha(#000, 0.08),
-                inset  1px  0px alpha(#000, 0.04),
-                inset -1px  0px alpha(#000, 0.04),
-                inset  0px -1px shade(@notebook_border, 1.00);
-}
-
-NautilusWindow .notebook tab:active,
-NautilusWindow .notebook tab:checked {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_base_color, 0.90)),
-                                     color-stop (0.15, shade(@theme_base_color, 1.00)),
-                                     to   (shade(@theme_base_color, 1.00)));
-    border-image: none;
-    border-left-color: shade(@notebook_border, 1.00);
-    border-right-color: shade(@notebook_border, 1.00);
-    box-shadow: inset  0px  1px alpha(#000, 0.08),
-                inset  1px  0px alpha(#fff, 0.04),
-                inset -1px  0px alpha(#fff, 0.04);
-}
-
-NautilusWindow .notebook tab.top {
-    padding: 1px 6px;
-}
-
-NautilusWindow .notebook tab:first-child,
-NautilusWindow .notebook tab:first-child:active,
-NautilusWindow .notebook tab:first-child:checked {
-    border-width: 0px 1px 0px 0px;
-    border-radius: 0px;
-}
-
-NautilusWindow .notebook tab:last-child,
-NautilusWindow .notebook tab:last-child:active,
-NautilusWindow .notebook tab:last-child:checked {
-    border-width: 0px 0px 0px 1px;
-    border-radius: 0px;
-}
-
-NautilusWindow .notebook tab GtkLabel {
-    padding: 0px;
-    color: @theme_text_color;
-    text-shadow: 0px 1px @theme_shadow_color;
-}
-
-NautilusWindow .notebook tab .button GtkImage {
-    border-radius: 3px;
-    color: mix(@theme_fg_color, @sidebar_background, 0.30);
-    border-style: solid;
-    border-color: transparent;
-    border-width: 1px;
-    padding: 0;
-    icon-shadow: 1px 1px @theme_shadow_color;
-}
-
-NautilusWindow .notebook tab .button GtkImage:hover {
-    color: @theme_fg_color; 
-    border-color: alpha(black, 0.1); 
-}
-
-NautilusWindow .notebook tab  .button GtkImage:active,
-NautilusWindow .notebook tab  .button GtkImage:active:hover,
-NautilusWindow .notebook tab  .button GtkImage:checked,
-NautilusWindow .notebook tab  .button GtkImage:checked:hover {
-    background-color: alpha(black, 0.15); 
-    color: shade(@theme_fg_color, 1.00);
-    icon-shadow: 0px 1px @theme_shadow_color;
-    border-color: alpha(black, 0.27) 
-                  alpha(black, 0.13) 
-                  alpha(black, 0.13) 
-                  alpha(black, 0.13); 
-}
-
-/* nautilus */
-.nautilus-canvas-item {
-    border-radius: 3px;
-}
-
-/* desktop mode */
-.nautilus-desktop.nautilus-canvas-item {
-    color: white;
-    text-shadow: 1px 1px black;
-}
-
-.nautilus-desktop.nautilus-canvas-item:active,
-.nautilus-desktop.nautilus-canvas-item:checked {
-    background-image: none;
-    color: @theme_text_color;
-}
-
-.nautilus-desktop.nautilus-canvas-item:selected {
-    color: @theme_selected_fg_color;
-}
-
-.nautilus-desktop.nautilus-canvas-item:active,
-.nautilus-desktop.nautilus-canvas-item:prelight,
-.nautilus-desktop.nautilus-canvas-item:selected {
-    text-shadow: none;
-}
-
 ApDocView, /* Abiword */
 EogScrollView, /* Eog */
 CheeseThumbView /* Cheese */
@@ -620,14 +288,6 @@ CheeseThumbView /* Cheese */
     -EogScrollView-shadow-type: none;
 }
 
-/* Documents */
-gnome_control_center GtkScrolledWindow.frame, 
-GnomeControlCenter GtkScrolledWindow.frame,
-.documents-scrolledwin.frame {
-    border-width: 0px;
-    border-radius: 0;
-}
-
 .documents-counter {
     background-image: url('assets/dnd-counter.svg');
     background-size: contain;
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css
index ecd32cfe..669e4c89 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css
@@ -2,85 +2,96 @@
  * Check and Radio items *
  *************************/
 
-.check,
-.view.cell.check,
-.check row:selected,
-.check row:selected:focus {
+check,
+.view.check,
+.view.cell check,
+check row:selected,
+check row:selected:focus {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"));
 }
 
-.check:insensitive,
-.check row:selected:insensitive,
-.check row:selected:focus:insensitive {
+check:disabled,
+.view.check:disabled,
+check row:selected:disabled,
+check row:selected:focus:disabled {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"));
     background-color: transparent;
 }
 
-.check:checked,
-.view.cell.check:checked,
-.check row:selected:checked,
-.check row:selected:focus:checked {
+check:checked,
+.view.check:checked,
+check row:selected:checked,
+check row:selected:focus:checked {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"));
 
 }
 
-.check:checked:insensitive,
-.check row:selected:checked:insensitive,
-.check row:selected:focus:checked:insensitive {
+check:checked:disabled,
+.view.check:checked:disabled,
+check row:selected:checked:disabled,
+check row:selected:focus:checked:disabled {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"));
     background-color: transparent;
 }
 
-.check:inconsistent,
-.check row:selected:inconsistent,
-.check row:selected:focus:inconsistent {
+check:indeterminate,
+.view.check:indeterminate,
+check row:selected:indeterminate,
+check row:selected:focus:indeterminate {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"));
 
 }
 
-.check:inconsistent:insensitive,
-.check row:selected:inconsistent:insensitive,
-.check row:selected:focus:inconsistent:insensitive {
+check:indeterminate:disabled,
+.view.check:indeterminate:disabled,
+check row:selected:indeterminate:disabled,
+check row:selected:focus:indeterminate:disabled {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"));
 
 }
 
-.radio,
-.view.cell.radio,
-.radio row:selected,
-.radio row:selected:focus {
+radio,
+.view.radio,
+.view.cell radio,
+radio row:selected,
+radio row:selected:focus {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected.png"));
 }
 
-.radio:insensitive,
-.radio row:selected:insensitive,
-.radio row:selected:focus:insensitive {
+radio:disabled,
+.view.radio:disabled,
+radio row:selected:disabled,
+radio row:selected:focus:disabled {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected-insensitive.png"));
 }
 
-.radio:checked,
-.view.cell.radio:checked,
-.radio row:selected:checked,
-.radio row:selected:focus:checked {
+radio:checked,
+.view.radio:checked,
+.view.cell radio:checked,
+radio row:selected:checked,
+radio row:selected:focus:checked {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-selected.png"));
 }
 
-.radio:checked:insensitive,
-.radio row:selected:checked:insensitive,
-.radio row:selected:focus:checked:insensitive {
+radio:checked:disabled,
+.view.radio:checked:disabled,
+radio row:selected:checked:disabled,
+radio row:selected:focus:checked:disabled {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-selected-insensitive.png"));
 }
 
-.radio:inconsistent,
-.radio row:selected:inconsistent,
-.radio row:selected:focus:inconsistent {
+radio:indeterminate,
+.view.radio:indeterminate,
+radio row:selected:indeterminate,
+radio row:selected:focus:indeterminate {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"));
 
 }
 
-.radio:inconsistent:insensitive,
-.radio row:selected:inconsistent:insensitive,
-.radio row:selected:focus:inconsistent:insensitive {
+radio:indeterminate,
+.view.radio:indeterminate,
+radio row:selected:indeterminate,
+radio row:selected:focus:indeterminate {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"));
     background-color: transparent;
 }
@@ -108,122 +119,122 @@
 
 /* Now draw menu check and radio items */
 
-.menuitem.radio:hover,
-.menuitem.radio:insensitive,
-.menuitem.check:hover,
-.menuitem.check:insensitive {
+menuitem radio:hover,
+menuitem radio:disabled,
+menuitem check:hover,
+menuitem check:disabled {
     background-color: transparent;
     background: none;
     border-style: none;
     border-image: none;
 }
 
-.menuitem.radio {
+menuitem radio {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-unselected.svg"));
 }
 
-.menuitem.radio:checked {
+menuitem radio:checked {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-checked.svg"));
 }
 
-.menuitem.radio:checked:hover {
+menuitem radio:checked:hover {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-checked-prelight.svg"));
 }
 
-.menuitem.radio:checked:insensitive {
+menuitem radio:checked:disabled {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-checked-insensitive.svg"));
 }
 
-.menuitem.radio:inconsistent {
+menuitem radio:indeterminate {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-mixed.svg"));
 }
 
-.menuitem.radio:inconsistent:hover {
+menuitem radio:indeterminate:hover {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-mixed-prelight.svg"));
 }
 
-.menuitem.radio:inconsistent:insensitive {
+menuitem radio:indeterminate:disabled {
     -gtk-icon-source: -gtk-scaled(url("assets/radio-menuitem-mixed-insensitive.svg"));
 }
 
-.menuitem.check {
+menuitem check {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-unchecked.svg"));
 }
 
-.menuitem.check:checked{
+menuitem check:checked{
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-checked.svg"));
 }
 
-.menuitem.check:checked:hover {
+menuitem check:checked:hover {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-checked-prelight.svg"));
 }
 
-.menuitem.check:checked:insensitive {
+menuitem check:checked:disabled {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-checked-insensitive.svg"));
 }
 
-.menuitem.check:inconsistent {
+menuitem check:indeterminate {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed.svg"));
 }
 
-.menuitem.check:inconsistent:hover {
+menuitem check:indeterminate:hover {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed-prelight.svg"));
 }
 
-.menuitem.check:inconsistent:insensitive {
+menuitem check:indeterminate:disabled {
     -gtk-icon-source: -gtk-scaled(url("assets/checkbox-menuitem-mixed-insensitive.svg"));
 }
 
-GtkScale.slider,
-GtkScale.slider.horizontal,
-GtkScale.slider.horizontal:hover {
-    background-image: url("assets/scale-slider-hor.svg");
+scale slider,
+scale.horizontal slider,
+scale.horizontal slider:hover {
+    background-image: -gtk-scaled(url("assets/scale-slider-hor.svg"));
 }
 
-GtkScale.slider:insensitive,
-GtkScale.slider.horizontal:insensitive {
-    background-image: url("assets/scale-slider-insensitive-hor.svg");
+scale slider:disabled,
+scale.horizontal slider:disabled {
+    background-image: -gtk-scaled(url("assets/scale-slider-insensitive-hor.svg"));
 }
 
-GtkScale.slider.vertical {
-    background-image: url("assets/scale-slider-ver.svg");
+scale.vertical slider {
+    background-image: -gtk-scaled(url("assets/scale-slider-ver.svg"));
 }
 
-GtkScale.slider.vertical:insensitive {
-    background-image: url("assets/scale-slider-insensitive-ver.svg");
+scale.vertical slider:disabled {
+    background-image: -gtk-scaled(url("assets/scale-slider-insensitive-ver.svg"));
 }
 
-GtkScale.scale-has-marks-above.slider.horizontal,
-GtkScale.scale-has-marks-above.slider.horizontal:hover {
-    background-image: url("assets/scale-slider-marks-above-horizontal.svg");
+scale.horizontal.scale-has-marks-above slider,
+scale.horizontal.scale-has-marks-above slider:hover {
+    background-image: -gtk-scaled(url("assets/scale-slider-marks-above-horizontal.svg"));
 }
 
-GtkScale.scale-has-marks-above.slider.horizontal:insensitive {
-    background-image: url("assets/scale-slider-marks-above-horizontal-insensitive.svg");
+scale.horizontal.scale-has-marks-above slider:disabled {
+    background-image: -gtk-scaled(url("assets/scale-slider-marks-above-horizontal-insensitive.svg"));
 }
 
-GtkScale.scale-has-marks-above.slider.vertical {
-    background-image: url("assets/scale-slider-marks-above-vertical.svg");
+scale.vertical.scale-has-marks-above slider {
+    background-image: -gtk-scaled(url("assets/scale-slider-marks-above-vertical.svg"));
 }
 
-GtkScale.scale-has-marks-above.slider.vertical:insensitive {
-    background-image: url("assets/scale-slider-marks-above-vertical-insensitive.svg");
+scale.vertical.scale-has-marks-above slider:disabled {
+    background-image: -gtk-scaled(url("assets/scale-slider-marks-above-vertical-insensitive.svg"));
 }
 
-GtkScale.scale-has-marks-below.slider.horizontal,
-GtkScale.scale-has-marks-below.slider.horizontal:hover {
-    background-image: url("assets/scale-slider-marks-below-horizontal.svg");
+scale.horizontal.scale-has-marks-below slider,
+scale.horizontal.scale-has-marks-below slider:hover {
+    background-image: -gtk-scaled(url("assets/scale-slider-marks-below-horizontal.svg"));
 }
 
-GtkScale.scale-has-marks-below.slider.horizontal:insensitive {
-    background-image: url("assets/scale-slider-marks-below-horizontal-insensitive.svg");
+scale.horizontal.scale-has-marks-below slider:disabled {
+    background-image: -gtk-scaled(url("assets/scale-slider-marks-below-horizontal-insensitive.svg"));
 }
 
-GtkScale.scale-has-marks-below.slider.vertical {
-    background-image: url("assets/scale-slider-marks-below-vertical.svg");
+scale.vertical.scale-has-marks-below slider {
+    background-image: -gtk-scaled(url("assets/scale-slider-marks-below-vertical.svg"));
 }
 
-GtkScale.scale-has-marks-below.slider.vertical:insensitive {
-    background-image: url("assets/scale-slider-marks-below-vertical-insensitive.svg");
+scale.vertical.scale-has-marks-below slider:disabled {
+    background-image: -gtk-scaled(url("assets/scale-slider-marks-below-vertical-insensitive.svg"));
 }
 
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..6d02492b 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,10 @@
 * {

     padding: 0;

     background-clip: padding-box;

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

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

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

-    -GtkComboBox-arrow-scaling: 0.75;

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

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

-    -GtkExpander-expander-size: 14;

     -GtkHTML-link-color: @link_color;

     -GtkIMHtml-hyperlink-color: @link_color;

-    -GtkMenu-horizontal-padding: 0;

-    -GtkMenu-vertical-padding: 0;

-    -GtkMenuBar-internal-padding: 0;

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

     -GtkRange-trough-border: 1;

     -GtkRange-slider-width: 11;

     -GtkRange-stepper-size: 13;

@@ -41,40 +22,26 @@
     -GtkScrollbar-slider-width: 11;

     -GtkScrollbar-min-slider-length: 31;

     -GtkScrolledWindow-scrollbar-spacing: 0;

-    -GtkScrolledWindow-scrollbars-within-bevel: 1;

-    -GtkSeparatorMenuItem-horizontal-padding: 0;

-    -GtkStatusbar-shadow-type: none;

     -GtkTextView-error-underline-color: @error_color;

     -GtkToolButton-icon-spacing: 4;

     -GtkToolItemGroup-expander-size: 6;

-    -GtkToolbar-internal-padding: 0;

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

     -WnckTasklist-fade-overlay-rect: 0;

     /* Highlight drag-drop destination */

-    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 +52,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 +66,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 +85,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 +101,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 +111,7 @@ GtkWindow {
     color: @theme_fg_color;

 }

 

-.gtkstyle-fallback:insensitive {

+.gtkstyle-fallback:disabled {

     background-color: @insensitive_bg_color;

     color: @insensitive_fg_color;

 }

@@ -158,13 +125,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 +143,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,6 +157,9 @@ GtkLabel:insensitive {
     background-image: url("assets/resize-grip.svg");

 }

 

+/* ie. selection mouse retancle in caja */

+view.rubberband,

+rubberband,

 .view.rubberband,

 .rubberband {

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

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

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

 

-.separator {

+separator {

     border-width: 1px;

     border-style: solid;

     border-image: none;

@@ -208,60 +182,48 @@ 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 {

+separator:hover {

     color: shade (@theme_bg_color, 0.92);

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

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

     border-image: none;

 }

 

-.separator.horizontal {

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

+treeview.view.separator,

+treeview.separator,

+treeview.view.separator:hover,

+treeview.separator:hover {

+    border-style: solid;

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

+    border-color: @notebook_border;

 }

 

-.separator.vertical {

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

+separator.horizontal {

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

 }

 

-GtkComboBox .separator {

-    -GtkWidget-wide-separators: true;

-    -GtkWidget-horizontal-separator: 0;

-    -GtkWidget-vertical-separator: 0;

+separator.vertical {

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

 }

 

-.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,18 +233,49 @@ 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: @theme_bg_color;

+}

+

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

-    padding: 5px 4px;

-    -GtkEntry-inner-border: 0;

-    -GtkEntry-progress-border: 0;

+    padding: 6px 4px;

     color: @entry_text_color;

     background-image: -gtk-gradient(linear,

                                     left top, left bottom,

@@ -310,14 +303,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 +325,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 +418,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 +449,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 +466,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 +477,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 +511,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 +539,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,59 +556,65 @@ 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;

     color: alpha(@theme_base_color, 0.0);

     background-color: alpha(@theme_base_color, 0.0);

     /* background-image in -assets variant */

+    background-repeat: no-repeat;

     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 +628,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 +689,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 +703,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 +711,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 +723,7 @@ GtkLevelBar.vertical {
  * Frames *

  **********/

 

-.frame {

+frame {

     padding: 2px;

     border-width: 1px;

     border-radius: 4px;

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

 

 /* only render frames in a GtkScrolledWindow */

-GtkScrolledWindow.frame {

+scrolledwindow.frame {

     border-width:  1px;

     border-radius: 0;

     border-style:  solid;

@@ -753,20 +749,23 @@ GtkScrolledWindow.frame {
  * Buttons *

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

 

-.button.menuitem.menubar {

+button menuitem menubar {

     padding: 4px 8px;

 }

 

-.button {

-    padding: 4px;

+button {

+    padding: 6px;

+    min-height: 20px;

+    min-width: 20px;

+}

+

+/* needed with new button padding */

+button label {

+    padding: 2px 0px;

 }

 

-.button {

+button {

     transition: all 400ms ease-out;

-    -GtkButton-image-spacing: 4;

-    -GtkButton-interior-focus: true;

-    -GtkButton-default-border: 0;

-    -GtkButton-inner-border: 3;

     -GtkArrow-arrow-scaling: 0.5;

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

@@ -782,11 +781,7 @@ GtkScrolledWindow.frame {
     border-left-color:   alpha (#000, 0.01);

     border-right-color:  alpha (#000, 0.01);

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

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

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

@@ -796,33 +791,38 @@ GtkScrolledWindow.frame {
     text-shadow: 0px 1px @theme_shadow_color;

 }

 

-.button.default {

-    transition: all 400ms ease-out;

+button.default {

     text-shadow: none;

     color: @theme_fg_color;

 }

 

 /* ie. mate-control-center */

-.button.flat {

+button.flat {

     transition: all 400ms ease-out;

-    padding: 0px;

+    border-radius: 6px;

+    padding: 4px;

     border-color: transparent;

     background-color: transparent;

     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. caja location drop down button */

+button.flat.toggle {

+    padding: 6px;

+}

+

 /* 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,16 +835,16 @@ 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)),

                                      color-stop (0.50, shade (@theme_bg_color, 1.00)),

-                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),

+                                     color-stop (0.50, shade (@theme_bg_color, 0.99)),

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

     border-radius: 6px;

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

@@ -853,8 +853,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 +862,14 @@ 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 {

-    color: @theme_selected_fg_color;

+button:hover:active,

+button:checked,

+button:checked:hover,

+button:checked:hover:active {

     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,85 +881,95 @@ 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 {

-    padding: 5px 4px;

+button.text-button,

+button.text-button:focus,

+button.text-button:hover,

+button.file {

+    padding: 6px;

 }

 

-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 {

-    padding: 2px;

+.path-bar > button,

+.linked.path-bar > button,

+.linked.path-bar > button:hover,

+.linked.path-bar > button:hover:active,

+.linked.path-bar > button:checked,

+.linked.path-bar > button:checked:hover,

+.linked.path-bar > button:checked:hover:active {

+    padding: 7px;

 }

 

-.path-bar .button {

+/* slider (left/right arrow) button */

+.linked.path-bar > button.image-button {

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

+    box-shadow: none;

 }

 

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

-    border-left-width: 1px;

+.linked.path-bar > button.image-button:first-child {

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

+    box-shadow: inset  0px  1px 0 0 alpha(shade(@button_border, 1.00), 0.70),

+                inset  1px  0px 0 0 alpha(shade(@button_border, 0.94), 0.80),

+                inset -1px  0px 0 0 alpha(shade(@button_border, 0.94), 0.80),

+                inset  0px -1px 0 0 alpha(shade(@button_border, 0.88), 0.90);

 }

 

-/* 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 {

-    border-radius: 0px;

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

+.linked.path-bar > button.image-button:first-child:hover {

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

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

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

+                inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-.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 {

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

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

+.linked.path-bar > button.image-button:last-child {

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

+    box-shadow: inset  0px  1px 0 0 alpha(shade(@button_border, 1.00), 0.70),

+                inset -1px  0px 0 0 alpha(shade(@button_border, 0.94), 0.80),

+                inset  0px -1px 0 0 alpha(shade(@button_border, 0.88), 0.90);

 }

 

-.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-radius: 0px 6px 6px 0px;

+.linked.path-bar > button.image-button:last-child:hover {

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

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

 }

 

-.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 {

-    border-radius: 6px;

-    border-width: 1px;

+.linked.path-bar > button.toggle,

+.linked.path-bar > button.toogle.button-image {

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

+    border-radius: 0px;

+    box-shadow: inset  0px  1px 0 0 alpha(shade(@button_border, 1.00), 0.70),

+                inset -1px  0px 0 0 alpha(shade(@button_border, 0.94), 0.80),

+                inset  0px -1px 0 0 alpha(shade(@button_border, 0.88), 0.90);

+}

+

+.linked.path-bar > button.toggle:hover,

+.linked.path-bar > button.toogle.button-image:hover,

+.linked.path-bar > button.toggle:checked,

+.linked.path-bar > button.toogle.button-image:checked {

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

+    border-radius: 0px;

+    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  0px -1px 0 0 shade (@theme_selected_bg_color, 1.3);

 }

 

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

@@ -968,53 +977,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 +1035,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 +1076,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 +1134,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 +1175,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 +1233,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 +1273,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 +1327,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 +1367,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 entry {

+    padding: 7px 6px;

 }

 

-.linked > GtkComboBox > .button,

-.linked > GtkComboBox > .button:focus,

-.linked > GtkComboBox > .button:hover,

-.linked > GtkComboBox > .button:checked,

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

-.linked > GtkComboBox > .button:insensitive {

-    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 +1466,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 +1479,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 +1492,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,186 +1513,130 @@ 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-right-width: 0px;

-    border-left-width: 0px;

+    border-width: 1px 0px 1px 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),

                  inset  0px -1px shade(@selected_bg_color, 1.3);

-     border-right-width: 0px;

-     border-left-width: 0px;

-     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-width: 1px 0px 1px 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),

                 inset  0px -1px @insensitive_border_color;

-    border-right-width: 0px;

-    border-left-width: 0px;

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

     border-radius: 0;

 }

 

 /* 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-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;

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

 }

 

-/* 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),

                 inset  0px -1px shade(@selected_bg_color, 1.3);

     border-radius: 6px 0 0 6px;

-    border-right-width: 0;

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

 }

 

-/* 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),

                 inset  0px -1px @insensitive_border_color;

     border-radius: 6px 0 0 6px;

-    border-right-width: 0;

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

 }

 

 /* 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 entry: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),

                 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 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,

                 inset  0px -1px @insensitive_border_color;

     border-radius: 0 6px 6px 0;

-    border-left-width: 0;

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

 }

 

-/* 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 +1644,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 +1655,8 @@ 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 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 +1665,13 @@ 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 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 +1680,7 @@ GtkColorButton.button {
     border-width: 0px 1px 1px 1px;

 }

 

-.vertical.linked > GtkComboBox > .button:insensitive:last-child,

-.vertical.linked .button:insensitive {

+.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 +1691,8 @@ 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 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 +1700,13 @@ 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 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 +1714,7 @@ 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 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 +1724,8 @@ 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 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 +1733,13 @@ 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 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 +1747,7 @@ 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 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 +1757,8 @@ 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 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 +1767,13 @@ 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 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 +1782,7 @@ GtkColorButton.button {
     border-width: 1px;

 }

 

-.vertical.linked > GtkComboBox:only-child > .button:insensitive:last-child,

-.vertical.linked .button:insensitive:only-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 +1796,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 +1815,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 +1828,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 +1848,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 +1860,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 +1882,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 +1896,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 +1917,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 +1929,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 +1938,24 @@ GtkColorButton.button {
  * ComboBoxes *

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

 

-GtkComboBox {

+combobox {

     padding: 0px;

-    -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-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 */

@@ -2054,8 +1969,7 @@ GtkComboBox .entry:nth-child(first) {
                 inset  0px -1px shade(@button_border, 1.10);

 }

 

-

-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 +1983,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 +2023,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 +2034,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,85 +2052,318 @@ 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) {

-    border-top-left-radius: 0px;

-    border-bottom-left-radius: 0px;

-    border-top-right-radius: 4px;

-    border-bottom-right-radius: 4px;

+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-radius: 6px;

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

-    padding: 2px 3px;

+    padding: 8px 6px;

+}

+

+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,

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

+/* 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;

 }

 

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

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

+combobox button.combo arrow {

+    padding: 0px 2px;

 }

 

-.primary-toolbar GtkComboBox.combobox-entry .button:nth-child(first) {

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

-    border-radius: 4px 0px 0px 4px;

+/* Middle button */

+.linked.horizontal combobox button.combo,

+.linked.horizontal 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;

+}

+

+ /* Middle Button active/hover */

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

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

+.linked.horizontal combobox button.combo:hover:active,

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

+.linked.horizontal combobox button.combo:checked:hover,

+.linked.horizontal 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.horizontal 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.horizontal combobox:first-child button.combo:first-child,

+.linked.horizontal 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.horizontal combobox:first-child button.combo:hover:first-child,

+.linked.horizontal combobox:first-child button.combo:focus:hover:first-child,

+.linked.horizontal combobox:first-child button.combo:hover:active:first-child,

+.linked.horizontal combobox:first-child button.combo:checked:first-child,

+.linked.horizontal combobox:first-child button.combo:checked:hover:first-child,

+.linked.horizontal 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.horizontal 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;

 }

 

-GtkComboBox.combobox-entry .button *:checked,

-GtkComboBox.combobox-entry .button *:prelight {

+/* Rightmost button */

+.linked.horizontal combobox:last-child button.combo:last-child,

+.linked.horizontal 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;

+}

+

+/* Rightmost button active */

+.linked.horizontal combobox:last-child button.combo:hover:last-child,

+.linked.horizontal combobox:last-child button.combo:focus:hover:last-child,

+.linked.horizontal combobox:last-child button.combo:hover:active:last-child,

+.linked.horizontal combobox:last-child button.combo:checked:last-child,

+.linked.horizontal combobox:last-child button.combo:checked:hover:last-child,

+.linked.horizontal 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.horizontal 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;

+}

+

+/* vertical */

+/* Middle button */

+.vertical.linked > combobox > button.combo,

+.vertical.linked > combobox > button.combo: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),

+                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

+    border-radius: 0px;

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

+}

+

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

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

+.vertical.linked > combobox > button.combo:checked {

+    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: 0px;

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

+}

+

+.vertical.linked > combobox > button.combo:disabled {

+    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: 0px;

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

+}

+

+/* Top button */

+.vertical.linked > combobox:first-child > button.combo:first-child,

+.vertical.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.90),

+                inset  -1px 0px alpha(shade(@button_border, 0.88), 0.90);

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

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

+}

+

+.vertical.linked > combobox:first-child > button.combo:hover:first-child,

+.vertical.linked > combobox:first-child > button.combo:focus:hover:first-child,

+.vertical.linked > combobox:first-child > button.combo:checked: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);

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

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

+}

+

+.vertical.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 @insensitive_border_color;

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

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

+}

+

+/* Bottom button */

+.vertical.linked > combobox:last-child > button.combo:last-child,

+.vertical.linked > combobox:last-child > button.combo: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);

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

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

+}

+

+.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 {

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

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

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

+}

+

+.vertical.linked > combobox:last-child > button.combo:disabled:last-child {

+    box-shadow: inset  1px  0px @insensitive_border_color,

+                inset -1px  0px @insensitive_border_color,

+                inset  0px -1px @insensitive_border_color;

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

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

+}

+

+/* Single button */

+.vertical.linked > combobox:only-child > button.combo:only-child,

+.vertical.linked > combobox:only-child > button.combo: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),

+                inset  0px -1px alpha(shade(@button_border, 0.94), 0.90);

+    border-radius: 6px;

+    border-width: 1px;

+}

+

+.vertical.linked > combobox:only-child > button.combo:hover:only-child,

+.vertical.linked > combobox:only-child > button.combo:focus:hover:only-child,

+.vertical.linked > combobox:only-child > button.combo:checked: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),

+                inset  0px -1px shade(@selected_bg_color, 1.3);

+    border-radius: 6px;

+    border-width: 1px;

+}

+

+.vertical.linked > combobox:only-child > button.combo:disabled:only-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: 6px;

+    border-width: 1px;

+}

+

+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 * {

-    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,16 +2377,44 @@ GtkHandleBox,
     color: @toolbar_fg_color;

 }

 

-.toolbar.vertical {

+toolbar.vertical {

     border-radius: 4px 0 0 4px;

     padding: 2px;

 }

 

+toolbar button.flat.image-button label {

+    color: @menu_fg_dark_color;

+}

+

+toolbar toolitem combobox button.combo,

+toolbar toolbutton button.flat.toggle.popup:focus,

+toolbar toolbutton button.flat.toggle.popup:disabled,

+toolbar toolbutton button.flat.image-button:disabled {

+    box-shadow: none;

+    background-image: none;

+}

+

+toolbar toolbutton button.flat.toggle.popup:focus {

+

+}

+

+toolbar toolbutton button.flat.toggle.popup:focus:hover,

+toolbar toolitem combobox button.combo:hover {

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

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

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

+}

+

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

  * Menubar Toolbars *

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

 

-.toolbar.menubar {

+toolbar menubar {

     padding: 2px 4px 5px 3px;

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

@@ -2263,7 +2438,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)),

@@ -2272,7 +2447,7 @@ GtkHandleBox,
     border-width: 0px 0px 1px 0px;

     border-radius: 0px;

     border-style: solid;    

-    border-color: transparent;

+    border-color: @primay-toolbar-border;

     padding: 3px;

     box-shadow: none;

     -GtkWidget-window-dragging: true;

@@ -2280,7 +2455,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 +2464,10 @@ GtkHandleBox,
 }

 

 /* primary toolbar buttons */

-.toolbar .button,

-.primary-toolbar.toolbar .button {

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

+toolbar button,

+toolbar.primary-toolbar button,

+toolbar.primary-toolbar .linked button,

+toolbar.primary-toolbar button:focus {

     border-image: none;

     border-style: solid;

     border-color: transparent;

@@ -2300,12 +2476,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 +2499,37 @@ 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 +2540,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 +2558,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 +2577,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 +2630,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 +2658,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 +2686,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 +2704,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 +2726,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 +2769,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 +2801,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 +2823,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 +2853,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 +2877,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 +2891,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 +2911,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 +2921,62 @@ 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.linked.stack-switcher > button.text-button.radio,

+stackswitcher > button.text-button.radio,

+stackswitcher > .linked.stackswitcher > button.text-button.radio,

+stackswitcher > button.image-button.radio,

+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 +2984,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 +3004,19 @@ GtkCalendar.header .stack-switcher > .titlebutton.button {
  * GtkActionBar *

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

 

-GtkActionBar .frame.action-bar .horizontal.linked.stack-switcher .button.image-button {

+actionbar revealer .horizontal.linked.stack-switcher button.image-button.radio {

     padding: 4px 2px;

 }

 

-GtkActionBar .frame.action-bar .button.image-button {

+actionbar revealer .horizontal.linked.stack-switcher button.image-button.radio:first-child  {

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

+}

+

+actionbar revealer .horizontal.linked.stack-switcher button.image-button.radio:last-child  {

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

+}

+

+actionbar revealer .horizontal button.image-button.popup.toggle {

     padding: 8px;

 }

 

@@ -2840,45 +3024,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 +3067,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 +3076,99 @@ 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 {

+    min-height: 10px;

+    min-width: 10px;

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

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

 }

 

-/* :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.vertical > entry {

+    border-style: none;

+    border-radius: 0;

+    padding: 5px 1px;

+    box-shadow: none;

 }

 

-/* :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 {

-    box-shadow: none;

+spinbutton.vertical > button,

+spinbutton.vertical > button:focus {

+    border-style: solid;

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

+    border-radius: 3px 3px 0px 0px;

+    padding: 6px 0px;

 }

 

-.spinbutton.vertical .button:first-child {

-    padding: 6px 4px;

-    border-image-width: 3px 3px 0 3px;

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

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

+spinbutton.vertical > button:last-child {

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

+    border-radius: 0px 0px 3px 3px;

 }

 

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

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

+                inset -1px  0px 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;

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

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

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

+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 {

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

-}

-

-.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.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 {

-    transition: all 600ms ease-out;

+GtkGrid button,

+GtkGrid button.flat {

+    transition: all 400ms 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 +3191,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 +3201,98 @@ 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;

+    box-shadow: inset  0px -1px alpha(shade(@button_border, 1.00), 0.90);

 }

 

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

+    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.90);

 }

 

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

+    box-shadow: inset -1px  0px alpha(shade(@button_border, 1.00), 0.90);

 }

 

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

+    box-shadow: inset  1px  0px alpha(shade(@button_border, 1.00), 0.90);

 }

 

-/* 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: 2px 4px;

 }

 

-.notebook tab.top {

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

+paned.horizontal notebook header.top {

+    border-radius: 0px;

+    border-width: 0px;

+    box-shadow: none;

 }

 

-.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 +3303,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 +3358,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 +3385,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 +3409,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 +3433,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,8 +3444,7 @@ GtkPaned.horizontal .notebook tab.top {
 

 /* close button styling */

 

-.notebook tab .button {

-    color: mix (@theme_fg_color, @theme_bg_color, 0.85);

+notebook button.flat.small-button {

     border-image: none;

     background-image: none;

     background-color: transparent;

@@ -3350,28 +3453,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 +3483,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 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.arrow:hover,

-.notebook.arrow:active {

+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 +3532,41 @@ 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,

+window.background.popup menuitem check,

+window.background.popup menuitem radio,

+window.background.popup menu menuitem check,

+window.background.popup menu menuitem radio {

+	padding: 0px 6px 0px 0px;

+    background-repeat: no-repeat;

+    background-position: center;

+}

+

+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 +3574,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 +3584,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 +3593,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 +3622,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 +3679,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;

 }

- 

-.header-bar .title {

+

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

+}

+

+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 +3749,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 +3768,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 +3795,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 +3816,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 +3838,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 +3855,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 +3871,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 +3901,8 @@ GtkSwitch.slider:backdrop:insensitive > GtkLabel {
  * image *

  *********/

 

-GtkImage,

-GtkImage:insensitive {

+image,

+image:disabled {

     background-color: transparent;

 }

 

@@ -3734,14 +3914,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 +3931,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 +3976,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 +4017,33 @@ GtkIconView.view.cell:hover:focus {
     text-shadow: none;

 }

 

+/* ie. coloe of selected icons if unfocused */

+.view:active {

+    background-color: shade(@theme_bg_color, 0.8);

+}

+

+.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 +4053,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 +4075,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 +4108,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 +4128,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 +4139,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 +4147,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 +4208,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 +4223,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 +4256,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 +4273,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 +4289,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 +4303,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 +4312,70 @@ 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 {

-    -GtkExpander-expander-size: 14;

+expander arrow {

+    min-width: 16px;

+    min-height: 16px;

     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 +4383,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 +4395,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;

+    transition: all 400ms 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 +4426,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 +4449,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 +4468,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 +4489,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 +4501,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 +4518,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 +4528,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 +4541,7 @@ GtkCalendar.highlight {
     color: @theme_base_color;

 }

 

-.menuitem GtkCalendar {

+menuitem calendar {

     background-color: shade (@menu_bg_color, 1.3);

     background-image: none;

 }

@@ -4331,7 +4550,7 @@ GtkCalendar.highlight {
  * GtkInfoBar *

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

 

-GtkInfoBar {

+infobar {

     border-width: 0;

     border-style: none;

 }

@@ -4350,54 +4569,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 +4624,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 +4633,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 +4650,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 +4659,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 +4679,70 @@ 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 2px;

 }

 

 /* 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 2px;

 }

 

 /* 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 2px;

 }

 

 /* 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 {

-    padding-left:  6px;

-    padding-right: 6px;

+.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: 6px 2px;

     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,

@@ -4532,24 +4750,20 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical {
                                      color-stop (0.48, @button_gradient2),

                                      color-stop (0.52, @button_gradient3),

                                      to   (@button_gradient4));

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

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

 }

 

-.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 +4772,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,13 +4781,17 @@ 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;

 }

 

+.dialog-action-area.linked button label {

+     padding: 2px 0px 0px 0px;

+}

+

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

  * Dim labels *

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

@@ -4618,15 +4836,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 +4849,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 +4871,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 +4886,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 +4898,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 +4912,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 +4926,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 +4934,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,

@@ -4771,13 +4974,7 @@ GtkOverlay.osd {
     border-radius: 5px;

 }

 

-/* ie. volume button */

-.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 +4989,76 @@ GtkOverlay.osd {
     -GtkToolbar-button-relief: normal;

 }

 

-.osd.toolbar .button,

-.osd.toolbar .button:hover,

-.osd.toolbar .linked .button {

-    padding: 6px;

+toolbar.osd button,

+toolbar.osd button:hover,

+toolbar.osd button:focus,

+toolbar.osd button:focus:hover,

+toolbar.osd button:focus:hover:active,

+toolbar.osd button:hover:active,

+toolbar.osd .linked button

+toolbar.osd .linked button:hover,

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

+toolbar.osd .linked button:focus,

+toolbar.osd .linked button:focus:hover,

+toolbar.osd .linked button:focus:hover:active,

+toolbar.osd button.scale.flat.image-button {

+    padding: 8px;

     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,

+toolbar.osd .linked button:focus:hover:first-child,

+toolbar.osd .linked button:focus:hover:active: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,

+toolbar.osd .linked button:focus:hover:last-child,

+toolbar.osd .linked button:focus:hover:active: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 +5070,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 +5082,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 +5099,18 @@ 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.horizontal,

+progressbar.horizontal .osd {

+    min-height: 3px;

+}

+

+.osd progressbar trough,

+progressbar .osd trough {

     padding: 0;

     border-image: none;

     border-style: none;

@@ -4907,37 +5120,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,8 +5171,9 @@ GtkProgressBar.osd.progressbar {
  * Popovers *

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

 

-.popover {

+popover.background {

     background-clip: initial;

+    color: @theme_fg_dark_color;

     margin: 10px;

     padding: 2px;

     border-color: @borders;

@@ -4970,42 +5183,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 +5225,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 +5253,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 +5265,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 +5287,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 +5297,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 +5319,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 +5328,54 @@ GtkProgressBar.osd.progressbar {
                 inset  0px -1px @insensitive_border_color;

 }

 

-GtkModelButton.button,

-GtkModelButton.button:first-child,

-GtkModelButton.button:last-child,

-GtkModelButton.button:only-child {

-    background-image: none;

-    color: @theme_fg_dark_color;

-    border-radius: 3px;

+modelbutton.flat,

+.linked button.image-button.model {

+  min-height: 24px;

+}

+

+modelbutton.flat arrow.left {

+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");

 }

 

-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.flat arrow.right {

+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");

+}

+

+modelbutton.flat,

+modelbutton.flat:first-child,

+modelbutton.flat:last-child,

+modelbutton.flat:only-child {

+    background-image: none;

+    color: @theme_fg_dark_color;

+    border-radius: 4px;

+    padding: 6px 0px 6px 6px;

+}

+

+modelbutton.flat:checked,

+modelbutton.flat:disabled,

+modelbutton.flat:checked:disabled,

+modelbutton.flat,

+modelbutton.flat:focus,

+modelbutton.flat:checked:focus,

+modelbutton.flat:checked:first-child,

+modelbutton.flat:disabled:first-child,

+modelbutton.flat:checked:disabled:first-child,

+modelbutton.flat:first-child,

+modelbutton.flat:focus:first-child,

+modelbutton.flat:checked:focus:first-child,

+modelbutton.flat:checked:last-child,

+modelbutton.flat:disabled:last-child,

+modelbutton.flat:checked:disabled:last-child,

+modelbutton.flat:last-child,

+modelbutton.flat:focus:last-child,

+modelbutton.flat:checked:focus:last-child,

+modelbutton.flat:checked:only-child,

+modelbutton.flat:disabled:only-child,

+modelbutton.flat:checked:disabled:only-child,

+modelbutton.flat:only-child,

+modelbutton.flat:focus:only-child,

+modelbutton.flat:checked:focus:only-child,

+.linked button.image-button.model {

     background-color: shade (@theme_bg_dark_color, 1.0);

     background-image: none;

     border-color: transparent;

@@ -5164,42 +5385,30 @@ 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.flat:checked:hover:only-child,

+modelbutton.flat:checked:hover:active:only-child,

+modelbutton.flat:focus:hover:active:only-child,

+modelbutton.flat:hover:active:only-child,

+modelbutton.flat:hover:only-child,

+modelbutton.flat:selected:only-child,

+modelbutton.flat:checked:hover:first-child,

+modelbutton.flat:checked:hover:active:first-child,

+modelbutton.flat:focus:hover:active:first-child,

+modelbutton.flat:hover:active:first-child,

+modelbutton.flat:hover:first-child,

+modelbutton.flat:selected:first-child,

+modelbutton.flat:checked:hover:last-child,

+modelbutton.flat:checked:hover:active:last-child,

+modelbutton.flat:focus:hover:active:last-child,

+modelbutton.flat:hover:active:last-child,

+modelbutton.flat:hover:last-child,

+modelbutton.flat:selected:last-child,

+modelbutton.flat:checked:hover,

+modelbutton.flat:checked:hover:active,

+modelbutton.flat:focus:hover:active,

+modelbutton.flat:hover:active,

+modelbutton.flat:hover,

+modelbutton.flat:selected {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

                                      from (shade(@menu_bg_dark_color, 2.03)),

@@ -5216,11 +5425,26 @@ 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 {

+.linked button.image-button.model,

+.linked button.image-button.model:focus,

+.linked button.image-button.model:first-child,

+.linked button.image-button.model:focus:first-child,

+.linked button.image-button.model:last-child,

+.linked button.image-button.model:focus:last-child {

+    background-color: shade (@theme_bg_dark_color, 1.0);

+    background-image: none;

+    border-color: transparent;

+    border-image: none;

+    border-style: none;

+    box-shadow: none;

+    border-radius: 3px;

+}

+

+.linked button.image-button.model:checked,

+.linked button.image-button.model:hover,

+.linked button.image-button.model:hover:active,

+.linked button.image-button.model:checked:hover,

+.linked button.image-button.model:checked:hover:active {

     color: @fg_dark_color;

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

@@ -5233,34 +5457,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 button.image-button.model:hover,

+.linked button.image-button.model:hover:active,

+.linked button.image-button.model:checked:hover,

+.linked button.image-button.model: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 button.image-button.model:hover:first-child,

+.linked button.image-button.model:hover:active:first-child,

+.linked button.image-button.model:checked:hover:first-child,

+.linked button.image-button.model: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 button.image-button.model:hover:last-child,

+.linked button.image-button.model:hover:active:last-child,

+.linked button.image-button.model:checked:hover:last-child,

+.linked button.image-button.model: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 +5494,15 @@ GtkModelButton.button:selected,
     padding: 5px 4px;

 }

 

-.popover .button.default.text-button.suggested-action:hover {

+/* override theme_bg color */

+popover button.default.text-button.suggested-action:disabled {

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

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 1.0)),

+                                     to   (shade(@menu_bg_dark_color, 1.0)));

+}

+

+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 +5519,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 +5527,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 +5579,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 +5598,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 +5611,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 +5630,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 +5656,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 +5684,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 +5703,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 +5732,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 +5751,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 +5780,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 +5796,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,38 +5822,38 @@ 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;

     border-style: solid;

-    background-color: @theme_bg_color;

+/*    background-color: @theme_bg_color; */

     box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;

     /* this is used for the resize cursor area */

     margin: 10px;

 }

  

 /* workaround to avoid unwanted black frames if switching compositor on/off */

-.window-frame:backdrop {

-    background-color: @theme_bg_dark_color;

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

+/*    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 +5861,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 +5883,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 +5906,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 +5925,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 +5939,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 +5958,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 +5972,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 +5991,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 +6005,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 +6024,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 +6039,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 +6050,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 +6061,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 +6072,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 +6087,18 @@ 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 list row.activatable:hover {

+    border-radius: 3px;

+    border-style: none;

 }

 

-GtkStack .linked.vertical .entry {

+stack .linked.vertical entry {

     border-radius: 5px;

     border-style: solid;

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

@@ -5922,103 +6113,115 @@ 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:first-child > button.combo:first-child,

+stack .vertical.linked > combobox:first-child > button.combo:hover:first-child,

+stack .vertical.linked > combobox:first-child > button.combo:focus:first-child,

+stack .vertical.linked > combobox:first-child > button.combo:focus:hover:first-child,

+stack .vertical.linked > combobox:first-child > button.combo:checked:first-child,

+stack .vertical.linked > combobox:first-child > button.combo:disabled:first-child {

     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;

 }

 

-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 .vertical.linked > combobox:first-child > button.combo:first-child,

+stack .vertical.linked > combobox:first-child > button.combo:focus:first-child {

+    box-shadow: none;

+}

+

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

+}

+

+stack .linked.vertical spinbutton.horizontal {

+    border-style: 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;

+}

+

+stack .linked.vertical spinbutton.horizontal entry,

+stack .linked.vertical spinbutton.horizontal entry:focus,

+stack .linked.vertical spinbutton.horizontal entry:active {

+    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 +6230,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 +6240,68 @@ 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);

+}

+

+stack .linked.vertical spinbutton.horizontal button:hover,

+stack .linked.vertical spinbutton.horizontal button:focus:hover,

+stack .linked.vertical spinbutton.horizontal button:active,

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

 }

 

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

  * 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 +6312,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 +6323,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,54 +6340,136 @@ 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;

+filechooser paned.horizontal box.vertical {

+    border-color: @notebook_border;

+    border-style: solid;

+    border-width: 1px;

 }

 

-.path-bar.linked .button  {

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

+filechooser #pathbarbox {

+    background-color: shade(@theme_bg_color, 1.07);

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

 }

 

-.path-bar.linked .button:hover,

-.path-bar.linked .button:checked,

-.path-bar.linked .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),

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

+/* bg color srollbar junction */

+filechooser paned.horizontal box.vertical box.horizontal .view box.vertical {

+    background-color: shade(@theme_bg_color, 1.07);

+    border-style: none;

+}

+

+filechooser placessidebar.sidebar {

+    border-color: @notebook_border;

+    border-style: solid;

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

+}

+

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

+ * Color Chooser *

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

+

+button.color colorswatch.activatable {

+    border-radius: 3px;

+}

+

+colorchooser {

+    border-style: solid;

+    border-color: @notebook_border;

+    border-width: 1px;

+    border-radius: 4px;

+    background-color: shade (@theme_bg_color, 1.1);

+    color: @theme_fg_color;

+    box-shadow: none;

+}

+

+colorchooser box.vertical {

+    padding: 6px;

+}

+

+colorswatch,

+colorswatch:selected {

+    border-width: 1px;

+    border-style: solid;

+    border-radius: 3px;

+    border-color: @notebook_border;

+    box-shadow: inset 0 2px alpha(black, 0.07),

+                inset 1px 1px alpha(black, 0.07);

+    background-color: transparent;

+    background-clip: border-box;

+}

+

+colorswatch:hover {

+    border-color: alpha(black, 0.45);

+}

+

+colorswatch.color-dark:hover {

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

+                                      alpha(white, 0) 40%,

+                                      alpha(white, 0.3));

+}

+

+colorswatch.color-light:hover {

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

+                                      alpha(black, 0) 40%,

+                                      alpha(black, 0.1));

+}

+

+colorswatch.color-light:selected:hover {

+    background-image: none;

+}

+

+colorswatch {

+    border-radius: 6px;

+}

+

+colorchooser #add-color-button {

+    background-clip: padding-box;

+    border-color: mix(@borders, @theme_bg_color, 0.3);

+    background-color: mix(@borders, @theme_bg_color, 0.8);

+}

+

+colorchooser #add-color-button:hover {

+    border-color: @borders;

+    background-color: @borders;

+    color: @theme_base_color;

+}

+

+.color-active-badge,

+.color-active-badge:selected {

+    border-style: solid;

+    border-width: 2px;

+    background-color: transparent;

+}

+

+.color-active-badge.color-light,

+.color-active-badge.color-light:hover {

+    border-color: #444444;

+    color: #444444;

+}

+

+.color-active-badge.color-dark,

+.color-active-badge.color-dark:hover {

+    border-color: #cccccc;

+    color: #cccccc;

+}

+

+colorchooser box.horizontal colorswatch {

+    border-radius: 6px;

+}

+

+colorchooser box.horizontal colorswatch.color-dark:hover {

+    background-image: none;

+    border-color: alpha(black, 0.3);

+}

+

+/* color mix window */

+colorchooser box.horizontal box.horizontal grid.horizontal{

+    padding: 6px;

 }

 

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

diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css
index 96610169..73701f8c 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css
@@ -52,9 +52,9 @@
 @define-color link_color #008BCC;
 @define-color frame_color #7F7F80;
 @define-color inactive_frame_color #B9B9BB;
-@define-color warning_color #00ABF5;
-@define-color error_color #0000CC;
-@define-color success_color #064E9A;
+@define-color warning_color #f57900;
+@define-color error_color #CC0000;
+@define-color success_color #4e9a06;
 
 @define-color info_fg_color rgb (181, 171, 156);
 @define-color info_bg_color rgb (116, 172, 232);
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
index 0c27c521..d5044bf2 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
@@ -4,107 +4,30 @@
 
 /**** Window ***/
 
-/* background of all views */
-CajaNavigationWindow .view {
-    background-color: shade (@base_color, 1.0);
-    color: @theme_fg_color;
-}
-
-/* since gtk+-3.18 */
-CajaNavigationWindow FMListView .view {
-    background-color: shade (@base_color, 1.0);
+/* icon and list view */
+.caja-notebook .view,
+.caja-notebook scrolledwindow.frame,
+.caja-side-pane scrolledwindow.frame,
+.caja-side-pane CajaInformationPanel .vertical {
+    border-style: none;
 }
 
 /* caja sidebar */
-CajaWindow FMTreeView .view,
-CajaWindow CajaNotesViewer .view,
-CajaWindow CajaPlacesSidebar .view,
-CajaWindow CajaHistorySidebar .view,
-CajaWindow CajaEmblemSidebar .frame,
-CajaWindow CajaInformationPanel .vertical {
+.caja-side-pane treeview.view,
+.caja-side-pane textview.view text,
+.caja-side-pane viewport.frame,
+.caja-side-pane CajaInformationPanel .vertical {
     background-color: shade (@theme_bg_color, 1.08);
 }
 
-/* the small line between sidebar and view */
-CajaWindow GtkPaned.horizontal {
-    -GtkPaned-handle-size: 3px;
-    border-color: transparent;
-}
-
-CajaWindow FMTreeView.frame,
-CajaWindow CajaPlacesSidebar.frame,
-CajaWindow CajaHistorySidebar.frame,
-CajaWindow CajaNotesViewer.frame {
-    border-width: 1px 1px 0px 0px;
-}
-
-CajaWindow CajaEmblemSidebar.vertical .frame,
-CajaWindow CajaInformationPanel .vertical {
-    border-width: 1px 1px 0px 0px;
-    border-style: solid;
-    border-color: @notebook_border;
-}
-
-CajaWindow CajaEmblemSidebar.vertical .frame {
-    border-width: 1px 0px 0px 0px;
-}
-
-CajaWindow CajaInformationPanel CajaSidebarTitle.vertical{
-    border-width: 0px 1px 0px 0px;
-}
-
-CajaWindow CajaInformationPanel CajaKeepLastVerticalBox.vertical {
+.caja-side-pane scrolledwindow scrollbar.vertical.left trough,
+.caja-side-pane scrolledwindow scrollbar.horizontal.bottom trough {
     border-style: none;
 }
 
-CajaWindow FMTreeView .scrollbar,
-CajaWindow CajaNotesViewer .scrollbar,
-CajaWindow CajaPlacesSidebar .scrollbar,
-CajaWindow CajaHistorySidebar .scrollbar,
-CajaWindow CajaEmblemSidebar .scrollbar {
-    background-image: none;
-    border-style: solid;
-    -GtkRange-stepper-size: 16;
-    -GtkRange-stepper-spacing: 0;
-    -GtkRange-trough-border: 0;
-    -GtkRange-arrow-scaling: 0.666;
-    -GtkRange-slider-width: 13;
-    -GtkRange-trough-under-steppers: 1;
-    -GtkScrollbar-has-backward-stepper: true;
-    -GtkScrollbar-has-forward-stepper: true;
-    -GtkScrollbar-activate-slider: 1;
-    -GtkScrollbar-min-slider-length: 31;
-    -GtkScrolledWindow-scrollbar-spacing: 0;
-    -GtkScrolledWindow-scrollbars-within-bevel: 1;
-}
-
-CajaWindow FMTreeView .scrollbar.trough,
-CajaWindow CajaNotesViewer .scrollbar.trough,
-CajaWindow CajaPlacesSidebar .scrollbar.trough,
-CajaWindow CajaHistorySidebar .scrollbar.trough,
-CajaWindow CajaEmblemSidebar .scrollbar.trough,
-CajaWindow FMTreeView .scrollbar.trough.vertical,
-CajaWindow CajaNotesViewer .scrollbar.trough.vertical,
-CajaWindow CajaPlacesSidebar .scrollbar.trough.vertical,
-CajaWindow CajaHistorySidebar .scrollbar.trough.vertical,
-CajaWindow CajaEmblemSidebar .scrollbar.trough.vertical {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@theme_bg_color, 0.98)),
-                                     to (shade (@theme_bg_color, 1.06)));
-    border-radius: 0;
-    border-width: 0 0 0 0;
-    border-style: solid;
-    border-right-color: shade (@theme_bg_color, 0.96);
-    border-left-color: shade (@theme_bg_color, 0.96);
-}
-
 /* selected item in sidebar */
-CajaWindow FMTreeView .view row:selected,
-CajaWindow CajaPlacesSidebar .view row:selected,
-CajaWindow CajaHistorySidebar .view row:selected,
-CajaWindow FMTreeView .view row:selected:hover,
-CajaWindow CajaPlacesSidebar .view row:selected:hover,
-CajaWindow CajaHistorySidebar .view row:selected:hover {
+.caja-side-pane treeview:selected,
+.caja-side-pane treeview:selected:hover {
     background-image: -gtk-gradient (linear,
                                      left top,
                                      left bottom,
@@ -120,9 +43,7 @@ CajaWindow CajaHistorySidebar .view row:selected:hover {
 }
 
 /* mouse hover item in sidebar */
-CajaWindow FMTreeView .view row:hover,
-CajaWindow CajaPlacesSidebar .view row:hover,
-CajaWindow CajaHistorySidebar .view row:hover {
+.caja-side-pane treeview:hover {
     background-image: -gtk-gradient (linear,
                                      left top,
                                      left bottom,
@@ -138,35 +59,28 @@ CajaWindow CajaHistorySidebar .view row:hover {
     text-shadow: none;
 }
 
-/* shadows and borders looks strange in list view */
-CajaWindow GtkTreeView row:nth-child(odd):hover,
-CajaWindow GtkTreeView row:nth-child(even):hover,
-CajaWindow GtkTreeView row:nth-child(odd):selected,
-CajaWindow GtkTreeView row:nth-child(even):selected,
-CajaWindow GtkTreeView row:nth-child(odd):selected:hover,
-CajaWindow GtkTreeView row:nth-child(even):selected:hover {
-    box-shadow:none;
-    border-radius: 0px;
-}
-
 /* moved eject button to left better for overlay scrollbars */
-CajaWindow CajaPlacesSidebar .view row {
+.caja-side-pane treeview {
     padding: 0px 4px 0px 0px;
 }
 
 /* Caja places bar */
-CajaNavigationWindow CajaSidePane .button.flat {
+.caja-side-pane button.flat,
+.caja-side-pane button.flat.toggle {
     border-style: none;
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (@button_gradient1),
                                      to   (@button_gradient4));
-    padding: 7px 5px;
     color: shade(@theme_fg_color, 1.00);
     text-shadow: 0px 1px @theme_shadow_color;
 }
 
-CajaNavigationWindow CajaSidePane .button.flat:first-child {
+.caja-side-pane button.flat {
+    padding: 7px 5px
+}
+
+.caja-side-pane button.flat.toggle:first-child {
     border-radius: 6px 0 0 6px;
     border-right-width: 0;
 /* remove left shadow */
@@ -180,7 +94,7 @@ CajaNavigationWindow CajaSidePane .button.flat:first-child {
                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
 }
 
-CajaNavigationWindow CajaSidePane .button.flat:last-child {
+.caja-side-pane button.flat:last-child {
     border-radius: 0 6px 6px 0;
     border-left-width: 0;
     border-left-color: @theme_bg_color;
@@ -194,28 +108,34 @@ CajaNavigationWindow CajaSidePane .button.flat:last-child {
                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
 }
 
-CajaNavigationWindow CajaSidePane .button.flat:hover:first-child,
-CajaNavigationWindow CajaSidePane .button.flat:checked:checked:first-child,
-CajaNavigationWindow CajaSidePane .button.flat:hover:last-child,
-CajaNavigationWindow CajaSidePane .button.flat:checked:checked:last-child {
+.caja-side-pane button.flat:checked:last-child,
+.caja-side-pane button.flat.toggle:checked:first-child {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade (@theme_bg_color, 1.20)),
                                      color-stop (0.50, shade (@theme_bg_color, 1.00)),
-                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
+                                     color-stop (0.50, shade (@theme_bg_color, 0.99)),
                                      to (shade (@theme_bg_color, 0.80)));
 }
 
-CajaNavigationWindow CajaSidePane .button.flat:hover:first-child,
-CajaNavigationWindow CajaSidePane .button.flat:checked:checked:first-child {
+.caja-side-pane button.flat:hover:last-child,
+.caja-side-pane button.flat.toggle:hover:first-child {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_gradient1, 1.03)),
+                                     to   (shade(@button_gradient4, 1.01)));
+}
+
+.caja-side-pane button.flat.toggle:hover:first-child,
+.caja-side-pane button.flat.toggle:checked:checked: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 rgba(255,255,255,0), 0 1px rgba(255,255,255,0),
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 
-CajaNavigationWindow CajaSidePane .button.flat:hover:last-child,
-CajaNavigationWindow CajaSidePane .button.flat:checked:checked:last-child {
+.caja-side-pane button.flat:hover:last-child,
+.caja-side-pane button.flat:checked:checked: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),
@@ -223,14 +143,14 @@ CajaNavigationWindow CajaSidePane .button.flat:checked:checked:last-child {
 }
 
 /* pathpar toggle button */
-CajaNavigationWindow .button.image-button {
+.caja-navigation-window button.toggle.image-button {
     padding: 5px 6px;
 }
 
 /* pathbar buttons */
-CajaPathBar .button,
-CajaPathBar .button:hover,
-CajaPathBar .button:checked {
+.caja-pathbar button,
+.caja-pathbar button:hover,
+.caja-pathbar button:checked {
     border-image: none;
     padding: 5px 6px;
     border-width: 1px;
@@ -240,38 +160,8 @@ CajaPathBar .button:checked {
     border-color: transparent;
 }
 
-CajaSearchBar .entry,
-CajaLocationBar .entry {
-    padding: 7px 4px;
-}
-
-CajaSearchBar .entry,
-CajaSearchBar .entry:focus,
-CajaLocationBar .entry,
-CajaLocationBar .entry:focus {
-    -GtkEntry-inner-border: 1;
-}
-
-CajaSearchBar .entry {
-    box-shadow: inset  0px  3px alpha(#000, 0.03),
-                inset  0px  2px alpha(#000, 0.05),
-                inset  2px  0px alpha(#000, 0.04),
-                inset -2px  0px alpha(#000, 0.04),
-                inset  0px -2px alpha(#000, 0.03),
-                inset  0px  1px shade(@toolbar_gradient_base, 0.70),
-                inset  1px  0px shade(@toolbar_gradient_base, 0.80),
-                inset -1px  0px shade(@toolbar_gradient_base, 0.80),
-                inset  0px -1px shade(@toolbar_gradient_base, 0.90);
-}
-
-/* search/clean icon */
-CajaSearchBar .entry.image,
-CajaLocationBar .entry.image {
-    padding: 0px 0px 0px 4px;
-}
-
-CajaSearchBar .entry,
-CajaLocationBar .entry {
+.caja-search-bar entry,
+.caja-location-entry {
     border-style: none;
     box-shadow: inset  0px  1px shade (@theme_bg_color, 0.80),
                 inset  1px  0px shade (@theme_bg_color, 0.80),
@@ -279,8 +169,8 @@ CajaLocationBar .entry {
                 inset  0px -1px shade (@theme_bg_color, 0.80);
 }
 
-CajaSearchBar .entry:focus,
-CajaLocationBar .entry:focus {
+.caja-search-bar entry:focus,
+.caja-location-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),
@@ -288,7 +178,13 @@ CajaLocationBar .entry:focus {
 }
 
 /* eventbars, ie. search results */
-CajaNotebook .frame GtkEventBox {
+.caja-notebook box.vertical frame {
+    background-color: shade (@theme_bg_color, 1.02);
+    border-style: none;
+    border-radius: 0px;
+}
+
+.caja-notebook #caja-extra-view-widget {
     background-color: shade (@theme_bg_color, 1.05);
     border-color: @notebook_border;
     border-width: 1px;
@@ -296,219 +192,28 @@ CajaNotebook .frame GtkEventBox {
     border-radius: 4px;
 }
 
-/* what's that ? *//*
-CajaSearchBar.info {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@toolbar_gradient_base, 0.89)),
-                                     color-stop (0.20, shade(@toolbar_gradient_base, 0.97)),
-                                     to   (shade(@toolbar_gradient_base, 1.01)));
-    border-radius: 0px;
-    border-width: 0px 0px 1px 0px;
-    border-style: solid;
-    border-color: alpha(#000, 0.00) @toolbar_gradient_base shade(@toolbar_gradient_base, 0.75);
-    box-shadow: inset  0px  1px alpha(#fff, 0.06),
-                inset  1px  0px alpha(#fff, 0.06),
-                inset -1px  0px alpha(#fff, 0.06),
-                inset  0px -1px alpha(#fff, 0.06);
-    color: @toolbar_fg_color;
-}*/
-/*
-.info,
-.question,
-CajaTrashBar.info,
-CajaXContentBar.info,
-CajaQueryEditor.info {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.00)),
-                                     to   (shade(@nautilus_cluebar_color, 1.00)));
-    border-radius: 0px;
-    border-width: 0px 0px 1px 0px;
-    border-style: solid;
-    border-color: transparent @nautilus_cluebar_color shade(@nautilus_cluebar_color, 0.75);
-    box-shadow: inset  0px  1px alpha(#fff, 0.06),
-                inset  1px  0px alpha(#fff, 0.06),
-                inset -1px  0px alpha(#fff, 0.06),
-                inset  0px -1px alpha(#fff, 0.06);
-}
-
-.info
-.caja-cluebar-label {
-    font: bold;
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0 1px @theme_shadow_color;
-}
-
-.question .button,
-.question .button:hover,
-CajaTrashBar .button,
-CajaTrashBar .button:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.08)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 1.02)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.96)),
-                                     to   (shade(@nautilus_cluebar_color, 0.92)));
-    box-shadow: inset  0px  2px alpha(#fff, 0.09),
-                inset  2px  0px alpha(#fff, 0.07),
-                inset -2px  0px alpha(#fff, 0.07),
-                inset  0px -2px alpha(#fff, 0.05),
-                inset  0px  1px shade(@nautilus_cluebar_color, 0.80),
-                inset  1px  0px shade(@nautilus_cluebar_color, 0.70),
-                inset -1px  0px shade(@nautilus_cluebar_color, 0.70),
-                inset  0px -1px shade(@nautilus_cluebar_color, 0.60);
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_color;
-}
-
-.question .button:active,
-.question .button:active:hover,
-CajaTrashBar .button:active,
-CajaTrashBar .button:active:hover,
-.question .button:checked,
-.question .button:checked:hover,
-CajaTrashBar .button:checked,
-CajaTrashBar .button:checked:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.00)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 0.95)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.91)),
-                                     to   (shade(@nautilus_cluebar_color, 0.87)));
-   *//* outer *//*
-    border-top-color:       alpha(@focused_entry_border, 0.20);
-    border-right-color:     alpha(@focused_entry_border, 0.25);
-    border-left-color:      alpha(@focused_entry_border, 0.25);
-    border-bottom-color:    alpha(#fff, 0.10);
-    box-shadow: inset  0px  2px alpha(#fff, 0.09),
-                inset  2px  0px alpha(#fff, 0.07),
-                inset -2px  0px alpha(#fff, 0.07),
-                inset  0px -2px alpha(#fff, 0.05),
-                inset  0px  1px shade(@nautilus_cluebar_color, 0.75),
-                inset  1px  0px shade(@nautilus_cluebar_color, 0.65),
-                inset -1px  0px shade(@nautilus_cluebar_color, 0.65),
-                inset  0px -1px shade(@nautilus_cluebar_color, 0.55);
-}
-
-.question .button *:active,
-.question .button *:active:hover,
-CajaTrashBar .button *:active,
-CajaTrashBar .button *:active:hover,
-.question .button *:checked,
-.question .button *:checked:hover,
-CajaTrashBar .button *:checked,
-CajaTrashBar .button *:checked:hover {
-    color: shade(@theme_text_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_color;
-}
-
-.question .button:insensitive,
-CajaTrashBar .button:insensitive {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 0.95)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 0.90)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.88)),
-                                     to (shade(@nautilus_cluebar_color, 0.89)));
-    box-shadow: inset  0px  1px shade(@nautilus_cluebar_color, 0.85),
-                inset  1px  0px shade(@nautilus_cluebar_color, 0.81),
-                inset -1px  0px shade(@nautilus_cluebar_color, 0.81),
-                inset  0px -1px shade(@nautilus_cluebar_color, 0.78);
-}
-
-.question .button *:insensitive,
-CajaTrashBar .button *:insensitive {
-    color: mix(@nautilus_cluebar_color, @theme_fg_color, 0.50);
-    text-shadow: none;
-}
-*/
-CajaQueryEditor.vertical .vertical .horizontal .button,
-CajaQueryEditor.vertical .vertical .horizontal .button:hover {
-    padding: 4px 6px;
-}
-
-
-CajaQueryEditor.vertical .vertical .horizontal .text-button,
-CajaQueryEditor.vertical .vertical .horizontal .text-button:hover {
-    padding: 6px;
-}
-
-CajaQueryEditor.vertical .vertical .horizontal .button.flat,
-CajaQueryEditor.vertical .vertical .horizontal .button.flat:hover {
-    border-radius: 5px;
-    padding: 0px 6px;
+.caja-notebook #caja-extra-view-widget button.flat {
+    padding: 4px;
+    border-radius: 6px;
 }
 
 /* primary-toolbar */
-CajaWindow .primary-toolbar.toolbar .button.image-button,
-CajaWindow .primary-toolbar.toolbar .button.image-button:hover,
-CajaWindow .primary-toolbar.toolbar .button.image-button:checked,
-CajaWindow .primary-toolbar.toolbar .button.image-button:active:hover,
-CajaWindow .primary-toolbar.toolbar .button.image-button:checked:hover {
-    padding: 3px 4px;
-    border-image: none;
-    border-width: 1px;
-    border-style: solid;
-    border-radius: 5px;
-    border-color: transparent;
-}
-
-CajaWindow .primary-toolbar.toolbar .button.image-button:hover,
-CajaWindow .primary-toolbar.toolbar .button.image-button:hover:active,
-CajaWindow .primary-toolbar.toolbar .button.image-button:checked,
-CajaWindow .primary-toolbar.toolbar .button.image-button:checked:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@menu_bg_dark_color, 2.03)),
-                                     to   (shade(@menu_bg_dark_color, 1.17)));
-    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);
-}
-
-/* some overrides for button.flat */
-/* zoom button */
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat {
-    background-color: transparent;
-    background-image: none;
-    border-image: none;
-    box-shadow: none;
-}
-
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@menu_bg_dark_color, 2.03)),
-                                     to   (shade(@menu_bg_dark_color, 1.17)));
-    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);
-}
-
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat,
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:hover,
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:hover:active {
+/* zoom buttons */
+.caja-navigation-window toolbar.primary-toolbar #Zoom button.flat {
     border-radius: 0px;
     border-style: solid;
     border-width: 1px 0px 1px 0px;
     padding: 0px 4px;
 }
 
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:first-child,
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:first-child:hover,
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:first-child:hover:active {
+.caja-navigation-window toolbar.primary-toolbar #Zoom button.flat:first-child {
     border-radius: 5px 0px 0px 5px;
     border-style: solid;
     border-width: 1px 0px 1px 1px;
     padding: 0px 5px;
 }
 
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:last-child,
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:last-child:hover,
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:last-child:hover:active {
+.caja-navigation-window toolbar.primary-toolbar #Zoom button.flat:last-child {
     border-radius: 0px  5px 5px 0px;
     border-style: solid;
     border-width: 1px 1px 1px 0px;
@@ -516,100 +221,57 @@ CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:last-child:hove
 }
 
 /* ComboBox views */
-CajaWindow .primary-toolbar.toolbar GtkComboBox .button,
-CajaWindow .primary-toolbar.toolbar GtkComboBox .button:hover,
-CajaWindow .primary-toolbar.toolbar GtkComboBox .button:active,
-CajaWindow .primary-toolbar.toolbar GtkComboBox .button:checked,
-CajaWindow .primary-toolbar.toolbar GtkComboBox .button:active:hover,
-CajaWindow .primary-toolbar.toolbar GtkComboBox .button:checked:hover {
-    padding: 7px 0px 7px 3px;
-}
-
-/* fix for menu transition */
-CajaWindow .primary-toolbar.toolbar GtkComboBox .menuitem {
-    background: transparent;
+/* kill a unwanted background with transition effect*/
+.caja-navigation-window toolbar combobox button.combo {
+    background-image: none;
 }
 
-CajaWindow .primary-toolbar.toolbar GtkComboBox .menuitem:hover {
+.caja-navigation-window toolbar.primary-toolbar combobox button.combo:hover {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@menu_bg_dark_color, 2.03)),
                                      to   (shade(@menu_bg_dark_color, 1.17)));
 }
 
+.caja-navigation-window toolbar.primary-toolbar combobox button.combo arrow {
+    color: @theme_selected_fg_color
+}
+
 /* navigation buttons */
-CajaWindow .primary-toolbar.toolbar GtkMenuToolButton .button.image-button,
-CajaWindow .primary-toolbar.toolbar GtkMenuToolButton .button.image-button:hover,
-CajaWindow .primary-toolbar.toolbar GtkMenuToolButton .button.image-button:hover:active {
-    border-radius: 5px 0px 0px 5px;
-    border-style: solid;
+.caja-navigation-window toolbar.primary-toolbar #Back button.image-button,
+.caja-navigation-window toolbar.primary-toolbar #Forward button.image-button {
+    border-radius: 6px 0px 0px 6px;
     border-width: 1px 0px 1px 1px;
 }
 
 /* navigation dropdown-menu buttons */
-CajaWindow .primary-toolbar.toolbar .button.menu-button {
-    border-radius: 0px  5px 5px 0px;
-    border-style: solid;
+.caja-navigation-window toolbar.primary-toolbar toolbutton button.toggle.popup {
+    border-radius: 0px  6px 6px 0px;
     border-width: 1px 1px 1px 0px;
 }
 
-CajaWindow .primary-toolbar.toolbar .button.menu-button .menuitem {
-    background: transparent;
-}
-
-CajaWindow .primary-toolbar.toolbar .button.menu-button .menuitem:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@menu_bg_dark_color, 2.03)),
-                                     to   (shade(@menu_bg_dark_color, 1.17)));
-    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);
-}
-
-/* properties-dialog emblem page */
-FMPropertiesWindow .vertical.dialog-vbox .notebook GtkViewport {
-    background-color: @theme_notebook_color;
-}
-
-/* tab styling */
-CajaNavigationWindow CajaNotebook.notebook {
-    border-style: none;
-    -GtkNotebook-tab-overlap: 1;
-}
-
-CajaNavigationWindow GtkPaned.horizontal GtkPaned.horizontal .vertical tab.top,
-CajaNavigationWindow GtkPaned.horizontal GtkPaned.horizontal .vertical tab.top:active,
-CajaNavigationWindow GtkPaned.horizontal GtkPaned.horizontal .vertical tab.top:active:hover,
-CajaNavigationWindow GtkPaned.horizontal GtkPaned.horizontal .vertical tab.reorderable-page,
-CajaNavigationWindow GtkPaned.horizontal GtkPaned.horizontal .vertical tab.reorderable-page:hover {
-    border-radius: 4px 4px 0px 0px;
-    border-width: 1px 1px 0px 1px;
-    border-color: @notebook_border;
-    border-style: solid;
-    padding: 3px 4px;
-    box-shadow: none;
-}
-
-CajaNavigationWindow CajaNotebook.notebook.header {
-    border-radius: 4px 4px 0px 0px;
-    border-style: none;
-}
-
-CajaNavigationWindow CajaNotebook.notebook tab .button.flat {
-    padding: 0px;
-    border-radius: 4px;
+.caja-property-browser scrolledwindow viewport.frame {
+    background-color: shade (@theme_bg_color, 1.1);
 }
 
-EelEditableLabel.entry,
-EelEditableLabel.entry:focused {
+/* EelEditableLabel (icon labels) */
+.caja-navigation-window .view .entry,
+.caja-navigation-window .view .entry:focus
+.caja-desktop .entry,
+.caja-desktop .entry:focus {
    border-image: none;
+   border-style: solid;
    border-width: 1px;
    border-color: @theme_fg_color;
    box-shadow: none;
    border-radius: 3px;
    text-shadow: none;
+   background-image: -gtk-gradient(linear,
+                                   left top, left bottom,
+                                   from       (shade(@theme_base_color, 0.86)),
+                                   color-stop (0.15, shade(@theme_base_color, 0.96)),
+                                   color-stop (0.50, shade(@theme_base_color, 0.98)),
+                                   to         (shade(@theme_base_color, 1.00)));
 }
 
 .caja-canvas-item {
@@ -617,14 +279,14 @@ EelEditableLabel.entry:focused {
 }
 
 /* desktop mode */
-CajaDesktopWindow.background .caja-canvas-item {
+.caja-desktop.caja-canvas-item {
     color: white;
     text-shadow: 1px 1px alpha (#000000, 0.8);
 }
 
-CajaDesktopWindow.background .caja-canvas-item:active,
-CajaDesktopWindow.background .caja-canvas-item:prelight,
-CajaDesktopWindow.background .caja-canvas-item:selected {
+.caja-desktop.caja-canvas-item:active,
+.caja-desktop.caja-canvas-item:hover,
+.caja-desktop.caja-canvas-item:selected {
     text-shadow: none;
 }
 
@@ -633,29 +295,23 @@ CajaDesktopWindow.background .caja-canvas-item:selected {
  ****************/
 
 /* first make all transparent */
+.mate-panel-menu-bar,
+.mate-panel-menu-bar menubar,
+.mate-panel-menu-bar menuitem,
+#PanelApplet button,
 PanelToplevel.background.horizontal {
     background-color: transparent;
-}
-
-WnckSelector.menubar,
-PanelMenuBar.menubar,
-WnckSelector GtkMenuItem,
-PanelMenuBar GtkMenuItem,
-MatePanelApplet GtkToggleButton.button {
-    border-image: none;
     background-image: none;
-    background-color: transparent;
+    border-color: transparent;
     box-shadow: none;
+    padding: 0px;
 }
 
 /* let's started */
 /* the panel bar itself */
+.mate-panel-menu-bar,
 PanelToplevel.background.horizontal {
     background-color: @theme_bg_dark_color;
-}
-
-.mate-panel-menu-bar {
-    background-color: @theme_bg_dark_color;
     background-image: none;
     /* normal panel */
     color: @menu_fg_dark_color;
@@ -665,59 +321,54 @@ PanelToplevel.background.horizontal {
 }
 
 /* workaround to avoid unwanted black frames if switching compositor on/off */
-.mate-panel-menu-bar .window-frame.csd.popup {
+.mate-panel-menu-bar .csd.popup decoration {
     box-shadow: none;
 }
 
-/* panel grip *//*
-PanelToplevel.background.mate-custom-panel-background {
-    background-color: transparent;
-    border-radius: 3px;*/
-/* enable for making borders visible */
-/*    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); *//*
-}*/
+/* panel grip */
+PanelToplevel.background {
+    border-radius: 3px;
+}
 
 /* hide buttons */
-PanelToplevel.background .button {
+PanelToplevel > widget > button {
+    color: @menu_fg_dark_color;
     background-image: none;
     background: transparent;
     border-style: none;
     border-radius: 3px;
     padding: 0px;
-    box-shadow: none;
+    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);
 }
 
-PanelToplevel.background .button:hover,
-PanelToplevel.background .button:hover:active {
-    background-image: none;
-    color: @menu_selected_fg_dark_color;
-    border-radius: 3px;
+PanelToplevel > widget > button:hover,
+PanelToplevel > widget > button:hover:active {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    text-shadow: none;
+    color: shade (@theme_selected_bg_color, 1.6);
     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);
+    border-style: none;
 }
 
 /* dictionary applet */
-GdictApplet .entry {
-    /* normal panel */
-    color: @menu_fg_dark_color;
-    /* transparent panel light desktop background */
-/*    color: @theme_fg_color; */
-    background-image: none;
-    background-color: transparent;
+#PanelApplet entry {
     border-width: 1px;
-    padding: 3px 4px;
-}
-
-MatePanelApplet {
-    border-width: 0;
+    margin: 3px 0px;
 }
 
-MatePanelAppletFrameDBus PanelSeparator,
 PanelSeparator {
     border-width: 0;
     background-image: -gtk-gradient (linear, left top, left bottom,
@@ -735,212 +386,102 @@ MatePanelAppletFrameDBus {
     background-position: left;
 }
 
-/* set normal menubar button */
-PanelMenuBar.menubar .menuitem {
-    padding: 5px 5px;
-    transition: all 200ms ease-out;
-}
-
-/* set selected menubar button */
-PanelMenuBar.menubar .menuitem:hover {
-    padding: 5px 5px;
-    background-color: shade (@theme_bg_dark_color, 1.2);
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@menu_bg_dark_color, 2.03)),
-                                     to   (shade(@menu_bg_dark_color, 1.17)));
-    border-radius: 6px;
-    text-shadow: none;
-    color: shade (@theme_selected_bg_color, 1.6);
-    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);
-    text-shadow: none;
-    border-style: none;
-    border-width: 0px;
-}
-
-/* set normal menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem {
-    padding: 6px;
-    transition: all 300ms ease-out;
-}
-
-/* set selected menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem:checked:hover,
-PanelMenuBar.menubar .menu .menuitem:hover:active,
-PanelMenuBar.menubar .menu .menuitem:hover {
-    padding: 6px;
-    background-color: shade (@theme_bg_dark_color, 1.2);
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@menu_bg_dark_color, 2.03)),
-                                     to   (shade(@menu_bg_dark_color, 1.17)));
-    border-radius: 6px;
-    text-shadow: none;
-    color: shade (@theme_selected_bg_color, 1.6);
-    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);
-    text-shadow: none;
-    border-style: none;
-    border-width: 0px;
-}
-
-/* Mate menu button normal */
-/* makes the arrow visible, nothing more works */
-PanelMenuButton.button {
-    background-image: none;
-    background-color: transparent;
-    color: shade (@menu_fg_color, 1.00);
-}
-
-/* Mate menu menuitem */
-PanelMenuButton .menu .menuitem,
-PanelMenuButton .menu .menuitem:hover {
-    padding: 6px;
-}
-
-/* desktop-applet, clockapplet, drivemount, character-map,
-dictionary */
-MatePanelApplet .button,
-MatePanelApplet .button.flat {
+/* most applets */
+#PanelApplet button,
+#PanelApplet button.flat,
+#PanelApplet button.toggle
+#PanelApplet button.flat.toggle {
     background-image: none;
     background-color: transparent;
+    border-color: transparent;
+    border-style: solid;
     border-radius: 5px;
-    border-width: 0px;
+    border-width: 1px;
     /* normal panel */
     color: @menu_fg_dark_color;
     /* transparent panel light desktop background*/
 /*    color: @theme_fg_color; */
     text-shadow: none;
-    padding: 6px;
+    box-shadow: none;
+    padding: 4px;
 }
 
-MatePanelApplet .button:hover:active,
-MatePanelApplet .button:checked,
-MatePanelApplet .button:checked:hover,
-MatePanelApplet .button.flat:hover:active,
-MatePanelApplet .button.flat:checked,
-MatePanelApplet .button.flat:checked:hover {
+#PanelApplet button:hover:active,
+#PanelApplet button:checked,
+#PanelApplet button:checked:hover,
+#PanelApplet button.flat:hover:active,
+#PanelApplet button.flat:checked,
+#PanelApplet button.flat:checked:hover,
+#PanelApplet button.toggle:hover:active,
+#PanelApplet button.toggle:checked,
+#PanelApplet button.toggle:checked:hover,
+#PanelApplet button.flat.toggle:hover:active,
+#PanelApplet button.flat.toggle:checked,
+#PanelApplet button.flat.toggle:checked:hover{
     background-image: none;
-    border-color: @selected_bg_color;
-    background-color: shade (@selected_bg_color, 0.90);
+    border-color: shade (@theme_selected_bg_color, 1.30);
+    background-color: shade (@theme_selected_bg_color, 0.90);
     border-radius: 5px;
-    border-width: 0px;
+    border-width: 1px;
     color: shade (@theme_text_dark_color, 0.90);
     text-shadow: none;
-    padding: 6px;
+    padding: 4px;
 }
 
-MatePanelApplet .button:hover,
-MatePanelApplet .button.flat:hover {
+#PanelApplet button:hover,
+#PanelApplet button.flat:hover,
+#PanelApplet button.toggle:hover,
+#PanelApplet button.flat.toggle:hover {
     background-image: none;
-    border-color: @selected_bg_color;
-    background-color: shade (@selected_bg_color, 1.10);
+    border-color: shade (@theme_selected_bg_color, 1.50);
+    background-color: shade (@theme_selected_bg_color, 1.10);
     border-radius: 5px;
-    border-width: 0px;
+    border-width: 1px;
     color: @selected_fg_color;
     text-shadow: none;
-    padding: 6px;
+    padding: 4px;
 }
 
-/* drivemount */
-DriveList .button,
-DriveList .button.flat,
-DriveList .button:hover,
-DriveList .button.flat:hover,
-DriveList .button:checked,
-DriveList .button.flat:checked {
-    padding: 4px;
-    border-radius: 5px;
-    border-color: transparent;
-    box-shadow: none;
+#PanelApplet  #showdesktop-button.toggle,
+#PanelApplet  #showdesktop-button.toggle:hover,
+#PanelApplet  #showdesktop-button.toggle:hover:active,
+#PanelApplet  #showdesktop-button.toggle:checked,
+#PanelApplet  #showdesktop-button.toggle:checked:hover,
+#PanelApplet  #showdesktop-button.toggle:checked:hover:active {
+    padding: 4px 2px;
 }
 
-/*Wncklist */
-WnckTasklist .button,
-WnckTasklist .button.flat {
-    background-image: none;
-    background-color: transparent;
-    border-radius: 5px;
-    border-width: 1px;
-    color: shade (@theme_text_dark_color, 0.65);
-    text-shadow: none;
-    padding: 2px;
+.mate-panel-menu-bar > menubar > menuitem {
+    padding: 5px 5px;
 }
 
-WnckTasklist .button:hover:active,
-WnckTasklist .button:checked,
-WnckTasklist .button:checked:hover,
-WnckTasklist .button.flat:hover:active,
-WnckTasklist .button.flat:checked:hover,
-WnckTasklist .button.flat:checked {
-    background-image: none;
-    border-color: @selected_bg_color;
-    background-color: shade (@selected_bg_color, 0.90);
-    border-radius: 5px;
-    border-width: 1px;
-    color: shade (@theme_text_dark_color, 0.90);
-    text-shadow: none;
-    padding: 2px;
+#clock-applet-button.flat.toggle > box.horizontal > label {
+    font: normal;
 }
 
-WnckTasklist .button:hover,
-WnckTasklist .button.flat:hover {
-    background-image: none;
-    border-color: @selected_bg_color;
-    background-color: shade (@selected_bg_color, 1.10);
-    border-radius: 5px;
-    border-width: 1px;
-    color: @selected_fg_color;
-    text-shadow: none;
-    padding: 2px;
+/* drivebutton */
+#PanelApplet > grid > button,
+#PanelApplet > grid > button:hover {
+    padding: 4px;
 }
 
-/* set normal button WnckSelector */
-WnckSelector.menubar .menuitem {
-    background-image: none;
-    background-color: transparent;
-    border-style: none;
-    border-width: 1px;
-    border-radius: 5px;
+/* window-menu applet, hover is checked !! */
+#window-menu-applet-button menubar menuitem {
+    padding: 4px 8px;
 }
 
-/* set selected button WnckSelector */
-WnckSelector.menubar .menuitem:hover {
+#window-menu-applet-button > menubar > menuitem:hover  {
     background-image: none;
-    border-color: @selected_bg_color;
-    background-color: shade (@selected_bg_color, 0.90);
+    border-color: shade (@theme_selected_bg_color, 1.30);
+    background-color: shade (@theme_selected_bg_color, 0.90);
     border-radius: 5px;
     border-width: 1px;
     color: shade (@theme_text_dark_color, 0.90);
     text-shadow: none;
 }
 
-/* set WnckSelector selected menuitem */
-WnckSelector.menubar .menu .menuitem:hover {
-    background-color: shade (@theme_bg_dark_color, 1.2);
-    background-image: none;
-    border-radius: 6px;
-    text-shadow: none;
-    color: shade (@theme_selected_bg_color, 1.6);
-    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);
-}
-
-ClockBox,
-.mate-panel-menu-bar.menubar,
-MatePanelApplet > GtkMenuBar.menubar {
-    font: normal;
-}
-
 /* WnckPager */
-WnckPager {
+#PanelApplet.wnck-pager widget {
     background-image: none;
     border-color: transparent;
     background-color: transparent;
@@ -948,50 +489,40 @@ WnckPager {
 }
 
 /* selected WnckPager */
-WnckPager:selected {
+#PanelApplet.wnck-pager widget:selected {
     background-image: linear-gradient(to bottom,
                                       @theme_selected_bg_color,
                                       shade (@theme_selected_bg_color, 0.36));
 }
 
-/* prelight of WnckPager */
-WnckPager:hover {
+/* hover of WnckPager */
+#PanelApplet.wnck-pager widget:hover {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_selected_bg_color, 0.56),
                                       @theme_selected_bg_color);
 }
 
-/* no background for icon-padding area */
-GtkTrayIcon.background {
-    background-color: transparent;
-}
-
-NaTrayApplet {
+na-tray-applet {
     -NaTrayApplet-icon-padding: 3px;
     -NaTrayApplet-icon-size: 16;
 }
 
 /* system-monitor-applet */
-MatePanelApplet .horizontal .vertical .frame {
-    box-shadow: inset  0px  1px shade (@menu_bg_dark_color, 1.3),
-                inset  1px  0px shade (@menu_bg_dark_color, 1.3),
-                inset -1px  0px shade (@menu_bg_dark_color, 1.3),
-                inset  0px -1px shade (@menu_bg_dark_color, 1.3);
+#PanelApplet > box.horizontal > box.vertical > frame {
+    box-shadow: inset  0px  1px shade (@menu_bg_dark_color, 1.5),
+                inset  1px  0px shade (@menu_bg_dark_color, 1.5),
+                inset -1px  0px shade (@menu_bg_dark_color, 1.5),
+                inset  0px -1px shade (@menu_bg_dark_color, 1.5);
     border-style: none;
     border-radius: 6px;
 }
 
-/* Classic icon style */
-.mate-panel-menu-bar {
-    -PanelMenuBar-icon-visible: true;
-}
-
 /* volume applet */
 .mate-panel-applet-slider {
     background: transparent;
 }
 
-.mate-panel-applet-slider .frame {
+.mate-panel-applet-slider frame {
     background-color: rgba(0,0,0,0.5);
     border-image: none;
     border-style: none;
@@ -1004,13 +535,13 @@ MatePanelApplet .horizontal .vertical .frame {
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 
-.mate-panel-applet-slider .frame .frame{
+.mate-panel-applet-slider frame frame {
     background-color:transparent;
     box-shadow: none;
 }
 
 /* brightness applet */
-.mate-panel-applet-slider .frame .button {
+.mate-panel-applet-slider frame button {
     padding: 4px 0px;
     background-image: none;
     background-color: transparent;
@@ -1020,11 +551,12 @@ MatePanelApplet .horizontal .vertical .frame {
     margin: 0px;
 }
 
-.mate-panel-applet-slider .frame .button:insensitive {
+.mate-panel-applet-slider frame button:disabled {
     box-shadow: none;
 }
 
-.mate-panel-applet-slider .frame .button:hover {
+.mate-panel-applet-slider frame button:hover {
+    padding: 4px 0px;
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (alpha(shade(@theme_selected_bg_color, 1.43) ,0.6)),
@@ -1035,38 +567,34 @@ MatePanelApplet .horizontal .vertical .frame {
  * Mate-terminal *
  ****************/
 
+.mate-terminal notebook {
+    border-color: @menu_bg_dark_color;
+}
+
 /* Background mate-terminal, this isn't the normal way to style that! */
-TerminalWindow .entry {
+.mate-terminal vte {
     -TerminalWindow-background-darkness: 0.95;
     background-color: @terminal_background_color;
     color: @selected_fg_color;
 }
 
-TerminalWindow .grip {
-    background-color: shade (@theme_bg_color, 1.0);
-    background-image: url("assets/resize-grip.svg");
-    -GtkWindow-resize-grip-default: true;
-    -GtkWindow-resize-grip-width: 13;
-    -GtkWindow-resize-grip-height: 13;
-}
-
 /****************
  * Pluma        *
  ****************/
 
 /* pluma line numbers */
-PlumaView {
+.pluma-window textview {
     background-color: shade (@bg_color, 1.07);
 }
 
 /* Pluma status bar */
-PlumaWindow .button.flat {
+.pluma-window statusbar.horizontal frame button.flat.toggle {
     border-style: none;
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@nautilus_cluebar_color, 1.08)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 1.02)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.96)),
+                                     color-stop (0.45, shade(@nautilus_cluebar_color, 1.00)),
+                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.99)),
                                      to   (shade(@nautilus_cluebar_color, 0.92)));
     box-shadow: inset  0px  2px alpha(#fff, 0.09),
                 inset  2px  0px alpha(#fff, 0.07),
@@ -1080,14 +608,14 @@ PlumaWindow .button.flat {
     padding: 2px 5px;
 }
 
-PlumaWindow .button.flat:hover {
+.pluma-window statusbar.horizontal frame button.flat.toggle:hover {
     border-style: none;
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.08)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 1.02)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.96)),
-                                     to   (shade(@nautilus_cluebar_color, 0.92)));
+                                     from (shade(@button_gradient1, 1.03)),
+                                     color-stop (0.48, shade(@button_gradient2, 1.03)),
+                                     color-stop (0.52, shade(@button_gradient3, 1.03)),
+                                     to   (shade(@button_gradient4, 1.01)));
     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),
@@ -1098,41 +626,16 @@ PlumaWindow .button.flat:hover {
     padding: 2px 5px;
 }
 
-/* notebook text area */
-PlumaWindow .notebook {
-    border-style: none;
-    -GtkNotebook-tab-overlap: 1;
-}
-
-PlumaWindow .notebook tab.top {
-    border-radius: 4px 4px 0px 0px;
-    border-width: 1px 1px 0px 1px;
-    border-color: @notebook_border;
-    border-style: solid;
-    padding: 5px 4px;
-}
-
-PlumaWindow .notebook.header {
-    border-radius: 0px;
-    border-style: none;
-}
-
-/* surpress styling of close button */
-PlumaWindow .notebook tab .button.flat {
-    background-image: none;
-    box-shadow: none;
-    padding: 1px;
-}
-
-PlumaWindow .notebook tab .button.flat:hover {
-    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
-                inset  1px  0px shade (@theme_selected_bg_color, 1.3),
-                inset -1px  0px shade (@theme_selected_bg_color, 1.3),
-                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
+/* FIXME , does not work anymore since GtkArrow is widget *//*
+#pluma-status-combo-button.flat.toggle box.horizontal widget {
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+    min-height: 16px
+    min-width: 16px;
 }
+*/
 
 /* Printpreview */
-PlumaPrintPreview.vertical .toolbar.horizontal {
+.pluma-print-preview toolbar.horizontal {
    background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@theme_bg_dark_color, 1.00)),
@@ -1149,269 +652,194 @@ PlumaPrintPreview.vertical .toolbar.horizontal {
     color: @theme_fg_dark_color;
 }
 
-PlumaPrintPreview.vertical .toolbar.horizontal .button {
-    background-image: none;
+.pluma-print-preview toolbar.horizontal button {
     box-shadow: none;
 }
 
-PlumaPrintPreview.vertical .toolbar.horizontal .button:hover {
+.pluma-print-preview toolbar.horizontal button:hover {
     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
                 inset  1px  0px shade (@theme_selected_bg_color, 1.3),
                 inset -1px  0px shade (@theme_selected_bg_color, 1.3),
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 
-PlumaPrintPreview.vertical .toolbar.horizontal .button.text-button {
+.pluma-print-preview toolbar.horizontal toolbutton button.text-button {
     padding: 0px 10px;
 }
 
-PlumaPrintPreview.vertical .toolbar.horizontal .button.text-button:hover {
+.pluma-print-preview toolbar.horizontal toolbutton button.text-button label {
     color: @theme_fg_dark_color;
 }
 
-PlumaPrintPreview.vertical GtkLayout {
-    background-color: @theme_base_color;
+.pluma-print-preview toolbar.horizontal toolitem entry {
+    margin: 4px 0px;
 }
 
 /* sidebar file-browser */
-PlumaPanel.vertical {
+.pluma-window paned.horizontal box.vertical {
     background-image: linear-gradient(to bottom,
                                       shade(@theme_bg_color, 1.14),
                                       shade(@theme_bg_color, 1.1));
     border-radius: 4px 4px 0px 0px;
     border-width: 1px 0px 0px 0px;
     border-style: solid;
-    border-color: @borders;
+    border-color: @notebook_border;
     box-shadow: none;
 }
 
-/* header */
-PlumaPanel.vertical .horizontal .horizontal .label {
-    padding: 4px 2px;
+.pluma-window paned.horizontal notebook.frame {
+    border-radius: 0px;
+    border-style: none;
 }
 
-PlumaPanel.vertical PlumaCloseButton.button.flat {
+.pluma-window paned.horizontal toolbar.horizontal button {
+    padding: 6px 3px ;
     box-shadow: none;
-    background-image: none;
-    border-style: none;
+    border-style:none;
 }
 
-PlumaPanel.vertical PlumaCloseButton.button.flat:hover {
-    border-radius: 4px;
-    border-style: none;
-    -gtk-image-effect: highlight;
+.pluma-window paned.horizontal toolbar.horizontal button:hover {
+    border-style:none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     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);
 }
 
-PlumaPanel.vertical .notebook {
-    border-radius: 0px;
+/* textview */
+.pluma-window paned.horizontal paned.vertical notebook {
+    border-style: none;
 }
 
-PlumaFileBrowserWidget.vertical GtkToggleButton.button {
-    padding: 4px ;
+.pluma-window paned.horizontal paned.vertical notebook box.vertical {
+    border-style: none;
 }
 
-PlumaFileBrowserWidget.vertical .toolbar.horizontal {
-   background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_bg_dark_color, 1.00)),
-                                     to   (shade(@theme_bg_dark_color, 0.95)));
+#caja-tab-close-button.flat,
+.pluma-window notebook button.flat {
     border-image: none;
-    border-width: 0px 0px 1px 0px;
-    border-radius: 0px;
+    background-image: none;
+    background-color: transparent;
+    border-radius: 4px;
     border-style: solid;
-    border-color: @primay-toolbar-border;
-    padding: 3px 3px;
-    box-shadow: none;
-    -GtkWidget-window-dragging: true;
-    -GtkToolbar-button-relief: normal;
-    color: @theme_fg_dark_color;
-}
-
-PlumaFileBrowserWidget.vertical .horizontal.toolbar .button,
-PlumaFileBrowserWidget.vertical .horizontal.toolbar .button.menu-button {
-    padding: 6px 3px ;
-}
-
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.image-button {
-    padding: 6px 4px ;
-}
-
-PlumaFileBrowserWidget.vertical {
-    background-color: @theme_bg_color;
-}
-
-PlumaDocumentsPanel .view,
-PlumaFileBrowserWidget .view {
-    background-color: shade (@theme_bg_color, 1.08);
-}
-
-/* color of of expander arrow */
-PlumaFileBrowserWidget.vertical GtkExpander:hover {
-    color: @theme_fg_color;
-}
-
-PlumaWindow .notebook.frame.bottom,
-PlumaWindow .notebook.header.bottom {
-    border-width: 0px 0px 0px 0px;
-}
-
-PlumaWindow .notebook tab.bottom {
-    padding: 2px 10px 4px 10px;
+    border-color: transparent;
+    border-width: 1px;
+    padding: 1px;
+    -gtk-icon-shadow: none;
 }
 
 /***********************
  * Mate-Control-Center *
  ***********************/
 
-/* background */
-ShellWindow .enty,
-ShellWindow AppResizer SlabSection {
-    background-color: @theme_base_color;
-}
-
-/* button of sidebar */
-ShellWindow .button.flat {
+#MyControlCenter button.flat {
     border-image: none;
     border-radius: 6px;
     padding: 4px;
 }
 
-ShellWindow .button.flat:hover {
-    border-radius: 6px;
-    padding: 4px;
-}
+/*********
+ * Atril *
+ *********/
 
-/* button of applications */
-ShellWindow GtkScrolledWindow .button.flat {
-    padding: 4px 0px;
-    border-image: none;
+.atril-window paned.horizontal notebook scrolledwindow {
+    border-style: none;
 }
 
-/* button hover of applications */
-ShellWindow GtkScrolledWindow .button.flat:hover {
-    padding: 4px 0px;
-    border-radius: 12px;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@button_gradient1, 1.03)),
-                                     color-stop (0.48, shade(@button_gradient2, 1.03)),
-                                     color-stop (0.52, shade(@button_gradient3, 1.03)),
-                                     to   (shade(@button_gradient4, 1.01)));
-    border-top-color:    alpha(@focused_entry_outer, 0.65);
-    border-right-color:  alpha(@focused_entry_outer, 0.75);
-    border-left-color:   alpha(@focused_entry_outer, 0.75);
-    border-bottom-color: alpha(@focused_entry_outer, 0.80);
-    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);
+/* atril and eom */
+EggToolbarEditor.vertical scrolledwindow {
+    border-color: @notebook_border;
+    border-width: 1px;
+    border-radius: 0px;
+    border-style: solid;
 }
 
-GsmLogoutDialog * {
-    -GtkDialog-button-spacing: 0;
+EggToolbarEditor.vertical scrolledwindow viewport.frame {
+    background-color: shade (@base_color, 1.0);
 }
 
-/***********************
- * Engrampa *
- ***********************/
+/**************
+ * mate-media *
+ **************/
 
-FrWindow .toolbar.primary-toolbar {
-    border-color: @primay-toolbar-border;
-    border-width: 0 0 1px 0;
+GvcMixerDialog box.horizontal {
+    margin: 0px -3px 0px -3px;
 }
 
-/*********
- * Atril *
- *********/
-
-EvWindow .vertical.primary-toolbar .horizontal.toolbar {
-    padding: 1px 4px;
+GvcMixerDialog box.horizontal box.horizontal frame {
+    background-color: shade (@theme_bg_color, 1.1);
+    border-color: @notebook_border;
 }
 
-/* size of page entry */
-EvPageActionWidget .entry {
-    padding: 4px;
+GvcMixerDialog box.horizontal box.horizontal frame label {
+    padding: 0px 0px 0px 14px;
 }
 
-EvWindow .toolbar .button,
-EvWindow .toolbar .button.flat {
-    padding: 0px 4px;
+GvcMixerDialog notebook.frame:nth-child(even) {
+    border-radius: 3px 3px 0px 0px;
 }
 
-EvWindow .vertical.primary-toolbar .horizontal.toolbar EphyZoomControl GtkToggleButton:prelight.button {
-    padding: 4px;
-    border-radius: 4px;
+GvcMixerDialog notebook.frame frame {
+    border-style: none;
 }
 
-EvSidebar .flat.button {
-    border-radius: 4px;
-    padding: 4px;
+/* fix weird borders in application page */
+GvcMixerDialog notebook.frame scrolledwindow.frame {
+    border-style: none;
 }
 
-/* atril and eom */
-EggToolbarEditor.vertical GtkScrolledWindow .frame {
-    background-color: shade (@base_color, 1.0);
+GvcMixerDialog notebook.frame scrolledwindow.frame viewport.frame {
+    background-color: shade (@theme_bg_color, 1.1);
+}
+ /* needed because of 'border-style: none' for application page */
+GvcMixerDialog notebook.frame box.vertical frame scrolledwindow.frame {
     border-color: @notebook_border;
-    border-width: 1px;
-    border-radius: 0px;
     border-style: solid;
 }
 
-/**************
- * mate-media *
- **************/
-
-GvcMixerDialog .frame.flat {
-    border-style: none;
+GvcMixerDialog notebook.frame box.vertical box.horizontal frame label {
+    padding: 0px 0px 0px 6px;
 }
 
-GvcMixerDialog .vertical.dialog-vbox .notebook GtkScrolledWindow.frame {
-    border-style: none;
-    border-radius: 0px 0px 4px 4px;
+GvcMixerDialog notebook.frame box.vertical box.horizontal box.horizontal label {
+    padding: 0px 0px 0px 6px;
 }
 
-GvcMixerDialog .vertical.dialog-vbox .notebook .frame.flat GtkScrolledWindow.frame {
-    border-width: 1px;
-    border-radius: 0px;
-    border-style: solid;
+GvcMixerDialog notebook.frame box.vertical box.horizontal box.horizontal frame box.horizontal box.horizontal label {
+    padding: 0px 0px 0px 10px;
 }
-
 /*******
  * Eom *
  *******/
 
-EomWindow .vertical.primary-toolbar .horizontal.toolbar {
-    border-bottom-color: @theme_bg_dark_color;
-}
-
-EomThumbNav .button.flat {
+.eom-window .vertical .vertical .vertical .horizontal button.flat {
     border-width: 1px;
     border-color: @button_border;
     border-image: none;
 }
 
-EomThumbNav .button.flat:first-child {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:first-child {
     border-radius: 5px 0px 0px 5px;
     border-right-width: 0px;
 }
 
-EomThumbNav .button.flat:last-child {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:last-child {
     border-radius: 0px 5px 5px 0px;
     border-left-width: 0px;
 }
 
-EomThumbNav .button.flat:hover {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:hover {
     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
                 inset  1px  0px shade (@theme_selected_bg_color, 1.3),
                 inset -1px  0px shade (@theme_selected_bg_color, 1.3),
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 
-EomThumbNav .button.flat:insensitive {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:disabled {
     border-color: transparent;
 }
 
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/menu.css b/desktop-themes/Blue-Submarine/gtk-3.0/menu.css
index 21ea28c9..b1c31965 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/menu.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/menu.css
@@ -3,8 +3,8 @@
  *
  *************************/
 
-.toolbar .raised .menu,
-.menu {
+toolbar .raised  menu,
+menu {
     /* menu contextual */
     background-color: @menu_bg_dark_color;
     background-image: -gtk-gradient (linear,
@@ -18,25 +18,25 @@
     border-image:     none;
 }
 
-.menu:selected {
+menu:selected {
     background-color: @theme_selected_bg_color;
 }
 
-GtkMenuItem,
-GtkMenuItem:insensitive {
+menuitem,
+menuitem:disabled {
     background-color: @menu_bg_dark_color;
 }
 
-.menubar .menu.button:hover,
-.menubar .menu.button:active,
-.menubar .menu.button:active:insensitive,
-.menubar .menu.button:insensitive,
-.menubar .menu.button,
-.primary-toolbar .menu.button:hover,
-.primary-toolbar .menu.button:active,
-.primary-toolbar .menu.button:active:insensitive,
-.primary-toolbar .menu.button:insensitive,
-.primary-toolbar .menu.button {
+menubar menu button:hover,
+menubar menu button:active,
+menubar menu button:active:disabled,
+menubar menu button:disabled,
+menubar menu button,
+toolbar.primary-toolbar menu button:hover,
+toolbar.primary-toolbar menu button:active,
+toolbar.primary-toolbar menu button:active:disabled,
+toolbar.primary-toolbar menu button:disabled,
+toolbar.primary-toolbar menu button {
     background-color: shade (@menu_bg_dark_color, 1.07);
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
@@ -46,10 +46,9 @@ GtkMenuItem:insensitive {
     border-style: none;
     border-width: 1px;
     border-image: none;
-
 }
 
-.menu.button {
+menu button {
     padding: 0px;
     background-image: none;
     background-color: shade (@menu_bg_dark_color, 0.95);
@@ -59,7 +58,7 @@ GtkMenuItem:insensitive {
     border-style: none;
 }
 
-.menu.button GtkArrow {
+menu button arrow {
     color: @menu_fg_dark_color;
 }
 
@@ -67,7 +66,7 @@ GtkMenuItem:insensitive {
 /***********
  * menubar *
  ***********/
-.menubar {
+menubar {
     -GtkWidget-window-dragging: true;
     /* line 3D  (dark) */
     box-shadow: inset  0px -1px @menu_line_dark_color;
@@ -79,106 +78,110 @@ GtkMenuItem:insensitive {
     border-bottom-color:  shade(@theme_bg_dark_color, 1.60);
     background-color: shade (@theme_bg_dark_color, 1.00);
     color: @menu_fg_dark_color;
+    min-height: 20px;
 }
 
 /***************
  * menubaritem *
  ***************/
-.menubar.menuitem  {
+menubar > menuitem  {
     padding: 5px 5px;
     transition: all 300ms ease-out;
     border-radius: 0px;
     border-width: 0px;
+    min-height: 16px;
 }
 
-.menubar.menuitem:hover,
-.menubar .menuitem:hover {
-    padding: 5px 5px;
+menubar > menuitem:hover {
     background-color: shade (@theme_bg_dark_color, 1.2);
     border-radius: 6px;
     color: shade (@theme_selected_bg_color, 1.6);
     text-shadow: 0px 1px @theme_selected_shadow_color;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    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);
 }
 
 /************
  * menuitem *
  ************/
-.menubar .menuitem {
-    padding: 5px 5px;
-    transition: all 300ms ease-out;
-    color: @theme_fg_dark_color;
-    text-shadow: 1px 1px @theme_shadow_dark_color;
-}
-
-Genericmenuitem .menuitem *,
-DbusmenuGtkMenu .menuitem *,
-.toolbar .raised .button .menuitem *,
-.toolbar.menubar .button .menuitem *,
-.toolbar .menuitem *,
-.primary-toolbar .menuitem *,
-.primary-toolbar .button .menuitem *,
-.menu .menuitem *, 
-.menuitem {
+
+toolbar .raised button menuitem,
+toolbar menubar button menuitem,
+toolbar menuitem,
+toolbar.primary-toolbar menuitem,
+toolbar.primary-toolbar button menuitem,
+window.background.popup menu menuitem,
+window.background.popup menuitem {
 /* Fix height change in nautilus menu item view options */
     padding: 0px;
     border-width: 0px;
-
 }
 
-Genericmenuitem .menuitem,
-DbusmenuGtkMenu .menuitem,
-.toolbar .raised .button .menuitem,
-.toolbar.menubar .button .menuitem,
-.toolbar.menubar .linked .button .menuitem,
-.toolbar .menuitem,
-.primary-toolbar .menuitem,
-.primary-toolbar .button .menuitem,
-.menu .menuitem, 
-.menuitem {
+toolbar .raised button menuitem,
+toolbar menubar button menuitem,
+toolbar menubar .linked button menuitem,
+toolbar menuitem,
+toolbar.primary-toolbar menuitem,
+toolbar.primary-toolbar button menuitem,
+window.background.popup menu menuitem,
+window.background.popup menuitem {
+/*    transition: all 300ms ease-out; FIXME this caused items jumpings*/
+/*    -GtkMenuItem-arrow-scaling: 0.7; */
     transition: all 300ms ease-out;
-    -GtkMenuItem-arrow-scaling: 0.7;
-    padding: 2px 4px;
     border-radius: 0px;
     color: @menu_fg_dark_color;
     text-shadow: 1px 1px @menu_shadow_dark_color;
     padding: 5px 5px;
+    min-height: 22px;
 }
 
-.toolbar .menuitem GtkLabel,
-.primary-toolbar .menuitem GtkLabel,
-.toolbar .raised .button .menuitem GtkLabel,
-.toolbar.menubar .button .menuitem GtkLabel,
-.primary-toolbar .button .menuitem GtkLabel {
+toolbar menuitem label,
+toolbar.primary-toolbar menuitem label,
+toolbar .raised button menuitem label,
+toolbar menubar button menuitem label,
+toolbar.primary-toolbar button menuitem label {
     color: @menu_fg_dark_color;
     text-shadow: 1px 1px @menu_shadow_dark_color;
 }
 
-GtkTreeMenu.menu {
+treemenu menu {
     background-color: @menu_bg_dark_color;
 }
 
-GtkTreeMenu .menuitem {
+treemenu menuitem {
     border-style: none;
     border-width: 0px;
 }
 
-.toolbar GtkComboBox .menuitem,
-GtkComboBox .menuitem {
-    transition: all 500ms ease-out;
+toolbar combobox menuitem,
+combobox menuitem {
+    transition: all 300ms ease-out;
+    color: @menu_fg_dark_color;
+    text-shadow: 0px 1px @menu_shadow_dark_color;
+}
+
+/* needed for .menuitem with gtk+-3.20 !!! */
+combobox menuitem .cell {
     color: @menu_fg_dark_color;
     text-shadow: 0px 1px @menu_shadow_dark_color;
 }
 
 /* needed for .menuitem with gtk+-3.18 */
-GtkTreeMenu.menu .menuitem GtkCellView {
+treemenu menu menuitem .cell {
     background-image: none;
     background-color: transparent;
     color: @menu_fg_dark_color;
     text-shadow: 0px 1px @menu_shadow_dark_color;
 }
 
-GtkTreeMenu.menu .menuitem:hover,
-GtkComboBox .menuitem:hover {
+treemenu menu menuitem:hover,
+combobox menuitem:hover {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@menu_bg_dark_color, 2.03)),
@@ -187,13 +190,14 @@ GtkComboBox .menuitem:hover {
     text-shadow: 0px 1px @theme_selected_shadow_color;
 }
 
-GtkTreeMenu.menu .menuitem:hover GtkCellView {
+treemenu menu menuitem:hover .cell,
+combobox menuitem:hover .cell {
     color: shade (@theme_selected_bg_color, 1.6);
     text-shadow: 0px 1px @theme_selected_shadow_color;
 }
 
-.menuitem:hover,
-.menu .menuitem:hover {
+window.background.popup menuitem:hover,
+window.background.popup menu menuitem:hover {
     /* contextual menu item-selected */
     background-color: shade (@theme_bg_dark_color, 1.2);
     background-image: -gtk-gradient (linear,
@@ -212,64 +216,65 @@ GtkTreeMenu.menu .menuitem:hover GtkCellView {
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 
-.toolbar .menuitem *:hover,
-.primary-toolbar .toolbar .button .menuitem *:hover,
-.primary-toolbar.toolbar .button .menuitem *:hover,
-.toolbar .raised .button .menuitem *:hover, /* menuitem opciones visualizacion nautilus  */
-.toolbar.menubar .button .menuitem *:hover, 
-GtkComboBox .menuitem *:hover, 
-GtkTreeMenu .menuitem *:active,
-GtkTreeMenu .menuitem *:prelight,
-.menuitem *:active,
-.menuitem *:prelight,
-.menuitem *:hover, 
-.menuitem:hover,
-.menu .menuitem:hover {
+toolbar menuitem *:hover,
+toolbar.primary-toolbar button menuitem *:hover,
+toolbar .raised button menuitem *:hover, /* menuitem opciones visualizacion nautilus  */
+toolbar menubar button menuitem *:hover, 
+combobox menuitem *:hover, 
+treemenu menuitem *:active,
+treemenu menuitem *:hover,
+window.background.popup menuitem *:active,
+window.background.popup menuitem *:hover, 
+window.background.popup menuitem:hover,
+window.background.popup menu menuitem:hover {
     color: shade (@theme_selected_bg_color, 1.6);
     text-shadow: 0px 1px @theme_selected_shadow_color;
 }
 
-.primary-toolbar .menuitem *:insensitive,
-.toolbar .raised .button .menuitem *:insensitive,
-.toolbar.menubar .button .menuitem *:insensitive,
-.primary-toolbar .button .menuitem *:insensitive,
-.toolbar .menuitem *:insensitive,
-.menuitem:insensitive,
-.menuitem *:insensitive {
-    /* contextual menu insensitive */
+toolbar.primary-toolbar menuitem *:disabled,
+toolbar .raised button menuitem *:disabled,
+toolbar.menubar button menuitem *:disabled,
+toolbar.primary-toolbar button menuitem *:disabled,
+toolbar menuitem *:disabled,
+window.background.popup menuitem:disabled,
+window.background.popup menuitem *:disabled {
+    /* contextual menu disabled */
     color: mix (@menu_fg_dark_color, @menu_bg_dark_color, 0.4);
     text-shadow: none;
 }
 
-.menuitem.check,
-.menuitem.radio,
-.menuitem.check:hover,
-.menuitem.radio:hover,
-.menuitem.check:insensitive,
-.menuitem.radio:insensitive,
-.menuitem.check:active:insensitive,
-.menuitem.radio:active:insensitive,
-.menuitem.check:checked:insensitive,
-.menuitem.radio:checked:insensitive,
-.menuitem.check:inconsistent:insensitive,
-.menuitem.radio:inconsistent:insensitive {
+window.background.popup menuitem check,
+window.background.popup menuitem radio,
+window.background.popup menuitem check:hover,
+window.background.popup menuitem radio:hover,
+window.background.popup menuitem check:disabled,
+window.background.popup menuitem radio:disabled,
+window.background.popup menuitem check:active:disabled,
+window.background.popup menuitem radio:active:disabled,
+window.background.popup menuitem check:checked:disabled,
+window.background.popup menuitem radio:checked:disabled,
+window.background.popup menuitem check:indeterminate:disabled,
+window.background.popup menuitem radio:indeterminate:disabled {
     border-width: 0px;
     border-style: none;
     background-image: none;
-}
-
-.toolbar .raised .button .menuitem.check:inconsistent,
-.toolbar .raised .button .menuitem.radio:inconsistent,
-.menuitem.check:inconsistent,
-.menuitem.radio:inconsistent,
-.toolbar .raised .button .menuitem.check:active,
-.toolbar .raised .button .menuitem.radio:active,
-.menuitem.check:active,
-.menuitem.radio:active,
-.toolbar .raised .button .menuitem.check:checked,
-.toolbar .raised .button .menuitem.radio:checked,
-.menuitem.check:checked,
-.menuitem.radio:checked {
+	min-height: 12px;
+	min-width: 12px;
+	background-position: center center;
+}
+
+toolbar .raised button menuitem check:indeterminate,
+toolbar .raised button menuitem radio:indeterminate,
+window.background.popup menuitem check:indeterminate,
+window.background.popup menuitem radio:indeterminate,
+toolbar .raised button menuitem check:active,
+toolbar .raised button menuitem radio:active,
+window.background.popup menuitem check:active,
+window.background.popup menuitem radio:active,
+toolbar .raised button menuitem check:checked,
+toolbar .raised button menuitem radio:checked,
+window.background.popup menuitem check:checked,
+window.background.popup menuitem radio:checked {
     border-width: 0px;
     border-style: none;
     background-image: none;
@@ -278,47 +283,70 @@ GtkTreeMenu .menuitem *:prelight,
     color: @menu_fg_dark_color;
 }
 
-.toolbar .raised .button .menuitem.check:inconsistent:hover,
-.toolbar .raised .button .menuitem.radio:inconsistent:hover,
-.menuitem.check:inconsistent:hover,
-.menuitem.radio:inconsistent:hover,
-.toolbar .raised .button .menuitem.check:active:hover,
-.toolbar .raised .button .menuitem.radio:active:hover,
-.menuitem.check:active:hover,
-.menuitem.radio:active:hover,
-.toolbar .raised .button .menuitem.check:checked:hover,
-.toolbar .raised .button .menuitem.radio:checked:hover,
-.menuitem.check:checked:hover,
-.menuitem.radio:checked:hover {
+toolbar .raised button menuitem check:indeterminate:hover,
+toolbar .raised button menuitem radio:indeterminate:hover,
+window.background.popup menuitem check:indeterminate:hover,
+window.background.popup menuitem radio:indeterminate:hover,
+toolbar .raised button menuitem check:active:hover,
+toolbar .raised button menuitem radio:active:hover,
+window.background.popup menuitem check:active:hover,
+window.background.popup menuitem radio:active:hover,
+toolbar .raised button menuitem check:checked:hover,
+toolbar .raised button menuitem radio:checked:hover,
+window.background.popup menuitem check:checked:hover,
+window.background.popup menuitem radio:checked:hover {
     border-color: @theme_selected_fg_color;
     color: @theme_selected_fg_color;
 }
 
-.menuitem.arrow:hover {
+window.background.popup menuitem arrow {
+    min-height: 16px;
+    min-width: 16px;
+    margin-left: 10px;
+    color: @menu_fg_color;
+}
+
+window.background.popup menu menuitem arrow:dir(ltr) {
+	-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
+
+window.background.popup menu menuitem arrow:dir(rtl) {
+        -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
+}
+
+window.background.popup menu arrow.top {
+      -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+}
+
+window.background.popup menu arrow.bottom {
+      -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+}
+
+window.background.popup menu arrow:hover {
     border-color: @theme_selected_fg_color;
     color: shade (@theme_selected_bg_color, 1.6);
 }
 
-.menuitem.check:insensitive,
-.menuitem.radio:insensitive,
-.menuitem.check:active:insensitive,
-.menuitem.radio:active:insensitive,
-.menuitem.check:checked:insensitive,
-.menuitem.radio:checked:insensitive,
-.menuitem.check:inconsistent:insensitive,
-.menuitem.radio:inconsistent:insensitive {
+window.background.popup menuitem check:disabled,
+window.background.popup menuitem radio:disabled,
+window.background.popup menuitem check:active:disabled,
+window.background.popup menuitem radio:active:disabled,
+window.background.popup menuitem check:checked:disabled,
+window.background.popup menuitem radio:checked:disabled,
+window.background.popup menuitem check:indeterminate:disabled,
+window.background.popup menuitem radio:indeterminate:disabled {
     color: mix (@menu_fg_dark_color, @menu_bg_dark_color, 0.6);
     text-shadow: none;
 }
 
-.menubar .menuitem GtkCalendar,
-.menubar .menuitem GtkCalendar.button,
-.menubar .menuitem GtkCalendar.header,
-.menubar .menuitem GtkCalendar.view,
-.primary-toolbar .menuitem GtkCalendar,
-.primary-toolbar .menuitem GtkCalendar.button,
-.primary-toolbar .menuitem GtkCalendar.header,
-.primary-toolbar .menuitem GtkCalendar.view {
+menubar menuitem calendar,
+menubar menuitem calendar.button,
+menubar menuitem calendar.header,
+menubar menuitem calendar.view,
+toolbar.primary-toolbar menuitem calendar,
+toolbar.primary-toolbar menuitem calendar.button,
+toolbar.primary-toolbar menuitem calendar.header,
+toolbar.primary-toolbar menuitem calendar.view {
     background-color: @menu_bg_dark_color;
     background-image: none;
     border-radius: 0;
@@ -328,13 +356,13 @@ GtkTreeMenu .menuitem *:prelight,
     color: @menu_fg_dark_color;
 }
 
-.menubar .menuitem GtkCalendar,
-.primary-toolbar .menuitem GtkCalendar {
+menubar menuitem calendar,
+toolbar.primary-toolbar menuitem calendar {
     background-color: shade (@menu_bg_dark_color, 1.3);
     background-image: none;
 }
 
-.menubar .menuitem GtkScale.trough {
+menubar menuitem scale trough {
     background-image: -gtk-gradient (linear,
                                      left top,
                                      left bottom,
@@ -348,33 +376,26 @@ GtkTreeMenu .menuitem *:prelight,
                 inset -1px -1px alpha(#000, 0.08);
 }
 
-Genericmenuitem .menuitem .accelerator,
-DbusmenuGtkMenu .menuitem .accelerator,
-.menubar .menuitem .accelerator,
-.primary-toolbar .menuitem .accelerator {
+menubar menuitem accelerator,
+toolbar.primary-toolbar menuitem accelerator {
     color: alpha (@menu_fg_dark_color, 0.8);
 }
 
-Genericmenuitem .menuitem .accelerator:hover,
-DbusmenuGtkMenu .menuitem .accelerator:hover,
-.menubar .menuitem .accelerator:hover,
-.primary-toolbar .menuitem .accelerator:hover {
+menubar menuitem accelerator:hover,
+toolbar.primary-toolbar menuitem accelerator:hover {
     color: alpha (@theme_selected_fg_color, 0.8);
 }
 
-Genericmenuitem .menuitem .accelerator:insensitive,
-DbusmenuGtkMenu .menuitem .accelerator:insensitive,
-.menubar .menuitem .accelerator:insensitive,
-.primary-toolbar .menuitem .accelerator:insensitive {
+menubar menuitem accelerator:disabled,
+toolbar.primary-toolbar menuitem accelerator:disabled {
     color: alpha (mix (@menu_fg_dark_color, @menu_bg_dark_color, 0.4), 0.8);
     text-shadow: none;
 }
 
-.menuitem.separator {
-    -GtkMenuItem-horizontal-padding: 0;
-    -GtkWidget-separator-height: 1;
-    /* border-color: shade (@menu_bg_dark_color, 0.90);
-    -unico-inner-stroke-color: alpha (shade (@menu_bg_dark_color, 1.18), 0.6); */
+window.background.popup menu separator {
+/*	-GtkMenuItem-horizontal-padding: 0; deprecated */
+/*    -GtkWidget-separator-height: 1; */
+    min-height: 1px;
     border-image: -gtk-gradient (linear,
                                  left top, right top,
                                  from (alpha (#000, 0.00)),
@@ -387,8 +408,8 @@ DbusmenuGtkMenu .menuitem .accelerator:insensitive,
  * Menu Button *
  ***************/
 
-.button.menuitem.menubar:active,
-.button.menuitem.menubar *:active {
+button menuitem menubar:active,
+button menuitem menubar *:active {
     color: @menu_fg_dark_color;
     background-image: none;
     background-color: @menu_bg_dark_color;
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/other-applications.css b/desktop-themes/Blue-Submarine/gtk-3.0/other-applications.css
index 0b2fd8aa..4105b94b 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/other-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/other-applications.css
@@ -54,11 +54,6 @@ NemoSearchBar .entry {
                 inset  0px -1px shade(@toolbar_gradient_base, 0.90);
 }
 
-NemoSearchBar .entry,
-NemoSearchBar .entry:focus {
-    -GtkEntry-inner-border: 1;
-}
-
 NemoSearchBar .entry.image {
     color: shade(@nautilus_cluebar_color, 0.60);
 }
@@ -129,7 +124,7 @@ NemoTrashBar .button *:checked:hover {
     text-shadow: 0px 1px @theme_shadow_color;
 }
 
-NemoTrashBar .button:insensitive {
+NemoTrashBar .button:disabled {
 /* .button:active:hover */
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
@@ -143,12 +138,12 @@ NemoTrashBar .button:insensitive {
                 inset  0px -1px shade(@nautilus_cluebar_color, 0.78);
 }
 
-NemoTrashBar .button *:insensitive {
+NemoTrashBar .button *:disabled {
     color: mix(@nautilus_cluebar_color, @theme_fg_color, 0.50);
     text-shadow: none;
 }
 
-NemoWindow .sidebar .scrollbar {
+.nemo-window .sidebar scrollbar {
     background-image: none;
     border-style: solid;
     -GtkRange-stepper-size: 16;
@@ -163,31 +158,22 @@ NemoWindow .sidebar .scrollbar {
     -GtkScrollbar-min-slider-length: 31;
     -GtkScrollbar-slider-width: 11;
     -GtkScrolledWindow-scrollbar-spacing: 0;
-    -GtkScrolledWindow-scrollbars-within-bevel: 1;
 }
 
-NemoWindow .sidebar .scrollbar.trough.vertical {
+.nemo-window .sidebar scrollbar.vertical.left trough {
     border-radius: 0;
     border-width: 0 0px 0 1px;
     border-style: solid;
     border-color: shade (@theme_bg_color, 0.96);
 }
 
-NemoWindow .sidebar .scrollbar.trough {
+.nemo-window .sidebar scrollbar trough {
     border-radius: 0;
     border-width: 1px 0 0px 0;
     border-style: solid;
     border-color: shade (@theme_bg_color, 0.96);
 }
 
-/* the small line between sidebar and view */
-NemoWindow GtkPaned.horizontal {
-    border-color: shade(@theme_bg_color, 0.80);
-    border-style: solid;
-    border-width: 0px 1px 0px 0px;
-    -GtkPaned-handle-size: 4px;
-}
-
 NemoWindow .sidebar .frame {
     border-width: 0px;
     border-style: none;
@@ -196,9 +182,9 @@ NemoWindow .sidebar .frame {
 }
 
 /* disable shadow and radius for nemo, looks strange */
-NemoWindow .sidebar .view row:hover,
-NemoWindow .sidebar .view row:selected,
-NemoWindow .sidebar .view row:selected:hover {
+.nemo-window .sidebar .view row:hover,
+.nemo-window .sidebar .view row:selected,
+.nemo-window .sidebar .view row:selected:hover {
     border-radius: 0px;
     box-shadow: none;
 }
@@ -224,16 +210,16 @@ NemoToolbar .linked .button:focus:last-child {
     box-shadow: none;
 }
 
-NemoWindow .primary-toolbar.toolbar .button GtkImage {
+.nemo-window toolbar.primary-toolbar button image {
     color: @theme_fg_dark_color;
 }
 
-NemoWindow .primary-toolbar.toolbar .button,
-NemoWindow .primary-toolbar.toolbar .button:hover {
+.nemo-window toolbar.primary-toolbar button,
+.nemo-window toolbar.primary-toolbar button:hover {
     padding: 4px;
 }
 
-NemoWindow .primary-toolbar.toolbar .entry {
+.nemo-window toolbar.primary-toolbar entry {
     padding: 3px 8px;
 }
 /*
@@ -270,7 +256,7 @@ NemoWindow .primary-toolbar.toolbar .button:checked:hover {
     border-color: transparent;
 }
 */
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton {
+.nemo-window toolbar.primary-toolbar NemoPathbarButton {
     padding: 4px;
     border-image: none;
     border-style: solid;
@@ -279,7 +265,7 @@ NemoWindow .primary-toolbar.toolbar NemoPathbarButton {
     border-color: transparent;
 }
 
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton {
+.nemo-window toolbar.primary-toolbar NemoPathbarButton {
     background-color: transparent;
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
@@ -290,39 +276,39 @@ NemoWindow .primary-toolbar.toolbar NemoPathbarButton {
     color: shade(@theme_fg_dark_color, 0.90);
 }
 
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton * {
+.nemo-window toolbar.primary-toolbar NemoPathbarButton * {
     color: shade(@theme_text_dark_color, 1.00);
     text-shadow: 0px 1px @theme_shadow_dark_color;
     border-color: transparent;
 }
 
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton *:hover {
+.nemo-window toolbar.primary-toolbar NemoPathbarButton *:hover {
     color: shade(@theme_text_dark_color, 1.00);
 }
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton * {
+.nemo-window toolbar.primary-toolbar NemoPathbarButton * {
     -GtkArrow-arrow-scaling: 0.7;
 }
 
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton,
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton:first-child,
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton:last-child,
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton:only-child {
+.nemo-window toolbar.primary-toolbar NemoPathbarButton,
+.nemo-window toolbar.primary-toolbar NemoPathbarButton:first-child,
+.nemo-window toolbar.primary-toolbar NemoPathbarButton:last-child,
+.nemo-window toolbar.primary-toolbar NemoPathbarButton:only-child {
     transition: all 400ms ease-out;
 }
 
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton,
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton:first-child,
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton:last-child,
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton:only-child,
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton:hover,
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton:first-child:hover,
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton:last-child:hover,
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton:only-child:hover {
+.nemo-window toolbar.primary-toolbar NemoPathbarButton,
+.nemo-window toolbar.primary-toolbar NemoPathbarButton:first-child,
+.nemo-window toolbar.primary-toolbar NemoPathbarButton:last-child,
+.nemo-window toolbar.primary-toolbar NemoPathbarButton:only-child,
+.nemo-window toolbar.primary-toolbar NemoPathbarButton:hover,
+.nemo-window toolbar.primary-toolbar NemoPathbarButton:first-child:hover,
+.nemo-window toolbar.primary-toolbar NemoPathbarButton:last-child:hover,
+.nemo-window toolbar.primary-toolbar NemoPathbarButton:only-child:hover {
     padding: 4px;
 }
 
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton:active,
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton:checked {
+.nemo-window toolbar.primary-toolbar NemoPathbarButton:active,
+.nemo-window toolbar.primary-toolbar NemoPathbarButton:checked {
     background-color: transparent;
     background-image: none;
     border-image: none;
@@ -333,10 +319,10 @@ NemoWindow .primary-toolbar.toolbar NemoPathbarButton:checked {
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton *:active,
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton *:active:hover,
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton *:checked,
-NemoWindow .primary-toolbar.toolbar NemoPathbarButton *:checked:hover {
+.nemo-window toolbar.primary-toolbar NemoPathbarButton *:active,
+.nemo-window toolbar.primary-toolbar NemoPathbarButton *:active:hover,
+.nemo-window toolbar.primary-toolbar NemoPathbarButton *:checked,
+.nemo-window toolbar.primary-toolbar NemoPathbarButton *:checked:hover {
     font: bold;
     color: shade(@theme_text_dark_color, 1.00);
     text-shadow: 1px 1px @theme_shadow_dark_color;
@@ -378,7 +364,7 @@ NemoWindow .primary-toolbar.toolbar .button:hover {
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 */
-NemoWindow .primary-toolbar .toolbar {
+.nemo-window toolbar.primary-toolbar {
     background-color: @theme_bg_color;
 }
 
@@ -418,33 +404,34 @@ NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:only
 }
 
 /* Nemo statusbar */
-NemoWindow .toolbar {
+.nemo-window box.toolbar.horizontal {
     background-image: none;
     background-color: @theme_bg_color;
     border-top-width: 0;
     border-bottom-width: 0;
     box-shadow: none;
+    padding: 0px;
 }
 
-NemoStatusBar.toolbar .button {
+.nemo-window box.toolbar.horizontal button {
     padding: 6px;
 }
 
 /* small buttons statusbar nemo */
-NemoWindow .toolbar .button GtkImage,
-NemoWindow .toolbar .button GtkImage:active,
-NemoWindow .toolbar .button GtkImage:active:hover,
-NemoWindow .toolbar .button GtkImage:checked,
-NemoWindow .toolbar .button GtkImage:checked:hover,
-NemoWindow .toolbar .button GtkImage:hover {
+.nemo-window box.toolbar.horizontal button image,
+.nemo-window box.toolbar.horizontal button image:active,
+.nemo-window box.toolbar.horizontal button image:active:hover,
+.nemo-window box.toolbar.horizontal button image:checked,
+.nemo-window box.toolbar.horizontal button image:checked:hover,
+.nemo-window box.toolbar.horizontal button image:hover {
     color: @theme_fg_color;
 }
 
-NemoWindow .toolbar .button:hover,
-NemoWindow .toolbar .button:active,
-NemoWindow .toolbar .button:active:hover,
-NemoWindow .toolbar .button:checked,
-NemoWindow .toolbar .button:checked:hover {
+.nemo-window box.toolbar.horizontal button:hover,
+.nemo-window box.toolbar.horizontal button:active,
+.nemo-window box.toolbar.horizontal button:active:hover,
+.nemo-window box.toolbar.horizontal button:checked,
+.nemo-window box.toolbar.horizontal button:checked:hover {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@button_gradient1, 1.03)),
@@ -458,8 +445,8 @@ NemoWindow .toolbar .button:checked:hover {
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 
-NemoWindow .notebook {
-    -GtkNotebook-initial-gap: 0;
+.nemo-window-pane notebook {
+/*    -GtkNotebook-initial-gap: 0; */
     background-color: @theme_base_color;
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
@@ -477,12 +464,8 @@ NemoWindow .notebook {
     box-shadow: none;
 }
 
-/* Nemo notebook */
-GtkDialog.background .vertical.dialog-vbox .notebook .frame {
-    background-color: shade (@theme_bg_color, 1.1);
-}
 
-NemoWindow .notebook tab {
+.nemo-window-pane notebook tab {
     border-width: 0px 1px;
     border-style: solid;
     border-color:       shade(@notebook_border, 1.00);
@@ -497,8 +480,7 @@ NemoWindow .notebook tab {
                 inset  0px -1px shade(@notebook_border, 1.00);
 }
 
-NemoWindow .notebook tab:active,
-NemoWindow .notebook tab:checked {
+.nemo-window-pane notebook tab:active {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@theme_base_color, 0.90)),
@@ -512,53 +494,51 @@ NemoWindow .notebook tab:checked {
                 inset -1px  0px alpha(#fff, 0.04);
 }
 
-NemoWindow .notebook tab.top {
+.nemo-window-pane notebook tab.top {
     padding: 0px 6px;
     border-radius: 0px;
 }
 
-NemoWindow .notebook tab:first-child,
-NemoWindow .notebook tab:first-child:active,
-NemoWindow .notebook tab:first-child:checked {
+.nemo-window-pane notebook tab:first-child,
+.nemo-window-pane notebook tab:first-child:active,
+.nemo-window-pane notebook tab:first-child:checked {
     border-width: 0px 1px 0px 0px;
     border-radius: 0px;
 }
 
-NemoWindow .notebook tab:last-child,
-NemoWindow .notebook tab:last-child:active,
-NemoWindow .notebook tab:last-child:checked {
+.nemo-window-pane notebook tab:last-child,
+.nemo-window-pane notebook tab:last-child:active,
+.nemo-window-pane notebook tab:last-child:checked {
     border-width: 0px 0px 0px 1px;
     border-radius: 0px;
 }
 
-NemoWindow .notebook tab GtkLabel {
+.nemo-window-pane notebook tab label {
     padding: 0px;
     color: @theme_text_color;
     text-shadow: 0px 1px @theme_shadow_color;
 }
 
-NemoWindow .notebook tab .button GtkImage {
+.nemo-window-pane notebook tab button image {
     border-radius: 3px;
     color: mix(@theme_fg_color, @sidebar_background, 0.30);
     border-style: solid;
     border-color: transparent;
     border-width: 1px;
     padding: 0;
-    icon-shadow: 1px 1px @theme_shadow_color;
+    -gtk-icon-shadow: 1px 1px @theme_shadow_color;
 }
 
-NemoWindow .notebook tab .button GtkImage:hover {
+.nemo-window-pane notebook tab button image:hover {
     color: @theme_fg_color; 
     border-color: alpha(black, 0.1); 
 }
 
-NemoWindow .notebook tab .button GtkImage:active,
-NemoWindow .notebook tab .button GtkImage:active:hover,
-NemoWindow .notebook tab .button GtkImage:checked,
-NemoWindow .notebook tab .button GtkImage:active:hover {
+.nemo-window-pane notebook tab button image:checked,
+.nemo-window-pane notebook tab button image:active:hover {
     background-color: alpha(black, 0.15); 
     color: shade(@theme_fg_color, 1.00);
-    icon-shadow: 0px 1px @theme_shadow_color;
+    -gtk-icon-shadow: 0px 1px @theme_shadow_color;
     border-color: alpha(black, 0.27) 
                   alpha(black, 0.13) 
                   alpha(black, 0.13) 
@@ -587,30 +567,32 @@ NemoWindow .notebook tab .button GtkImage:active:hover {
 
 .nemo-desktop.nemo-canvas-item:active,
 .nemo-desktop.nemo-canvas-item:checked,
-.nemo-desktop.nemo-canvas-item:prelight,
+.nemo-desktop.nemo-canvas-item:hover,
 .nemo-desktop.nemo-canvas-item:selected,
 .nemo-desktop.nemo-canvas-item:checked {
     text-shadow: none;
 }
 
 /* stack-switcher ie. nemo preferences */
-.vertical.dialog-vbox .horizontal.primary-toolbar {
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar {
     background-color: transparent;
     border-color: @primay-toolbar-border;
     border-width: 1px 0px;
     padding: 1px 0px;
 }
 
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button {
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio,
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio:focus {
     color: @menu_fg_dark_color;
     text-shadow: none;
     box-shadow: none;
     padding: 5px 2px;
+    background-image: none;
 }
 
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:hover,
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:checked,
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:checked:hover {
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio:hover,
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio:checked,
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio:checked:hover {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@menu_bg_dark_color, 2.03)),
@@ -622,161 +604,103 @@ NemoWindow .notebook tab .button GtkImage:active:hover {
 }
 
 /* middle most button */
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button,
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:focus,
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:hover,
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:checked {
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio,
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio:focus,
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio:hover,
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio:checked {
     border-right-width: 0px;
     border-left-width:  0px;
     border-radius: 0px;
 }
 
 /* left most button */
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:first-child,
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:focus:first-child,
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:hover:first-child,
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:checked:first-child {
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio:first-child,
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio:focus:first-child,
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio:hover:first-child,
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio:checked:first-child {
     border-radius: 6px 0 0 6px;
     border-width: 1px;
     border-right-width: 0px;
 }
 
 /* right most button */
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:last-child,
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:focus:last-child,
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:hover:last-child,
-.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:checked:last-child {
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio:last-child,
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio:focus:last-child,
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio:hover:last-child,
+.nemo-properties-dialog box.vertical.dialog-vbox toolbar.horizontal.primary-toolbar stackswitcher.horizontal.linked.stack-switcher button.text-button.radio:checked:last-child {
     border-radius: 0 6px 6px 0;
     border-width: 1px;
     border-left-width: 0px;
 }
 
-.vertical.dialog-vbox .view.frame {
+.nemo-properties-dialog box.vertical.dialog-vbox frame.view {
     background-color: shade (@theme_bg_color, 1.1);
     border-color: @borders;
 }
 
-.vertical.dialog-vbox .view.frame  GtkViewport.frame {
+.nemo-properties-dialog box.vertical.dialog-vbox frame.view  GtkViewport.frame {
     background-color: shade (@theme_bg_color, 1.1);
 }
 
-.vertical.dialog-vbox .view.frame  GtkViewport.frame .vertical GtkSeparator.separator.horizontal {
+.nemo-properties-dialog box.vertical.dialog-vbox frame.view stack  viewport.frame .vertical separator.horizontal {
     border-color: @borders;
     border-width: 0 0 1px 0;
 }
 
-.vertical.dialog-vbox .view.frame  GtkViewport.frame .vertical .vertical .vertical .text-button {
+.nemo-properties-dialog box.vertical.dialog-vbox frame.view stack  viewport.frame .vertical .vertical .vertical checkbutton.text-button {
     background-color: transparent;
 }
 
-.vertical.dialog-vbox .view.frame  GtkViewport.frame .vertical .vertical .vertical .text-button:hover {
+.nemo-properties-dialog box.vertical.dialog-vbox frame.view stack  viewport.frame .vertical .vertical .vertical checkbutton.text-button:hover {
     background-color: shade (@theme_bg_color, 1.05);
     border-radius: 4px;
 }
 
-/* Parole media player needs more testing! */
+/* CompizConfigManager */
 
-ParoleMediaList .toolbar.inline-toolbar .button {
-    padding: 11px;
+.ccsm-window notebook.frame scrolledwindow viewport widget.notebook {
+    background-color: shade (@theme_bg_color, 1.1);
 }
 
-/****************
- * Dconf-editor *
- ****************/
-
-DConfWindow GtkTreeView.view {
-    -GtkTreeView-expander-size: 12; /* arrow size in list/tree views */
+.ccsm-window notebook.frame scrolledwindow viewport widget.notebook box.vertical frame {
+    background-color: shade (@theme_bg_color, 1.14);
 }
 
-/* sidebar */
-DConfWindow GtkTreeView.view,
-DConfWindow GtkTreeView.view row {
-    background-color: shade (@theme_bg_color, 1.08);
-    color: @theme_fg_color;
+.ccsm-window notebook.frame scrolledwindow viewport widget.notebook box.vertical frame frame {
+    background-color: shade (@theme_bg_color, 1.17);
 }
 
-DConfWindow GtkTreeView.view row:selected,
-DConfWindow GtkTreeView.view row:selected:hover  {
-    background-image: -gtk-gradient (linear,
-                                     left top,
-                                     left bottom,
-                                     from (shade(@sidebar_selected_bg, 0.90)),
-                                     color-stop (0.40, shade (@sidebar_selected_bg, 0.98)),
-                                     to (shade(@sidebar_selected_bg, 1.05)));
-    color:  @theme_selected_fg_color;
-    border-radius: 6px;
+.ccsm-window notebook.frame scrolledwindow viewport widget.notebook box.vertical frame expander scrolledwindow {
+    border-color: @notebook_border;
     border-style: solid;
-    border-width: 1px 0px 0px 0px;
-    border-color: shade (@sidebar_selected_bg, 0.90) #bbb shade (@sidebar_selected_bg, 1.05);
-    text-shadow: none;
-}
-
-DConfWindow GtkTreeView.view row:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top,
-                                     left bottom,
-                                     from (shade(@theme_bg_color, 1.05)),
-                                     color-stop (0.40, shade (@theme_bg_color, 1.13)),
-                                     to (shade(@theme_bg_color, 1.10)));
-    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);
-    color: shade (@theme_fg_color, 0.90);
-    border-radius: 6px;
-    text-shadow: none;
-}
-
-/* view */
-DConfWindow DConfKeyView.view,
-DConfWindow DConfKeyView.view row {
-    background-color: @theme_base_color;
-    color: @theme_fg_color;
+    border-width: 1px;
 }
 
-DConfWindow DConfKeyView.view row:selected {
-    color: @theme_selected_fg_color;
+/* treeview header */
+.ccsm-window notebook.frame scrolledwindow viewport widget.notebook box.vertical frame expander scrolledwindow treeview.view button {
+    border-color: @notebook_border;
+    border-style: solid;
+    border-width: 0px 1px 1px 0px;
 }
 
-DConfWindow DConfKeyView.view row,
-DConfWindow DConfKeyView.view row:hover,
-DConfWindow DConfKeyView.view row:selected,
-DConfWindow DConfKeyView.view row:selected:hover {
-    border-radius: 0px;
-    box-shadow: none;
+.ccsm-window notebook.frame scrolledwindow viewport widget.notebook box.vertical frame expander scrolledwindow treeview.view button:first-child {
+    border-width: 0px 1px 1px 0px;
 }
 
-/* the small line between sidebar and view */
-DConfWindow GtkPaned.horizontal {
-    -GtkPaned-handle-size: 3px;
-    border-color: transparent;
-    background-color: @theme_bg_color;
+.ccsm-window notebook.frame scrolledwindow viewport widget.notebook box.vertical frame expander scrolledwindow treeview.view button:last-child {
+    border-width: 0px 0px 1px 0px;;
 }
 
-DConfKeyView.view row:selected,
-DConfKeyView.view row:selected:hover  {
-    background-image: -gtk-gradient (linear,
-                                     left top,
-                                     left bottom,
-                                     from (shade(@sidebar_selected_bg, 0.90)),
-                                     color-stop (0.40, shade (@sidebar_selected_bg, 0.98)),
-                                     to (shade(@sidebar_selected_bg, 1.05)));
-    color:  @theme_selected_fg_color;
+.ccsm-window notebook.frame scrolledwindow viewport widget.notebook  spinbutton.horizontal > entry {
+   padding: 0px 2px 0px 3px;
 }
 
-DConfKeyView.view .entry.spinbutton {
-    padding: 2px 0px 2px 4px;
-    box-shadow: none;
-    border-style: none;
+.ccsm-window notebook.frame scrolledwindow viewport widget.notebook  spinbutton.horizontal > button {
+    padding: 0px 8px;
 }
 
-DConfKeyView.view .spinbutton .button,
-DConfKeyView.view .spinbutton .button:hover {
+/* virtual-manager detail view, hopefully only */
+window.background box.vertical notebook box.horizontal box.vertical notebook {
     border-style: none;
 }
 
-DConfKeyView.view .spinbutton .button:last-child,
-DConfKeyView.view .spinbutton .button:hover:last-child {
-    border-radius: 0 5px 5px 0;
-}
-
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/scrollbar.css b/desktop-themes/Blue-Submarine/gtk-3.0/scrollbar.css
index 4d4cfa46..93a15143 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/scrollbar.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/scrollbar.css
@@ -2,7 +2,7 @@
  * Scrollbars *
  **************/
 
-.scrollbar {
+scrollbar {
     background-image: none;
     border-style: solid;
     -GtkRange-stepper-size: 16;
@@ -16,7 +16,6 @@
     -GtkScrollbar-activate-slider: 1;
     -GtkScrollbar-min-slider-length: 31;
     -GtkScrolledWindow-scrollbar-spacing: 0;
-    -GtkScrolledWindow-scrollbars-within-bevel: 1;
 }
 
  /* the small square between scrollbars!!!
@@ -34,8 +33,8 @@
     box-shadow: none;
 }
 
-.scrollbar.trough,
-.scrollbar.trough.vertical {
+scrollbar trough,
+scrollbar.vertical trough {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@theme_bg_color, 0.98)),
                                      to (shade (@theme_bg_color, 1.06)));
@@ -49,7 +48,7 @@
     box-shadow: none;
 }
 
-.scrollbar.trough.horizontal {
+scrollbar.horizontal trough {
     background-image: -gtk-gradient (linear, left top, right top,
                                      from (shade (@theme_bg_color, 0.98)),
                                      to (shade (@theme_bg_color, 1.06)));
@@ -63,7 +62,7 @@
 }
 
 /* Sliders and buttons */
-.scrollbar.slider.vertical {
+scrollbar.vertical slider {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@theme_bg_color, 0.95)),
                                      to (shade (@theme_bg_color, 0.8)));
@@ -72,8 +71,8 @@
     border-width: 1px;
 }
 
-.scrollbar.slider.vertical:hover,
-.scrollbar.slider.vertical:hover:active {
+scrollbar.vertical slider:hover,
+scrollbar.vertical slider:hover:active {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@theme_bg_color, 0.85)),
                                      to (shade (@theme_bg_color, 0.7)));
@@ -81,7 +80,7 @@
     border-width: 0 0 0 0;
 }
 
-.scrollbar.slider.horizontal {
+scrollbar.horizontal slider {
     background-image: -gtk-gradient (linear, left top, right top,
                                      from (shade (@theme_bg_color, 0.95)),
                                      to (shade (@theme_bg_color, 0.8)));
@@ -90,8 +89,8 @@
     border-width: 1px;
 }
 
-.scrollbar.slider.horizontal:hover,
-.scrollbar.slider.horizontal:hover:active {
+scrollbar.horizontal slider:hover,
+scrollbar.horizontal slider:hover:active {
     background-image: -gtk-gradient (linear, left top, right top,
                                      from (shade (@theme_bg_color, 0.85)),
                                      to (shade (@theme_bg_color, 0.7)));
@@ -99,18 +98,18 @@
     border-width: 0 0 0 0;
 }
 
-.scrollbar.slider:insensitive {
+scrollbar slider:disabled {
     background-color: shade (@theme_bg_color, 0.9);
 }
 
-.scrollbar.trough:insensitive {
+scrollbar trough:disabled {
     background-color: shade (@theme_bg_color, 1.06);
 }
 
-.scrollbar.button,
-.scrollbar.button:hover,
-.scrollbar.button:hover:active,
-.scrollbar.button:insensitive {
+scrollbar button,
+scrollbar button:hover,
+scrollbar button:hover:active,
+scrollbar button:disabled {
     box-shadow: none;
     border-style: none;
     border-image: none;
@@ -119,44 +118,44 @@
     background-color: transparent;
 }
 
-.scrollbar.button:hover,
-.scrollbar.button:hover:active {
+scrollbar button:hover,
+scrollbar button:hover:active {
     background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5);
 }
 
-.scrollbar.button.top:hover {
+scrollbar button.top:hover {
     box-shadow: none;
-    -gtk-image-effect: highlight;
+/*    -gtk-image-effect: highlight; invalid property name in GTK 3.20 */
 }
 
-.scrollbar.button.bottom:hover {
+scrollbar button.bottom:hover {
     box-shadow: none;
-    -gtk-image-effect: highlight;
+/*    -gtk-image-effect: highlight; invalid property name in GTK 3.20 */
 }
 
-.scrollbar.button.right:hover {
+scrollbar button.right:hover {
     box-shadow: none;
-    -gtk-image-effect: highlight;
+/*    -gtk-image-effect: highlight; invalid property name in GTK 3.20 */
 }
 
-.scrollbar.button.left:hover {
+scrollbar button.left:hover {
     box-shadow: none;
-    -gtk-image-effect: highlight;
+/*    -gtk-image-effect: highlight; invalid property name in GTK 3.20 */
 }
 
-.scrollbar.button {
+scrollbar button {
     color: @theme_fg_color;
 }
 
-.scrollbar.button:hover {
+scrollbar button:hover {
     color: @theme_fg_color;
 }
 
-.scrollbar.button:insensitive {
+scrollbar button:disabled {
     color: @insensitive_fg_color;
 }
 
-.scrollbar.slider.fine-tune:prelight:active {
+scrollbar.fine-tune slider:hover:active {
     background-image: url("assets/slider_fine_horizontal.svg"),
                       linear-gradient(to top,
                                       shade(@scrollbar_slider, 0.9),
@@ -170,7 +169,7 @@
     border-width: 1px;
 }
 
-.scrollbar.slider.vertical.fine-tune:prelight:active {
+scrollbar.vertical.fine-tune slider:hover:active {
     background-image: url("assets/slider_fine_vertical.svg"),
                       linear-gradient(to left,
                                       shade(@scrollbar_slider, 0.9),
@@ -190,24 +189,24 @@ OsThumb {
 }
 
 OsThumb:selected,
-OsScrollbar:selected {
+scrollbar.overlay-indicator:selected {
     background-color: @theme_selected_bg_color;
 }
 
 OsThumb:active,
-OsScrollbar:active {
+scrollbar.overlay-indicator:active {
     background-color: shade (@theme_bg_color, 0.6);
 }
 
-OsThumb:insensitive,
-OsScrollbar:insensitive {
+OsThumb:disabled,
+scrollbar.overlay-indicator:disabled {
     background-color: shade (@theme_bg_color, 0.85);
 }
 
 /*******************
  * scrolled window *
  *******************/
-GtkScrolledWindow.frame {
+scrolledwindow.frame {
     border-top-color: shade (@theme_bg_color, 0.84);
     border-right-color: shade (@theme_bg_color, 0.76);
     border-bottom-color: shade (@theme_bg_color, 0.86);
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/sidebar.css b/desktop-themes/Blue-Submarine/gtk-3.0/sidebar.css
index 0d807694..20db4ed6 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/sidebar.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/sidebar.css
@@ -8,35 +8,43 @@
 }
 
 .sidebar,
-.sidebar.view,
 .sidebar .view,
-.sidebar.view:prelight,
-.sidebar .view:prelight {
+.sidebar .view:hover {
     border-radius: 0px;
     color: @sidebar_fg_color;
     text-shadow: 0px 1px @theme_shadow_color;
     background-color: @sidebar_background;
 }
 
+.sidebar-button {
+    background-color: transparent;
+    background-image: none;
+    border-style: none;
+    border-image: none;
+    border-width: 0px;
+    border-color: transparent;
+    box-shadow: none;
+}
+
 /* dialog open */
-GtkPlacesSidebar.sidebar.frame .frame GtkListBox.sidebar.list,
-GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row {
+placessidebar.sidebar.frame viewport.frame list,
+placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row {
      background-color: @sidebar_background;
 }
 
-GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:selected {
+placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row:selected {
      border-radius: 6px;
 }
 
-GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-icon {
+placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer image.sidebar-icon {
      padding: 4px 8px 4px 6px;
 }
 
-GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-label {
+placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer label.sidebar-label {
      padding: 4px 0px 4px 1px;
 }
 
-GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-button.image-button.button {
+placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer button.sidebar-button.image-button {
     background-color: transparent;
     background-image: none;
     border-image:none;
@@ -44,11 +52,8 @@ GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sideba
     padding: 4px 12px 4px 0px;
 }
 
-.sidebar.view:selected,
-.sidebar.view *:selected,
 .sidebar .view:selected,
-.sidebar .view *:selected,
-.sidebar .view:selected:prelight {
+.sidebar .view:selected:hover {
     border-style: solid;
     border-width: 1px 0px 0px 0px;
     border-color: shade (@sidebar_selected_bg, 0.90) #bbb shade (@sidebar_selected_bg, 1.05);
@@ -65,7 +70,7 @@ GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sideba
 
 .sidebar row:hover,
 .sidebar .view row:hover,
-.sidebar GtkTreeView row:hover {
+.sidebar treeview row:hover {
     background-image: -gtk-gradient (linear,
                                      left top,
                                      left bottom,
@@ -81,40 +86,10 @@ GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sideba
     text-shadow: none;
 }
 
-.sidebar .radio,
-.sidebar .radio:focus,
-.sidebar .radio:selected {
+.sidebar radio,
+.sidebar radio:focus,
+.sidebar radio:selected {
     background-image: none;
     background-color: alpha(@theme_base_color, 0.0);
 }
 
-GtkHCollapsablePaned,
-SourceList.pane-separator {
-    border-width: 0px;
-    -GtkPaned-handle-size: 2px;
-}
-
-GtkHCollapsablePaned .pane-separator,
-GtkHCollapsablePaned .pane-separator:prelight,
-GtkHCollapsablePaned .pane-separator:selected {
-    background-image: none;
-    background-color: @sidebar_background;
-    border-width: 0px 1px 0px 0px;
-    border-style: solid;
-    border-color: shade (@button_border, 0.90);
-}
-
-/* Marlin sidebar separator */
-VarkaWidgetsHCollapsiblePaned,
-VarkaWidgetsHCollapsiblePaned.pane-separator,
-VarkaWidgetsHCollapsiblePaned.pane-separator:prelight,
-VarkaWidgetsHCollapsiblePaned.pane-separator:selected {
-    border-width: 0px;
-    border-color: shade(@sidebar_background, 0.80);
-    background-image: -gtk-gradient(linear,
-                                    left top, right top,
-                                    from (@sidebar_background),
-                                    color-stop(0.50, @sidebar_background),
-                                    to   (#a9a9a9));
-}
-
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css b/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css
index 405c79bd..95bd1c28 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css
@@ -21,7 +21,7 @@
 }
 
 .nautilus-desktop.nautilus-canvas-item:active,
-.nautilus-desktop.nautilus-canvas-item:prelight,
+.nautilus-desktop.nautilus-canvas-item:hover,
 .nautilus-desktop.nautilus-canvas-item:selected {
 	text-shadow: none;
 }
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
index a2cb0048..90dfed7a 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
@@ -31,7 +31,7 @@
 
 @define-color inactive_frame_color #ccc;
 
-@define-color sidebar_bg shade (@theme_bg_color, 1.025);
+@define-color sidebar_bg shade (@theme_bg_color, 1.08);
 @define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
 
 @define-color sidebar_scrollbar_trough shade(@sidebar_bg, 0.8);
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css
index 8840df4b..81074f8c 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css
@@ -25,8 +25,8 @@
 
 headerbar > box > separator.vertical,
 .header-bar > GtkBox > .separator.vertical {
-	-GtkWidget-wide-separators: 1; /* deprecated, but ignored */
-	-GtkWidget-separator-width: 2px; /* deprecated, but ignored */
+/*	-GtkWidget-wide-separators: 1;  deprecated */
+/*	-GtkWidget-separator-width: 2px;  deprecated */
 	background: transparent;
 	border-width: 0 1px 0 1px;
 	border-style: solid;
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
index e832ba40..88b50edd 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
@@ -3,14 +3,12 @@ button,
 toolbar button.raised,
 toolbar .raised button,
 toolbar combobox button,
-spinbutton.vertical button,
 toolbar.primary-toolbar .linked button,
 toolbar.primary-toolbar .raised button,
 .button,
 .toolbar .button.raised,
 .toolbar .raised .button,
-.toolbar GtkComboBox .button,
-.spinbutton.vertical .button {
+.toolbar GtkComboBox .button {
 	background-image: linear-gradient(to bottom, 
 		@button_gradient_color_a,
 		@button_gradient_color_b);
@@ -21,10 +19,6 @@ toolbar.primary-toolbar .raised button,
 button:checked,
 button:active,
 button:active:hover,
-spinbutton.vertical button:checked,
-spinbutton.vertical button:checked:hover,
-spinbutton.vertical button:active,
-spinbutton.vertical button:active:hover,
 toolbar button:active,
 toolbar button:active:hover,
 toolbar button.raised:active,
@@ -40,10 +34,6 @@ toolbar .raised button:checked:hover,
 .button:checked,
 .button:active,
 .button:active:hover,
-.spinbutton.vertical .button:checked,
-.spinbutton.vertical .button:checked:hover,
-.spinbutton.vertical .button:active,
-.spinbutton.vertical .button:active:hover,
 .toolbar .button:active,
 .toolbar .button:active:hover,
 .toolbar .button.raised:active,
@@ -76,7 +66,6 @@ row trough,
 
 button:checked:hover,
 button:active:hover,
-spinbutton.vertical button:active:hover,
 toolbar button:active:hover,
 toolbar button.raised:active:hover,
 toolbar .raised button:active:hover,
@@ -86,7 +75,6 @@ toolbar .raised button:checked:hover,
 row trough:hover,
 .button:checked:hover,
 .button:active:hover,
-.spinbutton.vertical .button:active:hover,
 .toolbar .button:active:hover,
 .toolbar .button.raised:active:hover,
 .toolbar .raised .button:active:hover,
@@ -135,13 +123,11 @@ toolbar button:hover,
 toolbar button.raised:hover,
 toolbar .raised button:hover,
 toolbar combobox button:hover,
-spinbutton.vertical button:hover,
 .button:hover,
 .toolbar .button:hover,
 .toolbar .button.raised:hover,
 .toolbar .raised .button:hover,
-.toolbar GtkComboBox .button:hover,
-.spinbutton.vertical .button:hover {
+.toolbar GtkComboBox .button:hover {
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
 		@button_hover_gradient_color_a,
@@ -159,12 +145,10 @@ toolbar.primary-toolbar button:hover,
 
 /* Insensitive button background */
 button:disabled,
-spinbutton.vertical button:disabled,
 toolbar combobox button:disabled,
 toolbar button.raised:disabled,
 toolbar .raised button:disabled,
 .button:disabled,
-.spinbutton.vertical button:disabled,
 .toolbar GtkComboBox button:disabled,
 .toolbar .button.raised:disabled,
 .toolbar .raised .button:disabled {
@@ -216,20 +200,12 @@ GtkComboBox.combobox-entry .button:hover,
 toolbar.primary-toolbar combobox entry button:active,
 toolbar.primary-toolbar combobox entry button:checked,
 combobox entry button:active,
-spinbutton button:active,
-spinbutton button:active:hover,
 combobox entry button:checked,
-spinbutton button:checked,
-spinbutton button:checked:hover,
 .primary-toolbar GtkComboBox.combobox-entry .button:active,
 .primary-toolbar GtkComboBox.combobox-entry .button:checked,
 /* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/
 GtkComboBox.combobox-entry .button:active,
-.spinbutton .button:active,
-.spinbutton .button:active:hover,
-GtkComboBox.combobox-entry .button:checked,
-.spinbutton .button:checked,
-.spinbutton .button:checked:hover {
+GtkComboBox.combobox-entry .button:checked {
 	background-image: linear-gradient(to bottom,
 		shade(@entry_background_a, 0.9),
 		@entry_background_b);
@@ -255,7 +231,7 @@ GtkStack column-header .button {
                                       shade(@theme_bg_color, 1.1));
 }
 
-treeview header button,
+treeview header button:hover,
 column-header.button:hover,
 column-header .button:hover {
 	background-image: linear-gradient(to bottom,
@@ -359,11 +335,11 @@ scale.vertical progressbar,
 
 /* Progressbar backgrounds */
 
-progressbar,
-row progressbar,
-row progressbar:hover,
-row progressbar:selected,
-row progressbar:selected:focus,
+progressbar progress,
+row progressbar progress,
+row:hover progressbar progress,
+row:selected progressbar progress,
+row:selected:focus progressbar progress,
 .progressbar,
 .progressbar row,
 .progressbar row:hover,
@@ -385,7 +361,7 @@ row progressbar:selected:focus,
 	box-shadow: inset 1px 1px alpha(white, 0.2), inset -1px -1px alpha(white, 0.1);
 }
 
-progressbar.vertical,
+progressbar.vertical progress,
 .progressbar.vertical {
 	background-image: linear-gradient(to right top,
 		alpha (@progressbar_pattern, 0.25),
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
index aa45d706..9d9960d3 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
@@ -6,23 +6,15 @@ button:active,
 button:checked,
 combobox entry entry,
 combobox entry button,
-spinbutton.vertical button:active,
-spinbutton.vertical button:checked,
 toolbar.inline-toolbar.vertical button:active,
 toolbar.inline-toolbar.vertical button:checked,
-stack box.linked.verticalspinbutton.horizontal.entry.spinbutton.vertical button:active,
-stack box.linked.verticalspinbutton.horizontal.entry.spinbutton.vertical button:checked,
 .entry,
 .button:active,
 .button:checked,
 GtkComboBox.combobox-entry .entry,
 GtkComboBox.combobox-entry .button,
-.spinbutton.vertical .button:active,
-.spinbutton.vertical .button:checked,
 .inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:active,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:checked {
+.inline-toolbar.toolbar.vertical .button:checked {
 	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -39,20 +31,16 @@ trough highlight,
 
 entry:disabled,
 button:active:disabled,
-spinbutton.vertical button:disabled,
 combobox entry entry:disabled,
 combobox entry button:disabled,
 toolbar.inline-toolbar.vertical button:disabled,
 toolbar.inline-toolbar.vertical button.default:disabled,
-stack box.linked.vertical spinbutton.horizontal.entry.spinbutton.vertical button:disabled,
 .entry:disabled,
 .button:active:disabled,
-.spinbutton.vertical .button:disabled,
 GtkComboBox.combobox-entry .entry:disabled,
 GtkComboBox.combobox-entry .button:disabled,
 .inline-toolbar.toolbar.vertical .button:disabled,
-.inline-toolbar.toolbar.vertical .button.default:disabled,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:disabled {
+.inline-toolbar.toolbar.vertical .button.default:disabled {
 	border-image: url("borders/button-active-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -62,20 +50,16 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu
 
 button:disabled,
 button.default:disabled,
-spinbutton.vertical button:disabled,
 toolbar.inline-toolbar button:disabled,
 toolbar.inline-toolbar button.default:disabled,
 toolbar.inline-toolbar.vertical button:disabled,
 toolbar.inline-toolbar.vertical button.default:disabled,
-stack box.linked.vertical spinbutton.horizontal.entry.spinbutton.vertical button:disabled,
 .button:disabled,
 .button.default:disabled,
-.spinbutton.vertical .button:disabled,
 .inline-toolbar.toolbar .button:disabled,
 .inline-toolbar.toolbar .button.default:disabled,
 .inline-toolbar.toolbar.vertical .button:disabled,
-.inline-toolbar.toolbar.vertical .button.default:disabled,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:disabled {
+.inline-toolbar.toolbar.vertical .button.default:disabled {
 	border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -99,32 +83,20 @@ button:checked:focus,
 button.default:active,
 button.default:checked,
 combobox entry button:focus,
-spinbutton.vertical button:active:focus,
-spinbutton.vertical button:checked:focus,
 toolbar.inline-toolbar.vertical button:active:focus,
 toolbar.inline-toolbar.vertical button:checked:focus
 toolbar.inline-toolbar.vertical button.default:active,
 toolbar.inline-toolbar.vertical button.default:checked,
-stack box.linked.vertical spinbutton.horizontal.entry.spinbutton button:active,
-stack box.linked.vertical spinbutton.horizontal.entry.spinbutton button:checked,
-stack box.linked.vertical spinbutton.horizontal.entry.spinbutton button:active:focus,
-stack box.linked.vertical spinbutton.horizontal.entry.spinbutton button:checked:focus,
 .entry:focus,
 .button:active:focus,
 .button:checked:focus,
 .button.default:active,
 .button.default:checked,
 GtkComboBox.combobox-entry .button:focus,
-.spinbutton.vertical .button:active:focus,
-.spinbutton.vertical .button:checked:focus,
 .inline-toolbar.toolbar.vertical .button:active:focus,
 .inline-toolbar.toolbar.vertical .button:checked:focus
 .inline-toolbar.toolbar.vertical .button.default:active,
-.inline-toolbar.toolbar.vertical .button.default:checked,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active:focus,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:focus {
+.inline-toolbar.toolbar.vertical .button.default:checked {
 	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -149,8 +121,7 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:chec
 
 button,
 .button
-/*.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button*/ {
+/*.inline-toolbar.toolbar.vertical .button*/ {
 	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -158,12 +129,8 @@ button,
 	border-color: transparent;
 }
 
-spinbutton.vertical button,
 toolbar.inline-toolbar.vertical button,
-stack box.linked.vertical spinbutton.horizontal.entry.spinbutton.vertical .button,
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button {
+.inline-toolbar.toolbar.vertical .button {
 	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -398,13 +365,15 @@ column-header .button.dnd {
 
 /* ie. yumex-dnf */
 stack treeview header button,
+stack treeview header button:focus,
 GtkStack column-header .button {
     border-width: 0px 1px 1px 0px;
-	border-color: transparent;
+    border-color: transparent;
     border-style: solid;
-	border-image: linear-gradient(to bottom,
-		alpha(@borders, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
+    border-radius: 0px;
+    border-image: linear-gradient(to bottom,
+                                  alpha(@borders, 0.0),
+                                  shade(@borders, 1.0)) 0 1 1 0;
 }
 
 treeview header button:disabled,
@@ -478,9 +447,50 @@ button.destructive-action:active,
 .destructive-action.button,
 .destructive-action.button:checked,
 .destructive-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
+    border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+    border-radius: 3px;
+    border-width: 2px;
+    border-style: solid;
+    border-color: transparent;
+}
+
+button.image-button.radio:dir(ltr) {
+    border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+    border-radius: 4px;
+    border-width: 2px;
+    border-style: solid;
+    border-color: transparent;
+    border-radius: 3px;
 }
+
+button.image-button.radio.default:dir(ltr),
+button.image-button.radio:dir(ltr):focus {
+    border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+    border-radius: 4px;
+    border-width: 2px;
+    border-style: solid;
+    border-color: transparent;
+}
+
+button.image-button.radio:dir(ltr):checked {
+    border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+    border-radius: 4px;
+    border-width: 2px;
+    border-style: solid;
+    border-color: transparent;
+}
+
+button.image-button.radio:dir(ltr):hover,
+button.image-button.radio:dir(ltr):checked:focus,
+button.image-button.radio:dir(ltr):checked:hover,
+button.image-button.radio:dir(ltr):checked:focus:hover,
+button.image-button.radio:dir(ltr):focus:hover:active,
+button.image-button.radio:dir(ltr):checked:focus:hover:active,
+button.image-button.radio.default:dir(ltr):checked {
+    border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+    border-radius: 4px;
+    border-width: 2px;
+    border-style: solid;
+    border-color: transparent;
+}
+
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index 7f3e6fbc..3040df8b 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -2,19 +2,19 @@
 /*	engine: none; */
 	padding: 0;
 	background-clip: padding-box;
-	-GtkButton-child-displacement-x: 1;
-	-GtkButton-child-displacement-y: 1;
-	-GtkButtonBox-child-min-height: 26;
-	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckMenuItem-indicator-size: 12;
+/*	-GtkButton-child-displacement-x: 1; deprecated */
+/*	-GtkButton-child-displacement-y: 1; deprecated */
+/*	-GtkButtonBox-child-min-height: 26; deprecated */
+/*	-GtkCheckButton-indicator-size: 16; deprecated */
+/*	-GtkCheckMenuItem-indicator-size: 12; deprecated */
 	-GtkDialog-button-spacing: 4;
 	-GtkDialog-action-area-border: 10; /* buttons mate-appearance-properties */
-	-GtkExpander-expander-size: 11;
+/*	-GtkExpander-expander-size: 11; deprecated */
 /*	-GtkMenu-horizontal-padding: 0; */
 /*	-GtkMenu-vertical-padding: 0; */
-	-GtkPaned-handle-size: 1;
+/*	-GtkPaned-handle-size: 1; deprecated */
 	-GtkScrolledWindow-scrollbar-spacing: 0;
-	-GtkScrolledWindow-scrollbars-within-bevel: 1;
+/*	-GtkScrolledWindow-scrollbars-within-bevel: 1; deprecated */
 	-GtkTextView-error-underline-color: @error_color;
 	-GtkToolButton-icon-spacing: 4;
 	-GtkToolItemGroup-expander-size: 11;
@@ -22,7 +22,7 @@
 	-GtkTreeView-horizontal-separator: 4;
 /*	-GtkWidget-focus-padding: 2;  deprecated */
 /*	-GtkWidget-focus-line-width: 0; */
-	-GtkStatusbar-shadow-type: none;
+/*	-GtkStatusbar-shadow-type: none;  deprecated */
 	-GtkIMHtml-hyperlink-color: @link_color;
 	-GtkHTML-link-color: @link_color;
 	-WnckTasklist-fade-overlay-rect: 0;
@@ -68,11 +68,11 @@
 
 /* Apply effects to insensitive and prelit images */
 *:disabled {
-	-gtk-image-effect: dim;
+	-gtk-icon-effect: dim;
 }
 
 *:hover {
-	-gtk-image-effect: highlight;
+	-gtk-icon-effect: highlight;
 }
 
 .gtkstyle-fallback {
@@ -136,22 +136,28 @@ GtkTextView {
 /************
  * Tooltips *
  ************/
-.tooltip,
-.tooltip.background {
+tooltip {
 	padding: 4px;
 	border-style: solid;
 	border-width: 1px;
 	border-color: shade(@theme_tooltip_bg_color, 0.50);
-	border-radius: 0px;
+	border-radius: 2px;
+}
 
+tooltip.background {
 	background-color: @theme_tooltip_bg_color;
 	color: @theme_tooltip_fg_color;
-
 	text-shadow: none;
 }
 
-.tooltip * {
+tooltip decoration {
+    background-color: transparent;
+}
+
+tooltip * {
 	background-color: transparent;
+	color: @theme_tooltip_fg_color;
+	padding: 4px;
 }
 
 /*********************
@@ -165,28 +171,22 @@ GtkTextView {
 
 spinner,
 .spinner {
-	background-image: none;
-	background-color: blue;
+	background: none;
 	opacity: 0;
 	-gtk-icon-source: -gtk-icontheme("process-working-symbolic");
 }
 
-spinner:active,
-.spinner:active {
+spinner:checked,
+.spinner:checked {
 	opacity: 1;
 	animation: spin 1s linear infinite;
 }
 
-spinner:active:disabled,
-.spinner:active:disabled {
+spinner:checked:disabled,
+.spinner:checked:disabled {
 	opacity: 0.5;
 }
 
-button spinner:active,
-.button .spinner:active {
-	color: @theme_fg_color;
-}
-
 /*****************
  * Miscellaneous *
  *****************/
@@ -202,18 +202,21 @@ rubberband {
 	border-radius: 0px;
 }
 
-GtkStatusbar label,
+statusbar label,
+statusbar frame,
 GtkStatusbar .label,
 GtkStatusbar .frame.flat {
 	color: @theme_fg_color;
-	-GtkStatusbar-shadow-type: none;
+/*	-GtkStatusbar-shadow-type: none;  deprecated */
 }
 
+statusbar frame,
 GtkStatusbar .frame.flat {
 	padding: 1px;
-	border-width: 0;
+    border-style: none;
 }
 
+statusbar frame button.flat,
 GtkStatusbar .frame.flat .button.flat {
     padding: 0px;
 }
@@ -225,7 +228,8 @@ GtkStatusbar .frame.flat .button.flat {
 	border-radius: 0;
 }
 
-treeview view separator,
+treeview.view separator,
+treeview.view .separator, /* why ?*/
 treeview separator,
 separator,
 separator:hover,
@@ -234,7 +238,12 @@ GtkTreeView.separator,
 .separator,
 .separator:hover {
 	color: @view_separators;
-	background-color: transparent;
+	background-color: @view_separators;
+}
+
+/*Keep treeviews from jumping, separators drawn at 0 by default until hovered*/
+treeview.view.separator {
+    min-height: 2px;
 }
 
 .toolbar separator,
@@ -243,34 +252,12 @@ GtkTreeView.separator,
 	color: transparent;
 }
 
-.pane-separator {
-	-GtkPaned-handle-size: 1;
-	border-width: 0 1px 1px 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-color: @sidebar_bg;
-	background-image: url("assets/null.png");
-	color: @borders;
-}
-
-.pane-separator:hover,
-.pane-separator:selected {
-	color: @theme_text_color;
-}
-
-notebook .pane-separator,
-notebook .pane-separator:hover,
-.notebook .pane-separator,
-.notebook .pane-separator:hover {
-	background-color: @theme_base_color;
-}
-
 /************************
  * overshoot/undershoot *
  ************************/
 
 /* displays at end of mouse scrolling */
-.overshoot.top {
+overshoot.top {
     background-image: -gtk-gradient(radial,
                                     center top, 0,
                                     center top, 0.5,
@@ -289,7 +276,7 @@ notebook .pane-separator:hover,
     box-shadow: none;
 }
 
-.overshoot.top:backdrop {
+overshoot.top:backdrop {
     background-image: -gtk-gradient(radial,
                                     center top, 0,
                                     center top, 0.5,
@@ -303,7 +290,7 @@ notebook .pane-separator:hover,
     box-shadow: none;
 }
 
-.overshoot.bottom {
+overshoot.bottom {
     background-image: -gtk-gradient(radial,
                                     center bottom, 0,
                                     center bottom, 0.5,
@@ -322,7 +309,7 @@ notebook .pane-separator:hover,
     box-shadow: none;
 }
 
-.overshoot.bottom:backdrop {
+overshoot.bottom:backdrop {
     background-image: -gtk-gradient(radial,
                                     center bottom, 0,
                                     center bottom, 0.5,
@@ -336,7 +323,7 @@ notebook .pane-separator:hover,
     box-shadow: none;
 }
 
-.overshoot.left {
+overshoot.left {
     background-image: -gtk-gradient(radial,
                                     left center, 0,
                                     left center, 0.5,
@@ -355,7 +342,7 @@ notebook .pane-separator:hover,
     box-shadow: none;
 }
 
-.overshoot.left:backdrop {
+overshoot.left:backdrop {
     background-image: -gtk-gradient(radial,
                                     left center, 0,
                                     left center, 0.5,
@@ -369,7 +356,7 @@ notebook .pane-separator:hover,
     box-shadow: none;
 }
 
-.overshoot.right {
+overshoot.right {
     background-image: -gtk-gradient(radial,
                                     right center, 0,
                                     right center, 0.5,
@@ -388,7 +375,7 @@ notebook .pane-separator:hover,
     box-shadow: none;
 }
 
-.overshoot.right:backdrop {
+overshoot.right:backdrop {
     background-image: -gtk-gradient(radial,
                                     right center, 0,
                                     right center, 0.5,
@@ -403,7 +390,7 @@ notebook .pane-separator:hover,
 }
 
 /* result is disable undershoot */
-.undershoot.top {
+undershoot.top {
     background-color: transparent;
     background-image: linear-gradient(to left,
                                       rgba(255, 255, 255, 0.2) 50%,
@@ -414,7 +401,7 @@ notebook .pane-separator:hover,
     background-position: center top;
 }
 
-.undershoot.bottom {
+undershoot.bottom {
     background-color: transparent;
     background-image: linear-gradient(to left,
                                       rgba(255, 255, 255, 0.2) 50%,
@@ -425,7 +412,7 @@ notebook .pane-separator:hover,
     background-position: center bottom;
 }
 
-.undershoot.left {
+undershoot.left {
     background-color: transparent;
     background-image: linear-gradient(to top,
                                       rgba(255, 255, 255, 0.2) 50%,
@@ -436,7 +423,7 @@ notebook .pane-separator:hover,
     background-position: left center;
 }
 
-.undershoot.right {
+undershoot.right {
     background-color: transparent;
     background-image: linear-gradient(to top,
                                       rgba(255, 255, 255, 0.2) 50%,
@@ -454,7 +441,7 @@ notebook .pane-separator:hover,
 entry,
 .entry {
 	border-style: solid;
-	padding: 5px 4px 6px; /*4px;*/
+	padding: 4px; /*4px;*/
 
 	/* border-image defined in the -assets variants */
 
@@ -550,215 +537,154 @@ entry:active,
 	/* background-image in assets */
 }
 
-/*******************
- * Symbolic images *
- *******************/
-image,
-.image {
-	color: @internal_element_color;
-}
-
-image:hover,
-.image:hover {
-	color: @internal_element_prelight;
-}
+/*****************
+ * GtkSpinButton *
+ *****************/
 
-image:selected,
-image:selected:hover,
-.image:selected,
-.image:selected:hover {
-	color: @theme_selected_fg_color;
+spinbutton,
+spinbutton:focus {
+    background-image: linear-gradient(to bottom,
+                                      @entry_background_a,
+                                      @entry_background_b);
+    border-color: @borders;
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 3px;
+    padding: 0px;
 }
 
-view image,
-view image:hover,
-.view.image,
-.view.image:hover {
-	color: @view_symbolic_color;
+spinbutton:disabled {
+    background-color: @insensitive_bg_color;
+    background-image: none;
+    border-color: @borders;
 }
 
-view image:selected,
-view image:selected:hover,
-.view.image:selected,
-.view.image:selected:hover {
-	color: @theme_selected_fg_color;
+spinbutton button,
+spinbutton button:focus,
+spinbutton button:active,
+spinbutton button:focus:active,
+spinbutton button:disabled {
+    border-style: none;
+    border-image: none;
+    padding: 5px;
+    border-radius: 0px;
+    box-shadow: inset 1px 0 @inset_dark_color;
 }
 
-/*****************
- * GtkSpinButton *
- *****************/
-
 spinbutton button,
-.spinbutton .button {
-	background-color: transparent;
-	background-image: none;
-	color: @internal_element_color;
-	padding: 2px 6px;
-	border-width: 0;
-	border-radius: 0;
-	border-style: none;
-	border-image: none;
-	box-shadow: inset 1px 0 @inset_dark_color;
+spinbutton button:focus {
+    background-image: linear-gradient(to bottom,
+                                      @button_gradient_color_a,
+                                      @button_gradient_color_b);
+    background-color: transparent;
+    color: @internal_element_color;
 }
 
-spinbutton button:disabled,
-.spinbutton .button:disabled {
-	color: @internal_element_insensitive;
+spinbutton button:hover {
+    background-color: transparent;
+    background-image: linear-gradient(to bottom,
+                                      @button_hover_gradient_color_a,
+                                      @button_hover_gradient_color_b);
+    color: @internal_element_prelight;
 }
 
 spinbutton button:active,
-spinbutton button:hover,
-.spinbutton .button:active,
-.spinbutton .button:hover {
-	color: @internal_element_prelight;
+spinbutton button:active:hover {
+    background-image: linear-gradient(to bottom,
+                                      @button_active_gradient_color_a,
+                                      @button_active_gradient_color_b);
+    background-color: transparent;
+    color: @internal_element_prelight;
 }
 
-spinbutton button:first-child,
-.spinbutton .button:first-child {
-	border-radius: 3px 0 0 3px;
-	box-shadow: none;
+spinbutton button:disabled {
+    color: @internal_element_insensitive;
 }
 
-spinbutton button:last-child,
-.spinbutton .button:last-child {
-	border-radius: 0 3px 3px 0;
+spinbutton button:first-child {
+    border-radius: 0px;
 }
 
-spinbutton button:dir(rtl),
-.spinbutton .button:dir(rtl) {
-	box-shadow: inset -1px 0 @inset_dark_color;
+spinbutton button:last-child {
+    border-radius: 0 3px 3px 0;
 }
 
-/* Add back the glowy effect from the entry covered by the pushed button background*/
-spinbutton button:active,
-spinbutton button:active:focus,
-.spinbutton .button:active,
-.spinbutton .button:active:focus {
-	padding: 2px 4px;
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
+spinbutton button:dir(rtl) {
+    box-shadow: inset -1px 0 @inset_dark_color;
 }
 
-spinbutton button:first-child:active,
-spinbutton button:first-child:active:focus,
-.spinbutton .button:first-child:active,
-.spinbutton .button:first-child:active:focus {
-	padding: 2px 4px;
-	box-shadow: inset 1px 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
+spinbutton.horizontal entry,
+spinbutton.horizontal entry:focus,
+stack box.vertical.linked spinbutton.horizontal entry,
+stack box.vertical.linked spinbutton.horizontal entry:focus {
+    padding: 0px 10px 0px 2px;
+    border-image:none;
+    border-style: none;
+    box-shadow: inset 1px 0 @inset_dark_color;
 }
 
-spinbutton button:last-child:active,
-spinbutton button:last-child:active:focus,
-.spinbutton .button:last-child:active,
-.spinbutton .button:last-child:active:focus {
-	padding: 2px 4px;
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
+spinbutton.horizontal button,
+spinbutton.horizontal button:focus,
+stack box.vertical.linked spinbutton.horizontal button,
+stack box.vertical.linked spinbutton.horizontal button:focus {
+    padding: 0px 6px 0px 6px;
 }
 
-spinbutton.vertical button,
-.spinbutton.vertical .button {
-	padding: 4px;
-	-gtk-icon-shadow: 0 1px @button_text_shadow;
+spinbutton.vertical entry,
+spinbutton.vertical entry:focus {
+    padding: 6px 4px 6px 2px;
+    border-image:none;
+    border-style: solid;
+    border-width: 1px 0px 1px 0px;
+    border-color: @borders;
+    border-radius: 0px;
 }
 
 spinbutton.vertical button,
-spinbutton.vertical button:hover,
-.spinbutton.vertical .button,
-.spinbutton.vertical .button:hover {
-	padding: 4px;
-	color: @theme_fg_color;
+spinbutton.vertical button:focus {
+    border-color: @borders;
+    border-width: 0px;
+    border-style: solid;
+    padding: 5px;
+    color: @theme_fg_color;
 }
 
-spinbutton.vertical button:disabled,
-.spinbutton.vertical .button:disabled {
-	color: @insensitive_fg_color;
+spinbutton.vertical button:disabled {
+    color: @insensitive_fg_color;
+    -gtk-icon-shadow: none;
 }
 
 spinbutton.vertical button:active,
-.spinbutton.vertical .button:active {
-	color: @button_active_text;
-	-gtk-icon-shadow: 0 1px @button_active_text_shadow;
-}
-
-/* :disabled:disabled to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-spinbutton.vertical button:disabled:disabled,
-.spinbutton.vertical .button:disabled:disabled {
-	-gtk-icon-shadow: none;
+spinbutton.vertical button:hover:active {
+    color: @button_active_text;
+    -gtk-icon-shadow: 0 1px @button_active_text_shadow;
 }
 
 spinbutton.vertical button,
-spinbutton.vertical button:active:active,
-.spinbutton.vertical .button,
-/* :active:active to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:active:active {
-	box-shadow: none;
-}
-
-spinbutton.vertical button:first-child,
-spinbutton.vertical button:active:first-child,
-.spinbutton.vertical .button:first-child,
-.spinbutton.vertical .button:active:first-child {
-	border-image-width: 3px 3px 0 3px;
-	border-width: 2px 1px 0 1px;
-	border-bottom-left-radius: 0; 
-	border-bottom-right-radius: 0;
-	padding: 4px;
+spinbutton.vertical button:active {
+    border-radius: 3px 3px 0 0;
 }
 
 spinbutton.vertical button:last-child,
-spinbutton.vertical button:active:last-child,
-.spinbutton.vertical .button:last-child,
-.spinbutton.vertical .button:active:last-child {
-	border-image-width: 0 3px 4px 3px;
-	border-width: 0 1px 2px 1px;
-	border-top-left-radius: 0; 
-	border-top-right-radius: 0;
-	padding: 4px;
+spinbutton.vertical button:active:last-child {
+    border-radius: 0 0 3px 3px;
 }
 
-spinbutton.vertical entry,
-.spinbutton.vertical.entry {
-	border-image: none;
-	border-color: alpha(@borders, 0.1);
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-radius: 0;
-	box-shadow: inset 1px 0 0 0 @borders, 
-		inset -1px 0 0 0 @borders,
-		inset 0 1px 0 0 @borders,
-		inset 0 -1px 0 0 @borders;
-
-	/* I'm using box-shadow as borders, so I need to compensate
-	   with padding. Those two values need to be entry padding +1 */
-	padding-top: 5px;
-	padding-bottom: 5px;
-}
-
-spinbutton.vertical entry:disabled,
-.spinbutton.vertical.entry:disabled {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 0 1px alpha(@borders, 0.4),
-		inset 0 -1px alpha(@borders, 0.4);
+stack box.vertical.linked spinbutton.horizontal {
+    border-radius: 0px;
 }
 
-spinbutton.vertical 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,
-		inset 0 1px 0 0 @theme_selected_bg_color,
-		inset 0 -1px 0 0 @theme_selected_bg_color;
+stack box.vertical.linked spinbutton.horizontal button {
+    border-radius: 0px;
+    border-style: none;
+    box-shadow: inset 1px 0 @inset_dark_color;
 }
 
 /*****************
  * Color Chooser *
  *****************/
+colorswatch,
+colorswatch:selected,
 GtkColorSwatch,
 GtkColorSwatch:selected {
 	border-width: 1px;
@@ -772,57 +698,57 @@ GtkColorSwatch:selected {
 	background-clip: border-box;
 }
 
-GtkColorSwatch:hover,
-GtkColorSwatch:selected:hover {
+colorswatch:hover,
+colorswatch:selected:hover {
 	border-color: alpha(black, 0.45);
 }
 
-GtkColorSwatch.color-dark:hover {
+colorswatch.color-dark:hover {
 	background-image: linear-gradient(to bottom,
 		alpha(white, 0) 40%,
 		alpha(white, 0.3)
 		);
 }
 
-GtkColorSwatch.color-light:hover {
+colorswatch.color-light:hover {
 	background-image: linear-gradient(to top,
 		alpha(black, 0) 40%,
 		alpha(black, 0.1)
 		);
 }
 
-GtkColorSwatch.color-light:selected:hover,
-GtkColorSwatch.color-dark:selected:hover {
+colorswatch.color-light:selected:hover,
+colorswatch.color-dark:selected:hover {
 	background-image: none;
 }
 
-GtkColorSwatch.left,
-GtkColorSwatch:first-child {
+colorswatch.left,
+colorswatch:first-child {
 	border-top-left-radius: 6px;
 	border-bottom-left-radius: 6px;
 }
 
-GtkColorSwatch.right,
-GtkColorSwatch:last-child {
+colorswatch.right,
+colorswatch:last-child {
 	border-top-right-radius: 6px;
 	border-bottom-right-radius: 6px;
 }
 
-GtkColorSwatch:only-child {
+colorswatch:only-child {
 	border-radius: 6px;
 }
 
-GtkColorSwatch.top {
+colorswatch.top {
 	border-top-left-radius: 6px;
 	border-top-right-radius: 6px;
 }
 
-GtkColorSwatch.bottom {
+colorswatch.bottom {
 	border-bottom-left-radius: 6px;
 	border-bottom-right-radius: 6px;
 }
 
-GtkColorChooserWidget #add-color-button {
+colorchooser #add-color-button {
 	background-clip: padding-box;
 	border-color: mix(@borders, @theme_bg_color, 0.3);
 	background-color: mix(@borders, @theme_bg_color, 0.3);
@@ -830,7 +756,7 @@ GtkColorChooserWidget #add-color-button {
 	box-shadow: none;
 }
 
-GtkColorChooserWidget #add-color-button:hover {
+colorchooser #add-color-button:hover {
 	border-color: @borders;
 	background-color: @borders;
 	color: @theme_base_color;
@@ -855,12 +781,13 @@ GtkColorChooserWidget #add-color-button:hover {
 	color: #cccccc;
 }
 
-GtkColorEditor GtkColorSwatch {
+box.horizontal colorswatch,
+GtkColorEditor colorswatch {
 	border-radius: 6px;
 }
 
-GtkColorEditor GtkColorSwatch.color-dark:hover,
-GtkColorEditor GtkColorSwatch.color-light:hover {
+GtkColorEditor colorswatch.color-dark:hover,
+GtkColorEditor colorswatch.color-light:hover {
 	background-image: none;
 	border-color: alpha(black, 0.3);
 }
@@ -884,6 +811,14 @@ GtkProgressBar {
 	font-size: smaller;
 }
 
+progressbar.horizontal {
+    min-height: 16px;
+}
+
+progressbar.vertical {
+    min-width: 16px;
+}
+
 /* progress component */
 progressbar.horizontal trough,
 progressbar.horizontal progress {
@@ -918,25 +853,22 @@ progressbar progress.bottom {
 }
 
 progressbar progress,
-progressbar row,
-progressbar row:hover,
-progressbar row:selected,
-progressbar row:selected:focus,
+row progressbar,
+row:hover progressbar,
+row:selected progressbar,
+row:selected:focus progressbar,
 .progressbar,
 .progressbar row,
 .progressbar row:hover,
 .progressbar row:selected,
 .progressbar row:selected:focus {
-/*	border-radius: 16px; */
 	border-width: 1px;
-/*	min-height: 16px;
-	min-width: 16px; */
 	border-style: solid;
 	border-color: @progressbar_border;
 }
 
-progressbar row:selected,
-progressbar row:selected:focus,
+row:selected progressbar,
+row:selected:focus progressbar,
 .progressbar row:selected,
 .progressbar row:selected:focus {
 	border-color: shade(@progressbar_border, 0.85);
@@ -962,14 +894,16 @@ row trough,
 
 levelbar,
 GtkLevelBar {
-	-GtkLevelBar-min-block-width: 34;
-	-GtkLevelBar-min-block-height: 3;
+/*   -GtkLevelBar-min-block-width: 34;
+    -GtkLevelBar-min-block-height: 3; deprecated */
+    min-width: 34px;
+    min-height: 3px;
 }
 
 levelbar.vertical,
 GtkLevelBar.vertical {
-	-GtkLevelBar-min-block-width: 3;
-	-GtkLevelBar-min-block-height: 34;
+    min-width: 3px;
+    min-height: 34px;
 }
 
 levelbar trough,
@@ -1083,7 +1017,7 @@ scale.vertical trough,
 }
 
 scale trough,
-scale trough.highlight,
+scale trough highlight,
 .scale.trough,
 .scale.trough.highlight {
 	border-color: alpha(@theme_base_color, 0.0);
@@ -1094,7 +1028,7 @@ scale trough.highlight,
 }
 
 scale.vertical trough,
-scale.vertical trough.highlight,
+scale.vertical trough highlight,
 .scale.trough.vertical,
 .scale.trough.highlight.vertical {
 	border-color: alpha(@theme_base_color, 0.0);
@@ -1111,29 +1045,35 @@ scale.vertical trough,
 	border-color: @borders;
 }
 
-scale trough.highlight,
-scale.vertical trough.highlight,
+scale trough highlight,
+scale.vertical trough highlight,
 .scale.trough.highlight,
 .scale.trough.highlight.vertical {
 	border-color: @scale_highlight_border;
 }
 
 scale trough:disabled,
-scale trough.highlight:disabled,
 scale.vertical trough:disabled,
-scale.vertical trough.highlight:disabled,
 .scale.trough:disabled,
+.scale.trough.vertical:disabled {
+	background-color: shade(@insensitive_bg_color, 0.96);
+	border-color: shade(@insensitive_scale_borders, 1.0);
+	box-shadow: none;
+	background-image: none;
+}
+
+scale trough highlight:disabled,
+scale.vertical trough highlight:disabled,
 .scale.trough.highlight:disabled,
-.scale.trough.vertical:disabled,
 .scale.trough.highlight.vertical:disabled {
-	background-color: shade(@insensitive_bg_color, 0.96);
+	background-color: shade(@scale_highlight_bg, 1.16);
 	border-color: shade(@insensitive_scale_borders, 1.0);
 	box-shadow: none;
 	background-image: none;
 }
 
-scale trough.highlight,
-scale.vertical trough.highlight,
+scale trough highlight,
+scale.vertical trough highlight,
 .scale.trough.highlight,
 .scale.trough.vertical.highlight {
 	background-image: none;
@@ -1163,13 +1103,13 @@ scale.vertical trough,
 		inset -1px 0 alpha(@theme_base_color, 0.4);
 }
 
-scale trough.highlight,
+scale trough highlight,
 .scale.trough.highlight {
 	box-shadow: inset 0 1px alpha(@theme_base_color, 0.2),
 		inset 0 -1px shade(@theme_selected_bg_color, 0.7);
 }
 
-scale.vertical trough.highlight,
+scale.vertical trough highlight,
 .scale.trough.vertical.highlight {
 	box-shadow: inset 1px 0 alpha(@theme_base_color, 0.2),
 		inset -1px 0 shade(@theme_selected_bg_color, 0.7);
@@ -1198,7 +1138,7 @@ frame action-bar,
 	border-width: 1px 0 0; 
 }
 
-scrolledwindow,
+scrolledwindow.frame,
 GtkScrolledWindow.frame {
     -gtk-icon-style: regular;
 	border-style: solid;
@@ -1209,12 +1149,17 @@ GtkScrolledWindow.frame {
 }
 
 /* avoid double borders when a viewport is 
- * packed into a GtkScrolledWindow */
-scrolledwindow viewport,
+ * packed into a GtkScrolledWindow, + avoid double borders in general */
+scrolledwindow viewport.frame,
+frame box stack scrolledwindow,
 GtkScrolledWindow viewport.frame {
 	border-style: none;
 }
 
+frame box.vertical scrolledwindow.frame {
+    border-width: 1px 0px 1px 0px;
+}
+
 /***********
  * Buttons *
  ***********/
@@ -1245,15 +1190,15 @@ toolbar.primary-toolbar button.image-button,
 button,
 .button {
 	transition: all 400ms ease-out;
-	-GtkButton-image-spacing: 4;
-	-GtkButton-interior-focus: true;
-	-GtkButton-default-border: 0;
-	-GtkButton-inner-border: 3;
-	-GtkArrow-arrow-scaling: 0.5; /* deprecated, but ignored */
-
+    min-height: 16px;
+    min-width: 16px;
+/*	-GtkButton-image-spacing: 4; deprecated, but ignored */
+/*	-GtkButton-interior-focus: true; deprecated, but ignored */
+/*	-GtkButton-default-border: 0; deprecated, but ignored */
+/*	-GtkButton-inner-border: 3; deprecated, but ignored */
+/*	-GtkArrow-arrow-scaling: 0.5; deprecated, but ignored */
 	border-style: solid;
 	border-color: transparent;
-
 	text-shadow: 0 1px @button_text_shadow;
 }
 
@@ -1291,6 +1236,17 @@ button.image-button.circular-button,
    border-color: @borders;
 }
 
+/* arrows */
+#gtk-toolbar-arrow,
+button.toggle.popup image {
+    color: @menu_controls_color;
+}
+
+#gtk-toolbar-arrow:disabled,
+button.toggle.popup image:disabled {
+    color: @insensitive_fg_color;
+}
+
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
 toolbar.primary-toolbar button,
 toolbar.primary-toolbar button:disabled,
@@ -2321,7 +2277,7 @@ GtkCalendar.header .stack-switcher > .button.titlebutton > GtkImage {
 
 stackswitcher > button.text-button,
 .stack-switcher > .button.text-button {
-	padding: 5px 10px 6px; 
+	padding: 5px 10px 6px;
 }
 
 stackswitcher > button.image-button,
@@ -2372,6 +2328,45 @@ stackswitcher > button.needs-attention:checked > image,
 	background-image: none; 
 }
 
+stackswitcher  > button:dir(ltr).text-button.radio,
+stackswitcher  > button:dir(ltr).text-button.radio:hover,
+stackswitcher  > button:dir(ltr).text-button.radio:hover:active,
+stackswitcher  > button:dir(ltr).text-button.radio:active,
+stackswitcher  > button:dir(ltr).text-button.radio:checked,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:hover,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active  {
+    padding: 5px 10px 6px;
+    border-width: 1px 0px 1px 0px;
+    border-image-width: 3px 0px 4px 0;
+    border-style: solid;
+    border-color: @borders;
+    border-radius: 0px;
+}
+
+stackswitcher  > button:dir(ltr).text-button.radio:first-child,
+stackswitcher  > button:dir(ltr).text-button.radio:hover:first-child,
+stackswitcher  > button:dir(ltr).text-button.radio:hover:active:first-child,
+stackswitcher  > button:dir(ltr).text-button.radio:active:first-child,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:first-child,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:first-child,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active:first-child {
+    border-width: 1px 0px 1px 1px;
+    border-image-width: 3px 0 4px 3px;
+    border-radius: 3px 0px 0px 3px;
+}
+
+stackswitcher  > button:dir(ltr).text-button.radio:last-child,
+stackswitcher  > button:dir(ltr).text-button.radio:hover:last-child,
+stackswitcher  > button:dir(ltr).text-button.radio:hover:active:last-child,
+stackswitcher  > button:dir(ltr).text-button.radio:active:last-child,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:last-child,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:last-child,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active:last-child {
+    border-width: 1px 1px 1px 0px;
+    border-image-width: 3px 3px 4px 0;
+    border-radius: 0px 3px 3px 0px;
+}
+
 /*****************
  * Notebooks and *
  * tabs          *
@@ -2386,7 +2381,7 @@ notebook,
     border-width: 0px;
     background-color: shade (@theme_bg_color, 1.1);
 /*    -GtkNotebook-initial-gap: 0; */
-/*    -GtkNotebook-arrow-spacing: 5; *//* deprecated, but ignored */
+/*    -GtkNotebook-arrow-spacing: 5; deprecated */
 /*    -GtkNotebook-tab-curvature: 0;
     -GtkNotebook-tab-overlap: 0;
     -GtkNotebook-has-tab-gap: false;
@@ -2396,7 +2391,7 @@ notebook,
 
 notebook :hover,
 .notebook :hover {
-    -gtk-image-effect: highlight; /* deprecated, but ignored */
+    -gtk-icon-effect: highlight; /* deprecated, but ignored */
     color: @theme_fg_color;
 }
 
@@ -2426,31 +2421,38 @@ notebook header,
                                       shade(@theme_bg_color, 0.96),
                                       shade(@theme_bg_color, 1.0));
     border-width: 0px;
-    box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4), inset 0 -1px 0 0 alpha(@borders, 1.0);
 }
 
 notebook header.top,
 .notebook.header.top {
     border-width: 1px;
-    border-radius: 4px 4px 0px 0px;
+    border-radius: 0px;
+    box-shadow: inset  0px  1px 0 0 alpha(@borders, 0.4),
+                inset  0px -1px 0 0 alpha(@borders, 0.4);
 }
 
 notebook header.bottom,
 .notebook.header.bottom {
     border-width: 1px;
-    border-radius: 0px 0px 4px 4px;
+    border-radius: 0px;
+    box-shadow: inset  0px  1px 0 0 alpha(@borders, 0.4),
+                inset  0px -1px 0 0 alpha(@borders, 0.4);
 }
 
 notebook header.left,
 .notebook.header.left {
     border-width: 1px;
-    border-radius: 4px 0px 0px 4px;
+    border-radius: 0px;
+    box-shadow: inset  1px  0px alpha(@borders, 0.4),
+                inset -1px  0px alpha(@borders, 0.4);
 }
 
 notebook header.right,
 .notebook.header.right {
     border-width: 1px;
-    border-radius: 0px 4px 4px 0px;
+    border-radius: 0px;
+    box-shadow: inset  1px  0px alpha(@borders, 0.4),
+                inset -1px  0px alpha(@borders, 0.4);
 }
 
 notebook viewport,
@@ -2487,10 +2489,18 @@ notebook header tab .active-page label,
     color: @theme_fg_color;
 }
 
+/* tabs in caja and pluma */
+notebook header tab {
+    padding: 4px;
+    border-style: solid;
+    border-width: 0px 1px 0px 1px;
+    border-color: transparent;
+}
+
 /* horizontal tabs */
 
-notebook header.top tab,
-notebook header.bottom tab,
+notebook.frame header.top tab,
+notebook.frame header.bottom tab,
 .notebook tab.top,
 /* wtf, why this doesn't work? */
 .notebook tab.bottom {
@@ -2557,8 +2567,8 @@ notebook header.bottom tab:hover,
 
 /* vertical tabs */
 
-notebook header.left tab,
-notebook header.right tab,
+notebook.frame header.left tab,
+notebook.frame header.right tab,
 .notebook tab.left,
 .notebook tab.right {
     padding: 5px 20px;
@@ -2639,6 +2649,7 @@ notebook tab.reorderable-page:active,
 }
 
 /* close button styling */
+notebook button.flat,
 notebook button.flat.small-button,
 .notebook tab .button {
     color: mix (@theme_fg_color, @theme_bg_color, 0.85);
@@ -2663,6 +2674,7 @@ notebook .active-page button.flat.small-button,
     -gtk-icon-shadow: 0 1px @button_text_shadow;
 }
 
+notebook button.flat:hover,
 notebook button.flat.small-button:hover,
 .notebook tab .button:hover {
     color: @theme_fg_color;
@@ -2672,6 +2684,8 @@ notebook button.flat.small-button:hover,
     background-color: transparent;
 }
 
+notebook button.flat:active,
+notebook button.flat:active:hover,
 notebook button.flat.small-button:active,
 notebook button.flat.small-button:active:hover,
 .notebook tab .button:active,
@@ -2688,22 +2702,26 @@ notebook button.flat.small-button:active:hover,
 
 notebook header.top tabs arrow.up,
 notebook header.bottom tabs arrow.up {
-      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+    color: @menu_controls_color;
 }
 
 notebook header.top tabs arrow.down,
 notebook header.bottom tabs arrow.down {
-      -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+    color: @menu_controls_color;
 }
 
 notebook header.left tabs arrow.up,
 notebook header.right tabs arrow.up {
-      -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+    -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+    color: @menu_controls_color;
 }
 
 notebook header.left tabs arrow.down,
 notebook header.right tabs arrow.down {
-      -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+    color: @menu_controls_color;
 }
 
 notebook header tabs arrow,
@@ -2745,8 +2763,8 @@ notebook header tabs arrow:disabled,
 combobox,
 GtkComboBox {
 	padding: 0;
-	-GtkComboBox-arrow-scaling: 0.5; /* deprecated, but ignored */
-	-GtkComboBox-shadow-type: none;
+/*	-GtkComboBox-arrow-scaling: 0.5; deprecated */
+/*	-GtkComboBox-shadow-type: none; deprecated */
 	text-shadow: 0 1px @button_text_shadow;
 }
 
@@ -2759,7 +2777,7 @@ GtkComboBox:disabled {
 combobox separator,
 GtkComboBox .separator {
 	/* always disable separators */
-	-GtkWidget-wide-separators: true; /* deprecated, but ignored */
+/*	-GtkWidget-wide-separators: true; deprecated */
 	-GtkWidget-horizontal-separator: 0;
 	-GtkWidget-vertical-separator: 0;
 }
@@ -2865,10 +2883,20 @@ GtkComboBox .button {
     color: @theme_fg_color;
 }
 
+combobox.linked button.combo,
+combobox.linked button.combo:checked {
+	border-right-width: 2px;
+	border-left-width: 0;
+	border-image-width: 3px 4px 4px 0;
+	border-bottom-left-radius: 0;
+	border-top-left-radius: 0;
+}
+
 combobox arrow {
-  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-  min-height: 16px;
-  min-width: 16px;
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+    color: @menu_controls_color;
+    min-height: 16px;
+    min-width: 16px;
 }
 
 /********************
@@ -2877,12 +2905,12 @@ combobox arrow {
 
 button.font separator,
 GtkFileChooserButton separator,
-GtkFileChooserWidget horizontal.separator,
+filechooser horizontal.separator,
 GtkFontButton .separator,
 GtkFileChooserButton .separator,
 GtkFileChooserWidget horizontal.separator {
 	/* always disable separators */
-	-GtkWidget-wide-separators: true; /* deprecated, but ignored */
+/*	-GtkWidget-wide-separators: true; deprecated */
 	-GtkWidget-horizontal-separator: 0;
 	-GtkWidget-vertical-separator: 0;
 }
@@ -2897,11 +2925,6 @@ GtkFileChooserButton GtkImage:last-child {
 	color: @internal_element_color;
 }
 
-GtkFileChooserWidget.vertical GtkPaned.horizontal {
-    -GtkPaned-handle-size: 3px;
-    border-color: transparent;
-}
-
 /**************
  * Scrollbars *
  **************/
@@ -3205,7 +3228,7 @@ menubar menuitem:hover,
 menu menuitem,
 .menu .menuitem {
     background-color: transparent;
-    -GtkMenuItem-arrow-scaling: 0.6; /* deprecated, but ignored */
+/*    -GtkMenuItem-arrow-scaling: 0.6; deprecated */
     transition: all 150ms ease-out;
     padding: 6px 5px;
 }
@@ -3267,14 +3290,32 @@ GtkModelMenuItem GtkBox GtkImage {
 
 menuitem arrow,
 .menuitem.arrow {
-	color: @menu_controls_color;
+    min-height: 16px;
+    min-width: 16px;
+    margin-left: 10px;
+    color: @menu_controls_color;
+}
+
+menu menuitem arrow:dir(ltr) {
+	-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
+
+menu menuitem arrow:dir(rtl) {
+        -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
+}
+
+menu arrow.top {
+      -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+}
+
+menu arrow.bottom {
+      -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
 menuitem separator,
 .menuitem.separator {
 	color: @menu_separator;
-
-	-GtkMenuItem-horizontal-padding: 0; /* deprecated, but ignored */
+/*	-GtkMenuItem-horizontal-padding: 0; deprecated */
 }
 
 menuitem check,
@@ -3291,6 +3332,9 @@ menuitem radio:disabled,
 .menuitem.radio:disabled {
 	background-image: none;
 	background-color: transparent;
+	min-height: 12px;
+	min-width: 12px;
+	background-position: center center;
 }
 
 menuitem check:checked,
@@ -3447,6 +3491,11 @@ radio:disabled,
 	border-style: none;
 }
 
+check,
+radio {
+	padding: 0px 6px 0px 0px;
+}
+
 checkbutton:hover,
 checkbutton:active:hover,
 checkbutton:selected,
@@ -3898,6 +3947,7 @@ toolbar.inline-toolbar.vertical:last-child,
 /***********
  * Sidebar *
  ***********/
+.sidebar .view,
 placessidebar .view,
 .sidebar,
 GtkPlacesSidebar.sidebar .view {
@@ -4344,9 +4394,15 @@ progressbar .osd,
 .osd GtkProgressBar,
 GtkProgressBar.osd {
 	padding: 0;
-	-GtkProgressBar-xspacing: 0;
-	-GtkProgressBar-yspacing: 3px;
-	-GtkProgressBar-min-horizontal-bar-height: 3px;
+/*	-GtkProgressBar-xspacing: 0; deprecated */
+/*	-GtkProgressBar-yspacing: 3px; deprecated */
+/*	-GtkProgressBar-min-horizontal-bar-height: 3px; deprecated */
+	min-height: 3px;
+}
+
+.osd progressbar.horizontal,
+progressbar.horizontal .osd {
+	min-height: 3px;
 }
 
 .osd progressbar trough,
@@ -5450,6 +5506,8 @@ GtkTreeView.view.expander:checked {
 
 expander arrow,
 GtkExpander {
+    min-width: 16px;
+    min-height: 16px;
     -gtk-icon-style: regular;
 	-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
 }
@@ -5518,48 +5576,57 @@ list,
 }
 
 list row,
+list row.activatable,
 .list-row {
     padding: 2px;
     transition: all 200ms ease-in;
-	background-image: none;
-	background-color: @theme_base_color;
+    background-image: none;
+    background-color: @theme_base_color;
 }
 
 list row:hover,
+list row.activatable:hover,
 .list-row:hover {
-	background-image: none;
-	background-color: shade (@theme_selected_bg_color, 1.55);
-	color: shade (@theme_selected_bg_color, 0.35);
+    padding: 2px;
+    background-image: none;
+    background-color: shade (@theme_selected_bg_color, 1.55);
+    color: shade (@theme_selected_bg_color, 0.35);
 }
 
 list row:selected,
 list row:selected:hover,
+list row.activatable:selected,
+list row.activatable:selected:hover,
 .list-row:selected,
 .list-row:selected:hover {
-	border-width: 0;
-	border-style: solid;
-	border-color: shade (@theme_selected_bg_color, 0.85);
-	background-color: @theme_selected_bg_color;
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	box-shadow: none;
-	color: @theme_selected_fg_color;
+    padding: 2px;
+    border-width: 0;
+    border-style: solid;
+    border-color: shade (@theme_selected_bg_color, 0.85);
+    background-color: @theme_selected_bg_color;
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 1.0),
+                                      shade (@theme_selected_bg_color, 0.85));
+    box-shadow: none;
+    color: @theme_selected_fg_color;
 }
 
 list row:selected:backdrop,
 list row:selected:backdrop:hover,
+list row.activatable:selected:backdrop,
+list row.activatable:selected:backdrop:hover,
 .list-row:selected:backdrop,
 .list-row:selected:backdrop:hover {
-	border-width: 0;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 0.94),
-		shade (@theme_selected_bg_color, 0.94));
-	color: @theme_fg_color;
-	text-shadow: none;
-	box-shadow: none;
+    padding: 2px;
+    border-width: 0;
+    border-style: solid;
+    border-color: shade (@theme_bg_color, 0.85);
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 0.94),
+                                      shade (@theme_selected_bg_color, 0.94));
+    color: @theme_fg_color;
+    text-shadow: none;
+    box-shadow: none;
 }
 
 list row button,
@@ -6040,6 +6107,7 @@ cursor-handle.top,
 .entry.cursor-handle.top,
 .cursor-handle.top {
 	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
+    color: @menu_controls_color;
 }
 
 entry cursor-handle.bottom,
@@ -6047,6 +6115,7 @@ cursor-handle.bottom,
 .entry.cursor-handle.bottom,
 .cursor-handle.bottom {
 	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
+    color: @menu_controls_color;
 }
 
 /*******
@@ -6182,10 +6251,66 @@ messagedialog.csd decoration,
 }
 
 /* print dialog */
+printdialog.background .vertical.view.dialog-vbox,
 GtkPrintUnixDialog.background .vertical.view.dialog-vbox {
     background-color: shade (@theme_bg_color, 1.1)
 }
 
+/* filechooser dialog */
+filechooser revealer .vertical.view {
+    background-color: @theme_bg_color;
+    border-style: solid;
+    border-width: 1px 1px 0px 1px;
+    border-color: @borders;
+}
+
+filechooser placessidebar.sidebar.frame {
+    border-style: solid;
+}
+
+/* calendar */
+/* this makes no sense for gtk+-3.20 :) */
+calendar.button {
+  background-image: none;
+}
+
+calendar {
+  border-color: @borders;
+}
+
+/*********
+ * 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 {
+}
+
 /* Various hacks and shit */
 /* FIXME - BELOW: Some stuff that can probably be done better or in another way */
 
@@ -6241,11 +6366,9 @@ GtkPrintUnixDialog.background .vertical.view.dialog-vbox {
 .floating-bar .button {
 	background-color: alpha (@theme_base_color, 0.0);
 	background-image: none;
-
 	border-style: none;
 	border-image: none;
-
-	-GtkButton-image-spacing: 0;
-	-GtkButton-inner-border: 0;
+/*	-GtkButton-image-spacing: 0;
+	-GtkButton-inner-border: 0; deprecated */
 }
 
diff --git a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
index 82bb43c1..126a427b 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
@@ -2,72 +2,15 @@
  * CAJA File manager *
  *********************/
 
-/* for breadcrumbs path bar */
-
-.caja-pathbar-button,
-CajaPathbarButton {
-    background-image: -gtk-gradient(linear, left top, left bottom,
-                                    color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-                                    color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-                                    color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)),
-                                    color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90)));
-    border-color: #979797;
-    color: @theme_fg_color;
-    -CajaPathbarButton-border-radius: 3px;
-}
-
-CajaPathbarButton:active {
-    background-image: -gtk-gradient(linear, left top, left bottom,
-                                    color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)),
-                                    color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)),
-                                    color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0)));
-}
-
-CajaPathbarButton:hover {
-    background-image: -gtk-gradient(linear, left top, left bottom,
-                                    color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-                                    color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-                                    color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)),
-                                    color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85)));
-}
-
-CajaPathbarButton:active:hover {
-    background-image: -gtk-gradient(linear, left top, left bottom,
-                                    color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)),
-                                    color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)),
-                                    color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)));
-}
-
-/* For Places Sidebar diskfull indicators */
-CajaPlacesTreeView {
-    -CajaPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
-    -CajaPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
-    -CajaPlacesTreeView-disk-full-bar-width: 2px;
-    -CajaPlacesTreeView-disk-full-bar-radius: 1px;
-    -CajaPlacesTreeView-disk-full-bottom-padding: 1px;
-    -CajaPlacesTreeView-disk-full-max-length: 70px;
-}
-
-CajaPlacesTreeView:selected {
-    -CajaPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
-    -CajaPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
-}
-
-CajaPlacesTreeView:hover {
-}
-
-CajaPlacesTreeView:selected:hover {
-}
-
 /* Caja places combobox */
-CajaWindow .button.flat {
+.caja-navigation-window .caja-side-pane button.flat {
     background-color: transparent;
     background-image: linear-gradient(to bottom,
                                       @button_gradient_color_a,
                                       @button_gradient_color_b);
 }
 
-CajaWindow .button.flat:first-child {
+.caja-navigation-window .caja-side-pane button.flat:first-child {
     transition: all 400ms ease-out;
     border-radius: 3px 0 0 3px;
     border-right-width: 0;
@@ -75,7 +18,7 @@ CajaWindow .button.flat:first-child {
     border-image: url("borders/button.png") 3 4 4 3 / 3px 0px 4px 3px stretch;
 }
 
-CajaWindow .button.flat:last-child {
+.caja-navigation-window .caja-side-pane button.flat:last-child {
     transition: all 400ms ease-out;
     border-radius: 0 3px 3px 0;
     border-left-width: 0;
@@ -83,14 +26,14 @@ CajaWindow .button.flat:last-child {
     border-image: url("borders/button.png") 3 3 4 4 / 3px 3px 4px 0px stretch;
 }
 
-CajaWindow .button.flat:hover {
+.caja-navigation-window .caja-side-pane button.flat:hover {
     background-color: transparent;
     background-image: linear-gradient(to bottom,
                                       @button_hover_gradient_color_a,
                                       @button_hover_gradient_color_b);
 }
 
-CajaWindow .button.flat:hover:first-child {
+.caja-navigation-window .caja-side-pane button.flat:hover:first-child {
     border-radius: 6px 0 0 6px;
     border-right-width: 0;
     background-color: transparent;
@@ -100,7 +43,7 @@ CajaWindow .button.flat:hover:first-child {
     border-image: url("borders/button.png") 3 3 4 3 / 3px 0px 4px 3px stretch;
 }
 
-CajaWindow .button.flat:hover:last-child  {
+.caja-navigation-window .caja-side-pane button.flat:hover:last-child  {
     border-radius: 0 6px 6px 0;
     border-left-width: 0;
     background-color: transparent;
@@ -112,9 +55,9 @@ CajaWindow .button.flat:hover:last-child  {
 
 /* some overrides for button.flat */
 /* zoom button */
-CajaWindow .primary-toolbar .button.flat,
-CajaWindow .primary-toolbar .button.flat:first-child,
-CajaWindow .primary-toolbar .button.flat:last-child {
+.caja-navigation-window toolbar.primary-toolbar button.flat,
+.caja-navigation-window toolbar.primary-toolbar button.flat:first-child,
+.caja-navigation-window toolbar.primary-toolbar button.flat:last-child {
     transition: all 400ms ease-out;
     border-width: 3px;
     background-color: transparent;
@@ -125,7 +68,7 @@ CajaWindow .primary-toolbar .button.flat:last-child {
 }
 
 /* zoom button */
-CajaWindow .primary-toolbar .button.flat:hover {
+.caja-navigation-window toolbar.primary-toolbar button.flat:hover {
     border-width: 3px;
     background-color: transparent;
     background-image: linear-gradient(to bottom,
@@ -135,34 +78,30 @@ CajaWindow .primary-toolbar .button.flat:hover {
 }
 
 /* ComboBox views */
-CajaWindow .toolbar GtkComboBox .button {
-    background-image: linear-gradient(to bottom,
-                                      shade (@theme_bg_color, 1.0),
-                                      shade (@theme_bg_color, 0.96));
-    padding: 4px 4px;
-}
-
-CajaWindow .toolbar GtkComboBox .button:hover {
+.caja-navigation-window toolbar.primary-toolbar combobox button.combo {
     background-image: linear-gradient(to bottom,
                                       @button_gradient_color_a,
                                       @button_gradient_color_b);
     border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-    padding: 4px 4px;
+    padding: 6px 4px;
 }
 
-/* to avoid padding when executing toogle button */
-CajaLocationBar .entry {
-    padding: 4px;
+.caja-navigation-window toolbar.primary-toolbar combobox button.combo:hover {
+    background-image: linear-gradient(to bottom,
+                                      @button_hover_gradient_color_a,
+                                      @button_hover_gradient_color_b);
+    border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+    padding: 6px 4px;
 }
 
-/* the small line between sidebar and view */
-CajaWindow GtkPaned.horizontal {
+/* the small line between sidebar and view , now in gtk-widgets 'paned'*//*
+.caja-navigation-window paned.horizontal {
     -GtkPaned-handle-size: 3px;
     border-color: transparent;
     background-color: @theme_bg_color;
 }
 
-/* caja sidebar */
+*//* caja sidebar *//*
 CajaWindow FMTreeView .view,
 CajaWindow CajaNotesViewer .view,
 CajaWindow CajaPlacesSidebar .view,
@@ -171,8 +110,16 @@ CajaWindow CajaInformationPanel GtkVBox,
 CajaWindow CajaEmblemSidebar GtkViewport {
     background-color: shade (@theme_bg_color, 1.08);
     color: @theme_fg_color;
+}*/
+/* 3.20 emblems are broken */
+/* places, treeview, history, information and notes */
+.caja-side-pane treeview.view,
+.caja-side-pane textview.view text {
+    background-color: shade (@theme_bg_color, 1.08);
+    color: @theme_fg_color;
 }
 
+.caja-side-pane treeview.view:selected:hover,
 CajaWindow CajaPlacesSidebar .view row:active:hover,
 CajaWindow CajaPlacesSidebar .view row:checked:hover,
 CajaWindow CajaPlacesSidebar .view row:selected:hover,
@@ -185,46 +132,29 @@ CajaWindow FMTreeView .view row:selected:hover {
     color: shade (@theme_selected_fg_color, 1.00);
 }
 
+.caja-side-pane treeview.view:hover,
 CajaWindow CajaPlacesSidebar .view row:hover,
 CajaWindow FMTreeView .view row:hover,
 CajaWindow CajaHistorySidebar .view row:hover {
     background-color: shade (@theme_selected_bg_color, 1.15);
-    color: shade (@theme_selected_bg_color, 0.35);
+    color: shade (@theme_selected_fg_color, 1.00);
 }
 
+/* What is that? */
 CajaWindow .rubberband,
 CajaWindow .view.rubberband {
     background-color: alpha (@theme_selected_bg_color, 0.35);
 }
 
-CajaWindow CajaPlacesSidebar .frame {
-    border-right-width: 1px;
-    border-style: solid;
-    border-color: shade (@theme_bg_color, 0.90);
-    border-left: none;
-    border-top: none;
-    border-bottom: none;
-}
-
 /* moved eject button to left better for overlay scrollbars */
+.caja-side-pane treeview.view,
 CajaWindow CajaPlacesSidebar .view row {
-    padding: 0px 4px 0px 0px;
-}
-
-CajaWindow CajaPlacesSidebar row:selected {
-    color: @theme_selected_fg_color;
-}
-
-CajaWindow CajaPlacesSidebar row:backdrop:selected {
-    color: @theme_fg_color;
-    text-shadow: none; 
-}
-
-CajaWindow CajaPlacesSidebar row:hover {
-    background-color: shade (@theme_bg_color, 0.97);
+    padding: 1px 4px 1px 0px;
 }
 
 /* better for overlay scrollbars */
+.caja-side-pane treeview.view .vertical.scrollbar.overlay-indicator,
+.caja-side-pane textview.view text .vertical.scrollbar.overlay-indicator,
 CajaWindow FMTreeView .vertical.scrollbar.overlay-indicator,
 CajaWindow CajaNotesViewer .vertical.scrollbar.overlay-indicator,
 CajaWindow CajaPlacesSidebar .vertical.scrollbar.overlay-indicator,
@@ -233,21 +163,87 @@ CajaWindow CajaHistorySidebar .vertical.scrollbar.overlay-indicator {
 	-GtkRange-slider-width: 11;
 }
 
+.caja-side-pane notebook {
+    border-style: none;
+}
+
+/* view and desktop mode */
 .caja-canvas-item {
     border-radius: 3px;
+    color: @theme_fg_color;
+}
+
+.caja-canvas-item:active,
+.caja-canvas-item:selected {
+    color: @theme_selected_fg_color;
+}
+
+/* view mode */
+
+/* list view 3.20 */
+.caja-notebook treeview.view,
+/* view and compact 3.20 */
+.caja-notebook scrolledwindow.frame {
+    background-color: @theme_base_color;
+}
+
+/* rows in listview */
+.caja-notebook treeview.view:selected,
+.caja-notebook treeview.view:selected:hover {
+    background-color: @theme_selected_bg_color;
+}
+
+.caja-notebook treeview.view:hover {
+    background-color: shade (@theme_selected_bg_color, 1.55);
+    color: shade (@theme_selected_bg_color, 0.35);
 }
 
-/* view */
+.caja-notebook .caja-canvas-item,
 CajaNavigationWindow.background .view.caja-canvas-item {
     color: @theme_fg_color;
 }
 
+.caja-notebook .caja-canvas-item:active,
+.caja-notebook .caja-canvas-item:selected,
 CajaNavigationWindow.background .view.caja-canvas-item:active,
 CajaNavigationWindow.background .view.caja-canvas-item:selected {
     color: @theme_selected_fg_color;
 }
 
+.caja-notebook {
+    border-style: none;
+}
+
+.caja-notebook frame {
+    border-width: 1px 1px 0 1px;
+}
+
 /* desktop mode */
+/* 3.20 */
+/* desktop */
+.caja-desktop.caja-canvas-item {
+    color: @theme_selected_fg_color;
+    text-shadow: 1px 1px alpha (#000000, 0.8);
+}
+
+.caja-desktop.caja-canvas-item:selected {
+    background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
+    text-shadow: none;
+}
+
+.caja-desktop.caja-canvas-item:active,
+.caja-desktop.caja-canvas-item:hover {
+    text-shadow: none;
+}
+
+.caja-desktop EelEditableLabel.entry {
+   border-image: none;
+   border-width: 1px;
+   text-shadow: none;
+}
+
+/*
 CajaDesktopWindow.background FMIconContainer.view EelEditableLabel.entry {
    border-image: none;
    border-width: 1px;
@@ -265,23 +261,25 @@ CajaDesktopWindow.background .caja-canvas-item:selected {
 }
 
 CajaDesktopWindow.background .caja-canvas-item:active,
-CajaDesktopWindow.background .caja-canvas-item:prelight,
+CajaDesktopWindow.background .caja-canvas-item:hover,
 CajaDesktopWindow.background .caja-canvas-item:selected {
     text-shadow: none;
 }
-
+*/
 /* inactive pane */
-
+/* not implemented yet *//*
 .caja-inactive-pane .view {
     background-color: shade(@theme_base_color, 0.9);
 }
+*/
 
 /* Toolbar */
-CajaWindow .toolbar .button {
+.caja-navigation-window toolbar button {
     border-image: none;
 }
 
 /* Misc */
+.caja-navigation-window notebook,
 CajaView.frame,
 CajaNotebook.notebook {
     border-right-width: 0;
@@ -289,41 +287,67 @@ CajaNotebook.notebook {
     border-bottom-width: 0;
 }
 
+.caja-navigation-window notebook tab,
 CajaNotebook.notebook tab.top,
 CajaNotebook.notebook tab.bottom {
     border-right-width: 1px;
     border-left-width: 1px;
 }
 
+.caja-navigation-window notebook,
 CajaNotebook .frame {
     border-width: 1px 0 0 0;
 }
 
 /* close button styling */
 /* surpress styling of close button */
+.caja-navigation-window notebook tab button.flat,
+.caja-navigation-window notebook tab button.flat:hover,
 CajaWindow .notebook tab .button.flat,
 CajaWindow .notebook tab .button.flat:hover {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
     text-shadow: none;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
     border-image: none;
 }
 
+.caja-navigation-window notebook tab,
 CajaWindow .notebook tab.top {
-    padding: 6px 3px 6px 0px;
+    padding: 4px 3px 4px 0px;
 }
 
+/* do we have this style class? */
 .caja-cluebar-label {
     font: normal;
     text-shadow: 0 1px shade (@cluebar_color, 1.06);
 }
 
-CajaSearchBar .horizontal .entry {
+/* to avoid padding when executing toogle button */
+.caja-search-bar entry,
+.caja-location-entry,
+CajaSearchBar .horizontal .entry,
+CajaLocationBar .entry {
     padding: 4px;
 }
 
+.caja-navigation-window statusbar frame {
+    border-style: none;
+}
+
+#caja-extra-view-widget {
+    background-color: shade (@theme_bg_color, 1.04);
+    background-color: @cluebar_color;
+    border-bottom-color: shade (@cluebar_color, 0.92);
+    border-radius: 0px;
+    border-style: solid;
+    border-width: 0px;
+    border-color: @borders;
+    color: @theme_fg_color;
+}
+
+/*
 CajaTrashBar.info,
 CajaXContentBar.info,
 CajaSearchBar.info,
@@ -342,33 +366,24 @@ CajaSearchBar .button,
 CajaQueryEditor .button {
     border-radius: 0;
 }
+*/
 
 /****************
  * Mate-Panel *
  ****************/
 
 /* first make all transparent */
-PanelToplevel.background.horizontal {
+.mate-panel-menu-bar,
+.mate-panel-menu-bar menubar,
+#PanelApplet-window-menu-applet-button {
     background-color: transparent;
-}
-
-WnckSelector.menubar,
-PanelMenuBar.menubar,
-WnckSelector GtkMenuItem,
-PanelMenuBar GtkMenuItem,
-MatePanelApplet GtkToggleButton.button {
     border-image: none;
     background-image: none;
     background-color: transparent;
     box-shadow: none;
 }
 
-/* let's started */
-/* the panel bar itself */
-PanelToplevel.background.horizontal {
-    background-color: @theme_bg_color;
-}
-
+/* let's start it */
 .mate-panel-menu-bar {
     background-color: @theme_bg_color;
     background-image: none;
@@ -384,18 +399,8 @@ PanelToplevel.background.horizontal {
     box-shadow: none;
 }
 
-/* panel grip */
-PanelToplevel.background {
-    border-radius: 2px;
-/* enable for making borders visible */
-/*    box-shadow: inset  0px  1px shade (@theme_bg_color, 1.0),
-                inset  1px  0px shade (@theme_bg_color, 1.0),
-                inset -1px  0px shade (@theme_bg_color, 1.0),
-                inset  0px -1px shade (@theme_bg_color, 1.0); */
-}
-
 /* hide buttons */
-PanelToplevel.background .button {
+.mate-panel-menu-bar button {
     background: transparent;
     border-image: none;
     border-radius: 2px;
@@ -404,8 +409,8 @@ PanelToplevel.background .button {
     box-shadow: none;
 }
 
-PanelToplevel.background .button:hover,
-PanelToplevel.background .button:hover:active {
+.mate-panel-menu-bar button:hover,
+.mate-panel-menu-bar button:hover:active {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_selected_bg_color, 0.86),
                                       shade (@theme_selected_bg_color, 0.26));
@@ -415,11 +420,10 @@ PanelToplevel.background .button:hover:active {
     border-width: 0px;
 }
 
-MatePanelApplet {
+#PanelApplet {
     border-width: 0;
 }
 
-MatePanelAppletFrameDBus PanelSeparator,
 PanelSeparator {
     border-width: 0;
     background-color: @theme_bg_color;
@@ -427,7 +431,7 @@ PanelSeparator {
     text-shadow: none;
 }
 
-/* the grid left from wnckpager and wncktasklist */
+/* the grid left from na-tray and wncktasklist */
 MatePanelAppletFrameDBus {
     background-image: -gtk-scaled(url("assets/panel-grid.svg"));
     background-color: transparent;
@@ -437,13 +441,13 @@ MatePanelAppletFrameDBus {
 
 /* main menu */
 /* set normal menubar button */
-PanelMenuBar.menubar .menuitem {
+.mate-panel-menu-bar menubar menuitem {
     transition: all 200ms ease-out;
     text-shadow: none;
 }
 
 /* set selected menubar button */
-PanelMenuBar.menubar .menuitem:hover {
+.mate-panel-menu-bar menubar menuitem:hover {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_selected_bg_color, 0.86),
                                       shade (@theme_selected_bg_color, 0.26));
@@ -454,22 +458,22 @@ PanelMenuBar.menubar .menuitem:hover {
     border-radius: 5px;
 }
 
-/* set menubar menuitem separator */
-PanelMenuBar.menubar .menu .menuitem.separator {
+/* set menubar menuitem separator , does not work */
+.mate-panel-menu-bar menubar menu menuitem separator {
     color: @menu_separator;
-    -GtkMenuItem-horizontal-padding: 0;
+/*    -GtkMenuItem-horizontal-padding: 0; deprecated */
 }
 
 /* set normal menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem {
+.mate-panel-menu-bar menubar menu menuitem {
     transition: all 150ms ease-out;
     padding: 6px;
 }
 
 /* set selected menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem:checked:hover,
-PanelMenuBar.menubar .menu .menuitem:active:hover,
-PanelMenuBar.menubar .menu .menuitem:hover {
+.mate-panel-menu-bar menubar menu menuitem:checked:hover,
+.mate-panel-menu-bar menubar menu menuitem:active:hover,
+.mate-panel-menu-bar menubar menu menuitem:hover {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_selected_bg_color, 1.0),
                                       shade (@theme_selected_bg_color, 0.85));
@@ -480,28 +484,11 @@ PanelMenuBar.menubar .menu .menuitem:hover {
     border-radius: 0px;
 }
 
-/* mate menu */
-
-/* Mate menu button hover */
-PanelMenuButton.button:hover {
-    color: shade (@theme_selected_bg_color, 1.00);
-}
-
-/* Mate menu menuitem */
-PanelMenuButton .menu .menuitem {
-    padding: 6px;
-}
-
-/* Mate menu menuitem separator */
-PanelMenuButton .menu .menuitem.separator {
-    color: @menu_separator;
-    -GtkMenuItem-horizontal-padding: 0;
-}
-
-/* desktop-applet, clockapplet, drivemount, character-map,
-dictionary */
-MatePanelApplet .button,
-MatePanelApplet .button.flat {
+/* all applets */
+.mate-panel-menu-bar #PanelApplet button,
+.mate-panel-menu-bar #PanelApplet button.flat,
+.mate-panel-menu-bar #PanelApplet button.toggle,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle {
     transition: all 400ms ease-out;
     background-image: none;
     background-color: transparent;
@@ -515,14 +502,18 @@ MatePanelApplet .button.flat {
     padding: 4px 4px 4px 4px;
 }
 
-MatePanelApplet .button:checked,
-MatePanelApplet .button:active,
-MatePanelApplet .button:checked:hover,
-MatePanelApplet .button:active:hover,
-MatePanelApplet .button.flat:checked,
-MatePanelApplet .button.flat:active,
-MatePanelApplet .button.flat:checked:hover,
-MatePanelApplet .button.flat:active:hover {
+.mate-panel-menu-bar #PanelApplet button:checked,
+.mate-panel-menu-bar #PanelApplet button:checked:hover,
+.mate-panel-menu-bar #PanelApplet button:hover:active,
+.mate-panel-menu-bar #PanelApplet button.flat:checked,
+.mate-panel-menu-bar #PanelApplet button.flat:checked:hover,
+.mate-panel-menu-bar #PanelApplet button.flat:hover:active,
+.mate-panel-menu-bar #PanelApplet button.toggle:checked,
+.mate-panel-menu-bar #PanelApplet button.toggle:checked:hover,
+.mate-panel-menu-bar #PanelApplet button.toggle:hover:active,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle:checked,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle:checked:hover,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle:hover:active {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_selected_bg_color, 0.86),
                                       shade (@theme_selected_bg_color, 0.26));
@@ -537,8 +528,10 @@ MatePanelApplet .button.flat:active:hover {
     padding: 4px 4px 4px 4px;
 }
 
-MatePanelApplet .button:hover,
-MatePanelApplet .button.flat:hover {
+.mate-panel-menu-bar #PanelApplet button:hover,
+.mate-panel-menu-bar #PanelApplet button.flat:hover,
+.mate-panel-menu-bar #PanelApplet button.toggle:hover,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle:hover {
     background-image: linear-gradient(to bottom,
                                       @theme_bg_color,
                                       shade (@theme_selected_bg_color, 0.86));
@@ -553,87 +546,10 @@ MatePanelApplet .button.flat:hover {
     padding: 4px 4px 4px 4px;
 }
 
-/*Wncklist */
-WnckTasklist .button {
-    transition: all 400ms ease-out;
-    background-image: linear-gradient(to bottom,
-                                      shade (@theme_bg_color, 1.0),
-                                      shade (@theme_bg_color, 0.96));
-    background-color: transparent;
-/*    color: @theme_selected_fg_color;*/
-    border-image: none;
-    border-style: solid;
-    border-width: 0px;
-    border-radius: 5px;
-    text-shadow: none;
-    -GtkWidget-window-dragging: true;
-}
-
-WnckTasklist .button:checked:hover,
-WnckTasklist .button:checked,
-WnckTasklist .button:active:hover,
-WnckTasklist .button:active {
-    background-image: linear-gradient(to bottom,
-                                      shade (@theme_selected_bg_color, 0.86),
-                                      shade (@theme_selected_bg_color, 0.26));
-    background-color: transparent;
-    color: shade (@theme_selected_fg_color, 1.00);
-    border-image: none;
-    border-style: solid;
-    border-width: 0px;
-    border-radius: 5px;
-    text-shadow: none;
-    -GtkWidget-window-dragging: true;
-}
-
-WnckTasklist .button:hover,
-WnckTasklist .button.flat:hover {
-    background-image: linear-gradient(to bottom,
-                                      @theme_bg_color,
-                                      shade (@theme_selected_bg_color, 0.86));
-    background-color: transparent;
-    color: shade (@theme_text_color, 1.0);
-    border-image: none;
-    border-style: solid;
-    border-width: 0px;
-    border-radius: 5px;
-    text-shadow: none;
-    -GtkWidget-window-dragging: true;
-}
-
-/* set selected button WnckSelector */
-WnckSelector.menubar .menuitem:hover {
-    background-image: linear-gradient(to bottom,
-                                      shade (@theme_selected_bg_color, 0.86),
-                                      shade (@theme_selected_bg_color, 0.26));
-    background-color: transparent;
-    border-style: solid;
-    border-width: 0px;
-    border-radius: 5px;
-}
-
-/* set WnckSelector normal menuitem */
-WnckSelector.menubar .menu .menuitem {
-    background-color: @menu_bg_color;
-    background-image: none;
-    color: shade (@theme_fg_color, 1.00);
-    text-shadow: none;
-}
-
-/* set WnckSelector selected menuitem */
-WnckSelector.menubar .menu .menuitem:hover {
-    background-color: transparent;
-    background-image: linear-gradient(to bottom,
-                                      shade (@theme_selected_bg_color, 1.0),
-                                      shade (@theme_selected_bg_color, 0.85));
-    color: shade (@theme_selected_fg_color, 1.00);
-    text-shadow: none;
-    border-radius: 0px;
-}
-
-/* set WnckSelector menuitem separator */WnckSelector.menubar .menu .menuitem.separator {
+/* set WnckSelector menuitem separator seperators are broken */
+.mate-panel-menu-bar menubar menu menuitem separator {
     color: @menu_separator;
-    -GtkMenuItem-horizontal-padding: 0;
+/*    -GtkMenuItem-horizontal-padding: 0; */
 }
 
 /* WnckPager */
@@ -657,9 +573,8 @@ WnckPager:hover {
                                       @theme_selected_bg_color);
 }
 
-ClockBox,
-.mate-panel-menu-bar.menubar,
-MatePanelApplet > GtkMenuBar.menubar {
+.mate-panel-menu-bar menubar,
+MatePanelApplet > menubar {
     font: normal;
 }
 
@@ -668,7 +583,8 @@ GtkTrayIcon.background {
     background-color: transparent;
 }
 
-NaTrayApplet {
+/* na-tray-applet */
+.mate-panel-menu-bar #PanelApplet {
     -NaTrayApplet-icon-padding: 3px;
     -NaTrayApplet-icon-size: 16;
 }
@@ -683,7 +599,7 @@ NaTrayApplet {
     background: transparent;
 }
 
-.mate-panel-applet-slider .frame {
+.mate-panel-applet-slider frame {
     background-color: @theme_bg_color;
     border-image: none;
     border-style: solid;
@@ -692,13 +608,13 @@ NaTrayApplet {
     margin: 0px;
 }
 
-.mate-panel-applet-slider .frame .frame{
+.mate-panel-applet-slider frame frame{
     background-color:transparent;
     border-style: none;
     box-shadow: none;
 }
 
-.mate-panel-applet-slider .frame .button {
+.mate-panel-applet-slider frame button {
     color: @theme_fg_color;
 }
 
@@ -724,56 +640,29 @@ TerminalWindow GtkNotebook.notebook tab.top,
  ****************/
 
 /* pluma line numbers */
+.pluma-window textview,
 PlumaView {
     background-color: shade (@theme_bg_color, 1.07);
 }
 
-/*FIXME normaly this isn't the right entry for adjusting
-the sidebar entry hover color*/
-PlumaWindow .view row:hover {
-    background-color: shade (@theme_selected_bg_color, 1.15);
-    color: shade (@theme_selected_bg_color, 0.35);
-}
-
 /* Pluma status bar */
-PlumaStatusbar.horizontal.statusbar .frame.flat .flat.button {
-    border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+.pluma-window statusbar.horizontal frame {
+    border-style: none;
 }
 
-PlumaWindow .button.flat:hover {
-    background-color: transparent;
-    background-image: linear-gradient(to bottom,
-                                      @button_gradient_color_a,
-                                      @button_gradient_color_b);
+.pluma-window statusbar.horizontal frame button.flat.toggle,
+PlumaStatusbar.horizontal.statusbar .frame.flat .flat.button {
     border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-    padding: 2px 5px;
-}
-
-PlumaCloseButton.button.flat,
-PlumaCloseButton.button.flat:hover,
-PlumaCloseButton:prelight.button.flat,
-PlumaCloseButton:prelight.button.flat:hover {
-    padding: 1px;
-}
-
-/* surpress styling of close button */
-PlumaWindow .notebook tab .button.flat,
-PlumaWindow .notebook tab .button.flat:hover {
-    border-color: transparent;
-    background-color: transparent;
-    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;
-    border-image: none;
-    padding: 1px;
+    padding: 0px;
 }
 
-PlumaWindow .notebook tab.top {
-    padding: 6px 0px 6px 6px;
+.pluma-window statusbar.horizontal frame button.flat.toggle GtkArrow {
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+    -GtkArrow-arrow-scaling: 1.0; /* deprecated, but ignored */
 }
 
 /* Printpreview */
+.pluma-print-preview toolbar.horizontal,
 PlumaPrintPreview.vertical .toolbar.horizontal {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_bg_color, 1.0),
@@ -787,25 +676,44 @@ PlumaPrintPreview.vertical .toolbar.horizontal {
     padding: 0px;
 }
 
+.pluma-print-preview toolbar.horizontal entry,
 PlumaPrintPreview.vertical .toolbar.horizontal GtkToolItem .horizontal .entry {
     padding: 4px 6px;
 }
 
+.pluma-print-preview toolbar.horizontal button.flat.image-button,
 PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.image-button {
     padding: 0px;
 }
 
+.pluma-print-preview toolbar.horizontal button.flat.text-button,
 PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.text-button {
     padding: 0px 16px;
     border-radius: 2px;
 }
 
+.pluma-print-preview toolbar.horizontal toolbutton button.flat.text-button {
+    color: @theme_fg_color;
+    border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+    background-image: linear-gradient(to bottom,
+                                      @button_gradient_color_a,
+                                      @button_gradient_color_b);
+}
+
+.pluma-print-preview toolbar.horizontal toolbutton button.flat.text-button:hover {
+    color: @internal_element_prelight;
+    background-image: linear-gradient(to bottom,
+                                      @button_hover_gradient_color_a,
+                                      @button_hover_gradient_color_b);
+}
+
+.pluma-print-preview scrolledwindow,
 PlumaPrintPreview.vertical GtkLayout {
     background-color: @theme_base_color;
 }
 
 /* sidebar file-browser */
-PlumaPanel.vertical {
+.pluma-window paned.horizontal box.vertical {
     border-radius: 4px 4px 0px 0px;
     border-width: 1px 0px 0px 0px;
     border-style: solid;
@@ -813,10 +721,16 @@ PlumaPanel.vertical {
     box-shadow: none;
 }
 
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical,
 PlumaFileBrowserWidget.vertical {
     background-color: @theme_bg_color;
 }
 
+.pluma-window paned.horizontal box.vertical box.horizontal button.flat {
+    padding: 0px ;
+}
+
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal,
 PlumaFileBrowserWidget.vertical .toolbar.horizontal {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_bg_color, 1.0),
@@ -830,70 +744,47 @@ PlumaFileBrowserWidget.vertical .toolbar.horizontal {
     padding: 4px 0px;
 }
 
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat,
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat.menu-button,
 PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat,
 PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat.menu-button {
     padding: 4px 2px ;
 }
 
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat.image-button,
 PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat.image-button {
     padding: 4px 3px ;
 }
 
 /* color of of expander arrow */
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical expander:hover,
 PlumaFileBrowserWidget.vertical GtkExpander:hover {
     color: @theme_fg_color;
 }
 
-/***********************
- * Mate-Control-Center *
- ***********************/
-
-/* background */
-ShellWindow AppResizer .view {
-    background-color: @theme_base_color;
-}
-
-/* button of sidebar */
-ShellWindow .button.flat {
-    border-image: none;
-    padding: 4px 1px;
-}
-
-ShellWindow .button.flat:hover {
-    padding: 4px 1px;
-
-}
-
-/* button of applications */
-ShellWindow GtkScrolledWindow .button.flat {
-    padding: 4px 0px;
-    border-image: none;
-}
-
-ShellWindow GtkScrolledWindow .button.flat:hover {
-    background-color: transparent;
-    background-image: linear-gradient(to bottom,
-                                      @button_hover_gradient_color_a,
-                                      @button_hover_gradient_color_b);
-    border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-    padding: 4px 0px;
-}
-
 /*********
  * Atril *
  *********/
 
 /* size of page entry */
+.atril-window .primary-toolbar toolbar toolitem box.horizontal entry,
 EvPageActionWidget .entry {
     padding: 2px;
 }
 
+.atril-window .primary-toolbar toolbar button,
+.atril-window .primary-toolbar toolbar button.flat,
 EvWindow .toolbar .button,
 EvWindow .toolbar .button.flat {
-    padding: 0px 4px;
+    padding: 5px;
+}
+
+.atril-window .primary-toolbar toolbar button.combo {
+    padding: 6px;
 }
 
 /* atril and eom */
+dialog.background>box.vertical.dialog-vbox>box.vertical>scrolledwindow>viewport.frame,
 EggToolbarEditor.vertical GtkScrolledWindow .frame {
     background-color: shade (@theme_base_color, 1.0);
     border-color: @borders;
@@ -906,27 +797,36 @@ EggToolbarEditor.vertical GtkScrolledWindow .frame {
  * Eom *
  *******/
 
+.eom-window .vertical .vertical .vertical .horizontal button.flat:first-child,
 EomThumbNav .button.flat:first-child {
     border-radius: 4px 0px 0px 4px;
     border-width: 1px 0px 1px 1px;
 }
 
+.eom-window .vertical .vertical .vertical .horizontal button.flat:last-child,
 EomThumbNav .button.flat:last-child {
     border-radius: 0px 4px 4px 0px;
     border-width: 1px 1px 1px 0px;
 }
 
+.eom-window .vertical .vertical .vertical .horizontal button.flat,
 EomThumbNav .button.flat {
     border-image: none;
     border-color: @unfocused_borders;
 }
 
+.eom-window .vertical .vertical .vertical .horizontal button.flat:hover,
 EomThumbNav .button.flat:hover {
     border-image: none;
     border-color: @menu_combobox_border;
 }
 
-EomThumbNav .button.flat:insensitive {
+.eom-window .vertical .vertical .vertical .horizontal button.flatdisabled,
+EomThumbNav .button.flat:disabled {
     border-color: transparent;
 }
 
+.eom-window .vertical statusbar.horizontal frame {
+    border-style: none;
+}
+
diff --git a/desktop-themes/BlueMenta/gtk-3.0/other-applications.css b/desktop-themes/BlueMenta/gtk-3.0/other-applications.css
index 141a07f1..779216b8 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/other-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/other-applications.css
@@ -2,90 +2,45 @@
  * NEMO File manager *
  *********************/
 
-/* for breadcrumbs path bar */
-
-.nemo-pathbar-button,
-NemoPathbarButton {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90)));
-	border-color: #979797;
-	color: @theme_fg_color;
-	-NemoPathbarButton-border-radius: 3px;
-}
-
-NemoPathbarButton:active {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0)));
-}
-
-NemoPathbarButton:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85)));
-}
-
-NemoPathbarButton:active:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)));
-}
-
 /* workaround for broken first/last-child logic with linked buttons
-   in pathbar with gtk+-3.18 */
-NemoPathBar:dir(ltr).raised.linked .button.text-button,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:only-child {
-	border-right-width: 1px;
-	border-left-width: 1px;
-	border-image-width: 3px 3px 4px 3px;
-	border-radius: 4px;
-}
-
-/* New */
-toolbar.primary-toolbar.horizontal NemoPathBar.raised.linked button:first-child GtkArrow {
-      -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
-}
-
-toolbar.primary-toolbar.horizontal NemoPathBar.raised.linked button:last-child GtkArrow {
-      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+   in pathbar since gtk+-3.18 */
+.nemo-window NemoPathBar.raised.linked button.text-button,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover:active,
+.nemo-window NemoPathBar.raised.linked button.text-button:active,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active,
+.nemo-window NemoPathBar.raised.linked button.text-button:first-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover:first-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover:active:first-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:active:first-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:first-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:first-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active:first-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:last-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover:last-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover:active:last-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:active:last-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:last-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:last-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active:last-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:only-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover:only-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover:active:only-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:active:only-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:only-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:only-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active:only-child {
+    border-right-width: 1px;
+    border-left-width: 1px;
+    border-image-width: 3px 3px 4px 3px;
+    border-radius: 4px;
+    border-style: solid;
 }
 
-
 /* For Places Sidebar diskfull indicators */
-
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view,
 NemoPlacesTreeView {
 	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
 	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
@@ -95,40 +50,39 @@ NemoPlacesTreeView {
 	-NemoPlacesTreeView-disk-full-max-length: 70px;
 }
 
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:selected,
 NemoPlacesTreeView:selected {
 	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
 	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
 }
 
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:hover,
 NemoPlacesTreeView:hover {
 }
 
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:selected:hover,
 NemoPlacesTreeView:selected:hover {
 }
 
 @define-color cluebar_color shade (@theme_base_color, 0.9);
 
-NemoWindow * {
-	-GtkPaned-handle-size: 0;
-}
-
-NemoWindow .view {
+/* view */
+.nemo-window-pane notebook scrolledwindow {
 	background-color: @theme_base_color;
 }
 
-NemoWindow .rubberband,
-NemoWindow .view.rubberband {
+.nemo-window .rubberband,
+.nemo-window .view.rubberband {
 	background-color: alpha (@theme_selected_bg_color, 0.35);
 }
 
 /* sidebar */
-
-NemoWindow .sidebar .view {
+.nemo-window .sidebar .view {
 	background-color: shade (@theme_bg_color, 1.08);
 	color: @theme_fg_color;
 }
 
-NemoWindow .sidebar .frame {
+.nemo-window .sidebar scrolledwindow.frame {
 	border-right-width: 1px;
 	border-style: solid;
 	border-color: shade (@theme_bg_color, 0.90);
@@ -137,18 +91,21 @@ NemoWindow .sidebar .frame {
 	border-bottom: none;
 }
 
-NemoWindow .sidebar row:selected {
+.nemo-window .sidebar treeview .cell:selected {
+	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 }
 
-NemoWindow .sidebar row:backdrop:selected {
-	color: @theme_fg_color;
-	text-shadow: none; 
+.nemo-window .sidebar treeview .cell:hover {
+	background-color: shade (@theme_selected_bg_color, 1.15);
+	color: @theme_selected_fg_color;
 }
 
-NemoWindow .sidebar row:hover {
-	background-color: shade (@theme_selected_bg_color, 1.15);
-	color: shade (@theme_selected_bg_color, 0.35);
+.nemo-window .sidebar scrollbar.vertical.left trough {
+	border-width: 0px 0px 0px 1px;
+	border-radius: 0;
+	border-style: solid;
+	border-color: shade (@theme_bg_color, 0.84);
 }
 
 /* desktop mode */
@@ -170,53 +127,41 @@ NemoWindow .sidebar row:hover {
 }
 
 .nemo-desktop.nemo-canvas-item:active,
-.nemo-desktop.nemo-canvas-item:prelight,
+.nemo-desktop.nemo-canvas-item:hover,
 .nemo-desktop.nemo-canvas-item:selected {
 	text-shadow: none;
 }
 
 /* inactive pane */
-
-.nemo-inactive-pane .view {
+/* bug in gtk+, .view writes no bg color in all browsers */
+.nemo-inactive-pane .view,
+.nemo-inactive-pane scrolledwindow,
+.nemo-inactive-pane scrolledwindow treeview {
 	background-color: shade(@theme_base_color, 0.9);
 }
 
-/* Toolbar */
-NemoToolbar .toolbar.primary-toolbar .button.image-button {
+/* Primary Toolbar */
+.nemo-window toolbar.primary-toolbar.horizontal button.image-button {
     padding: 0px 8px;
 }
 
-NemoToolbar .toolbar.primary-toolbar .button.text-button {
+.nemo-window toolbar.primary-toolbar.horizontal button.text-button {
     padding: 0px 10px;
 }
 
-/* Misc */
-NemoView.frame,
-NemoNotebook.notebook {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-bottom-width: 0;
+/* statusbar */
+.nemo-window box.toolbar.horizontal {
+    padding: 0px;
 }
 
-NemoNotebook.notebook tab.top,
-NemoNotebook.notebook tab.bottom {
-	border-right-width: 1px;
-	border-left-width: 1px;
-}
-
-NemoNotebook .frame {
-	border-width: 1px 0 0 0;
-}
+/* Misc */
 
 .nemo-cluebar-label {
 	font: normal;
 	text-shadow: 0 1px shade (@cluebar_color, 1.06);
 }
 
-NemoTrashBar.info,
-NemoXContentBar.info,
-NemoSearchBar.info,
-NemoQueryEditor.info {
+.nemo-window-pane infobar.info {
 	background-color: @cluebar_color;
 	border-bottom-color: shade (@cluebar_color, 0.92);
 	border-radius: 0;
@@ -225,11 +170,9 @@ NemoQueryEditor.info {
 	color: @theme_fg_color;
 }
 
-NemoTrashBar .button,
-NemoXContentBar .button,
-NemoSearchBar .button,
-NemoQueryEditor .button {
-	border-radius: 0;
+.nemo-window-pane box.toolbar.primary-toolbar.vertical revealer button.radio.text-button {
+    padding: 6px;
+    border-style: solid;
 }
 
 /****************
@@ -358,13 +301,6 @@ DConfWindow DConfKeyView.view row:hover {
     color: shade (@theme_selected_bg_color, 0.35);
 }
 
-/* the small line between sidebar and view */
-DConfWindow GtkPaned.horizontal {
-    -GtkPaned-handle-size: 3px;
-    border-color: transparent;
-    background-color: @theme_bg_color;
-}
-
 DConfKeyView.view row:selected,
 DConfKeyView.view row:selected:hover  {
     color:  @theme_selected_fg_color;
@@ -387,6 +323,33 @@ DConfKeyView.view .spinbutton .button:last-child {
     border-radius: 0 2px 2px 0;
 }
 
+/***********
+ * Lightdm *
+ ***********/
+
+#login_window.background.lightdm-gtk-greeter {
+	border-radius: 10px;
+}
+
+#login_window.background.lightdm-gtk-greeter,
+#login_window.background.lightdm-gtk-greeter box.vertical {
+	border-radius: 10px;
+    border-style: solid;
+    border-width: 2px;
+    border-color: black;
+}
+
+#login_window.background.lightdm-gtk-greeter frame {
+	border-style: none;
+}
+
+#login_window.background.lightdm-gtk-greeter #prompt_entry,
+#login_window.background.lightdm-gtk-greeter button.combo,
+#login_window.background.lightdm-gtk-greeter button.text-button,
+#login_window.background.lightdm-gtk-greeter button.text-button.default {
+	padding: 8px 4px;
+}
+
 /*****************
  * Ubuntu styles *
  *****************/