diff --git a/home/.config/vim/vimrc b/home/.config/vim/vimrc
index ad1446c..0103f61 100755
--- a/home/.config/vim/vimrc
+++ b/home/.config/vim/vimrc
@@ -48,12 +48,18 @@ set splitbelow splitright		" Split in more natural way
 "set listchars=tab:\|\ " Set tab lines
 "set listchars=tab:\|\- " Set tab lines with -
 
-" SET VIM Locations
+" XDG Support
+if empty($MYVIMRC) | let $MYVIMRC = expand('<sfile>:p') | endif
+
+if empty($XDG_CACHE_HOME)  | let $XDG_CACHE_HOME  = $HOME."/.cache"       | endif
+if empty($XDG_CONFIG_HOME) | let $XDG_CONFIG_HOME = $HOME."/.config"      | endif
+if empty($XDG_DATA_HOME)   | let $XDG_CONFIG_HOME = $HOME."/.local/share" | endif
+
 set runtimepath^=$XDG_CONFIG_HOME/vim
 set runtimepath+=$XDG_DATA_HOME/vim
 set runtimepath+=$XDG_CONFIG_HOME/vim/after
 
-set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFGI_HOME/vim
+set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim
 set packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after
 
 let g:netrw_home = $XDG_DATA_HOME."/vim"
@@ -104,7 +110,6 @@ Plugin 'Xuyuanp/nerdtree-git-plugin'	" Shows git status in nerd-tree
 Plugin 'vim-syntastic/syntastic'		" Syntax checking
 Plugin 'PotatoesMaster/i3-vim-syntax'	" Add syntax for i3 config
 Plugin 'jmcantrell/vim-virtualenv'		" Manage Virtual Enviroment
-Plugin 'wakatime/vim-wakatime'			" Install WakaTime (Shows coding time)
 " Vundle End
 call vundle#end()
 filetype plugin indent on