GTK+-3.20 TraditionalOK: first raw port to 3.20

4 files changed, 1163 insertions, 1284 deletions

diff --git a/desktop-themes/TraditionalOk/gtk-3.0/applications.css b/desktop-themes/TraditionalOk/gtk-3.0/applications.css
index 5ac5de64..4b36e396 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/applications.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/applications.css
@@ -2,92 +2,22 @@
  * Nautilus *
  ************/
 
-/*
 .nautilus-desktop.nautilus-canvas-item {
 	color: @theme_base_color;
-	text-shadow: 1 1 alpha (@theme_fg_color, 0.8);
+	text-shadow: 1px 1px alpha (@theme_fg_color, 0.8);
 }
 
 .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;
 }
-*/
 
 .nautilus-desktop .entry {
 	background-image: none;
 	border-image: none;
 }
 
-NautilusToolbar .linked.raised GtkToggleButton.button:first-child,
-NautilusToolbar .linked.raised GtkToggleButton.button:first-child:active:hover {
-	border-right-width: 1px;
-}
-
-/*********
- * gedit *
- *********/
-
-GeditMenuStackSwitcher.button.flat {
-	border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-	border-radius: 3px;
-	border-width: 1px 1px 2px 1px;
-	border-style: solid;
-	border-color: transparent;
-}
-
-.gedit-side-panel-paned,
-.gedit-bottom-panel-paned,
-.gedit-bottom-panel-stack-switcher .notebook GtkBox.vertical {
-	border-style: solid;
-	border-color: @toolbar_border_top_color;
-}
-
-.gedit-side-panel-paned {
-	border-width: 0px 1px 0px 0px;
-}
-
-.gedit-bottom-panel-paned {
-	border-width: 1px 0px 0px 0px;
-}
-
-.gedit-bottom-panel-stack-switcher .notebook GtkBox.vertical {
-	border-width: 1px;
-}
-
-.gedit-menu-stack-switcher {
-	padding: 15px 15px 2px 15px;
-}
-
-GeditMultiNotebook .notebook {
-	border-width: 0px 0px 1px 1px;
-}
-
-GeditViewFrame .gedit-search-slider {
-	padding: 4px;
-	border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
-}
-
-.gedit-search-entry-occurrences-tag {
-	color: @theme_text_color;
-	background-color: @theme_bg_color;
-	margin: 2px 0px 2px 2px;
-	padding: 2px;
-}
-
-GeditStatusbar .frame.flat {
-	border: none;
-}
-
-/**********
- * evince *
- **********/
-
-EvPageActionWidget .linked .entry:first-child {
-	border-right-width: 0px;
-}
-
 /*******************
  * gnome-documents *
  *******************/
@@ -126,15 +56,6 @@ GtkIconView.documents-main-view.check {
 	border-radius: 3px;
 }
 
-/******************
- * gnome-terminal *
- ******************/
-
-TerminalScreen {
-	background-color: @theme_base_color;
-	color: @theme_fg_color;
-}
-
 /*********
  * Unity *
  *********/
@@ -147,7 +68,7 @@ UnityPanelWidget,
 	border-width: 0;
 }
 
