diff --git a/docs/TODO.md b/docs/TODO.md
index 70bbf01..d74ec62 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -3,7 +3,7 @@
 feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
 
 - [ ] Nixy
-  - [ ] Installation script (easy)
+  - [ ] Installation script ([install.sh](./scripts/install.sh) to test on a fresh install)
   - [ ] Variables-template with defaults
   - [ ] Themes
     - [ ] Upload new wallpapers
@@ -33,8 +33,7 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
   - [ ] Exclude file pattern (nodes modules, ...)
   - [ ] Auto backup when a specific usb key is plugged
 
-- [ ] Automount USB Key (And notify-send when it's done)
-  - [ ] Usb security for laptop & server, variable in variables.nix, disable for guest
+- [ ] Usb security for laptop & server, variable in variables.nix, disable for guest
 
 - [ ] Server
   - [ ] Bitcoin-git
diff --git a/home/laptop.nix b/home/laptop.nix
index 01659fd..6298d8a 100644
--- a/home/laptop.nix
+++ b/home/laptop.nix
@@ -12,22 +12,23 @@
     ./programs/qutebrowser
     ./programs/spicetify
     ./programs/zathura
+    ./programs/shell
+    ./programs/git
 
     # Scripts
     ./scripts # All scripts
 
-    # System
+    # System (Desktop environment like stuff)
     ./system/dunst
-    ./system/git
     ./system/gtk
     ./system/hyprland
-    ./system/shell
-    ./system/sops/laptop.nix # You should probably remove this line
     ./system/waybar
     ./system/wlogout
     ./system/wofi
     ./system/mime
     ./system/udiskie
+
+    ./system/sops/laptop.nix # You should probably remove this line
   ];
 
   home = {
diff --git a/home/system/git/default.nix b/home/programs/git/default.nix
similarity index 100%
rename from home/system/git/default.nix
rename to home/programs/git/default.nix
diff --git a/home/system/shell/default.nix b/home/programs/shell/default.nix
similarity index 100%
rename from home/system/shell/default.nix
rename to home/programs/shell/default.nix
diff --git a/home/system/shell/eza.nix b/home/programs/shell/eza.nix
similarity index 100%
rename from home/system/shell/eza.nix
rename to home/programs/shell/eza.nix
diff --git a/home/system/shell/fetch/default.nix b/home/programs/shell/fetch/default.nix
similarity index 100%
rename from home/system/shell/fetch/default.nix
rename to home/programs/shell/fetch/default.nix
diff --git a/home/system/shell/fetch/neofetch/default.nix b/home/programs/shell/fetch/neofetch/default.nix
similarity index 100%
rename from home/system/shell/fetch/neofetch/default.nix
rename to home/programs/shell/fetch/neofetch/default.nix
diff --git a/home/system/shell/fetch/nerdfetch/default.nix b/home/programs/shell/fetch/nerdfetch/default.nix
similarity index 100%
rename from home/system/shell/fetch/nerdfetch/default.nix
rename to home/programs/shell/fetch/nerdfetch/default.nix
diff --git a/home/system/shell/fzf.nix b/home/programs/shell/fzf.nix
similarity index 100%
rename from home/system/shell/fzf.nix
rename to home/programs/shell/fzf.nix
diff --git a/home/system/shell/lazygit.nix b/home/programs/shell/lazygit.nix
similarity index 100%
rename from home/system/shell/lazygit.nix
rename to home/programs/shell/lazygit.nix
diff --git a/home/system/shell/lf/config/colors b/home/programs/shell/lf/config/colors
similarity index 100%
rename from home/system/shell/lf/config/colors
rename to home/programs/shell/lf/config/colors
diff --git a/home/system/shell/lf/config/icons b/home/programs/shell/lf/config/icons
similarity index 100%
rename from home/system/shell/lf/config/icons
rename to home/programs/shell/lf/config/icons
diff --git a/home/system/shell/lf/default.nix b/home/programs/shell/lf/default.nix
similarity index 100%
rename from home/system/shell/lf/default.nix
rename to home/programs/shell/lf/default.nix
diff --git a/home/system/shell/starship.nix b/home/programs/shell/starship.nix
similarity index 100%
rename from home/system/shell/starship.nix
rename to home/programs/shell/starship.nix
diff --git a/home/system/shell/tmux.nix b/home/programs/shell/tmux.nix
similarity index 100%
rename from home/system/shell/tmux.nix
rename to home/programs/shell/tmux.nix
diff --git a/home/system/shell/zoxide.nix b/home/programs/shell/zoxide.nix
similarity index 100%
rename from home/system/shell/zoxide.nix
rename to home/programs/shell/zoxide.nix
diff --git a/home/system/shell/zsh.nix b/home/programs/shell/zsh.nix
similarity index 100%
rename from home/system/shell/zsh.nix
rename to home/programs/shell/zsh.nix
diff --git a/home/server.nix b/home/server.nix
index 6402592..cbf3370 100644
--- a/home/server.nix
+++ b/home/server.nix
@@ -6,13 +6,11 @@
     # Programs
     ./programs/btop
     ./programs/nvim
+    ./programs/git
+    ./programs/shell
 
     # Scripts
     ./scripts # All scripts
-
-    # System
-    ./system/git
-    ./system/shell
   ];
 
   home = {
diff --git a/home/system/gtk/default.nix b/home/system/gtk/default.nix
index 32daca5..235c138 100644
--- a/home/system/gtk/default.nix
+++ b/home/system/gtk/default.nix
@@ -32,7 +32,7 @@
   home.file = {
     ".local/share/themes/FlatColor" = {
       recursive = true;
-      source = ./gtk;
+      source = ./theme;
     };
 
     ".local/share/themes/FlatColor/colors2".text = ''
diff --git a/home/system/gtk/gtk/gtk-2.0/gtkrc b/home/system/gtk/theme/gtk-2.0/gtkrc
similarity index 100%
rename from home/system/gtk/gtk/gtk-2.0/gtkrc
rename to home/system/gtk/theme/gtk-2.0/gtkrc
diff --git a/home/system/gtk/gtk/gtk-2.0/gtkrc.base b/home/system/gtk/theme/gtk-2.0/gtkrc.base
similarity index 100%
rename from home/system/gtk/gtk/gtk-2.0/gtkrc.base
rename to home/system/gtk/theme/gtk-2.0/gtkrc.base
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/blank.png b/home/system/gtk/theme/gtk-3.0/assets/blank.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/blank.png
rename to home/system/gtk/theme/gtk-3.0/assets/blank.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/check-insensitive.png b/home/system/gtk/theme/gtk-3.0/assets/check-insensitive.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/check-insensitive.png
rename to home/system/gtk/theme/gtk-3.0/assets/check-insensitive.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/check-mixed-insensitive.png b/home/system/gtk/theme/gtk-3.0/assets/check-mixed-insensitive.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/check-mixed-insensitive.png
rename to home/system/gtk/theme/gtk-3.0/assets/check-mixed-insensitive.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/check-mixed.png b/home/system/gtk/theme/gtk-3.0/assets/check-mixed.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/check-mixed.png
rename to home/system/gtk/theme/gtk-3.0/assets/check-mixed.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/check.png b/home/system/gtk/theme/gtk-3.0/assets/check.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/check.png
rename to home/system/gtk/theme/gtk-3.0/assets/check.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/grid-selection-blank.png b/home/system/gtk/theme/gtk-3.0/assets/grid-selection-blank.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/grid-selection-blank.png
rename to home/system/gtk/theme/gtk-3.0/assets/grid-selection-blank.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/grid-selection.png b/home/system/gtk/theme/gtk-3.0/assets/grid-selection.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/grid-selection.png
rename to home/system/gtk/theme/gtk-3.0/assets/grid-selection.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-checked-hover.png b/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-checked-hover.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-checked-hover.png
rename to home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-checked-hover.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png b/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png
rename to home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-checked.png b/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-checked.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-checked.png
rename to home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-checked.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png b/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png
rename to home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png b/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png
rename to home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-mixed.png b/home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-mixed.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/menuitem-checkbox-mixed.png
rename to home/system/gtk/theme/gtk-3.0/assets/menuitem-checkbox-mixed.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/menuitem-radio-checked-hover.png b/home/system/gtk/theme/gtk-3.0/assets/menuitem-radio-checked-hover.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/menuitem-radio-checked-hover.png
rename to home/system/gtk/theme/gtk-3.0/assets/menuitem-radio-checked-hover.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/menuitem-radio-checked-insensitive.png b/home/system/gtk/theme/gtk-3.0/assets/menuitem-radio-checked-insensitive.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/menuitem-radio-checked-insensitive.png
rename to home/system/gtk/theme/gtk-3.0/assets/menuitem-radio-checked-insensitive.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/menuitem-radio-checked.png b/home/system/gtk/theme/gtk-3.0/assets/menuitem-radio-checked.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/menuitem-radio-checked.png
rename to home/system/gtk/theme/gtk-3.0/assets/menuitem-radio-checked.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/pane-separator-grip-vertical.png b/home/system/gtk/theme/gtk-3.0/assets/pane-separator-grip-vertical.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/pane-separator-grip-vertical.png
rename to home/system/gtk/theme/gtk-3.0/assets/pane-separator-grip-vertical.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/pane-separator-grip.png b/home/system/gtk/theme/gtk-3.0/assets/pane-separator-grip.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/pane-separator-grip.png
rename to home/system/gtk/theme/gtk-3.0/assets/pane-separator-grip.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/radio-checked.png b/home/system/gtk/theme/gtk-3.0/assets/radio-checked.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/radio-checked.png
rename to home/system/gtk/theme/gtk-3.0/assets/radio-checked.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/radio-insensitive.png b/home/system/gtk/theme/gtk-3.0/assets/radio-insensitive.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/radio-insensitive.png
rename to home/system/gtk/theme/gtk-3.0/assets/radio-insensitive.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/radio-unchecked.png b/home/system/gtk/theme/gtk-3.0/assets/radio-unchecked.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/radio-unchecked.png
rename to home/system/gtk/theme/gtk-3.0/assets/radio-unchecked.png
diff --git a/home/system/gtk/gtk/gtk-3.0/assets/radio.png b/home/system/gtk/theme/gtk-3.0/assets/radio.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/assets/radio.png
rename to home/system/gtk/theme/gtk-3.0/assets/radio.png
diff --git a/home/system/gtk/gtk/gtk-3.0/gnome-applications.css b/home/system/gtk/theme/gtk-3.0/gnome-applications.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/gnome-applications.css
rename to home/system/gtk/theme/gtk-3.0/gnome-applications.css
diff --git a/home/system/gtk/gtk/gtk-3.0/gtk-widgets-assets.css b/home/system/gtk/theme/gtk-3.0/gtk-widgets-assets.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/gtk-widgets-assets.css
rename to home/system/gtk/theme/gtk-3.0/gtk-widgets-assets.css
diff --git a/home/system/gtk/gtk/gtk-3.0/gtk-widgets.css b/home/system/gtk/theme/gtk-3.0/gtk-widgets.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/gtk-widgets.css
rename to home/system/gtk/theme/gtk-3.0/gtk-widgets.css
diff --git a/home/system/gtk/gtk/gtk-3.0/gtk.css b/home/system/gtk/theme/gtk-3.0/gtk.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/gtk.css
rename to home/system/gtk/theme/gtk-3.0/gtk.css
diff --git a/home/system/gtk/gtk/gtk-3.0/gtk.css.base b/home/system/gtk/theme/gtk-3.0/gtk.css.base
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/gtk.css.base
rename to home/system/gtk/theme/gtk-3.0/gtk.css.base
diff --git a/home/system/gtk/gtk/gtk-3.0/settings.ini b/home/system/gtk/theme/gtk-3.0/settings.ini
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/settings.ini
rename to home/system/gtk/theme/gtk-3.0/settings.ini
diff --git a/home/system/gtk/gtk/gtk-3.0/unity.css b/home/system/gtk/theme/gtk-3.0/unity.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/unity.css
rename to home/system/gtk/theme/gtk-3.0/unity.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/button.css b/home/system/gtk/theme/gtk-3.0/widgets/button.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/button.css
rename to home/system/gtk/theme/gtk-3.0/widgets/button.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/calendar.css b/home/system/gtk/theme/gtk-3.0/widgets/calendar.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/calendar.css
rename to home/system/gtk/theme/gtk-3.0/widgets/calendar.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/cell-row.css b/home/system/gtk/theme/gtk-3.0/widgets/cell-row.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/cell-row.css
rename to home/system/gtk/theme/gtk-3.0/widgets/cell-row.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/check-radio.css b/home/system/gtk/theme/gtk-3.0/widgets/check-radio.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/check-radio.css
rename to home/system/gtk/theme/gtk-3.0/widgets/check-radio.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/color-chooser.css b/home/system/gtk/theme/gtk-3.0/widgets/color-chooser.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/color-chooser.css
rename to home/system/gtk/theme/gtk-3.0/widgets/color-chooser.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/column-header.css b/home/system/gtk/theme/gtk-3.0/widgets/column-header.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/column-header.css
rename to home/system/gtk/theme/gtk-3.0/widgets/column-header.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/combobox.css b/home/system/gtk/theme/gtk-3.0/widgets/combobox.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/combobox.css
rename to home/system/gtk/theme/gtk-3.0/widgets/combobox.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/csd.css b/home/system/gtk/theme/gtk-3.0/widgets/csd.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/csd.css
rename to home/system/gtk/theme/gtk-3.0/widgets/csd.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/entry.css b/home/system/gtk/theme/gtk-3.0/widgets/entry.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/entry.css
rename to home/system/gtk/theme/gtk-3.0/widgets/entry.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/header-bar.css b/home/system/gtk/theme/gtk-3.0/widgets/header-bar.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/header-bar.css
rename to home/system/gtk/theme/gtk-3.0/widgets/header-bar.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/infobar.css b/home/system/gtk/theme/gtk-3.0/widgets/infobar.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/infobar.css
rename to home/system/gtk/theme/gtk-3.0/widgets/infobar.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/linked-buttons.css b/home/system/gtk/theme/gtk-3.0/widgets/linked-buttons.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/linked-buttons.css
rename to home/system/gtk/theme/gtk-3.0/widgets/linked-buttons.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/menu.css b/home/system/gtk/theme/gtk-3.0/widgets/menu.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/menu.css
rename to home/system/gtk/theme/gtk-3.0/widgets/menu.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/notebook.css b/home/system/gtk/theme/gtk-3.0/widgets/notebook.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/notebook.css
rename to home/system/gtk/theme/gtk-3.0/widgets/notebook.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/osd.css b/home/system/gtk/theme/gtk-3.0/widgets/osd.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/osd.css
rename to home/system/gtk/theme/gtk-3.0/widgets/osd.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/progress-scale.css b/home/system/gtk/theme/gtk-3.0/widgets/progress-scale.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/progress-scale.css
rename to home/system/gtk/theme/gtk-3.0/widgets/progress-scale.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/scrollbar.css b/home/system/gtk/theme/gtk-3.0/widgets/scrollbar.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/scrollbar.css
rename to home/system/gtk/theme/gtk-3.0/widgets/scrollbar.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/selection-mode.css b/home/system/gtk/theme/gtk-3.0/widgets/selection-mode.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/selection-mode.css
rename to home/system/gtk/theme/gtk-3.0/widgets/selection-mode.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/separator.css b/home/system/gtk/theme/gtk-3.0/widgets/separator.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/separator.css
rename to home/system/gtk/theme/gtk-3.0/widgets/separator.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/sidebar.css b/home/system/gtk/theme/gtk-3.0/widgets/sidebar.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/sidebar.css
rename to home/system/gtk/theme/gtk-3.0/widgets/sidebar.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/spinbutton.css b/home/system/gtk/theme/gtk-3.0/widgets/spinbutton.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/spinbutton.css
rename to home/system/gtk/theme/gtk-3.0/widgets/spinbutton.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/spinner.css b/home/system/gtk/theme/gtk-3.0/widgets/spinner.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/spinner.css
rename to home/system/gtk/theme/gtk-3.0/widgets/spinner.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/switch.css b/home/system/gtk/theme/gtk-3.0/widgets/switch.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/switch.css
rename to home/system/gtk/theme/gtk-3.0/widgets/switch.css
diff --git a/home/system/gtk/gtk/gtk-3.0/widgets/toolbar.css b/home/system/gtk/theme/gtk-3.0/widgets/toolbar.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.0/widgets/toolbar.css
rename to home/system/gtk/theme/gtk-3.0/widgets/toolbar.css
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/blank.png b/home/system/gtk/theme/gtk-3.20/assets/blank.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/blank.png
rename to home/system/gtk/theme/gtk-3.20/assets/blank.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/bullet-disabled.png b/home/system/gtk/theme/gtk-3.20/assets/bullet-disabled.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/bullet-disabled.png
rename to home/system/gtk/theme/gtk-3.20/assets/bullet-disabled.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/bullet.png b/home/system/gtk/theme/gtk-3.20/assets/bullet.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/bullet.png
rename to home/system/gtk/theme/gtk-3.20/assets/bullet.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/check-disabled.png b/home/system/gtk/theme/gtk-3.20/assets/check-disabled.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/check-disabled.png
rename to home/system/gtk/theme/gtk-3.20/assets/check-disabled.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/check.png b/home/system/gtk/theme/gtk-3.20/assets/check.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/check.png
rename to home/system/gtk/theme/gtk-3.20/assets/check.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/dash-disabled.png b/home/system/gtk/theme/gtk-3.20/assets/dash-disabled.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/dash-disabled.png
rename to home/system/gtk/theme/gtk-3.20/assets/dash-disabled.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/dash.png b/home/system/gtk/theme/gtk-3.20/assets/dash.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/dash.png
rename to home/system/gtk/theme/gtk-3.20/assets/dash.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/grid-selection-blank.png b/home/system/gtk/theme/gtk-3.20/assets/grid-selection-blank.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/grid-selection-blank.png
rename to home/system/gtk/theme/gtk-3.20/assets/grid-selection-blank.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/grid-selection.png b/home/system/gtk/theme/gtk-3.20/assets/grid-selection.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/grid-selection.png
rename to home/system/gtk/theme/gtk-3.20/assets/grid-selection.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/pane-separator-grip-vertical.png b/home/system/gtk/theme/gtk-3.20/assets/pane-separator-grip-vertical.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/pane-separator-grip-vertical.png
rename to home/system/gtk/theme/gtk-3.20/assets/pane-separator-grip-vertical.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/pane-separator-grip.png b/home/system/gtk/theme/gtk-3.20/assets/pane-separator-grip.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/pane-separator-grip.png
rename to home/system/gtk/theme/gtk-3.20/assets/pane-separator-grip.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/radio-disabled.png b/home/system/gtk/theme/gtk-3.20/assets/radio-disabled.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/radio-disabled.png
rename to home/system/gtk/theme/gtk-3.20/assets/radio-disabled.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-dark.png b/home/system/gtk/theme/gtk-3.20/assets/slider-dark.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-dark.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-dark.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-dark@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-dark@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-dark@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-dark@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above-dark@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above-insensitive@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-above@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-above@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below-dark@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below-insensitive@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-horz-scale-has-marks-below@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-horz-scale-has-marks-below@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive-dark.png b/home/system/gtk/theme/gtk-3.20/assets/slider-insensitive-dark.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive-dark.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-insensitive-dark.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive-dark@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-insensitive-dark@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive-dark@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-insensitive-dark@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive.png b/home/system/gtk/theme/gtk-3.20/assets/slider-insensitive.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-insensitive.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-insensitive@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-insensitive@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-insensitive@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above-dark@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above-insensitive@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-above@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-above@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below-dark@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below-insensitive@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider-vert-scale-has-marks-below@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider-vert-scale-has-marks-below@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider.png b/home/system/gtk/theme/gtk-3.20/assets/slider.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider.png
diff --git a/home/system/gtk/gtk/gtk-3.20/assets/slider@2.png b/home/system/gtk/theme/gtk-3.20/assets/slider@2.png
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/assets/slider@2.png
rename to home/system/gtk/theme/gtk-3.20/assets/slider@2.png
diff --git a/home/system/gtk/gtk/gtk-3.20/gnome-applications.css b/home/system/gtk/theme/gtk-3.20/gnome-applications.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/gnome-applications.css
rename to home/system/gtk/theme/gtk-3.20/gnome-applications.css
diff --git a/home/system/gtk/gtk/gtk-3.20/gtk-widgets.css b/home/system/gtk/theme/gtk-3.20/gtk-widgets.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/gtk-widgets.css
rename to home/system/gtk/theme/gtk-3.20/gtk-widgets.css
diff --git a/home/system/gtk/gtk/gtk-3.20/gtk.css b/home/system/gtk/theme/gtk-3.20/gtk.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/gtk.css
rename to home/system/gtk/theme/gtk-3.20/gtk.css
diff --git a/home/system/gtk/gtk/gtk-3.20/gtk.css.base b/home/system/gtk/theme/gtk-3.20/gtk.css.base
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/gtk.css.base
rename to home/system/gtk/theme/gtk-3.20/gtk.css.base
diff --git a/home/system/gtk/gtk/gtk-3.20/settings.ini b/home/system/gtk/theme/gtk-3.20/settings.ini
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/settings.ini
rename to home/system/gtk/theme/gtk-3.20/settings.ini
diff --git a/home/system/gtk/gtk/gtk-3.20/unity.css b/home/system/gtk/theme/gtk-3.20/unity.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/unity.css
rename to home/system/gtk/theme/gtk-3.20/unity.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/button.css b/home/system/gtk/theme/gtk-3.20/widgets/button.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/button.css
rename to home/system/gtk/theme/gtk-3.20/widgets/button.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/calendar.css b/home/system/gtk/theme/gtk-3.20/widgets/calendar.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/calendar.css
rename to home/system/gtk/theme/gtk-3.20/widgets/calendar.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/cell-row.css b/home/system/gtk/theme/gtk-3.20/widgets/cell-row.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/cell-row.css
rename to home/system/gtk/theme/gtk-3.20/widgets/cell-row.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/check-radio.css b/home/system/gtk/theme/gtk-3.20/widgets/check-radio.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/check-radio.css
rename to home/system/gtk/theme/gtk-3.20/widgets/check-radio.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/chrome.css b/home/system/gtk/theme/gtk-3.20/widgets/chrome.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/chrome.css
rename to home/system/gtk/theme/gtk-3.20/widgets/chrome.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/color-chooser.css b/home/system/gtk/theme/gtk-3.20/widgets/color-chooser.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/color-chooser.css
rename to home/system/gtk/theme/gtk-3.20/widgets/color-chooser.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/column-header.css b/home/system/gtk/theme/gtk-3.20/widgets/column-header.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/column-header.css
rename to home/system/gtk/theme/gtk-3.20/widgets/column-header.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/combobox.css b/home/system/gtk/theme/gtk-3.20/widgets/combobox.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/combobox.css
rename to home/system/gtk/theme/gtk-3.20/widgets/combobox.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/csd.css b/home/system/gtk/theme/gtk-3.20/widgets/csd.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/csd.css
rename to home/system/gtk/theme/gtk-3.20/widgets/csd.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/entry.css b/home/system/gtk/theme/gtk-3.20/widgets/entry.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/entry.css
rename to home/system/gtk/theme/gtk-3.20/widgets/entry.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/header-bar.css b/home/system/gtk/theme/gtk-3.20/widgets/header-bar.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/header-bar.css
rename to home/system/gtk/theme/gtk-3.20/widgets/header-bar.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/infobar.css b/home/system/gtk/theme/gtk-3.20/widgets/infobar.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/infobar.css
rename to home/system/gtk/theme/gtk-3.20/widgets/infobar.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/linked-buttons.css b/home/system/gtk/theme/gtk-3.20/widgets/linked-buttons.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/linked-buttons.css
rename to home/system/gtk/theme/gtk-3.20/widgets/linked-buttons.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/menu.css b/home/system/gtk/theme/gtk-3.20/widgets/menu.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/menu.css
rename to home/system/gtk/theme/gtk-3.20/widgets/menu.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/notebook.css b/home/system/gtk/theme/gtk-3.20/widgets/notebook.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/notebook.css
rename to home/system/gtk/theme/gtk-3.20/widgets/notebook.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/osd.css b/home/system/gtk/theme/gtk-3.20/widgets/osd.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/osd.css
rename to home/system/gtk/theme/gtk-3.20/widgets/osd.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/progress-scale.css b/home/system/gtk/theme/gtk-3.20/widgets/progress-scale.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/progress-scale.css
rename to home/system/gtk/theme/gtk-3.20/widgets/progress-scale.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/scrollbar.css b/home/system/gtk/theme/gtk-3.20/widgets/scrollbar.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/scrollbar.css
rename to home/system/gtk/theme/gtk-3.20/widgets/scrollbar.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/selection-mode.css b/home/system/gtk/theme/gtk-3.20/widgets/selection-mode.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/selection-mode.css
rename to home/system/gtk/theme/gtk-3.20/widgets/selection-mode.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/separator.css b/home/system/gtk/theme/gtk-3.20/widgets/separator.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/separator.css
rename to home/system/gtk/theme/gtk-3.20/widgets/separator.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/sidebar.css b/home/system/gtk/theme/gtk-3.20/widgets/sidebar.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/sidebar.css
rename to home/system/gtk/theme/gtk-3.20/widgets/sidebar.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/spinbutton.css b/home/system/gtk/theme/gtk-3.20/widgets/spinbutton.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/spinbutton.css
rename to home/system/gtk/theme/gtk-3.20/widgets/spinbutton.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/spinner.css b/home/system/gtk/theme/gtk-3.20/widgets/spinner.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/spinner.css
rename to home/system/gtk/theme/gtk-3.20/widgets/spinner.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/switch.css b/home/system/gtk/theme/gtk-3.20/widgets/switch.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/switch.css
rename to home/system/gtk/theme/gtk-3.20/widgets/switch.css
diff --git a/home/system/gtk/gtk/gtk-3.20/widgets/toolbar.css b/home/system/gtk/theme/gtk-3.20/widgets/toolbar.css
similarity index 100%
rename from home/system/gtk/gtk/gtk-3.20/widgets/toolbar.css
rename to home/system/gtk/theme/gtk-3.20/widgets/toolbar.css
diff --git a/home/system/gtk/gtk/index.theme b/home/system/gtk/theme/index.theme
similarity index 100%
rename from home/system/gtk/gtk/index.theme
rename to home/system/gtk/theme/index.theme
diff --git a/home/system/gtk/gtk/metacity-1/close_focused_normal.png b/home/system/gtk/theme/metacity-1/close_focused_normal.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/close_focused_normal.png
rename to home/system/gtk/theme/metacity-1/close_focused_normal.png
diff --git a/home/system/gtk/gtk/metacity-1/close_focused_prelight.png b/home/system/gtk/theme/metacity-1/close_focused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/close_focused_prelight.png
rename to home/system/gtk/theme/metacity-1/close_focused_prelight.png
diff --git a/home/system/gtk/gtk/metacity-1/close_focused_pressed.png b/home/system/gtk/theme/metacity-1/close_focused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/close_focused_pressed.png
rename to home/system/gtk/theme/metacity-1/close_focused_pressed.png
diff --git a/home/system/gtk/gtk/metacity-1/close_unfocused.png b/home/system/gtk/theme/metacity-1/close_unfocused.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/close_unfocused.png
rename to home/system/gtk/theme/metacity-1/close_unfocused.png
diff --git a/home/system/gtk/gtk/metacity-1/close_unfocused_prelight.png b/home/system/gtk/theme/metacity-1/close_unfocused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/close_unfocused_prelight.png
rename to home/system/gtk/theme/metacity-1/close_unfocused_prelight.png
diff --git a/home/system/gtk/gtk/metacity-1/close_unfocused_pressed.png b/home/system/gtk/theme/metacity-1/close_unfocused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/close_unfocused_pressed.png
rename to home/system/gtk/theme/metacity-1/close_unfocused_pressed.png
diff --git a/home/system/gtk/gtk/metacity-1/maximize_focused_normal.png b/home/system/gtk/theme/metacity-1/maximize_focused_normal.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/maximize_focused_normal.png
rename to home/system/gtk/theme/metacity-1/maximize_focused_normal.png
diff --git a/home/system/gtk/gtk/metacity-1/maximize_focused_prelight.png b/home/system/gtk/theme/metacity-1/maximize_focused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/maximize_focused_prelight.png
rename to home/system/gtk/theme/metacity-1/maximize_focused_prelight.png
diff --git a/home/system/gtk/gtk/metacity-1/maximize_focused_pressed.png b/home/system/gtk/theme/metacity-1/maximize_focused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/maximize_focused_pressed.png
rename to home/system/gtk/theme/metacity-1/maximize_focused_pressed.png
diff --git a/home/system/gtk/gtk/metacity-1/maximize_unfocused.png b/home/system/gtk/theme/metacity-1/maximize_unfocused.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/maximize_unfocused.png
rename to home/system/gtk/theme/metacity-1/maximize_unfocused.png
diff --git a/home/system/gtk/gtk/metacity-1/maximize_unfocused_prelight.png b/home/system/gtk/theme/metacity-1/maximize_unfocused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/maximize_unfocused_prelight.png
rename to home/system/gtk/theme/metacity-1/maximize_unfocused_prelight.png
diff --git a/home/system/gtk/gtk/metacity-1/maximize_unfocused_pressed.png b/home/system/gtk/theme/metacity-1/maximize_unfocused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/maximize_unfocused_pressed.png
rename to home/system/gtk/theme/metacity-1/maximize_unfocused_pressed.png
diff --git a/home/system/gtk/gtk/metacity-1/menu-pressed.png b/home/system/gtk/theme/metacity-1/menu-pressed.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/menu-pressed.png
rename to home/system/gtk/theme/metacity-1/menu-pressed.png
diff --git a/home/system/gtk/gtk/metacity-1/menu-unfocus-prelight.png b/home/system/gtk/theme/metacity-1/menu-unfocus-prelight.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/menu-unfocus-prelight.png
rename to home/system/gtk/theme/metacity-1/menu-unfocus-prelight.png
diff --git a/home/system/gtk/gtk/metacity-1/menu-unfocus-pressed.png b/home/system/gtk/theme/metacity-1/menu-unfocus-pressed.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/menu-unfocus-pressed.png
rename to home/system/gtk/theme/metacity-1/menu-unfocus-pressed.png
diff --git a/home/system/gtk/gtk/metacity-1/menu-unfocus.png b/home/system/gtk/theme/metacity-1/menu-unfocus.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/menu-unfocus.png
rename to home/system/gtk/theme/metacity-1/menu-unfocus.png
diff --git a/home/system/gtk/gtk/metacity-1/menu.png b/home/system/gtk/theme/metacity-1/menu.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/menu.png
rename to home/system/gtk/theme/metacity-1/menu.png
diff --git a/home/system/gtk/gtk/metacity-1/menu_prelight.png b/home/system/gtk/theme/metacity-1/menu_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/menu_prelight.png
rename to home/system/gtk/theme/metacity-1/menu_prelight.png
diff --git a/home/system/gtk/gtk/metacity-1/metacity-theme-1.xml b/home/system/gtk/theme/metacity-1/metacity-theme-1.xml
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/metacity-theme-1.xml
rename to home/system/gtk/theme/metacity-1/metacity-theme-1.xml
diff --git a/home/system/gtk/gtk/metacity-1/metacity-theme-3.xml b/home/system/gtk/theme/metacity-1/metacity-theme-3.xml
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/metacity-theme-3.xml
rename to home/system/gtk/theme/metacity-1/metacity-theme-3.xml
diff --git a/home/system/gtk/gtk/metacity-1/minimize_focused_normal.png b/home/system/gtk/theme/metacity-1/minimize_focused_normal.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/minimize_focused_normal.png
rename to home/system/gtk/theme/metacity-1/minimize_focused_normal.png
diff --git a/home/system/gtk/gtk/metacity-1/minimize_focused_prelight.png b/home/system/gtk/theme/metacity-1/minimize_focused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/minimize_focused_prelight.png
rename to home/system/gtk/theme/metacity-1/minimize_focused_prelight.png
diff --git a/home/system/gtk/gtk/metacity-1/minimize_focused_pressed.png b/home/system/gtk/theme/metacity-1/minimize_focused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/minimize_focused_pressed.png
rename to home/system/gtk/theme/metacity-1/minimize_focused_pressed.png
diff --git a/home/system/gtk/gtk/metacity-1/minimize_unfocused.png b/home/system/gtk/theme/metacity-1/minimize_unfocused.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/minimize_unfocused.png
rename to home/system/gtk/theme/metacity-1/minimize_unfocused.png
diff --git a/home/system/gtk/gtk/metacity-1/minimize_unfocused_prelight.png b/home/system/gtk/theme/metacity-1/minimize_unfocused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/minimize_unfocused_prelight.png
rename to home/system/gtk/theme/metacity-1/minimize_unfocused_prelight.png
diff --git a/home/system/gtk/gtk/metacity-1/minimize_unfocused_pressed.png b/home/system/gtk/theme/metacity-1/minimize_unfocused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/minimize_unfocused_pressed.png
rename to home/system/gtk/theme/metacity-1/minimize_unfocused_pressed.png
diff --git a/home/system/gtk/gtk/metacity-1/trough_left.png b/home/system/gtk/theme/metacity-1/trough_left.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/trough_left.png
rename to home/system/gtk/theme/metacity-1/trough_left.png
diff --git a/home/system/gtk/gtk/metacity-1/trough_middle.png b/home/system/gtk/theme/metacity-1/trough_middle.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/trough_middle.png
rename to home/system/gtk/theme/metacity-1/trough_middle.png
diff --git a/home/system/gtk/gtk/metacity-1/trough_right.png b/home/system/gtk/theme/metacity-1/trough_right.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/trough_right.png
rename to home/system/gtk/theme/metacity-1/trough_right.png
diff --git a/home/system/gtk/gtk/metacity-1/unmaximize.png b/home/system/gtk/theme/metacity-1/unmaximize.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/unmaximize.png
rename to home/system/gtk/theme/metacity-1/unmaximize.png
diff --git a/home/system/gtk/gtk/metacity-1/unmaximize_focused_normal.png b/home/system/gtk/theme/metacity-1/unmaximize_focused_normal.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/unmaximize_focused_normal.png
rename to home/system/gtk/theme/metacity-1/unmaximize_focused_normal.png
diff --git a/home/system/gtk/gtk/metacity-1/unmaximize_focused_prelight.png b/home/system/gtk/theme/metacity-1/unmaximize_focused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/unmaximize_focused_prelight.png
rename to home/system/gtk/theme/metacity-1/unmaximize_focused_prelight.png
diff --git a/home/system/gtk/gtk/metacity-1/unmaximize_focused_pressed.png b/home/system/gtk/theme/metacity-1/unmaximize_focused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/unmaximize_focused_pressed.png
rename to home/system/gtk/theme/metacity-1/unmaximize_focused_pressed.png
diff --git a/home/system/gtk/gtk/metacity-1/unmaximize_unfocused.png b/home/system/gtk/theme/metacity-1/unmaximize_unfocused.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/unmaximize_unfocused.png
rename to home/system/gtk/theme/metacity-1/unmaximize_unfocused.png
diff --git a/home/system/gtk/gtk/metacity-1/unmaximize_unfocused_prelight.png b/home/system/gtk/theme/metacity-1/unmaximize_unfocused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/unmaximize_unfocused_prelight.png
rename to home/system/gtk/theme/metacity-1/unmaximize_unfocused_prelight.png
diff --git a/home/system/gtk/gtk/metacity-1/unmaximize_unfocused_pressed.png b/home/system/gtk/theme/metacity-1/unmaximize_unfocused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/metacity-1/unmaximize_unfocused_pressed.png
rename to home/system/gtk/theme/metacity-1/unmaximize_unfocused_pressed.png
diff --git a/home/system/gtk/gtk/unity/close.png b/home/system/gtk/theme/unity/close.png
similarity index 100%
rename from home/system/gtk/gtk/unity/close.png
rename to home/system/gtk/theme/unity/close.png
diff --git a/home/system/gtk/gtk/unity/close_focused_normal.png b/home/system/gtk/theme/unity/close_focused_normal.png
similarity index 100%
rename from home/system/gtk/gtk/unity/close_focused_normal.png
rename to home/system/gtk/theme/unity/close_focused_normal.png
diff --git a/home/system/gtk/gtk/unity/close_focused_prelight.png b/home/system/gtk/theme/unity/close_focused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/unity/close_focused_prelight.png
rename to home/system/gtk/theme/unity/close_focused_prelight.png
diff --git a/home/system/gtk/gtk/unity/close_focused_pressed.png b/home/system/gtk/theme/unity/close_focused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/unity/close_focused_pressed.png
rename to home/system/gtk/theme/unity/close_focused_pressed.png
diff --git a/home/system/gtk/gtk/unity/close_unfocused.png b/home/system/gtk/theme/unity/close_unfocused.png
similarity index 100%
rename from home/system/gtk/gtk/unity/close_unfocused.png
rename to home/system/gtk/theme/unity/close_unfocused.png
diff --git a/home/system/gtk/gtk/unity/close_unfocused_prelight.png b/home/system/gtk/theme/unity/close_unfocused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/unity/close_unfocused_prelight.png
rename to home/system/gtk/theme/unity/close_unfocused_prelight.png
diff --git a/home/system/gtk/gtk/unity/close_unfocused_pressed.png b/home/system/gtk/theme/unity/close_unfocused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/unity/close_unfocused_pressed.png
rename to home/system/gtk/theme/unity/close_unfocused_pressed.png
diff --git a/home/system/gtk/gtk/unity/launcher_arrow_ltr_19.svg b/home/system/gtk/theme/unity/launcher_arrow_ltr_19.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_arrow_ltr_19.svg
rename to home/system/gtk/theme/unity/launcher_arrow_ltr_19.svg
diff --git a/home/system/gtk/gtk/unity/launcher_arrow_ltr_37.svg b/home/system/gtk/theme/unity/launcher_arrow_ltr_37.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_arrow_ltr_37.svg
rename to home/system/gtk/theme/unity/launcher_arrow_ltr_37.svg
diff --git a/home/system/gtk/gtk/unity/launcher_arrow_outline_ltr_19.svg b/home/system/gtk/theme/unity/launcher_arrow_outline_ltr_19.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_arrow_outline_ltr_19.svg
rename to home/system/gtk/theme/unity/launcher_arrow_outline_ltr_19.svg
diff --git a/home/system/gtk/gtk/unity/launcher_arrow_outline_ltr_37.svg b/home/system/gtk/theme/unity/launcher_arrow_outline_ltr_37.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_arrow_outline_ltr_37.svg
rename to home/system/gtk/theme/unity/launcher_arrow_outline_ltr_37.svg
diff --git a/home/system/gtk/gtk/unity/launcher_arrow_outline_rtl_19.svg b/home/system/gtk/theme/unity/launcher_arrow_outline_rtl_19.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_arrow_outline_rtl_19.svg
rename to home/system/gtk/theme/unity/launcher_arrow_outline_rtl_19.svg
diff --git a/home/system/gtk/gtk/unity/launcher_arrow_outline_rtl_37.svg b/home/system/gtk/theme/unity/launcher_arrow_outline_rtl_37.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_arrow_outline_rtl_37.svg
rename to home/system/gtk/theme/unity/launcher_arrow_outline_rtl_37.svg
diff --git a/home/system/gtk/gtk/unity/launcher_arrow_rtl_19.svg b/home/system/gtk/theme/unity/launcher_arrow_rtl_19.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_arrow_rtl_19.svg
rename to home/system/gtk/theme/unity/launcher_arrow_rtl_19.svg
diff --git a/home/system/gtk/gtk/unity/launcher_arrow_rtl_37.svg b/home/system/gtk/theme/unity/launcher_arrow_rtl_37.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_arrow_rtl_37.svg
rename to home/system/gtk/theme/unity/launcher_arrow_rtl_37.svg
diff --git a/home/system/gtk/gtk/unity/launcher_icon_back_150.svg b/home/system/gtk/theme/unity/launcher_icon_back_150.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_icon_back_150.svg
rename to home/system/gtk/theme/unity/launcher_icon_back_150.svg
diff --git a/home/system/gtk/gtk/unity/launcher_icon_back_54.svg b/home/system/gtk/theme/unity/launcher_icon_back_54.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_icon_back_54.svg
rename to home/system/gtk/theme/unity/launcher_icon_back_54.svg
diff --git a/home/system/gtk/gtk/unity/launcher_icon_edge_150.svg b/home/system/gtk/theme/unity/launcher_icon_edge_150.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_icon_edge_150.svg
rename to home/system/gtk/theme/unity/launcher_icon_edge_150.svg
diff --git a/home/system/gtk/gtk/unity/launcher_icon_edge_54.svg b/home/system/gtk/theme/unity/launcher_icon_edge_54.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_icon_edge_54.svg
rename to home/system/gtk/theme/unity/launcher_icon_edge_54.svg
diff --git a/home/system/gtk/gtk/unity/launcher_icon_glow_200.svg b/home/system/gtk/theme/unity/launcher_icon_glow_200.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_icon_glow_200.svg
rename to home/system/gtk/theme/unity/launcher_icon_glow_200.svg
diff --git a/home/system/gtk/gtk/unity/launcher_icon_glow_62.svg b/home/system/gtk/theme/unity/launcher_icon_glow_62.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_icon_glow_62.svg
rename to home/system/gtk/theme/unity/launcher_icon_glow_62.svg
diff --git a/home/system/gtk/gtk/unity/launcher_icon_selected_back_150.svg b/home/system/gtk/theme/unity/launcher_icon_selected_back_150.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_icon_selected_back_150.svg
rename to home/system/gtk/theme/unity/launcher_icon_selected_back_150.svg
diff --git a/home/system/gtk/gtk/unity/launcher_icon_selected_back_54.svg b/home/system/gtk/theme/unity/launcher_icon_selected_back_54.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_icon_selected_back_54.svg
rename to home/system/gtk/theme/unity/launcher_icon_selected_back_54.svg
diff --git a/home/system/gtk/gtk/unity/launcher_icon_shadow_200.svg b/home/system/gtk/theme/unity/launcher_icon_shadow_200.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_icon_shadow_200.svg
rename to home/system/gtk/theme/unity/launcher_icon_shadow_200.svg
diff --git a/home/system/gtk/gtk/unity/launcher_icon_shadow_62.svg b/home/system/gtk/theme/unity/launcher_icon_shadow_62.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_icon_shadow_62.svg
rename to home/system/gtk/theme/unity/launcher_icon_shadow_62.svg
diff --git a/home/system/gtk/gtk/unity/launcher_icon_shine_150.svg b/home/system/gtk/theme/unity/launcher_icon_shine_150.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_icon_shine_150.svg
rename to home/system/gtk/theme/unity/launcher_icon_shine_150.svg
diff --git a/home/system/gtk/gtk/unity/launcher_icon_shine_54.svg b/home/system/gtk/theme/unity/launcher_icon_shine_54.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_icon_shine_54.svg
rename to home/system/gtk/theme/unity/launcher_icon_shine_54.svg
diff --git a/home/system/gtk/gtk/unity/launcher_pip_ltr_19.svg b/home/system/gtk/theme/unity/launcher_pip_ltr_19.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_pip_ltr_19.svg
rename to home/system/gtk/theme/unity/launcher_pip_ltr_19.svg
diff --git a/home/system/gtk/gtk/unity/launcher_pip_ltr_37.svg b/home/system/gtk/theme/unity/launcher_pip_ltr_37.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_pip_ltr_37.svg
rename to home/system/gtk/theme/unity/launcher_pip_ltr_37.svg
diff --git a/home/system/gtk/gtk/unity/launcher_pip_rtl_19.svg b/home/system/gtk/theme/unity/launcher_pip_rtl_19.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_pip_rtl_19.svg
rename to home/system/gtk/theme/unity/launcher_pip_rtl_19.svg
diff --git a/home/system/gtk/gtk/unity/launcher_pip_rtl_37.svg b/home/system/gtk/theme/unity/launcher_pip_rtl_37.svg
similarity index 100%
rename from home/system/gtk/gtk/unity/launcher_pip_rtl_37.svg
rename to home/system/gtk/theme/unity/launcher_pip_rtl_37.svg
diff --git a/home/system/gtk/gtk/unity/maximize.png b/home/system/gtk/theme/unity/maximize.png
similarity index 100%
rename from home/system/gtk/gtk/unity/maximize.png
rename to home/system/gtk/theme/unity/maximize.png
diff --git a/home/system/gtk/gtk/unity/maximize_focused_normal.png b/home/system/gtk/theme/unity/maximize_focused_normal.png
similarity index 100%
rename from home/system/gtk/gtk/unity/maximize_focused_normal.png
rename to home/system/gtk/theme/unity/maximize_focused_normal.png
diff --git a/home/system/gtk/gtk/unity/maximize_focused_prelight.png b/home/system/gtk/theme/unity/maximize_focused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/unity/maximize_focused_prelight.png
rename to home/system/gtk/theme/unity/maximize_focused_prelight.png
diff --git a/home/system/gtk/gtk/unity/maximize_focused_pressed.png b/home/system/gtk/theme/unity/maximize_focused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/unity/maximize_focused_pressed.png
rename to home/system/gtk/theme/unity/maximize_focused_pressed.png
diff --git a/home/system/gtk/gtk/unity/maximize_unfocused.png b/home/system/gtk/theme/unity/maximize_unfocused.png
similarity index 100%
rename from home/system/gtk/gtk/unity/maximize_unfocused.png
rename to home/system/gtk/theme/unity/maximize_unfocused.png
diff --git a/home/system/gtk/gtk/unity/maximize_unfocused_prelight.png b/home/system/gtk/theme/unity/maximize_unfocused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/unity/maximize_unfocused_prelight.png
rename to home/system/gtk/theme/unity/maximize_unfocused_prelight.png
diff --git a/home/system/gtk/gtk/unity/maximize_unfocused_pressed.png b/home/system/gtk/theme/unity/maximize_unfocused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/unity/maximize_unfocused_pressed.png
rename to home/system/gtk/theme/unity/maximize_unfocused_pressed.png
diff --git a/home/system/gtk/gtk/unity/minimize.png b/home/system/gtk/theme/unity/minimize.png
similarity index 100%
rename from home/system/gtk/gtk/unity/minimize.png
rename to home/system/gtk/theme/unity/minimize.png
diff --git a/home/system/gtk/gtk/unity/minimize_focused_normal.png b/home/system/gtk/theme/unity/minimize_focused_normal.png
similarity index 100%
rename from home/system/gtk/gtk/unity/minimize_focused_normal.png
rename to home/system/gtk/theme/unity/minimize_focused_normal.png
diff --git a/home/system/gtk/gtk/unity/minimize_focused_prelight.png b/home/system/gtk/theme/unity/minimize_focused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/unity/minimize_focused_prelight.png
rename to home/system/gtk/theme/unity/minimize_focused_prelight.png
diff --git a/home/system/gtk/gtk/unity/minimize_focused_pressed.png b/home/system/gtk/theme/unity/minimize_focused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/unity/minimize_focused_pressed.png
rename to home/system/gtk/theme/unity/minimize_focused_pressed.png
diff --git a/home/system/gtk/gtk/unity/minimize_unfocused.png b/home/system/gtk/theme/unity/minimize_unfocused.png
similarity index 100%
rename from home/system/gtk/gtk/unity/minimize_unfocused.png
rename to home/system/gtk/theme/unity/minimize_unfocused.png
diff --git a/home/system/gtk/gtk/unity/minimize_unfocused_prelight.png b/home/system/gtk/theme/unity/minimize_unfocused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/unity/minimize_unfocused_prelight.png
rename to home/system/gtk/theme/unity/minimize_unfocused_prelight.png
diff --git a/home/system/gtk/gtk/unity/minimize_unfocused_pressed.png b/home/system/gtk/theme/unity/minimize_unfocused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/unity/minimize_unfocused_pressed.png
rename to home/system/gtk/theme/unity/minimize_unfocused_pressed.png
diff --git a/home/system/gtk/gtk/unity/unmaximize.png b/home/system/gtk/theme/unity/unmaximize.png
similarity index 100%
rename from home/system/gtk/gtk/unity/unmaximize.png
rename to home/system/gtk/theme/unity/unmaximize.png
diff --git a/home/system/gtk/gtk/unity/unmaximize_focused_normal.png b/home/system/gtk/theme/unity/unmaximize_focused_normal.png
similarity index 100%
rename from home/system/gtk/gtk/unity/unmaximize_focused_normal.png
rename to home/system/gtk/theme/unity/unmaximize_focused_normal.png
diff --git a/home/system/gtk/gtk/unity/unmaximize_focused_prelight.png b/home/system/gtk/theme/unity/unmaximize_focused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/unity/unmaximize_focused_prelight.png
rename to home/system/gtk/theme/unity/unmaximize_focused_prelight.png
diff --git a/home/system/gtk/gtk/unity/unmaximize_focused_pressed.png b/home/system/gtk/theme/unity/unmaximize_focused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/unity/unmaximize_focused_pressed.png
rename to home/system/gtk/theme/unity/unmaximize_focused_pressed.png
diff --git a/home/system/gtk/gtk/unity/unmaximize_unfocused.png b/home/system/gtk/theme/unity/unmaximize_unfocused.png
similarity index 100%
rename from home/system/gtk/gtk/unity/unmaximize_unfocused.png
rename to home/system/gtk/theme/unity/unmaximize_unfocused.png
diff --git a/home/system/gtk/gtk/unity/unmaximize_unfocused_prelight.png b/home/system/gtk/theme/unity/unmaximize_unfocused_prelight.png
similarity index 100%
rename from home/system/gtk/gtk/unity/unmaximize_unfocused_prelight.png
rename to home/system/gtk/theme/unity/unmaximize_unfocused_prelight.png
diff --git a/home/system/gtk/gtk/unity/unmaximize_unfocused_pressed.png b/home/system/gtk/theme/unity/unmaximize_unfocused_pressed.png
similarity index 100%
rename from home/system/gtk/gtk/unity/unmaximize_unfocused_pressed.png
rename to home/system/gtk/theme/unity/unmaximize_unfocused_pressed.png
diff --git a/home/system/gtk/gtk/xfce-notify-4.0/gtkrc b/home/system/gtk/theme/xfce-notify-4.0/gtkrc
similarity index 100%
rename from home/system/gtk/gtk/xfce-notify-4.0/gtkrc
rename to home/system/gtk/theme/xfce-notify-4.0/gtkrc
diff --git a/home/system/udiskie/default.nix b/home/system/udiskie/default.nix
index 06af19e..87c3ab8 100644
--- a/home/system/udiskie/default.nix
+++ b/home/system/udiskie/default.nix
@@ -2,5 +2,7 @@
   services.udiskie = {
     enable = true;
     tray = "always";
+    notify = true;
+    automount = true;
   };
 }