diff --git a/.config/vim/vimrc b/.config/vim/vimrc
index 00dda28..8f2e58d 100644
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@@ -1,10 +1,11 @@
 set nocompatible              " be iMproved, required
 
 " Reconfigure Vim to be clean!
-set rtp+=~/.config/vim
-set directory=.,~/.config/vim
-set viminfo+=n~/.config/vim/viminfo
-set directory=$HOME/.config/vim/swapfiles//
+set undodir=$XDG_CACHE_HOME/vim/undo
+set directory=$XDG_CACHE_HOME/vim/swap
+set backupdir=$XDG_CACHE_HOME/vim/backup
+set viminfo+='1000,n$XDG_CACHE_HOME/vim/viminfo
+set runtimepath+=$XDG_CONFIG_HOME/vim,$VIMRUNTIME,$XDG_CONFIG_HOME/vim/after
 
 syntax enable
 filetype plugin on
diff --git a/.profile b/.profile
index 08c83bf..3e442ef 100644
--- a/.profile
+++ b/.profile
@@ -18,8 +18,8 @@ export PATH="${PATH}:$DOTFILES/scripts"
 
 # Allow Vim to load from ~/.config/vim
 export VIMDIR="$XDG_CONFIG_HOME/vim"
-export MYVIMRC="$VIMDIR/vimrc"
-export VIMINIT=":so $MYVIMRC"
+export VIMRC="$VIMDIR/vimrc"
+export VIMINIT=":so $VIMRC"
 export EDITOR="vim"
 export VISUAL="vim"