diff --git a/.vimrc b/.vimrc
index 07b4867..1f22d63 100644
--- a/.vimrc
+++ b/.vimrc
@@ -10,6 +10,7 @@ call vundle#begin()
     " load sensible defaults first
     Plugin 'tpope/vim-sensible'
 
+    Plugin 'APZelos/blamer.nvim'
     Plugin 'airblade/vim-gitgutter'
     Plugin 'Chiel92/vim-autoformat'
     Plugin 'deoplete-plugins/deoplete-clang'
@@ -35,7 +36,6 @@ call vundle#begin()
     Plugin 'wincent/terminus'
     Plugin 'wokalski/autocomplete-flow'
     Plugin 'Xuyuanp/nerdtree-git-plugin'
-    Plugin 'zivyangll/git-blame.vim'
     if !has('nvim')
         Plugin 'roxma/nvim-yarp'
         Plugin 'roxma/vim-hug-neovim-rpc'
@@ -53,6 +53,7 @@ augroup END
 if "$VIM_COLORSCHEME" == "light"
     set background=light
 endif
+set termguicolors
 colorscheme solarized
 call togglebg#map("<Leader>b")
 let load_doxygen_syntax = 1
@@ -63,6 +64,9 @@ let g:airline_powerline_fonts = 1
 let g:airline_symbols.colnr = ' C'
 let g:airline_theme='solarized'
 let g:airline#extensions#tabline#enabled = 1
+let g:blamer_date_format = '%c'
+let g:blamer_delay = 500
+let g:blamer_prefix = '   > '
 let g:deoplete#enable_at_startup = 1
 let g:deoplete#sources#clang#libclang_path = '/usr/lib/llvm-default/lib/libclang.so.1'
 let g:deoplete#sources#clang#clang_header = '/usr/lib/llvm-default/lib/clang/default/include'
@@ -150,7 +154,7 @@ onoremap <F9> <C-C>za
 vnoremap <F9> zf
 map <C-n> :NERDTreeToggle<CR>
 map <C-b> :TagbarToggle<CR>
-nnoremap <Leader>b :<C-u>call gitblame#echo()<CR>
+nnoremap <Leader>b :BlamerToggle<CR>
 nnoremap <Leader>g :Goyo<CR>
 nnoremap <Leader>l :Limelight!!<CR>