diff --git a/.gitmodules b/.gitmodules
index c584a1f..8e1c20e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,4 +49,7 @@
 
 [submodule "init/Smyck-Color-Scheme"]
         path = init/Smyck-Color-Scheme
-        url = https://github.com/hukl/Smyck-Color-Scheme.git
\ No newline at end of file
+        url = https://github.com/hukl/Smyck-Color-Scheme.git
+[submodule "init/iocage_zsh-completion"]
+	path = init/iocage_zsh-completion
+	url = https://github.com/varpon/iocage_zsh-completion.git
diff --git a/.gvimrc b/.gvimrc
index 1c588e8..98ba32c 100644
--- a/.gvimrc
+++ b/.gvimrc
@@ -1,4 +1,4 @@
-set guifont=Menlo:h14
+set guifont=Source\ Code\ Pro\ ExtraLight:h15
 set gcr=n-v-c:block-Cursor/block-Cursor-blinkon0,i-ci:hor20-Cursor-blinkwait2000-blinkon1500-blinkoff500
 
 " Hide Toolbar from MacVim
diff --git a/.zsh/lib/aliases.zsh b/.zsh/lib/aliases.zsh
index e535177..8556f02 100644
--- a/.zsh/lib/aliases.zsh
+++ b/.zsh/lib/aliases.zsh
@@ -17,4 +17,4 @@ alias flushdns='dscacheutil -flushcache && killall -HUP mDNSResponder'
 alias pkg_add='brew install'
 alias pkg_search='brew search'
 alias pkg_remove='brew remove'
-alias pkg_upgrade='brew update && brew upgrade && brew cleanup && brew cask cleanup'
+alias pkg_upgrade='brew update && brew upgrade && brew cleanup && brew cask cleanup'
\ No newline at end of file
diff --git a/.zsh/lib/completion.zsh b/.zsh/lib/completion.zsh
index 09f1f3b..5c7e069 100644
--- a/.zsh/lib/completion.zsh
+++ b/.zsh/lib/completion.zsh
@@ -9,6 +9,7 @@ setopt always_to_end
 WORDCHARS=''
 
 zmodload -i zsh/complist
+source ~/.zsh/comp/_*
 
 ## case-insensitive (all),partial-word and then substring completion
 if [ "x$CASE_SENSITIVE" = "xtrue" ]; then
diff --git a/bootstrap.sh b/bootstrap.sh
index 6fcf3f9..cb08dec 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -78,6 +78,7 @@ deploy)
 
 	# Copy color vim scheme from init folder to .vim/colors
 	cp init/Smyck-Color-Scheme/smyck.vim .vim/colors/smyck.vim
+	cp init/iocage_zsh-completion/_iocage .zsh/comp/_iocage
 	
 	df_deploy
   ;;
diff --git a/init/iocage_zsh-completion b/init/iocage_zsh-completion
new file mode 160000
index 0000000..bedd0c9
--- /dev/null
+++ b/init/iocage_zsh-completion
@@ -0,0 +1 @@
+Subproject commit bedd0c9e8c9673b8399edb3fd1340d0940de77d6