diff --git a/.gitmodules b/.gitmodules
index f04e888..dc79d4b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "dotfiles/vim/pack/matir/start/fugitive"]
 	path = dotfiles/vim/pack/matir/start/fugitive
 	url = https://github.com/tpope/vim-fugitive
+[submodule "dotfiles/vim/pack/matir/start/ctrlp"]
+	path = dotfiles/vim/pack/matir/start/ctrlp
+	url = https://github.com/ctrlpvim/ctrlp.vim.git
diff --git a/dotfiles/vim/pack/matir/start/ctrlp b/dotfiles/vim/pack/matir/start/ctrlp
new file mode 160000
index 0000000..2e773fd
--- /dev/null
+++ b/dotfiles/vim/pack/matir/start/ctrlp
@@ -0,0 +1 @@
+Subproject commit 2e773fd8c7548526853fff6ee2e642eafbbe3d04
diff --git a/packages.X b/packages.X
index 2062bb4..1a4e2da 100644
--- a/packages.X
+++ b/packages.X
@@ -1,5 +1,6 @@
 audacity
 cinnamon
+codequery
 fonts-inconsolata
 gimp
 keepassx
diff --git a/packages.cli b/packages.cli
index b700733..4479985 100644
--- a/packages.cli
+++ b/packages.cli
@@ -3,26 +3,24 @@ build-essential
 cryptsetup
 dsniff
 ecryptfs-utils
-jarwrapper
+exuberant-ctags
 iftop
 iptraf
 ipython
 ipython3
+jarwrapper
 jq
 kpartx
 ldap-utils
 lvm2
-msitools
 most
+msitools
 nasm
 opensc
 openvpn
 p7zip-full
 psmisc
 pwgen
-python3
-python3-pip
-python3-virtualenv
 python-crypto
 python-dev
 python-hachoir-urwid
@@ -32,6 +30,9 @@ python-pip
 python-scapy
 python-virtualenv
 python-yara
+python3
+python3-pip
+python3-virtualenv
 radare2
 scapy
 scdaemon