diff --git a/nvim/init.lua b/nvim/init.lua
index b9f7c2d..fbbdc3a 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -42,8 +42,8 @@ function addGitTopLevelDirectoryToRuntimePath()
 end
 
 vim.cmd [[
-    source ~/.vimrc.common
-    source ~/.vim/plugins.vim
+    source $XDG_CONFIG_HOME/vim/vimrc.common
+    source $XDG_CONFIG_HOME/vim/plugins.vim
 ]]
 
 addGitTopLevelDirectoryToRuntimePath()
diff --git a/gvimrc b/vim/gvimrc
similarity index 100%
rename from gvimrc
rename to vim/gvimrc
diff --git a/vimrc b/vim/vimrc
similarity index 90%
rename from vimrc
rename to vim/vimrc
index a0d2aea..d7f1271 100644
--- a/vimrc
+++ b/vim/vimrc
@@ -1,7 +1,8 @@
 " ~/.vimrc
 " Eryn Wells <eryn@erynwells.me>
 
-source ~/.vimrc.common
+source $XDG_CONFIG_HOME/vim/vimrc.common
+source $XDG_CONFIG_HOME/vim/plugins.vim
 
 if !has('nvim')
     set nocompatible        " use enhanced vim features
@@ -24,4 +25,6 @@ if !has('nvim')
     "   :   maximum number of lines of command history to save
     "   s   shada entries over 100 KiB are skipped
     set viminfo=%100,'100,h,<1000,:100,s100
+
+    colorscheme zaibatsu
 endif
diff --git a/vimrc.common b/vim/vimrc.common
similarity index 100%
rename from vimrc.common
rename to vim/vimrc.common