diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index aad11c0..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,7 +0,0 @@
-[submodule "plugins/tpm"]
-	path = tmux/plugins/tpm
-	url = https://github.com/tmux-plugins/tpm.git
-
-[submodule "antigen"]
-	path = zsh/antigen
-	url = https://github.com/zsh-users/antigen.git
diff --git a/tmux/.gitignore b/tmux/.gitignore
index 13ff5b6..d51e080 100644
--- a/tmux/.gitignore
+++ b/tmux/.gitignore
@@ -1,5 +1,4 @@
 .tmux_config_*
 !.tmux_config_*.example
 plugins/
-!plugins/tpm
 *.log
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 2b001b3..a4a5cc4 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -76,17 +76,16 @@ set -sg escape-time 10
 
 # List of plugins
 set -g @plugin 'tmux-plugins/tpm'
-#set -g @plugin 'tmux-plugins/tmux-sensible'
-#set -g @plugin 'tmux-plugins/tmux-sidebar'
 set -g @plugin 'tmux-plugins/tmux-open'
 set -g @plugin 'tmux-plugins/tmux-yank'
 set -g @plugin 'jimeh/tmux-themepack'
 set -g @themepack 'powerline/double/blue'
 
-# Other examples:
-# set -g @plugin 'github_username/plugin_name'
-# set -g @plugin 'git@github.com/user/plugin'
-# set -g @plugin 'git@bitbucket.com/user/plugin'
+setenv -g TMUX_PLUGIN_MANAGER_PATH "$HOME/.tmux/plugins/"
+
+if "test ! -d ~/.tmux/plugins/tpm" \
+  "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && \
+      ~/.tmux/plugins/tpm/bin/install_plugins'"
 
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
-run '~/.tmux/plugins/tpm/tpm || true' # 2>&1 >> /tmp/tpm_out'
+run -b '~/.tmux/plugins/tpm/tpm || true'
diff --git a/tmux/plugins/tpm b/tmux/plugins/tpm
deleted file mode 160000
index b699a7e..0000000
--- a/tmux/plugins/tpm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b699a7e01c253ffb7818b02d62bce24190ec1019