diff --git a/.gitmodules b/.gitmodules
index 371f1de..b0594c3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,9 +49,6 @@
 [submodule ".vim/bundle/vim-abolish"]
 	path = .vim/bundle/vim-abolish
 	url = https://github.com/tpope/vim-abolish.git
-[submodule ".vim/bundle/vim-commentary"]
-	path = .vim/bundle/vim-commentary
-	url = https://github.com/tpope/vim-commentary.git
 [submodule ".vim/bundle/vim-eunuch"]
 	path = .vim/bundle/vim-eunuch
 	url = https://github.com/tpope/vim-eunuch.git
@@ -124,3 +121,9 @@
 [submodule ".vim/bundle/base16-vim"]
 	path = .vim/bundle/base16-vim
 	url = https://github.com/danielwe/base16-vim
+[submodule ".vim/bundle/tcomment_vim"]
+	path = .vim/bundle/tcomment_vim
+	url = https://github.com/tomtom/tcomment_vim
+[submodule ".vim/bundle/targets.vim"]
+	path = .vim/bundle/targets.vim
+	url = https://github.com/wellle/targets.vim
diff --git a/.vim/bundle/targets.vim b/.vim/bundle/targets.vim
new file mode 160000
index 0000000..a79447f
--- /dev/null
+++ b/.vim/bundle/targets.vim
@@ -0,0 +1 @@
+Subproject commit a79447f261e4b8b4327557aa03726f3849334b84
diff --git a/.vim/bundle/tcomment_vim b/.vim/bundle/tcomment_vim
new file mode 160000
index 0000000..622cc05
--- /dev/null
+++ b/.vim/bundle/tcomment_vim
@@ -0,0 +1 @@
+Subproject commit 622cc0551bef87a3dfb2846cb339412eeb8ef133
diff --git a/.vim/bundle/vim-commentary b/.vim/bundle/vim-commentary
deleted file mode 160000
index 141d9d3..0000000
--- a/.vim/bundle/vim-commentary
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 141d9d32a9fb58fe474fcc89cd7221eb2dd57b3a