diff --git a/.gitmodules b/.gitmodules
index 1fd341b..9961af3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,33 +1,33 @@
-[submodule "vim-easy-align"]
-	path = vimpack/start/vim-easy-align
-	url = https://github.com/junegunn/vim-easy-align.git
 [submodule "vim-commentary"]
 	path = vimpack/start/vim-commentary
 	url = https://github.com/tpope/vim-commentary.git
+[submodule "vim-easy-align"]
+	path = vimpack/start/vim-easy-align
+	url = https://github.com/junegunn/vim-easy-align.git
 [submodule "vim-fugitive"]
 	path = vimpack/start/vim-fugitive
 	url = https://github.com/tpope/vim-fugitive.git
-[submodule "vim-rsi"]
-	path = vimpack/start/vim-rsi
-	url = https://github.com/tpope/vim-rsi.git
 [submodule "vim-polyglot"]
 	path = vimpack/start/vim-polyglot
 	url = https://github.com/sheerun/vim-polyglot
+[submodule "vim-rsi"]
+	path = vimpack/start/vim-rsi
+	url = https://github.com/tpope/vim-rsi.git
+[submodule "vim-signify"]
+	path = vimpack/start/git-signify
+	url = https://github.com/mhinz/vim-signify.git
 [submodule "vim-tru-typewriter"]
 	path = vimpack/start/vim-tru-typewriter
 	url = https://git.vdrandom.org/vim-tru-typewriter
-[submodule "vimwiki"]
-	path = vimpack/opt/vimwiki
-	url = https://github.com/vimwiki/vimwiki.git
 [submodule "ale"]
 	path = vimpack/opt/ale
 	url = https://github.com/w0rp/ale.git
 [submodule "jedi-vim"]
 	path = vimpack/opt/jedi-vim
 	url = https://github.com/davidhalter/jedi-vim.git
-[submodule "vim-gitgutter"]
-	path = vimpack/start/vim-gitgutter
-	url = https://github.com/airblade/vim-gitgutter.git
+[submodule "vimwiki"]
+	path = vimpack/opt/vimwiki
+	url = https://github.com/vimwiki/vimwiki.git
 [submodule "vim-solarized8"]
-	path = vimpack/start/vim-solarized8
+	path = vimpack/opt/vim-solarized8
 	url = https://github.com/lifepillar/vim-solarized8.git
diff --git a/i3_config b/i3_config
index 37f711c..02bd969 100644
--- a/i3_config
+++ b/i3_config
@@ -196,10 +196,10 @@ for_window [instance="KB.exe"] floating enable
 for_window [instance="nwn2main.exe"] floating enable
 # scratchpad
 for_window [class="keepassxc"] move scratchpad, scratchpad show
-for_window [title="vimwiki"] move scratchpad, scratchpad show
+for_window [title="^vimwiki$"] move scratchpad, scratchpad show
 for_window [class="Vpnui"] move scratchpad, scratchpad show
-bindsym $mod+n [title="vimwiki"] scratchpad show
 bindsym $mod+i [class="keepassxc"] scratchpad show
+bindsym $mod+n [title="^vimwiki$"] scratchpad show
 bindsym $mod+y [class="Vpnui"] scratchpad show
 
 # execs
diff --git a/vimpack/start/vim-solarized8 b/vimpack/opt/vim-solarized8
similarity index 100%
rename from vimpack/start/vim-solarized8
rename to vimpack/opt/vim-solarized8
diff --git a/vimpack/start/git-signify b/vimpack/start/git-signify
new file mode 160000
index 0000000..a8b50de
--- /dev/null
+++ b/vimpack/start/git-signify
@@ -0,0 +1 @@
+Subproject commit a8b50dee5afe50dd0011c645ef396bc209c1f2ef
diff --git a/vimpack/start/vim-gitgutter b/vimpack/start/vim-gitgutter
deleted file mode 160000
index a986ab0..0000000
--- a/vimpack/start/vim-gitgutter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a986ab054788776dca269d6c289b470255d54e8c
diff --git a/vimrc b/vimrc
index 8bfb8f3..9dc961f 100644
--- a/vimrc
+++ b/vimrc
@@ -63,6 +63,10 @@ if v:version >= 800
     xmap <Leader>a <Plug>(EasyAlign)
     nmap <Leader>a <Plug>(EasyAlign)
 
+    " signify options
+    let g:signify_vcs_list = [ 'git' ]
+    let g:signify_sign_change = '~'
+
     " enable packs based on filetype
     let g:ale_python_flake8_executable = 'python2'
     autocmd FileType python packadd ale | packadd jedi-vim
diff --git a/vimwikirc b/vimwikirc
deleted file mode 100644
index 1faf85b..0000000
--- a/vimwikirc
+++ /dev/null
@@ -1,4 +0,0 @@
-set titlestring=vimwiki
-let wiki = expand("$HOME/vimwiki/index.wiki")
-packadd vimwiki
-execute 'edit ' . fnameescape(wiki)