diff --git a/.gitignore b/.gitignore
index f004673..9bbbeea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 .luarc.json
-/zsh/plugins
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..6f44e44
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "zsh/plugins/zsh-autosuggestions"]
+	path = zsh/plugins/zsh-autosuggestions
+	url = git@github.com:zsh-users/zsh-autosuggestions.git
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..1aaef7e
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,78 @@
+install_base:
+	sudo dnf install -y \
+		NetworkManager-tui \
+		btop \
+		cava \
+		cbonsai \
+		cloc \
+		cmatrix \
+		fastfetch \
+		fzf \
+		git \
+		git-lfs \
+		htop \
+		httpie \
+		light \
+		lynx \
+		mc \
+		ncdu \
+		neovim \
+		profanity \
+		pwgen \
+		ranger \
+		ripgrep \
+		sen \
+		stow \
+		telnet \
+		vim \
+		zsh
+
+install_gui:
+	sudo dnf install -y \
+		dino \
+		epiphany \
+		firefox \
+		gimp \
+		gparted \
+		inkscape \
+		kitty \
+		mediawriter \
+		qt5ct \
+		telegram-desktop \
+		thunderbird \
+		vlc \
+		fontawesome-fonts \
+		terminus-fonts \
+		unifont-fonts
+
+install_multimedia:
+	sudo dnf group install Multimedia
+
+install_i3: install_base install_gui
+	sudo dnf install -y \
+		arandr \
+		dunst \
+		gpick \
+		i3 \
+		picom \
+		polybar \
+		rofi \
+		rxvt-unicode \
+		unclutter-xfixes \
+		xclip \
+		xdotool \
+		xdpyinfo \
+		xev \
+		xkill \
+		xprop
+
+remove_default_configs:
+	rm -f ~/.zshrc
+	rm -f ~/.config/i3/config
+
+apply_configs: remove_default_configs
+	stow -Rvt ~ home
+
+desktop_i3: install_i3 apply_configs
+
+# vim: set ts=4 sw=4 autoindent noexpandtab:
diff --git a/README.md b/README.md
index 16c6cfd..b438f3e 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,12 @@
 
 ## Bootstrap
 
