diff --git a/nvim/.config/nvim/after/plugin/gitgutter.vim b/nvim/.config/nvim/after/plugin/gitgutter.vim
deleted file mode 100644
index 14897fc..0000000
--- a/nvim/.config/nvim/after/plugin/gitgutter.vim
+++ /dev/null
@@ -1,11 +0,0 @@
-nnoremap ]c :GitGutterNextHunk<CR>
-nnoremap [c :GitGutterPrevHunk<CR>
-nnoremap ghs :GitGutterStageHunk<CR>
-nnoremap ghu :GitGutterUndoHunk<CR>
-nnoremap ghp :GitGutterPreviewHunk<CR>
-nnoremap ghq :GitGutterQuickFix<CR>
-nnoremap ghf :GitGutterFold<CR>
-omap ih <Plug>(GitGutterTextObjectInnerPending)
-omap ah <Plug>(GitGutterTextObjectOuterPending)
-xmap ih <Plug>(GitGutterTextObjectInnerVisual)
-xmap ah <Plug>(GitGutterTextObjectOuterVisual)
diff --git a/nvim/.config/nvim/after/plugin/signify.vim b/nvim/.config/nvim/after/plugin/signify.vim
new file mode 100644
index 0000000..316da9b
--- /dev/null
+++ b/nvim/.config/nvim/after/plugin/signify.vim
@@ -0,0 +1,10 @@
+nnoremap ghu :SignifyHunkUndo<CR>
+nnoremap ghp :SignifyHunkDiff<CR>
+nmap ]c <Plug>(signify-next-hunk)
+nmap [c <Plug>(signify-prev-hunk)
+nmap ]C 9999]c
+nmap [C 9999[c
+omap ih <Plug>(signify-motion-inner-pending)
+xmap ih <Plug>(signify-motion-inner-visual)
+omap ah <Plug>(signify-motion-outer-pending)
+xmap ah <Plug>(signify-motion-outer-visual)
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index f7f416c..93f82cf 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -20,7 +20,7 @@ Plug 'tmux-plugins/vim-tmux-focus-events'
 " Git support
 Plug 'rhysd/git-messenger.vim'
 Plug 'tpope/vim-fugitive'
-Plug 'airblade/vim-gitgutter'
+Plug 'mhinz/vim-signify'
 Plug 'rhysd/conflict-marker.vim'
 Plug 'salcode/vim-interactive-rebase-reverse'
 Plug 'stsewd/fzf-checkout.vim'
diff --git a/nvim/.config/nvim/plugin_settings.vim b/nvim/.config/nvim/plugin_settings.vim
index 5e52a7b..691bf96 100644
--- a/nvim/.config/nvim/plugin_settings.vim
+++ b/nvim/.config/nvim/plugin_settings.vim
@@ -1,15 +1,3 @@
-" Let vim-gitgutter do its thing on large files
-let g:gitgutter_max_signs=1000
-let g:gitgutter_map_keys = 0
-let g:gitgutter_highlight_linenrs = 1
-let g:gitgutter_preview_win_floating = 1
-let g:gitgutter_use_location_list = 0
-let g:gitgutter_sign_added = '+a'
-let g:gitgutter_sign_modified = '+m'
-let g:gitgutter_sign_removed = '-r'
-let g:gitgutter_sign_removed_first_line = '^^'
-let g:gitgutter_sign_modified_removed = 'mr'
-
 " Automatically detect style file and apply style to formatting
 let g:clang_format#detect_style_file = 1
 " For workspace