fix theme css warningsmain

24 files changed, 365 insertions, 381 deletions

diff --git a/themes/ayaya/gtk-3.0/apps/gnome-applications.css b/themes/ayaya/gtk-3.0/apps/gnome-applications.css
index 198263e..446a8c2 100644
--- a/themes/ayaya/gtk-3.0/apps/gnome-applications.css
+++ b/themes/ayaya/gtk-3.0/apps/gnome-applications.css
@@ -29,7 +29,7 @@ PanelMenuBar.menubar.menuitem {
     -PanelMenuBar-icon-visible: true;
 
     border-width: 0;
-    color: #ff00000;
+    color: #ff0000;
     padding-right: 20px;
     background-image: none;
 }
@@ -60,14 +60,14 @@ PanelApplet .button:active {
     color: shade(@panel_fg_color, 1.08);
 }
 
-PanelApplet .button:prelight {
+PanelApplet .button:hover {
     border-color: mix(@panel_bg_color, @panel_fg_color, 0.11);
     background-color: mix(@panel_bg_color, @panel_fg_color, 0.11);
     background-image: none;
     color: shade(@panel_fg_color, 1.08);
 }
 
-PanelApplet .button:active:prelight {
+PanelApplet .button:active:hover {
     border-color: mix(@panel_bg_color, @panel_fg_color, 0.31);
     background-color: mix(@panel_bg_color, @panel_fg_color, 0.31);
     background-image: none;
@@ -95,7 +95,7 @@ WnckPager, WnckTasklist {
 }
 
 .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;
 }
@@ -241,21 +241,21 @@ GeditWindow .pane-separator:hover {
     background-color: transparent;
     background-image: none;
     color: transparent;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
 }
 
-.gedit-document-panel .prelight-row .button  {
+.gedit-document-panel .hover-row .button  {
     border-color: alpha(black, 0.1);
     color: alpha(white, 0.8);
 }
 
 .gedit-document-panel .list-row .button:hover,
-.gedit-document-panel .prelight-row .button:hover {
+.gedit-document-panel .hover-row .button:hover {
     border-color: alpha(black, 0.1);
     color: white;
 }
 
-.gedit-document-panel .prelight-row .button:active {
+.gedit-document-panel .hover-row .button:active {
     border-color: alpha(black, 0.2);
     background-color: alpha(black, 0.08);
     color: white;
@@ -387,11 +387,13 @@ EPreviewPane .entry {
  * gnome-bluetooth *
  *******************/
 GtkEntry.entry.pin-entry {
-	font: regular 50;
+	font-size: 50px;
+  font-weight: normal;
 	padding-left: 25px;
 	padding-right: 25px;
 }
 
 GtkLabel.pin-label {
-	font: regular 50;
+	font-size: 50px;
+  font-weight: normal;
 }
diff --git a/themes/ayaya/gtk-3.0/apps/granite-widgets.css b/themes/ayaya/gtk-3.0/apps/granite-widgets.css
index 1ddb61c..0e0f51a 100644
--- a/themes/ayaya/gtk-3.0/apps/granite-widgets.css
+++ b/themes/ayaya/gtk-3.0/apps/granite-widgets.css
@@ -12,9 +12,6 @@
 }
 
 .dynamic-notebook .notebook {
-    -GtkNotebook-tab-overlap: 3px;
-    -GtkNotebook-initial-gap: 12px;
-
     border-width: 1px 0 0 0;
     border-color: shade(@theme_bg_color, 0.8);
     border-radius: 0;
@@ -124,7 +121,7 @@
     color: shade(@theme_text_color, 0.7);
 }
 
-.content-view .button:insensitive {
+.content-view .button:disabled {
     background-color: shade(@theme_base_color, 0.9);
     background-image: none;
 }
@@ -170,21 +167,21 @@
 }
 
 .source-list.view:selected,
-.source-list.view:prelight:selected {
+.source-list.view:hover:selected {
     background-color: @theme_selected_bg_color;
     background-image: none;
     color: @theme_selected_fg_color;
 }
 
-.source-list.view:prelight {
+.source-list.view:hover {
     background-color: shade(@theme_bg_color, 1.08);
     background-image: none;
 }
 
 .source-list.badge,
-.source-list.badge:prelight,
+.source-list.badge:hover,
 .source-list.badge:selected,
-.source-list.badge:prelight:selected {
+.source-list.badge:hover:selected {
     margin: 0 3px;
     padding: 0 6px;
     border-width: 0;
@@ -227,7 +224,7 @@
 }
 
 .button.noundo GtkLabel,
-.button.noundo Gtklabel:prelight {
+.button.noundo Gtklabel:hover {
     color: @error_fg_color;
 }
 
@@ -264,7 +261,7 @@
 }
 
 .button.affirmative GtkLabel,
-.button.affirmative Gtklabel:prelight {
+.button.affirmative Gtklabel:hover {
     color: @theme_selected_fg_color;
 }
 
@@ -308,13 +305,13 @@
     border-color: shade(@toolbar_bg_color, 0.7);
 }
 
-.secondary-toolbar.toolbar .button:insensitive {
+.secondary-toolbar.toolbar .button:disabled {
     border-color: shade(@toolbar_bg_color, 0.85);
     background-color: shade(@toolbar_bg_color, 0.9);
     background-image: none;
 }
 
-.secondary-toolbar.toolbar .button:active *:insensitive {
+.secondary-toolbar.toolbar .button:active *:disabled {
     border-color: shade(@toolbar_bg_color, 0.75);
     background-color: shade(@toolbar_bg_color, 0.80);
     background-image: none;
@@ -361,13 +358,13 @@
     border-color: shade(@theme_bg_color, 0.7);
 }
 
-.bottom-toolbar.toolbar .button:insensitive {
+.bottom-toolbar.toolbar .button:disabled {
     border-color: shade(@theme_bg_color, 0.85);
     background-color: shade(@theme_bg_color, 0.9);
     background-image: none;
 }
 
-.bottom-toolbar.toolbar .button:active *:insensitive {
+.bottom-toolbar.toolbar .button:active *:disabled {
     border-color: shade(@theme_bg_color, 0.75);
     background-color: shade(@theme_bg_color, 0.80);
     background-image: none;
@@ -461,17 +458,17 @@ GraniteWidgetsPopOver .linked .button:active {
                 inset 0 -1px alpha(@dark_shadow, 0.05);
 }
 
-GraniteWidgetsPopOver .linked .button:insensitive {
+GraniteWidgetsPopOver .linked .button:disabled {
     box-shadow: inset -1px 0 shade(@menu_bg_color, 0.9);
 }
 
 /* remove box shadow from last-child and only-child */
 GraniteWidgetsPopOver .linked .button:last-child,
 GraniteWidgetsPopOver .linked .button:only-child,
-GraniteWidgetsPopOver .linked .button:insensitive:last-child,
-GraniteWidgetsPopOver .linked .button:insensitive:only-child,
-GraniteWidgetsPopOver .linked .button:active *:insensitive:last-child,
-GraniteWidgetsPopOver .linked .button:active *:insensitive:only-child {
+GraniteWidgetsPopOver .linked .button:disabled:last-child,
+GraniteWidgetsPopOver .linked .button:disabled:only-child,
+GraniteWidgetsPopOver .linked .button:active *:disabled:last-child,
+GraniteWidgetsPopOver .linked .button:active *:disabled:only-child {
     box-shadow: none;
 }
 
@@ -647,7 +644,7 @@ BirdieWidgetsTweetList * {
     color: white;
     font-weight: bold;
     text-shadow: 0 1px 2px alpha (black, 0.5);
-    icon-shadow: 0 1px 2px alpha (black, 0.5);
+    -gtk-icon-shadow: 0 1px 2px alpha (black, 0.5);
 }
 
 .panel .menu .menuitem {
@@ -670,7 +667,7 @@ BirdieWidgetsTweetList * {
 }
 
 .composited-indicator.menuitem:active,
-.composited-indicator.menuitem:prelight {
+.composited-indicator.menuitem:hover {
     border-style: none;
     background-image: none;
     box-shadow: none;
diff --git a/themes/ayaya/gtk-3.0/apps/lightdm-gtk-greeter.css b/themes/ayaya/gtk-3.0/apps/lightdm-gtk-greeter.css
index 874cdb3..abb8415 100644
--- a/themes/ayaya/gtk-3.0/apps/lightdm-gtk-greeter.css
+++ b/themes/ayaya/gtk-3.0/apps/lightdm-gtk-greeter.css
@@ -5,9 +5,9 @@
     background-color: transparent;
     background-image: none;
     color: white;
-    font: bold;
+    font-weight: bold;
     text-shadow: 0 1px alpha(black, 0.5);
-    icon-shadow: 0 1px alpha(black, 0.5);
+    -gtk-icon-shadow: 0 1px alpha(black, 0.5);
 }
 
 #panel_window .menubar,
@@ -15,9 +15,8 @@
     background-color: transparent;
     background-image: none;
     color: white;
-    font: bold;
     text-shadow: 0 1px alpha(black, 0.5);
-    icon-shadow: 0 1px alpha(black, 0.5);
+    -gtk-icon-shadow: 0 1px alpha(black, 0.5);
 }
 
 #panel_window .menubar > .menuitem:hover {
@@ -31,7 +30,7 @@
     color: white;
 }
 
-#panel_window .menubar > .menuitem:insensitive {
+#panel_window .menubar > .menuitem:disabled {
     color: alpha(white, 0.7);
 }
 
@@ -40,7 +39,6 @@
 }
 
 #panel_window .menubar .menu .menuitem {
-    font: normal;
     text-shadow: none;
 }
 
@@ -94,11 +92,11 @@
 
 #login_window #user_combobox {
     color: @lightdm_fg_color;
-    font: 18px;
+    font-size: 18px;
 }
 
 #login_window #user_combobox .menu {
-    font: normal;
+    font-weight: normal;
 }
 
 #login_window #user_combobox .arrow {
@@ -246,5 +244,5 @@
  * password warning *
  ********************/
 #greeter_infobar {
-    font: bold;
+    font-weight: bold;
 }
diff --git a/themes/ayaya/gtk-3.0/apps/nemo.css b/themes/ayaya/gtk-3.0/apps/nemo.css
index fa09d03..e696199 100644
--- a/themes/ayaya/gtk-3.0/apps/nemo.css
+++ b/themes/ayaya/gtk-3.0/apps/nemo.css
@@ -19,7 +19,7 @@
 }
 
 .nemo-desktop.nemo-canvas-item:active,
-.nemo-desktop.nemo-canvas-item:prelight,
+.nemo-desktop.nemo-canvas-item:hover,
 .nemo-desktop.nemo-canvas-item:selected {
     text-shadow: none;
 }
diff --git a/themes/ayaya/gtk-3.0/apps/xfce.css b/themes/ayaya/gtk-3.0/apps/xfce.css
index 03cfb20..7ee7b04 100644
--- a/themes/ayaya/gtk-3.0/apps/xfce.css
+++ b/themes/ayaya/gtk-3.0/apps/xfce.css
@@ -10,7 +10,7 @@ XfceHeading {
 .xfce4-panel {
     background-color: @panel_bg_color;
     color: @panel_fg_color;
-    font: normal;
+    font-weight: normal;
 }
 
 .xfce4-panel .button {
@@ -34,5 +34,5 @@ XfceHeading {
 }
 
 .xfce4-panel .menu {
-    -gtk-image-effect: none;
+    -gtk-icon-effect: none;
 }
diff --git a/themes/ayaya/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg b/themes/ayaya/gtk-3.0/assets/checkbox-checked-disabled-dark.svg
index c3219e2..c3219e2 100644
--- a/themes/ayaya/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg
+++ b/themes/ayaya/gtk-3.0/assets/checkbox-checked-disabled-dark.svg
diff --git a/themes/ayaya/gtk-3.0/assets/checkbox-checked-insensitive.svg b/themes/ayaya/gtk-3.0/assets/checkbox-checked-disabled.svg
index 4dbe967..4dbe967 100644
--- a/themes/ayaya/gtk-3.0/assets/checkbox-checked-insensitive.svg
+++ b/themes/ayaya/gtk-3.0/assets/checkbox-checked-disabled.svg
diff --git a/themes/ayaya/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg b/themes/ayaya/gtk-3.0/assets/checkbox-mixed-disabled-dark.svg
index 27e0ef1..27e0ef1 100644
--- a/themes/ayaya/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg
+++ b/themes/ayaya/gtk-3.0/assets/checkbox-mixed-disabled-dark.svg
diff --git a/themes/ayaya/gtk-3.0/assets/checkbox-mixed-insensitive.svg b/themes/ayaya/gtk-3.0/assets/checkbox-mixed-disabled.svg
index d408465..d408465 100644
--- a/themes/ayaya/gtk-3.0/assets/checkbox-mixed-insensitive.svg
+++ b/themes/ayaya/gtk-3.0/assets/checkbox-mixed-disabled.svg
diff --git a/themes/ayaya/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg b/themes/ayaya/gtk-3.0/assets/checkbox-unchecked-disabled-dark.svg
index 3488e66..3488e66 100644
--- a/themes/ayaya/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg
+++ b/themes/ayaya/gtk-3.0/assets/checkbox-unchecked-disabled-dark.svg
diff --git a/themes/ayaya/gtk-3.0/assets/checkbox-unchecked-insensitive.svg b/themes/ayaya/gtk-3.0/assets/checkbox-unchecked-disabled.svg
index f90aa4c..f90aa4c 100644
--- a/themes/ayaya/gtk-3.0/assets/checkbox-unchecked-insensitive.svg
+++ b/themes/ayaya/gtk-3.0/assets/checkbox-unchecked-disabled.svg
diff --git a/themes/ayaya/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/themes/ayaya/gtk-3.0/assets/menuitem-checkbox-checked-disabled.svg
index f570a1c..f570a1c 100644
--- a/themes/ayaya/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
+++ b/themes/ayaya/gtk-3.0/assets/menuitem-checkbox-checked-disabled.svg
diff --git a/themes/ayaya/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/themes/ayaya/gtk-3.0/assets/menuitem-checkbox-mixed-disabled.svg
index fd8b0d4..fd8b0d4 100644
--- a/themes/ayaya/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
+++ b/themes/ayaya/gtk-3.0/assets/menuitem-checkbox-mixed-disabled.svg
diff --git a/themes/ayaya/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/themes/ayaya/gtk-3.0/assets/menuitem-radio-checked-disabled.svg
index 0bc947f..0bc947f 100644
--- a/themes/ayaya/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
+++ b/themes/ayaya/gtk-3.0/assets/menuitem-radio-checked-disabled.svg
diff --git a/themes/ayaya/gtk-3.0/assets/radio-mixed-insensitive-dark.svg b/themes/ayaya/gtk-3.0/assets/radio-mixed-disabled-dark.svg
index 6b93fc4..6b93fc4 100644
--- a/themes/ayaya/gtk-3.0/assets/radio-mixed-insensitive-dark.svg
+++ b/themes/ayaya/gtk-3.0/assets/radio-mixed-disabled-dark.svg
diff --git a/themes/ayaya/gtk-3.0/assets/radio-mixed-insensitive.svg b/themes/ayaya/gtk-3.0/assets/radio-mixed-disabled.svg
index 9fa3659..9fa3659 100644
--- a/themes/ayaya/gtk-3.0/assets/radio-mixed-insensitive.svg
+++ b/themes/ayaya/gtk-3.0/assets/radio-mixed-disabled.svg
diff --git a/themes/ayaya/gtk-3.0/assets/radio-selected-insensitive-dark.svg b/themes/ayaya/gtk-3.0/assets/radio-selected-disabled-dark.svg
index f5cfbe0..f5cfbe0 100644
--- a/themes/ayaya/gtk-3.0/assets/radio-selected-insensitive-dark.svg
+++ b/themes/ayaya/gtk-3.0/assets/radio-selected-disabled-dark.svg
diff --git a/themes/ayaya/gtk-3.0/assets/radio-selected-insensitive.svg b/themes/ayaya/gtk-3.0/assets/radio-selected-disabled.svg
index e782ba6..e782ba6 100644
--- a/themes/ayaya/gtk-3.0/assets/radio-selected-insensitive.svg
+++ b/themes/ayaya/gtk-3.0/assets/radio-selected-disabled.svg
diff --git a/themes/ayaya/gtk-3.0/assets/radio-unselected-insensitive-dark.svg b/themes/ayaya/gtk-3.0/assets/radio-unselected-disabled-dark.svg
index 0fdfaf4..0fdfaf4 100644
--- a/themes/ayaya/gtk-3.0/assets/radio-unselected-insensitive-dark.svg
+++ b/themes/ayaya/gtk-3.0/assets/radio-unselected-disabled-dark.svg
diff --git a/themes/ayaya/gtk-3.0/assets/radio-unselected-insensitive.svg b/themes/ayaya/gtk-3.0/assets/radio-unselected-disabled.svg
index a0f2168..a0f2168 100644
--- a/themes/ayaya/gtk-3.0/assets/radio-unselected-insensitive.svg
+++ b/themes/ayaya/gtk-3.0/assets/radio-unselected-disabled.svg
diff --git a/themes/ayaya/gtk-3.0/gtk-widgets-assets-dark.css b/themes/ayaya/gtk-3.0/gtk-widgets-assets-dark.css
index 64cecb7..acd2692 100644
--- a/themes/ayaya/gtk-3.0/gtk-widgets-assets-dark.css
+++ b/themes/ayaya/gtk-3.0/gtk-widgets-assets-dark.css
@@ -6,48 +6,48 @@
 	-gtk-icon-source: url("assets/checkbox-unchecked-dark.svg");
 }
 
-.check:insensitive {
-	-gtk-icon-source: url("assets/checkbox-unchecked-insensitive-dark.svg");
+.check:disabled {
+	-gtk-icon-source: url("assets/checkbox-unchecked-disabled-dark.svg");
 }
 
 .check:checked {
 	-gtk-icon-source: url("assets/checkbox-checked-dark.svg");
 }
 
-.check:checked:insensitive {
-	-gtk-icon-source: url("assets/checkbox-checked-insensitive-dark.svg");
+.check:checked:disabled {
+	-gtk-icon-source: url("assets/checkbox-checked-disabled-dark.svg");
 }
 
 .check:inconsistent {
 	-gtk-icon-source: url("assets/checkbox-mixed-dark.svg");
 }
 
-.check:inconsistent:insensitive {
-	-gtk-icon-source: url("assets/checkbox-mixed-insensitive-dark.svg");
+.check:inconsistent:disabled {
+	-gtk-icon-source: url("assets/checkbox-mixed-disabled-dark.svg");
 }
 
 .radio {
 	-gtk-icon-source: url("assets/radio-unselected-dark.svg");
 }
 
-.radio:insensitive {
-	-gtk-icon-source: url("assets/radio-unselected-insensitive-dark.svg");
+.radio:disabled {
+	-gtk-icon-source: url("assets/radio-unselected-disabled-dark.svg");
 }
 
 .radio:checked {
 	-gtk-icon-source: url("assets/radio-selected-dark.svg");
 }
 
-.radio:checked:insensitive {
-	-gtk-icon-source: url("assets/radio-selected-insensitive-dark.svg");
+.radio:checked:disabled {
+	-gtk-icon-source: url("assets/radio-selected-disabled-dark.svg");
 }
 
 .radio:inconsistent {
 	-gtk-icon-source: url("assets/radio-mixed-dark.svg");
 }
 
-.radio:inconsistent:insensitive {
-	-gtk-icon-source: url("assets/radio-mixed-insensitive-dark.svg");
+.radio:inconsistent:disabled {
+	-gtk-icon-source: url("assets/radio-mixed-disabled-dark.svg");
 }
 
 .menuitem.check {
diff --git a/themes/ayaya/gtk-3.0/gtk-widgets-assets.css b/themes/ayaya/gtk-3.0/gtk-widgets-assets.css
index fac92c4..fc65df5 100644
--- a/themes/ayaya/gtk-3.0/gtk-widgets-assets.css
+++ b/themes/ayaya/gtk-3.0/gtk-widgets-assets.css
@@ -6,48 +6,48 @@
     -gtk-icon-source: url("assets/checkbox-unchecked.svg");
 }
 
-.check:insensitive {
-    -gtk-icon-source: url("assets/checkbox-unchecked-insensitive.svg");
+.check:disabled {
+    -gtk-icon-source: url("assets/checkbox-unchecked-disabled.svg");
 }
 
 .check:checked {
     -gtk-icon-source: url("assets/checkbox-checked.svg");
 }
 
-.check:checked:insensitive {
-    -gtk-icon-source: url("assets/checkbox-checked-insensitive.svg");
+.check:checked:disabled {
+    -gtk-icon-source: url("assets/checkbox-checked-disabled.svg");
 }
 
-.check:inconsistent {
+.check:indeterminate {
     -gtk-icon-source: url("assets/checkbox-mixed.svg");
 }
 
-.check:inconsistent:insensitive {
-    -gtk-icon-source: url("assets/checkbox-mixed-insensitive.svg");
+.check:indeterminate:disabled {
+    -gtk-icon-source: url("assets/checkbox-mixed-disabled.svg");
 }
 
 .radio {
     -gtk-icon-source: url("assets/radio-unselected.svg");
 }
 
-.radio:insensitive {
-    -gtk-icon-source: url("assets/radio-unselected-insensitive.svg");
+.radio:disabled {
+    -gtk-icon-source: url("assets/radio-unselected-disabled.svg");
 }
 
 .radio:checked {
     -gtk-icon-source: url("assets/radio-selected.svg");
 }
 
-.radio:checked:insensitive {
-    -gtk-icon-source: url("assets/radio-selected-insensitive.svg");
+.radio:checked:disabled {
+    -gtk-icon-source: url("assets/radio-selected-disabled.svg");
 }
 
-.radio:inconsistent {
+.radio:indeterminate {
     -gtk-icon-source: url("assets/radio-mixed.svg");
 }
 
-.radio:inconsistent:insensitive {
-    -gtk-icon-source: url("assets/radio-mixed-insensitive.svg");
+.radio:indeterminate:disabled {
+    -gtk-icon-source: url("assets/radio-mixed-disabled.svg");
 }
 
 .menuitem.check {
@@ -62,23 +62,23 @@
     -gtk-icon-source: url("assets/menuitem-checkbox-checked-hover.svg");
 }
 
-.menuitem.check:active:insensitive {
-    -gtk-icon-source: url("assets/menuitem-checkbox-checked-insensitive.svg");
+.menuitem.check:active:disabled {
+    -gtk-icon-source: url("assets/menuitem-checkbox-checked-disabled.svg");
 }
 
-.menuitem.check:inconsistent:hover,
-.menuitem.radio:inconsistent:hover {
+.menuitem.check:indeterminate:hover,
+.menuitem.radio:indeterminate:hover {
     -gtk-icon-source: url("assets/menuitem-checkbox-mixed-hover.svg");
 }
 
-.menuitem.check:inconsistent,
-.menuitem.radio:inconsistent {
+.menuitem.check:indeterminate,
+.menuitem.radio:indeterminate {
     -gtk-icon-source: url("assets/menuitem-checkbox-mixed.svg");
 }
 
-.menuitem.check:inconsistent:insensitive,
-.menuitem.radio:inconsistent:insensitive {
-    -gtk-icon-source: url("assets/menuitem-checkbox-mixed-insensitive.svg");
+.menuitem.check:indeterminate:disabled,
+.menuitem.radio:indeterminate:disabled {
+    -gtk-icon-source: url("assets/menuitem-checkbox-mixed-disabled.svg");
 }
 
 .menuitem.radio {
@@ -93,8 +93,8 @@
     -gtk-icon-source: url("assets/menuitem-radio-checked-hover.svg");
 }
 
-.menuitem.radio:active:insensitive {
-    -gtk-icon-source: url("assets/menuitem-radio-checked-insensitive.svg");
+.menuitem.radio:active:disabled {
+    -gtk-icon-source: url("assets/menuitem-radio-checked-disabled.svg");
 }
 
 GtkIconView.content-view.cell.check {
diff --git a/themes/ayaya/gtk-3.0/gtk-widgets.css b/themes/ayaya/gtk-3.0/gtk-widgets.css
index 5b0fa24..9db299a 100644
--- a/themes/ayaya/gtk-3.0/gtk-widgets.css
+++ b/themes/ayaya/gtk-3.0/gtk-widgets.css
@@ -15,8 +15,8 @@
     -GtkCheckButton-indicator-size: 16;
     -GtkCheckMenuItem-indicator-size: 14;
     -GtkExpander-expander-size: 8;
-    -GtkMenu-horizontal-padding: 0;
-    -GtkMenu-vertical-padding: 0;
+    /*-GtkMenu-horizontal-padding: 0;
+    -GtkMenu-vertical-padding: 0;*/
     -GtkPaned-handle-size: 4;
     -GtkProgressBar-min-horizontal-bar-height: 12;
     -GtkProgressBar-min-vertical-bar-width: 12;
@@ -39,8 +39,8 @@
     -WnckTasklist-fade-overlay-rect: 0;
 
     /* legacy only */
-    -GtkWidget-focus-line-width: 1;
-    -GtkWidget-focus-padding: 0;
+    /*-GtkWidget-focus-line-width: 1;
+    -GtkWidget-focus-padding: 0;*/
 
     background-clip: padding-box;
 
@@ -63,7 +63,7 @@
 
 .background:backdrop {
     text-shadow: none;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
 }
 
 *:selected,
@@ -72,18 +72,18 @@
     color: @theme_selected_fg_color;
 }
 
-*:insensitive,
-*:insensitive:insensitive {
+*:disabled,
+*:disabled:disabled {
     color: mix(@theme_fg_color, @theme_bg_color, 0.5);
 }
 
-/* apply effects to insensitive and prelit images */
-*:insensitive {
-    -gtk-image-effect: dim;
+/* apply effects to disabled and prelit images */
+*:disabled {
+    -gtk-icon-effect: dim;
 }
 
 *:hover {
-    -gtk-image-effect: highlight;
+    -gtk-icon-effect: highlight;
 }
 
 .gtkstyle-fallback {
@@ -91,7 +91,7 @@
     color: @theme_fg_color;
 }
 
-.gtkstyle-fallback:prelight {
+.gtkstyle-fallback:hover {
     background-color: shade(@theme_bg_color, 1.1);
     color: @theme_fg_color;
 }
@@ -101,7 +101,7 @@
     color: @theme_fg_color;
 }
 
-.gtkstyle-fallback:insensitive {
+.gtkstyle-fallback:disabled {
     background-color: shade(shade(@theme_bg_color, 0.95), 1.05);
     color: mix(@theme_fg_color, @theme_bg_color, 0.5);
 }
@@ -112,13 +112,13 @@
 }
 
 GtkImage,
-GtkImage:insensitive,
+GtkImage:disabled,
 GtkLabel,
-GtkLabel:insensitive,
+GtkLabel:disabled,
 GtkBox,
-GtkBox:insensitive,
+GtkBox:disabled,
 GtkGrid,
-GtkGrid:insensitive {
+GtkGrid:disabled {
     background-color: transparent;
 }
 
@@ -128,8 +128,8 @@ GtkGrid:insensitive {
 * {
     -GtkHTML-link-color: @link_color;
     -GtkIMHtml-hyperlink-color: @link_color;
-    -GtkWidget-link-color: @link_color;
-    -GtkWidget-visited-link-color: @link_color;
+    /*-GtkWidget-link-color: @link_color;
+    -GtkWidget-visited-link-color: @link_color;*/
 }
 
 *:link,
@@ -158,8 +158,8 @@ GtkGrid:insensitive {
 }
 
 notebook tab GtkLabel,
-notebook .prelight-page,
-notebook .prelight-page GtkLabel,
+notebook .hover-page,
+notebook .hover-page GtkLabel,
 notebook .active-page,
 notebook .active-page GtkLabel {
     transition: all 200ms ease-in;
@@ -189,15 +189,15 @@ notebook.header {
 }
 
 /* disable inset shadow */
-.button:active:insensitive,
-.primary-toolbar .button:active:insensitive,
-.toolbar .button:active:insensitive,
-.header-bar .button:active:insensitive,
-.button:checked:insensitive,
-.primary-toolbar .button:checked:insensitive,
-.toolbar .button:checked:insensitive,
-.header-bar .button:checked:insensitive,
-.entry:insensitive {
+.button:active:disabled,
+.primary-toolbar .button:active:disabled,
+.toolbar .button:active:disabled,
+.header-bar .button:active:disabled,
+.button:checked:disabled,
+.primary-toolbar .button:checked:disabled,
+.toolbar .button:checked:disabled,
+.header-bar .button:checked:disabled,
+.entry:disabled {
     box-shadow: none;
 }
 
@@ -205,7 +205,6 @@ notebook.header {
  * assistant *
  *************/
 GtkAssistant .sidebar .highlight {
-    font: bold;
 }
 
 GtkAssistant .sidebar {
@@ -222,8 +221,8 @@ GtkAssistant .sidebar {
  * button *
  **********/
 button {
-    -GtkWidget-focus-padding: 1;
-    -GtkWidget-focus-line-width: 0;
+    /*-GtkWidget-focus-padding: 1;*/
+    /*-GtkWidget-focus-line-width: 0;*/
 
     padding: 3px;
     border-width: 1px;
@@ -244,7 +243,7 @@ button:hover {
 button:active,
 button:checked {
     /*border-color: shade(@selected_bg_color, 0.8);*/
-    background-color: shade(@selected_bg_color 0.95);
+    background-color: shade(@selected_bg_color, 0.95);
     background-image: none;
 }
 
@@ -262,14 +261,14 @@ button:checked:hover:focus {
     border-color: shade(@theme_bg_color, 0.7);
 }
 
-button:insensitive {
+button:disabled {
     border-color: shade(@theme_bg_color, 0.85);
     background-color: shade(@theme_bg_color, 0.9);
     background-image: none;
 }
 
-button:active:insensitive,
-button:checked:insensitive {
+button:active:disabled,
+button:checked:disabled {
     border-color: shade(@theme_bg_color, 0.75);
     background-color: shade(@theme_bg_color, 0.80);
     background-image: none;
@@ -300,7 +299,7 @@ button.default:checked:hover {
 }
 
 button.flat,
-button.flat:insensitive {
+button.flat:disabled {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
@@ -328,9 +327,6 @@ button.flat:checked {
 row:selected,
 row:selected:hover,
 row:selected:focus {
-    -GtkWidget-focus-padding: 1;
-    -GtkWidget-focus-line-width: 0;
-
     border-width: 1px 0;
     border-style: solid;
     border-color: shade(@theme_selected_bg_color, 0.9);
@@ -385,7 +381,6 @@ selection {
  * content view *
  ****************/
 .content-view.subtitle {
-    font: smaller;
     padding: 0 12px;
 }
 
@@ -393,7 +388,7 @@ selection {
     background-color: @theme_base_color;
 }
 
-.content-view.view:prelight {
+.content-view.view:hover {
     background-color: alpha(@theme_selected_bg_color, 0.6);
 }
 
@@ -402,7 +397,7 @@ selection {
     background-color: @theme_selected_bg_color;
 }
 
-.content-view.view:insensitive {
+.content-view.view:disabled {
     background-color: shade(@theme_base_color, 0.9);
 }
 
@@ -423,8 +418,8 @@ GtkIconView.content-view.check:active {
     background-color: transparent;
 }
 
-GtkIconView.content-view.check:prelight,
-GtkIconView.content-view.check:insensitive,
+GtkIconView.content-view.check:hover,
+GtkIconView.content-view.check:disabled,
 GtkIconView.content-view.check:selected {
     background-color: transparent;
 }
@@ -436,7 +431,7 @@ GtkDrawingArea {
     background-color: transparent;
 }
 
-GtkDrawingArea:insensitive {
+GtkDrawingArea:disabled {
     background-color: shade(@theme_base_color, 0.9);
 }
 
@@ -456,7 +451,7 @@ GtkCalendar {
     outline-offset: -1px;
 }
 
-GtkCalendar:inconsistent {
+GtkCalendar:indeterminate {
     color: mix(@theme_fg_color, @theme_bg_color, 0.5);
 }
 
@@ -464,7 +459,7 @@ GtkCalendar.view,
 GtkCalendar.header,
 GtkCalendar.button,
 GtkCalendar.button:hover,
-GtkCalendar.button:insensitive {
+GtkCalendar.button:disabled {
     border-width: 0;
     background-color: transparent;
     background-image: none;
@@ -483,11 +478,11 @@ GtkCalendar.highlight {
 .primary-toolbar GtkComboBox.combobox-entry .entry,
 .primary-toolbar GtkComboBox.combobox-entry .entry:active,
 .primary-toolbar GtkComboBox.combobox-entry .entry:focus,
-.primary-toolbar GtkComboBox.combobox-entry .entry:insensitive,
+.primary-toolbar GtkComboBox.combobox-entry .entry:disabled,
 GtkComboBox.combobox-entry .entry,
 GtkComboBox.combobox-entry .entry:active,
 GtkComboBox.combobox-entry .entry:focus,
-GtkComboBox.combobox-entry .entry:insensitive {
+GtkComboBox.combobox-entry .entry:disabled {
     border-width: 1px 0 1px 1px;
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
@@ -497,12 +492,12 @@ GtkComboBox.combobox-entry .entry:insensitive {
 .primary-toolbar GtkComboBox.combobox-entry .button:hover,
 .primary-toolbar GtkComboBox.combobox-entry .button:active,
 .primary-toolbar GtkComboBox.combobox-entry .button:checked,
-.primary-toolbar GtkComboBox.combobox-entry .button:insensitive,
+.primary-toolbar GtkComboBox.combobox-entry .button:disabled,
 GtkComboBox.combobox-entry .button,
 GtkComboBox.combobox-entry .button:hover,
 GtkComboBox.combobox-entry .button:active,
 GtkComboBox.combobox-entry .button:checked,
-GtkComboBox.combobox-entry .button:insensitive {
+GtkComboBox.combobox-entry .button:disabled {
     border-width: 1px 1px 1px 1px;
     border-bottom-left-radius: 0;
     border-top-left-radius: 0;
@@ -533,7 +528,7 @@ GtkComboBox.combobox-entry .button:insensitive {
     color: @theme_selected_fg_color;
 }
 
-.entry:insensitive {
+.entry:disabled {
     background-color: shade(@theme_bg_color, 0.95);
     background-image: none;
     color: mix(@theme_text_color, @theme_base_color, 0.5);
@@ -998,9 +993,9 @@ GtkComboBox .menu {
 .menu.button:hover,
 .menu.button:active,
 .menu.button:checked,
-.menu.button:active:insensitive,
-.menu.button:checked:insensitive,
-.menu.button:insensitive,
+.menu.button:active:disabled,
+.menu.button:checked:disabled,
+.menu.button:disabled,
 .menu.button {
     border-width: 0;
     background-color: @menu_bg_color;
@@ -1075,8 +1070,6 @@ GtkTreeMenu .menuitem {
 
 .menuitem,
 .menu .menuitem {
-    -GtkMenuItem-arrow-scaling: 0.5;
-
     padding: 3px;
     border-width: 1px;
     border-style: solid;
@@ -1108,8 +1101,8 @@ menuitem label {
     color: @theme_selected_fg_color;
 }
 
-.menu .menuitem:insensitive,
-.menu .menuitem *:insensitive {
+.menu .menuitem:disabled,
+.menu .menuitem *:disabled {
     color: mix(@menu_fg_color, @menu_bg_color, 0.5);
 }
 
@@ -1117,8 +1110,8 @@ menuitem label {
 .menuitem.radio,
 .menuitem.check:hover,
 .menuitem.radio:hover,
-.menuitem.check:insensitive,
-.menuitem.radio:insensitive {
+.menuitem.check:disabled,
+.menuitem.radio:disabled {
     border-style: none;
     background-color: transparent;
     background-image: none;
@@ -1130,7 +1123,7 @@ menuitem label {
     background-color: transparent;
 }
 
-.menuitem GtkCalendar:inconsistent {
+.menuitem GtkCalendar:indeterminate {
     color: mix(@menu_fg_color, @menu_bg_color, 0.5);
 }
 
@@ -1156,14 +1149,14 @@ menuitem label {
 .menuitem .accelerator {
   color: #ff0000;
   margin: 20px;
-  display: none;
+  /*display: none;*/
 }
 
 .menuitem .accelerator:hover {
     color: alpha(@theme_selected_fg_color, 0.8);
 }
 
-.menuitem .accelerator:insensitive {
+.menuitem .accelerator:disabled {
     color: alpha(mix(@menu_fg_color, @menu_bg_color, 0.5), 0.6);
 }
 
@@ -1264,9 +1257,9 @@ GtkPopover .separator {
 .menuitem.button,
 .menuitem.button:active,
 .menuitem.button:checked,
-.menuitem.button:insensitive,
-.menuitem.button:active:insensitive,
-.menuitem.button:checked:insensitive {
+.menuitem.button:disabled,
+.menuitem.button:active:disabled,
+.menuitem.button:checked:disabled {
     background-color: transparent;
     background-image: none;
     border: none;
@@ -1295,9 +1288,9 @@ GtkModelButton.button:active:focus,
 GtkModelButton.button:checked:focus,
 GtkModelButton.button:active,
 GtkModelButton.button:checked,
-GtkModelButton.button:insensitive:insensitive,
-GtkModelButton.button:active:insensitive,
-GtkModelButton.button:checked:insensitive,
+GtkModelButton.button:disabled:disabled,
+GtkModelButton.button:active:disabled,
+GtkModelButton.button:checked:disabled,
 GtkModelButton.button {
     background-color: transparent;
     background-image: none;
@@ -1309,17 +1302,17 @@ GtkModelButton.button {
 
 GtkModelButton.button:backdrop,
 GtkModelButton.button:hover:backdrop,
-GtkModelButton.button:insensitive:backdrop,
-GtkModelButton.button:active:insensitive:backdrop,
+GtkModelButton.button:disabled:backdrop,
+GtkModelButton.button:active:disabled:backdrop,
 GtkModelButton.button:active:backdrop,
 GtkModelButton.button:active:hover:backdrop,
 GtkModelButton.button:active:selected:backdrop,
-GtkModelButton.button:checked:insensitive:backdrop,
+GtkModelButton.button:checked:disabled:backdrop,
 GtkModelButton.button:checked:backdrop,
 GtkModelButton.button:checked:hover:backdrop,
 GtkModelButton.button:checked:selected:backdrop {
     text-shadow: none;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
     color: @theme_selected_fg_color;
     background-color: transparent;
     background-image: none;
@@ -1471,8 +1464,8 @@ notebook tab GtkLabel {
     color: mix(@theme_text_color, @theme_base_color, 0.3);
 }
 
-notebook .prelight-page,
-notebook .prelight-page GtkLabel {
+notebook .hover-page,
+notebook .hover-page GtkLabel {
     color: mix (@theme_text_color, @theme_base_color, 0.15);
 }
 
@@ -1717,7 +1710,7 @@ GtkScale.horizontal:hover {
                 inset 0 -1px shade(@theme_bg_color, 0.7);
 }
 
-scale.slider:insensitive {
+scale.slider:disabled {
     background-color: shade(@theme_bg_color, 0.9);
     background-image: none;
     box-shadow: inset 1px 0 shade(@theme_bg_color, 0.85),
@@ -1769,8 +1762,8 @@ scale.highlight.bottom {
     background-image: none;
 }
 
-scale.trough:insensitive,
-scale.highlight.left:insensitive {
+scale.trough:disabled,
+scale.highlight.left:disabled {
     border-color: shade(@theme_bg_color, 0.85);
     background-color: shade(@theme_bg_color, 0.9);
     background-image: none;
@@ -1824,7 +1817,7 @@ scrollbar.slider.vertical:active {
     background-color: @theme_selected_bg_color;
 }
 
-scrollbar.slider.fine-tune:prelight:active {
+scrollbar.slider.fine-tune:hover:active {
       border-width: 2px;
       border-color: transparent;
 }
@@ -1863,8 +1856,8 @@ OsScrollbar:active {
     background-color: @theme_selected_bg_color;
 }
 
-OsThumb:insensitive,
-OsScrollbar:insensitive {
+OsThumb:disabled,
+OsScrollbar:disabled {
     background-color: shade(@theme_bg_color, 0.9);
 }
 
@@ -1887,17 +1880,17 @@ OsScrollbar:insensitive {
     border-color: shade(@theme_bg_color, 0.95);
 }
 
-.button .separator:insensitive,
-.button.separator:insensitive {
+.button .separator:disabled,
+.button.separator:disabled {
     border-color: shade(@theme_bg_color, 0.85);
 }
 
 .primary-toolbar GtkSeparatorToolItem,
 .primary-toolbar .separator,
-.primary-toolbar .separator:insensitive,
+.primary-toolbar .separator:disabled,
 .toolbar GtkSeparatorToolItem,
 .toolbar .separator,
-.toolbar .separator:insensitive {
+.toolbar .separator:disabled {
     -GtkWidget-window-dragging: true;
 
     border-color: shade(@toolbar_bg_color, 0.95);
@@ -1906,10 +1899,10 @@ OsScrollbar:insensitive {
 
 .header-bar GtkSeparatorToolItem,
 .header-bar .separator,
-.header-bar .separator:insensitive,
+.header-bar .separator:disabled,
 .titlebar GtkSeparatorToolItem,
 .titlebar .separator,
-.titlebar .separator:insensitive {
+.titlebar .separator:disabled {
     -GtkWidget-window-dragging: true;
 
     border-color: shade(@titlebar_bg_color, 0.95);
@@ -1930,17 +1923,17 @@ OsScrollbar:insensitive {
     border-color: shade(@titlebar_bg_color, 0.95);
 }
 
-.primary-toolbar .button .separator:insensitive,
-.primary-toolbar .button.separator:insensitive,
-.toolbar .button .separator:insensitive,
-.toolbar .button.separator:insensitive {
+.primary-toolbar .button .separator:disabled,
+.primary-toolbar .button.separator:disabled,
+.toolbar .button .separator:disabled,
+.toolbar .button.separator:disabled {
     border-color: shade(@toolbar_bg_color, 0.85);
 }
 
-.header-bar .button .separator:insensitive,
-.header-bar .button.separator:insensitive,
-.titlebar .button .separator:insensitive,
-.titlebar .button.separator:insensitive {
+.header-bar .button .separator:disabled,
+.header-bar .button.separator:disabled,
+.titlebar .button .separator:disabled,
+.titlebar .button.separator:disabled {
     border-color: shade(@titlebar_bg_color, 0.85);
 }
 
@@ -1950,7 +1943,7 @@ OsScrollbar:insensitive {
     
     color: #ff0000;
 
-    border-style: 1px solid @theme_bg_color;
+    border: 1px solid @theme_bg_color;
     color: shade(@menu_bg_color, 0.9);
 }
 
@@ -1986,16 +1979,16 @@ GtkComboBox .separator {
     color: @theme_selected_fg_color;
 }
 
-.sidebar row:prelight,
-.sidebar .view row:prelight {
+.sidebar row:hover,
+.sidebar .view row:hover {
     border-color: shade(@theme_bg_color, 1.05);
     background-color: shade(@theme_bg_color, 1.05);
     background-image: none;
     color: @theme_fg_color;
 }
 
-.sidebar row:selected:prelight,
-.sidebar .view row:selected:prelight {
+.sidebar row:selected:hover,
+.sidebar .view row:selected:hover {
     border-color: shade(@theme_selected_bg_color, 1.05);
     background-color: shade(@theme_selected_bg_color, 1.05);
     background-image: none;
@@ -2020,7 +2013,7 @@ GtkComboBox .separator {
     box-shadow: inset 1px 0 shade(@theme_base_color, 0.9);
 }
 
-.spinbutton .button:insensitive {
+.spinbutton .button:disabled {
     color: mix(@theme_text_color, @theme_base_color, 0.7);
     box-shadow: inset 1px 0 shade(@theme_bg_color, 0.95);
 }
@@ -2082,7 +2075,7 @@ GtkComboBox .separator {
     border-color: shade(@theme_bg_color, 0.7);
 }
 
-.spinbutton.vertical .button:insensitive {
+.spinbutton.vertical .button:disabled {
     border-color: shade(@theme_bg_color, 0.85);
     background-color: shade(@theme_bg_color, 0.9);
     background-image: none;
@@ -2130,7 +2123,7 @@ GtkComboBox .separator {
     animation: spin 1s linear infinite;
 }
 
-.spinner:active:insensitive { opacity: 0.5; }
+.spinner:active:disabled { opacity: 0.5; }
 
 .menu.spinner,
 .menu .spinner,
@@ -2155,7 +2148,6 @@ GtkStatusbar {
 GtkSwitch {
     padding: 0;
     border-radius: 2px;
-    font: bold condensed;
     outline-offset: -4px;
 }
 
@@ -2167,7 +2159,7 @@ GtkSwitch.slider {
     background-image: none;
 }
 
-GtkSwitch.slider:insensitive {
+GtkSwitch.slider:disabled {
     border-color: shade(@theme_bg_color, 0.85);
     background-color: shade(@theme_bg_color, 0.9);
     background-image: none;
@@ -2187,7 +2179,7 @@ GtkSwitch.trough:active {
     color: @theme_selected_fg_color;
 }
 
-GtkSwitch.trough:insensitive {
+GtkSwitch.trough:disabled {
     border-color: shade(@theme_bg_color, 0.85);
     background-color: shade(@theme_bg_color, 0.9);
     background-image: none;
@@ -2326,12 +2318,10 @@ GtkColorButton.button {
 }
 
 .header-bar .title {
-    font: bold;
     padding: 0 12px;
 }
 
 .header-bar .subtitle {
-    font: smaller;
     padding: 0 12px;
 }
 
@@ -2370,14 +2360,14 @@ GtkColorButton.button {
     border-color: shade(@titlebar_bg_color, 0.7);
 }
 
-.header-bar .button:insensitive {
+.header-bar .button:disabled {
     border-color: shade(@titlebar_bg_color, 0.85);
     background-color: shade(@titlebar_bg_color, 0.9);
     background-image: none;
 }
 
-.header-bar .button:active:insensitive,
-.header-bar .button:checked:insensitive {
+.header-bar .button:active:disabled,
+.header-bar .button:checked:disabled {
     border-color: shade(@titlebar_bg_color, 0.75);
     background-color: shade(@titlebar_bg_color, 0.80);
     background-image: none;
@@ -2415,7 +2405,7 @@ GtkColorButton.button {
     padding: 4px 3px 3px 4px;
 }
 
-.toolbar:insensitive {
+.toolbar:disabled {
     background-color: shade(@toolbar_bg_color, 0.9);
     color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.5);
 }
@@ -2459,12 +2449,12 @@ GtkColorButton.button {
 .primary-toolbar .button.flat,
 .toolbar GtkComboBox.flat,
 .toolbar .button.flat,
-.primary-toolbar GtkComboBox.flat:insensitive,
-.primary-toolbar .button.flat:insensitive,
-.primary-toolbar GtkComboBox.flat:insensitive,
-.primary-toolbar .button.flat:insensitive,
-.toolbar GtkComboBox.flat:insensitive,
-.toolbar .button.flat:insensitive {
+.primary-toolbar GtkComboBox.flat:disabled,
+.primary-toolbar .button.flat:disabled,
+.primary-toolbar GtkComboBox.flat:disabled,
+.primary-toolbar .button.flat:disabled,
+.toolbar GtkComboBox.flat:disabled,
+.toolbar .button.flat:disabled {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
@@ -2518,17 +2508,17 @@ GtkColorButton.button {
     border-color: shade(@toolbar_bg_color, 0.7);
 }
 
-.primary-toolbar .button:insensitive,
-.toolbar .button:insensitive {
+.primary-toolbar .button:disabled,
+.toolbar .button:disabled {
     border-color: shade(@toolbar_bg_color, 0.85);
     background-color: shade(@toolbar_bg_color, 0.9);
     background-image: none;
 }
 
-.primary-toolbar .button:active:insensitive,
-.toolbar .button:active:insensitive,
-.primary-toolbar .button:checked:insensitive,
-.toolbar .button:checked:insensitive {
+.primary-toolbar .button:active:disabled,
+.toolbar .button:active:disabled,
+.primary-toolbar .button:checked:disabled,
+.toolbar .button:checked:disabled {
     border-color: shade(@toolbar_bg_color, 0.75);
     background-color: shade(@toolbar_bg_color, 0.80);
     background-image: none;
@@ -2603,17 +2593,17 @@ GtkColorButton.button {
     border-color: shade(@theme_bg_color, 0.7);
 }
 
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive {
+.inline-toolbar.toolbar .button:disabled,
+.inline-toolbar.toolbar GtkToolButton .button:disabled {
     border-color: shade(@theme_bg_color, 0.85);
     background-color: shade(@theme_bg_color, 0.9);
     background-image: none;
 }
 
-.inline-toolbar.toolbar .button:active:insensitive
-.inline-toolbar.toolbar GtkToolButton .button:active:insensitive,
-.inline-toolbar.toolbar .button:checked:insensitive
-.inline-toolbar.toolbar GtkToolButton .button:checked:insensitive {
+.inline-toolbar.toolbar .button:active:disabled
+.inline-toolbar.toolbar GtkToolButton .button:active:disabled,
+.inline-toolbar.toolbar .button:checked:disabled
+.inline-toolbar.toolbar GtkToolButton .button:checked:disabled {
     border-color: shade(@theme_bg_color, 0.75);
     background-color: shade(@theme_bg_color, 0.80);
     background-image: none;
@@ -2644,38 +2634,38 @@ GtkColorButton.button {
                 inset 0 -1px alpha(@dark_shadow, 0.05);
 }
 
-.linked .button:insensitive,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive {
+.linked .button:disabled,
+.inline-toolbar.toolbar .button:disabled,
+.inline-toolbar.toolbar GtkToolButton .button:disabled,
+.inline-toolbar.toolbar GtkToolButton > .button:disabled {
     box-shadow: inset -1px 0 shade(@theme_bg_color, 0.85);
 }
 
 /* remove box shadow from last-child and only-child */
 .linked .button:last-child,
 .linked .button:only-child,
-.linked .button:insensitive:last-child,
-.linked .button:insensitive:only-child,
-.linked .button:active:insensitive:last-child,
-.linked .button:active:insensitive:only-child,
-.linked .button:checked:insensitive:last-child,
-.linked .button:checked:insensitive:only-child,
+.linked .button:disabled:last-child,
+.linked .button:disabled:only-child,
+.linked .button:active:disabled:last-child,
+.linked .button:active:disabled:only-child,
+.linked .button:checked:disabled:last-child,
+.linked .button:checked:disabled:only-child,
 .inline-toolbar.toolbar .button:last-child,
 .inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:insensitive:only-child,
-.inline-toolbar.toolbar .button:active:insensitive:last-child,
-.inline-toolbar.toolbar .button:active:insensitive:only-child,
-.inline-toolbar.toolbar .button:checked:insensitive:last-child,
-.inline-toolbar.toolbar .button:checked:insensitive:only-child,
+.inline-toolbar.toolbar .button:disabled:last-child,
+.inline-toolbar.toolbar .button:disabled:only-child,
+.inline-toolbar.toolbar .button:active:disabled:last-child,
+.inline-toolbar.toolbar .button:active:disabled:only-child,
+.inline-toolbar.toolbar .button:checked:disabled:last-child,
+.inline-toolbar.toolbar .button:checked:disabled:only-child,
 .inline-toolbar.toolbar GtkToolButton:last-child > .button,
 .inline-toolbar.toolbar GtkToolButton:only-child > .button,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:active:insensitive,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:active:insensitive,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:checked:insensitive,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:checked:insensitive {
+.inline-toolbar.toolbar GtkToolButton:last-child > .button:disabled,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button:disabled,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button:active:disabled,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button:active:disabled,
+.inline-toolbar.toolbar GtkToolButton:last-child > .button:checked:disabled,
+.inline-toolbar.toolbar GtkToolButton:only-child > .button:checked:disabled {
     box-shadow: none;
 }
 
@@ -2704,15 +2694,15 @@ GtkColorButton.button {
 .linked .button:active:hover,
 .linked .button:checked,
 .linked .button:checked:hover,
-.linked .button:insensitive,
+.linked .button:disabled,
 .inline-toolbar.toolbar .button,
 .inline-toolbar.toolbar .button:active,
 .inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar .button:insensitive,
+.inline-toolbar.toolbar .button:disabled,
 .inline-toolbar.toolbar GtkToolButton .button,
 .inline-toolbar.toolbar GtkToolButton .button:active,
 .inline-toolbar.toolbar GtkToolButton .button:checked,
-.inline-toolbar.toolbar GtkToolButton .button:insensitive {
+.inline-toolbar.toolbar GtkToolButton .button:disabled {
     border-width: 1px;
     border-radius: 0;
     border-right-width: 0;
@@ -2726,15 +2716,15 @@ GtkColorButton.button {
 .linked .button:active:hover:first-child,
 .linked .button:checked:first-child,
 .linked .button:checked:hover:first-child,
-.linked .button:insensitive:first-child,
+.linked .button:disabled:first-child,
 .inline-toolbar.toolbar .button:first-child,
 .inline-toolbar.toolbar .button:active:first-child,
 .inline-toolbar.toolbar .button:checked:first-child,
-.inline-toolbar.toolbar .button:insensitive:first-child,
+.inline-toolbar.toolbar .button:disabled:first-child,
 .inline-toolbar.toolbar GtkToolButton:first-child .button,
 .inline-toolbar.toolbar GtkToolButton:first-child .button:active,
 .inline-toolbar.toolbar GtkToolButton:first-child .button:checked,
-.inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive {
+.inline-toolbar.toolbar GtkToolButton:first-child .button:disabled {
     border-width: 1px;
     border-radius: 2px;
     border-right-width: 0;
@@ -2749,15 +2739,15 @@ GtkColorButton.button {
 .linked .button:active:hover:last-child,
 .linked .button:checked:last-child,
 .linked .button:checked:hover:last-child,
-.linked .button:insensitive:last-child,
+.linked .button:disabled:last-child,
 .inline-toolbar.toolbar .button:last-child,
 .inline-toolbar.toolbar .button:active:last-child,
 .inline-toolbar.toolbar .button:checked:last-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
+.inline-toolbar.toolbar .button:disabled:last-child,
 .inline-toolbar.toolbar GtkToolButton:last-child .button,
 .inline-toolbar.toolbar GtkToolButton:last-child .button:active,
 .inline-toolbar.toolbar GtkToolButton:last-child .button:checked,
-.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive {
+.inline-toolbar.toolbar GtkToolButton:last-child .button:disabled {
     border-width: 1px;
     border-radius: 2px;
     border-left-width: 0;
@@ -2772,15 +2762,15 @@ GtkColorButton.button {
 .linked .button:active:hover:only-child,
 .linked .button:checked:only-child,
 .linked .button:checked:hover:only-child,
-.linked .button:insensitive:only-child,
+.linked .button:disabled:only-child,
 .inline-toolbar.toolbar .button:only-child,
 .inline-toolbar.toolbar .button:active:only-child,
 .inline-toolbar.toolbar .button:checked:only-child,
-.inline-toolbar.toolbar .button:insensitive:only-child,
+.inline-toolbar.toolbar .button:disabled:only-child,
 .inline-toolbar.toolbar GtkToolButton:only-child .button,
 .inline-toolbar.toolbar GtkToolButton:only-child .button:active,
 .inline-toolbar.toolbar GtkToolButton:only-child .button:checked,
-.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive {
+.inline-toolbar.toolbar GtkToolButton:only-child .button:disabled {
     border-width: 1px;
     border-radius: 2px;
 }
@@ -2804,37 +2794,37 @@ GtkColorButton.button {
                 inset -1px 0 alpha(@dark_shadow, 0.07);
 }
 
-.linked.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive {
+.linked.vertical .button:disabled,
+.inline-toolbar.toolbar.vertical .button:disabled,
+.inline-toolbar.toolbar.vertical GtkToolButton > .button:disabled {
     box-shadow: inset 0 -1px shade(@theme_bg_color, 0.85);
 }
 
 /* remove box shadow from last-child and only-child */
 .linked.vertical .button:last-child,
 .linked.vertical .button:only-child,
-.linked.vertical .button:insensitive:last-child,
-.linked.vertical .button:insensitive:only-child,
-.linked.vertical .button:active:insensitive:last-child,
-.linked.vertical .button:active:insensitive:only-child,
-.linked.vertical .button:checked:insensitive:last-child,
-.linked.vertical .button:checked:insensitive:only-child,
+.linked.vertical .button:disabled:last-child,
+.linked.vertical .button:disabled:only-child,
+.linked.vertical .button:active:disabled:last-child,
+.linked.vertical .button:active:disabled:only-child,
+.linked.vertical .button:checked:disabled:last-child,
+.linked.vertical .button:checked:disabled:only-child,
 .inline-toolbar.toolbar.vertical .button:last-child,
 .inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:only-child,
-.inline-toolbar.toolbar.vertical .button:active:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:active:insensitive:only-child,
-.inline-toolbar.toolbar.vertical .button:checked:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:checked:insensitive:only-child,
+.inline-toolbar.toolbar.vertical .button:disabled:last-child,
+.inline-toolbar.toolbar.vertical .button:disabled:only-child,
+.inline-toolbar.toolbar.vertical .button:active:disabled:last-child,
+.inline-toolbar.toolbar.vertical .button:active:disabled:only-child,
+.inline-toolbar.toolbar.vertical .button:checked:disabled:last-child,
+.inline-toolbar.toolbar.vertical .button:checked:disabled:only-child,
 .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button,
 .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked:insensitive {
+.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:disabled,
+.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:disabled,
+.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active:disabled,
+.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active:disabled,
+.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked:disabled,
+.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked:disabled {
     box-shadow: none;
 }
 
@@ -2869,7 +2859,7 @@ GtkColorButton.button {
 .linked.vertical .button:active:hover,
 .linked.vertical .button:checked,
 .linked.vertical .button:checked:hover,
-.linked.vertical .button:insensitive {
+.linked.vertical .button:disabled {
     border-width: 1px;
     border-radius: 0;
     border-top-width: 0;
@@ -2883,7 +2873,7 @@ GtkColorButton.button {
 .linked.vertical .button:active:hover:first-child,
 .linked.vertical .button:checked:first-child,
 .linked.vertical .button:checked:hover:first-child,
-.linked.vertical .button:insensitive:first-child {
+.linked.vertical .button:disabled:first-child {
     border-width: 1px;
     border-radius: 2px;
     border-bottom-width: 0;
@@ -2898,7 +2888,7 @@ GtkColorButton.button {
 .linked.vertical .button:active:hover:last-child,
 .linked.vertical .button:checked:last-child,
 .linked.vertical .button:checked:hover:last-child,
-.linked.vertical .button:insensitive:last-child {
+.linked.vertical .button:disabled:last-child {
     border-width: 1px;
     border-radius: 2px;
     border-top-width: 0;
@@ -2913,7 +2903,7 @@ GtkColorButton.button {
 .linked.vertical .button:active:hover:only-child,
 .linked.vertical .button:checked:only-child,
 .linked.vertical .button:checked:hover:only-child,
-.linked.vertical .button:insensitive:only-child {
+.linked.vertical .button:disabled:only-child {
     border-width: 1px;
     border-radius: 2px;
 }
@@ -2942,55 +2932,55 @@ GtkColorButton.button {
                 inset 0 -1px alpha(@dark_shadow, 0.05);
 }
 
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .raised.linked .button:insensitive,
-.toolbar .button.raised.linked:insensitive,
-.toolbar .raised.linked .button:insensitive,
-.toolbar .linked .button:insensitive {
+.primary-toolbar .button.raised.linked:disabled,
+.primary-toolbar .raised.linked .button:disabled,
+.toolbar .button.raised.linked:disabled,
+.toolbar .raised.linked .button:disabled,
+.toolbar .linked .button:disabled {
     box-shadow: inset -1px 0 shade(@toolbar_bg_color, 0.85);
 }
 
 /* remove box shadow from last-child and only-child */
 .primary-toolbar .button.raised.linked:last-child,
 .primary-toolbar .button.raised.linked:only-child,
-.primary-toolbar .button:insensitive.raised.linked:last-child,
-.primary-toolbar .button:insensitive.raised.linked:only-child,
-.primary-toolbar .button:active:insensitive.raised.linked:last-child,
-.primary-toolbar .button:active:insensitive.raised.linked:only-child,
-.primary-toolbar .button:checked:insensitive.raised.linked:last-child,
-.primary-toolbar .button:checked:insensitive.raised.linked:only-child,
+.primary-toolbar .button:disabled.raised.linked:last-child,
+.primary-toolbar .button:disabled.raised.linked:only-child,
+.primary-toolbar .button:active:disabled.raised.linked:last-child,
+.primary-toolbar .button:active:disabled.raised.linked:only-child,
+.primary-toolbar .button:checked:disabled.raised.linked:last-child,
+.primary-toolbar .button:checked:disabled.raised.linked:only-child,
 .primary-toolbar .raised.linked .button:last-child,
 .primary-toolbar .raised.linked .button:only-child,
-.primary-toolbar .raised.linked .button:insensitive:last-child,
-.primary-toolbar .raised.linked .button:insensitive:only-child,
-.primary-toolbar .raised.linked .button:active:insensitive:last-child,
-.primary-toolbar .raised.linked .button:active:insensitive:only-child,
-.primary-toolbar .raised.linked .button:checked:insensitive:last-child,
-.primary-toolbar .raised.linked .button:checked:insensitive:only-child,
+.primary-toolbar .raised.linked .button:disabled:last-child,
+.primary-toolbar .raised.linked .button:disabled:only-child,
+.primary-toolbar .raised.linked .button:active:disabled:last-child,
+.primary-toolbar .raised.linked .button:active:disabled:only-child,
+.primary-toolbar .raised.linked .button:checked:disabled:last-child,
+.primary-toolbar .raised.linked .button:checked:disabled:only-child,
 .toolbar .button.raised.linked:last-child,
 .toolbar .button.raised.linked:only-child,
-.toolbar .button:insensitive.raised.linked:last-child,
-.toolbar .button:insensitive.raised.linked:only-child,
-.toolbar .button:active:insensitive.raised.linked:last-child,
-.toolbar .button:active:insensitive.raised.linked:only-child,
-.toolbar .button:checked:insensitive.raised.linked:last-child,
-.toolbar .button:checked:insensitive.raised.linked:only-child,
+.toolbar .button:disabled.raised.linked:last-child,
+.toolbar .button:disabled.raised.linked:only-child,
+.toolbar .button:active:disabled.raised.linked:last-child,
+.toolbar .button:active:disabled.raised.linked:only-child,
+.toolbar .button:checked:disabled.raised.linked:last-child,
+.toolbar .button:checked:disabled.raised.linked:only-child,
 .toolbar .raised.linked .button:last-child,
 .toolbar .raised.linked .button:only-child,
-.toolbar .raised.linked .button:insensitive:last-child,
-.toolbar .raised.linked .button:insensitive:only-child,
-.toolbar .raised.linked .button:active:insensitive:last-child,
-.toolbar .raised.linked .button:active:insensitive:only-child,
-.toolbar .raised.linked .button:checked:insensitive:last-child,
-.toolbar .raised.linked .button:checked:insensitive:only-child,
+.toolbar .raised.linked .button:disabled:last-child,
+.toolbar .raised.linked .button:disabled:only-child,
+.toolbar .raised.linked .button:active:disabled:last-child,
+.toolbar .raised.linked .button:active:disabled:only-child,
+.toolbar .raised.linked .button:checked:disabled:last-child,
+.toolbar .raised.linked .button:checked:disabled:only-child,
 .toolbar .linked .button:last-child,
 .toolbar .linked .button:only-child,
-.toolbar .linked .button:insensitive:last-child,
-.toolbar .linked .button:insensitive:only-child,
-.toolbar .linked .button:active:insensitive:last-child,
-.toolbar .linked .button:active:insensitive:only-child
-.toolbar .linked .button:checked:insensitive:last-child,
-.toolbar .linked .button:checked:insensitive:only-child {
+.toolbar .linked .button:disabled:last-child,
+.toolbar .linked .button:disabled:only-child,
+.toolbar .linked .button:active:disabled:last-child,
+.toolbar .linked .button:active:disabled:only-child
+.toolbar .linked .button:checked:disabled:last-child,
+.toolbar .linked .button:checked:disabled:only-child {
     box-shadow: none;
 }
 
@@ -3024,23 +3014,23 @@ GtkColorButton.button {
 .primary-toolbar .button.raised.linked,
 .primary-toolbar .button.raised.linked:active,
 .primary-toolbar .button.raised.linked:checked,
-.primary-toolbar .button.raised.linked:insensitive,
+.primary-toolbar .button.raised.linked:disabled,
 .primary-toolbar .raised.linked .button,
 .primary-toolbar .raised.linked .button:active,
 .primary-toolbar .raised.linked .button:checked,
-.primary-toolbar .raised.linked .button:insensitive,
+.primary-toolbar .raised.linked .button:disabled,
 .toolbar .button.raised.linked,
 .toolbar .button.raised.linked:active,
 .toolbar .button.raised.linked:checked,
-.toolbar .button.raised.linked:insensitive,
+.toolbar .button.raised.linked:disabled,
 .toolbar .raised.linked .button,
 .toolbar .raised.linked .button:active,
 .toolbar .raised.linked .button:checked,
-.toolbar .raised.linked .button:insensitive,
+.toolbar .raised.linked .button:disabled,
 .toolbar .linked .button,
 .toolbar .linked .button:active,
 .toolbar .linked .button:checked,
-.toolbar .linked .button:insensitive {
+.toolbar .linked .button:disabled {
     border-width: 1px;
     border-radius: 0;
     border-right-width: 0;
@@ -3051,19 +3041,19 @@ GtkColorButton.button {
 .primary-toolbar .button.raised.linked:first-child,
 .primary-toolbar .button.raised.linked:active:first-child,
 .primary-toolbar .button.raised.linked:checked:first-child,
-.primary-toolbar .button.raised.linked:insensitive:first-child,
+.primary-toolbar .button.raised.linked:disabled:first-child,
 .primary-toolbar .raised.linked .button:first-child,
 .primary-toolbar .raised.linked .button:active:first-child,
 .primary-toolbar .raised.linked .button:checked:first-child,
-.primary-toolbar .raised.linked .button:insensitive:first-child,
+.primary-toolbar .raised.linked .button:disabled:first-child,
 .toolbar .button.raised.linked:first-child,
 .toolbar .button.raised.linked:active:first-child,
 .toolbar .button.raised.linked:checked:first-child,
-.toolbar .button.raised.linked:insensitive:first-child,
+.toolbar .button.raised.linked:disabled:first-child,
 .toolbar .raised.linked .button:first-child,
 .toolbar .raised.linked .button:active:first-child,
 .toolbar .raised.linked .button:checked:first-child,
-.toolbar .raised.linked .button:insensitive:first-child,
+.toolbar .raised.linked .button:disabled:first-child,
 .toolbar .linked .button:first-child,
 .toolbar .linked .button:active:first-child,
 .toolbar .linked .button:checked:first-child {
@@ -3078,23 +3068,23 @@ GtkColorButton.button {
 .primary-toolbar .button.raised.linked:last-child,
 .primary-toolbar .button.raised.linked:active:last-child,
 .primary-toolbar .button.raised.linked:checked:last-child,
-.primary-toolbar .button.raised.linked:insensitive:last-child,
+.primary-toolbar .button.raised.linked:disabled:last-child,
 .primary-toolbar .raised.linked .button:last-child,
 .primary-toolbar .raised.linked .button:active:last-child,
 .primary-toolbar .raised.linked .button:checked:last-child,
-.primary-toolbar .raised.linked .button:insensitive:last-child,
+.primary-toolbar .raised.linked .button:disabled:last-child,
 .toolbar .button.raised.linked:last-child,
 .toolbar .button.raised.linked:active:last-child,
 .toolbar .button.raised.linked:checked:last-child,
-.toolbar .button.raised.linked:insensitive:last-child,
+.toolbar .button.raised.linked:disabled:last-child,
 .toolbar .raised.linked .button:last-child,
 .toolbar .raised.linked .button:active:last-child,
 .toolbar .raised.linked .button:checked:last-child,
-.toolbar .raised.linked .button:insensitive:last-child,
+.toolbar .raised.linked .button:disabled:last-child,
 .toolbar .linked .button:last-child,
 .toolbar .linked .button:active:last-child,
 .toolbar .linked .button:checked:last-child,
-.toolbar .linked .button:insensitive:last-child {
+.toolbar .linked .button:disabled:last-child {
     border-width: 1px;
     border-radius: 2px;
     border-left-width: 0;
@@ -3106,23 +3096,23 @@ GtkColorButton.button {
 .primary-toolbar .button.raised.linked:only-child,
 .primary-toolbar .button.raised.linked:active:only-child,
 .primary-toolbar .button.raised.linked:checked:only-child,
-.primary-toolbar .button.raised.linked:insensitive:only-child,
+.primary-toolbar .button.raised.linked:disabled:only-child,
 .primary-toolbar .raised.linked .button:only-child,
 .primary-toolbar .raised.linked .button:active:only-child,
 .primary-toolbar .raised.linked .button:checked:only-child,
-.primary-toolbar .raised.linked .button:insensitive:only-child,
+.primary-toolbar .raised.linked .button:disabled:only-child,
 .toolbar .button.raised.linked:only-child,
 .toolbar .button.raised.linked:active:only-child,
 .toolbar .button.raised.linked:checked:only-child,
-.toolbar .button.raised.linked:insensitive:only-child,
+.toolbar .button.raised.linked:disabled:only-child,
 .toolbar .raised.linked .button:only-child,
 .toolbar .raised.linked .button:active:only-child,
 .toolbar .raised.linked .button:checked:only-child,
-.toolbar .raised.linked .button:insensitive:only-child,
+.toolbar .raised.linked .button:disabled:only-child,
 .toolbar .linked .button:only-child,
 .toolbar .linked .button:active:only-child,
 .toolbar .linked .button:checked:only-child,
-.toolbar .linked .button:insensitive:only-child {
+.toolbar .linked .button:disabled:only-child {
     border-width: 1px;
     border-radius: 2px;
 }
@@ -3146,37 +3136,37 @@ GtkColorButton.button {
                 inset 0 -1px alpha(@dark_shadow, 0.05);
 }
 
-.header-bar .button.raised.linked:insensitive,
-.header-bar .raised.linked .button:insensitive,
-.header-bar .linked .button:insensitive {
+.header-bar .button.raised.linked:disabled,
+.header-bar .raised.linked .button:disabled,
+.header-bar .linked .button:disabled {
     box-shadow: inset -1px 0 shade(@titlebar_bg_color, 0.85);
 }
 
 /* remove box shadow from last-child and only-child */
 .header-bar .button.raised.linked:last-child,
 .header-bar .button.raised.linked:only-child,
-.header-bar .button:insensitive.raised.linked:last-child,
-.header-bar .button:insensitive.raised.linked:only-child,
-.header-bar .button:active:insensitive.raised.linked:last-child,
-.header-bar .button:active:insensitive.raised.linked:only-child,
-.header-bar .button:checked:insensitive.raised.linked:last-child,
-.header-bar .button:checked:insensitive.raised.linked:only-child,
+.header-bar .button:disabled.raised.linked:last-child,
+.header-bar .button:disabled.raised.linked:only-child,
+.header-bar .button:active:disabled.raised.linked:last-child,
+.header-bar .button:active:disabled.raised.linked:only-child,
+.header-bar .button:checked:disabled.raised.linked:last-child,
+.header-bar .button:checked:disabled.raised.linked:only-child,
 .header-bar .raised.linked .button:last-child,
 .header-bar .raised.linked .button:only-child,
-.header-bar .raised.linked .button:insensitive:last-child,
-.header-bar .raised.linked .button:insensitive:only-child,
-.header-bar .raised.linked .button:active:insensitive:last-child,
-.header-bar .raised.linked .button:active:insensitive:only-child,
-.header-bar .raised.linked .button:checked:insensitive:last-child,
-.header-bar .raised.linked .button:checked:insensitive:only-child,
+.header-bar .raised.linked .button:disabled:last-child,
+.header-bar .raised.linked .button:disabled:only-child,
+.header-bar .raised.linked .button:active:disabled:last-child,
+.header-bar .raised.linked .button:active:disabled:only-child,
+.header-bar .raised.linked .button:checked:disabled:last-child,
+.header-bar .raised.linked .button:checked:disabled:only-child,
 .header-bar .linked .button:last-child,
 .header-bar .linked .button:only-child,
-.header-bar .linked .button:insensitive:last-child,
-.header-bar .linked .button:insensitive:only-child,
-.header-bar .linked .button:active:insensitive:last-child,
-.header-bar .linked .button:active:insensitive:only-child,
-.header-bar .linked .button:checked:insensitive:last-child,
-.header-bar .linked .button:checked:insensitive:only-child {
+.header-bar .linked .button:disabled:last-child,
+.header-bar .linked .button:disabled:only-child,
+.header-bar .linked .button:active:disabled:last-child,
+.header-bar .linked .button:active:disabled:only-child,
+.header-bar .linked .button:checked:disabled:last-child,
+.header-bar .linked .button:checked:disabled:only-child {
     box-shadow: none;
 }
 
@@ -3202,15 +3192,15 @@ GtkColorButton.button {
 .header-bar .button.raised.linked,
 .header-bar .button.raised.linked:active,
 .header-bar .button.raised.linked:checked,
-.header-bar .button.raised.linked:insensitive,
+.header-bar .button.raised.linked:disabled,
 .header-bar .raised.linked .button,
 .header-bar .raised.linked .button:active,
 .header-bar .raised.linked .button:checked,
-.header-bar .raised.linked .button:insensitive,
+.header-bar .raised.linked .button:disabled,
 .header-bar .linked .button,
 .header-bar .linked .button:active,
 .header-bar .linked .button:checked,
-.header-bar .linked .button:insensitive {
+.header-bar .linked .button:disabled {
     border-width: 1px;
     border-radius: 0;
     border-right-width: 0;
@@ -3220,13 +3210,13 @@ GtkColorButton.button {
 /* leftmost button */
 .header-bar .button.raised.linked:first-child,
 .header-bar .button.raised.linked:active:first-child,
-.header-bar .button.raised.linked:insensitive:first-child,
+.header-bar .button.raised.linked:disabled:first-child,
 .header-bar .raised.linked .button:first-child,
 .header-bar .raised.linked .button:active:first-child,
-.header-bar .raised.linked .button:insensitive:first-child,
+.header-bar .raised.linked .button:disabled:first-child,
 .header-bar .linked .button:first-child,
 .header-bar .linked .button:active:first-child,
-.header-bar .linked .button:insensitive:first-child {
+.header-bar .linked .button:disabled:first-child {
     border-width: 1px;
     border-radius: 2px;
     border-right-width: 0;
@@ -3238,15 +3228,15 @@ GtkColorButton.button {
 .header-bar .button.raised.linked:last-child,
 .header-bar .button.raised.linked:active:last-child,
 .header-bar .button.raised.linked:checked:last-child,
-.header-bar .button.raised.linked:insensitive:last-child,
+.header-bar .button.raised.linked:disabled:last-child,
 .header-bar .raised.linked .button:last-child,
 .header-bar .raised.linked .button:active:last-child,
 .header-bar .raised.linked .button:checked:last-child,
-.header-bar .raised.linked .button:insensitive:last-child,
+.header-bar .raised.linked .button:disabled:last-child,
 .header-bar .linked .button:last-child,
 .header-bar .linked .button:active:last-child,
 .header-bar .linked .button:checked:last-child,
-.header-bar .linked .button:insensitive:last-child {
+.header-bar .linked .button:disabled:last-child {
     border-width: 1px;
     border-radius: 2px;
     border-left-width: 0;
@@ -3258,15 +3248,15 @@ GtkColorButton.button {
 .header-bar .button.raised.linked:only-child,
 .header-bar .button.raised.linked:active:only-child,
 .header-bar .button.raised.linked:checked:only-child,
-.header-bar .button.raised.linked:insensitive:only-child,
+.header-bar .button.raised.linked:disabled:only-child,
 .header-bar .raised.linked .button:only-child,
 .header-bar .raised.linked .button:active:only-child,
 .header-bar .raised.linked .button:checked:only-child,
-.header-bar .raised.linked .button:insensitive:only-child,
+.header-bar .raised.linked .button:disabled:only-child,
 .header-bar .linked .button:only-child,
 .header-bar .linked .button:active:only-child,
 .header-bar .linked .button:checked:only-child,
-.header-bar .linked .button:insensitive:only-child {
+.header-bar .linked .button:disabled:only-child {
     border-width: 1px;
     border-radius: 2px;
 }
@@ -3322,8 +3312,8 @@ GtkViewport.frame {
     color: @theme_text_color;
 }
 
-.view:insensitive,
-.view:insensitive:insensitive {
+.view:disabled,
+.view:disabled:disabled {
     background-color: shade(@theme_base_color, 0.9);
     color: mix(@theme_fg_color, @theme_bg_color, 0.5);
 }
@@ -3356,12 +3346,10 @@ GtkViewport.frame {
 }
 
 .action-bar .title {
-    font: bold;
     padding: 0 12px;
 }
 
 .action-bar .subtitle {
-    font: smaller;
     padding: 0 12px;
 }
 
@@ -3470,7 +3458,7 @@ GtkOverlay.osd {
     color: @osd_fg;
 }
 
-.osd.button:prelight,
+.osd.button:hover,
 .osd.button:hover,
 .osd .button:hover {
     border-color: shade(@osd_bg, 0.7);
@@ -3498,17 +3486,17 @@ GtkOverlay.osd {
     border-color: shade(@osd_bg, 0.7);
 }
 
-.osd.button:insensitive,
-.osd .button:insensitive {
+.osd.button:disabled,
+.osd .button:disabled {
     border-color: shade(@osd_bg, 0.85);
     background-color: shade(@osd_bg, 0.9);
     background-image: none;
 }
 
-.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-color: shade(@osd_bg, 0.80);
     background-image: none;
 }
@@ -3564,14 +3552,14 @@ GtkOverlay.osd {
     border-color: shade(@osd_bg, 0.7);
 }
 
-.osd.toolbar .button:insensitive {
+.osd.toolbar .button:disabled {
     border-color: shade(@osd_bg, 0.85);
     background-color: shade(@osd_bg, 0.9);
     background-image: none;
 }
 
-.osd.toolbar .button:active:insensitive,
-.osd.toolbar .button:checked:insensitive {
+.osd.toolbar .button:active:disabled,
+.osd.toolbar .button:checked:disabled {
     border-color: shade(@osd_bg, 0.75);
     background-color: shade(@osd_bg, 0.80);
     background-image: none;
@@ -3629,7 +3617,7 @@ GtkOverlay.osd {
                 inset 0 -1px shade(@osd_bg, 0.7);
 }
 
-.osd .scale.slider:insensitive {
+.osd .scale.slider:disabled {
     background-color: shade(@osd_bg, 0.9);
     background-image: none;
     box-shadow: inset 1px 0 shade(@osd_bg, 0.85),
@@ -3650,8 +3638,8 @@ GtkOverlay.osd {
     background-image: none;
 }
 
-.osd .scale.trough:insensitive,
-.osd .scale.trough.highlight:insensitive {
+.osd .scale.trough:disabled,
+.osd .scale.trough.highlight:disabled {
     border-color: shade(@osd_bg, 0.85);
     background-color: shade(@osd_bg, 0.9);
     background-image: none;
@@ -3963,7 +3951,6 @@ GtkBubbleWindow .toolbar {
 }
 
 .titlebar .title {
-    font: bold;
 }
 
 .titlebar:backdrop {
@@ -3978,7 +3965,7 @@ GtkBubbleWindow .toolbar {
     border-style: none;
     background: none;
     color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.1);
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
 }
 
 .titlebar .titlebutton:hover,
@@ -4015,7 +4002,7 @@ GtkBubbleWindow .toolbar {
 .titlebar .titlebutton:backdrop {
     background-image: none;
     color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.4);
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
 }
 
 .window-frame {
diff --git a/themes/ayaya/gtk-3.0/gtk.css b/themes/ayaya/gtk-3.0/gtk.css
index a2afda5..1d436b4 100644
--- a/themes/ayaya/gtk-3.0/gtk.css
+++ b/themes/ayaya/gtk-3.0/gtk.css
@@ -68,10 +68,10 @@
 @define-color wm_title_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1);
 @define-color wm_title_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4);
 @define-color wm_icons_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1);
-@define-color wm_icons_focused_prelight @selected_bg_color;
+@define-color wm_icons_focused_hover @selected_bg_color;
 @define-color wm_icons_focused_pressed shade(@selected_bg_color, 0.8);
 @define-color wm_icons_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4);
-@define-color wm_icons_unfocused_prelight @selected_bg_color;
+@define-color wm_icons_unfocused_hover @selected_bg_color;
 @define-color wm_icons_unfocused_pressed shade(@selected_bg_color, 0.8);
 
 @import url("gtk-widgets.css");