diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 8b42ddb..3fc6378 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2270,7 +2270,7 @@ switch {
                   (':checked:active', '-checked-active'),
                   (':backdrop:checked', '-checked-backdrop'),
                   (':backdrop:checked:disabled', '-checked-backdrop-insensitive') {
-    #{$w}#{$s} {
+    treeview.#{$w}#{$s} {
       -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}#{$asset_suffix}.png"),
                                     url("assets/#{$a}#{$as}#{$asset_suffix}@2.png"));
       -gtk-icon-shadow: if(str-index($s,"backdrop"), none, 0 1px 0 $borders_edge); //no edge highlight for :backdrop
@@ -2280,34 +2280,13 @@ switch {
       // the borders of the light variant versions of checks and radios are
       // too similar in luminosity to the selected background color, hence
       // we need special casing.
-      .view #{$w}#{$s}:selected,
+      .view treeview.#{$w}#{$s}:selected,
       row:selected #{$w}#{$s} {
         -gtk-icon-source: -gtk-scaled(url("assets/selected-#{$a}#{$as}#{$asset_suffix}.png"),
                                       url("assets/selected-#{$a}#{$as}#{$asset_suffix}@2.png"));
       }
     }
   }
-
-  //menu
-  menu menuitem #{$w} {
-    color: mix($fg_color, $bg_color, 70%);
-    -gtk-icon-source: -gtk-icontheme('#{$a}-symbolic');
-    -gtk-icon-shadow: none;
-    &:hover, &:disabled {
-      -gtk-icon-source: -gtk-icontheme('#{$a}-symbolic');
-      -gtk-icon-shadow: none;
-    }
-    &:checked, &:checked:hover, &:checked:disabled {
-      -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic');
-      -gtk-icon-shadow: none;
-    }
-    &:indeterminate, &:indeterminate:hover, &:indeterminate:disabled {
-      -gtk-icon-source: -gtk-icontheme('#{$a}-mixed-symbolic');
-      -gtk-icon-shadow: none;
-    }
-    &:hover { color: $selected_fg_color; }
-    &:disabled { color: mix($insensitive_fg_color, $bg_color, 50%); }
-  }
 }
 
 //treeview and rows
@@ -2347,15 +2326,60 @@ checkbutton.text-button, radiobutton.text-button {
   }
 }
 
