diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index a64d06d..81c9d58 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -189,14 +189,14 @@ GtkGrid:insensitive {
 }
 
 /* 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,
+.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 {
     box-shadow: none;
 }
@@ -268,8 +268,8 @@ GtkAssistant .sidebar {
     background-image: none;
 }
 
-.button:active *:insensitive,
-.button:checked *:insensitive {
+.button:active:insensitive,
+.button:checked:insensitive {
     border-color: shade(@theme_bg_color, 0.75);
     background-color: shade(@theme_bg_color, 0.80);
     background-image: none;
@@ -334,83 +334,6 @@ row:selected:focus {
     color: @theme_selected_fg_color;
 }
 
-/*******************
- * check and radio *
- *******************/
-GtkCheckButton.text-button,
-GtkRadioButton.text-button {
-    padding: 1px;
-    outline-offset: 0;
-}
-
-.check {
-    color: shade(@theme_fg_color, 1.2);
-    background-image: none;
-
-    -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
-}
-.check:hover {
-    color: shade(@theme_fg_color, 1.1);
-}
-
-.check:checked,
-.check:active {
-    -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic");
-
-    color: @theme_fg_color;
-}
-.check:checked:hover,
-.check:active:hover {
-    color: shade(@theme_fg_color, 1.1);
-}
-
-.check:checked:insensitive,
-.check:active:insensitive {
-    color: shade(@theme_fg_color, 1.1);
-}
-
-.check:insensitive {
-    color: shade(@theme_fg_color, 1.8);
-}
-
-.check:inconsistent {
-    -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic");
-}
-
-.radio {
-    color: shade(@theme_fg_color, 1.2);
-    background-image: none;
-
-    -gtk-icon-source: -gtk-icontheme("radio-symbolic");
-}
-.radio:hover {
-    color: shade(@theme_fg_color, 1.1);
-}
-
-.radio:checked,
-.radio:active {
-    -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic");
-
-    color: @theme_fg_color;
-}
-
-.radio:checked:hover,
-.radio:active:hover {
-    color: shade(@theme_fg_color, 1.1);
-}
-.radio:checked:insensitive,
-.radio:active:insensitive {
-    color: shade(@theme_fg_color, 1.1);
-}
-
-.radio:insensitive {
-    color: shade(@theme_fg_color, 1.8);
-}
-
-.radio:inconsistent {
-    -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic");
-}
-
 /*****************
  * column-header *
  *****************/
@@ -1061,8 +984,8 @@ GtkComboBox .menu {
 .menu.button:hover,
 .menu.button:active,
 .menu.button:checked,
-.menu.button:active *:insensitive,
-.menu.button:checked *:insensitive,
+.menu.button:active:insensitive,
+.menu.button:checked:insensitive,
 .menu.button:insensitive,
 .menu.button {
     border-width: 0;
@@ -2339,8 +2262,8 @@ GtkColorButton.button {
     background-image: none;
 }
 
-.header-bar .button:active *:insensitive,
-.header-bar .button:checked *:insensitive {
+.header-bar .button:active:insensitive,
+.header-bar .button:checked:insensitive {
     border-color: shade(@titlebar_bg_color, 0.75);
     background-color: shade(@titlebar_bg_color, 0.80);
     background-image: none;
@@ -2488,10 +2411,10 @@ GtkColorButton.button {
     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:insensitive,
+.toolbar .button:active:insensitive,
+.primary-toolbar .button:checked:insensitive,
+.toolbar .button:checked:insensitive {
     border-color: shade(@toolbar_bg_color, 0.75);
     background-color: shade(@toolbar_bg_color, 0.80);
     background-image: none;
@@ -2573,10 +2496,10 @@ GtkColorButton.button {
     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:insensitive
+.inline-toolbar.toolbar GtkToolButton .button:active:insensitive,
+.inline-toolbar.toolbar .button:checked:insensitive
+.inline-toolbar.toolbar GtkToolButton .button:checked:insensitive {
     border-color: shade(@theme_bg_color, 0.75);
     background-color: shade(@theme_bg_color, 0.80);
     background-image: none;
@@ -2619,26 +2542,26 @@ GtkColorButton.button {
 .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:active:insensitive:last-child,
+.linked .button:active:insensitive:only-child,
+.linked .button:checked:insensitive:last-child,
+.linked .button:checked:insensitive: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: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 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: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 {
     box-shadow: none;
 }
 
@@ -2778,26 +2701,26 @@ GtkColorButton.button {
 .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: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,
 .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: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 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: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 {
     box-shadow: none;
 }
 
@@ -2918,42 +2841,42 @@ GtkColorButton.button {
 .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: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 .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: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,
 .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: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 .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: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 .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: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 {
     box-shadow: none;
 }
 
@@ -3120,26 +3043,26 @@ GtkColorButton.button {
 .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: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 .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: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 .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: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 {
     box-shadow: none;
 }
 
@@ -3468,10 +3391,10 @@ GtkOverlay.osd {
     background-image: none;
 }
 
-.osd.button:active *:insensitive,
-.osd .button:active *:insensitive,
-.osd.button:checked *:insensitive,
-.osd .button:checked *:insensitive {
+.osd.button:active:insensitive,
+.osd .button:active:insensitive,
+.osd.button:checked:insensitive,
+.osd .button:checked:insensitive {
     background-color: shade(@osd_bg, 0.80);
     background-image: none;
 }
@@ -3533,8 +3456,8 @@ GtkOverlay.osd {
     background-image: none;
 }
 
-.osd.toolbar .button:active *:insensitive,
-.osd.toolbar .button:checked *:insensitive {
+.osd.toolbar .button:active:insensitive,
+.osd.toolbar .button:checked:insensitive {
     border-color: shade(@osd_bg, 0.75);
     background-color: shade(@osd_bg, 0.80);
     background-image: none;