diff --git a/gitconfig b/gitconfig
index 3b1a982..ebd349e 100644
--- a/gitconfig
+++ b/gitconfig
@@ -9,3 +9,4 @@
 	pager = less -F -X
 [push]
 	default = simple
+	followTags = true
diff --git a/vimrc b/vimrc
index 50801f2..c113c83 100644
--- a/vimrc
+++ b/vimrc
@@ -19,7 +19,10 @@ if exists("*vundle#begin")
     Plugin 'honza/vim-snippets'
     Plugin 'alfredodeza/coveragepy.vim'
     Plugin 'tikhomirov/vim-glsl'
-    Plugin 'ntpeters/vim-better-whitespace'
+    Plugin 'chrisbra/vim-show-whitespace'
+    Plugin 'krisajenkins/vim-projectlocal'
+    Plugin 'xolox/vim-misc'
+    Plugin 'rhysd/vim-clang-format'
 
     " All of your Plugins must be added before the following line
     call vundle#end()            " required
@@ -71,3 +74,22 @@ au FileType python :imap <F10> <Esc><F10>
 
 "Map <F9> on Latex files
 au FileType tex :map <F9> :! if [ -f Makefile ]; then; make; else; pdflatex %:t; rm *.aux; rm *.log; fi<cr>
+
+"Highlight chars after column 80
+let s:activatedh=0
+highlight OverLength ctermbg=darkred guibg=#ffd9d9
+function! ToggleH()
+    if s:activatedh == 0
+        let s:activatedh = 1
+        match OverLength '\%>80v.\+'
+    else
+        let s:activatedh = 0
+        match none
+    endif
+endfunction
+nnoremap <F4> :call ToggleH()<CR>
+call ToggleH()
+
+"Map ctrl+f to ClangFormat
+:nnoremap <C-f> :ClangFormat<CR>
+:vnoremap <C-f> :ClangFormat<CR>
diff --git a/zsh_functions b/zsh_functions
index 9b50929..869481d 100644
--- a/zsh_functions
+++ b/zsh_functions
@@ -106,7 +106,8 @@ update-mirrors() {
     then
         echo "Not supported on this architecture."
     else
-        sudo sh -c "reflector -p http -l 50 --sort rate | tee /etc/pacman.d/mirrorlist"
+        sudo sh -c "reflector -p http -l 50 --sort rate | tee /etc/pacman.d/mirrorlist_"
+        sudo sed -i 's/mirrorlist$/mirrorlist_/g' /etc/pacman.conf
     fi
 }
 
diff --git a/zshrc b/zshrc
index c7d6e74..bc34c46 100644
--- a/zshrc
+++ b/zshrc
@@ -40,10 +40,11 @@ alias gdfs='git diff --staged'
 alias gad='git add'
 alias gcm='git commit'
 alias resource='source ~/.zshrc'
-alias battery='upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep "time to empty"'
+alias battery='upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep "time to"'
 alias poweroff='sudo poweroff'
 alias reboot='sudo reboot'
 alias n='ninja'
+alias m='make'
 alias cmake='cmake -G Ninja'
 alias wlan='sudo netctl-auto list'
 alias adb-connect='adb connect 192.168.1.138:5555'
@@ -76,7 +77,7 @@ alias rbtv='livestreamer twitch.tv/rocketbeanstv &'
 alias taketv='livestreamer twitch.tv/taketv &'
 alias ls='ls --color=auto'
 export ASPROOT=~/.asp
-export PATH=$PATH:/home/fab/bin:/home/fab/.gem/ruby/2.3.0/bin
+export PATH=$PATH:/home/fab/bin:/home/fab/.gem/ruby/2.3.0/bin:~/.local/bin
 export LFS=/mnt/lfs
 
 #vi mode