diff --git a/.config/vim/after/ftplugin/cpp.vim b/.config/vim/after/ftplugin/cpp.vim
new file mode 100644
index 0000000..032957c
--- /dev/null
+++ b/.config/vim/after/ftplugin/cpp.vim
@@ -0,0 +1 @@
+setlocal colorcolumn=81
diff --git a/.config/vim/colors/hybrid_reverse.vim b/.config/vim/colors/hybrid_reverse.vim
new file mode 120000
index 0000000..1f899ab
--- /dev/null
+++ b/.config/vim/colors/hybrid_reverse.vim
@@ -0,0 +1 @@
+/home/rick/.config/vim/pack/plugins/opt/vim-hybrid-material/colors/hybrid_reverse.vim
\ No newline at end of file
diff --git a/usr/share/vim/vimfiles/pack/list b/.config/vim/pack/list
similarity index 100%
rename from usr/share/vim/vimfiles/pack/list
rename to .config/vim/pack/list
diff --git a/etc/vimrc b/.config/vim/vimrc
similarity index 90%
rename from etc/vimrc
rename to .config/vim/vimrc
index 8042e70..ca05af9 100644
--- a/etc/vimrc
+++ b/.config/vim/vimrc
@@ -3,7 +3,11 @@ set nobackup
 set nocompatible
 
 " Setup paths
-set viminfo+=n~/.cache/vim_history
+set backupdir=$XDG_CACHE_HOME/vim,/var/tmp/tmp
+set directory=$XDG_CACHE_HOME/vim,/var/tmp/tmp
+set packpath^=$XDG_CONFIG_HOME/vim,$XDG_CONFIG_HOME/vim/after
+set runtimepath^=$XDG_CONFIG_HOME/vim,$XDG_CONFIG_HOME/vim/after
+set viminfo+=n$XDG_CACHE_HOME/vim_history
 
 "" General
 
@@ -15,8 +19,9 @@ set clipboard=unnamedplus
 set encoding=utf-8
 set fileencoding=utf-8
 set hidden
-
 set history=1000
+set mouse=a
+set ttimeoutlen=0
 set undolevels=1000
 
 set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc,.png,.jpg
diff --git a/usr/share/vim/vimfiles/colors/hybrid_reverse.vim b/usr/share/vim/vimfiles/colors/hybrid_reverse.vim
deleted file mode 120000
index 73dfbd8..0000000
--- a/usr/share/vim/vimfiles/colors/hybrid_reverse.vim
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/vim/vimfiles/pack/plugins/opt/vim-hybrid-material/colors/hybrid_reverse.vim
\ No newline at end of file