diff --git a/.gitmodules b/.gitmodules
index 1bb0398..dd14384 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "private"]
 	path = private
 	url = git@bitbucket.org:jimeh/dotfiles-private.git
-[submodule "tmux/tmuxifier"]
-	path = tmux/tmuxifier
-	url = git@github.com:jimeh/tmuxifier.git
 [submodule "tmux/plugins/tpm"]
 	path = tmux/plugins/tpm
 	url = https://github.com/tmux-plugins/tpm
diff --git a/tmux/tmuxifier b/tmux/tmuxifier
deleted file mode 160000
index 8987dd4..0000000
--- a/tmux/tmuxifier
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8987dd44922fc69943a1fa7845f259fa2e075c56
diff --git a/zsh/tmux.zsh b/zsh/tmux.zsh
index b3895dd..94d0a72 100644
--- a/zsh/tmux.zsh
+++ b/zsh/tmux.zsh
@@ -1,3 +1,7 @@
+#
+# Tmux environment setup.
+#
+
 # Aliases
 alias tm="tmux"
 alias tma="tm att"
@@ -6,39 +10,40 @@ alias tml="tm ls"
 alias tmm="tmn -s main"
 
 # Tmuxifier
-if [ -d "$DOTFILES/tmux/tmuxifier" ]; then
-  alias m="tmuxifier"
-  alias ms="tmuxifier load-session"
-  alias mw="tmuxifier load-window"
-  alias mm="tmuxifier load-session main"
 
-  # lazy-load tmuxifier
-  tmuxifier() {
-    load-tmuxifier
-    tmuxifier "$@"
-  }
+zinit ice as'program' pick'bin/tmuxifier' from'gh'
+zinit light jimeh/tmuxifier
 
-  _tmuxifier() {
-    load-tmuxifier
-    _tmuxifier "$@"
-  }
+alias m="tmuxifier"
+alias ms="tmuxifier load-session"
+alias mw="tmuxifier load-window"
+alias mm="tmuxifier load-session main"
 
-  compctl -K _tmuxifier tmuxifier
+# lazy-load tmuxifier
+tmuxifier() {
+  load-tmuxifier
+  tmuxifier "$@"
+}
 
-  load-tmuxifier() {
-    # unset lazy-load functions
-    unset -f load-tmuxifier _tmuxifier tmuxifier
+_tmuxifier() {
+  load-tmuxifier
+  _tmuxifier "$@"
+}
 
-    if [ -d "$DOTPFILES/tmux-layouts" ]; then
-      export TMUXIFIER_LAYOUT_PATH="$DOTPFILES/tmux-layouts"
-    else
-      export TMUXIFIER_LAYOUT_PATH="$HOME/.tmux-layouts"
-    fi
+compctl -K _tmuxifier tmuxifier
 
-    path_prepend "$DOTFILES/tmux/tmuxifier/bin"
-    eval "$(command tmuxifier init -)"
-  }
-fi
+load-tmuxifier() {
+  # unset lazy-load functions
+  unset -f load-tmuxifier _tmuxifier tmuxifier
+
+  if [ -d "$DOTPFILES/tmux-layouts" ]; then
+    export TMUXIFIER_LAYOUT_PATH="$DOTPFILES/tmux-layouts"
+  else
+    export TMUXIFIER_LAYOUT_PATH="$HOME/.tmux-layouts"
+  fi
+
+  eval "$(command tmuxifier init -)"
+}
 
 use-tmuxifier-dev() {
   path_prepend "$HOME/Projects/tmuxifier/bin"