diff --git a/config.yaml b/config.yaml
index 7cad415..b72f7ab 100644
--- a/config.yaml
+++ b/config.yaml
@@ -16,26 +16,32 @@ config:
   showdiff: false
   workdir: ~/.config/dotdrop
 dotfiles:
-  f_tmux.conf:
-    dst: ~/.tmux.conf
-    src: ./tmux/.tmux.conf
-    link: true
+
+  # Alacritty
   f_alacritty.yml:
     dst: ~/.config/alacritty/alacritty.yml
     src: ./alacritty/.config/alacritty/alacritty.yml
     link: true
+
+  # Bin
   d_bin:
     dst: ~/bin/
     src: ./bin/bin/
     link: true
+
+  # Compton
   f_compton.conf:
     dst: ~/.config/compton/compton.conf
     src: ./compton/.config/compton/compton.conf
     link: true
+
+  # Ctags
   f_ctags:
     dst: ~/.ctags
     src: ./ctags/.ctags
     link: true
+
+  # Dunst
   f_dunstrc:
     dst: ~/.config/dunst/dunstrc
     src: ./dunst/.config/dunst/dunstrc
@@ -44,38 +50,204 @@ dotfiles:
     dst: ~/.icons/dunst/
     src: ./dunst/.icons/dunst/
     link: true
+
+  # Firefox
+  d_firefox:
+    dst: /tmp/.dotdrop/firefox_install/
+    src: ./firefox/
+    actions:
+      - firefox_install
+
+  # Git
   f_gitconfig:
     dst: ~/.gitconfig
     src: ./git/.gitconfig
     link: true
+
+  # GTK
   d_gtk:
     dst: ~/.config/gtk-3.0/
-    src: ./gtk/.config/gtk-3.0/
-    link: true
+    src: ./gtk/
+
+  # Lead
   f_lead:
     dst: ~/.config/lead/lead.conf
     src: ./lead/.config/lead/lead.conf
     link: true
-  f_vimrc:
-    dst: ~/.vimrc
-    src: vimrc
-    actions:
-     - vim-plug-install
-     - vim-plug
+
+  # Linters
+  d_linters:
+    dst: ~/
+    src: ./linters/
+
+  # MPD
+  f_mpd:
+    dst: ~/.config/mpd/mpd.conf
+    src: ./mpd/mpd.conf
+    link: true
+
+  # MyCLI
+  f_myclirc:
+    dst: ~/.myclirc
+    src: ./mycli/.myclirc
+    link: true
+
+  # ncmpcpp
+  f_ncmpcpp:
+    dst: ~/.config/ncmpcpp/config
+    src: ./ncmpcpp/config
+    link: true
+
+  # neofetch
+  f_neofetch:
+    dst: ~/.config/neofetch/config
+    src: ./neofetch/config
+    link: true
+
+  # NPM
+  f_npmrc:
+    dst: ~/.npmrc
+    src: ./npm/.npmrc
+    link: true
+
+  # openbox
+  d_openbox:
+    dst: ~/.config/openbox/
+    src: ./openbox/config/
+  d_openbox_theme:
+    dst: ~/.local/share/themes/Arc-Dark/openbox-3/
+    src: ./openbox/theme/
+
+  # Ranger
+  d_ranger:
+    dst: ~/.config/ranger/
+    src: ./ranger/
+
+  # Redshift
+  f_redshift:
+    dst: ~/.config/redshift.conf
+    src: ./redshift/redshift.conf
+    link: true
+
+  # Rofi pass
+  f_rofi-pass:
+    dst: ~/.config/rofi-pass/config
+    src: ./rofi-pass/config
+    link: true
+
+  # setxkbmap
+  f_setxkbmap:
+    dst: ~/.config/setxkbmap.conf
+    src: ./setxkbmap/setxkbmap.conf
+    link: true
+
+  # sxhkd
+  f_sxhkdrc:
+    dst: ~/.config/sxhkd/sxhkdrc
+    src: ./sxhkd/sxhkdrc
+    link: true
+
+  # Termite
+  f_termite:
+    dst: ~/.config/termite/config
+    src: ./termite/config
+    link: true
+
+  # Tern
+  f_tern:
+    dst: ~/.tern-project
+    src: ./tern/.tern-project
+    link: true
+
+  # Thunar
+  f_thunar:
+    dst: ~/.config/Thunar/uca.xml
+    src: ./thunar/uca.xml
+    link: true
+
+  # tint2
   d_tint2:
     dst: ~/.config/tint2/
     src: ./tint2/