-1. `git clone https://github.com/He4eT/dotfiles.git ~/dotfiles`
-1. Run `./installPackages.sh`
-1. Run `./apply.sh`
+1. Setup SSH keys
+1. [Enable RPM Fusion](https://docs.fedoraproject.org/en-US/quick-docs/rpmfusion-setup/)
+1. `sudo dnf install git make`
+1. `git clone --recurse-submodules git@github.com:He4eT/dotfiles.git ~/dotfiles`
 1. Install [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh#basic-installation)
+1. `make desktop_i3`
 
 ## GTK
 
@@ -17,13 +19,6 @@
     XDG_CURRENT_DESKTOP=gnome
     ```
 
-## git
-
-1. `git config --global core.pager 'less -S'`
-1. `git config --global pull.rebase true`
-1. `git config user.email 'email'`
-1. `git config user.name 'name'`
-
 ## Telegram
 
 1. Tinted theme: `#707070`
diff --git a/apply.sh b/apply.sh
deleted file mode 100755
index 6862ddb..0000000
--- a/apply.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-# .Xresources
-rm ~/.Xresources
-ln -sv ~/dotfiles/root/.Xresources ~/.Xresources
-
-# .zshrc
-rm ~/.zshrc
-ln -sv ~/dotfiles/root/.zshrc ~/.zshrc
-
-# .vimrc
-rm ~/.vimrc
-ln -sv ~/dotfiles/root/.vimrc ~/.vimrc
-
-# .lynxrc
-rm ~/.lynxrc
-ln -sv ~/dotfiles/root/.lynxrc ~/.lynxrc
-
-# kitty
-mkdir -p ~/.config/kitty
-rm ~/.config/kitty/kitty.conf
-ln -sv ~/dotfiles/kitty/kitty.conf ~/.config/kitty/kitty.conf
-
-# neovim
-mkdir -p ~/.config/nvim
-rm ~/.config/nvim/init.lua
-ln -sv ~/dotfiles/nvim/init.lua ~/.config/nvim/init.lua
-
-# i3
-mkdir -p ~/.config/i3
-rm ~/.config/i3/config
-ln -sv ~/dotfiles/i3/config ~/.config/i3/config
-# sudo cp ~/dotfiles/i3/i3-gaps.desktop /usr/share/xsessions/i3-gaps.desktop
-
-# dunst
-mkdir -p ~/.config/dunst
-rm ~/.config/dunst/dunstrc
-ln -sv ~/dotfiles/dunst/dunstrc ~/.config/dunst/dunstrc
-
-# polybar
-mkdir -p ~/.config/polybar
-rm ~/.config/polybar/config
-ln -sv ~/dotfiles/polybar/config.ini ~/.config/polybar/config.ini
-
-# ranger
-mkdir -p ~/.config/ranger
-rm ~/.config/ranger/rc.conf
-ln -sv ~/dotfiles/ranger/rc.conf ~/.config/ranger/rc.conf
-rm ~/.config/ranger/scope.sh
-ln -sv ~/dotfiles/ranger/scope.sh ~/.config/ranger/scope.sh
-
-# rofi
-mkdir -p ~/.config/rofi
-rm ~/.config/rofi/config
-ln -sv ~/dotfiles/rofi/config.rasi ~/.config/rofi/config.rasi
-rm ~/.config/rofi/paper-float.rasi
-ln -sv ~/dotfiles/rofi/paper-float.rasi ~/.config/rofi/paper-float.rasi
diff --git a/firefox/README.md b/firefox/README.md
index 07440ad..55d830e 100644
--- a/firefox/README.md
+++ b/firefox/README.md
@@ -1,6 +1,12 @@
 # Firefox
 
+## userChrome
+
 1. Set `toolkit.legacyUserProfileCustomizations.stylesheets` to `true` with `about:config`
 1. Locate profile with `about:profiles`
 1. Copy `firefox/userChrome.css` to `{Root Directory}/chrome/userChrome.css`
 1. Customize interface
+
+## userStyles
+
+Styles can be applied using the [CSS Override extension](https://github.com/swcolegrove/css-override-web-extension).
diff --git a/firefox/configs-treestyletab@piro.sakura.ne.jp.json b/firefox/treestyletab/configs-treestyletab@piro.sakura.ne.jp.json
similarity index 100%
rename from firefox/configs-treestyletab@piro.sakura.ne.jp.json
rename to firefox/treestyletab/configs-treestyletab@piro.sakura.ne.jp.json
diff --git a/firefox/treestyletab.css b/firefox/treestyletab/treestyletab.css
similarity index 100%
rename from firefox/treestyletab.css
rename to firefox/treestyletab/treestyletab.css
diff --git a/userStyles/lemmy.css b/firefox/userStyles/lemmy.css
similarity index 100%
rename from userStyles/lemmy.css
rename to firefox/userStyles/lemmy.css
diff --git a/userStyles/zulip.css b/firefox/userStyles/zulip.css
similarity index 100%
rename from userStyles/zulip.css
rename to firefox/userStyles/zulip.css
diff --git a/firefox/vimium-options.json b/firefox/vimium/vimium-options.json
similarity index 100%
rename from firefox/vimium-options.json
rename to firefox/vimium/vimium-options.json
diff --git a/root/.Xresources b/home/.Xresources
similarity index 100%
rename from root/.Xresources
rename to home/.Xresources
diff --git a/dunst/dunstrc b/home/.config/dunst/dunstrc
similarity index 100%
rename from dunst/dunstrc
rename to home/.config/dunst/dunstrc
diff --git a/i3/config b/home/.config/i3/config
similarity index 100%
rename from i3/config
rename to home/.config/i3/config
diff --git a/kitty/kitty.conf b/home/.config/kitty/kitty.conf
similarity index 100%
rename from kitty/kitty.conf
rename to home/.config/kitty/kitty.conf
diff --git a/nvim/.stylua.toml b/home/.config/nvim/.stylua.toml
similarity index 100%
rename from nvim/.stylua.toml
rename to home/.config/nvim/.stylua.toml
diff --git a/nvim/init.lua b/home/.config/nvim/init.lua
similarity index 98%
rename from nvim/init.lua
rename to home/.config/nvim/init.lua
index e915126..4422dba 100644
--- a/nvim/init.lua
+++ b/home/.config/nvim/init.lua
@@ -149,13 +149,6 @@ vim.api.nvim_create_autocmd('TermOpen', {
   command = 'setlocal nonumber',
 })
 
--- Switch the keyboard layout to English (US) when leaving Insert Mode
-vim.api.nvim_create_autocmd('InsertLeave', {
-  group = vim.api.nvim_create_augroup('SwitchToEnglishOnLeave', { clear = true }),
-  pattern = '*',
-  command = 'silent !xkb-switch -s us',
-})
-
 --[[ cfg_keymaps: Base keymaps ]]
 
 local leader = ' '
@@ -616,7 +609,6 @@ require('lazy').setup({
   },
 }, {
   -- lazy.nvim options
-  lockfile = '~/dotfiles/nvim/lazy-lock.json',
   ui = {
     backdrop = 100,
     border = 'solid',
diff --git a/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json
similarity index 100%
rename from nvim/lazy-lock.json
rename to home/.config/nvim/lazy-lock.json
diff --git a/polybar/config.ini b/home/.config/polybar/config.ini
similarity index 100%
rename from polybar/config.ini
rename to home/.config/polybar/config.ini
diff --git a/home/.config/profanity/profrc b/home/.config/profanity/profrc
new file mode 100644
index 0000000..c64d560
--- /dev/null
+++ b/home/.config/profanity/profrc
@@ -0,0 +1,2 @@
+[ui]
+theme=desolate
diff --git a/profanity/themes/desolate b/home/.config/profanity/themes/desolate
similarity index 100%
rename from profanity/themes/desolate
rename to home/.config/profanity/themes/desolate
diff --git a/ranger/rc.conf b/home/.config/ranger/rc.conf
similarity index 100%
rename from ranger/rc.conf
rename to home/.config/ranger/rc.conf
diff --git a/ranger/scope.sh b/home/.config/ranger/scope.sh
similarity index 100%
rename from ranger/scope.sh
rename to home/.config/ranger/scope.sh
diff --git a/rofi/config.rasi b/home/.config/rofi/config.rasi
similarity index 100%
rename from rofi/config.rasi
rename to home/.config/rofi/config.rasi
diff --git a/rofi/paper-float.rasi b/home/.config/rofi/paper-float.rasi
similarity index 100%
rename from rofi/paper-float.rasi
rename to home/.config/rofi/paper-float.rasi
diff --git a/home/.gitconfig b/home/.gitconfig
new file mode 100644
index 0000000..f51aff6
--- /dev/null
+++ b/home/.gitconfig
@@ -0,0 +1,12 @@
+[user]
+	name = He4eT
+	email = He4eT@oddsquat.org
+[core]
+	pager = less -S
+[pull]
+	rebase = true
+[filter "lfs"]
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
+	clean = git-lfs clean -- %f
diff --git a/root/.lynxrc b/home/.lynxrc
similarity index 100%
rename from root/.lynxrc
rename to home/.lynxrc
diff --git a/root/.vimrc b/home/.vimrc
similarity index 100%
rename from root/.vimrc
rename to home/.vimrc
diff --git a/root/.zshrc b/home/.zshrc
similarity index 100%
rename from root/.zshrc
rename to home/.zshrc
diff --git a/i3/i3-gaps.desktop b/i3/i3-gaps.desktop
deleted file mode 100644
index bcb4572..0000000
--- a/i3/i3-gaps.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=i3-gaps
-Comment=improved dynamic tiling window manager
-Exec=i3
-TryExec=i3
-Type=Application
-X-LightDM-DesktopName=i3
-DesktopNames=i3
-
diff --git a/installPackages.sh b/installPackages.sh
deleted file mode 100755
index aa6c9c5..0000000
--- a/installPackages.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-sudo dnf install \
-  fontawesome-fonts \
-  terminus-fonts \
-  unifont-fonts \
-  i3 \
-  picom \
-  polybar \
-  rofi \
-  lxappearance \
-  gparted \
-  gimp \
-  vlc \
-  qt5ct \
-  rxvt-unicode \
-  cbonsai \
-  cmatrix \
-  fastfetch \
-  NetworkManager-tui \
-  arandr \
-  gpick \
-  light \
-  btop \
-  htop \
-  ncdu \
-  lynx \
-  sen \
-  vim \
-  neovim \
-  ripgrep \
-  xclip \
-  xdotool \
-  xdpyinfo \
-  xkb-switch \
-  unclutter-xfixes \
-  git \
-  zsh \
-  mc \
-  ranger \
-  telegram-desktop \
-
-sudo dnf group install Multimedia
-
-mkdir ./zsh/plugins
-git clone git@github.com:zsh-users/zsh-autosuggestions.git ~/dotfiles/zsh/plugins/zsh-autosuggestions
diff --git a/oomox/colors/desolate b/oomox/colors/desolate
deleted file mode 100644
index 43dadb7..0000000
--- a/oomox/colors/desolate
+++ /dev/null
@@ -1,34 +0,0 @@
-NAME="desolate"
-THEME_STYLE=oomox
-GTK3_GENERATE_DARK=True
-
-ROUNDNESS=0
-GRADIENT=0.0
-SPACING=8
-OUTLINE_WIDTH=0
-BTN_OUTLINE_OFFSET=2
-BTN_OUTLINE_WIDTH=2
-
-ACCENT_BG=CDCDCD
-BG=383838
-BTN_BG=383838
-BTN_FG=CDCDCD
-CARET1_FG=CDCDCD
-CARET2_FG=CDCDCD
-CARET_SIZE=0.08
-FG=CDCDCD
-HDR_BG=383838
-HDR_BTN_BG=383838
-HDR_BTN_FG=CDCDCD
-HDR_FG=CDCDCD
-MENU_BG=383838
-MENU_FG=CDCDCD
-SEL_BG=BDBDBD
-SEL_FG=383838
-TXT_BG=383838
-TXT_FG=CDCDCD
-WM_BORDER_FOCUS=FFFFFF
-WM_BORDER_UNFOCUS=383838
-
-ICONS_ARCHDROID=757575
-ICONS_STYLE=archdroid
diff --git a/oomox/colors/gray b/oomox/colors/gray
deleted file mode 100644
index 8da9dba..0000000
--- a/oomox/colors/gray
+++ /dev/null
@@ -1,34 +0,0 @@
-NAME="gray"
-THEME_STYLE=oomox
-GTK3_GENERATE_DARK=False
-
-ROUNDNESS=0
-GRADIENT=0.0
-SPACING=4
-OUTLINE_WIDTH=0
-BTN_OUTLINE_OFFSET=2
-BTN_OUTLINE_WIDTH=2
-
-ACCENT_BG=212121
-BG=BDBDBD
-BTN_BG=BDBDBD
-BTN_FG=212121
-CARET1_FG=212121
-CARET2_FG=212121
-CARET_SIZE=0.08
-FG=212121
-HDR_BG=BDBDBD
-HDR_BTN_BG=BDBDBD
-HDR_BTN_FG=212121
-HDR_FG=212121
-MENU_BG=BDBDBD
-MENU_FG=212121
-SEL_BG=A3A3A3
-SEL_FG=212121
-TXT_BG=E0E0E0
-TXT_FG=212121
-WM_BORDER_FOCUS=9E9E9E
-WM_BORDER_UNFOCUS=BDBDBD
-
-ICONS_ARCHDROID=757575
-ICONS_STYLE=archdroid
diff --git a/zsh/plugins/zsh-autosuggestions b/zsh/plugins/zsh-autosuggestions
new file mode 160000
index 0000000..85919cd
--- /dev/null
+++ b/zsh/plugins/zsh-autosuggestions
@@ -0,0 +1 @@
+Subproject commit 85919cd1ffa7d2d5412f6d3fe437ebdbeeec4fc5