-.unity-panel.menubar.menuitem:hover {
+.unity-panel menubar menuitem:hover {
 	background-color: @menu_bg_color;
 	border-style: solid;
 	border-width: 1px 1px 0px;
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css
index c0aff763..5cf090da 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css
@@ -6,7 +6,7 @@
  * GtkSwitch *
  *************/
 
-GtkSwitch.slider {
+switch slider {
 	background-image: linear-gradient(to bottom,
 	                      alpha (@switch_slider_gradient_a, 0.5),
 	                      alpha (@switch_slider_gradient_b, 0.5) 50%,
@@ -17,7 +17,7 @@ GtkSwitch.slider {
 	background-position: center center;
 }
 
-GtkSwitch.slider:insensitive {
+switch slider:disabled {
 	background-image: linear-gradient(to bottom,
 	                      alpha (@switch_slider_insensitive_gradient_a, 0.8),
 	                      alpha (@switch_slider_insensitive_gradient_b, 0.8) 50%,
@@ -26,24 +26,16 @@ GtkSwitch.slider:insensitive {
 	                  url("img/slider-horz-grip.png");
 }
 
-/***************
- * Resize grip *
- ***************/
-
-.grip {
-	background-image: url("img/resize-grip.png");
-}
-
 /*************
  * Scrollbar *
  *************/
 
-.scrollbar.slider {
+scrollbar slider {
 	background-repeat: no-repeat;
 	background-position: center center;
 }
 
-.scrollbar.slider.vertical {
+scrollbar.vertical slider {
 	background-image: linear-gradient(to right,
 	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
 	                      alpha (@scrollbar_slider_gradient_a, 0.5) 1px,
@@ -54,7 +46,7 @@ GtkSwitch.slider:insensitive {
 	                  url("img/slider-vert-grip.png");
 }
 
-.scrollbar.slider.horizontal {
+scrollbar.horizontal slider {
 	background-image: linear-gradient(to bottom,
 	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
 	                      alpha (@scrollbar_slider_gradient_a, 0.5) 1px,
@@ -65,7 +57,7 @@ GtkSwitch.slider:insensitive {
 	                  url("img/slider-horz-grip.png");
 }
 
-.scrollbar.slider.vertical:hover {
+scrollbar.vertical slider:hover {
 	background-image: linear-gradient(to right,
 	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
 	                      alpha (@scrollbar_slider_hover_gradient_a, 0.5) 1px,
@@ -76,7 +68,7 @@ GtkSwitch.slider:insensitive {
 	                  url("img/slider-vert-grip.png");
 }
 
-.scrollbar.slider.horizontal:hover {
+scrollbar.horizontal slider:hover {
 	background-image: linear-gradient(to bottom,
 	                      alpha (@scrollbar_slider_inner_border_color, 0.5),
 	                      alpha (@scrollbar_slider_hover_gradient_a, 0.5) 1px,
@@ -91,129 +83,129 @@ GtkSwitch.slider:insensitive {
  * Check and Radio items *
  *************************/
 
-.check,
-.check row:selected,
-.check row:selected:focus {
+check,
+check row:selected,
+check row:selected:focus {
 	-gtk-icon-source: url("img/checkbox-unchecked.png");
 }
 
-.check:hover,
-.check row:selected:hover,
-.check row:selected:focus:hover {
+check:hover,
+check row:selected:hover,
+check row:selected:focus:hover {
 	-gtk-icon-source: url("img/checkbox-unchecked-hover.png");
 }
 
-.check:insensitive,
-.check row:selected:insensitive,
-.check row:selected:focus:insensitive {
+check:disabled,
+check row:selected:disabled,
+check row:selected:focus:disabled {
 	-gtk-icon-source: url("img/checkbox-unchecked-insensitive.png");
 }
 
-.check:checked,
-.check row:selected:checked,
-.check row:selected:focus:checked,
-.check:active,
-.check row:selected:active,
-.check row:selected:focus:active {
+check:checked,
+check row:selected:checked,
+check row:selected:focus:checked,
+check:active,
+check row:selected:active,
+check row:selected:focus:active {
 	-gtk-icon-source: url("img/checkbox-checked.png");
 }
 
-.check:checked:hover,
-.check row:selected:checked:hover,
-.check row:selected:focus:checked:hover,
-.check:active:hover,
-.check row:selected:active:hover,
-.check row:selected:focus:active:hover {
+check:checked:hover,
+check row:selected:checked:hover,
+check row:selected:focus:checked:hover,
+check:active:hover,
+check row:selected:active:hover,
+check row:selected:focus:active:hover {
 	-gtk-icon-source: url("img/checkbox-checked-hover.png");
 }
 
-.check:checked:insensitive,
-.check row:selected:checked:insensitive,
-.check row:selected:focus:checked:insensitive,
-.check:active:insensitive,
-.check row:selected:active:insensitive,
-.check row:selected:focus:active:insensitive {
+check:checked:disabled,
+check row:selected:checked:disabled,
+check row:selected:focus:checked:disabled,
+check:active:disabled,
+check row:selected:active:disabled,
+check row:selected:focus:active:disabled {
 	-gtk-icon-source: url("img/checkbox-checked-insensitive.png");
  }
 
-.check:inconsistent,
-.check row:selected:inconsistent,
-.check row:selected:focus:inconsistent {
+check:indeterminate,
+check row:selected:indeterminate,
+check row:selected:focus:indeterminate {
 	-gtk-icon-source: url("img/checkbox-mixed.png");
 }
 
-.check:inconsistent:hover,
-.check row:selected:inconsistent:hover,
-.check row:selected:focus:inconsistent:hover {
+check:indeterminate:hover,
+check row:selected:indeterminate:hover,
+check row:selected:focus:indeterminate:hover {
 	-gtk-icon-source: url("img/checkbox-mixed-hover.png");
 }
 
-.check:inconsistent:insensitive,
-.check row:selected:inconsistent:insensitive,
-.check row:selected:focus:inconsistent:insensitive {
+check:indeterminate:disabled,
+check row:selected:indeterminate:disabled,
+check row:selected:focus:indeterminate:disabled {
 	-gtk-icon-source: url("img/checkbox-mixed-insensitive.png");
 }
 
-.radio,
-.radio row:selected,
-.radio row:selected:focus {
+radio,
+radio row:selected,
+radio row:selected:focus {
 	-gtk-icon-source: url("img/radio-unchecked.png");
 }
 
-.radio:hover,
-.radio row:selected:hover,
-.radio row:selected:focus:hover {
+radio:hover,
+radio row:selected:hover,
+radio row:selected:focus:hover {
 	-gtk-icon-source: url("img/radio-unchecked-hover.png");
 }
 
-.radio:insensitive,
-.radio row:selected:insensitive,
-.radio row:selected:focus:insensitive {
+radio:disabled,
+radio row:selected:disabled,
+radio row:selected:focus:disabled {
 	-gtk-icon-source: url("img/radio-unchecked-insensitive.png");
 }
 
-.radio:checked,
-.radio row:selected:checked,
-.radio row:selected:focus:checked,
-.radio:active,
-.radio row:selected:active,
-.radio row:selected:focus:active {
+radio:checked,
+radio row:selected:checked,
+radio row:selected:focus:checked,
+radio:active,
+radio row:selected:active,
+radio row:selected:focus:active {
 	-gtk-icon-source: url("img/radio-checked.png");
 }
 
-.radio:checked:hover,
-.radio row:selected:checked:hover,
-.radio row:selected:focus:checked:hover,
-.radio:active:hover,
-.radio row:selected:active:hover,
-.radio row:selected:focus:active:hover {
+radio:checked:hover,
+radio row:selected:checked:hover,
+radio row:selected:focus:checked:hover,
+radio:active:hover,
+radio row:selected:active:hover,
+radio row:selected:focus:active:hover {
 	-gtk-icon-source: url("img/radio-checked-hover.png");
 }
  
-.radio:checked:insensitive,
-.radio row:selected:checked:insensitive,
-.radio row:selected:focus:checked:insensitive,
-.radio:active:insensitive,
-.radio row:selected:active:insensitive,
-.radio row:selected:focus:active:insensitive {
+radio:checked:disabled,
+radio row:selected:checked:disabled,
+radio row:selected:focus:checked:disabled,
+radio:active:disabled,
+radio row:selected:active:disabled,
+radio row:selected:focus:active:disabled {
 	-gtk-icon-source: url("img/radio-checked-insensitive.png");
 }
  
-.radio:inconsistent,
-.radio row:selected:inconsistent,
-.radio row:selected:focus:inconsistent {
+radio:indeterminate,
+radio row:selected:indeterminate,
+radio row:selected:focus:indeterminate {
 	-gtk-icon-source: url("img/radio-mixed.png");
 }
  
-.radio:inconsistent:hover,
-.radio row:selected:inconsistent:hover,
-.radio row:selected:focus:inconsistent:hover {
+radio:indeterminate:hover,
+radio row:selected:indeterminate:hover,
+radio row:selected:focus:indeterminate:hover {
 	-gtk-icon-source: url("img/radio-mixed-hover.png");
 }
  
-.radio:inconsistent:insensitive,
-.radio row:selected:inconsistent:insensitive,
-.radio row:selected:focus:inconsistent:insensitive {
+radio:indeterminate:disabled,
+radio row:selected:indeterminate:disabled,
+radio row:selected:focus:indeterminate:disabled {
 	-gtk-icon-source: url("img/radio-mixed-insensitive.png");
 }
 
@@ -221,78 +213,78 @@ GtkSwitch.slider:insensitive {
  * GtkScale's slider *
  *********************/
  
-GtkScale.slider,
-GtkScale.slider.horizontal {
+scale slider,
+scale.horizontal slider {
 	background-image: url("img/scale-slider-horz.png");
 }
 
-GtkScale.slider:hover,
-GtkScale.slider.horizontal:hover {
+scale slider:hover,
+scale.horizontal slider:hover {
 	background-image: url("img/scale-slider-horz-hover.png");
 }
 
-GtkScale.slider:insensitive,
-GtkScale.slider.horizontal:insensitive {
+scale slider:disabled,
+scale.horizontal slider:disabled {
 	background-image: url("img/scale-slider-horz-insensitive.png");
 }
 
-GtkScale.slider.vertical {
+scale.vertical slider {
 	background-image: url("img/scale-slider-vert.png");
 }
 
-GtkScale.slider.vertical:hover {
+scale.vertical slider:hover {
 	background-image: url("img/scale-slider-vert-hover.png");
 }
 
-GtkScale.slider.vertical:insensitive {
+scale.vertical slider:disabled {
 	background-image: url("img/scale-slider-vert-insensitive.png");
 }
 
-GtkScale.scale-has-marks-above.slider.horizontal {
+scale.horizontal.scale-has-marks-above slider {
 	background-image: url("img/scale-slider-horz.png");
 }
 
-GtkScale.scale-has-marks-above.slider.horizontal:hover {
+scale.horizontal.scale-has-marks-above slider:hover {
 	background-image: url("img/scale-slider-horz-hover.png");
 }
 
-GtkScale.scale-has-marks-above.slider.horizontal:insensitive {
+scale.horizontal.scale-has-marks-above slider:disabled {
 	background-image: url("img/scale-slider-horz-insensitive.png");
 }
 
-GtkScale.scale-has-marks-above.slider.vertical {
+scale.vertical.scale-has-marks-above slider {
 	background-image: url("img/scale-slider-vert.png");
 }
 
-GtkScale.scale-has-marks-above.slider.vertical:hover {
+scale.vertical.scale-has-marks-above slider:hover {
 	background-image: url("img/scale-slider-vert-hover.png");
 }
 
-GtkScale.scale-has-marks-above.slider.vertical:insensitive {
+scale.vertical.scale-has-marks-above slider:disabled {
 	background-image: url("img/scale-slider-vert-insensitive.png");
 }
 
-GtkScale.scale-has-marks-below.slider.horizontal {
+scale.horizontal.scale-has-marks-below slider {
 	background-image: url("img/scale-slider-horz.png");
 }
 
-GtkScale.scale-has-marks-below.slider.horizontal:hover {
+scale.horizontal.scale-has-marks-below slider:hover {
 	background-image: url("img/scale-slider-horz-hover.png");
 }
 
-GtkScale.scale-has-marks-below.slider.horizontal:insensitive {
+scale.horizontal.scale-has-marks-below slider:disabled {
 	background-image: url("img/scale-slider-horz-insensitive.png");
 }
 
-GtkScale.scale-has-marks-below.slider.vertical {
+scale.vertical.scale-has-marks-below slider {
 	background-image: url("img/scale-slider-vert.png");
 }
 
-GtkScale.scale-has-marks-below.slider.vertical:hover {
+scale.vertical.scale-has-marks-below slider:hover {
 	background-image: url("img/scale-slider-vert-hover.png");
 }
 
-GtkScale.scale-has-marks-below.slider.vertical:insensitive {
+scale.vertical.scale-has-marks-below slider:disabled {
 	background-image: url("img/scale-slider-vert-insensitive.png");
 }
 
@@ -300,72 +292,72 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive {
  * Menus *
  *********/
 
-.menu .menuitem.check {
+menu menuitem check {
 	-gtk-icon-source: url("img/menuitem-checkbox.png");
 }
 
-.menu .menuitem.check:hover {
+menu menuitem check:hover {
 	-gtk-icon-source: url("img/menuitem-checkbox-hover.png");
 }
 
-.menu .menuitem.check:insensitive {
+menu menuitem check:disabled {
 	-gtk-icon-source: url("img/menuitem-checkbox-insensitive.png");
 }
 
-.menu .menuitem.check:checked,
-.menu .menuitem.check:active {
+menu menuitem check:checked,
+menu menuitem check:active {
 	-gtk-icon-source: url("img/menuitem-checkbox-checked.png");
 }
 
-.menu .menuitem.check:checked:hover,
-.menu .menuitem.check:active:hover {
+menu menuitem check:checked:hover,
+menu menuitem check:active:hover {
 	-gtk-icon-source: url("img/menuitem-checkbox-checked-hover.png");
 }
 
-.menu .menuitem.check:checked:insensitive,
-.menu .menuitem.check:active:insensitive {
+menu menuitem check:checked:disabled,
+menu menuitem check:active:disabled {
 	-gtk-icon-source: url("img/menuitem-checkbox-checked-insensitive.png");
 }
 
-.menu .menuitem.check:inconsistent,
-.menu .menuitem.radio:inconsistent {
+menu menuitem check:indeterminate,
+menu menuitem radio:indeterminate {
 	-gtk-icon-source: url("img/menuitem-checkbox-mixed.png");
 }
 
-.menu .menuitem.check:inconsistent:hover,
-.menu .menuitem.radio:inconsistent:hover {
+menu menuitem check:indeterminate:hover,
+menu menuitem radio:indeterminate:hover {
 	-gtk-icon-source: url("img/menuitem-checkbox-mixed-hover.png");
 }
 
-.menu .menuitem.check:inconsistent:insensitive,
-.menu .menuitem.radio:inconsistent:insensitive {
+menu menuitem check:indeterminate:disabled,
+menu menuitem radio:indeterminate:disabled {
 	-gtk-icon-source: url("img/menuitem-checkbox-mixed-insensitive.png");
 }
 
-.menu .menuitem.radio {
+menu menuitem radio {
 	-gtk-icon-source: url("img/menuitem-radio.png");
 }
 
-.menu .menuitem.radio:hover {
+menu menuitem radio:hover {
 	-gtk-icon-source: url("img/menuitem-radio-hover.png");
 }
 
-.menu .menuitem.radio:insensitive {
+menu menuitem radio:disabled {
 	-gtk-icon-source: url("img/menuitem-radio-insensitive.png");
 }
 
-.menu .menuitem.radio:checked,
-.menu .menuitem.radio:active {
+menu menuitem radio:checked,
+menu menuitem radio:active {
 	-gtk-icon-source: url("img/menuitem-radio-checked.png");
 }
 
-.menu .menuitem.radio:checked:hover,
-.menu .menuitem.radio:active:hover {
+menu menuitem radio:checked:hover,
+menu menuitem radio:active:hover {
 	-gtk-icon-source: url("img/menuitem-radio-checked-hover.png");
 }
 
-.menu .menuitem.radio:checked:insensitive,
-.menu .menuitem.radio:active:insensitive {
+menu menuitem radio:checked:disabled,
+menu menuitem radio:active:disabled {
 	-gtk-icon-source: url("img/menuitem-radio-checked-insensitive.png");
 }
 
@@ -373,11 +365,11 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive {
  * Panes *
  *********/
 
-.pane-separator {
+paned > separator {
 	background-image: url("img/pane-separator-grip-horz.png");
 }
 
-.pane-separator.vertical {
+paned.vertical > separator {
 	background-image: url("img/pane-separator-grip-vert.png");
 }
 
@@ -386,39 +378,39 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive {
  ***********/
 
 /* generic element borders */
-.entry,
-.combobox-entry .entry,
-.combobox-entry .button,
-.button:active,
-.trough,
-.trough.highlight,
-GtkSwitch.trough,
+entry,
+combobox entry,
+combobox entry button,
+button:active,
+trough,
+trough highlight,
+switch,
 /* generic button borders */
-.button,
-.button.flat:active,
-.button.flat:hover,
+button,
+button.flat:active,
+button.flat:hover,
 .menu-button:active,
-.titlebar .titlebutton:hover,
-.primary-toolbar .button:checked,
-.titlebar .titlebutton:hover,
-.primary-toolbar .button.raised,
-.primary-toolbar .raised .button,
-.primary-toolbar GtkComboBox .button,
+.titlebar button.titlebutton:hover,
+toolbar.primary-toolbar button:checked,
+.titlebar button.titlebutton:hover,
+toolbar.primary-toolbar button.raised,
+toolbar.primary-toolbar .raised button,
+toolbar.primary-toolbar combobox button,
 /* primary toolbar - generic element borders */
-.primary-toolbar .entry,
-.primary-toolbar .combobox-entry .entry,
-.primary-toolbar .combobox-entry .button,
-.primary-toolbar .button:active,
-.primary-toolbar .button.raised:active,
-.primary-toolbar .raised .button:active,
-.primary-toolbar .button.raised:insensitive,
-.primary-toolbar .raised .button:insensitive,
-.primary-toolbar GtkSwitch.trough,
-.primary-toolbar GtkSwitch.trough:insensitive,
-.primary-toolbar GtkComboBox .button:active,
-.primary-toolbar GtkComboBox .button:insensitive,
+toolbar.primary-toolbar entry,
+toolbar.primary-toolbar combobox entry,
+toolbar.primary-toolbar combobox button,
+toolbar.primary-toolbar button:active,
+toolbar.primary-toolbar button.raised:active,
+toolbar.primary-toolbar .raised button:active,
+toolbar.primary-toolbar button.raised:disabled,
+toolbar.primary-toolbar .raised button:disabled,
+toolbar.primary-toolbar switch,
+toolbar.primary-toolbar switch:disabled,
+toolbar.primary-toolbar combobox button:active,
+toolbar.primary-toolbar combobox button:disabled,
 /* primary toolbar - hover button borders */
-.primary-toolbar .button:hover {
+toolbar.primary-toolbar button:hover {
 	border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
 	border-radius: 3px;
 	border-width: 1px 1px 2px 1px;
@@ -426,131 +418,131 @@ GtkSwitch.trough,
 	border-color: transparent;
 }
 
-.primary-toolbar .entry,
-.primary-toolbar .combobox-entry .entry {
+toolbar.primary-toolbar entry,
+toolbar.primary-toolbar combobox entry {
 	border-width: 1px 2px 2px;
 }
 
-.primary-toolbar .entry:focus,
-.primary-toolbar .combobox-entry .entry:focus {
+toolbar.primary-toolbar entry:focus,
+toolbar.primary-toolbar combobox entry:focus {
 	border-width: 1px 2px 2px;
 }
 
 /* Linked single button */
-.linked .entry:only-child,
-.linked .button:only-child,
-.linked .button:active:only-child,
-.linked .button:active:hover:only-child,
-.linked .button:focus:only-child,
-.linked .button:focus:active:only-child,
-.linked .button:insensitive:only-child,
+.linked entry:only-child,
+.linked button:only-child,
+.linked button:active:only-child,
+.linked button:active:hover:only-child,
+.linked button:focus:only-child,
+.linked button:focus:active:only-child,
+.linked button:disabled:only-child,
 /* Middle button (vertical) */
-.linked.vertical .entry,
-.linked.vertical .button,
-.linked.vertical .button:active,
-.linked.vertical .button:active:hover,
-.linked.vertical .button:focus,
-.linked.vertical .button:focus:active,
-.linked.vertical .button:insensitive,
+.linked.vertical entry,
+.linked.vertical button,
+.linked.vertical button:active,
+.linked.vertical button:active:hover,
+.linked.vertical button:focus,
+.linked.vertical button:focus:active,
+.linked.vertical button:disabled,
 /* Top button (vertical) */
-.linked.vertical .entry:first-child,
-.linked.vertical .button:first-child,
-.linked.vertical .button:active:first-child,
-.linked.vertical .button:active:hover:first-child,
-.linked.vertical .button:focus:first-child,
-.linked.vertical .button:focus:active:first-child,
-.linked.vertical .button:insensitive:first-child,
+.linked.vertical entry:first-child,
+.linked.vertical button:first-child,
+.linked.vertical button:active:first-child,
+.linked.vertical button:active:hover:first-child,
+.linked.vertical button:focus:first-child,
+.linked.vertical button:focus:active:first-child,
+.linked.vertical button:disabled:first-child,
 /* Bottom button (vertical) */
-.linked.vertical .entry:last-child,
-.linked.vertical .button:last-child,
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:focus:last-child,
-.linked.vertical .button:focus:active:last-child,
-.linked.vertical .button:insensitive:last-child,
+.linked.vertical entry:last-child,
+.linked.vertical button:last-child,
+.linked.vertical button:active:last-child,
+.linked.vertical button:active:hover:last-child,
+.linked.vertical button:focus:last-child,
+.linked.vertical button:focus:active:last-child,
+.linked.vertical button:disabled:last-child,
 /* Linked single button (vertical) */
-.linked.vertical .entry:only-child,
-.linked.vertical .button:only-child,
-.linked.vertical .button:active:only-child,
-.linked.vertical .button:active:hover:only-child,
-.linked.vertical .button:focus:only-child,
-.linked.vertical .button:focus:active:only-child,
-.linked.vertical .button:insensitive:only-child,
+.linked.vertical entry:only-child,
+.linked.vertical button:only-child,
+.linked.vertical button:active:only-child,
+.linked.vertical button:active:hover:only-child,
+.linked.vertical button:focus:only-child,
+.linked.vertical button:focus:active:only-child,
+.linked.vertical button:disabled:only-child,
 /* Linked buttons on primary toolbars */
 /* Middle button */
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .button.raised.linked:focus,
-.primary-toolbar .button.raised.linked:focus:active,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .raised.linked .button,
-.primary-toolbar .raised.linked .button:active,
-.primary-toolbar .raised.linked .button:focus,
-.primary-toolbar .raised.linked .button:focus:active,
-.primary-toolbar .raised.linked .button:insensitive,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar .button:focus,
-.inline-toolbar.toolbar .button:focus:active,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton .button,
-.inline-toolbar.toolbar GtkToolButton .button:active,
-.inline-toolbar.toolbar GtkToolButton .button:focus,
-.inline-toolbar.toolbar GtkToolButton .button:focus:active,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive,
+toolbar.primary-toolbar button.raised.linked,
+toolbar.primary-toolbar button.raised.linked:active,
+toolbar.primary-toolbar button.raised.linked:focus,
+toolbar.primary-toolbar button.raised.linked:focus:active,
+toolbar.primary-toolbar button.raised.linked:disabled,
+toolbar.primary-toolbar .raised.linked button,
+toolbar.primary-toolbar .raised.linked button:active,
+toolbar.primary-toolbar .raised.linked button:focus,
+toolbar.primary-toolbar .raised.linked button:focus:active,
+toolbar.primary-toolbar .raised.linked button:disabled,
+toolbar.inline-toolbar button,
+toolbar.inline-toolbar button:active,
+toolbar.inline-toolbar button:focus,
+toolbar.inline-toolbar button:focus:active,
+toolbar.inline-toolbar button:disabled,
+toolbar.inline-toolbar toolbutton button,
+toolbar.inline-toolbar toolbutton button:active,
+toolbar.inline-toolbar toolbutton button:focus,
+toolbar.inline-toolbar toolbutton button:focus:active,
+toolbar.inline-toolbar toolbutton button:disabled,
 /* Leftmost button */
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .button.raised.linked:active:first-child,
-.primary-toolbar .button.raised.linked:focus:first-child,
-.primary-toolbar .button.raised.linked:focus:active:first-child,
-.primary-toolbar .button.raised.linked:insensitive:first-child,
-.primary-toolbar .raised.linked .button:first-child,
-.primary-toolbar .raised.linked .button:active:first-child,
-.primary-toolbar .raised.linked .button:focus:first-child,
-.primary-toolbar .raised.linked .button:focus:active:first-child,
-.primary-toolbar .raised.linked .button:insensitive:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar .button:focus:first-child,
-.inline-toolbar.toolbar .button:focus:active:first-child,
-.inline-toolbar.toolbar .button:insensitive:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child .button,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:active,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:focus,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:focus:active,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive,
+toolbar.primary-toolbar button.raised.linked:first-child,
+toolbar.primary-toolbar button.raised.linked:active:first-child,
+toolbar.primary-toolbar button.raised.linked:focus:first-child,
+toolbar.primary-toolbar button.raised.linked:focus:active:first-child,
+toolbar.primary-toolbar button.raised.linked:disabled:first-child,
+toolbar.primary-toolbar .raised.linked button:first-child,
+toolbar.primary-toolbar .raised.linked button:active:first-child,
+toolbar.primary-toolbar .raised.linked button:focus:first-child,
+toolbar.primary-toolbar .raised.linked button:focus:active:first-child,
+toolbar.primary-toolbar .raised.linked button:disabled:first-child,
+toolbar.inline-toolbar button:first-child,
+toolbar.inline-toolbar button:active:first-child,
+toolbar.inline-toolbar button:focus:first-child,
+toolbar.inline-toolbar button:focus:active:first-child,
+toolbar.inline-toolbar button:disabled:first-child,
+toolbar.inline-toolbar toolbutton button :first-child,
+toolbar.inline-toolbar toolbutton button :first-child:active,
+toolbar.inline-toolbar toolbutton button :first-child:focus,
+toolbar.inline-toolbar toolbutton button :first-child:focus:active,
+toolbar.inline-toolbar toolbutton button :first-child:disabled,
 /* Rightmost button */
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .button.raised.linked:active:last-child,
-.primary-toolbar .button.raised.linked:focus:last-child,
-.primary-toolbar .button.raised.linked:focus:active:last-child,
-.primary-toolbar .button.raised.linked:insensitive:last-child,
-.primary-toolbar .raised.linked .button:last-child,
-.primary-toolbar .raised.linked .button:active:last-child,
-.primary-toolbar .raised.linked .button:focus:last-child,
-.primary-toolbar .raised.linked .button:focus:active:last-child,
-.primary-toolbar .raised.linked .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar .button:focus:last-child,
-.inline-toolbar.toolbar .button:focus:active:last-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child .button,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:active,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:focus,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:focus:active,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive,
+toolbar.primary-toolbar button.raised.linked:last-child,
+toolbar.primary-toolbar button.raised.linked:active:last-child,
+toolbar.primary-toolbar button.raised.linked:focus:last-child,
+toolbar.primary-toolbar button.raised.linked:focus:active:last-child,
+toolbar.primary-toolbar button.raised.linked:disabled:last-child,
+toolbar.primary-toolbar .raised.linked button:last-child,
+toolbar.primary-toolbar .raised.linked button:active:last-child,
+toolbar.primary-toolbar .raised.linked button:focus:last-child,
+toolbar.primary-toolbar .raised.linked button:focus:active:last-child,
+toolbar.primary-toolbar .raised.linked button:disabled:last-child,
+toolbar.inline-toolbar button:last-child,
+toolbar.inline-toolbar button:active:last-child,
+toolbar.inline-toolbar button:focus:last-child,
+toolbar.inline-toolbar button:focus:active:last-child,
+toolbar.inline-toolbar button:disabled:last-child,
+toolbar.inline-toolbar toolbutton button :last-child,
+toolbar.inline-toolbar toolbutton button :last-child:active,
+toolbar.inline-toolbar toolbutton button :last-child:focus,
+toolbar.inline-toolbar toolbutton button :last-child:focus:active,
+toolbar.inline-toolbar toolbutton button :last-child:disabled,
 /* Single button */
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar .button:focus:only-child,
-.inline-toolbar.toolbar .button:focus:active:only-child,
-.inline-toolbar.toolbar .button:insensitive:only-child,
-.inline-toolbar.toolbar GtkToolButton:only-child .button,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:active,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:focus,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:focus:active,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive {
+toolbar.inline-toolbar button:only-child,
+toolbar.inline-toolbar button:active:only-child,
+toolbar.inline-toolbar button:focus:only-child,
+toolbar.inline-toolbar button:focus:active:only-child,
+toolbar.inline-toolbar button:disabled:only-child,
+toolbar.inline-toolbar toolbutton button :only-child,
+toolbar.inline-toolbar toolbutton button :only-child:active,
+toolbar.inline-toolbar toolbutton button :only-child:focus,
+toolbar.inline-toolbar toolbutton button :only-child:focus:active,
+toolbar.inline-toolbar toolbutton button :only-child:disabled {
 	border-image: url("img/border-inline-button.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
 	border-radius: 3px;
 	border-width: 1px 1px 2px 1px;
@@ -558,13 +550,13 @@ GtkSwitch.trough,
 	border-color: transparent;
 }
 
-/* generic insensitive element borders */
-GtkSwitch.trough:insensitive,
-GtkComboBox.combobox-entry .entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.entry:insensitive,
-.button:insensitive,
-.trough row {
+/* generic disabled element borders */
+switch:disabled,
+combobox entry:disabled,
+combobox button:disabled,
+entry:disabled,
+button:disabled,
+trough row {
 	border-image: url("img/border-insensitive.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
 	border-radius: 3px;
 	border-width: 1px 1px 2px 1px;
@@ -572,39 +564,39 @@ GtkComboBox.combobox-entry .button:insensitive,
 	border-color: transparent;
 }
 
-.menuitem.button.flat,
-.button.flat,
-.button.flat:insensitive,
-GtkListBoxRow.button.list-row,
-GtkListBoxRow.button.list-row:hover {
+menuitem button.flat,
+button.flat,
+button.flat:disabled,
+list row button,
+list row button:hover {
     border-image: none;
     background-image: none;
 }
 
 /* focused element borders */
-.entry:focus,
-.combobox-entry .entry:focus,
-.button.flat:focus:active,
-.button:focus:active,
-.button.default:active,
+entry:focus,
+combobox entry:focus,
+button.flat:focus:active,
+button:focus:active,
+button.default:active,
 /* focused button borders */
-.button.flat:focus,
-.button.default,
-.primary-toolbar .entry:focus,
-.primary-toolbar .button:active:focus,
-.primary-toolbar .button:focus:hover,
-.primary-toolbar .combobox-entry .entry:focus,
-.primary-toolbar .combobox-entry .button:focus,
-.primary-toolbar .button.raised:focus:active,
-.primary-toolbar .raised .button:focus:active,
-.primary-toolbar .button.raised.default:active,
-.primary-toolbar .raised .button.default:active,
-.primary-toolbar GtkComboBox .button:active:focus,
-.primary-toolbar .button.raised:focus,
-.primary-toolbar .button.raised.default,
-.primary-toolbar .raised .button:focus,
-.primary-toolbar .raised .button.default,
-.primary-toolbar GtkComboBox .button:focus {
+button.flat:focus,
+button.default,
+toolbar.primary-toolbar entry:focus,
+toolbar.primary-toolbar button:active:focus,
+toolbar.primary-toolbar button:focus:hover,
+toolbar.primary-toolbar combobox entry:focus,
+toolbar.primary-toolbar combobox button:focus,
+toolbar.primary-toolbar button.raised:focus:active,
+toolbar.primary-toolbar .raised button:focus:active,
+toolbar.primary-toolbar button.raised.default:active,
+toolbar.primary-toolbar .raised button.default:active,
+toolbar.primary-toolbar combobox button:active:focus,
+toolbar.primary-toolbar button.raised:focus,
+toolbar.primary-toolbar button.raised.default,
+toolbar.primary-toolbar .raised button:focus,
+toolbar.primary-toolbar .raised button.default,
+toolbar.primary-toolbar combobox button:focus {
 	border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
 	border-radius: 3px;
 	border-width: 1px 1px 2px 1px;
@@ -613,7 +605,7 @@ GtkListBoxRow.button.list-row:hover {
 }
 
 /* focused primary toolbar button borders */
-.primary-toolbar .button:focus {
+toolbar.primary-toolbar button:focus {
 	border-image: url("img/border-focused-ptb.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
 	border-radius: 3px;
 	border-width: 1px 1px 2px 1px;
@@ -622,7 +614,7 @@ GtkListBoxRow.button.list-row:hover {
 }
 
 /* focused switch trough borders */
-GtkSwitch.trough:active {
+switch:active {
 	border-image: url("img/border-focused-switch.svg") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 3px;
 	border-width: 1px 1px 2px 1px;
@@ -631,16 +623,11 @@ GtkSwitch.trough:active {
 }
 
 /* column-headers borders */
-column-header.button,
-column-header .button,
-column-header.button:focus,
-column-header .button:focus,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover
-column-header.button:active:focus,
-column-header .button:active:focus {
+treeview header button,
+treeview header button:focus,
+treeview header button:active,
+treeview header button:active:hover,
+treeview header button:active:focus {
 	border-image: none;
 	border-width: 1px;
 	border-radius: 0;
@@ -650,33 +637,28 @@ column-header .button:active:focus {
 
 }
 
-column-header.button:last-child,
-column-header:last-child .button,
-column-header.button:last-child:focus,
-column-header:last-child .button:focus,
-column-header.button:last-child:active,
-column-header:last-child .button:active,
-column-header.button:last-child:active:hover,
-column-header:last-child .button:active:hover,
-column-header.button:last-child:active:focus,
-column-header:last-child .button:active:focus {
+treeview header button:last-child,
+treeview header button:last-child:focus,
+treeview header button:last-child:active,
+treeview header button:last-child:active:hover,
+treeview header button:last-child:active:focus{
 	border-right: none;
 }
 
 /* Leftmost button */
 .linked .entry:first-child,
-.linked > GtkComboBox:first-child > .button:last-child,
-.linked > GtkComboBox:first-child > .button:active:last-child,
-.linked > GtkComboBox:first-child > .button:active:hover:last-child,
-.linked > GtkComboBox:first-child > .button:focus:last-child,
-.linked > GtkComboBox:first-child > .button:focus:active:last-child,
-.linked > GtkComboBox:first-child > .button:insensitive:last-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:focus:first-child,
-.linked .button:focus:active:first-child,
-.linked .button:insensitive:first-child {
+.linked > combobox:first-child > button:last-child,
+.linked > combobox:first-child > button:active:last-child,
+.linked > combobox:first-child > button:active:hover:last-child,
+.linked > combobox:first-child > button:focus:last-child,
+.linked > combobox:first-child > button:focus:active:last-child,
+.linked > combobox:first-child > button:disabled:last-child,
+.linked button:first-child,
+.linked button:active:first-child,
+.linked button:active:hover:first-child,
+.linked button:focus:first-child,
+.linked button:focus:active:first-child,
+.linked button:disabled:first-child {
     border-image: none;
     border-radius: 3px 0 0 3px;
     border-color: @border_color;
@@ -684,24 +666,24 @@ column-header:last-child .button:active:focus {
     padding: 1px 2px;
 }
 
-.linked .entry:first-child {
+.linked entry:first-child {
     padding: 6px;
 }
 
 /* Middle button */
-.linked .entry,
-.linked > GtkComboBox > .button:last-child,
-.linked > GtkComboBox > .button:active:last-child,
-.linked > GtkComboBox > .button:active:hover:last-child,
-.linked > GtkComboBox > .button:focus:last-child,
-.linked > GtkComboBox > .button:focus:active:last-child,
-.linked > GtkComboBox > .button:insensitive:last-child,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:focus,
-.linked .button:focus:active,
-.linked .button:insensitive {
+.linked entry,
+.linked > combobox > button:last-child,
+.linked > combobox > button:active:last-child,
+.linked > combobox > button:active:hover:last-child,
+.linked > combobox > button:focus:last-child,
+.linked > combobox > button:focus:active:last-child,
+.linked > combobox > button:disabled:last-child,
+.linked button,
+.linked button:active,
+.linked button:active:hover,
+.linked button:focus,
+.linked button:focus:active,
+.linked button:disabled {
     border-image: none;
 	border-radius: 0;
     border-color: @border_color;
@@ -710,15 +692,15 @@ column-header:last-child .button:active:focus {
 }
 
 /* Rightmost button */
-.linked .entry:last-child,
-.linked > GtkComboBox:last-child > .button,
-.linked > GtkComboBox:last-child > .button:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:focus:last-child,
-.linked .button:focus:active:last-child,
-.linked .button:insensitive:last-child {
+.linked entry:last-child,
+.linked > combobox:last-child > button,
+.linked > combobox:last-child > button:last-child,
+.linked button:last-child,
+.linked button:active:last-child,
+.linked button:active:hover:last-child,
+.linked button:focus:last-child,
+.linked button:focus:active:last-child,
+.linked button:disabled:last-child {
     border-image: none;
 	border-radius: 0 3px 3px 0;
     border-color: @border_color;
@@ -726,21 +708,21 @@ column-header:last-child .button:active:focus {
     padding: 1px 2px;
 }
 
-.linked .entry:last-child {
+.linked entry:last-child {
     padding: 6px;
 }
 
 /* vertical */
 
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:active,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:active:hover,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:checked,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:checked:hover,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:focus,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:focus:active,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:focus:checked,
-.vertical .horizontal .vertical .frame .horizontal .vertical .button.image-button:insensitive {
+.vertical .horizontal .vertical .frame .horizontal .vertical button.image-button,
+.vertical .horizontal .vertical .frame .horizontal .vertical button.image-button:active,
+.vertical .horizontal .vertical .frame .horizontal .vertical button.image-button:active:hover,
+.vertical .horizontal .vertical .frame .horizontal .vertical button.image-button:checked,
+.vertical .horizontal .vertical .frame .horizontal .vertical button.image-button:checked:hover,
+.vertical .horizontal .vertical .frame .horizontal .vertical button.image-button:focus,
+.vertical .horizontal .vertical .frame .horizontal .vertical button.image-button:focus:active,
+.vertical .horizontal .vertical .frame .horizontal .vertical button.image-button:focus:checked,
+.vertical .horizontal .vertical .frame .horizontal .vertical button.image-button:disabled {
     border-image: none;
     border-radius: 3px 3px 3px 3px;
     border-color: @border_color;
@@ -748,8 +730,8 @@ column-header:last-child .button:active:focus {
     padding: 4px 5px;
 }
 
-.vertical .horizontal .vertical .frame .horizontal .vertical.toolbar .button.flat.image-button,
-.vertical .horizontal .vertical .frame .horizontal .vertical.toolbar .button.flat.image-button:focus {
+.vertical .horizontal .vertical .frame .horizontal toolbar.vertical button.flat.image-button,
+.vertical .horizontal .vertical .frame .horizontal toolbar.vertical button.flat.image-button:focus {
     background-image: none;
     border-style: none;
     border-radius: 3px;
@@ -760,8 +742,8 @@ column-header:last-child .button:active:focus {
     box-shadow: none;
 }
 
-.vertical .horizontal .vertical .frame .horizontal .vertical.toolbar .button.flat.image-button:hover,
-.vertical .horizontal .vertical .frame .horizontal .vertical.toolbar .button.flat.image-button:focus:hover {
+.vertical .horizontal .vertical .frame .horizontal toolbar.vertical button.flat.image-button:hover,
+.vertical .horizontal .vertical .frame .horizontal toolbar.vertical button.flat.image-button:focus:hover {
     background-image: linear-gradient(to bottom,
                                       @button_hover_gradient_a 5%,
                                       @button_hover_gradient_b 95%,
@@ -776,18 +758,18 @@ column-header:last-child .button:active:focus {
 
 /* Middle button */
 
-.linked.vertical > GtkComboBox > .button:last-child,
-.linked.vertical > GtkComboBox > .button:active:last-child,
-.linked.vertical > GtkComboBox > .button:active:hover:last-child,
-.linked.vertical > GtkComboBox > .button:focus:last-child,
-.linked.vertical > GtkComboBox > .button:focus:active:last-child,
-.linked.vertical > GtkComboBox > .button:insensitive:last-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:active,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:active:hover,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:focus,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:focus:active,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:insensitive {
+.linked.vertical > combobox > button:last-child,
+.linked.vertical > combobox > button:active:last-child,
+.linked.vertical > combobox > button:active:hover:last-child,
+.linked.vertical > combobox > button:focus:last-child,
+.linked.vertical > combobox > button:focus:active:last-child,
+.linked.vertical > combobox > button:disabled:last-child,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:active,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:active:hover,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:focus,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:focus:active,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:disabled {
     border-image: none;
     border-radius: 0;
     border-color: @border_color;
@@ -797,15 +779,15 @@ column-header:last-child .button:active:focus {
 
 /* top button */
 
-.linked.vertical > GtkComboBox:first-child > .button:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:active:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:active:hover:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:checked:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:checked:hover:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:focus:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:focus:active:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:focus:checked:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:insensitive:last-child {
+.linked.vertical > combobox:first-child > button:last-child,
+.linked.vertical > combobox:first-child > button:active:last-child,
+.linked.vertical > combobox:first-child > button:active:hover:last-child,
+.linked.vertical > combobox:first-child > button:checked:last-child,
+.linked.vertical > combobox:first-child > button:checked:hover:last-child,
+.linked.vertical > combobox:first-child > button:focus:last-child,
+.linked.vertical > combobox:first-child > button:focus:active:last-child,
+.linked.vertical > combobox:first-child > button:focus:checked:last-child,
+.linked.vertical > combobox:first-child > button:disabled:last-child {
     border-image: none;
     border-radius: 3px 3px 0px 0px;
     border-color: @border_color;
@@ -813,15 +795,15 @@ column-header:last-child .button:active:focus {
     padding: 5px 5px;
 }
 
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:active:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:active:hover:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:checked:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:checked:hover:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:focus:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:focus:active:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:focus:checked:first-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:insensitive:first-child {
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:first-child,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:active:first-child,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:active:hover:first-child,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:checked:first-child,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:checked:hover:first-child,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:focus:first-child,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:focus:active:first-child,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:focus:checked:first-child,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:disabled:first-child {
     border-image: none;
     border-radius: 3px 3px 0px 0px;
     border-color: @border_color;
@@ -831,20 +813,20 @@ column-header:last-child .button:active:focus {
 
 /* bottom button */
 
-.linked.vertical > GtkComboBox:last-child > .button,
-.linked.vertical > GtkComboBox:last-child > .button:last-child,
-.linked.vertical .button:last-child,
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:focus:last-child,
-.linked.vertical .button:focus:active:last-child,
-.linked.vertical .button:insensitive:last-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:last-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:active:last-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:active:hover:last-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:focus:last-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:focus:active:last-child,
-.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical .button.image-button:insensitive:last-child {
+.linked.vertical > combobox:last-child > button,
+.linked.vertical > combobox:last-child > button:last-child,
+.linked.vertical button:last-child,
+.linked.vertical button:active:last-child,
+.linked.vertical button:active:hover:last-child,
+.linked.vertical button:focus:last-child,
+.linked.vertical button:focus:active:last-child,
+.linked.vertical button:disabled:last-child,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:last-child,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:active:last-child,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:active:hover:last-child,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:focus:last-child,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:focus:active:last-child,
+.vertical .horizontal .vertical .frame .horizontal .vertical .linked.vertical button.image-button:disabled:last-child {
     border-image: none;
     border-radius: 0px 0px 3px 3px;
     border-color: @border_color;
@@ -854,7 +836,7 @@ column-header:last-child .button:active:focus {
 
 /* vertical linked spinbutton */
 
-.linked.vertical .horizontal.entry.spinbutton {
+.linked.vertical spinbutton.horizontal entry {
     border-image: none;
     border-color: @border_color;
     border-radius: 0px;
@@ -863,54 +845,54 @@ column-header:last-child .button:active:focus {
     background-image: none;
 }
 
-.linked.vertical .horizontal.entry.spinbutton  .button,
-.linked.vertical .horizontal.entry.spinbutton  .button:hover,
-.linked.vertical .horizontal.entry.spinbutton  .button:focus,
-.linked.vertical .horizontal.entry.spinbutton  .button:active,
-.linked.vertical .horizontal.entry.spinbutton  .button:checked,
-.linked.vertical .horizontal.entry.spinbutton  .button:active:hover,
-.linked.vertical .horizontal.entry.spinbutton  .button:checked:hover,
-.linked.vertical .horizontal.entry.spinbutton  .button:insensitive {
+.linked.vertical spinbutton.horizontal  button,
+.linked.vertical spinbutton.horizontal  button:hover,
+.linked.vertical spinbutton.horizontal  button:focus,
+.linked.vertical spinbutton.horizontal  button:active,
+.linked.vertical spinbutton.horizontal  button:checked,
+.linked.vertical spinbutton.horizontal  button:active:hover,
+.linked.vertical spinbutton.horizontal  button:checked:hover,
+.linked.vertical spinbutton.horizontal  button:disabled {
     border-image: none;
     border-color: @border_color;
     border-radius: 0px;
     border-width: 0px 1px 0px 1px;
 }
 
-.linked.vertical .horizontal.entry.spinbutton  .button:last-child,
-.linked.vertical .horizontal.entry.spinbutton  .button:hover:last-child,
-.linked.vertical .horizontal.entry.spinbutton  .button:focus:last-child,
-.linked.vertical .horizontal.entry.spinbutton  .button:active:last-child,
-.linked.vertical .horizontal.entry.spinbutton  .button:checked:last-child,
-.linked.vertical .horizontal.entry.spinbutton  .button:active:hover:last-child,
-.linked.vertical .horizontal.entry.spinbutton  .button:checked:hover:last-child,
-.linked.vertical .horizontal.entry.spinbutton  .button:insensitive:last-child {
+.linked.vertical spinbutton.horizontal  button:last-child,
+.linked.vertical spinbutton.horizontal  button:hover:last-child,
+.linked.vertical spinbutton.horizontal  button:focus:last-child,
+.linked.vertical spinbutton.horizontal  button:active:last-child,
+.linked.vertical spinbutton.horizontal  button:checked:last-child,
+.linked.vertical spinbutton.horizontal  button:active:hover:last-child,
+.linked.vertical spinbutton.horizontal  button:checked:hover:last-child,
+.linked.vertical spinbutton.horizontal  button:disabled:last-child {
     border-width: 0px 0px 0px 0px;
 }
 
 /* Dialog Action Area */
 
 /* Leftmost button */
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:focus:first-child,
-.dialog-action-area.linked .button:focus:active:first-child,
-.dialog-action-area.linked .button:insensitive:first-child,
+.dialog-action-area.linked button:first-child,
+.dialog-action-area.linked button:active:first-child,
+.dialog-action-area.linked button:active:hover:first-child,
+.dialog-action-area.linked button:focus:first-child,
+.dialog-action-area.linked button:focus:active:first-child,
+.dialog-action-area.linked button:disabled:first-child,
 /* Middle button */
-.dialog-action-area.linked .button,
-.dialog-action-area.linked .button:active,
-.dialog-action-area.linked .button:active:hover,
-.dialog-action-area.linked .button:focus,
-.dialog-action-area.linked .button:focus:active,
-.dialog-action-area.linked .button:insensitive,
+.dialog-action-area.linked button,
+.dialog-action-area.linked button:active,
+.dialog-action-area.linked button:active:hover,
+.dialog-action-area.linked button:focus,
+.dialog-action-area.linked button:focus:active,
+.dialog-action-area.linked button:disabled,
 /* Rightmost button */
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:focus:last-child,
-.dialog-action-area.linked .button:focus:active:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
+.dialog-action-area.linked button:last-child,
+.dialog-action-area.linked button:active:last-child,
+.dialog-action-area.linked button:active:hover:last-child,
+.dialog-action-area.linked button:focus:last-child,
+.dialog-action-area.linked button:focus:active:last-child,
+.dialog-action-area.linked button:disabled:last-child {
 	border-radius: 3px;
 	border-width: 1px;
 }
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
index a6491f3c..bdc35848 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
@@ -1,5 +1,5 @@
 * {
-	engine: none;
+/*	engine: none; */
 	padding: 0;
 
 	background-clip: padding-box;
@@ -8,33 +8,30 @@
 
 	-GtkTextView-error-underline-color: @error_color;
 
-	-GtkPaned-handle-size: 5;
+/*	-GtkPaned-handle-size: 5; deprecated */
 
-	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckMenuItem-indicator-size: 10;
+/*	-GtkCheckButton-indicator-size: 16; deprecated */
+/*	-GtkCheckMenuItem-indicator-size: 10; deprecated */
 
 	-GtkScrolledWindow-scrollbar-spacing: 3;
-	-GtkScrolledWindow-scrollbars-within-bevel: 0;
+/*	-GtkScrolledWindow-scrollbars-within-bevel: 0; deprecated */
 
 	-GtkToolItemGroup-expander-size: 11;
-	-GtkExpander-expander-size: 14;
+/*	-GtkExpander-expander-size: 14; deprecated */
 
-	-GtkMenu-horizontal-padding: 0;
-	-GtkMenu-vertical-padding: 0;
+/*	-GtkMenu-horizontal-padding: 0; */
+/*	-GtkMenu-vertical-padding: 0; */
 
 	-GtkIMHtml-hyperlink-color: @link_color;
 	-GtkHTML-link-color: @link_color;
 
 	-WnckTasklist-fade-overlay-rect: 0;
 
-	-GtkWidget-focus-padding: 2;
-    /* disable focusline on active notebook tabs if focused*/
-    -GtkWidget-focus-line-width: 0;
 	outline-color: @focus_border_color;
 	outline-style: dashed;
 	outline-offset: -2px;
 	outline-width: 0px; /* disable ugly focus-line */
-	outline-radius: 2px;
+	-gtk-outline-radius: 2px;
 	-gtk-icon-style: regular; /* disable symbolic icons */
 	-GtkWindow-resize-grip-width: 11;
 	-GtkWindow-resize-grip-height: 11;
@@ -44,7 +41,7 @@
  * Base States *
  ***************/
 
-GtkWindow {
+window {
 	color: @theme_fg_color;
 }
 
@@ -59,29 +56,29 @@ GtkWindow {
 	color: @theme_selected_fg_color;
 }
 
-*:insensitive {
+*:disabled {
 	background-color: @insensitive_bg_color;
 	color: @insensitive_fg_color;
 	text-shadow: 1px 1px @insensitive_text_shadow_color;
 	border-color: @insensitive_border_color;
 }
 
-GtkImage,
-GtkImage:insensitive,
-GtkLabel,
-GtkLabel:insensitive,
-GtkBox,
-GtkBox:insensitive,
+image,
+image:disabled,
+label,
+label:disabled,
+box,
+box:disabled,
 GtkGrid,
-GtkGrid:insensitive {
+GtkGrid:disabled {
 	background-color: transparent;
 }
 
 /************
  * Tooltips *
  ************/
-.tooltip,
-.tooltip.background {
+tooltip,
+tooltip.background {
 	padding: 4px;
 	border-style: solid;
 	border-width: 1px;
@@ -91,7 +88,7 @@ GtkGrid:insensitive {
 	color: @theme_tooltip_fg_color;
 }
 
-.tooltip * {
+tooltip * {
 	background-color: transparent;
 }
 
@@ -104,21 +101,21 @@ GtkGrid:insensitive {
 	to { -gtk-icon-transform: rotate(1turn); }
 }
 
-.spinner {
-	background-image: none;
+spinner {
+	background: none;
 	background-color: blue;
 	opacity: 0;
 	-gtk-icon-source: -gtk-icontheme("process-working-symbolic");
 }
 
-.spinner:active {
+spinner:checked {
 	opacity: 1;
 	animation: spin 1s linear infinite; }
-.spinner:active:insensitive {
+spinner:active:disabled {
 	opacity: 0.5;
 }
 
-.button .spinner:active {
+button spinner:checked {
 	color: @theme_fg_color;
 }
 
@@ -162,17 +159,17 @@ GtkGrid:insensitive {
 	border-bottom-left-radius: 0;
 }
 
-.floating-bar .button {
+.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;
 }
 
 .view.rubberband,
-.rubberband {
+.rubberband,
+view rubberband,
+rubberband {
 	background-color: alpha (@theme_selected_bg_color, 0.35);
 	border-color: @theme_selected_bg_color;
 	border-style: solid;
@@ -180,19 +177,18 @@ GtkGrid:insensitive {
 	border-radius: 2px;
 }
 
-GtkStatusbar .label,
-GtkStatusbar .frame.flat {
+statusbar label,
+statusbar frame {
 	color: @theme_fg_color;
-	-GtkStatusbar-shadow-type: none;
 	font-size: smaller;
 }
 
-GtkStatusbar .frame.flat {
+statusbar frame {
 	padding: 2px 0px;
 	border-width: 0;
 }
 
-GtkStatusbar .frame.flat .button.flat {
+statusbar frame button.flat {
 	padding: 2px 0px 0px 0px;
 }
 
@@ -203,20 +199,44 @@ GtkStatusbar .frame.flat .button.flat {
 	border-radius: 0;
 }
 
-GtkTreeView.view.separator,
-GtkTreeView.separator,
-.separator,
-.separator:hover {
+treeview.view separator,
+treeview.view .separator, /* why ?*/
+treeview separator,
+separator,
+separator:hover {
 	color: shade(@border_color, 1.30);
 }
 
-.pane-separator,
-.pane-separator:hover,
-.pane-separator:selected {
-	color: @theme_bg_color;
-	background-color: @theme_bg_color;
-	background-repeat: no-repeat;
-	background-position: center;
+/*********
+ * Paned *
+ *********/
+
+/* the small line between sidebar and view */
+paned > separator {
+    min-width: 3px;
+    min-height: 3px;
+    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 {
 }
 
 /************************
@@ -224,7 +244,7 @@ GtkTreeView.separator,
  ************************/
 
 /* displays at end of mouse scrolling */
-.overshoot.top {
+overshoot.top {
     background-image: -gtk-gradient(radial,
                                     center top, 0,
                                     center top, 0.5,
@@ -243,7 +263,7 @@ GtkTreeView.separator,
     box-shadow: none;
 }
 
-.overshoot.top:backdrop {
+overshoot.top:backdrop {
     background-image: -gtk-gradient(radial,
                                     center top, 0,
                                     center top, 0.5,
@@ -257,7 +277,7 @@ GtkTreeView.separator,
     box-shadow: none;
 }
 
-.overshoot.bottom {
+overshoot.bottom {
     background-image: -gtk-gradient(radial,
                                     center bottom, 0,
                                     center bottom, 0.5,
@@ -276,7 +296,7 @@ GtkTreeView.separator,
     box-shadow: none;
 }
 
-.overshoot.bottom:backdrop {
+overshoot.bottom:backdrop {
     background-image: -gtk-gradient(radial,
                                     center bottom, 0,
                                     center bottom, 0.5,
@@ -290,7 +310,7 @@ GtkTreeView.separator,
     box-shadow: none;
 }
 
-.overshoot.left {
+overshoot.left {
     background-image: -gtk-gradient(radial,
                                     left center, 0,
                                     left center, 0.5,
@@ -309,7 +329,7 @@ GtkTreeView.separator,
     box-shadow: none;
 }
 
-.overshoot.left:backdrop {
+overshoot.left:backdrop {
     background-image: -gtk-gradient(radial,
                                     left center, 0,
                                     left center, 0.5,
@@ -323,7 +343,7 @@ GtkTreeView.separator,
     box-shadow: none;
 }
 
-.overshoot.right {
+overshoot.right {
     background-image: -gtk-gradient(radial,
                                     right center, 0,
                                     right center, 0.5,
@@ -342,7 +362,7 @@ GtkTreeView.separator,
     box-shadow: none;
 }
 
-.overshoot.right:backdrop {
+overshoot.right:backdrop {
     background-image: -gtk-gradient(radial,
                                     right center, 0,
                                     right center, 0.5,
@@ -358,7 +378,7 @@ GtkTreeView.separator,
 
 
 /* result is disable undershoot */
-.undershoot.top {
+undershoot.top {
     background-color: transparent;
     background-image: linear-gradient(to left,
                                       rgba(255, 255, 255, 0.2) 50%,
@@ -369,7 +389,7 @@ GtkTreeView.separator,
     background-position: center top;
 }
 
-.undershoot.bottom {
+undershoot.bottom {
     background-color: transparent;
     background-image: linear-gradient(to left,
                                       rgba(255, 255, 255, 0.2) 50%,
@@ -380,7 +400,7 @@ GtkTreeView.separator,
     background-position: center bottom;
 }
 
-.undershoot.left {
+undershoot.left {
     background-color: transparent;
     background-image: linear-gradient(to top,
                                       rgba(255, 255, 255, 0.2) 50%,
@@ -391,7 +411,7 @@ GtkTreeView.separator,
     background-position: left center;
 }
 
-.undershoot.right {
+undershoot.right {
     background-color: transparent;
     background-image: linear-gradient(to top,
                                       rgba(255, 255, 255, 0.2) 50%,
@@ -406,29 +426,31 @@ GtkTreeView.separator,
  * Text Entries *
  ****************/
 
-.entry {
+entry {
 	border-style: solid;
 	padding: 4px;
 	color: @entry_text_color;
 	background-color: @theme_base_color;
 }
 
-.entry.progressbar {
+entry progressbar {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 }
 
-.entry:selected {
+entry selection,
+entry selection:focus,
+entry:selected {
 	color: @theme_selected_fg_color;
 	background-color: @theme_selected_bg_color;
 }
 
-.entry:insensitive {
+entry:disabled {
 	color: @insensitive_fg_color;
 }
 
 /* Entry background */
-.entry {
+entry {
 	background-color: @entry_bg_color;
 	background-image: linear-gradient(to bottom,
 	                  @entry_inner_border_color 1px,
@@ -436,12 +458,12 @@ GtkTreeView.separator,
 }
 
 /* Focused entry background */
-.entry:focus {
+entry:focus {
 	background-image: none;
 }
 
-/* Insensitive entry background */
-.entry:insensitive {
+/* disabled entry background */
+entry:disabled {
 	background-image: linear-gradient(to bottom,
 	                  @entry_insensitive_inner_border_color 2px,
 	                  @entry_insensitive_bg_color 3px);
@@ -451,15 +473,15 @@ GtkTreeView.separator,
  * Symbolic images *
  *******************/
 
-.image {
+image {
 	color: @internal_element_color;
 }
 
-.image:hover {
+image:hover {
 	color: @internal_element_hover_color;
 }
 
-.image:selected {
+image:selected {
 	color: @theme_selected_fg_color;
 }
 
@@ -467,8 +489,8 @@ GtkTreeView.separator,
  * Color Chooser *
  *****************/
 
-GtkColorSwatch,
-GtkColorSwatch:selected {
+colorswatch,
+colorswatch:selected {
 	border-width: 1px;
 	border-style: solid;
 	border-radius: 3px;
@@ -477,13 +499,13 @@ GtkColorSwatch:selected {
 	background-clip: border-box;
 }
 
-GtkColorSwatch:hover,
-GtkColorSwatch:selected:hover {
+colorswatch:hover,
+colorswatch:selected:hover {
 	border-color: @color_swatch_hover_border_color;
 }
 
-GtkColorChooserWidget #add-color-button:hover,
-GtkColorChooserWidget #add-color-button:selected:hover {
+colorchooser #add-color-button:hover,
+colorchooser #add-color-button:selected:hover {
 }
 
 .color-active-badge,
@@ -505,8 +527,8 @@ GtkColorChooserWidget #add-color-button:selected:hover {
 	color: @color_active_badge_dark_color;
 }
 
-GtkColorEditor GtkColorSwatch.color-light:hover,
-GtkColorEditor GtkColorSwatch.color-dark:hover {
+GtkColorEditor colorswatch.color-light:hover,
+GtkColorEditor colorswatch.color-dark:hover {
 	background-image: none;
 }
 
@@ -514,20 +536,19 @@ GtkColorEditor GtkColorSwatch.color-dark:hover {
  * Progress bar *
  ****************/
 
-GtkProgressBar {
-	/* FIXME - Not working 3.14 */
-	-GtkProgressBar-min-horizontal-bar-height: 16;
-	-GtkProgressBar-min-vertical-bar-width: 16;
+progressbar {
+	min-height: 16px;
+	min-width: 16px;
 	border-radius: 3px;
 	padding: 0 0 1px 0;
 }
 
 /* progress component */
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
+progressbar,
+progressbar row,
+progressbar row:hover,
+progressbar row:selected,
+progressbar row:selected:focus {
 	background-color: @progressbar_bg_color;
 	background-image: linear-gradient(to bottom,
 	                      alpha (@progressbar_gradient_a, 0.7),
@@ -545,12 +566,12 @@ GtkProgressBar {
 	border-color: @progressbar_border_color;
 }
 
-.progressbar row:selected,
-.progressbar row:selected:focus {
+progressbar row:selected,
+progressbar row:selected:focus {
 	border-color: shade(@progressbar_border_color, 0.85);
 }
 
-.progressbar.vertical {
+progressbar.vertical {
 	background-image: linear-gradient(to right,
 	                      alpha (@progressbar_gradient_a, 0.7),
 	                      alpha (@progressbar_gradient_b, 0.7) 50%,
@@ -564,12 +585,12 @@ GtkProgressBar {
 }
 
 /* for progressbars in cell renderers */
-.trough row {
+row trough {
 	padding: 0;
 }
 
-.trough row:selected,
-.trough row:selected:focus {
+row trough:selected,
+row trough:selected:focus {
 	background-image: -gtk-gradient (linear,
 	                  left top, left bottom,
 	                  from (mix (@trough_gradient_a, @theme_selected_bg_color, 0.25)),
@@ -580,24 +601,24 @@ GtkProgressBar {
  * GtkScale *
  ************/
 
-GtkScale {
+scale {
 	-GtkScale-slider-length: 21;
 	-GtkRange-slider-width: 13;
 	-GtkRange-trough-border: 4;
 }
 
-GtkScale.slider,
-GtkScale.slider:hover,
-GtkScale.slider:insensitive {
+scale slider,
+scale slider:hover,
+scale slider:disabled {
 	border-radius: 0;
 	border-style: none;
 	background-color: transparent;
 }
 
-GtkScale.trough,
-GtkScale.trough.highlight,
-GtkScale.trough.vertical,
-GtkScale.trough:insensitive {
+scale trough,
+scale trough highlight,
+scale.vertical trough,
+scale trough:disabled {
 	border-image: none;
 	border-style: solid;
 	border-width: 1px;
@@ -605,36 +626,36 @@ GtkScale.trough:insensitive {
 	background-image: none;
 }
 
-GtkScale.trough {
+scale trough {
 	margin: 8px 0;
 	border-color: @scale_trough_border_color;
 	background-color: @scale_trough_bg_color;
 }
 
-GtkScale.trough.vertical {
+scale.vertical trough {
 	margin: 0 8px;
 }
 
-GtkScale.trough.highlight {
+scale trough highlight {
 	border-color: @scale_trough_highlight_border_color;
 	background-color: @scale_trough_highlight_bg_color;
 }
 
-GtkScale.trough:insensitive {
+scale trough:disabled {
 	border-color: @scale_trough_insensitive_border_color;
 	background-color: @scale_trough_insensitive_highlight_bg_color;
 }
 
-GtkScale.trough.highlight:insensitive {
+scale trough highlight:disabled {
 	border-color: @scale_trough_highlight_insensitive_border_color;
 	background-color: @scale_trough_highlight_insensitive_bg_color;
 }
 
-GtkScale.progressbar {
+scale progressbar {
 	background-color: @scale_progressbar_bg_color;
 }
 
-GtkScale.mark {
+scale marks {
 	color: @scale_mark_color;
 }
 
@@ -642,7 +663,7 @@ GtkScale.mark {
  * Frames *
  **********/
 
-.frame {
+frame {
 	border-width: 1px;
 	border-color: @border_color;
 	border-style: solid;
@@ -651,11 +672,11 @@ GtkScale.mark {
 	padding: 0;
 }
 
-.frame.flat {
+frame.flat {
    border-style:none;
 }
 
-GtkScrolledWindow.frame {
+scrolledwindow.frame {
 	border-style: solid;
 	border-color: @border_color;
 	border-width: 1px;
@@ -663,13 +684,13 @@ GtkScrolledWindow.frame {
 	padding: 0;
 }
 
-GtkScrolledWindow GtkViewport {
+scrolledwindow viewport {
 	background-color: @theme_bg_color;
 }
 
 /* avoid double borders when a viewport is
  * packed into a GtkScrolledWindow */
-GtkScrolledWindow GtkViewport.frame {
+scrolledwindow viewport.frame {
 	border-style: none;
 }
 
@@ -677,134 +698,134 @@ GtkScrolledWindow GtkViewport.frame {
  * Buttons *
  ***********/
 
-.button,
-.button.menuitem.menubar,
-.combobox-entry .button,
-.inline-toolbar.toolbar .button,
-.primary-toolbar.toolbar.horizontal .button,
-.primary-toolbar.toolbar.horizontal .button:active,
-.toolbar.horizontal .button,
-.toolbar.horizontal .button:active,
-.titlebar .linked.raised .button,
-.titlebar .linked.raised .button:active {
+button {
+    min-height: 16px;
+    min-width: 16px;
+}
+
+button,
+button.menuitem.menubar,
+combobox entry button,
+toolbar.inline-toolbar button,
+toolbar.primary-toolbar.horizontal button,
+toolbar.primary-toolbar.horizontal button:active,
+toolbar.horizontal button,
+toolbar.horizontal button:active,
+.titlebar .linked.raised button,
+.titlebar .linked.raised button:active {
 	padding: 5px 5px 6px; /* larger values makes the button arrow smaller*/
 }
 
-.toolbar.horizontal .button,
-.toolbar.horizontal .button:active,
-.primary-toolbar.toolbar.horizontal .button,
-.primary-toolbar.toolbar.horizontal .button:active {
+toolbar.horizontal button,
+toolbar.horizontal button:active,
+toolbar.primary-toolbar.horizontal button,
+toolbar.primary-toolbar.horizontal button:active {
 	padding: 2px 2px;
 }
 
-.button.default {
+button.default {
 	text-shadow: none;
 	color: @theme_fg_color;
 }
 
-.button.flat {
+button.flat {
 	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;
 }
 
-.button.flat.hover {
+button.flat.hover {
 	border-radius: 3px;
 }
 
-.button.image-button.circular-button {
+button.image-button.circular-button {
    border-image: none;
    border-width: 1px;
    border-style: solid;
    border-color: @border_color;
 }
 
-GtkComboBox GtkToggleButton.button,
-GtkComboBoxText GtkToggleButton.button,
-.toolbar.horizontal GtkComboBox GtkToggleButton.button,
-.toolbar.horizontal GtkComboBoxText GtkToggleButton.button {
+combobox button.toggle,
+combobox button.text-button.toggle,
+toolbar.horizontal combobox button.toggle,
+toolbar.horizontal button.text-button.toggle {
 	padding: 4px;
 }
 
-.path-bar .button,
-.path-bar .button GtkImage,
-.path-bar .button GtkLabel {
+.path-bar button,
+.path-bar button image,
+.path-bar button label {
 	padding: 2px;
 }
 
-.path-bar .button {
+.path-bar button {
 	border-width: 1px 0px 1px 1px;
 }
 
-.path-bar .button:hover:active {
+.path-bar button:hover:active {
 	border-left-width: 1px;
 }
 
-.path-bar .button:first-child,
-.path-bar .button:first-child:hover:active {
+.path-bar button:first-child,
+.path-bar button:first-child:hover:active {
 	border-right-width: 0px;
 }
 
-.path-bar .button:only-child,
-.path-bar .button:only-child:hover:active {
+.path-bar button:only-child,
+.path-bar button:only-child:hover:active {
 	border-radius: 3px;
 	border-right-width: 1px;
 }
 
-.linked.raised .button:first-child,
-.linked.raised .button:first-child:hover:active {
+.linked.raised button:first-child,
+.linked.raised button:first-child:hover:active {
 	border-right-width: 0px;
 }
 
-.button {
-	-GtkButton-image-spacing: 4;
-	-GtkButton-interior-focus: true;
-	-GtkButton-default-border: 0;
-	-GtkButton-inner-border: 3;
-	-GtkArrow-arrow-scaling: 0.5;
+button {
 	color: @theme_text_color;
 	border-style: solid;
 	border-color: transparent;
 }
 
 /* We want anything inside the buttons to use their background */
-.button * {
+button * {
 	background-color: transparent;
 }
 
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
 GtkMenuToolButton *,
-.primary-toolbar .button,
-.primary-toolbar .button:insensitive {
+toolbar.primary-toolbar button,
+toolbar.primary-toolbar button:disabled {
 	background-image: none;
 	background-color: transparent;
 }
 
-.primary-toolbar .button {
+toolbar.primary-toolbar button {
 	border-image: none;
 	border-style: solid;
 	border-width: 1px 1px 2px 1px;
 	border-color: transparent;
 }
 
-.primary-toolbar .button *:active,
-.inline-toolbar .button *:active,
-.button *:active,
-.button *:active:focus,
-.button *:focus {
+toolbar.primary-toolbar button *:active,
+toolbar.inline-toolbar button *:active,
+button *:active,
+button *:active:focus,
+button *:focus {
 	color: @button_active_text_color;
 }
 
-.button *:insensitive,
-.button *:active:insensitive {
+button *:disabled,
+button *:active:disabled {
 	color: @insensitive_fg_color;
 }
 
-.button .separator {
+button .separator {
 	color: shade(@internal_element_color, 1.30);
 }
 
@@ -812,8 +833,8 @@ GtkMenuToolButton *,
  * GtkSpinButton *
  *****************/
 
-.spinbutton .button,
-.spinbutton .button:focus {
+spinbutton button,
+spinbutton button:focus {
 	color: @internal_element_color;
 	padding: 2px 6px;
 	border-width: 0 0 0 1px;
@@ -823,25 +844,25 @@ GtkMenuToolButton *,
 	border-image: none;
 }
 
-.spinbutton .button {
+spinbutton button {
 	background-color: transparent;
 }
 
-.spinbutton .button:insensitive {
+spinbutton button:disabled {
 	color: @internal_element_insensitive_color;
 }
 
-.spinbutton .button:active,
-.spinbutton .button:active:focus,
-.spinbutton .button:hover {
+spinbutton button:active,
+spinbutton button:active:focus,
+spinbutton button:hover {
 	color: @internal_element_hover_color;
 }
 
-.spinbutton .button:first-child {
+spinbutton button:first-child {
 	border-radius: 2px 0 0 2px;
 }
 
-.spinbutton .button:last-child {
+spinbutton button:last-child {
 	border-radius: 0 2px 2px 0;
 }
 
@@ -856,26 +877,26 @@ GtkMenuToolButton *,
     padding: 4px;
 }
 
-.vertical.entry.spinbutton .button,
-.vertical.entry.spinbutton .button:hover,
-.vertical.entry.spinbutton .button:focus,
-.vertical.entry.spinbutton .button:active,
-.vertical.entry.spinbutton .button:checked,
-.vertical.entry.spinbutton .button:active:hover,
-.vertical.entry.spinbutton .button:checked:hover,
-.vertical.entry.spinbutton .button:insensitive {
+.vertical.entry.spinbutton button,
+.vertical.entry.spinbutton button:hover,
+.vertical.entry.spinbutton button:focus,
+.vertical.entry.spinbutton button:active,
+.vertical.entry.spinbutton button:checked,
+.vertical.entry.spinbutton button:active:hover,
+.vertical.entry.spinbutton button:checked:hover,
+.vertical.entry.spinbutton button:disabled {
     border-radius: 3px 3px 0px 0px;
     border-width: 1px;
 }
 
-.vertical.entry.spinbutton .button:last-child,
-.vertical.entry.spinbutton .button:hover:last-child,
-.vertical.entry.spinbutton .button:focus:last-child,
-.vertical.entry.spinbutton .button:active:last-child,
-.vertical.entry.spinbutton .button:checked:last-child,
-.vertical.entry.spinbutton .button:active:hover:last-child,
-.vertical.entry.spinbutton .button:checked:hover:last-child,
-.vertical.entry.spinbutton .button:insensitive:last-child {
+.vertical.entry.spinbutton button:last-child,
+.vertical.entry.spinbutton button:hover:last-child,
+.vertical.entry.spinbutton button:focus:last-child,
+.vertical.entry.spinbutton button:active:last-child,
+.vertical.entry.spinbutton button:checked:last-child,
+.vertical.entry.spinbutton button:active:hover:last-child,
+.vertical.entry.spinbutton button:checked:hover:last-child,
+.vertical.entry.spinbutton button:disabled:last-child {
     border-width: 1px;
     border-radius: 0px 0px 3px 3px;
 }
@@ -885,16 +906,16 @@ GtkMenuToolButton *,
  *********************/
 
 /* Button background */
-.button,
-.spinbutton .button,
-.toolbar .button.raised,
-.toolbar .raised .button,
-.toolbar .button.raised:focus,
-.toolbar .raised .button:focus,
-.toolbar GtkComboBox .button,
-.toolbar GtkComboBox .button:focus,
-.combobox-entry .button,
-.primary-toolbar .combobox-entry .button,
+button,
+spinbutton button,
+toolbar button.raised,
+toolbar .raised button,
+toolbar button.raised:focus,
+toolbar .raised button:focus,
+toolbar combobox button,
+toolbar combobox button:focus,
+combobox entry button,
+toolbar.primary-toolbar combobox entry button,
 .titlebar .titlebutton:hover,
 GtkColorChooserWidget #add-color-button {
 	background-image: -gtk-gradient (linear,
@@ -906,31 +927,31 @@ GtkColorChooserWidget #add-color-button {
 }
 
 /* Pushed button background */
-.button:checked,
-.button:checked:hover,
-.button:active,
-.button:active:hover,
+button:checked,
+button:checked:hover,
+button:active,
+button:active:hover,
 .menuitem.button:hover,
-.spinbutton .button:active,
-.spinbutton .button:active:hover,
-.toolbar .button:active,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active,
-.toolbar .button.raised:checked,
-.toolbar .raised .button:active,
-.toolbar .raised .button:checked,
-.toolbar .button.raised:active:hover,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .raised .button:checked:hover,
-.primary-toolbar .combobox-entry .button:active,
-.combobox-entry .button:active,
-.primary-toolbar .button:active,
-.primary-toolbar .button:active:hover,
-.primary-toolbar .button:focus:active,
-.primary-toolbar .button:focus:active:hover,
-.inline-toolbar .button:active,
-.inline-toolbar .button:active:hover {
+spinbutton button:active,
+spinbutton button:active:hover,
+toolbar button:active,
+toolbar button:active:hover,
+toolbar button.raised:active,
+toolbar button.raised:checked,
+toolbar .raised button:active,
+toolbar .raised button:checked,
+toolbar button.raised:active:hover,
+toolbar button.raised:checked:hover,
+toolbar .raised button:active:hover,
+toolbar .raised button:checked:hover,
+toolbar.primary-toolbar combobox entry button:active,
+combobox entry button:active,
+toolbar.primary-toolbar button:active,
+toolbar.primary-toolbar button:active:hover,
+toolbar.primary-toolbar button:focus:active,
+toolbar.primary-toolbar button:focus:active:hover,
+toolbar.inline-toolbar button:active,
+toolbar.inline-toolbar button:active:hover {
 	background-image: linear-gradient(to bottom,
 	                  @button_active_gradient_a,
 	                  @button_active_gradient_b 3px,
@@ -974,33 +995,33 @@ GtkListBoxRow.button.list-row:selected {
 	                  to (@menubar_menuitem_hover_gradient_d));
 }
 
-.trough,
-.trough.highlight,
-.trough row,
-.trough row:hover {
+trough,
+trough highlight,
+trough row,
+trough row:hover {
 	background-image: linear-gradient(to bottom,
 	                  @trough_gradient_a,
 	                  @trough_gradient_b 4px);
 }
 
 /* Flipped pushed button background for vertical progressbar through and the like */
-.trough.vertical {
+trough.vertical {
 	background-image: linear-gradient(to right,
 	                  @trough_gradient_a,
 	                  @trough_gradient_b 4px);
 }
 
 /* Prelight button background */
-.button:hover,
-.spinbutton .button:hover,
-.toolbar .button:hover,
-.toolbar .button.raised:hover,
-.toolbar .raised .button:hover,
-.toolbar GtkComboBox .button:hover,
-.primary-toolbar .button:hover,
-.combobox-entry .button:hover,
-.primary-toolbar .combobox-entry .button:hover,
-GtkColorChooserWidget #add-color-button:hover {
+button:hover,
+spinbutton button:hover,
+toolbar button:hover,
+toolbar button.raised:hover,
+toolbar .raised button:hover,
+toolbar combobox button:hover,
+toolbar.primary-toolbar button:hover,
+combobox entry button:hover,
+toolbar.primary-toolbar combobox entry button:hover,
+colorchooser #add-color-button:hover {
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
 	                  @button_hover_gradient_a 5%,
@@ -1008,19 +1029,19 @@ GtkColorChooserWidget #add-color-button:hover {
 	                  @button_hover_gradient_c);
 }
 
-/* Insensitive button background */
-.button:insensitive,
-.toolbar GtkComboBox .button:insensitive,
-.combobox-entry .button:insensitive {
+/* disabled button background */
+button:disabled,
+toolbar combobox button:disabled,
+combobox entry button:disabled {
 	background-image: none;
 	background-color: transparent;
     color: @insensitive_fg_color;
 }
 
-/* Pushed + Insensitive button background */
-.button:active:insensitive,
-.toolbar .button:active:insensitive,
-.toolbar GtkComboBox .button:active:insensitive {
+/* Pushed + disabled button background */
+button:active:disabled,
+toolbar button:active:disabled,
+toolbar combobox button:active:disabled {
 	background-image: linear-gradient(to bottom,
 	                  @button_active_insensitive_gradient_a,
 	                  @button_active_insensitive_gradient_b 3px,
@@ -1032,7 +1053,7 @@ GtkColorChooserWidget #add-color-button:hover {
 }
 
 /* Focused primary toolbar button background */
-.primary-toolbar .button:focus {
+toolbar.primary-toolbar button:focus {
 	background-image: linear-gradient(to bottom,
 	                  @pt_button_focus_gradient_a,
 	                  @pt_button_focus_gradient_b 50%,
@@ -1041,7 +1062,7 @@ GtkColorChooserWidget #add-color-button:hover {
 }
 
 /* Focused + prelit primary toolbar button background */
-.primary-toolbar .button:focus:hover {
+toolbar.primary-toolbar button:focus:hover {
 	background-image: linear-gradient(to bottom,
 	                  @pt_button_focus_hover_gradient_a,
 	                  @pt_button_focus_hover_gradient_b 50%,
@@ -1054,20 +1075,17 @@ GtkColorChooserWidget #add-color-button:hover {
  * tabs          *
  *****************/
 
-.notebook {
+notebook {
 	padding: 0;
 	background-clip: border-box;
 	background-color: @notebook_bg_color;
-	-GtkNotebook-tab-overlap: 2;
-	-GtkNotebook-tab-curvature: 3;
-	-GtkNotebook-initial-gap: 0;
 }
 
 .notebook.header.frame {
 	border-width: 0;
 }
 
-.notebook GtkViewport {
+notebook viewport {
 	background-color: @theme_bg_color;
 }
 
@@ -1178,16 +1196,16 @@ GtkColorChooserWidget #add-color-button:hover {
 }
 
 /* close button styling */
-.notebook tab .button,
-.notebook tab .button:active,
-.notebook tab .button:hover {
+.notebook tab button,
+.notebook tab button:active,
+.notebook tab button:hover {
 	border-image: none;
 	border-style: none;
 	background-image: none;
 	background-color: transparent;
 }
 
-.notebook tab .button GtkImage {
+.notebook tab button GtkImage {
 	border-radius: 3px;
 	color: mix(@theme_fg_color, @theme_base_color, 0.6);
 	border-style: solid;
@@ -1196,13 +1214,13 @@ GtkColorChooserWidget #add-color-button:hover {
 	padding: 0;
 }
 
-.notebook tab .button GtkImage:hover {
+.notebook tab button GtkImage:hover {
 	color: @theme_fg_color;
 	border-color: alpha(black, 0.1);
 }
 
-.notebook tab .button GtkImage:active,
-.notebook tab .button GtkImage:active:hover {
+.notebook tab button GtkImage:active,
+.notebook tab button GtkImage:active:hover {
 	background-color: alpha(black, 0.08);
 	color:  @theme_base_color;
 	border-color: alpha(black, 0.27)
@@ -1215,65 +1233,62 @@ GtkColorChooserWidget #add-color-button:hover {
  * ComboBoxes *
  **************/
 
-GtkComboBox {
+combobox {
 	padding: 0;
-	-GtkComboBox-arrow-scaling: 0.5;
-	-GtkComboBox-shadow-type: none;
 }
 
-GtkComboBox *:insensitive {
+combobox *:disabled {
 	color: @insensitive_fg_color;
 }
 
-GtkComboBox .separator {
+combobox separator {
 	/* always disable separators */
-	-GtkWidget-wide-separators: true;
 	-GtkWidget-horizontal-separator: 0;
 	-GtkWidget-vertical-separator: 0;
 }
 
-.combobox-entry .entry:first-child,
-.combobox-entry .button:first-child {
+combobox entry .entry:first-child,
+combobox entry button:first-child {
 	border-image-width: 3px 0 4px 3px;
 	border-radius: 3px 0 0 3px;
 	border-right-width: 0;
 }
 
-.combobox-entry .entry:last-child,
-.combobox-entry .button:last-child {
+combobox entry .entry:last-child,
+combobox entry button:last-child {
 	border-image-width: 3px 3px 4px 0;
 	border-radius: 0 3px 3px 0;
 	border-left-width: 0;
 }
 
-.combobox-entry .button:last-child {
+combobox entry button:last-child {
 	border-image-width: 3px 3px 4px 2px;
 }
 
-.primary-toolbar .combobox-entry .entry:first-child,
-.primary-toolbar .combobox-entry .button:first-child {
+toolbar.primary-toolbar combobox entry .entry:first-child,
+toolbar.primary-toolbar combobox entry button:first-child {
 	border-image-width: 4px 0 4px 4px;
 	border-radius: 3px 0 0 3px;
 	border-right-width: 0;
 }
 
-.primary-toolbar .combobox-entry .entry:last-child,
-.primary-toolbar .combobox-entry .button:last-child {
+toolbar.primary-toolbar combobox entry .entry:last-child,
+toolbar.primary-toolbar combobox entry button:last-child {
 	border-image-width: 4px 4px 4px 0;
 	border-radius: 0 3px 3px 0;
 	border-left-width: 0;
 }
 
-.combobox-entry .button *:active,
-.combobox-entry .button *:active:hover {
+combobox entry button *:active,
+combobox entry button *:active:hover {
 	color: @theme_text_color;
 }
 
-GtkComboBox .button {
+combobox button {
 	color: @internal_element_color;
 }
 
-GtkComboBox .button *:hover {
+combobox button *:hover {
 	color: @theme_text_color;
 }
 
@@ -1281,13 +1296,12 @@ GtkComboBox .button *:hover {
  * Scrollbars *
  **************/
 
-.scrollbar {
+scrollbar {
 	background-image: none;
 	border-style: solid;
 	-GtkRange-trough-border: 0;
 	-GtkScrollbar-has-backward-stepper: true;
 	-GtkScrollbar-has-forward-stepper: true;
-	-GtkRange-arrow-scaling: 0.4;
 	-GtkRange-slider-width: 15;
 	-GtkRange-stepper-size: 15px;
 	-GtkScrollbar-min-slider-length: 30;
@@ -1295,19 +1309,19 @@ GtkComboBox .button *:hover {
 	-GtkRange-trough-under-steppers: 0;
 }
 
-.scrollbars-junction {
+scrollbars-junction {
 	background-image: none;
 	background-color: @scrollbars_junction_bg_color;
 }
 
-.scrollbars-junction,
+scrollbars-junction,
 .scrollbar.trough {
 	border-color: @scrollbar_trough_border_color;
 	border-radius: 0;
 	border-image: none;
 }
 
-.scrollbar.trough.horizontal {
+scrollbar trough.horizontal {
 	border-width: 1px 0px;
 	background-image: -gtk-gradient (linear,
 	                  left top,
@@ -1316,7 +1330,7 @@ GtkComboBox .button *:hover {
 	                  color-stop (0.5, @scrollbar_trough_gradient_b));
 }
 
-.scrollbar.trough.vertical {
+scrollbar trough.vertical {
 	border-width: 0px 1px;
 	background-image: -gtk-gradient (linear,
 	                  left top,
@@ -1325,7 +1339,7 @@ GtkComboBox .button *:hover {
 	                  color-stop (0.5, @scrollbar_trough_gradient_b));
 }
 
-.scrollbar.button {
+scrollbar button {
 	border-width: 1px;
 	border-image: none;
 	border-color: @scrollbar_button_border_color;
@@ -1334,23 +1348,23 @@ GtkComboBox .button *:hover {
 	color: @scrollbar_button_color;
 }
 
-.scrollbar.button.top {
+scrollbar button.top {
 	border-radius: 3px 3px 0px 0px;
 }
 
-.scrollbar.button.bottom {
+scrollbar button.bottom {
 	border-radius: 0px 0px 3px 3px;
 }
 
-.scrollbar.button.left {
+scrollbar button.left {
 	border-radius: 3px 0px 0px 3px;
 }
 
-.scrollbar.button.right {
+scrollbar button.right {
 	border-radius: 0px 3px 3px 0px;
 }
 
-.scrollbar.button.horizontal {
+scrollbar.horizontal button {
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  left bottom,
@@ -1360,7 +1374,7 @@ GtkComboBox .button *:hover {
 	                  to (@scrollbar_button_gradient_d));
 }
 
-.scrollbar.button.vertical {
+scrollbar.vertical button {
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  right top,
@@ -1370,7 +1384,7 @@ GtkComboBox .button *:hover {
 	                  to (@scrollbar_button_gradient_d));
 }
 
-.scrollbar.button.horizontal:hover {
+scrollbar.horizontal button:hover {
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  left bottom,
@@ -1380,7 +1394,7 @@ GtkComboBox .button *:hover {
 	                  to (@scrollbar_button_hover_gradient_d));
 }
 
-.scrollbar.button.vertical:hover {
+scrollbar.vertical button:hover {
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  right top,
@@ -1390,7 +1404,7 @@ GtkComboBox .button *:hover {
 	                  to (@scrollbar_button_hover_gradient_d));
 }
 
-.scrollbar.button.horizontal:active {
+scrollbar.horizontal button:active {
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  left bottom,
@@ -1400,7 +1414,7 @@ GtkComboBox .button *:hover {
 	                  to (@scrollbar_button_active_gradient_d));
 }
 
-.scrollbar.button.vertical:active {
+scrollbar.vertical button:active {
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  right top,
@@ -1410,11 +1424,11 @@ GtkComboBox .button *:hover {
 	                  to (@scrollbar_button_active_gradient_d));
 }
 
-.scrollbar.button:insensitive {
+scrollbar button:disabled {
 	color: @scrollbar_button_insensitive_color;
 }
 
-.scrollbar.slider {
+scrollbar slider {
 	background-color: @scrollbar_slider_bg_color;
 	background-image: none;
 	border-radius: 0;
@@ -1424,7 +1438,7 @@ GtkComboBox .button *:hover {
 	border-width: 1px;
 }
 
-.scrollbar.slider:hover {
+scrollbar slider:hover {
 	background-color: @scrollbar_slider_hover_bg_color;
 }
 
@@ -1433,16 +1447,15 @@ GtkComboBox .button *:hover {
  *********/
 
 /* combobox menus */
-GtkTreeMenu.menu,
-GtkTreeMenu.menu * {
+treemenu menu {
 	background-color: @menu_bg_color;
 }
 
-GtkTreeMenu .menuitem {
+treemenu menuitem {
 	padding: 2px;
 }
 
-.menu {
+menu {
 	font: normal;
 	background-color: @menu_bg_color;
 	color: @menu_fg_color;
@@ -1452,7 +1465,7 @@ GtkTreeMenu .menuitem {
 	border-color: @menu_border_color;
 }
 
-.menu.button {
+menu button {
 	background-image: none;
 	background-color: @menu_bg_color;
 	color: @internal_element_color;
@@ -1461,7 +1474,7 @@ GtkTreeMenu .menuitem {
 	border-style: none;
 }
 
-.menu.button:hover {
+menu button:hover {
 	background-image: none;
 	background-color: @theme_base_color;
 	color: @theme_text_color;
@@ -1470,7 +1483,7 @@ GtkTreeMenu .menuitem {
 	border-style: none;
 }
 
-.menu.button:insensitive {
+menu button:disabled {
 	background-color: @theme_base_color;
 	color: lighter(@internal_element_color);
 
@@ -1479,11 +1492,10 @@ GtkTreeMenu .menuitem {
 }
 
 /* this controls the general appearance of the menubar */
-.menubar {
+menubar {
 	border-style: none;
 	padding: 1px;
 	-GtkWidget-window-dragging: true;
-	-GtkMenuBar-internal-padding: 1;
 	background-image: -gtk-gradient (linear,
 	                  left top,
 	                  left bottom,
@@ -1492,15 +1504,15 @@ GtkTreeMenu .menuitem {
 	                  to (@menubar_gradient_c));
 }
 
-.menubar .menuitem {
+menubar menuitem {
 	border-style: none;
 	padding: 3px 5px;
 	background-color: transparent;
 }
 
-.menubar .menuitem:hover,
-.menuitem.button.flat:hover,
-.menuitem.button.flat:active {
+menubar menuitem:hover,
+menuitem button.flat:hover,
+menuitem button.flat:active {
 	background-color: @menu_bg_color;
 	border-style: solid;
 	border-width: 1px 1px 0px;
@@ -1516,48 +1528,43 @@ GtkTreeMenu .menuitem {
 	                  to (@menubar_menuitem_hover_gradient_d));
 }
 
-.menuitem.button.flat:hover {
+menuitem.button.flat:hover {
 	border-width: 1px;
 	border-radius: 3px;
 }
 
-.menuitem.button.flat:focus {
+menuitem button.flat:focus {
 	color: @theme_text_color;
 }
 
-.menubar .menuitem *:hover {
+menubar menuitem:hover {
 	border-width: 1px;
 	color: @menubar_menuitem_hover_color;
 }
 
-.menu .menuitem {
-	-GtkMenuItem-arrow-scaling: 0.5;
+menu menuitem {
 	padding: 4px;
 	background-color: @menu_bg_color;
 }
 
-.menu .menuitem > * {
-	background-color: transparent;
-}
-
-.menu .menuitem:hover {
+menu menuitem:hover {
 	border-radius: 0;
 }
 
-GtkTreeMenu .menuitem:hover,
-.menu .menuitem:active,
-.menu .menuitem:hover {
+treemenu menuitem:hover,
+menu menuitem:active,
+menu menuitem:hover {
 	border-style: solid;
 	border-width: 1px;
 	border-color: @menubar_menuitem_hover_border_color;
 }
 
-GtkTreeMenu .menuitem *:hover,
-GtkComboBox .menuitem:hover *,
-.menu .menuitem:active,
-.menu .menuitem *:active,
-.menu .menuitem:hover,
-.menu .menuitem *:hover {
+treemenu menuitem:hover,
+combobox menuitem:hover,
+menu menuitem:active,
+menu menuitem:active,
+menu menuitem:hover,
+menu menuitem:hover {
 	color: @theme_selected_fg_color;
 	background-image: -gtk-gradient (linear,
 	                  left top,
@@ -1568,47 +1575,46 @@ GtkComboBox .menuitem:hover *,
 	                  to (@menubar_menuitem_hover_gradient_d));
 }
 
-.menu .menuitem:insensitive,
-.menu .menuitem *:insensitive {
+menu menuitem:disabled {
 	color: mix (@menu_fg_color, @menu_bg_color, 0.6);
 }
 
-.menu .menuitem .accelerator:insensitive {
+menu menuitem accelerator:disabled {
 	color: mix (@menu_fg_color, @menu_bg_color, 0.7);
 }
 
-.menuitem .accelerator {
+menuitem accelerator {
 	color: alpha (@menu_fg_color, 0.4);
 }
 
-.menuitem .accelerator:hover,
-.menuitem .accelerator:active {
+menuitem accelerator:hover,
+menuitem accelerator:active {
 	color: alpha (@menu_fg_color, 0.3);
 }
 
-.menuitem.arrow {
+menuitem arrow {
 	color: @menu_controls_color;
 }
 
-.menuitem.separator {
+menuitem separator {
 	color: @menu_separator_color;
 	padding: 3px 1px 3px 1px;
-
-	-GtkMenuItem-horizontal-padding: 0;
 }
 
-.menuitem.check,
-.menuitem.radio,
-.menuitem.check:hover,
-.menuitem.radio:hover,
-.menuitem.check:insensitive,
-.menuitem.radio:insensitive {
+menuitem check,
+menuitem radio,
+menuitem check:hover,
+menuitem radio:hover,
+menuitem check:disabled,
+menuitem radio:disabled {
 	background-image: none;
 	background-color: transparent;
+	min-height: 12px;
+	min-width: 12px;
 }
 
-.menuitem.check:active,
-.menuitem.radio:active {
+menuitem check:active,
+menuitem radio:active {
 	background-color: transparent;
 }
 
@@ -1616,8 +1622,7 @@ GtkComboBox .menuitem:hover *,
  * Menu Button *
  ***************/
 
-.button.menuitem.menubar:active,
-.button.menuitem.menubar *:active {
+.menuitem.button.flat:active {
 	color: @theme_text_color;
 	background-image: none;
 	background-color: @menu_bg_color;
@@ -1632,23 +1637,23 @@ GtkComboBox .menuitem:hover *,
  * Radiobuttons *
  ****************/
 
-.check,
-.radio,
-.check:insensitive,
-.radio:insensitive {
+check,
+radio,
+check:disabled,
+radio:disabled {
 	background-color: transparent;
 	border-style: none;
 }
 
-.check row:selected:insensitive,
-.check row:selected:focus:insensitive {
+check row:selected:disabled,
+check row:selected:focus:disabled {
 	background-color: transparent;
 }
 
-GtkCheckButton:hover,
-GtkCheckButton:active:hover,
-GtkCheckButton:selected,
-GtkCheckButton:selected:focus {
+checkbutton:hover,
+checkbutton:active:hover,
+checkbutton:selected,
+checkbutton:selected:focus {
 	background-color: transparent;
 }
 
@@ -1656,17 +1661,17 @@ GtkCheckButton:selected:focus {
  * Toolbars *
  ************/
 
-.toolbar {
+toolbar {
 	border-style: none;
 	border-color: darker (@theme_bg_color);
 	padding: 3px;
 }
 
-.toolbar .button {
+toolbar button {
 	padding: 1px;
 }
 
-.toolbar:insensitive {
+toolbar:disabled {
 	color: alpha (@theme_fg_color, 0.6);
 }
 
@@ -1674,7 +1679,7 @@ GtkCheckButton:selected:focus {
  * Menubar Toolbars *
  ********************/
 
-.toolbar.menubar {
+toolbar menubar {
 	border-style: none;
 	-GtkToolbar-button-relief: normal;
 	padding-left: 4px;
@@ -1688,8 +1693,7 @@ GtkCheckButton:selected:focus {
 /* applications using EggEditableToolbar usually set the primary-toolbar
  * hint on the containing vbox, so we need to handle both these cases here.
  */
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar {
+toolbar.primary-toolbar {
 	border-width: 1px 0 1px 0;
 	border-radius: 0;
 	border-style: solid;
@@ -1699,16 +1703,14 @@ GtkCheckButton:selected:focus {
 	-GtkToolbar-button-relief: normal;
 }
 
-.primary-toolbar .toolbar:insensitive,
-.primary-toolbar.toolbar:insensitive {
+toolbar.primary-toolbar:disabled {
 	background-image: none;
 	background-color: shade (@theme_bg_color, 0.97);
 	border-color: shade (@theme_bg_color, 0.91);
 }
 
 /* progressbars on primary toolbar entries are special */
-.primary-toolbar .toolbar .entry.progressbar,
-.primary-toolbar.toolbar .entry.progressbar {
+toolbar.primary-toolbar entry progress {
 	background-image: -gtk-gradient (linear,
 	                  left top, left bottom,
 	                  from (@trough_gradient_a),
@@ -1725,7 +1727,7 @@ GtkCheckButton:selected:focus {
  * Inline toolbars *
  *******************/
 
-.inline-toolbar.toolbar {
+toolbar.inline-toolbar {
 	border-width: 1px;
 	border-radius: 0;
 	border-style: solid;
@@ -1733,15 +1735,14 @@ GtkCheckButton:selected:focus {
 	padding: 4px;
 }
 
-.inline-toolbar.toolbar:last-child {
+toolbar.inline-toolbar:last-child {
 	border-width: 0 1px 1px 1px;
 	border-radius: 0 0 3px 3px;
 }
 
 /* Primary and inline toolbars background */
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar,
-.inline-toolbar.toolbar  {
+toolbar.primary-toolbar,
+toolbar.inline-toolbar  {
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
 	                  @toolbar_gradient_a 2px,
@@ -1755,7 +1756,8 @@ GtkCheckButton:selected:focus {
  ***********/
 
 .sidebar,
-.sidebar .view {
+.sidebar .view,
+placessidebar .view {
 	background-color: @sidebar_bg_color;
 }
 
@@ -1764,17 +1766,13 @@ GtkCheckButton:selected:focus {
 }
 
 /* dialog open */
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame GtkListBox.sidebar.list,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame GtkListBox.sidebar.list,
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row {
+dialog filechooser placessidebar.sidebar.frame viewport.frame list,
+dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row {
     background-color: @theme_base_color;
 }
 
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:selected,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:selected,
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:selected:hover,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:selected:hover {
+dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row:selected,
+dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row:selected:hover {
     border-style: none;
     color: @theme_selected_fg_color;
     background-image: -gtk-gradient (linear,
@@ -1786,8 +1784,7 @@ GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-r
                       to (@menubar_menuitem_hover_gradient_d));
 }
 
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:hover,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:hover {
+dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row:hover {
 	background-image: linear-gradient(to bottom,
 	                  shade(@button_active_gradient_a, 1.20),
 	                  shade(@button_active_gradient_b, 1.20) 3px,
@@ -1798,18 +1795,15 @@ GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-r
 	background-color: transparent;
 }
 
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-icon,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-icon {
+dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer image.sidebar-icon {
     padding: 4px 8px 4px 6px;
 }
 
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-label,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-label {
+dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer label.sidebar-label {
     padding: 4px 0px 4px 1px;
 }
 
-GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-button.image-button.button,
-GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-button.image-button.button {
+dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer button.image-button.sidebar-button {
     background-color: transparent;
     background-image: none;
     border-image:none;
@@ -1819,17 +1813,18 @@ GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-r
 }
 
 /* workaround for broken first/last-child logic with linked buttons
-   in pathbar with gtk+-3.18 */
-.path-bar.linked .button.text-button {
+   in pathbar with gtk+-3.18 *//*
+.path-bar.linked button.text-button {
 	border-right-width: 1px;
 	border-left-width: 1px;
 	border-radius: 2px;
     padding: 4px;
 }
+*/
 
-.sidebar .radio,
-.sidebar .radio:focus,
-.sidebar .radio:selected {
+.sidebar radio,
+.sidebar radio:focus,
+.sidebar radio:selected {
 	background-image: none;
 	background-color: transparent;
 }
@@ -1852,33 +1847,29 @@ GtkOverlay.osd {
     background-origin: border-box;
 }
 
-.osd.button,
-.osd.button:active,
-.osd.button:checked,
-.osd .button,
-.osd .button:active,
-.osd .button:checked {
+.osd button,
+.osd button:active,
+.osd button:checked {
     border-width: 1px;
     border-style: solid;
     border-image: none;
     border-radius: 5px;
 }
 
-.osd .button {
+.osd button {
     border-color: shade (@theme_bg_color, 0.4);
 }
-.osd .button:insensitive {
+.osd button:disabled {
     border-color: alpha(@osd_button_border,0.5);
 }
 
-.osd .button:hover,
-.osd .button:active,
-.osd .button:checked {
+.osd button:hover,
+.osd button:active,
+.osd button:checked {
     border-color: shade (@theme_selected_bg_color, 0.5);
 }
 
-.osd.button,
-.osd .button {
+.osd button {
     padding: 6px;
     background-image: linear-gradient(to bottom,
                                       @osd_button_bg_a,
@@ -1886,7 +1877,7 @@ 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 {
@@ -1900,62 +1891,62 @@ GtkOverlay.osd {
 }
 
 .osd.button,
-.osd.button:prelight,
+.osd.button:hover,
 .osd.button:active,
 .osd.button:checked {
     background-color: shade(@osd_bg, 1.10);
 }
 
-.osd .button,
-.osd .button:prelight,
-.osd .button:active,
-.osd .button:checked {
+.osd button,
+.osd button:hover,
+.osd button:active,
+.osd button:checked {
     background-color: transparent;
 }
 
-.osd.button:insensitive,
-.osd .button:insensitive {
+.osd.button:disabled,
+.osd button:disabled {
     background-image: none;
     background-color: @osd_button_bg_insensitive;
 }
 
-.osd.button:active:insensitive,
-.osd .button:active:insensitive,
-.osd.button:checked:insensitive,
-.osd .button:checked:insensitive {
+.osd.button:active:disabled,
+.osd button:active:disabled,
+.osd.button:checked:disabled,
+.osd button:checked:disabled {
     background-image: none;
     background-color: @osd_button_bg_insensitive_active;
 }
 
 .osd.button:hover,
-.osd .button:hover {
+.osd button:hover {
     color: @osd_button_fg_hover;
 }
 
 .osd.button:active,
 .osd.button:hover:active,
-.osd .button:active,
-.osd .button:hover:active,
+.osd button:active,
+.osd button:hover:active,
 .osd.button:checked,
 .osd.button:hover:checked,
-.osd .button:checked,
-.osd .button:hover:checked {
+.osd button:checked,
+.osd button:hover:checked {
     color: @osd_button_fg_active;
 }
 
-.osd.button:insensitive,
-.osd.button:active *:insensitive,
-.osd.button:checked *:insensitive,
-.osd .button:insensitive,
-.osd .button:active *:insensitive,
-.osd .button:checked *:insensitive {
+.osd.button:disabled,
+.osd.button:active *:disabled,
+.osd.button:checked *:disabled,
+.osd button:disabled,
+.osd button:active *:disabled,
+.osd button:checked *:disabled {
     color: @osd_button_fg_insensitive;
     text-shadow: none;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
 }
 
 .osd.button:hover,
-.osd .button:hover {
+.osd button:hover {
     background-image: linear-gradient(to bottom,
                                       @osd_button_bg_hover_a,
                                       @osd_button_bg_hover_b 68%,
@@ -1964,13 +1955,13 @@ GtkOverlay.osd {
 
 .osd.button:active,
 .osd.button:active:hover,
-.osd .button:active,
-.osd .button:active:hover,
+.osd button:active,
+.osd button:active:hover,
 .osd GtkMenuButton.menu-button:active,
 .osd.button:checked,
 .osd.button:checked:hover,
-.osd .button:checked,
-.osd .button:checked:hover,
+.osd button:checked,
+.osd button:checked:hover,
 .osd GtkMenuButton.menu-button:checked {
     background-image: linear-gradient(to bottom,
                                       @osd_button_bg_active_a,
@@ -1978,11 +1969,11 @@ GtkOverlay.osd {
                                       @osd_button_bg_active_c);
 }
 
-.osd .linked .button:active:first-child {
+.osd .linked button:active:first-child {
     border-left-width: 1px;
 }
 
-.osd .linked .button:active:last-child {
+.osd .linked button:active:last-child {
     border-right-width: 1px;
 }
 
@@ -1997,7 +1988,7 @@ GtkOverlay.osd {
 }
 
 
-.osd.toolbar {
+toolbar.osd {
     color: @osd_fg;
     text-shadow: 0 1px @osd_text_shadow;
     padding: 5px;
@@ -2013,22 +2004,22 @@ GtkOverlay.osd {
     -GtkToolbar-button-relief: normal;
 }
 
-.osd.toolbar .flat.button.image-button {
+toolbar.osd .flat.button.image-button {
     box-shadow: none;
 }
 
-.osd.toolbar .button,
-.osd.toolbar .button:hover,
-.osd.toolbar .button:active,
-.osd.toolbar .button:checked,
-.osd.toolbar .button:active:hover,
-.osd.toolbar .button:insensitive,
-.osd.toolbar .linked .button,
-.osd.toolbar .linked .button:hover,
-.osd.toolbar .linked .button:active,
-.osd.toolbar .linked .button:checked,
-.osd.toolbar .linked .button:active:hover,
-.osd.toolbar .linked .button:insensitive {
+toolbar.osd button,
+toolbar.osd button:hover,
+toolbar.osd button:active,
+toolbar.osd button:checked,
+toolbar.osd button:active:hover,
+toolbar.osd button:disabled,
+toolbar.osd .linked button,
+toolbar.osd .linked button:hover,
+toolbar.osd .linked button:active,
+toolbar.osd .linked button:checked,
+toolbar.osd .linked button:active:hover,
+toolbar.osd .linked button:disabled {
     border-color: shade (@theme_bg_color, 0.4);
     border-style: solid;
     border-image: none;
@@ -2036,87 +2027,87 @@ GtkOverlay.osd {
     border-radius: 0px;
 }
 
-.osd.toolbar .button:active,
-.osd.toolbar .button:active:hover {
+toolbar.osd button:active,
+toolbar.osd button:active:hover {
     background-image: linear-gradient(to bottom,
                                       @osd_button_bg_active_a,
                                       @osd_button_bg_active_b 20%,
                                       @osd_button_bg_active_c);
 }
 
-.osd.toolbar .button:hover {
+toolbar.osd button:hover {
     background-image: linear-gradient(to bottom,
                                       @osd_button_bg_hover_a,
                                       @osd_button_bg_hover_b 68%,
                                       @osd_button_bg_hover_c);
 }
 
-.osd.toolbar .button:first-child,
-.osd.toolbar .button:hover:first-child,
-.osd.toolbar .button:active:first-child,
-.osd.toolbar .button:active:hover:first-child {
+toolbar.osd button:first-child,
+toolbar.osd button:hover:first-child,
+toolbar.osd button:active:first-child,
+toolbar.osd button:active:hover:first-child {
     border-radius: 3px 0 0 3px;
     border-width: 1px 0 1px 1px;
     box-shadow: inset -1px 0 @osd_button_inset;
 }
 
-.osd.toolbar .button:last-child,
-.osd.toolbar .button:hover:last-child,
-.osd.toolbar .button:active:last-child,
-.osd.toolbar .button:active:hover:last-child {
+toolbar.osd button:last-child,
+toolbar.osd button:hover:last-child,
+toolbar.osd button:active:last-child,
+toolbar.osd button:active:hover:last-child {
     box-shadow: none;
     border-radius: 0 3px 3px 0;
     border-width: 1px 1px 1px 0;
 }
 
-.osd.toolbar .button:only-child,
-.osd.toolbar .button:hover:only-child,
-.osd.toolbar .button:active:only-child,
-.osd.toolbar .button:active:hover: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 button:hover:only-child,
+toolbar.osd button:active:only-child,
+toolbar.osd button:active:hover:only-child,
+toolbar.osd GtkToolButton button,
+toolbar.osd GtkToolButton:only-child button,
+toolbar.osd GtkToolButton:last-child button,
+toolbar.osd GtkToolButton:first-child button {
     border-width: 1px;
     border-radius: 3px;
     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 */
-.osd.trough {
+.osd trough {
     background-color: @osd_trough_bg;
     border-width: 0;
 }
 
-.osd.progressbar {
+.osd progressbar {
     background-color: @osd_fg;
 }
 
-.osd .scale.trough {
+.osd scale trough {
     border-color: shade (@theme_bg_color, 0.4);
     border-image: none;
     /* this defines the bg color of the played segment */
     background-color: @osd_scale_trough_bg_color;
 }
 
-.osd .scale.trough.highlight {
+.osd scale trough highlight {
     background-image: none;
     background-color: @theme_selected_bg_color;
     background-color: @osd_scale_trough_highlight_bg_color;
 }
 
-.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;
@@ -2130,7 +2121,7 @@ GtkOverlay.osd {
     padding: 2px;
 }
 
-.osd .scale-popup.popover.background .button.flat.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%,
@@ -2140,7 +2131,7 @@ GtkOverlay.osd {
     padding: 3px;
 }
 
-.osd .scale-popup.popover.background .button.flat.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 78%,
@@ -2148,22 +2139,20 @@ GtkOverlay.osd {
     box-shadow: none;
 }
 
-.osd .scale-popup.popover.background .button.flat.image-button:insensitive {
+.osd popover.background.scale-popup button.flat.image-button:disabled {
     border-color: alpha (shade(@theme_bg_color, 0.4), 0.0);
     background-image: none;
     background-color: transparent;
 }
 
-.osd GtkProgressBar,
-GtkProgressBar.osd {
+.osd progressbar,
+progressbar .osd {
     padding: 0;
-    -GtkProgressBar-xspacing: 0;
-    -GtkProgressBar-yspacing: 3px;
-    -GtkProgressBar-min-horizontal-bar-height: 3px;
+    min-height: 3px;
 }
 
-.osd GtkProgressBar.trough,
-GtkProgressBar.osd.trough {
+.osd progressbar trough,
+progressbar .osd trough {
     padding: 0;
     border-image: none;
     border-style: none;
@@ -2173,37 +2162,37 @@ 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 {
     background-color: @osd_scrollbar_trough;
 }
 
-.osd .scrollbar.slider {
+.osd scrollbar slider {
     background-color: @osd_scrollbar_slider;
 }
 
-.osd .scrollbar.slider:hover {
+.osd scrollbar slider:hover {
     background-color: @osd_scrollbar_slider_prelight;
 }
 
-.osd .scrollbar.slider:active {
+.osd scrollbar 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;
@@ -2225,12 +2214,12 @@ GtkProgressBar.osd.progressbar {
  * GtkAssistant *
  ****************/
 
-GtkAssistant .sidebar .highlight {
+assistant .sidebar highlight {
 	color: @theme_fg_color;
 	font: bold;
 }
 
-GtkAssistant .sidebar {
+assistant .sidebar {
 	padding: 12px;
 	border-width: 1px;
 	border-radius: 2px;
@@ -2245,12 +2234,12 @@ GtkAssistant .sidebar {
  * GtkSwitch *
  *************/
 
-GtkSwitch {
+switch {
 	color: @switch_color;
 }
 
-GtkScale.progressbar,
-GtkSwitch.trough:active {
+scale progressbar,
+switch trough:active {
 	color: @switch_trough_active_color;
 }
 
@@ -2261,13 +2250,13 @@ GtkSwitch.trough:active {
 	                  to (@switch_trough_active_gradient_b));
 }
 
-GtkSwitch.trough:insensitive {
+switch trough:disabled {
 	background-image: none;
 	background-color: @insensitive_bg_color;
 	color: mix(@insensitive_bg_color, @insensitive_fg_color, 0.5);
 }
 
-GtkSwitch.slider {
+switch slider {
 	background-color: @switch_slider_bg_color;
 	border-width: 1px;
 	border-radius: 2px;
@@ -2276,53 +2265,65 @@ GtkSwitch.slider {
 	padding: 0px 0px 1px 0px;
 }
 
-GtkSwitch.slider:insensitive {
+switch slider:disabled {
 	background-color: @switch_slider_insensitive_bg_color;
 	border-color: @insensitive_border_color;
 }
 
-GtkTreeView {
+treeview {
 	-GtkTreeView-vertical-separator: 0;
 	-GtkTreeView-expander-size: 13;
-	-GtkWidget-focus-line-width: 1;
-	-GtkWidget-focus-padding: 1;
 }
 
-GtkTreeView.dnd {
+treeview.dnd {
 	border-color: @internal_element_color;
 	border-radius: 2px;
 	border-width: 1px;
 	border-style: solid;
 }
 
-GtkViewport,
-GtkIconView {
+iconview,
+viewport {
 	border-radius: 3px;
 	padding: 0;
 	background-color: @theme_base_color;
 }
 
-GtkIconView.view.cell:selected,
-GtkIconView.view.cell:selected:focus {
+iconview.view.cell:selected,
+iconview.view.cell:selected:focus {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 	border-radius: 4px;
 }
 
-.view,
-GtkTreeView {
+view,
+.view, 
+view text,
+.view text,
+iconview text,
+textview text
+treeview {
 	background-color: @theme_base_color;
 	color: @theme_text_color;
 }
 
+view,
+view:selected,
+view:selected:focus, 
 .view:selected,
-GtkTreeView:selected {
+.view:selected:focus, 
+view text selection,
+.view text selection,
+view text selection:focus,
+.view text selection:focus
+treeview:selected {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 }
 
-.view:insensitive,
-GtkTreeView:insensitive {
+view:disabled,
+.view:disabled,
+treeview:disabled {
 	background-color: @insensitive_bg_color;
 	color: @insensitive_fg_color;
 }
@@ -2338,19 +2339,14 @@ GtkTreeView:hover {
 	background-color: transparent;
 }
 
-column-header.button,
-column-header .button {
+treeview header button {
 	color: @internal_element_color;
 }
 
-column-header.button,
-column-header .button,
-column-header.button:insensitive,
-column-header .button:insensitive,
-column-header.button:hover,
-column-header .button:hover,
-column-header.button:focus:hover,
-column-header .button:focus:hover {
+treeview header button,
+treeview header button:disabled,
+treeview header button:hover,
+treeview header button:focus:hover {
 	background-color: @theme_base_color;
 	background-image: -gtk-gradient (linear,
 	                  left top,
@@ -2363,36 +2359,24 @@ column-header .button:focus:hover {
 	font-weight: normal;
 }
 
-column-header.button:insensitive,
-column-header .button:insensitive {
+treeview header button:disabled {
 	background-color: @insensitive_bg_color;
 }
 
-column-header.button:hover,
-column-header .button:hover,
-column-header.button:focus:hover,
-column-header .button:focus:hover,
-column-header.button:active:focus:hover,
-column-header .button:active:focus:hover,
-column-header.button:active:focus,
-column-header .button:active:focus,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button *:active,
-column-header .button *:active,
-column-header.button *:active:hover,
-column-header .button *:active:hover {
+treeview header button:hover,
+treeview header button:focus:hover,
+treeview header button:active:focus:hover,
+treeview header button:active:focus,
+treeview header button:active:hover,
+treeview header button:checked,
+treeview header button:active:hover {
 	color: @internal_element_hover_color;
 }
 
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:active:hover:focus,
-column-header .button:active:hover:focus,
-column-header.button:active:focus,
-column-header .button:active:focus {
+treeview header button:checked,
+treeview header button:active:hover,
+treeview header button:active:hover:focus,
+treeview header button:active:focus {
 	background-color: @entry_bg_color;
 	background-image: none;
 }
@@ -2401,7 +2385,7 @@ row:hover {
 	border-width: 0;
 }
 
-row:insensitive {
+row:disabled {
 	border-width: 0;
 }
 
@@ -2431,7 +2415,7 @@ row:selected:focus,
 	color: @theme_selected_fg_color;
 }
 
-.expander {
+expander {
 	border-style: solid;
 	border-width: 1px;
 	border-radius: 2px;
@@ -2440,14 +2424,14 @@ row:selected:focus,
 	background-color: @theme_base_color;
 }
 
-.expander:active {
+expander:active {
 	border-style: solid;
 	border-width: 1px;
 	border-color: shade (@internal_element_color, 1.40);
 	background-color: @theme_base_color;
 }
 
-.expander:hover {
+expander:hover {
 	border-style: solid;
 	border-width: 1px;
 	color: @internal_element_color;
@@ -2455,12 +2439,12 @@ row:selected:focus,
 	background-color: shade (@theme_bg_color, 1.02);
 }
 
-.expander row {
+expander row {
 	border-radius: 2px;
 }
 
-.expander row:selected,
-.expander row:selected:focus {
+expander row:selected,
+expander row:selected:focus {
 	border-style: solid;
 	border-width: 1px;
 	border-color: @expander_row_selected_border_color;
@@ -2469,18 +2453,18 @@ row:selected:focus,
 }
 
 /* Calendars */
-GtkCalendar {
+calendar {
 	padding: 2px;
 }
 
-GtkCalendar.view {
+calendar.view {
 	border-radius: 3px;
 	border-style: solid;
 	border-width: 1px;
 	padding: 2px;
 }
 
-GtkCalendar.header {
+calendar.header {
 	border-radius: 0;
 	background-image: -gtk-gradient (linear,
 	                  left top,
@@ -2490,14 +2474,14 @@ GtkCalendar.header {
 	border-width: 0;
 }
 
-GtkCalendar.button,
-GtkCalendar.button:insensitive {
+calendar button,
+calendar button:disabled {
 	background-image: none;
 	background-color: transparent;
 }
 
-.highlight,
-GtkCalendar.highlight {
+highlight,
+calendar.highlight {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 	border-radius: 0;
@@ -2506,48 +2490,48 @@ GtkCalendar.highlight {
 }
 
 /* Use different button and entry borders on infobars */
-GtkInfoBar .entry,
-GtkInfoBar .entry:focus,
-GtkInfoBar .button,
-GtkInfoBar .button:insensitive,
-GtkInfoBar .button:active,
-GtkInfoBar .button:focus,
-GtkInfoBar .button:active:focus,
-.info .entry,
-.info .entry:focus,
-.info .button,
-.info .button:insensitive,
-.info .button:active,
-.info .button:focus,
-.info .button:active:focus,
-.warning .entry,
-.warning .entry:focus,
-.warning .button,
-.warning .button:insensitive,
-.warning .button:active,
-.warning .button:focus,
-.warning .button:active:focus,
-.question .entry,
-.question .entry:focus,
-.question .button,
-.question .button:insensitive,
-.question .button:active,
-.question .button:focus,
-.question .button:active:focus,
-.error .entry,
-.error .entry:focus,
-.error .button,
-.error .button:insensitive,
-.error .button:active,
-.error .button:focus,
-.error .button:active:focus {
+infobar entry,
+infobar entry:focus,
+infobar button,
+infobar button:disabled,
+infobar button:active,
+infobar button:focus,
+infobar button:active:focus,
+entry.info,
+entry.info:focus,
+.info button,
+.info button:disabled,
+.info button:active,
+.info button:focus,
+.info button:active:focus,
+entry.warning,
+entry.warning:focus,
+.warning button,
+.warning button:disabled,
+.warning button:active,
+.warning button:focus,
+.warning button:active:focus,
+entry.question,
+entry.question:focus,
+.question button,
+.question button:disabled,
+.question button:active,
+.question button:focus,
+.question button:active:focus,
+entry.error,
+entry.error:focus,
+.error button,
+.error button:disabled,
+.error button:active,
+.error button:focus,
+.error button:active:focus {
 	border-image: none;
 	border-color: shade(@border_color, 0.9);
 	border-style: solid;
 	border-width: 1px;
 }
 
-GtkInfoBar:last-child,
+infobar:last-child,
 .info:last-child,
 .warning:last-child,
 .question:last-child,
@@ -2594,14 +2578,6 @@ GtkInfoBar:last-child,
 	color: mix (@theme_selected_fg_color, @theme_base_color, 0.50);
 }
 
-/***************
- * Resize grip *
- ***************/
-
-.grip {
-	background-color: transparent;
-}
-
 /************
  * Titlebar *
  ************/
@@ -2637,17 +2613,17 @@ GtkInfoBar:last-child,
 /*	padding: 5px 5px 6px 5px;*/
 /*}*/
 
-.titlebar .titlebutton {
+.titlebar button.titlebutton {
 	background: none;
 	border-image: none;
 }
 
 /* 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-width: 0px;
 	border-radius: 7px 7px 0 0;
 	border-style: solid;
@@ -2656,21 +2632,21 @@ GtkInfoBar:last-child,
 }
 
 /* workaround to avoid unwanted black frames if switching compositor on/off */
-.window-frame:backdrop {
+decoration:backdrop {
 /*	box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px*/
     box-shadow: none;
 }
 
-.window-frame.tiled {
+.tiled decoration {
 	border-radius: 0;
 	background-color: @theme_bg_color;
 }
 
-.window-frame.ssd {
+.ssd decoration {
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23);
 }
 
-.window-frame.solid-csd {
+.solid-csd decoration {
     border-radius: 0;
     margin: 4px;
     background-color: @wm_bg_a;
@@ -2678,17 +2654,17 @@ GtkInfoBar:last-child,
     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: 5px;
     box-shadow: 0 1px 5px @wm_shadow;
 }
 
-.window-frame.csd.message-dialog {
+messagedialog.csd decoration {
     border-radius: 7px;
     box-shadow: 0 1px 5px @wm_shadow;
 }
@@ -2697,7 +2673,7 @@ GtkInfoBar:last-child,
  * Action bar *
  **************/
 
-.action-bar {
+actionbar {
 	border-style: none;
 	padding: 7px 7px 3px 7px;
 }
@@ -2706,7 +2682,7 @@ GtkInfoBar:last-child,
  * Header bar *
  **************/
 
-GtkHeaderBar .header-bar {
+headerbar {
 	padding: 5px 4px 4px 4px;
 }
 
@@ -2714,7 +2690,7 @@ GtkHeaderBar .header-bar {
  * Popovers *
  *************/
 
-.popover {
+popover.background {
 	background-clip: initial;
 	margin: 10px;
 	padding: 2px;
@@ -2727,84 +2703,85 @@ GtkHeaderBar .header-bar {
 	                                  shade(@theme_bg_color, 0.85));
 	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_color,0.1);
 	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(#3E403D, 0.85), 0.75);
 	border: 1px solid black;
 	box-shadow: none;
 	color: @theme_selected_fg_color;
 }
-.popover.osd .toolbar {
+popover.osd toolbar {
 	background-image: none;
 	background-color: transparent;
 	border-style: 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:active,
-.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 .list {
+popover list {
 	background-color: @theme_base_color;
 }
 
-GtkModelButton.button {
+modelbutton.flat {
 	color: @theme_fg_color;
 	border-radius: 3px;
 }
 
-GtkModelButton.button:checked,
-GtkModelButton.button:active,
-GtkModelButton.button:insensitive,
-GtkModelButton.button:active:insensitive,
-GtkModelButton.button:checked:insensitive,
-GtkModelButton.button,
-GtkModelButton.button:focus,
-GtkModelButton.button:active:focus,
-GtkModelButton.button:checked:focus {
+modelbutton.flat:checked,
+modelbutton.flat:active,
+modelbutton.flat:disabled,
+modelbutton.flat:active:disabled,
+modelbutton.flat:checked:disabled,
+modelbutton.flat,
+modelbutton.flat:focus,
+modelbutton.flat:active:focus,
+modelbutton.flat:checked:focus {
 	color: @theme_fg_color;
 	background-color: transparent;
 	background-image: none;
@@ -2815,10 +2792,10 @@ GtkModelButton.button:checked:focus {
 	border-radius: 3px;
 }
 
-GtkModelButton.button:checked:hover,
-GtkModelButton.button:active:hover,
-GtkModelButton.button:hover,
-GtkModelButton.button:selected {
+modelbutton.flat:checked:hover,
+modelbutton.flat:active:hover,
+modelbutton.flat:hover,
+modelbutton.flat:selected {
 	color: @theme_selected_fg_color;
 	background-image:  linear-gradient(to bottom,
 	                                  shade(@theme_selected_bg_color, 1.1),
@@ -2829,17 +2806,17 @@ GtkModelButton.button:selected {
 	border-radius: 3px;
 }
 
-GtkPopover .separator {
+popover separator {
 	font-size: 80%;
 	font-weight: bold;
 	color: alpha(@theme_text_color,0.4);
 	text-shadow: none;
 	background-color: transparent;
-	icon-shadow: none;
+	-gtk-icon-shadow: none;
 	border: 0;
 }
 
-.popover .button.default.suggested-action.text-button {
+popover button.default.text-button.suggested-action {
     background-color: transparent;
     background-image: none;
     text-shadow:none;
@@ -2848,7 +2825,7 @@ GtkPopover .separator {
     box-shadow: none;
 }
 
-.popover .button.default.suggested-action.text-button:hover {
+popover button.default.text-button.suggested-action:hover {
 	color: @theme_selected_fg_color;
 	background-image:  linear-gradient(to bottom,
 	                                  shade(@theme_selected_bg_color, 1.1),
@@ -2863,11 +2840,11 @@ GtkPopover .separator {
  * GtkStack *
  ************/
 
-GtkStackSidebar.sidebar .separator.horizontal {
-    -GtkWidget-separator-height: 0px;
+stacksidebar.sidebar separator.horizontal {
+/*    -GtkWidget-separator-height: 0px; */
 }
 
-GtkStackSidebar.sidebar GtkViewport.frame {
+stacksidebar.sidebar viewport.frame {
     border-color: @border_color;
     border-style: solid;
     border-width: 0 1px 0 0;
@@ -2876,8 +2853,7 @@ GtkStackSidebar.sidebar GtkViewport.frame {
     background-color: @theme_base_color;
 }
 
-GtkStackSidebar.sidebar GtkListBoxRow.button.list-row:active,
-GtkStackSidebar.sidebar GtkListBoxRow.button.list-row:selected {
+stacksidebar.sidebar list row.activatable:selected {
     border-style: none;
     border-width: 0px;
     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 0.8),
@@ -2887,11 +2863,11 @@ GtkStackSidebar.sidebar GtkListBoxRow.button.list-row:selected {
 }
 
 /* address entry */
-GtkStack .linked.vertical .entry {
+stack .linked.vertical entry {
     padding: 4px;
 }
 
-.horizontal.titlebar.header-bar .horizontal.linked.stack-switcher .button.text-button {
+.horizontal.titlebar.header-bar .horizontal.linked.stack-switcher button.text-button {
     padding: 4px;
 }
 
@@ -2917,14 +2893,14 @@ GtkStack .linked.vertical .entry {
     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_fg_color;
     border-color: rgba(75, 89, 112, 0.7);
     background-image: linear-gradient(to bottom,
@@ -2932,32 +2908,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: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom,
@@ -2965,19 +2941,19 @@ 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;
 }
 
-.app-notification .button:active,
-.app-notification .button:checked,
-.app-notification .button:backdrop:active,
-.app-notification .button:backdrop:checked,
-.app-notification.frame .button:active,
-.app-notification.frame .button:checked,
-.app-notification.frame .button:backdrop:active,
-.app-notification.frame .button:backdrop:checked {
+.app-notification button:active,
+.app-notification button:checked,
+.app-notification button:backdrop:active,
+.app-notification button:backdrop:checked,
+.app-notification.frame button:active,
+.app-notification.frame button:checked,
+.app-notification.frame button:backdrop:active,
+.app-notification.frame button:backdrop:checked {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom,
@@ -2985,15 +2961,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,
@@ -3001,13 +2977,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,
@@ -3015,7 +2991,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;
 }
@@ -3027,10 +3003,10 @@ GtkCalendar.header .app-notification.frame .titlebutton.button {
   color: @link_color;
 }
 
-GtkLinkButton.button,
-GtkLinkButton.button:hover,
-GtkLinkButton.button:active,
-GtkLinkButton.button:active:hover {
+button.flat.link.text-button,
+button.flat.link.text-button:hover,
+button.flat.link.text-button:active,
+button.flat.link.text-button:active:hover {
     transition: all 400ms ease-in;
     text-shadow: none;
 }
@@ -3040,18 +3016,18 @@ GtkLinkButton.button:active:hover {
  ******************/
 
 /* ie. mate-keyboard-properties option window */
-GtkDialog GtkScrolledWindow.frame {
+dialog scrolledwindow.frame {
     border-color: @border_color;
     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.04);
 }
 
-GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical {
+dialog scrolledwindow.frame viewport .vertical expander .vertical {
     background-color: @theme_base_color;
     border-radius: 3px;
     border-color: @border_color;
@@ -3063,7 +3039,7 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical {
  * GtkAboutDialog *
  ******************/
 
-GtkAboutDialog.background .vertical.dialog-vbox  GtkGrid.vertical {
+dialog.background dialog-vbox.vertical .vertical {
     background: transparent;
 }
 
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css b/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
index 8fe89332..86ae9272 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
@@ -55,7 +55,7 @@ CajaDesktopWindow.background .caja-canvas-item {
 }
 
 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;
 }
@@ -270,7 +270,7 @@ WnckPager {
 	text-shadow: none;
 }
 
-/* prelight of WnckPager */
+/* hover of WnckPager */
 WnckPager:hover {
 	background-image: linear-gradient(to bottom,
 		shade (@theme_selected_bg_color, 1.86),
@@ -347,8 +347,8 @@ ShellWindow GtkScrolledWindow .button.flat:hover {
 
 PlumaCloseButton.button.flat,
 PlumaCloseButton.button.flat:hover,
-PlumaCloseButton:prelight.button.flat,
-PlumaCloseButton:prelight.button.flat:hover {
+PlumaCloseButton:hover.button.flat,
+PlumaCloseButton:hover.button.flat:hover {
     padding: 0px;
 }
 
@@ -453,7 +453,7 @@ PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat.image-button {
  * Engrampa *
  ************/
 
-FrWindow .horizontal.toolbar .button.flat.image-button:insensitive {
+FrWindow .horizontal.toolbar .button.flat.image-button:disabled {
     background-image: none;
 }
 
@@ -477,7 +477,7 @@ EvWindow .toolbar .button.flat {
 }
 
 EvWindow .vertical.primary-toolbar .horizontal.toolbar EphyZoomControl GtkToggleButton.button,
-EvWindow .vertical.primary-toolbar .horizontal.toolbar EphyZoomControl GtkToggleButton:prelight.button {
+EvWindow .vertical.primary-toolbar .horizontal.toolbar EphyZoomControl GtkToggleButton:hover.button {
     padding: 8px 4px;
     border-radius: 4px;
 }
@@ -519,7 +519,7 @@ EomThumbNav .button.flat:hover {
     border-color: @focus_border_color;
 }
 
-EomThumbNav .button.flat:insensitive {
+EomThumbNav .button.flat:disabled {
     border-color: @insensitive_border_color;
 }