diff --git a/.config/vim/pack/plugins/opt/delimitMate b/.config/vim/pack/plugins/opt/delimitMate
new file mode 160000
index 0000000..16687ae
--- /dev/null
+++ b/.config/vim/pack/plugins/opt/delimitMate
@@ -0,0 +1 @@
+Subproject commit 16687aec24d803bc76cae2d7bfe2b73b1cdda4ef
diff --git a/.config/vim/pack/plugins/opt/vim-surround b/.config/vim/pack/plugins/opt/vim-surround
new file mode 160000
index 0000000..f51a26d
--- /dev/null
+++ b/.config/vim/pack/plugins/opt/vim-surround
@@ -0,0 +1 @@
+Subproject commit f51a26d3710629d031806305b6c8727189cd1935
diff --git a/.config/vim/vim-surround.vim b/.config/vim/vim-surround.vim
new file mode 100644
index 0000000..e7af881
--- /dev/null
+++ b/.config/vim/vim-surround.vim
@@ -0,0 +1,10 @@
+" Overwrite vim-surround bindings.
+nmap ds  <Plug>Dsurround
+nmap cs  <Plug>Csurround
+nmap cS  <Plug>CSurround
+nmap ys  <Plug>Ysurround
+nmap yS  <Plug>YSurround
+nmap yss <Plug>Yssurround
+nmap ySS <Plug>YSsurround
+xmap s   <Plug>VSurround
+xmap gs  <Plug>VgSurround
diff --git a/.config/vim/vimrc b/.config/vim/vimrc
index 56503b8..7a0f102 100644
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@@ -7,8 +7,14 @@ if (has('patch-8.1.1719') || has('nvim'))
 endif
 " Theme
 packadd! onedark.vim
+" Automatically close parentheses, brackets, quotes, etc.
+packadd! delimitMate
 " Git information
 packadd! vim-gitgutter
+" Surround text with parentheses, brackets, quotes, tags, etc.
+let g:surround_no_mappings = 1
+packadd! vim-surround
+source $XDG_CONFIG_HOME/vim/vim-surround.vim
 
 " Settings #####################################################################
 " hybrid linenumbers
diff --git a/.gitmodules b/.gitmodules
index 9c28ee2..b98ba6e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,12 +22,18 @@
 [submodule ".config/vim/plugged/coc.nvim"]
 	path = .config/vim/pack/plugins/opt/coc.nvim
 	url = https://github.com/neoclide/coc.nvim.git
+[submodule ".config/vim/pack/plugins/opt/delimitMate"]
+	path = .config/vim/pack/plugins/opt/delimitMate
+	url = https://github.com/Raimondi/delimitMate.git
 [submodule ".config/vim/plugged/onedark.vim"]
 	path = .config/vim/pack/plugins/opt/onedark.vim
 	url = https://github.com/joshdick/onedark.vim
 [submodule ".config/vim/plugged/vim-gitgutter"]
 	path = .config/vim/pack/plugins/opt/vim-gitgutter
 	url = https://github.com/airblade/vim-gitgutter
+[submodule ".config/vim/pack/plugins/opt/vim-surround"]
+	path = .config/vim/pack/plugins/opt/vim-surround
+	url = https://github.com/tpope/vim-surround
 [submodule ".config/zsh/plugins/fzf"]
 	path = .config/zsh/plugins/fzf
 	url = https://github.com/junegunn/fzf