diff --git a/.vim/ale.vim b/.vim/ftdetect/ale.vim
similarity index 100%
rename from .vim/ale.vim
rename to .vim/ftdetect/ale.vim
diff --git a/.vim/ftdetect/gitgutter.vim b/.vim/ftdetect/gitgutter.vim
new file mode 100644
index 0000000..58d6ebf
--- /dev/null
+++ b/.vim/ftdetect/gitgutter.vim
@@ -0,0 +1,11 @@
+highlight GitGutterAdd    guibg=#22ff22 guifg=#000000 ctermfg=Green
+highlight GitGutterChange guibg=#bbbb00 guifg=#000000 ctermfg=Yellow
+highlight GitGutterDelete guibg=#ff2222 guifg=#000000 ctermfg=DarkRed
+
+let g:gitgutter_sign_added = '+'
+let g:gitgutter_sign_modified = '-+'
+let g:gitgutter_sign_removed = '-'
+let g:gitgutter_sign_removed_first_line = '^^'
+let g:gitgutter_sign_modified_removed = '--'
+let g:gitgutter_grep = 'rg'
+let g:gitgutter_map_keys = 0
diff --git a/.vim/nerdtree.vim b/.vim/ftdetect/nerdtree.vim
similarity index 73%
rename from .vim/nerdtree.vim
rename to .vim/ftdetect/nerdtree.vim
index 7310490..25623d9 100644
--- a/.vim/nerdtree.vim
+++ b/.vim/ftdetect/nerdtree.vim
@@ -1,3 +1,3 @@
 let NERDTreeHighlightCursorLine=1
 let NERDTreeMouseMode=2
-let NERDTreeIgnore=['\.pyc$', '\.jp?g$', '\.gif$', '\.png$', '\~$', '\.o', '\.log', 'target']
+let NERDTreeIgnore=['\.pyc$', '\.jp?g$', '\.gif$', '\.png$', '\~$', '\.o', '\.log', 'target', '\.egg-info']
diff --git a/.vim/vimrc b/.vim/vimrc
index b6769d3..895e81b 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -59,7 +59,3 @@ nmap <leader>e :ALEDetail <cr>
 set exrc
 " Disable unsafe commands in project vimrc
 set secure
-
-" Plugin configuration
-source ~/.vim/ale.vim
-source ~/.vim/nerdtree.vim
diff --git a/.vim/vundlerc.vim b/.vim/vundlerc.vim
index 4ad652a..2e12f34 100644
--- a/.vim/vundlerc.vim
+++ b/.vim/vundlerc.vim
@@ -29,5 +29,7 @@ Plugin 'Rykka/riv.vim' " rst formatter and highlighter
 Plugin 'vim-scripts/indentpython.vim'
 " Async Lint Engine
 Plugin 'w0rp/ale'
+" Git
+Plugin 'airblade/vim-gitgutter'
 
 call vundle#end()