diff --git a/astronvim/lua/user/highlights/init.lua b/_cli/astronvim/lua/user/highlights/init.lua
similarity index 100%
rename from astronvim/lua/user/highlights/init.lua
rename to _cli/astronvim/lua/user/highlights/init.lua
diff --git a/astronvim/lua/user/init.lua b/_cli/astronvim/lua/user/init.lua
similarity index 100%
rename from astronvim/lua/user/init.lua
rename to _cli/astronvim/lua/user/init.lua
diff --git a/astronvim/lua/user/mappings.lua b/_cli/astronvim/lua/user/mappings.lua
similarity index 100%
rename from astronvim/lua/user/mappings.lua
rename to _cli/astronvim/lua/user/mappings.lua
diff --git a/astronvim/lua/user/options.lua b/_cli/astronvim/lua/user/options.lua
similarity index 100%
rename from astronvim/lua/user/options.lua
rename to _cli/astronvim/lua/user/options.lua
diff --git a/astronvim/lua/user/plugins/indent.lua b/_cli/astronvim/lua/user/plugins/indent.lua
similarity index 100%
rename from astronvim/lua/user/plugins/indent.lua
rename to _cli/astronvim/lua/user/plugins/indent.lua
diff --git a/astronvim/lua/user/plugins/init.lua b/_cli/astronvim/lua/user/plugins/init.lua
similarity index 100%
rename from astronvim/lua/user/plugins/init.lua
rename to _cli/astronvim/lua/user/plugins/init.lua
diff --git a/astronvim/lua/user/plugins/lualine.lua b/_cli/astronvim/lua/user/plugins/lualine.lua
similarity index 100%
rename from astronvim/lua/user/plugins/lualine.lua
rename to _cli/astronvim/lua/user/plugins/lualine.lua
diff --git a/astronvim/lua/user/plugins/monokai.lua b/_cli/astronvim/lua/user/plugins/monokai.lua
similarity index 100%
rename from astronvim/lua/user/plugins/monokai.lua
rename to _cli/astronvim/lua/user/plugins/monokai.lua
diff --git a/astronvim/lua/user/plugins/neotree.lua b/_cli/astronvim/lua/user/plugins/neotree.lua
similarity index 100%
rename from astronvim/lua/user/plugins/neotree.lua
rename to _cli/astronvim/lua/user/plugins/neotree.lua
diff --git a/astronvim/lua/user/plugins/notify.lua b/_cli/astronvim/lua/user/plugins/notify.lua
similarity index 100%
rename from astronvim/lua/user/plugins/notify.lua
rename to _cli/astronvim/lua/user/plugins/notify.lua
diff --git a/astronvim/lua/user/plugins/treesitter.lua b/_cli/astronvim/lua/user/plugins/treesitter.lua
similarity index 100%
rename from astronvim/lua/user/plugins/treesitter.lua
rename to _cli/astronvim/lua/user/plugins/treesitter.lua
diff --git a/astronvim/lua/user/plugins/whitespace.lua b/_cli/astronvim/lua/user/plugins/whitespace.lua
similarity index 100%
rename from astronvim/lua/user/plugins/whitespace.lua
rename to _cli/astronvim/lua/user/plugins/whitespace.lua
diff --git a/fd/ignore b/_cli/fd/ignore
similarity index 100%
rename from fd/ignore
rename to _cli/fd/ignore
diff --git a/htop/htoprc b/_cli/htop/htoprc
similarity index 100%
rename from htop/htoprc
rename to _cli/htop/htoprc
diff --git a/starship.toml b/_cli/starship.toml
similarity index 100%
rename from starship.toml
rename to _cli/starship.toml
diff --git a/tmux/tmux.conf b/_cli/tmux/tmux.conf
similarity index 100%
rename from tmux/tmux.conf
rename to _cli/tmux/tmux.conf
diff --git a/zsh/.zlogout b/_cli/zsh/.zlogout
similarity index 100%
rename from zsh/.zlogout
rename to _cli/zsh/.zlogout
diff --git a/zsh/.zshenv b/_cli/zsh/.zshenv
similarity index 100%
rename from zsh/.zshenv
rename to _cli/zsh/.zshenv
diff --git a/zsh/.zshrc b/_cli/zsh/.zshrc
similarity index 100%
rename from zsh/.zshrc
rename to _cli/zsh/.zshrc
diff --git a/zsh/aliases.zsh b/_cli/zsh/aliases.zsh
similarity index 100%
rename from zsh/aliases.zsh
rename to _cli/zsh/aliases.zsh
diff --git a/zsh/cleanhome.zsh b/_cli/zsh/cleanhome.zsh
similarity index 100%
rename from zsh/cleanhome.zsh
rename to _cli/zsh/cleanhome.zsh
diff --git a/zsh/fzf.zsh b/_cli/zsh/fzf.zsh
similarity index 100%
rename from zsh/fzf.zsh
rename to _cli/zsh/fzf.zsh
diff --git a/zsh/keys.zsh b/_cli/zsh/keys.zsh
similarity index 100%
rename from zsh/keys.zsh
rename to _cli/zsh/keys.zsh
diff --git a/zsh/ssh.zsh b/_cli/zsh/ssh.zsh
similarity index 100%
rename from zsh/ssh.zsh
rename to _cli/zsh/ssh.zsh
diff --git a/_desktop/_scripts/firefox b/_gui/_scripts/firefox
similarity index 100%
rename from _desktop/_scripts/firefox
rename to _gui/_scripts/firefox
diff --git a/_desktop/_scripts/sb-battery b/_gui/_scripts/sb-battery
similarity index 100%
rename from _desktop/_scripts/sb-battery
rename to _gui/_scripts/sb-battery
diff --git a/_desktop/_scripts/sb-network b/_gui/_scripts/sb-network
similarity index 100%
rename from _desktop/_scripts/sb-network
rename to _gui/_scripts/sb-network
diff --git a/_desktop/_scripts/sb-volume b/_gui/_scripts/sb-volume
similarity index 100%
rename from _desktop/_scripts/sb-volume
rename to _gui/_scripts/sb-volume
diff --git a/_desktop/_scripts/selector-audio b/_gui/_scripts/selector-audio
similarity index 100%
rename from _desktop/_scripts/selector-audio
rename to _gui/_scripts/selector-audio
diff --git a/_desktop/_scripts/selector-bluetooth b/_gui/_scripts/selector-bluetooth
similarity index 100%
rename from _desktop/_scripts/selector-bluetooth
rename to _gui/_scripts/selector-bluetooth
diff --git a/_desktop/_scripts/selector-chars b/_gui/_scripts/selector-chars
similarity index 100%
rename from _desktop/_scripts/selector-chars
rename to _gui/_scripts/selector-chars
diff --git a/_desktop/autorandr/home-dp0/config b/_gui/autorandr/home-dp0/config
similarity index 100%
rename from _desktop/autorandr/home-dp0/config
rename to _gui/autorandr/home-dp0/config
diff --git a/_desktop/autorandr/home-dp0/setup b/_gui/autorandr/home-dp0/setup
similarity index 100%
rename from _desktop/autorandr/home-dp0/setup
rename to _gui/autorandr/home-dp0/setup
diff --git a/_desktop/autorandr/home-dp1/config b/_gui/autorandr/home-dp1/config
similarity index 100%
rename from _desktop/autorandr/home-dp1/config
rename to _gui/autorandr/home-dp1/config
diff --git a/_desktop/autorandr/home-dp1/setup b/_gui/autorandr/home-dp1/setup
similarity index 100%
rename from _desktop/autorandr/home-dp1/setup
rename to _gui/autorandr/home-dp1/setup
diff --git a/_desktop/autorandr/nomad/config b/_gui/autorandr/nomad/config
similarity index 100%
rename from _desktop/autorandr/nomad/config
rename to _gui/autorandr/nomad/config
diff --git a/_desktop/autorandr/nomad/setup b/_gui/autorandr/nomad/setup
similarity index 100%
rename from _desktop/autorandr/nomad/setup
rename to _gui/autorandr/nomad/setup
diff --git a/_desktop/clipit/clipitrc b/_gui/clipit/clipitrc
similarity index 100%
rename from _desktop/clipit/clipitrc
rename to _gui/clipit/clipitrc
diff --git a/_desktop/gammastep/config.ini b/_gui/gammastep/config.ini
similarity index 100%
rename from _desktop/gammastep/config.ini
rename to _gui/gammastep/config.ini
diff --git a/_desktop/gtk-3.0/settings.ini b/_gui/gtk-3.0/settings.ini
similarity index 100%
rename from _desktop/gtk-3.0/settings.ini
rename to _gui/gtk-3.0/settings.ini
diff --git a/_desktop/install-desktop.sh b/_gui/install.sh
similarity index 100%
rename from _desktop/install-desktop.sh
rename to _gui/install.sh
diff --git a/_desktop/neofetch/config.conf b/_gui/neofetch/config.conf
similarity index 100%
rename from _desktop/neofetch/config.conf
rename to _gui/neofetch/config.conf
diff --git a/_desktop/neofetch/gentoo.png b/_gui/neofetch/gentoo.png
similarity index 100%
rename from _desktop/neofetch/gentoo.png
rename to _gui/neofetch/gentoo.png
diff --git a/_desktop/qtile/chars/emoji b/_gui/qtile/chars/emoji
similarity index 100%
rename from _desktop/qtile/chars/emoji
rename to _gui/qtile/chars/emoji
diff --git a/_desktop/qtile/chars/font-awesome b/_gui/qtile/chars/font-awesome
similarity index 100%
rename from _desktop/qtile/chars/font-awesome
rename to _gui/qtile/chars/font-awesome
diff --git a/_desktop/qtile/config.py b/_gui/qtile/config.py
similarity index 100%
rename from _desktop/qtile/config.py
rename to _gui/qtile/config.py
diff --git a/_desktop/qtile/wallpaper.img b/_gui/qtile/wallpaper.img
similarity index 100%
rename from _desktop/qtile/wallpaper.img
rename to _gui/qtile/wallpaper.img
diff --git a/_desktop/xinitrc b/_gui/xinitrc
similarity index 100%
rename from _desktop/xinitrc
rename to _gui/xinitrc
diff --git a/_unused/_suckless/dmenu/LICENSE b/_suckless/dmenu/LICENSE
similarity index 100%
rename from _unused/_suckless/dmenu/LICENSE
rename to _suckless/dmenu/LICENSE
diff --git a/_unused/_suckless/dmenu/Makefile b/_suckless/dmenu/Makefile
similarity index 100%
rename from _unused/_suckless/dmenu/Makefile
rename to _suckless/dmenu/Makefile
diff --git a/_unused/_suckless/dmenu/README.md b/_suckless/dmenu/README.md
similarity index 100%
rename from _unused/_suckless/dmenu/README.md
rename to _suckless/dmenu/README.md
diff --git a/_unused/_suckless/dmenu/arg.h b/_suckless/dmenu/arg.h
similarity index 100%
rename from _unused/_suckless/dmenu/arg.h
rename to _suckless/dmenu/arg.h
diff --git a/_unused/_suckless/dmenu/config.def.h b/_suckless/dmenu/config.def.h
similarity index 100%
rename from _unused/_suckless/dmenu/config.def.h
rename to _suckless/dmenu/config.def.h
diff --git a/_unused/_suckless/dmenu/config.h b/_suckless/dmenu/config.h
similarity index 100%
rename from _unused/_suckless/dmenu/config.h
rename to _suckless/dmenu/config.h
diff --git a/_unused/_suckless/dmenu/config.mk b/_suckless/dmenu/config.mk
similarity index 100%
rename from _unused/_suckless/dmenu/config.mk
rename to _suckless/dmenu/config.mk
diff --git a/_unused/_suckless/dmenu/dmenu.1 b/_suckless/dmenu/dmenu.1
similarity index 100%
rename from _unused/_suckless/dmenu/dmenu.1
rename to _suckless/dmenu/dmenu.1
diff --git a/_unused/_suckless/dmenu/dmenu.c b/_suckless/dmenu/dmenu.c
similarity index 100%
rename from _unused/_suckless/dmenu/dmenu.c
rename to _suckless/dmenu/dmenu.c
diff --git a/_unused/_suckless/dmenu/dmenu_path b/_suckless/dmenu/dmenu_path
similarity index 100%
rename from _unused/_suckless/dmenu/dmenu_path
rename to _suckless/dmenu/dmenu_path
diff --git a/_unused/_suckless/dmenu/dmenu_run b/_suckless/dmenu/dmenu_run
similarity index 100%
rename from _unused/_suckless/dmenu/dmenu_run
rename to _suckless/dmenu/dmenu_run
diff --git a/_unused/_suckless/dmenu/drw.c b/_suckless/dmenu/drw.c
similarity index 100%
rename from _unused/_suckless/dmenu/drw.c
rename to _suckless/dmenu/drw.c
diff --git a/_unused/_suckless/dmenu/drw.h b/_suckless/dmenu/drw.h
similarity index 100%
rename from _unused/_suckless/dmenu/drw.h
rename to _suckless/dmenu/drw.h
diff --git a/_unused/_suckless/dmenu/stest.1 b/_suckless/dmenu/stest.1
similarity index 100%
rename from _unused/_suckless/dmenu/stest.1
rename to _suckless/dmenu/stest.1
diff --git a/_unused/_suckless/dmenu/stest.c b/_suckless/dmenu/stest.c
similarity index 100%
rename from _unused/_suckless/dmenu/stest.c
rename to _suckless/dmenu/stest.c
diff --git a/_unused/_suckless/dmenu/util.c b/_suckless/dmenu/util.c
similarity index 100%
rename from _unused/_suckless/dmenu/util.c
rename to _suckless/dmenu/util.c
diff --git a/_unused/_suckless/dmenu/util.h b/_suckless/dmenu/util.h
similarity index 100%
rename from _unused/_suckless/dmenu/util.h
rename to _suckless/dmenu/util.h
diff --git a/_unused/_suckless/dwm/LICENSE b/_suckless/dwm/LICENSE
similarity index 100%
rename from _unused/_suckless/dwm/LICENSE
rename to _suckless/dwm/LICENSE
diff --git a/_unused/_suckless/dwm/Makefile b/_suckless/dwm/Makefile
similarity index 100%
rename from _unused/_suckless/dwm/Makefile
rename to _suckless/dwm/Makefile
diff --git a/_unused/_suckless/dwm/README.md b/_suckless/dwm/README.md
similarity index 100%
rename from _unused/_suckless/dwm/README.md
rename to _suckless/dwm/README.md
diff --git a/_unused/_suckless/dwm/_patches/dwm-preserveonrestart-6.3.diff b/_suckless/dwm/_patches/dwm-preserveonrestart-6.3.diff
similarity index 100%
rename from _unused/_suckless/dwm/_patches/dwm-preserveonrestart-6.3.diff
rename to _suckless/dwm/_patches/dwm-preserveonrestart-6.3.diff
diff --git a/_unused/_suckless/dwm/_patches/dwm-tagschemes-1.0.diff b/_suckless/dwm/_patches/dwm-tagschemes-1.0.diff
similarity index 100%
rename from _unused/_suckless/dwm/_patches/dwm-tagschemes-1.0.diff
rename to _suckless/dwm/_patches/dwm-tagschemes-1.0.diff
diff --git a/_unused/_suckless/dwm/config.def.h b/_suckless/dwm/config.def.h
similarity index 100%
rename from _unused/_suckless/dwm/config.def.h
rename to _suckless/dwm/config.def.h
diff --git a/_unused/_suckless/dwm/config.h b/_suckless/dwm/config.h
similarity index 100%
rename from _unused/_suckless/dwm/config.h
rename to _suckless/dwm/config.h
diff --git a/_unused/_suckless/dwm/config.mk b/_suckless/dwm/config.mk
similarity index 100%
rename from _unused/_suckless/dwm/config.mk
rename to _suckless/dwm/config.mk
diff --git a/_unused/_suckless/dwm/drw.c b/_suckless/dwm/drw.c
similarity index 100%
rename from _unused/_suckless/dwm/drw.c
rename to _suckless/dwm/drw.c
diff --git a/_unused/_suckless/dwm/drw.h b/_suckless/dwm/drw.h
similarity index 100%
rename from _unused/_suckless/dwm/drw.h
rename to _suckless/dwm/drw.h
diff --git a/_unused/_suckless/dwm/dwm.1 b/_suckless/dwm/dwm.1
similarity index 100%
rename from _unused/_suckless/dwm/dwm.1
rename to _suckless/dwm/dwm.1
diff --git a/_unused/_suckless/dwm/dwm.c b/_suckless/dwm/dwm.c
similarity index 100%
rename from _unused/_suckless/dwm/dwm.c
rename to _suckless/dwm/dwm.c
diff --git a/_unused/_suckless/dwm/transient.c b/_suckless/dwm/transient.c
similarity index 100%
rename from _unused/_suckless/dwm/transient.c
rename to _suckless/dwm/transient.c
diff --git a/_unused/_suckless/dwm/util.c b/_suckless/dwm/util.c
similarity index 100%
rename from _unused/_suckless/dwm/util.c
rename to _suckless/dwm/util.c
diff --git a/_unused/_suckless/dwm/util.h b/_suckless/dwm/util.h
similarity index 100%
rename from _unused/_suckless/dwm/util.h
rename to _suckless/dwm/util.h
diff --git a/_unused/_suckless/dwm/vanitygaps.c b/_suckless/dwm/vanitygaps.c
similarity index 100%
rename from _unused/_suckless/dwm/vanitygaps.c
rename to _suckless/dwm/vanitygaps.c
diff --git a/_unused/_suckless/dwmblocks/LICENSE b/_suckless/dwmblocks/LICENSE
similarity index 100%
rename from _unused/_suckless/dwmblocks/LICENSE
rename to _suckless/dwmblocks/LICENSE
diff --git a/_unused/_suckless/dwmblocks/Makefile b/_suckless/dwmblocks/Makefile
similarity index 100%
rename from _unused/_suckless/dwmblocks/Makefile
rename to _suckless/dwmblocks/Makefile
diff --git a/_unused/_suckless/dwmblocks/_scripts/sb-battery b/_suckless/dwmblocks/_scripts/sb-battery
similarity index 100%
rename from _unused/_suckless/dwmblocks/_scripts/sb-battery
rename to _suckless/dwmblocks/_scripts/sb-battery
diff --git a/_unused/_suckless/dwmblocks/_scripts/sb-mail b/_suckless/dwmblocks/_scripts/sb-mail
similarity index 100%
rename from _unused/_suckless/dwmblocks/_scripts/sb-mail
rename to _suckless/dwmblocks/_scripts/sb-mail
diff --git a/_unused/_suckless/dwmblocks/_scripts/sb-network b/_suckless/dwmblocks/_scripts/sb-network
similarity index 100%
rename from _unused/_suckless/dwmblocks/_scripts/sb-network
rename to _suckless/dwmblocks/_scripts/sb-network
diff --git a/_unused/_suckless/dwmblocks/_scripts/sb-vol-in b/_suckless/dwmblocks/_scripts/sb-vol-in
similarity index 100%
rename from _unused/_suckless/dwmblocks/_scripts/sb-vol-in
rename to _suckless/dwmblocks/_scripts/sb-vol-in
diff --git a/_unused/_suckless/dwmblocks/_scripts/sb-vol-out b/_suckless/dwmblocks/_scripts/sb-vol-out
similarity index 100%
rename from _unused/_suckless/dwmblocks/_scripts/sb-vol-out
rename to _suckless/dwmblocks/_scripts/sb-vol-out
diff --git a/_unused/_suckless/dwmblocks/blocks.def.h b/_suckless/dwmblocks/blocks.def.h
similarity index 100%
rename from _unused/_suckless/dwmblocks/blocks.def.h
rename to _suckless/dwmblocks/blocks.def.h
diff --git a/_unused/_suckless/dwmblocks/blocks.h b/_suckless/dwmblocks/blocks.h
similarity index 100%
rename from _unused/_suckless/dwmblocks/blocks.h
rename to _suckless/dwmblocks/blocks.h
diff --git a/_unused/_suckless/dwmblocks/dwmblocks.c b/_suckless/dwmblocks/dwmblocks.c
similarity index 100%
rename from _unused/_suckless/dwmblocks/dwmblocks.c
rename to _suckless/dwmblocks/dwmblocks.c
diff --git a/_unused/_suckless/dwmblocks/install-scripts.sh b/_suckless/dwmblocks/install-scripts.sh
similarity index 100%
rename from _unused/_suckless/dwmblocks/install-scripts.sh
rename to _suckless/dwmblocks/install-scripts.sh
diff --git a/_unused/_suckless/st/LICENSE b/_suckless/st/LICENSE
similarity index 100%
rename from _unused/_suckless/st/LICENSE
rename to _suckless/st/LICENSE
diff --git a/_unused/_suckless/st/Makefile b/_suckless/st/Makefile
similarity index 100%
rename from _unused/_suckless/st/Makefile
rename to _suckless/st/Makefile
diff --git a/_unused/_suckless/st/README.md b/_suckless/st/README.md
similarity index 100%
rename from _unused/_suckless/st/README.md
rename to _suckless/st/README.md
diff --git a/_unused/_suckless/st/arg.h b/_suckless/st/arg.h
similarity index 100%
rename from _unused/_suckless/st/arg.h
rename to _suckless/st/arg.h
diff --git a/_unused/_suckless/st/config.def.h b/_suckless/st/config.def.h
similarity index 100%
rename from _unused/_suckless/st/config.def.h
rename to _suckless/st/config.def.h
diff --git a/_unused/_suckless/st/config.h b/_suckless/st/config.h
similarity index 100%
rename from _unused/_suckless/st/config.h
rename to _suckless/st/config.h
diff --git a/_unused/_suckless/st/config.mk b/_suckless/st/config.mk
similarity index 100%
rename from _unused/_suckless/st/config.mk
rename to _suckless/st/config.mk
diff --git a/_unused/_suckless/st/st.1 b/_suckless/st/st.1
similarity index 100%
rename from _unused/_suckless/st/st.1
rename to _suckless/st/st.1
diff --git a/_unused/_suckless/st/st.c b/_suckless/st/st.c
similarity index 100%
rename from _unused/_suckless/st/st.c
rename to _suckless/st/st.c
diff --git a/_unused/_suckless/st/st.h b/_suckless/st/st.h
similarity index 100%
rename from _unused/_suckless/st/st.h
rename to _suckless/st/st.h
diff --git a/_unused/_suckless/st/st.info b/_suckless/st/st.info
similarity index 100%
rename from _unused/_suckless/st/st.info
rename to _suckless/st/st.info
diff --git a/_unused/_suckless/st/win.h b/_suckless/st/win.h
similarity index 100%
rename from _unused/_suckless/st/win.h
rename to _suckless/st/win.h
diff --git a/_unused/_suckless/st/x.c b/_suckless/st/x.c
similarity index 100%
rename from _unused/_suckless/st/x.c
rename to _suckless/st/x.c
diff --git a/_unused/_wayland/foot/foot.ini b/_unused/foot/foot.ini
similarity index 100%
rename from _unused/_wayland/foot/foot.ini
rename to _unused/foot/foot.ini
diff --git a/_unused/_wayland/kanshi/config b/_unused/kanshi/config
similarity index 100%
rename from _unused/_wayland/kanshi/config
rename to _unused/kanshi/config
diff --git a/_unused/kitty/kitty.conf b/_unused/kitty/kitty.conf
deleted file mode 100644
index ee7fbb0..0000000
--- a/_unused/kitty/kitty.conf
+++ /dev/null
@@ -1,73 +0,0 @@
-font_family      Roboto Mono Medium Nerd Font Complete Mono
-bold_font        auto
-italic_font      auto
-bold_italic_font auto
-font_size 11
-modify_font cell_width 80%
-#modify_font cell_height -2px
-background_opacity 1.0
-cursor #f29718
-cursor_text_color #272822
-cursor_shape beam
-cursor_beam_thickness 1.5
-cursor_blink_interval 0
-scrollback_lines -1
-mouse_hide_wait 0.0
-url_color #005577
-url_style straight
-open_url_with $BROWSER
-clear_all_mouse_actions yes
-mouse_map left click ungrabbed mouse_handle_click selection link prompt
-mouse_map middle release ungrabbed paste_from_selection
-mouse_map left press ungrabbed mouse_selection normal
-mouse_map left doublepress ungrabbed mouse_selection word
-mouse_map left triplepress ungrabbed mouse_selection line
-mouse_map right press ungrabbed mouse_selection extend
-sync_to_monitor yes
-enable_audio_bell no
-window_alert_on_bell yes
-remember_window_size no
-initial_window_width 1200
-initial_window_height 800
-window_padding_width 1.7
-hide_window_decorations yes
-update_check_interval 0
-term xterm-256color
-
-foreground           #e6e1cf
-background           #0f1419
-selection_foreground #000000
-selection_background #c1ddff
-
-color0  #000000
-color1  #ff3333
-color2  #b8cc52
-color3  #e7c547
-color4  #36a3d9
-color5  #f07178
-color6  #95e6cb
-color7  #ffffff
-color8  #323232
-color9  #ff6565
-color10 #eafe84
-color11 #fff779
-color12 #68d5ff
-color13 #ffa3aa
-color14 #c7fffd
-color15 #ffffff
-
-kitty_mod ctrl
-clear_all_shortcuts yes
-map kitty_mod+shift+c copy_to_clipboard
-map kitty_mod+shift+v paste_from_clipboard
-map shift+insert      paste_from_selection
-map kitty_mod+k       scroll_line_up
-map kitty_mod+k       scroll_line_up
-map kitty_mod+j       scroll_line_down
-map kitty_mod+equal   change_font_size all +2.0
-map kitty_mod+minus   change_font_size all -2.0
-map kitty_mod+0       change_font_size all 0
-map kitty_mod+o       open_url_with_hints
-map kitty_mod+x>l     kitten hints --type line --program -
-map kitty_mod+x>w     kitten hints --type word --program -
-map kitty_mod+shift+u kitten unicode_input
diff --git a/_unused/_wayland/rofi/config.rasi b/_unused/rofi/config.rasi
similarity index 100%
rename from _unused/_wayland/rofi/config.rasi
rename to _unused/rofi/config.rasi
diff --git a/_unused/_suckless/slock/LICENSE b/_unused/slock/LICENSE
similarity index 100%
rename from _unused/_suckless/slock/LICENSE
rename to _unused/slock/LICENSE
diff --git a/_unused/_suckless/slock/Makefile b/_unused/slock/Makefile
similarity index 100%
rename from _unused/_suckless/slock/Makefile
rename to _unused/slock/Makefile
diff --git a/_unused/_suckless/slock/README.md b/_unused/slock/README.md
similarity index 100%
rename from _unused/_suckless/slock/README.md
rename to _unused/slock/README.md
diff --git a/_unused/_suckless/slock/arg.h b/_unused/slock/arg.h
similarity index 100%
rename from _unused/_suckless/slock/arg.h
rename to _unused/slock/arg.h
diff --git a/_unused/_suckless/slock/config.def.h b/_unused/slock/config.def.h
similarity index 100%
rename from _unused/_suckless/slock/config.def.h
rename to _unused/slock/config.def.h
diff --git a/_unused/_suckless/slock/config.h b/_unused/slock/config.h
similarity index 100%
rename from _unused/_suckless/slock/config.h
rename to _unused/slock/config.h
diff --git a/_unused/_suckless/slock/config.mk b/_unused/slock/config.mk
similarity index 100%
rename from _unused/_suckless/slock/config.mk
rename to _unused/slock/config.mk
diff --git a/_unused/_suckless/slock/explicit_bzero.c b/_unused/slock/explicit_bzero.c
similarity index 100%
rename from _unused/_suckless/slock/explicit_bzero.c
rename to _unused/slock/explicit_bzero.c
diff --git a/_unused/_suckless/slock/slock.1 b/_unused/slock/slock.1
similarity index 100%
rename from _unused/_suckless/slock/slock.1
rename to _unused/slock/slock.1
diff --git a/_unused/_suckless/slock/slock.c b/_unused/slock/slock.c
similarity index 100%
rename from _unused/_suckless/slock/slock.c
rename to _unused/slock/slock.c
diff --git a/_unused/_suckless/slock/util.h b/_unused/slock/util.h
similarity index 100%
rename from _unused/_suckless/slock/util.h
rename to _unused/slock/util.h
diff --git a/_unused/xresources b/_unused/urxvt.xresources
similarity index 100%
rename from _unused/xresources
rename to _unused/urxvt.xresources
diff --git a/install.sh b/install.sh
index f1a0cfe..ac5d656 100644
--- a/install.sh
+++ b/install.sh
@@ -1,40 +1,40 @@
 #!/bin/sh
 
