diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f004673
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.luarc.json
+/zsh/plugins
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 6f44e44..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[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
deleted file mode 100644
index e05932c..0000000
--- a/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-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 -fr ~/.config/i3
-
-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 b438f3e..16c6cfd 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,10 @@
 
 ## Bootstrap
 
-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. `git clone https://github.com/He4eT/dotfiles.git ~/dotfiles`
+1. Run `./installPackages.sh`
+1. Run `./apply.sh`
 1. Install [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh#basic-installation)
-1. `make desktop_i3`
 
 ## GTK
 
@@ -19,6 +17,13 @@
     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
new file mode 100755
index 0000000..6862ddb
--- /dev/null
+++ b/apply.sh
@@ -0,0 +1,55 @@
+# .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/home/.config/dunst/dunstrc b/dunst/dunstrc
similarity index 100%
rename from home/.config/dunst/dunstrc
rename to dunst/dunstrc
diff --git a/firefox/README.md b/firefox/README.md
index 55d830e..07440ad 100644
--- a/firefox/README.md
+++ b/firefox/README.md
@@ -1,12 +1,6 @@
 # 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/treestyletab/configs-treestyletab@piro.sakura.ne.jp.json b/firefox/configs-treestyletab@piro.sakura.ne.jp.json
similarity index 100%
rename from firefox/treestyletab/configs-treestyletab@piro.sakura.ne.jp.json
rename to firefox/configs-treestyletab@piro.sakura.ne.jp.json
diff --git a/firefox/treestyletab/treestyletab.css b/firefox/treestyletab.css
similarity index 100%
rename from firefox/treestyletab/treestyletab.css
rename to firefox/treestyletab.css
diff --git a/firefox/vimium/vimium-options.json b/firefox/vimium-options.json
similarity index 100%
rename from firefox/vimium/vimium-options.json
rename to firefox/vimium-options.json
diff --git a/home/.config/profanity/profrc b/home/.config/profanity/profrc
deleted file mode 100644
index c64d560..0000000
--- a/home/.config/profanity/profrc
+++ /dev/null
@@ -1,2 +0,0 @@
-[ui]
-theme=desolate
diff --git a/home/.gitconfig b/home/.gitconfig
deleted file mode 100644
index f51aff6..0000000
--- a/home/.gitconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-[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/home/.config/i3/config b/i3/config
similarity index 100%
rename from home/.config/i3/config
rename to i3/config
diff --git a/i3/i3-gaps.desktop b/i3/i3-gaps.desktop
new file mode 100644
index 0000000..bcb4572
--- /dev/null
+++ b/i3/i3-gaps.desktop
@@ -0,0 +1,9 @@
+[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
new file mode 100755
index 0000000..aa6c9c5
--- /dev/null
+++ b/installPackages.sh
@@ -0,0 +1,44 @@
+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/home/.config/kitty/kitty.conf b/kitty/kitty.conf
similarity index 100%
rename from home/.config/kitty/kitty.conf
rename to kitty/kitty.conf
diff --git a/home/.config/nvim/.stylua.toml b/nvim/.stylua.toml
similarity index 100%
rename from home/.config/nvim/.stylua.toml
rename to nvim/.stylua.toml
diff --git a/home/.config/nvim/init.lua b/nvim/init.lua
similarity index 95%
rename from home/.config/nvim/init.lua
rename to nvim/init.lua
index 7bdcb08..e986c0a 100644
--- a/home/.config/nvim/init.lua
+++ b/nvim/init.lua
@@ -149,6 +149,13 @@ 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 = ' '
@@ -184,8 +191,8 @@ vim.keymap.set('n', '<leader>l', '<C-i>', { desc = 'Forward' })
 -- Copy'n'Paste
 vim.keymap.set('v', '<leader>y', '"+y', { desc = 'Cop[y] selection to system clipboard' })
 vim.keymap.set('n', '<leader>y', function()
-  vim.fn.setreg('+', vim.fn.getreg '"')
-  print 'Copied to system clipboard'
+  vim.fn.setreg('+', vim.fn.getreg('"'))
+  print('Copied to system clipboard')
 end, {
   silent = true,
   desc = 'Copy last [y]anked or deleted text to system clipboard',
@@ -487,30 +494,7 @@ require('lazy').setup({
 
       --[[ cfg_lazy_lsp_servers ]]
       local servers = {
-        lua_ls = {
-          on_init = function(client)
-            if client.workspace_folders then
-              local path = client.workspace_folders[1].name
-              if path ~= vim.fn.stdpath 'config' and (vim.uv.fs_stat(path .. '/.luarc.json') or vim.uv.fs_stat(path .. '/.luarc.jsonc')) then
-                return
-              end
-            end
-
-            client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, {
-              runtime = {
-                version = 'LuaJIT',
-                path = { 'lua/?.lua', 'lua/?/init.lua' },
-              },
-              workspace = {
-                checkThirdParty = false,
-                library = vim.tbl_extend('force', vim.api.nvim_get_runtime_file('', true), {
-                  '${3rd}/luv/library',
-                  '${3rd}/busted/library',
-                }),
-              },
-            })
-          end,
-        },
+        lua_ls = {},
         ts_ls = {
           filetypes = { 'javascript', 'javascriptreact', 'typescript', 'typescriptreact', 'vue' },
           init_options = {
@@ -632,6 +616,7 @@ require('lazy').setup({
   },
 }, {
   -- lazy.nvim options
+  lockfile = '~/dotfiles/nvim/lazy-lock.json',
   ui = {
     backdrop = 100,
     border = 'solid',
diff --git a/home/.config/nvim/lazy-lock.json b/nvim/lazy-lock.json
similarity index 100%
rename from home/.config/nvim/lazy-lock.json
rename to nvim/lazy-lock.json
diff --git a/oomox/colors/desolate b/oomox/colors/desolate
new file mode 100644
index 0000000..43dadb7
--- /dev/null
+++ b/oomox/colors/desolate
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 0000000..8da9dba
--- /dev/null
+++ b/oomox/colors/gray
@@ -0,0 +1,34 @@
+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/home/.config/polybar/config.ini b/polybar/config.ini
similarity index 100%
rename from home/.config/polybar/config.ini
rename to polybar/config.ini
diff --git a/home/.config/profanity/themes/desolate b/profanity/themes/desolate
similarity index 100%
rename from home/.config/profanity/themes/desolate
rename to profanity/themes/desolate
diff --git a/home/.config/ranger/rc.conf b/ranger/rc.conf
similarity index 100%
rename from home/.config/ranger/rc.conf
rename to ranger/rc.conf
diff --git a/home/.config/ranger/scope.sh b/ranger/scope.sh
similarity index 100%
rename from home/.config/ranger/scope.sh
rename to ranger/scope.sh
diff --git a/home/.config/rofi/config.rasi b/rofi/config.rasi
similarity index 100%
rename from home/.config/rofi/config.rasi
rename to rofi/config.rasi
diff --git a/home/.config/rofi/paper-float.rasi b/rofi/paper-float.rasi
similarity index 97%
rename from home/.config/rofi/paper-float.rasi
rename to rofi/paper-float.rasi
index 5350a51..df9b1c1 100644
--- a/home/.config/rofi/paper-float.rasi
+++ b/rofi/paper-float.rasi
@@ -16,7 +16,7 @@
 #window {
     border: @border-width;
     width: 800px;
-    height: 466px;
+    height: 477px;
 }
 
 #inputbar {
diff --git a/home/.Xresources b/root/.Xresources
similarity index 100%
rename from home/.Xresources
rename to root/.Xresources
diff --git a/home/.lynxrc b/root/.lynxrc
similarity index 100%
rename from home/.lynxrc
rename to root/.lynxrc
diff --git a/home/.vimrc b/root/.vimrc
similarity index 100%
rename from home/.vimrc
rename to root/.vimrc
diff --git a/home/.zshrc b/root/.zshrc
similarity index 100%
rename from home/.zshrc
rename to root/.zshrc
diff --git a/firefox/userStyles/lemmy.css b/userStyles/lemmy.css
similarity index 100%
rename from firefox/userStyles/lemmy.css
rename to userStyles/lemmy.css
diff --git a/firefox/userStyles/zulip.css b/userStyles/zulip.css
similarity index 100%
rename from firefox/userStyles/zulip.css
rename to userStyles/zulip.css
diff --git a/zsh/plugins/zsh-autosuggestions b/zsh/plugins/zsh-autosuggestions
deleted file mode 160000
index 85919cd..0000000
--- a/zsh/plugins/zsh-autosuggestions
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 85919cd1ffa7d2d5412f6d3fe437ebdbeeec4fc5