-radiobutton radio,
-checkbutton check {
-  min-width: 16px;
-  min-height: 16px;
-  margin: 0 2px 0 2px;
-
+check,
+radio {
+  margin: 0 4px;
   &:only-child { margin: 0; }
+
+  min-height: 14px;
+  min-width: 14px;
+  border: 1px solid;
+  -gtk-icon-source: none;
+  @include button(normal);
+  &:hover { @include button(hover); }
+  &:active { @include button(active); }
+  &:disabled { @include button(insensitive); }
+  &:backdrop {
+    @include button(backdrop);
+    &:disabled { @include button(backdrop-insensitive); }
+  }
+
+  @if $variant == 'light' {
+    // the borders of the light variant versions of checks and radios are too similar in luminosity to the selected background
+    // color, hence we need special casing.
+    row:selected & { border-color: $selected_borders_color; }
+  }
+
+  menu menuitem & {
+    &, &:hover, &:disabled {
+      min-height: 14px;
+      min-width: 14px;
+      background-image: none;
+      background-color: transparent;
+      box-shadow: none;
+      -gtk-icon-shadow: none;
+      color: inherit;
+      border-color: currentColor;
+    }
+  }
+}
+
+check {
+  border-radius: 3px;
+  -gtk-icon-theme: "adwaita-private";
+  &:checked { -gtk-icon-source: -gtk-icontheme('check-symbolic'); }
+  &:indeterminate { -gtk-icon-source: -gtk-icontheme('dash-symbolic'); }
 }
 
+radio {
+  border-radius: 100%;
+  -gtk-icon-theme: "adwaita-private";
+  &:checked { -gtk-icon-source: -gtk-icontheme('bullet-symbolic'); }
+  &:indeterminate { -gtk-icon-source: -gtk-icontheme('dash-symbolic'); }
+}
+
+
+
 /************
  * GtkScale *
  ************/
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 00c4356..807138b 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2672,330 +2672,294 @@ switch {
 /*************************
  * Check and Radio items *
  *************************/
-check {
+treeview.check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  check button.flat, check button.sidebar-button, check headerbar button.titlebutton, headerbar check button.titlebutton,
-  check .titlebar button.titlebutton,
-  .titlebar check button.titlebutton {
+  treeview.check button.flat, treeview.check button.sidebar-button, treeview.check headerbar button.titlebutton, headerbar treeview.check button.titlebutton,
+  treeview.check .titlebar button.titlebutton,
+  .titlebar treeview.check button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:hover {
+treeview.check:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover-dark.png"), url("assets/checkbox-unchecked-hover-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  check:hover button.flat, check:hover button.sidebar-button, check:hover headerbar button.titlebutton, headerbar check:hover button.titlebutton,
-  check:hover .titlebar button.titlebutton,
-  .titlebar check:hover button.titlebutton {
+  treeview.check:hover button.flat, treeview.check:hover button.sidebar-button, treeview.check:hover headerbar button.titlebutton, headerbar treeview.check:hover button.titlebutton,
+  treeview.check:hover .titlebar button.titlebutton,
+  .titlebar treeview.check:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:active {
+treeview.check:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active-dark.png"), url("assets/checkbox-unchecked-active-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  check:active button.flat, check:active button.sidebar-button, check:active headerbar button.titlebutton, headerbar check:active button.titlebutton,
-  check:active .titlebar button.titlebutton,
-  .titlebar check:active button.titlebutton {
+  treeview.check:active button.flat, treeview.check:active button.sidebar-button, treeview.check:active headerbar button.titlebutton, headerbar treeview.check:active button.titlebutton,
+  treeview.check:active .titlebar button.titlebutton,
+  .titlebar treeview.check:active button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:disabled {
+treeview.check:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  check:disabled button.flat, check:disabled button.sidebar-button, check:disabled headerbar button.titlebutton, headerbar check:disabled button.titlebutton,
-  check:disabled .titlebar button.titlebutton,
-  .titlebar check:disabled button.titlebutton {
+  treeview.check:disabled button.flat, treeview.check:disabled button.sidebar-button, treeview.check:disabled headerbar button.titlebutton, headerbar treeview.check:disabled button.titlebutton,
+  treeview.check:disabled .titlebar button.titlebutton,
+  .titlebar treeview.check:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:backdrop {
+treeview.check:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-dark.png"), url("assets/checkbox-unchecked-backdrop-dark@2.png"));
   -gtk-icon-shadow: none; }
-  check:backdrop button.flat, check:backdrop button.sidebar-button, check:backdrop headerbar button.titlebutton, headerbar check:backdrop button.titlebutton,
-  check:backdrop .titlebar button.titlebutton,
-  .titlebar check:backdrop button.titlebutton {
+  treeview.check:backdrop button.flat, treeview.check:backdrop button.sidebar-button, treeview.check:backdrop headerbar button.titlebutton, headerbar treeview.check:backdrop button.titlebutton,
+  treeview.check:backdrop .titlebar button.titlebutton,
+  .titlebar treeview.check:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:backdrop:disabled {
+treeview.check:backdrop:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive-dark.png"), url("assets/checkbox-unchecked-backdrop-insensitive-dark@2.png"));
   -gtk-icon-shadow: none; }
-  check:backdrop:disabled button.flat, check:backdrop:disabled button.sidebar-button, check:backdrop:disabled headerbar button.titlebutton, headerbar check:backdrop:disabled button.titlebutton,
-  check:backdrop:disabled .titlebar button.titlebutton,
-  .titlebar check:backdrop:disabled button.titlebutton {
+  treeview.check:backdrop:disabled button.flat, treeview.check:backdrop:disabled button.sidebar-button, treeview.check:backdrop:disabled headerbar button.titlebutton, headerbar treeview.check:backdrop:disabled button.titlebutton,
+  treeview.check:backdrop:disabled .titlebar button.titlebutton,
+  .titlebar treeview.check:backdrop:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:indeterminate {
+treeview.check:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  check:indeterminate button.flat, check:indeterminate button.sidebar-button, check:indeterminate headerbar button.titlebutton, headerbar check:indeterminate button.titlebutton,
-  check:indeterminate .titlebar button.titlebutton,
-  .titlebar check:indeterminate button.titlebutton {
+  treeview.check:indeterminate button.flat, treeview.check:indeterminate button.sidebar-button, treeview.check:indeterminate headerbar button.titlebutton, headerbar treeview.check:indeterminate button.titlebutton,
+  treeview.check:indeterminate .titlebar button.titlebutton,
+  .titlebar treeview.check:indeterminate button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:indeterminate:hover {
+treeview.check:indeterminate:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover-dark.png"), url("assets/checkbox-mixed-hover-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  check:indeterminate:hover button.flat, check:indeterminate:hover button.sidebar-button, check:indeterminate:hover headerbar button.titlebutton, headerbar check:indeterminate:hover button.titlebutton,
-  check:indeterminate:hover .titlebar button.titlebutton,
-  .titlebar check:indeterminate:hover button.titlebutton {
+  treeview.check:indeterminate:hover button.flat, treeview.check:indeterminate:hover button.sidebar-button, treeview.check:indeterminate:hover headerbar button.titlebutton, headerbar treeview.check:indeterminate:hover button.titlebutton,
+  treeview.check:indeterminate:hover .titlebar button.titlebutton,
+  .titlebar treeview.check:indeterminate:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:indeterminate:selected {
+treeview.check:indeterminate:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active-dark.png"), url("assets/checkbox-mixed-active-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  check:indeterminate:selected button.flat, check:indeterminate:selected button.sidebar-button, check:indeterminate:selected headerbar button.titlebutton, headerbar check:indeterminate:selected button.titlebutton,
-  check:indeterminate:selected .titlebar button.titlebutton,
-  .titlebar check:indeterminate:selected button.titlebutton {
+  treeview.check:indeterminate:selected button.flat, treeview.check:indeterminate:selected button.sidebar-button, treeview.check:indeterminate:selected headerbar button.titlebutton, headerbar treeview.check:indeterminate:selected button.titlebutton,
+  treeview.check:indeterminate:selected .titlebar button.titlebutton,
+  .titlebar treeview.check:indeterminate:selected button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:indeterminate:backdrop {
+treeview.check:indeterminate:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-dark.png"), url("assets/checkbox-mixed-backdrop-dark@2.png"));
   -gtk-icon-shadow: none; }
-  check:indeterminate:backdrop button.flat, check:indeterminate:backdrop button.sidebar-button, check:indeterminate:backdrop headerbar button.titlebutton, headerbar check:indeterminate:backdrop button.titlebutton,
-  check:indeterminate:backdrop .titlebar button.titlebutton,
-  .titlebar check:indeterminate:backdrop button.titlebutton {
+  treeview.check:indeterminate:backdrop button.flat, treeview.check:indeterminate:backdrop button.sidebar-button, treeview.check:indeterminate:backdrop headerbar button.titlebutton, headerbar treeview.check:indeterminate:backdrop button.titlebutton,
+  treeview.check:indeterminate:backdrop .titlebar button.titlebutton,
+  .titlebar treeview.check:indeterminate:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:indeterminate:disabled {
+treeview.check:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  check:indeterminate:disabled button.flat, check:indeterminate:disabled button.sidebar-button, check:indeterminate:disabled headerbar button.titlebutton, headerbar check:indeterminate:disabled button.titlebutton,
-  check:indeterminate:disabled .titlebar button.titlebutton,
-  .titlebar check:indeterminate:disabled button.titlebutton {
+  treeview.check:indeterminate:disabled button.flat, treeview.check:indeterminate:disabled button.sidebar-button, treeview.check:indeterminate:disabled headerbar button.titlebutton, headerbar treeview.check:indeterminate:disabled button.titlebutton,
+  treeview.check:indeterminate:disabled .titlebar button.titlebutton,
+  .titlebar treeview.check:indeterminate:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:indeterminate:disabled:backdrop {
+treeview.check:indeterminate:disabled:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive-dark.png"), url("assets/checkbox-mixed-backdrop-insensitive-dark@2.png"));
   -gtk-icon-shadow: none; }
-  check:indeterminate:disabled:backdrop button.flat, check:indeterminate:disabled:backdrop button.sidebar-button, check:indeterminate:disabled:backdrop headerbar button.titlebutton, headerbar check:indeterminate:disabled:backdrop button.titlebutton,
-  check:indeterminate:disabled:backdrop .titlebar button.titlebutton,
-  .titlebar check:indeterminate:disabled:backdrop button.titlebutton {
+  treeview.check:indeterminate:disabled:backdrop button.flat, treeview.check:indeterminate:disabled:backdrop button.sidebar-button, treeview.check:indeterminate:disabled:backdrop headerbar button.titlebutton, headerbar treeview.check:indeterminate:disabled:backdrop button.titlebutton,
+  treeview.check:indeterminate:disabled:backdrop .titlebar button.titlebutton,
+  .titlebar treeview.check:indeterminate:disabled:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:checked {
+treeview.check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  check:checked button.flat, check:checked button.sidebar-button, check:checked headerbar button.titlebutton, headerbar check:checked button.titlebutton,
-  check:checked .titlebar button.titlebutton,
-  .titlebar check:checked button.titlebutton {
+  treeview.check:checked button.flat, treeview.check:checked button.sidebar-button, treeview.check:checked headerbar button.titlebutton, headerbar treeview.check:checked button.titlebutton,
+  treeview.check:checked .titlebar button.titlebutton,
+  .titlebar treeview.check:checked button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:checked:disabled {
+treeview.check:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  check:checked:disabled button.flat, check:checked:disabled button.sidebar-button, check:checked:disabled headerbar button.titlebutton, headerbar check:checked:disabled button.titlebutton,
-  check:checked:disabled .titlebar button.titlebutton,
-  .titlebar check:checked:disabled button.titlebutton {
+  treeview.check:checked:disabled button.flat, treeview.check:checked:disabled button.sidebar-button, treeview.check:checked:disabled headerbar button.titlebutton, headerbar treeview.check:checked:disabled button.titlebutton,
+  treeview.check:checked:disabled .titlebar button.titlebutton,
+  .titlebar treeview.check:checked:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:checked:hover {
+treeview.check:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-dark.png"), url("assets/checkbox-checked-hover-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  check:checked:hover button.flat, check:checked:hover button.sidebar-button, check:checked:hover headerbar button.titlebutton, headerbar check:checked:hover button.titlebutton,
-  check:checked:hover .titlebar button.titlebutton,
-  .titlebar check:checked:hover button.titlebutton {
+  treeview.check:checked:hover button.flat, treeview.check:checked:hover button.sidebar-button, treeview.check:checked:hover headerbar button.titlebutton, headerbar treeview.check:checked:hover button.titlebutton,
+  treeview.check:checked:hover .titlebar button.titlebutton,
+  .titlebar treeview.check:checked:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:checked:active {
+treeview.check:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-dark.png"), url("assets/checkbox-checked-active-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  check:checked:active button.flat, check:checked:active button.sidebar-button, check:checked:active headerbar button.titlebutton, headerbar check:checked:active button.titlebutton,
-  check:checked:active .titlebar button.titlebutton,
-  .titlebar check:checked:active button.titlebutton {
+  treeview.check:checked:active button.flat, treeview.check:checked:active button.sidebar-button, treeview.check:checked:active headerbar button.titlebutton, headerbar treeview.check:checked:active button.titlebutton,
+  treeview.check:checked:active .titlebar button.titlebutton,
+  .titlebar treeview.check:checked:active button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:backdrop:checked {
+treeview.check:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-dark.png"), url("assets/checkbox-checked-backdrop-dark@2.png"));
   -gtk-icon-shadow: none; }
-  check:backdrop:checked button.flat, check:backdrop:checked button.sidebar-button, check:backdrop:checked headerbar button.titlebutton, headerbar check:backdrop:checked button.titlebutton,
-  check:backdrop:checked .titlebar button.titlebutton,
-  .titlebar check:backdrop:checked button.titlebutton {
+  treeview.check:backdrop:checked button.flat, treeview.check:backdrop:checked button.sidebar-button, treeview.check:backdrop:checked headerbar button.titlebutton, headerbar treeview.check:backdrop:checked button.titlebutton,
+  treeview.check:backdrop:checked .titlebar button.titlebutton,
+  .titlebar treeview.check:backdrop:checked button.titlebutton {
     -gtk-icon-shadow: none; }
 
-check:backdrop:checked:disabled {
+treeview.check:backdrop:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive-dark.png"), url("assets/checkbox-checked-backdrop-insensitive-dark@2.png"));
   -gtk-icon-shadow: none; }
-  check:backdrop:checked:disabled button.flat, check:backdrop:checked:disabled button.sidebar-button, check:backdrop:checked:disabled headerbar button.titlebutton, headerbar check:backdrop:checked:disabled button.titlebutton,
-  check:backdrop:checked:disabled .titlebar button.titlebutton,
-  .titlebar check:backdrop:checked:disabled button.titlebutton {
-    -gtk-icon-shadow: none; }
-
-menu menuitem check {
-  color: #b8bab8;
-  -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
-  -gtk-icon-shadow: none; }
-  menu menuitem check:hover, menu menuitem check:disabled {
-    -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
-    -gtk-icon-shadow: none; }
-  menu menuitem check:checked, menu menuitem check:checked:hover, menu menuitem check:checked:disabled {
-    -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic");
+  treeview.check:backdrop:checked:disabled button.flat, treeview.check:backdrop:checked:disabled button.sidebar-button, treeview.check:backdrop:checked:disabled headerbar button.titlebutton, headerbar treeview.check:backdrop:checked:disabled button.titlebutton,
+  treeview.check:backdrop:checked:disabled .titlebar button.titlebutton,
+  .titlebar treeview.check:backdrop:checked:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
-  menu menuitem check:indeterminate, menu menuitem check:indeterminate:hover, menu menuitem check:indeterminate:disabled {
-    -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic");
-    -gtk-icon-shadow: none; }
-  menu menuitem check:hover {
-    color: #ffffff; }
-  menu menuitem check:disabled {
-    color: #676b6b; }
 
-radio {
+treeview.radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  radio button.flat, radio button.sidebar-button, radio headerbar button.titlebutton, headerbar radio button.titlebutton,
-  radio .titlebar button.titlebutton,
-  .titlebar radio button.titlebutton {
+  treeview.radio button.flat, treeview.radio button.sidebar-button, treeview.radio headerbar button.titlebutton, headerbar treeview.radio button.titlebutton,
+  treeview.radio .titlebar button.titlebutton,
+  .titlebar treeview.radio button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:hover {
+treeview.radio:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover-dark.png"), url("assets/radio-unchecked-hover-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  radio:hover button.flat, radio:hover button.sidebar-button, radio:hover headerbar button.titlebutton, headerbar radio:hover button.titlebutton,
-  radio:hover .titlebar button.titlebutton,
-  .titlebar radio:hover button.titlebutton {
+  treeview.radio:hover button.flat, treeview.radio:hover button.sidebar-button, treeview.radio:hover headerbar button.titlebutton, headerbar treeview.radio:hover button.titlebutton,
+  treeview.radio:hover .titlebar button.titlebutton,
+  .titlebar treeview.radio:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:active {
+treeview.radio:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active-dark.png"), url("assets/radio-unchecked-active-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  radio:active button.flat, radio:active button.sidebar-button, radio:active headerbar button.titlebutton, headerbar radio:active button.titlebutton,
-  radio:active .titlebar button.titlebutton,
-  .titlebar radio:active button.titlebutton {
+  treeview.radio:active button.flat, treeview.radio:active button.sidebar-button, treeview.radio:active headerbar button.titlebutton, headerbar treeview.radio:active button.titlebutton,
+  treeview.radio:active .titlebar button.titlebutton,
+  .titlebar treeview.radio:active button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:disabled {
+treeview.radio:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  radio:disabled button.flat, radio:disabled button.sidebar-button, radio:disabled headerbar button.titlebutton, headerbar radio:disabled button.titlebutton,
-  radio:disabled .titlebar button.titlebutton,
-  .titlebar radio:disabled button.titlebutton {
+  treeview.radio:disabled button.flat, treeview.radio:disabled button.sidebar-button, treeview.radio:disabled headerbar button.titlebutton, headerbar treeview.radio:disabled button.titlebutton,
+  treeview.radio:disabled .titlebar button.titlebutton,
+  .titlebar treeview.radio:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:backdrop {
+treeview.radio:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-dark.png"), url("assets/radio-unchecked-backdrop-dark@2.png"));
   -gtk-icon-shadow: none; }
-  radio:backdrop button.flat, radio:backdrop button.sidebar-button, radio:backdrop headerbar button.titlebutton, headerbar radio:backdrop button.titlebutton,
-  radio:backdrop .titlebar button.titlebutton,
-  .titlebar radio:backdrop button.titlebutton {
+  treeview.radio:backdrop button.flat, treeview.radio:backdrop button.sidebar-button, treeview.radio:backdrop headerbar button.titlebutton, headerbar treeview.radio:backdrop button.titlebutton,
+  treeview.radio:backdrop .titlebar button.titlebutton,
+  .titlebar treeview.radio:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:backdrop:disabled {
+treeview.radio:backdrop:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive-dark.png"), url("assets/radio-unchecked-backdrop-insensitive-dark@2.png"));
   -gtk-icon-shadow: none; }
-  radio:backdrop:disabled button.flat, radio:backdrop:disabled button.sidebar-button, radio:backdrop:disabled headerbar button.titlebutton, headerbar radio:backdrop:disabled button.titlebutton,
-  radio:backdrop:disabled .titlebar button.titlebutton,
-  .titlebar radio:backdrop:disabled button.titlebutton {
+  treeview.radio:backdrop:disabled button.flat, treeview.radio:backdrop:disabled button.sidebar-button, treeview.radio:backdrop:disabled headerbar button.titlebutton, headerbar treeview.radio:backdrop:disabled button.titlebutton,
+  treeview.radio:backdrop:disabled .titlebar button.titlebutton,
+  .titlebar treeview.radio:backdrop:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:indeterminate {
+treeview.radio:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  radio:indeterminate button.flat, radio:indeterminate button.sidebar-button, radio:indeterminate headerbar button.titlebutton, headerbar radio:indeterminate button.titlebutton,
-  radio:indeterminate .titlebar button.titlebutton,
-  .titlebar radio:indeterminate button.titlebutton {
+  treeview.radio:indeterminate button.flat, treeview.radio:indeterminate button.sidebar-button, treeview.radio:indeterminate headerbar button.titlebutton, headerbar treeview.radio:indeterminate button.titlebutton,
+  treeview.radio:indeterminate .titlebar button.titlebutton,
+  .titlebar treeview.radio:indeterminate button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:indeterminate:hover {
+treeview.radio:indeterminate:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover-dark.png"), url("assets/radio-mixed-hover-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  radio:indeterminate:hover button.flat, radio:indeterminate:hover button.sidebar-button, radio:indeterminate:hover headerbar button.titlebutton, headerbar radio:indeterminate:hover button.titlebutton,
-  radio:indeterminate:hover .titlebar button.titlebutton,
-  .titlebar radio:indeterminate:hover button.titlebutton {
+  treeview.radio:indeterminate:hover button.flat, treeview.radio:indeterminate:hover button.sidebar-button, treeview.radio:indeterminate:hover headerbar button.titlebutton, headerbar treeview.radio:indeterminate:hover button.titlebutton,
+  treeview.radio:indeterminate:hover .titlebar button.titlebutton,
+  .titlebar treeview.radio:indeterminate:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:indeterminate:selected {
+treeview.radio:indeterminate:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-dark.png"), url("assets/radio-mixed-active-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  radio:indeterminate:selected button.flat, radio:indeterminate:selected button.sidebar-button, radio:indeterminate:selected headerbar button.titlebutton, headerbar radio:indeterminate:selected button.titlebutton,
-  radio:indeterminate:selected .titlebar button.titlebutton,
-  .titlebar radio:indeterminate:selected button.titlebutton {
+  treeview.radio:indeterminate:selected button.flat, treeview.radio:indeterminate:selected button.sidebar-button, treeview.radio:indeterminate:selected headerbar button.titlebutton, headerbar treeview.radio:indeterminate:selected button.titlebutton,
+  treeview.radio:indeterminate:selected .titlebar button.titlebutton,
+  .titlebar treeview.radio:indeterminate:selected button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:indeterminate:backdrop {
+treeview.radio:indeterminate:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-dark.png"), url("assets/radio-mixed-backdrop-dark@2.png"));
   -gtk-icon-shadow: none; }
-  radio:indeterminate:backdrop button.flat, radio:indeterminate:backdrop button.sidebar-button, radio:indeterminate:backdrop headerbar button.titlebutton, headerbar radio:indeterminate:backdrop button.titlebutton,
-  radio:indeterminate:backdrop .titlebar button.titlebutton,
-  .titlebar radio:indeterminate:backdrop button.titlebutton {
+  treeview.radio:indeterminate:backdrop button.flat, treeview.radio:indeterminate:backdrop button.sidebar-button, treeview.radio:indeterminate:backdrop headerbar button.titlebutton, headerbar treeview.radio:indeterminate:backdrop button.titlebutton,
+  treeview.radio:indeterminate:backdrop .titlebar button.titlebutton,
+  .titlebar treeview.radio:indeterminate:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:indeterminate:disabled {
+treeview.radio:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  radio:indeterminate:disabled button.flat, radio:indeterminate:disabled button.sidebar-button, radio:indeterminate:disabled headerbar button.titlebutton, headerbar radio:indeterminate:disabled button.titlebutton,
-  radio:indeterminate:disabled .titlebar button.titlebutton,
-  .titlebar radio:indeterminate:disabled button.titlebutton {
+  treeview.radio:indeterminate:disabled button.flat, treeview.radio:indeterminate:disabled button.sidebar-button, treeview.radio:indeterminate:disabled headerbar button.titlebutton, headerbar treeview.radio:indeterminate:disabled button.titlebutton,
+  treeview.radio:indeterminate:disabled .titlebar button.titlebutton,
+  .titlebar treeview.radio:indeterminate:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:indeterminate:disabled:backdrop {
+treeview.radio:indeterminate:disabled:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive-dark.png"), url("assets/radio-mixed-backdrop-insensitive-dark@2.png"));
   -gtk-icon-shadow: none; }
-  radio:indeterminate:disabled:backdrop button.flat, radio:indeterminate:disabled:backdrop button.sidebar-button, radio:indeterminate:disabled:backdrop headerbar button.titlebutton, headerbar radio:indeterminate:disabled:backdrop button.titlebutton,
-  radio:indeterminate:disabled:backdrop .titlebar button.titlebutton,
-  .titlebar radio:indeterminate:disabled:backdrop button.titlebutton {
+  treeview.radio:indeterminate:disabled:backdrop button.flat, treeview.radio:indeterminate:disabled:backdrop button.sidebar-button, treeview.radio:indeterminate:disabled:backdrop headerbar button.titlebutton, headerbar treeview.radio:indeterminate:disabled:backdrop button.titlebutton,
+  treeview.radio:indeterminate:disabled:backdrop .titlebar button.titlebutton,
+  .titlebar treeview.radio:indeterminate:disabled:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:checked {
+treeview.radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  radio:checked button.flat, radio:checked button.sidebar-button, radio:checked headerbar button.titlebutton, headerbar radio:checked button.titlebutton,
-  radio:checked .titlebar button.titlebutton,
-  .titlebar radio:checked button.titlebutton {
+  treeview.radio:checked button.flat, treeview.radio:checked button.sidebar-button, treeview.radio:checked headerbar button.titlebutton, headerbar treeview.radio:checked button.titlebutton,
+  treeview.radio:checked .titlebar button.titlebutton,
+  .titlebar treeview.radio:checked button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:checked:disabled {
+treeview.radio:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  radio:checked:disabled button.flat, radio:checked:disabled button.sidebar-button, radio:checked:disabled headerbar button.titlebutton, headerbar radio:checked:disabled button.titlebutton,
-  radio:checked:disabled .titlebar button.titlebutton,
-  .titlebar radio:checked:disabled button.titlebutton {
+  treeview.radio:checked:disabled button.flat, treeview.radio:checked:disabled button.sidebar-button, treeview.radio:checked:disabled headerbar button.titlebutton, headerbar treeview.radio:checked:disabled button.titlebutton,
+  treeview.radio:checked:disabled .titlebar button.titlebutton,
+  .titlebar treeview.radio:checked:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:checked:hover {
+treeview.radio:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover-dark.png"), url("assets/radio-checked-hover-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  radio:checked:hover button.flat, radio:checked:hover button.sidebar-button, radio:checked:hover headerbar button.titlebutton, headerbar radio:checked:hover button.titlebutton,
-  radio:checked:hover .titlebar button.titlebutton,
-  .titlebar radio:checked:hover button.titlebutton {
+  treeview.radio:checked:hover button.flat, treeview.radio:checked:hover button.sidebar-button, treeview.radio:checked:hover headerbar button.titlebutton, headerbar treeview.radio:checked:hover button.titlebutton,
+  treeview.radio:checked:hover .titlebar button.titlebutton,
+  .titlebar treeview.radio:checked:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:checked:active {
+treeview.radio:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active-dark.png"), url("assets/radio-checked-active-dark@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(238, 238, 236, 0.07); }
-  radio:checked:active button.flat, radio:checked:active button.sidebar-button, radio:checked:active headerbar button.titlebutton, headerbar radio:checked:active button.titlebutton,
-  radio:checked:active .titlebar button.titlebutton,
-  .titlebar radio:checked:active button.titlebutton {
+  treeview.radio:checked:active button.flat, treeview.radio:checked:active button.sidebar-button, treeview.radio:checked:active headerbar button.titlebutton, headerbar treeview.radio:checked:active button.titlebutton,
+  treeview.radio:checked:active .titlebar button.titlebutton,
+  .titlebar treeview.radio:checked:active button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:backdrop:checked {
+treeview.radio:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-dark.png"), url("assets/radio-checked-backdrop-dark@2.png"));
   -gtk-icon-shadow: none; }
-  radio:backdrop:checked button.flat, radio:backdrop:checked button.sidebar-button, radio:backdrop:checked headerbar button.titlebutton, headerbar radio:backdrop:checked button.titlebutton,
-  radio:backdrop:checked .titlebar button.titlebutton,
-  .titlebar radio:backdrop:checked button.titlebutton {
+  treeview.radio:backdrop:checked button.flat, treeview.radio:backdrop:checked button.sidebar-button, treeview.radio:backdrop:checked headerbar button.titlebutton, headerbar treeview.radio:backdrop:checked button.titlebutton,
+  treeview.radio:backdrop:checked .titlebar button.titlebutton,
+  .titlebar treeview.radio:backdrop:checked button.titlebutton {
     -gtk-icon-shadow: none; }
 
-radio:backdrop:checked:disabled {
+treeview.radio:backdrop:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive-dark.png"), url("assets/radio-checked-backdrop-insensitive-dark@2.png"));
   -gtk-icon-shadow: none; }
-  radio:backdrop:checked:disabled button.flat, radio:backdrop:checked:disabled button.sidebar-button, radio:backdrop:checked:disabled headerbar button.titlebutton, headerbar radio:backdrop:checked:disabled button.titlebutton,
-  radio:backdrop:checked:disabled .titlebar button.titlebutton,
-  .titlebar radio:backdrop:checked:disabled button.titlebutton {
+  treeview.radio:backdrop:checked:disabled button.flat, treeview.radio:backdrop:checked:disabled button.sidebar-button, treeview.radio:backdrop:checked:disabled headerbar button.titlebutton, headerbar treeview.radio:backdrop:checked:disabled button.titlebutton,
+  treeview.radio:backdrop:checked:disabled .titlebar button.titlebutton,
+  .titlebar treeview.radio:backdrop:checked:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-menu menuitem radio {
-  color: #b8bab8;
-  -gtk-icon-source: -gtk-icontheme("radio-symbolic");
-  -gtk-icon-shadow: none; }
-  menu menuitem radio:hover, menu menuitem radio:disabled {
-    -gtk-icon-source: -gtk-icontheme("radio-symbolic");
-    -gtk-icon-shadow: none; }
-  menu menuitem radio:checked, menu menuitem radio:checked:hover, menu menuitem radio:checked:disabled {
-    -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic");
-    -gtk-icon-shadow: none; }
-  menu menuitem radio:indeterminate, menu menuitem radio:indeterminate:hover, menu menuitem radio:indeterminate:disabled {
-    -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic");
-    -gtk-icon-shadow: none; }
-  menu menuitem radio:hover {
-    color: #ffffff; }
-  menu menuitem radio:disabled {
-    color: #676b6b; }
-
 .view.check, textview text.check, iconview.check, .view.radio, textview text.radio, iconview.radio,
 row .check, row .radio {
   -gtk-icon-shadow: none; }
@@ -3052,14 +3016,105 @@ checkbutton.text-button, radiobutton.text-button {
     checkbutton.text-button:disabled:backdrop, checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop {
       color: #5d6767; }
 
-radiobutton radio,
-checkbutton check {
-  min-width: 16px;
-  min-height: 16px;
-  margin: 0 2px 0 2px; }
-  radiobutton radio:only-child,
-  checkbutton check:only-child {
+check,
+radio {
+  margin: 0 4px;
+  min-height: 14px;
+  min-width: 14px;
+  border: 1px solid;
+  -gtk-icon-source: none;
+  color: #eeeeec;
+  outline-color: rgba(238, 238, 236, 0.3);
+  border-color: #1c1f1f;
+  background-image: linear-gradient(to bottom, #343a3a, #2f3434 60%, #2a2f2f);
+  text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
+  -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(238, 238, 236, 0); }
+  check:only-child,
+  radio:only-child {
     margin: 0; }
+  check:hover,
+  radio:hover {
+    color: #eeeeec;
+    outline-color: rgba(238, 238, 236, 0.3);
+    border-color: #1c1f1f;
+    /*
+    background-image: linear-gradient(to bottom,
+                                      lighten($c, 16%),
+                                      lighten($c, 6%) 40%,
+                                      lighten($c, 2%));
+    */
+    background-image: linear-gradient(to bottom, #3b4242, #343a3a 60%, #2f3434);
+    text-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
+    -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.76376);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(238, 238, 236, 0); }
+  check:active,
+  radio:active {
+    color: #eeeeec;
+    outline-color: rgba(238, 238, 236, 0.3);
+    border-color: #1c1f1f;
+    background-image: linear-gradient(to bottom, #232727, #2d3232);
+    text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
+    -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
+    box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0); }
+  check:disabled,
+  radio:disabled {
+    color: #949796;
+    border-color: #1c1f1f;
+    background-image: linear-gradient(to bottom, #333636);
+    text-shadow: none;
+    -gtk-icon-shadow: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
+    check:disabled > .label,
+    radio:disabled > .label {
+      color: inherit; }
+  check:backdrop,
+  radio:backdrop {
+    color: #949796;
+    border-color: #1f2222;
+    background-image: linear-gradient(to bottom, #393f3f);
+    text-shadow: none;
+    -gtk-icon-shadow: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
+    check:backdrop:disabled,
+    radio:backdrop:disabled {
+      color: #5d6767;
+      border-color: #1f2222;
+      background-image: linear-gradient(to bottom, #333636);
+      text-shadow: none;
+      -gtk-icon-shadow: none;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
+      check:backdrop:disabled > .label,
+      radio:backdrop:disabled > .label {
+        color: inherit; }
+  menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem
+  radio, menu menuitem
+  radio:hover, menu menuitem
+  radio:disabled {
+    min-height: 14px;
+    min-width: 14px;
+    background-image: none;
+    background-color: transparent;
+    box-shadow: none;
+    -gtk-icon-shadow: none;
+    color: inherit;
+    border-color: currentColor; }
+
+check {
+  border-radius: 3px;
+  -gtk-icon-theme: "adwaita-private"; }
+  check:checked {
+    -gtk-icon-source: -gtk-icontheme("check-symbolic"); }
+  check:indeterminate {
+    -gtk-icon-source: -gtk-icontheme("dash-symbolic"); }
+
+radio {
+  border-radius: 100%;
+  -gtk-icon-theme: "adwaita-private"; }
+  radio:checked {
+    -gtk-icon-source: -gtk-icontheme("bullet-symbolic"); }
+  radio:indeterminate {
+    -gtk-icon-source: -gtk-icontheme("dash-symbolic"); }
 
 /************
  * GtkScale *
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 64b4ba5..c9cfd09 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2694,474 +2694,438 @@ switch {
 /*************************
  * Check and Radio items *
  *************************/
-check {
+treeview.check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked.png"), url("assets/checkbox-unchecked@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  check button.flat, check button.sidebar-button, check headerbar button.titlebutton, headerbar check button.titlebutton,
-  check .titlebar button.titlebutton,
-  .titlebar check button.titlebutton {
+  treeview.check button.flat, treeview.check button.sidebar-button, treeview.check headerbar button.titlebutton, headerbar treeview.check button.titlebutton,
+  treeview.check .titlebar button.titlebutton,
+  .titlebar treeview.check button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:selected, textview text check:selected, iconview check:selected,
+.view treeview.check:selected, textview text treeview.check:selected, iconview treeview.check:selected,
 row:selected check {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked.png"), url("assets/selected-checkbox-unchecked@2.png")); }
 
-check:hover {
+treeview.check:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-hover.png"), url("assets/checkbox-unchecked-hover@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  check:hover button.flat, check:hover button.sidebar-button, check:hover headerbar button.titlebutton, headerbar check:hover button.titlebutton,
-  check:hover .titlebar button.titlebutton,
-  .titlebar check:hover button.titlebutton {
+  treeview.check:hover button.flat, treeview.check:hover button.sidebar-button, treeview.check:hover headerbar button.titlebutton, headerbar treeview.check:hover button.titlebutton,
+  treeview.check:hover .titlebar button.titlebutton,
+  .titlebar treeview.check:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:hover:selected, textview text check:hover:selected, iconview check:hover:selected,
+.view treeview.check:hover:selected, textview text treeview.check:hover:selected, iconview treeview.check:hover:selected,
 row:selected check:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked-hover.png"), url("assets/selected-checkbox-unchecked-hover@2.png")); }
 
-check:active {
+treeview.check:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-active.png"), url("assets/checkbox-unchecked-active@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  check:active button.flat, check:active button.sidebar-button, check:active headerbar button.titlebutton, headerbar check:active button.titlebutton,
-  check:active .titlebar button.titlebutton,
-  .titlebar check:active button.titlebutton {
+  treeview.check:active button.flat, treeview.check:active button.sidebar-button, treeview.check:active headerbar button.titlebutton, headerbar treeview.check:active button.titlebutton,
+  treeview.check:active .titlebar button.titlebutton,
+  .titlebar treeview.check:active button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:active:selected, textview text check:active:selected, iconview check:active:selected,
+.view treeview.check:active:selected, textview text treeview.check:active:selected, iconview treeview.check:active:selected,
 row:selected check:active {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked-active.png"), url("assets/selected-checkbox-unchecked-active@2.png")); }
 
-check:disabled {
+treeview.check:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive.png"), url("assets/checkbox-unchecked-insensitive@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  check:disabled button.flat, check:disabled button.sidebar-button, check:disabled headerbar button.titlebutton, headerbar check:disabled button.titlebutton,
-  check:disabled .titlebar button.titlebutton,
-  .titlebar check:disabled button.titlebutton {
+  treeview.check:disabled button.flat, treeview.check:disabled button.sidebar-button, treeview.check:disabled headerbar button.titlebutton, headerbar treeview.check:disabled button.titlebutton,
+  treeview.check:disabled .titlebar button.titlebutton,
+  .titlebar treeview.check:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:disabled:selected, textview text check:disabled:selected, iconview check:disabled:selected,
+.view treeview.check:disabled:selected, textview text treeview.check:disabled:selected, iconview treeview.check:disabled:selected,
 row:selected check:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked-insensitive.png"), url("assets/selected-checkbox-unchecked-insensitive@2.png")); }
 
-check:backdrop {
+treeview.check:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop.png"), url("assets/checkbox-unchecked-backdrop@2.png"));
   -gtk-icon-shadow: none; }
-  check:backdrop button.flat, check:backdrop button.sidebar-button, check:backdrop headerbar button.titlebutton, headerbar check:backdrop button.titlebutton,
-  check:backdrop .titlebar button.titlebutton,
-  .titlebar check:backdrop button.titlebutton {
+  treeview.check:backdrop button.flat, treeview.check:backdrop button.sidebar-button, treeview.check:backdrop headerbar button.titlebutton, headerbar treeview.check:backdrop button.titlebutton,
+  treeview.check:backdrop .titlebar button.titlebutton,
+  .titlebar treeview.check:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:backdrop:selected, textview text check:backdrop:selected, iconview check:backdrop:selected,
+.view treeview.check:backdrop:selected, textview text treeview.check:backdrop:selected, iconview treeview.check:backdrop:selected,
 row:selected check:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked-backdrop.png"), url("assets/selected-checkbox-unchecked-backdrop@2.png")); }
 
-check:backdrop:disabled {
+treeview.check:backdrop:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-backdrop-insensitive.png"), url("assets/checkbox-unchecked-backdrop-insensitive@2.png"));
   -gtk-icon-shadow: none; }
-  check:backdrop:disabled button.flat, check:backdrop:disabled button.sidebar-button, check:backdrop:disabled headerbar button.titlebutton, headerbar check:backdrop:disabled button.titlebutton,
-  check:backdrop:disabled .titlebar button.titlebutton,
-  .titlebar check:backdrop:disabled button.titlebutton {
+  treeview.check:backdrop:disabled button.flat, treeview.check:backdrop:disabled button.sidebar-button, treeview.check:backdrop:disabled headerbar button.titlebutton, headerbar treeview.check:backdrop:disabled button.titlebutton,
+  treeview.check:backdrop:disabled .titlebar button.titlebutton,
+  .titlebar treeview.check:backdrop:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:backdrop:disabled:selected, textview text check:backdrop:disabled:selected, iconview check:backdrop:disabled:selected,
+.view treeview.check:backdrop:disabled:selected, textview text treeview.check:backdrop:disabled:selected, iconview treeview.check:backdrop:disabled:selected,
 row:selected check:backdrop:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked-backdrop-insensitive.png"), url("assets/selected-checkbox-unchecked-backdrop-insensitive@2.png")); }
 
-check:indeterminate {
+treeview.check:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed.png"), url("assets/checkbox-mixed@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  check:indeterminate button.flat, check:indeterminate button.sidebar-button, check:indeterminate headerbar button.titlebutton, headerbar check:indeterminate button.titlebutton,
-  check:indeterminate .titlebar button.titlebutton,
-  .titlebar check:indeterminate button.titlebutton {
+  treeview.check:indeterminate button.flat, treeview.check:indeterminate button.sidebar-button, treeview.check:indeterminate headerbar button.titlebutton, headerbar treeview.check:indeterminate button.titlebutton,
+  treeview.check:indeterminate .titlebar button.titlebutton,
+  .titlebar treeview.check:indeterminate button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:indeterminate:selected, textview text check:indeterminate:selected, iconview check:indeterminate:selected,
+.view treeview.check:indeterminate:selected, textview text treeview.check:indeterminate:selected, iconview treeview.check:indeterminate:selected,
 row:selected check:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed.png"), url("assets/selected-checkbox-mixed@2.png")); }
 
-check:indeterminate:hover {
+treeview.check:indeterminate:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-hover.png"), url("assets/checkbox-mixed-hover@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  check:indeterminate:hover button.flat, check:indeterminate:hover button.sidebar-button, check:indeterminate:hover headerbar button.titlebutton, headerbar check:indeterminate:hover button.titlebutton,
-  check:indeterminate:hover .titlebar button.titlebutton,
-  .titlebar check:indeterminate:hover button.titlebutton {
+  treeview.check:indeterminate:hover button.flat, treeview.check:indeterminate:hover button.sidebar-button, treeview.check:indeterminate:hover headerbar button.titlebutton, headerbar treeview.check:indeterminate:hover button.titlebutton,
+  treeview.check:indeterminate:hover .titlebar button.titlebutton,
+  .titlebar treeview.check:indeterminate:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:indeterminate:hover:selected, textview text check:indeterminate:hover:selected, iconview check:indeterminate:hover:selected,
+.view treeview.check:indeterminate:hover:selected, textview text treeview.check:indeterminate:hover:selected, iconview treeview.check:indeterminate:hover:selected,
 row:selected check:indeterminate:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed-hover.png"), url("assets/selected-checkbox-mixed-hover@2.png")); }
 
-check:indeterminate:selected {
+treeview.check:indeterminate:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-active.png"), url("assets/checkbox-mixed-active@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  check:indeterminate:selected button.flat, check:indeterminate:selected button.sidebar-button, check:indeterminate:selected headerbar button.titlebutton, headerbar check:indeterminate:selected button.titlebutton,
-  check:indeterminate:selected .titlebar button.titlebutton,
-  .titlebar check:indeterminate:selected button.titlebutton {
+  treeview.check:indeterminate:selected button.flat, treeview.check:indeterminate:selected button.sidebar-button, treeview.check:indeterminate:selected headerbar button.titlebutton, headerbar treeview.check:indeterminate:selected button.titlebutton,
+  treeview.check:indeterminate:selected .titlebar button.titlebutton,
+  .titlebar treeview.check:indeterminate:selected button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:indeterminate:selected:selected, textview text check:indeterminate:selected:selected, iconview check:indeterminate:selected:selected,
+.view treeview.check:indeterminate:selected:selected, textview text treeview.check:indeterminate:selected:selected, iconview treeview.check:indeterminate:selected:selected,
 row:selected check:indeterminate:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed-active.png"), url("assets/selected-checkbox-mixed-active@2.png")); }
 
-check:indeterminate:backdrop {
+treeview.check:indeterminate:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop.png"), url("assets/checkbox-mixed-backdrop@2.png"));
   -gtk-icon-shadow: none; }
-  check:indeterminate:backdrop button.flat, check:indeterminate:backdrop button.sidebar-button, check:indeterminate:backdrop headerbar button.titlebutton, headerbar check:indeterminate:backdrop button.titlebutton,
-  check:indeterminate:backdrop .titlebar button.titlebutton,
-  .titlebar check:indeterminate:backdrop button.titlebutton {
+  treeview.check:indeterminate:backdrop button.flat, treeview.check:indeterminate:backdrop button.sidebar-button, treeview.check:indeterminate:backdrop headerbar button.titlebutton, headerbar treeview.check:indeterminate:backdrop button.titlebutton,
+  treeview.check:indeterminate:backdrop .titlebar button.titlebutton,
+  .titlebar treeview.check:indeterminate:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:indeterminate:backdrop:selected, textview text check:indeterminate:backdrop:selected, iconview check:indeterminate:backdrop:selected,
+.view treeview.check:indeterminate:backdrop:selected, textview text treeview.check:indeterminate:backdrop:selected, iconview treeview.check:indeterminate:backdrop:selected,
 row:selected check:indeterminate:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed-backdrop.png"), url("assets/selected-checkbox-mixed-backdrop@2.png")); }
 
-check:indeterminate:disabled {
+treeview.check:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive.png"), url("assets/checkbox-mixed-insensitive@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  check:indeterminate:disabled button.flat, check:indeterminate:disabled button.sidebar-button, check:indeterminate:disabled headerbar button.titlebutton, headerbar check:indeterminate:disabled button.titlebutton,
-  check:indeterminate:disabled .titlebar button.titlebutton,
-  .titlebar check:indeterminate:disabled button.titlebutton {
+  treeview.check:indeterminate:disabled button.flat, treeview.check:indeterminate:disabled button.sidebar-button, treeview.check:indeterminate:disabled headerbar button.titlebutton, headerbar treeview.check:indeterminate:disabled button.titlebutton,
+  treeview.check:indeterminate:disabled .titlebar button.titlebutton,
+  .titlebar treeview.check:indeterminate:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:indeterminate:disabled:selected, textview text check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected,
+.view treeview.check:indeterminate:disabled:selected, textview text treeview.check:indeterminate:disabled:selected, iconview treeview.check:indeterminate:disabled:selected,
 row:selected check:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed-insensitive.png"), url("assets/selected-checkbox-mixed-insensitive@2.png")); }
 
-check:indeterminate:disabled:backdrop {
+treeview.check:indeterminate:disabled:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-backdrop-insensitive.png"), url("assets/checkbox-mixed-backdrop-insensitive@2.png"));
   -gtk-icon-shadow: none; }
-  check:indeterminate:disabled:backdrop button.flat, check:indeterminate:disabled:backdrop button.sidebar-button, check:indeterminate:disabled:backdrop headerbar button.titlebutton, headerbar check:indeterminate:disabled:backdrop button.titlebutton,
-  check:indeterminate:disabled:backdrop .titlebar button.titlebutton,
-  .titlebar check:indeterminate:disabled:backdrop button.titlebutton {
+  treeview.check:indeterminate:disabled:backdrop button.flat, treeview.check:indeterminate:disabled:backdrop button.sidebar-button, treeview.check:indeterminate:disabled:backdrop headerbar button.titlebutton, headerbar treeview.check:indeterminate:disabled:backdrop button.titlebutton,
+  treeview.check:indeterminate:disabled:backdrop .titlebar button.titlebutton,
+  .titlebar treeview.check:indeterminate:disabled:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:indeterminate:disabled:backdrop:selected, textview text check:indeterminate:disabled:backdrop:selected, iconview check:indeterminate:disabled:backdrop:selected,
+.view treeview.check:indeterminate:disabled:backdrop:selected, textview text treeview.check:indeterminate:disabled:backdrop:selected, iconview treeview.check:indeterminate:disabled:backdrop:selected,
 row:selected check:indeterminate:disabled:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed-backdrop-insensitive.png"), url("assets/selected-checkbox-mixed-backdrop-insensitive@2.png")); }
 
-check:checked {
+treeview.check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked.png"), url("assets/checkbox-checked@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  check:checked button.flat, check:checked button.sidebar-button, check:checked headerbar button.titlebutton, headerbar check:checked button.titlebutton,
-  check:checked .titlebar button.titlebutton,
-  .titlebar check:checked button.titlebutton {
+  treeview.check:checked button.flat, treeview.check:checked button.sidebar-button, treeview.check:checked headerbar button.titlebutton, headerbar treeview.check:checked button.titlebutton,
+  treeview.check:checked .titlebar button.titlebutton,
+  .titlebar treeview.check:checked button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:checked:selected, textview text check:checked:selected, iconview check:checked:selected,
+.view treeview.check:checked:selected, textview text treeview.check:checked:selected, iconview treeview.check:checked:selected,
 row:selected check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked.png"), url("assets/selected-checkbox-checked@2.png")); }
 
-check:checked:disabled {
+treeview.check:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive.png"), url("assets/checkbox-checked-insensitive@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  check:checked:disabled button.flat, check:checked:disabled button.sidebar-button, check:checked:disabled headerbar button.titlebutton, headerbar check:checked:disabled button.titlebutton,
-  check:checked:disabled .titlebar button.titlebutton,
-  .titlebar check:checked:disabled button.titlebutton {
+  treeview.check:checked:disabled button.flat, treeview.check:checked:disabled button.sidebar-button, treeview.check:checked:disabled headerbar button.titlebutton, headerbar treeview.check:checked:disabled button.titlebutton,
+  treeview.check:checked:disabled .titlebar button.titlebutton,
+  .titlebar treeview.check:checked:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:checked:disabled:selected, textview text check:checked:disabled:selected, iconview check:checked:disabled:selected,
+.view treeview.check:checked:disabled:selected, textview text treeview.check:checked:disabled:selected, iconview treeview.check:checked:disabled:selected,
 row:selected check:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-insensitive.png"), url("assets/selected-checkbox-checked-insensitive@2.png")); }
 
-check:checked:hover {
+treeview.check:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover.png"), url("assets/checkbox-checked-hover@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  check:checked:hover button.flat, check:checked:hover button.sidebar-button, check:checked:hover headerbar button.titlebutton, headerbar check:checked:hover button.titlebutton,
-  check:checked:hover .titlebar button.titlebutton,
-  .titlebar check:checked:hover button.titlebutton {
+  treeview.check:checked:hover button.flat, treeview.check:checked:hover button.sidebar-button, treeview.check:checked:hover headerbar button.titlebutton, headerbar treeview.check:checked:hover button.titlebutton,
+  treeview.check:checked:hover .titlebar button.titlebutton,
+  .titlebar treeview.check:checked:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:checked:hover:selected, textview text check:checked:hover:selected, iconview check:checked:hover:selected,
+.view treeview.check:checked:hover:selected, textview text treeview.check:checked:hover:selected, iconview treeview.check:checked:hover:selected,
 row:selected check:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-hover.png"), url("assets/selected-checkbox-checked-hover@2.png")); }
 
-check:checked:active {
+treeview.check:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active.png"), url("assets/checkbox-checked-active@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  check:checked:active button.flat, check:checked:active button.sidebar-button, check:checked:active headerbar button.titlebutton, headerbar check:checked:active button.titlebutton,
-  check:checked:active .titlebar button.titlebutton,
-  .titlebar check:checked:active button.titlebutton {
+  treeview.check:checked:active button.flat, treeview.check:checked:active button.sidebar-button, treeview.check:checked:active headerbar button.titlebutton, headerbar treeview.check:checked:active button.titlebutton,
+  treeview.check:checked:active .titlebar button.titlebutton,
+  .titlebar treeview.check:checked:active button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:checked:active:selected, textview text check:checked:active:selected, iconview check:checked:active:selected,
+.view treeview.check:checked:active:selected, textview text treeview.check:checked:active:selected, iconview treeview.check:checked:active:selected,
 row:selected check:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-active.png"), url("assets/selected-checkbox-checked-active@2.png")); }
 
-check:backdrop:checked {
+treeview.check:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop.png"), url("assets/checkbox-checked-backdrop@2.png"));
   -gtk-icon-shadow: none; }
-  check:backdrop:checked button.flat, check:backdrop:checked button.sidebar-button, check:backdrop:checked headerbar button.titlebutton, headerbar check:backdrop:checked button.titlebutton,
-  check:backdrop:checked .titlebar button.titlebutton,
-  .titlebar check:backdrop:checked button.titlebutton {
+  treeview.check:backdrop:checked button.flat, treeview.check:backdrop:checked button.sidebar-button, treeview.check:backdrop:checked headerbar button.titlebutton, headerbar treeview.check:backdrop:checked button.titlebutton,
+  treeview.check:backdrop:checked .titlebar button.titlebutton,
+  .titlebar treeview.check:backdrop:checked button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:backdrop:checked:selected, textview text check:backdrop:checked:selected, iconview check:backdrop:checked:selected,
+.view treeview.check:backdrop:checked:selected, textview text treeview.check:backdrop:checked:selected, iconview treeview.check:backdrop:checked:selected,
 row:selected check:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-backdrop.png"), url("assets/selected-checkbox-checked-backdrop@2.png")); }
 
-check:backdrop:checked:disabled {
+treeview.check:backdrop:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-insensitive.png"), url("assets/checkbox-checked-backdrop-insensitive@2.png"));
   -gtk-icon-shadow: none; }
-  check:backdrop:checked:disabled button.flat, check:backdrop:checked:disabled button.sidebar-button, check:backdrop:checked:disabled headerbar button.titlebutton, headerbar check:backdrop:checked:disabled button.titlebutton,
-  check:backdrop:checked:disabled .titlebar button.titlebutton,
-  .titlebar check:backdrop:checked:disabled button.titlebutton {
+  treeview.check:backdrop:checked:disabled button.flat, treeview.check:backdrop:checked:disabled button.sidebar-button, treeview.check:backdrop:checked:disabled headerbar button.titlebutton, headerbar treeview.check:backdrop:checked:disabled button.titlebutton,
+  treeview.check:backdrop:checked:disabled .titlebar button.titlebutton,
+  .titlebar treeview.check:backdrop:checked:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view check:backdrop:checked:disabled:selected, textview text check:backdrop:checked:disabled:selected, iconview check:backdrop:checked:disabled:selected,
+.view treeview.check:backdrop:checked:disabled:selected, textview text treeview.check:backdrop:checked:disabled:selected, iconview treeview.check:backdrop:checked:disabled:selected,
 row:selected check:backdrop:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-backdrop-insensitive.png"), url("assets/selected-checkbox-checked-backdrop-insensitive@2.png")); }
 
-menu menuitem check {
-  color: #666a6b;
-  -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
-  -gtk-icon-shadow: none; }
-  menu menuitem check:hover, menu menuitem check:disabled {
-    -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
-    -gtk-icon-shadow: none; }
-  menu menuitem check:checked, menu menuitem check:checked:hover, menu menuitem check:checked:disabled {
-    -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic");
-    -gtk-icon-shadow: none; }
-  menu menuitem check:indeterminate, menu menuitem check:indeterminate:hover, menu menuitem check:indeterminate:disabled {
-    -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic");
-    -gtk-icon-shadow: none; }
-  menu menuitem check:hover {
-    color: #ffffff; }
-  menu menuitem check:disabled {
-    color: #babbbb; }
-
-radio {
+treeview.radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked.png"), url("assets/radio-unchecked@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  radio button.flat, radio button.sidebar-button, radio headerbar button.titlebutton, headerbar radio button.titlebutton,
-  radio .titlebar button.titlebutton,
-  .titlebar radio button.titlebutton {
+  treeview.radio button.flat, treeview.radio button.sidebar-button, treeview.radio headerbar button.titlebutton, headerbar treeview.radio button.titlebutton,
+  treeview.radio .titlebar button.titlebutton,
+  .titlebar treeview.radio button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:selected, textview text radio:selected, iconview radio:selected,
+.view treeview.radio:selected, textview text treeview.radio:selected, iconview treeview.radio:selected,
 row:selected radio {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked.png"), url("assets/selected-radio-unchecked@2.png")); }
 
-radio:hover {
+treeview.radio:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-hover.png"), url("assets/radio-unchecked-hover@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  radio:hover button.flat, radio:hover button.sidebar-button, radio:hover headerbar button.titlebutton, headerbar radio:hover button.titlebutton,
-  radio:hover .titlebar button.titlebutton,
-  .titlebar radio:hover button.titlebutton {
+  treeview.radio:hover button.flat, treeview.radio:hover button.sidebar-button, treeview.radio:hover headerbar button.titlebutton, headerbar treeview.radio:hover button.titlebutton,
+  treeview.radio:hover .titlebar button.titlebutton,
+  .titlebar treeview.radio:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:hover:selected, textview text radio:hover:selected, iconview radio:hover:selected,
+.view treeview.radio:hover:selected, textview text treeview.radio:hover:selected, iconview treeview.radio:hover:selected,
 row:selected radio:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked-hover.png"), url("assets/selected-radio-unchecked-hover@2.png")); }
 
-radio:active {
+treeview.radio:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-active.png"), url("assets/radio-unchecked-active@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  radio:active button.flat, radio:active button.sidebar-button, radio:active headerbar button.titlebutton, headerbar radio:active button.titlebutton,
-  radio:active .titlebar button.titlebutton,
-  .titlebar radio:active button.titlebutton {
+  treeview.radio:active button.flat, treeview.radio:active button.sidebar-button, treeview.radio:active headerbar button.titlebutton, headerbar treeview.radio:active button.titlebutton,
+  treeview.radio:active .titlebar button.titlebutton,
+  .titlebar treeview.radio:active button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:active:selected, textview text radio:active:selected, iconview radio:active:selected,
+.view treeview.radio:active:selected, textview text treeview.radio:active:selected, iconview treeview.radio:active:selected,
 row:selected radio:active {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked-active.png"), url("assets/selected-radio-unchecked-active@2.png")); }
 
-radio:disabled {
+treeview.radio:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive.png"), url("assets/radio-unchecked-insensitive@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  radio:disabled button.flat, radio:disabled button.sidebar-button, radio:disabled headerbar button.titlebutton, headerbar radio:disabled button.titlebutton,
-  radio:disabled .titlebar button.titlebutton,
-  .titlebar radio:disabled button.titlebutton {
+  treeview.radio:disabled button.flat, treeview.radio:disabled button.sidebar-button, treeview.radio:disabled headerbar button.titlebutton, headerbar treeview.radio:disabled button.titlebutton,
+  treeview.radio:disabled .titlebar button.titlebutton,
+  .titlebar treeview.radio:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:disabled:selected, textview text radio:disabled:selected, iconview radio:disabled:selected,
+.view treeview.radio:disabled:selected, textview text treeview.radio:disabled:selected, iconview treeview.radio:disabled:selected,
 row:selected radio:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked-insensitive.png"), url("assets/selected-radio-unchecked-insensitive@2.png")); }
 
-radio:backdrop {
+treeview.radio:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop.png"), url("assets/radio-unchecked-backdrop@2.png"));
   -gtk-icon-shadow: none; }
-  radio:backdrop button.flat, radio:backdrop button.sidebar-button, radio:backdrop headerbar button.titlebutton, headerbar radio:backdrop button.titlebutton,
-  radio:backdrop .titlebar button.titlebutton,
-  .titlebar radio:backdrop button.titlebutton {
+  treeview.radio:backdrop button.flat, treeview.radio:backdrop button.sidebar-button, treeview.radio:backdrop headerbar button.titlebutton, headerbar treeview.radio:backdrop button.titlebutton,
+  treeview.radio:backdrop .titlebar button.titlebutton,
+  .titlebar treeview.radio:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:backdrop:selected, textview text radio:backdrop:selected, iconview radio:backdrop:selected,
+.view treeview.radio:backdrop:selected, textview text treeview.radio:backdrop:selected, iconview treeview.radio:backdrop:selected,
 row:selected radio:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked-backdrop.png"), url("assets/selected-radio-unchecked-backdrop@2.png")); }
 
-radio:backdrop:disabled {
+treeview.radio:backdrop:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-backdrop-insensitive.png"), url("assets/radio-unchecked-backdrop-insensitive@2.png"));
   -gtk-icon-shadow: none; }
-  radio:backdrop:disabled button.flat, radio:backdrop:disabled button.sidebar-button, radio:backdrop:disabled headerbar button.titlebutton, headerbar radio:backdrop:disabled button.titlebutton,
-  radio:backdrop:disabled .titlebar button.titlebutton,
-  .titlebar radio:backdrop:disabled button.titlebutton {
+  treeview.radio:backdrop:disabled button.flat, treeview.radio:backdrop:disabled button.sidebar-button, treeview.radio:backdrop:disabled headerbar button.titlebutton, headerbar treeview.radio:backdrop:disabled button.titlebutton,
+  treeview.radio:backdrop:disabled .titlebar button.titlebutton,
+  .titlebar treeview.radio:backdrop:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:backdrop:disabled:selected, textview text radio:backdrop:disabled:selected, iconview radio:backdrop:disabled:selected,
+.view treeview.radio:backdrop:disabled:selected, textview text treeview.radio:backdrop:disabled:selected, iconview treeview.radio:backdrop:disabled:selected,
 row:selected radio:backdrop:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked-backdrop-insensitive.png"), url("assets/selected-radio-unchecked-backdrop-insensitive@2.png")); }
 
-radio:indeterminate {
+treeview.radio:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed.png"), url("assets/radio-mixed@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  radio:indeterminate button.flat, radio:indeterminate button.sidebar-button, radio:indeterminate headerbar button.titlebutton, headerbar radio:indeterminate button.titlebutton,
-  radio:indeterminate .titlebar button.titlebutton,
-  .titlebar radio:indeterminate button.titlebutton {
+  treeview.radio:indeterminate button.flat, treeview.radio:indeterminate button.sidebar-button, treeview.radio:indeterminate headerbar button.titlebutton, headerbar treeview.radio:indeterminate button.titlebutton,
+  treeview.radio:indeterminate .titlebar button.titlebutton,
+  .titlebar treeview.radio:indeterminate button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:indeterminate:selected, textview text radio:indeterminate:selected, iconview radio:indeterminate:selected,
+.view treeview.radio:indeterminate:selected, textview text treeview.radio:indeterminate:selected, iconview treeview.radio:indeterminate:selected,
 row:selected radio:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed.png"), url("assets/selected-radio-mixed@2.png")); }
 
-radio:indeterminate:hover {
+treeview.radio:indeterminate:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-hover.png"), url("assets/radio-mixed-hover@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  radio:indeterminate:hover button.flat, radio:indeterminate:hover button.sidebar-button, radio:indeterminate:hover headerbar button.titlebutton, headerbar radio:indeterminate:hover button.titlebutton,
-  radio:indeterminate:hover .titlebar button.titlebutton,
-  .titlebar radio:indeterminate:hover button.titlebutton {
+  treeview.radio:indeterminate:hover button.flat, treeview.radio:indeterminate:hover button.sidebar-button, treeview.radio:indeterminate:hover headerbar button.titlebutton, headerbar treeview.radio:indeterminate:hover button.titlebutton,
+  treeview.radio:indeterminate:hover .titlebar button.titlebutton,
+  .titlebar treeview.radio:indeterminate:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:indeterminate:hover:selected, textview text radio:indeterminate:hover:selected, iconview radio:indeterminate:hover:selected,
+.view treeview.radio:indeterminate:hover:selected, textview text treeview.radio:indeterminate:hover:selected, iconview treeview.radio:indeterminate:hover:selected,
 row:selected radio:indeterminate:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed-hover.png"), url("assets/selected-radio-mixed-hover@2.png")); }
 
-radio:indeterminate:selected {
+treeview.radio:indeterminate:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png"), url("assets/radio-mixed-active@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  radio:indeterminate:selected button.flat, radio:indeterminate:selected button.sidebar-button, radio:indeterminate:selected headerbar button.titlebutton, headerbar radio:indeterminate:selected button.titlebutton,
-  radio:indeterminate:selected .titlebar button.titlebutton,
-  .titlebar radio:indeterminate:selected button.titlebutton {
+  treeview.radio:indeterminate:selected button.flat, treeview.radio:indeterminate:selected button.sidebar-button, treeview.radio:indeterminate:selected headerbar button.titlebutton, headerbar treeview.radio:indeterminate:selected button.titlebutton,
+  treeview.radio:indeterminate:selected .titlebar button.titlebutton,
+  .titlebar treeview.radio:indeterminate:selected button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:indeterminate:selected:selected, textview text radio:indeterminate:selected:selected, iconview radio:indeterminate:selected:selected,
+.view treeview.radio:indeterminate:selected:selected, textview text treeview.radio:indeterminate:selected:selected, iconview treeview.radio:indeterminate:selected:selected,
 row:selected radio:indeterminate:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed-active.png"), url("assets/selected-radio-mixed-active@2.png")); }
 
-radio:indeterminate:backdrop {
+treeview.radio:indeterminate:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop.png"), url("assets/radio-mixed-backdrop@2.png"));
   -gtk-icon-shadow: none; }
-  radio:indeterminate:backdrop button.flat, radio:indeterminate:backdrop button.sidebar-button, radio:indeterminate:backdrop headerbar button.titlebutton, headerbar radio:indeterminate:backdrop button.titlebutton,
-  radio:indeterminate:backdrop .titlebar button.titlebutton,
-  .titlebar radio:indeterminate:backdrop button.titlebutton {
+  treeview.radio:indeterminate:backdrop button.flat, treeview.radio:indeterminate:backdrop button.sidebar-button, treeview.radio:indeterminate:backdrop headerbar button.titlebutton, headerbar treeview.radio:indeterminate:backdrop button.titlebutton,
+  treeview.radio:indeterminate:backdrop .titlebar button.titlebutton,
+  .titlebar treeview.radio:indeterminate:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:indeterminate:backdrop:selected, textview text radio:indeterminate:backdrop:selected, iconview radio:indeterminate:backdrop:selected,
+.view treeview.radio:indeterminate:backdrop:selected, textview text treeview.radio:indeterminate:backdrop:selected, iconview treeview.radio:indeterminate:backdrop:selected,
 row:selected radio:indeterminate:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed-backdrop.png"), url("assets/selected-radio-mixed-backdrop@2.png")); }
 
-radio:indeterminate:disabled {
+treeview.radio:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive.png"), url("assets/radio-mixed-insensitive@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  radio:indeterminate:disabled button.flat, radio:indeterminate:disabled button.sidebar-button, radio:indeterminate:disabled headerbar button.titlebutton, headerbar radio:indeterminate:disabled button.titlebutton,
-  radio:indeterminate:disabled .titlebar button.titlebutton,
-  .titlebar radio:indeterminate:disabled button.titlebutton {
+  treeview.radio:indeterminate:disabled button.flat, treeview.radio:indeterminate:disabled button.sidebar-button, treeview.radio:indeterminate:disabled headerbar button.titlebutton, headerbar treeview.radio:indeterminate:disabled button.titlebutton,
+  treeview.radio:indeterminate:disabled .titlebar button.titlebutton,
+  .titlebar treeview.radio:indeterminate:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:indeterminate:disabled:selected, textview text radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected,
+.view treeview.radio:indeterminate:disabled:selected, textview text treeview.radio:indeterminate:disabled:selected, iconview treeview.radio:indeterminate:disabled:selected,
 row:selected radio:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed-insensitive.png"), url("assets/selected-radio-mixed-insensitive@2.png")); }
 
-radio:indeterminate:disabled:backdrop {
+treeview.radio:indeterminate:disabled:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-backdrop-insensitive.png"), url("assets/radio-mixed-backdrop-insensitive@2.png"));
   -gtk-icon-shadow: none; }
-  radio:indeterminate:disabled:backdrop button.flat, radio:indeterminate:disabled:backdrop button.sidebar-button, radio:indeterminate:disabled:backdrop headerbar button.titlebutton, headerbar radio:indeterminate:disabled:backdrop button.titlebutton,
-  radio:indeterminate:disabled:backdrop .titlebar button.titlebutton,
-  .titlebar radio:indeterminate:disabled:backdrop button.titlebutton {
+  treeview.radio:indeterminate:disabled:backdrop button.flat, treeview.radio:indeterminate:disabled:backdrop button.sidebar-button, treeview.radio:indeterminate:disabled:backdrop headerbar button.titlebutton, headerbar treeview.radio:indeterminate:disabled:backdrop button.titlebutton,
+  treeview.radio:indeterminate:disabled:backdrop .titlebar button.titlebutton,
+  .titlebar treeview.radio:indeterminate:disabled:backdrop button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:indeterminate:disabled:backdrop:selected, textview text radio:indeterminate:disabled:backdrop:selected, iconview radio:indeterminate:disabled:backdrop:selected,
+.view treeview.radio:indeterminate:disabled:backdrop:selected, textview text treeview.radio:indeterminate:disabled:backdrop:selected, iconview treeview.radio:indeterminate:disabled:backdrop:selected,
 row:selected radio:indeterminate:disabled:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed-backdrop-insensitive.png"), url("assets/selected-radio-mixed-backdrop-insensitive@2.png")); }
 
-radio:checked {
+treeview.radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked.png"), url("assets/radio-checked@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  radio:checked button.flat, radio:checked button.sidebar-button, radio:checked headerbar button.titlebutton, headerbar radio:checked button.titlebutton,
-  radio:checked .titlebar button.titlebutton,
-  .titlebar radio:checked button.titlebutton {
+  treeview.radio:checked button.flat, treeview.radio:checked button.sidebar-button, treeview.radio:checked headerbar button.titlebutton, headerbar treeview.radio:checked button.titlebutton,
+  treeview.radio:checked .titlebar button.titlebutton,
+  .titlebar treeview.radio:checked button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:checked:selected, textview text radio:checked:selected, iconview radio:checked:selected,
+.view treeview.radio:checked:selected, textview text treeview.radio:checked:selected, iconview treeview.radio:checked:selected,
 row:selected radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked.png"), url("assets/selected-radio-checked@2.png")); }
 
-radio:checked:disabled {
+treeview.radio:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive.png"), url("assets/radio-checked-insensitive@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  radio:checked:disabled button.flat, radio:checked:disabled button.sidebar-button, radio:checked:disabled headerbar button.titlebutton, headerbar radio:checked:disabled button.titlebutton,
-  radio:checked:disabled .titlebar button.titlebutton,
-  .titlebar radio:checked:disabled button.titlebutton {
+  treeview.radio:checked:disabled button.flat, treeview.radio:checked:disabled button.sidebar-button, treeview.radio:checked:disabled headerbar button.titlebutton, headerbar treeview.radio:checked:disabled button.titlebutton,
+  treeview.radio:checked:disabled .titlebar button.titlebutton,
+  .titlebar treeview.radio:checked:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:checked:disabled:selected, textview text radio:checked:disabled:selected, iconview radio:checked:disabled:selected,
+.view treeview.radio:checked:disabled:selected, textview text treeview.radio:checked:disabled:selected, iconview treeview.radio:checked:disabled:selected,
 row:selected radio:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-insensitive.png"), url("assets/selected-radio-checked-insensitive@2.png")); }
 
-radio:checked:hover {
+treeview.radio:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-hover.png"), url("assets/radio-checked-hover@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  radio:checked:hover button.flat, radio:checked:hover button.sidebar-button, radio:checked:hover headerbar button.titlebutton, headerbar radio:checked:hover button.titlebutton,
-  radio:checked:hover .titlebar button.titlebutton,
-  .titlebar radio:checked:hover button.titlebutton {
+  treeview.radio:checked:hover button.flat, treeview.radio:checked:hover button.sidebar-button, treeview.radio:checked:hover headerbar button.titlebutton, headerbar treeview.radio:checked:hover button.titlebutton,
+  treeview.radio:checked:hover .titlebar button.titlebutton,
+  .titlebar treeview.radio:checked:hover button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:checked:hover:selected, textview text radio:checked:hover:selected, iconview radio:checked:hover:selected,
+.view treeview.radio:checked:hover:selected, textview text treeview.radio:checked:hover:selected, iconview treeview.radio:checked:hover:selected,
 row:selected radio:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-hover.png"), url("assets/selected-radio-checked-hover@2.png")); }
 
-radio:checked:active {
+treeview.radio:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-active.png"), url("assets/radio-checked-active@2.png"));
   -gtk-icon-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
-  radio:checked:active button.flat, radio:checked:active button.sidebar-button, radio:checked:active headerbar button.titlebutton, headerbar radio:checked:active button.titlebutton,
-  radio:checked:active .titlebar button.titlebutton,
-  .titlebar radio:checked:active button.titlebutton {
+  treeview.radio:checked:active button.flat, treeview.radio:checked:active button.sidebar-button, treeview.radio:checked:active headerbar button.titlebutton, headerbar treeview.radio:checked:active button.titlebutton,
+  treeview.radio:checked:active .titlebar button.titlebutton,
+  .titlebar treeview.radio:checked:active button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:checked:active:selected, textview text radio:checked:active:selected, iconview radio:checked:active:selected,
+.view treeview.radio:checked:active:selected, textview text treeview.radio:checked:active:selected, iconview treeview.radio:checked:active:selected,
 row:selected radio:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-active.png"), url("assets/selected-radio-checked-active@2.png")); }
 
-radio:backdrop:checked {
+treeview.radio:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop.png"), url("assets/radio-checked-backdrop@2.png"));
   -gtk-icon-shadow: none; }
-  radio:backdrop:checked button.flat, radio:backdrop:checked button.sidebar-button, radio:backdrop:checked headerbar button.titlebutton, headerbar radio:backdrop:checked button.titlebutton,
-  radio:backdrop:checked .titlebar button.titlebutton,
-  .titlebar radio:backdrop:checked button.titlebutton {
+  treeview.radio:backdrop:checked button.flat, treeview.radio:backdrop:checked button.sidebar-button, treeview.radio:backdrop:checked headerbar button.titlebutton, headerbar treeview.radio:backdrop:checked button.titlebutton,
+  treeview.radio:backdrop:checked .titlebar button.titlebutton,
+  .titlebar treeview.radio:backdrop:checked button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:backdrop:checked:selected, textview text radio:backdrop:checked:selected, iconview radio:backdrop:checked:selected,
+.view treeview.radio:backdrop:checked:selected, textview text treeview.radio:backdrop:checked:selected, iconview treeview.radio:backdrop:checked:selected,
 row:selected radio:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-backdrop.png"), url("assets/selected-radio-checked-backdrop@2.png")); }
 
-radio:backdrop:checked:disabled {
+treeview.radio:backdrop:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-backdrop-insensitive.png"), url("assets/radio-checked-backdrop-insensitive@2.png"));
   -gtk-icon-shadow: none; }
-  radio:backdrop:checked:disabled button.flat, radio:backdrop:checked:disabled button.sidebar-button, radio:backdrop:checked:disabled headerbar button.titlebutton, headerbar radio:backdrop:checked:disabled button.titlebutton,
-  radio:backdrop:checked:disabled .titlebar button.titlebutton,
-  .titlebar radio:backdrop:checked:disabled button.titlebutton {
+  treeview.radio:backdrop:checked:disabled button.flat, treeview.radio:backdrop:checked:disabled button.sidebar-button, treeview.radio:backdrop:checked:disabled headerbar button.titlebutton, headerbar treeview.radio:backdrop:checked:disabled button.titlebutton,
+  treeview.radio:backdrop:checked:disabled .titlebar button.titlebutton,
+  .titlebar treeview.radio:backdrop:checked:disabled button.titlebutton {
     -gtk-icon-shadow: none; }
 
-.view radio:backdrop:checked:disabled:selected, textview text radio:backdrop:checked:disabled:selected, iconview radio:backdrop:checked:disabled:selected,
+.view treeview.radio:backdrop:checked:disabled:selected, textview text treeview.radio:backdrop:checked:disabled:selected, iconview treeview.radio:backdrop:checked:disabled:selected,
 row:selected radio:backdrop:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-backdrop-insensitive.png"), url("assets/selected-radio-checked-backdrop-insensitive@2.png")); }
 
-menu menuitem radio {
-  color: #666a6b;
-  -gtk-icon-source: -gtk-icontheme("radio-symbolic");
-  -gtk-icon-shadow: none; }
-  menu menuitem radio:hover, menu menuitem radio:disabled {
-    -gtk-icon-source: -gtk-icontheme("radio-symbolic");
-    -gtk-icon-shadow: none; }
-  menu menuitem radio:checked, menu menuitem radio:checked:hover, menu menuitem radio:checked:disabled {
-    -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic");
-    -gtk-icon-shadow: none; }
-  menu menuitem radio:indeterminate, menu menuitem radio:indeterminate:hover, menu menuitem radio:indeterminate:disabled {
-    -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic");
-    -gtk-icon-shadow: none; }
-  menu menuitem radio:hover {
-    color: #ffffff; }
-  menu menuitem radio:disabled {
-    color: #babbbb; }
-
 .view.check, textview text.check, iconview.check, .view.radio, textview text.radio, iconview.radio,
 row .check, row .radio {
   -gtk-icon-shadow: none; }
@@ -3218,14 +3182,108 @@ checkbutton.text-button, radiobutton.text-button {
     checkbutton.text-button:disabled:backdrop, checkbutton.text-button:disabled:active:backdrop, checkbutton.text-button:disabled:indeterminate:backdrop, radiobutton.text-button:disabled:backdrop, radiobutton.text-button:disabled:active:backdrop, radiobutton.text-button:disabled:indeterminate:backdrop {
       color: #c3c3c0; }
 
-radiobutton radio,
-checkbutton check {
-  min-width: 16px;
-  min-height: 16px;
-  margin: 0 2px 0 2px; }
-  radiobutton radio:only-child,
-  checkbutton check:only-child {
+check,
+radio {
+  margin: 0 4px;
+  min-height: 14px;
+  min-width: 14px;
+  border: 1px solid;
+  -gtk-icon-source: none;
+  color: #2e3436;
+  outline-color: rgba(46, 52, 54, 0.3);
+  border-color: #9d9d99;
+  background-image: linear-gradient(to bottom, #e8e8e7, #dededd 60%, #cfcfcd);
+  text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+  -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.8), 0 1px rgba(255, 255, 255, 0); }
+  check:only-child,
+  radio:only-child {
     margin: 0; }
+  check:hover,
+  radio:hover {
+    color: #2e3436;
+    outline-color: rgba(46, 52, 54, 0.3);
+    border-color: #9d9d99;
+    /*
+    background-image: linear-gradient(to bottom,
+                                      lighten($c, 16%),
+                                      lighten($c, 6%) 40%,
+                                      lighten($c, 2%));
+    */
+    background-image: linear-gradient(to bottom, #f7f7f7, #e8e8e7 60%, #dededd);
+    text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+    -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+    box-shadow: inset 0 1px white, 0 1px rgba(255, 255, 255, 0); }
+  check:active,
+  radio:active {
+    color: #2e3436;
+    outline-color: rgba(46, 52, 54, 0.3);
+    border-color: #9d9d99;
+    background-image: linear-gradient(to bottom, #c8c8c5, #dcdcda);
+    text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+    -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+    box-shadow: inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(255, 255, 255, 0); }
+  check:disabled,
+  radio:disabled {
+    color: #8b8e8f;
+    border-color: #9d9d99;
+    background-image: linear-gradient(to bottom, #f1f1f1);
+    text-shadow: none;
+    -gtk-icon-shadow: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    check:disabled > .label,
+    radio:disabled > .label {
+      color: inherit; }
+  check:backdrop,
+  radio:backdrop {
+    color: #8b8e8f;
+    border-color: #a5a5a1;
+    background-image: linear-gradient(to bottom, #e8e8e7);
+    text-shadow: none;
+    -gtk-icon-shadow: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    check:backdrop:disabled,
+    radio:backdrop:disabled {
+      color: #c3c3c0;
+      border-color: #a5a5a1;
+      background-image: linear-gradient(to bottom, #f1f1f1);
+      text-shadow: none;
+      -gtk-icon-shadow: none;
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+      check:backdrop:disabled > .label,
+      radio:backdrop:disabled > .label {
+        color: inherit; }
+  row:selected check, row:selected
+  radio {
+    border-color: #184472; }
+  menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem
+  radio, menu menuitem
+  radio:hover, menu menuitem
+  radio:disabled {
+    min-height: 14px;
+    min-width: 14px;
+    background-image: none;
+    background-color: transparent;
+    box-shadow: none;
+    -gtk-icon-shadow: none;
+    color: inherit;
+    border-color: currentColor; }
+
+check {
+  border-radius: 3px;
+  -gtk-icon-theme: "adwaita-private"; }
+  check:checked {
+    -gtk-icon-source: -gtk-icontheme("check-symbolic"); }
+  check:indeterminate {
+    -gtk-icon-source: -gtk-icontheme("dash-symbolic"); }
+
+radio {
+  border-radius: 100%;
+  -gtk-icon-theme: "adwaita-private"; }
+  radio:checked {
+    -gtk-icon-source: -gtk-icontheme("bullet-symbolic"); }
+  radio:indeterminate {
+    -gtk-icon-source: -gtk-icontheme("dash-symbolic"); }
 
 /************
  * GtkScale *