-  d_firefox:
-    dst: /tmp/.dotdrop/firefox_install/
-    src: ./firefox/
+
+  # tmux
+  f_tmux:
+    dst: ~/.tmux.conf
+    src: ./tmux/.tmux.conf
+    link: true
+
+  # tmuxinator
+  d_tmuxinator:
+    dst: ~/.config/tmuxinator/
+    src: ./tmuxinator/
+
+  f_vim:
+    dst: ~/.vim/
+    src: ./vim/
     actions:
-      - firefox_install
+     - vim-plug-install
+     - vim-plug
+
+  # X
+  d_x:
+    dst: ~/
+    src: ./X/
+
+  # yay
+  f_yay:
+    dst: ~/.config/yay/config.json
+    src: ./yay/config.json
+    link: true
+
+  # Zathura
+  f_zathura:
+    dst: ~/.config/zathura/zathurarc
+    src: ./zathura/zathurarc
+    link: true
+
+  # zsh
+  d_zsh:
+    dst: ~/.oh-my-zsh/
+    src: ./zsh/
+
 profiles:
   Zeus:
     dotfiles:
-    - f_tmux.conf
+    - f_tmux
   Hermes:
     dotfiles:
-    - d_tint2
+    - f_alacritty.yml
+    - d_bin
+    - f_compton.conf
+    - f_ctags
+    - f_dunstrc
+    - d_dunst_icons
     - d_firefox
+    - f_gitconfig
+    - d_gtk
+    - f_lead
+    - d_linters
+    - f_mpd
+    - f_myclirc
+    - f_ncmpcpp
+    - f_neofetch
+    - f_npmrc
+    - d_openbox
+    - d_openbox_theme
+    - d_ranger
+    - f_redshift
+    - f_rofi-pass
+    - f_setxkbmap
+    - f_sxhkdrc
+    - f_termite
+    - f_tern
+    - f_thunar
+    - d_tint2
+    - f_tmux
+    - d_tmuxinator
+    - f_vim
+    - d_x
+    - f_yay
+    - f_zathura
+    - d_zsh
 
diff --git a/gtk/.config/gtk-3.0/bookmarks b/gtk/bookmarks
similarity index 100%
rename from gtk/.config/gtk-3.0/bookmarks
rename to gtk/bookmarks
diff --git a/gtk/.config/gtk-3.0/gtk.css b/gtk/gtk.css
similarity index 100%
rename from gtk/.config/gtk-3.0/gtk.css
rename to gtk/gtk.css
diff --git a/gtk/.config/gtk-3.0/settings.ini b/gtk/settings.ini
similarity index 93%
rename from gtk/.config/gtk-3.0/settings.ini
rename to gtk/settings.ini
index 05ee849..65efc5b 100644
--- a/gtk/.config/gtk-3.0/settings.ini
+++ b/gtk/settings.ini
@@ -5,7 +5,6 @@ gtk-cursor-theme-name=Paper
 gtk-cursor-theme-size=0
 gtk-enable-event-sounds=1
 gtk-enable-input-feedback-sounds=1
-gtk-fallback-icon-theme=breeze
 gtk-font-name=Cantarell 11
 gtk-icon-theme-name=Flat-Remix
 gtk-menu-images=1
