diff --git a/.gitmodules b/.gitmodules
index 6ccfb78..c444f8b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -55,3 +55,6 @@
 [submodule "vim/pack/plugins/start/vim-gitgutter"]
 	path = vim/pack/plugins/start/vim-gitgutter
 	url = https://github.com/airblade/vim-gitgutter.git
+[submodule "vim/pack/color/start/vim-colors-solarized"]
+	path = vim/pack/color/start/vim-colors-solarized
+	url = https://github.com/altercation/vim-colors-solarized.git
diff --git a/bin/git-submodule-remove b/bin/git-submodule-remove
index ada43db..135f4fc 100755
--- a/bin/git-submodule-remove
+++ b/bin/git-submodule-remove
@@ -13,7 +13,7 @@ logdebug "Remove entry for submodule from .gitmodules, if exist"
     loginfo "$(git config --file=.gitmodules --remove-section submodule.${SUBMODULE})"
 
 loginfo "$(git commit .gitmodules -m 'remove submodule-entry for '"$SUBMODULE"' from .gitconfig')"
-logdebug "Remove entry for submodule from .git/confi, if exist"
+logdebug "Remove entry for submodule from .git/config, if exist"
 [[ $(git config --get submodule.${SUBMODULE}.url >/dev/null 2>&1; echo $?) -eq 0 \
     || $(git config --get submodule.${SUBMODULE}.path >/dev/null 2>&1; echo $?) -eq 0 ]] && \
     loginfo "$(git config --remove-section submodule.${SUBMODULE})"
diff --git a/vim/pack/color/start/vim-colors-solarized b/vim/pack/color/start/vim-colors-solarized
new file mode 160000
index 0000000..528a59f
--- /dev/null
+++ b/vim/pack/color/start/vim-colors-solarized
@@ -0,0 +1 @@
+Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21
diff --git a/vimrc b/vimrc
index b3fbbea..33ed592 100644
--- a/vimrc
+++ b/vimrc
@@ -389,20 +389,22 @@ autocmd FileType human set formatoptions-=t textwidth=0 "disable wrapping in txt
 autocmd BufRead,BufNewFile *.conf setf dosini
 
 " to make comments better visible on dark backgrounds
-:color desert
+":color desert
 
 if has('gui_running')
   set background=dark
   colorscheme solarized
 else
-  if !empty(glob("~/vim//bundle/Zenburn/colors/zenburn.vim"))
+  if !empty(glob("~/vim/pack/color/start/Zenburn"))
     colorscheme zenburn
+  else
+    colorscheme desert
   endif
 endif
 
-if !empty(glob("~/.vim/bundle/vim-togglebg"))
-  call togglebg#map("<F5>")
-endif
+"if !empty(glob("~/.vim/bundle/vim-togglebg"))
+"  call togglebg#map("<F5>")
+"endif
 
 
 
@@ -513,7 +515,6 @@ noremap <C-Tab> :tabnext<CR>
 noremap <silent> <C-A-S-Tab> :execute 'silent! tabmove' . (tabpagenr()-2)<CR>
 noremap <silent> <C-A-Tab> :execute 'silent! tabmove' . (tabpagenr()+1)<CR>
 
-
 " Configure Plugin airline
 let g:airline_powerline_fonts=1
 let g:airline#extensions#tabline#enabled = 1
@@ -522,3 +523,7 @@ let g:airline_theme='angr'
 " Configure fzf - fuzzy finder
 let g:fzf_preview_window = 'right:50%'
 let g:fzf_layout = { 'window': { 'width': 0.9, 'height': 0.6  }  }
+
+" Configure Gitgutter
+nmap <Leader>hn <Plug>(GitGutterNextHunk)
+nmap <Leader>hp <Plug>(GitGutterPrevHunk)