diff --git a/.gitmodules b/.gitmodules
index b963434..38136e3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "zsh"]
 	path = zsh
 	url = https://github.com/zimfw/zimfw
+[submodule "tmux"]
+	path = tmux
+	url = https://github.com/tony/tmux-config
diff --git a/Makefile b/Makefile
index 5db5c68..ef96917 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
 tmux:
+	git submodule init
+	git submodule update
 	ln -s ~/.dotfiles/tmux ~/.tmux
-	ln -s ~/.dotfiles/tmux/tmux.conf ~/.tmux.conf
+	ln -s ~/.dotfiles/tmux/.tmux.conf ~/.tmux.conf
 
 vim:
 	ln -s ~/.dotfiles/vim ~/.vim
@@ -53,14 +55,16 @@ mutt: dep
 .PHONY: clean zsh git vim tmux i3 albert
 clean:
 	rm -rf ~/.vim ~/.vimrc ~/.tmux ~/.tmux.conf ~/.gitconfig ~/.config/i3 ~/.muttrc
-	rm -rf ~/.zshrc ~/.zimrc ~/.zim ~/.zlogin
+	rm -rf ~/.zshrc ~/.zimrc ~/.zim ~/.zlogin ~/.compton.conf
 	rm -rf ~/.mailcap ~/.zsh 
+	rm -rf ~/.config/albert
+	rm -rf /tmp/makedir/
 
 dep:
-	git clone https://aur.archlinux.org/powerline-fonts-git.git /tmp/powerline-font
-	cd /tmp/powerline-font && makepkg -Acsi
-	git clone https://aur.archlinux.org/bumblebee-status-git.git /tmp/bumblebee
-	cd /tmp/bumblebee && makepkg -Acsi
+	git clone https://aur.archlinux.org/powerline-fonts-git.git /tmp/makedir/powerline-font
+	cd /tmp/makedir/powerline-font && makepkg -Acsi
+	git clone https://aur.archlinux.org/bumblebee-status-git.git /tmp/makedir/bumblebee
+	cd /tmp/makedir/bumblebee && makepkg -Acsi
 	sudo pacman -S awesome-terminal-fonts perl-anyevent-i3 perl-json-xs w3m
 
 all: clean tmux vim git zsh i3 mutt xresources compton albert
diff --git a/tmux b/tmux
new file mode 160000
index 0000000..5b348ee
--- /dev/null
+++ b/tmux
@@ -0,0 +1 @@
+Subproject commit 5b348ee402913fae67ab51e725a2b4971ab65f3d