diff --git a/mpd/.config/mpd/mpd.conf b/mpd/mpd.conf
similarity index 100%
rename from mpd/.config/mpd/mpd.conf
rename to mpd/mpd.conf
diff --git a/ncmpcpp/.config/ncmpcpp/config b/ncmpcpp/config
similarity index 100%
rename from ncmpcpp/.config/ncmpcpp/config
rename to ncmpcpp/config
diff --git a/neofetch/.config/neofetch/config b/neofetch/config
similarity index 100%
rename from neofetch/.config/neofetch/config
rename to neofetch/config
diff --git a/openbox/.config/openbox/autostart b/openbox/config/autostart
similarity index 100%
rename from openbox/.config/openbox/autostart
rename to openbox/config/autostart
diff --git a/openbox/.config/openbox/menu.xml b/openbox/config/menu.xml
similarity index 100%
rename from openbox/.config/openbox/menu.xml
rename to openbox/config/menu.xml
diff --git a/openbox/.config/openbox/rc.xml b/openbox/config/rc.xml
similarity index 100%
rename from openbox/.config/openbox/rc.xml
rename to openbox/config/rc.xml
diff --git a/openbox/.local/share/themes/Arc-Dark/openbox-3/close.xbm b/openbox/theme/close.xbm
similarity index 100%
rename from openbox/.local/share/themes/Arc-Dark/openbox-3/close.xbm
rename to openbox/theme/close.xbm
diff --git a/openbox/.local/share/themes/Arc-Dark/openbox-3/desk.xbm b/openbox/theme/desk.xbm
similarity index 100%
rename from openbox/.local/share/themes/Arc-Dark/openbox-3/desk.xbm
rename to openbox/theme/desk.xbm
diff --git a/openbox/.local/share/themes/Arc-Dark/openbox-3/desk_toggled.xbm b/openbox/theme/desk_toggled.xbm
similarity index 100%
rename from openbox/.local/share/themes/Arc-Dark/openbox-3/desk_toggled.xbm
rename to openbox/theme/desk_toggled.xbm
diff --git a/openbox/.local/share/themes/Arc-Dark/openbox-3/iconify.xbm b/openbox/theme/iconify.xbm
similarity index 100%
rename from openbox/.local/share/themes/Arc-Dark/openbox-3/iconify.xbm
rename to openbox/theme/iconify.xbm
diff --git a/openbox/.local/share/themes/Arc-Dark/openbox-3/max.xbm b/openbox/theme/max.xbm
similarity index 100%
rename from openbox/.local/share/themes/Arc-Dark/openbox-3/max.xbm
rename to openbox/theme/max.xbm
diff --git a/openbox/.local/share/themes/Arc-Dark/openbox-3/max_toggled.xbm b/openbox/theme/max_toggled.xbm
similarity index 100%
rename from openbox/.local/share/themes/Arc-Dark/openbox-3/max_toggled.xbm
rename to openbox/theme/max_toggled.xbm
diff --git a/openbox/.local/share/themes/Arc-Dark/openbox-3/shade.xbm b/openbox/theme/shade.xbm
similarity index 100%
rename from openbox/.local/share/themes/Arc-Dark/openbox-3/shade.xbm
rename to openbox/theme/shade.xbm
diff --git a/openbox/.local/share/themes/Arc-Dark/openbox-3/shade_toggled.xbm b/openbox/theme/shade_toggled.xbm
similarity index 100%
rename from openbox/.local/share/themes/Arc-Dark/openbox-3/shade_toggled.xbm
rename to openbox/theme/shade_toggled.xbm
diff --git a/openbox/.local/share/themes/Arc-Dark/openbox-3/themerc b/openbox/theme/themerc
similarity index 100%
rename from openbox/.local/share/themes/Arc-Dark/openbox-3/themerc
rename to openbox/theme/themerc
diff --git a/ranger/.config/ranger/rc.conf b/ranger/rc.conf
similarity index 100%
rename from ranger/.config/ranger/rc.conf
rename to ranger/rc.conf
diff --git a/ranger/.config/ranger/scope.sh b/ranger/scope.sh
similarity index 100%
rename from ranger/.config/ranger/scope.sh
rename to ranger/scope.sh
diff --git a/redshift/.config/redshift.conf b/redshift/redshift.conf
similarity index 100%
rename from redshift/.config/redshift.conf
rename to redshift/redshift.conf
diff --git a/rofi-pass/.config/rofi-pass/config b/rofi-pass/config
similarity index 100%
rename from rofi-pass/.config/rofi-pass/config
rename to rofi-pass/config
diff --git a/setxkbmap/.config/setxkbmap.conf b/setxkbmap/setxkbmap.conf
similarity index 100%
rename from setxkbmap/.config/setxkbmap.conf
rename to setxkbmap/setxkbmap.conf
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
similarity index 100%
rename from sxhkd/.config/sxhkd/sxhkdrc
rename to sxhkd/sxhkdrc
diff --git a/termite/.config/termite/config b/termite/config
similarity index 100%
rename from termite/.config/termite/config
rename to termite/config
diff --git a/thunar/.config/Thunar/uca.xml b/thunar/uca.xml
similarity index 100%
rename from thunar/.config/Thunar/uca.xml
rename to thunar/uca.xml
diff --git a/tmuxinator/.tmuxinator/apollo.yml b/tmuxinator/apollo.yml
similarity index 100%
rename from tmuxinator/.tmuxinator/apollo.yml
rename to tmuxinator/apollo.yml
diff --git a/tmuxinator/.tmuxinator/dots.yml b/tmuxinator/dots.yml
similarity index 100%
rename from tmuxinator/.tmuxinator/dots.yml
rename to tmuxinator/dots.yml
diff --git a/tmuxinator/.tmuxinator/elumicate.yml b/tmuxinator/elumicate.yml
similarity index 100%
rename from tmuxinator/.tmuxinator/elumicate.yml
rename to tmuxinator/elumicate.yml
diff --git a/tmuxinator/.tmuxinator/grum-python.yml b/tmuxinator/grum-python.yml
similarity index 100%
rename from tmuxinator/.tmuxinator/grum-python.yml
rename to tmuxinator/grum-python.yml
diff --git a/tmuxinator/.tmuxinator/sweatacademy.yml b/tmuxinator/sweatacademy.yml
similarity index 100%
rename from tmuxinator/.tmuxinator/sweatacademy.yml
rename to tmuxinator/sweatacademy.yml
diff --git a/vim/.vim/after/plugin/abolish.vim b/vim/after/plugin/abolish.vim
similarity index 100%
rename from vim/.vim/after/plugin/abolish.vim
rename to vim/after/plugin/abolish.vim
diff --git a/vim/.vim/plugin/ale-platformio.vim b/vim/plugin/ale-platformio.vim
similarity index 100%
rename from vim/.vim/plugin/ale-platformio.vim
rename to vim/plugin/ale-platformio.vim
diff --git a/vim/.vim/snippets/javascript.snippets b/vim/snippets/javascript.snippets
similarity index 100%
rename from vim/.vim/snippets/javascript.snippets
rename to vim/snippets/javascript.snippets
diff --git a/vim/.vim/vimrc b/vim/vimrc
similarity index 100%
rename from vim/.vim/vimrc
rename to vim/vimrc
diff --git a/vim/.vim/ycm_global_ycm_extra_conf.py b/vim/ycm_global_ycm_extra_conf.py
similarity index 99%
rename from vim/.vim/ycm_global_ycm_extra_conf.py
rename to vim/ycm_global_ycm_extra_conf.py
index 5b62c05..624abaa 100644
--- a/vim/.vim/ycm_global_ycm_extra_conf.py
+++ b/vim/ycm_global_ycm_extra_conf.py
@@ -171,6 +171,7 @@ def get_platformio_environment(wdir):
     # your first `platformio run`.
     _includes.insert(0, wdir + "/src")
     _includes.insert(0, wdir + "/.pioenvs")