-# clean + prepare local dirs
-rm -rf ~/.cache ~/.config/_cache /tmp/${USER}-cache
-rm -rf ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh* ~/.local/share/nvim ~/.local/state/nvim
-mkdir -p /tmp/${USER}-cache/ ~/.config ~/.local/bin ~/.local/share
-chmod 700 /tmp/${USER}-cache
-
-# export XDG stuff for later use
-export XDG_CACHE_HOME=/tmp/${USER}-cache
-export XDG_CONFIG_HOME=$HOME/.config
-export XDG_DATA_HOME=$HOME/.local/share
-export XDG_STATE_HOME=$HOME/.local/state
-
-# prepare repository
-mkdir -p $XDG_DATA_HOME/repos
-rm -rf $XDG_DATA_HOME/repos/dotfiles
-git clone --recurse https://git.insomniac.pl/ftpd/dotfiles $XDG_DATA_HOME/repos/dotfiles
-
+# # clean + prepare local dirs
+# rm -rf ~/.cache ~/.config/_cache /tmp/${USER}-cache
+# rm -rf ~/.fdignore ~/.fzf.bash ~/.fzf.zsh ~/.gitconfig ~/.gitignore ~/.history ~/.tmux.conf ~/.vim* ~/.zcomp* ~/.zsh* ~/.local/share/nvim ~/.local/state/nvim
+# mkdir -p /tmp/${USER}-cache/ ~/.config ~/.local/bin ~/.local/share
+# chmod 700 /tmp/${USER}-cache
+#
+# # export XDG stuff for later use
+# export XDG_CACHE_HOME=/tmp/${USER}-cache
+# export XDG_CONFIG_HOME=$HOME/.config
+# export XDG_DATA_HOME=$HOME/.local/share
+# export XDG_STATE_HOME=$HOME/.local/state
+#
+# # prepare repository
+# mkdir -p $XDG_DATA_HOME/repos
+# rm -rf $XDG_DATA_HOME/repos/dotfiles
+# git clone --recurse https://git.insomniac.pl/ftpd/dotfiles $XDG_DATA_HOME/repos/dotfiles
+#
+# # astronvim
+# rm -rf ~/.config/nvim $XDG_DATA_HOME/repos/AstroNvim
+# git clone --depth 1 https://github.com/AstroNvim/AstroNvim $XDG_DATA_HOME/repos/AstroNvim
+# ln -sf $XDG_DATA_HOME/repos/AstroNvim $XDG_CONFIG_HOME/nvim
+#
 # configs
