diff --git a/theme/Just-Dark/gtk-3.0/gtk-widgets-assets-dark.css b/theme/Just-Dark/gtk-3.0/gtk-widgets-assets-dark.css
deleted file mode 100644
--- a/theme/Just-Dark/gtk-3.0/gtk-widgets-assets-dark.css
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************
- * Pane separators *
- *******************/
-.pane-separator {
-  background-image: url("assets/pane-separator-grip-dark.svg");
-  background-repeat: no-repeat;
-  background-position: center;
-}
-
-.pane-separator:hover {
-  background-image: url("assets/pane-separator-grip-prelight-dark.svg");
-}
-
-.pane-separator.vertical {
-  background-image: url("assets/pane-separator-grip-vertical-dark.svg");
-}
-
-.pane-separator.vertical:hover {
-  background-image: url("assets/pane-separator-grip-vertical-prelight-dark.svg");
-}
-
-/*************************
- * Header bar separator  *
- *************************/
-.titlebar.selection-mode .header-bar-separator, GtkCalendar.selection-mode.header .header-bar-separator, 
-.titlebar.selection-mode > GtkBox > .separator.vertical, GtkCalendar.selection-mode.header > GtkBox > .separator.vertical,
-.header-bar.selection-mode .header-bar-separator,
-.header-bar.selection-mode > GtkBox > .separator.vertical {
-  -GtkWidget-wide-separators: 1;
-  -GtkWidget-separator-width: 9px;
-  background: transparent;
-  border-width: 0 4px 0 1px;
-  border-style: solid;
-  border-color: transparent;
-  border-image: -gtk-scaled(url("assets/header-separator-selectionmode-dark.png"),url("assets/header-separator-selectionmode-dark@2.png")) 0 4 0 1 / 0 4px 0 1px stretch; }
-
-.titlebar.selection-mode .left .header-bar-separator, 
-.titlebar.selection-mode > GtkBox.left > .separator.vertical, 
-.header-bar.selection-mode .left .header-bar-separator,
-.header-bar.selection-mode > GtkBox.left > .separator.vertical,
-.titlebar.selection-mode .right:dir(rtl) .header-bar-separator, 
-.titlebar.selection-mode > GtkBox.right:dir(rtl) > .separator.vertical, 
-.header-bar.selection-mode .right:dir(rtl) .header-bar-separator,
-.header-bar.selection-mode > GtkBox.right:dir(rtl) > .separator.vertical {
-  -GtkWidget-wide-separators: 1;
-  -GtkWidget-separator-width: 9px;
-  background: transparent;
-  border-width: 0 1px 0 4px;
-  border-style: solid;
-  border-color: transparent;
-  border-image: -gtk-scaled(url("assets/header-separator-selectionmode-left-dark.png"),url("assets/header-separator-selectionmode-left-dark@2.png")) 0 1 0 4 / 0 1px 0 4px stretch; }
-
-.titlebar .header-bar-separator, GtkCalendar.header .header-bar-separator, 
-.titlebar > GtkBox > .separator.vertical, GtkCalendar.header > GtkBox > .separator.vertical,
-.header-bar .header-bar-separator,
-.header-bar > GtkBox > .separator.vertical, .toolbar .separator {
-  -GtkWidget-wide-separators: 1;
-  -GtkWidget-separator-width: 9px;
-  background: transparent;
-  border-width: 0 4px 0 1px;
-  border-style: solid;
-  border-color: transparent;
-  border-image: -gtk-scaled(url("assets/header-separator-dark.png"),url("assets/header-separator-dark@2.png")) 0 4 0 1 / 0 4px 0 1px stretch; }
-
-.titlebar .left .header-bar-separator, 
-.titlebar > GtkBox.left > .separator.vertical, 
-.header-bar .left .header-bar-separator,
-.header-bar > GtkBox.left > .separator.vertical,
-.titlebar .right:dir(rtl) .header-bar-separator, 
-.titlebar > GtkBox.right:dir(rtl) > .separator.vertical, 
-.header-bar .right:dir(rtl) .header-bar-separator,
-.header-bar > GtkBox.right:dir(rtl) > .separator.vertical {
-  -GtkWidget-wide-separators: 1;
-  -GtkWidget-separator-width: 9px;
-  background: transparent;
-  border-width: 0 1px 0 4px;
-  border-style: solid;
-  border-color: transparent;
-  border-image: -gtk-scaled(url("assets/header-separator-left-dark.png"),url("assets/header-separator-left-dark@2.png")) 0 1 0 4 / 0 1px 0 4px stretch; }
-
-/*********************
- * GtkScale's slider *
- *********************/
-.scale.slider {
-  background-image: -gtk-scaled(url("assets/slider-dark.png"),url("assets/slider-dark@2.png"));
-}
-
-.list-row:selected .scale.slider {
-  background-image: -gtk-scaled(url("assets/slider-selected-dark.png"),url("assets/slider-selected-dark@2.png"));
-}
-
-.scale.slider:hover {
-  background-image: -gtk-scaled(url("assets/slider-hover-dark.png"),url("assets/slider-hover-dark@2.png"));
-}
-
-.list-row:selected .scale.slider:hover {
-  background-image: -gtk-scaled(url("assets/slider-hover-selected-dark.png"),url("assets/slider-hover-selected-dark@2.png"));
-}
-
-.scale.slider:active,
-.scale.slider:active:hover {
-  background-image: -gtk-scaled(url("assets/slider-active-dark.png"),url("assets/slider-active-dark@2.png"));
-}
-
-.list-row:selected .scale.slider:active,
-.list-row:selected .scale.slider:active:hover {
-  background-image: -gtk-scaled(url("assets/slider-active-selected-dark.png"),url("assets/slider-active-selected-dark@2.png"));
-}
-
-.scale.slider:insensitive,
-.scale.slider:insensitive:hover {
-  background-image: -gtk-scaled(url("assets/slider-insensitive-dark.png"),url("assets/slider-insensitive-dark@2.png"));
-}
-
-.list-row:selected .scale.slider:insensitive,
-.list-row:selected .scale.slider:insensitive:hover {
-  background-image: -gtk-scaled(url("assets/slider-insensitive-selected-dark.png"),url("assets/slider-insensitive-selected-dark@2.png"));
-}
-
-.osd .scale.slider {
-  background-image: -gtk-scaled(url("assets/slider-dark.png"),url("assets/slider-dark@2.png"));
-}
-
-.osd .scale.slider:hover {
-  background-image: -gtk-scaled(url("assets/slider-hover-dark.png"),url("assets/slider-hover-dark@2.png"));
-}
-
-.osd .scale.slider:active,
-.osd .scale.slider:active:hover {
-  background-image: -gtk-scaled(url("assets/slider-active-dark.png"),url("assets/slider-active-dark@2.png"));
-}
-
-.osd .scale.slider:insensitive,
-.osd .scale.slider:insensitive:hover {
-  background-image: -gtk-scaled(url("assets/slider-insensitive-dark.png"),url("assets/slider-insensitive-dark@2.png"));
-}
-
-/*Scrollbar*/
-.scrollbar.trough {
-  border-image: -gtk-scaled(url("assets/scrollbar-trough-dark.png"),url("assets/scrollbar-trough-dark@2.png"))  8 7 8 8 / 8px 7px 8px 8px;
-	border-width: 8px 7px 8px 8px;
-  background-color: transparent;
-  border-radius: 0;
-}
-
-.scrollbar.trough.horizontal {
-  border-image: -gtk-scaled(url("assets/scrollbar-trough-horizontal-dark.png"),url("assets/scrollbar-trough-horizontal-dark@2.png")) 8 8 7 8 / 8px 8px 7px 8px;
-  border-width: 8px 8px 7px 8px;
-}
-
-.scrollbar.slider {
-  border-image: -gtk-scaled(url("assets/scrollbar-slider-dark.png"),url("assets/scrollbar-slider-dark@2.png")) 8 7 8 8 / 8px 7px 8px 8px;
-  border-width: 8px 7px 8px 8px;
-  background-color: transparent;
-  border-radius: 0;
-}
-
-.scrollbar.slider.horizontal {
-  border-image: -gtk-scaled(url("assets/scrollbar-slider-horizontal-dark.png"),url("assets/scrollbar-slider-horizontal-dark@2.png")) 8 8 7 8 / 8px 8px 7px 8px;
-  border-width: 8px 8px 7px 8px;
-}
-
-.scrollbar.slider:insensitive,
-.scrollbar.slider:hover {
-  border-image: -gtk-scaled(url("assets/scrollbar-slider-hover-dark.png"),url("assets/scrollbar-slider-hover-dark@2.png")) 8 7 8 8 / 8px 7px 8px 8px;
-}
-
-.scrollbar.slider.horizontal:insensitive,
-.scrollbar.slider.horizontal:hover {
-  border-image: -gtk-scaled(url("assets/scrollbar-slider-horizontal-hover-dark.png"),url("assets/scrollbar-slider-horizontal-hover-dark@2.png")) 8 8 7 8 / 8px 8px 7px 8px;
-}
-
-.scrollbar.slider:active {
-  border-image: -gtk-scaled(url("assets/scrollbar-slider-active-dark.png"),url("assets/scrollbar-slider-active-dark@2.png")) 8 7 8 8 / 8px 7px 8px 8px;
-}
-
-.scrollbar.slider.horizontal:active {
-  border-image: -gtk-scaled(url("assets/scrollbar-slider-horizontal-active-dark.png"),url("assets/scrollbar-slider-horizontal-active-dark@2.png")) 8 8 7 8 / 8px 8px 7px 8px;
-}
-
-/*************
- * GtkSwitch *
- *************/
-GtkSwitch.trough {
-  background-image: -gtk-scaled(url("assets/switch-dark.png"),url("assets/switch-dark@2.png"));
-  background-repeat: no-repeat;
-  background-position: 0 center;
-  color: transparent;
-  border-color: transparent;
-  border-image: none;
-  border-style: none;
-  box-shadow: none;
-  text-shadow: none;
-}
-
-GtkSwitch.trough:active {
-  background-image: -gtk-scaled(url("assets/switch-active-dark.png"),url("assets/switch-active-dark@2.png"));
-}
-
-GtkSwitch.trough:insensitive {
-  background-color: transparent;
-  background-image: -gtk-scaled(url("assets/switch-insensitive-dark.png"),url("assets/switch-insensitive-dark@2.png"));
-}
-
-GtkSwitch.trough:active:insensitive {
-  background-image: -gtk-scaled(url("assets/switch-active-insensitive-dark.png"),url("assets/switch-active-insensitive-dark@2.png"));
-}
-
-GtkSwitch.slider {
-  background-image: -gtk-scaled(url("assets/switch-slider-dark.png"),url("assets/switch-slider-dark@2.png"));
-  background-repeat: no-repeat;
-  background-position: 0 center;
-}
-
-GtkSwitch.slider:insensitive {
-  background-color: transparent;
-  background-image: -gtk-scaled(url("assets/switch-slider-insensitive-dark.png"),url("assets/switch-slider-insensitive-dark@2.png"));
-  background-repeat: no-repeat;
-  background-position: 0 center;
-}
-/*
-.list-row:selected GtkSwitch.trough  {
-  background-image: -gtk-scaled(url("assets/switch-selected.png"),url("assets/switch-selected@2.png"));
-}
-
-.list-row:selected GtkSwitch.trough:active  {
-  background-image: -gtk-scaled(url("assets/switch-active-selected.png"),url("assets/switch-active-selected@2.png"));
-}
-
-.list-row:selected GtkSwitch.trough:insensitive  {
-  background-image: -gtk-scaled(url("assets/switch-insensitive-selected.png"),url("assets/switch-insensitive-selected@2.png"));
-}
-
-.list-row:selected GtkSwitch.trough:active:insensitive  {
-  background-image: -gtk-scaled(url("assets/switch-active-insensitive-selected.png"),url("assets/switch-active-insensitive-selected@2.png"));
-}*/
-
-/*************************
- * Check and Radio items *
- *************************/
-.check {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); }
-
-.view.check:selected row,
-.menuitem.check:hover,
-.list-row:selected .check {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-selected-dark.png"), url("assets/checkbox-unchecked-selected-dark@2.png")); }
-
-.check:insensitive {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); }
-
-.view.check:insensitive:selected row,
-.menuitem.check:insensitive:hover,
-.list-row:selected .check:insensitive {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-selected-dark.png"), url("assets/checkbox-unchecked-insensitive-selected-dark@2.png")); }
-
-.check:inconsistent {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); }
-
-.view.check:inconsistent:selected row,
-.menuitem.check:inconsistent:hover,
-.list-row:selected .check:inconsistent {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-selected-dark.png"), url("assets/checkbox-mixed-selected-dark@2.png")); }
-
-.check:inconsistent:insensitive {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); }
-
-.view.check:inconsistent:insensitive:selected row,
-.menuitem.check:inconsistent:insensitive:hover,
-.list-row:selected .check:inconsistent:insensitive {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-selected-dark.png"), url("assets/checkbox-mixed-selected-dark@2.png")); }
-
-.check:active, 
-.check:checked {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); }
-
-.view.check:active:selected row,
-.menuitem.check:active:hover,
-.view.check:checked:selected row,
-.menuitem.check:checked:hover,
-.list-row:selected .check:active,
-.list-row:selected .check:checked {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selected-dark.png"), url("assets/checkbox-checked-selected-dark@2.png")); }
-
-.check:active:insensitive,
-.check:checked:insensitive {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); }
-
-.view.check:active:insensitive:selected row,
-.menuitem.check:active:insensitive:hover,
-.view.check:checked:insensitive:selected row,
-.menuitem.check:checked:insensitive:hover,
-.list-row:selected .check:active:insensitive,
-.list-row:selected .check:checked:insensitive {
-  -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-selected-dark.png"), url("assets/checkbox-checked-insensitive-selected-dark@2.png")); }
-
-.radio {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); }
-
-.view.radio:selected row,
-.menuitem.radio:hover,
-.list-row:selected .radio {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-selected-dark.png"), url("assets/radio-unchecked-selected-dark@2.png")); }
-
-.radio:insensitive {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); }
-
-.view.radio:insensitive:selected row,
-.menuitem.radio:insensitive:hover,
-.list-row:selected .radio:insensitive {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-selected-dark.png"), url("assets/radio-unchecked-insensitive-selected-dark@2.png")); }
-
-.radio:inconsistent {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); }
-
-.view.radio:inconsistent:selected row,
-.menuitem.radio:inconsistent:hover,
-.list-row:selected .radio:inconsistent {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-selected-dark.png"), url("assets/radio-mixed-selected-dark@2.png")); }
-
-.radio:inconsistent:insensitive {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); }
-
-.view.radio:inconsistent:insensitive:selected row,
-.menuitem.radio:inconsistent:insensitive:hover,
-.list-row:selected .radio:inconsistent:insensitive {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-selected-dark.png"), url("assets/radio-mixed-selected-dark@2.png")); }
-
-.radio:active, 
-.radio:checked {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); }
-
-.view.radio:active:selected row,
-.menuitem.radio:active:hover,
-.view.radio:checked:selected row,
-.menuitem.radio:checked:hover,
-.list-row:selected .radio:active,
-.list-row:selected .radio:checked {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-selected-dark.png"), url("assets/radio-checked-selected-dark@2.png")); }
-
-.radio:active:insensitive,
-.radio:checked:insensitive {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); }
-
-.view.radio:active:insensitive:selected row,
-.menuitem.radio:active:insensitive:hover,
-.view.radio:checked:insensitive:selected row,
-.menuitem.radio:checked:insensitive:hover,
-.list-row:selected .radio:active:insensitive,
-.list-row:selected .radio:checked:insensitive {
-  -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-selected-dark.png"), url("assets/radio-checked-insensitive-selected-dark@2.png")); }
-
-/*Selectionmode*/
-GtkIconView.view.check,
-GtkFlowBox.view.check {
-  color: mix(@theme_fg_color, @theme_bg_color, 0.7);
-  background-image: none;
-  -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
-
-GtkIconView.view.check:hover,
-GtkFlowBox.view.check:hover {
-    color: mix(@theme_fg_color, @theme_bg_color, 0.4); }
-
-GtkIconView.view.check:active,
-GtkFlowBox.view.check:active,
-GtkIconView.view.check:checked,
-GtkFlowBox.view.check:checked {
-  color: @theme_selected_bg_color; }
-
-GtkCheckButton.text-button, GtkRadioButton.text-button {
-  padding: 1px 2px 4px;
-  outline-offset: 0; }
-  GtkCheckButton.text-button:insensitive, GtkCheckButton.text-button:insensitive:active, GtkCheckButton.text-button:insensitive:checked, GtkCheckButton.text-button:insensitive:inconsistent, GtkRadioButton.text-button:insensitive, GtkRadioButton.text-button:insensitive:active, GtkRadioButton.text-button:insensitive:checked, GtkRadioButton.text-button:insensitive:inconsistent {
-  color: @insensitive_fg_color; }
-
-.menuitem.check,
-.menuitem.radio,
-.menuitem.check:hover,
-.menuitem.radio:hover,
-.menuitem.check:insensitive,
-.menuitem.radio:insensitive,
-.menuitem.check:active,
-.menuitem.radio:active,
-.menuitem.check:checked,
-.menuitem.radio:checked,
-.cell.check,
-.cell.radio,
-.cell.check:hover,
-.cell.radio:hover,
-.cell.check:insensitive,
-.cell.radio:insensitive,
-.cell.check:active,
-.cell.radio:active,
-.cell.check:checked,
-.cell.radio:checked {
-  background-color: transparent;
-  icon-shadow: none;
-}