+    _includes.insert(0, wdir + "/Inc")
 
     # Create "-I<include_file>" list
     inc_list = []
diff --git a/yay/.config/yay/config.json b/yay/config.json
similarity index 100%
rename from yay/.config/yay/config.json
rename to yay/config.json
diff --git a/zathura/.config/zathura/zathurarc b/zathura/zathurarc
similarity index 100%
rename from zathura/.config/zathura/zathurarc
rename to zathura/zathurarc
diff --git a/zsh/.zshrc b/zsh/.zshrc
index ab3b27a..e733e90 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -15,7 +15,7 @@ plugins=(git pass vi-mode)
 
 source "$ZSH/oh-my-zsh.sh"
 
-for file in $HOME/.dotfiles/omzsh/{exports,aliases,functions,secret}.sh; do
+for file in $ZSH/custom/{exports,aliases,functions,secret}.sh; do
   [ -r "$file" ] && [ -f "$file" ] && source "$file";
 done;
 
diff --git a/omzsh/aliases.sh b/zsh/custom/aliases.sh
similarity index 100%
rename from omzsh/aliases.sh
rename to zsh/custom/aliases.sh
diff --git a/omzsh/exports.sh b/zsh/custom/exports.sh
similarity index 100%
rename from omzsh/exports.sh
rename to zsh/custom/exports.sh
diff --git a/omzsh/functions.sh b/zsh/custom/functions.sh
similarity index 100%
rename from omzsh/functions.sh
rename to zsh/custom/functions.sh