-for i in astronvim fd htop starship.toml tmux; do
-  rm -rf $XDG_CONFIG_HOME/${i}
-  ln -sf $XDG_DATA_HOME/repos/dotfiles/${i} $XDG_CONFIG_HOME
+for i in _cli/*; do
+  echo rm -rf $XDG_CONFIG_HOME/$(basename $i)
+  echo ln -sf $XDG_DATA_HOME/repos/dotfiles/${i} $XDG_CONFIG_HOME/
 done
-
-# astronvim
-rm -rf ~/.config/nvim $XDG_DATA_HOME/repos/AstroNvim
-git clone --depth 1 https://github.com/AstroNvim/AstroNvim $XDG_DATA_HOME/repos/AstroNvim
-ln -sf $XDG_DATA_HOME/repos/AstroNvim $XDG_CONFIG_HOME/nvim
-
-## zsh
-### modules
-mkdir -p $XDG_DATA_HOME/repos/zsh_modules
-rm -rf $XDG_DATA_HOME/repos/zsh_modules/*
-for module in mfaerevaag/wd zdharma-continuum/fast-syntax-highlighting; do
-  git clone https://github.com/${module} $XDG_DATA_HOME/repos/zsh_modules/${module#*/}
-done
-### config
-rm -rf $XDG_CONFIG_HOME/zsh
-ln -sf $XDG_DATA_HOME/repos/dotfiles/zsh $XDG_CONFIG_HOME
+#
+# ## zsh
+# ### modules
+# mkdir -p $XDG_DATA_HOME/repos/zsh_modules
+# rm -rf $XDG_DATA_HOME/repos/zsh_modules/*
+# for module in mfaerevaag/wd zdharma-continuum/fast-syntax-highlighting; do
+#   git clone https://github.com/${module} $XDG_DATA_HOME/repos/zsh_modules/${module#*/}
+# done
+# ### config
+# rm -rf $XDG_CONFIG_HOME/zsh
+# ln -sf $XDG_DATA_HOME/repos/dotfiles/zsh $XDG_CONFIG_HOME