diff --git a/.gitignore b/.gitignore
index b8fd5ed..b15c940 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,120 @@ vim/.swp/*
 
 .sqlite
 # End of https://www.gitignore.io/api/vim
+
+# Created by https://www.gitignore.io/api/vim,python
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+.pytest_cache/
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule.*
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+### Vim ###
+# swap
+.sw[a-p]
+.*.sw[a-p]
+# session
+Session.vim
+# temporary
+.netrwhist
+*~
+# auto-generated tag files
+tags
+
+
+# End of https://www.gitignore.io/api/vim,python
diff --git a/.gitmodules b/.gitmodules
index e4c93a3..6b5af52 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -91,3 +91,48 @@
 [submodule "vim/plugins/vim-latex-live-preview"]
 	path = vim/plugins/vim-latex-live-preview
 	url = https://github.com/xuhdev/vim-latex-live-preview
+[submodule "zsh/modules/history-substring-search/external"]
+	path = zsh/modules/history-substring-search/external
+	url = https://github.com/zsh-users/zsh-history-substring-search.git
+[submodule "zsh/modules/completion/external"]
+	path = zsh/modules/completion/external
+	url = https://github.com/zsh-users/zsh-completions.git
+[submodule "zsh/modules/syntax-highlighting/external"]
+	path = zsh/modules/syntax-highlighting/external
+	url = https://github.com/zsh-users/zsh-syntax-highlighting.git
+[submodule "zsh/modules/prompt/external-themes/pure"]
+	path = zsh/modules/prompt/external-themes/pure
+	url = https://github.com/sindresorhus/pure.git
+[submodule "zsh/modules/prompt/external-themes/liquidprompt"]
+	path = zsh/modules/prompt/external-themes/liquidprompt
+	url = https://github.com/nojhan/liquidprompt.git
+[submodule "zsh/modules/prompt/external-themes/lean"]
+	path = zsh/modules/prompt/external-themes/lean
+	url = https://github.com/miekg/lean
+[submodule "zsh/modules/autosuggestions/external"]
+	path = zsh/modules/autosuggestions/external
+	url = https://github.com/zsh-users/zsh-autosuggestions.git
+[submodule "tmux/plugins/tmux-battery"]
+	path = tmux/plugins/tmux-battery
+	url = https://github.com/tmux-plugins/tmux-battery.git
+[submodule "tmux/plugins/tmux-copycat"]
+	path = tmux/plugins/tmux-copycat
+	url = https://github.com/tmux-plugins/tmux-copycat.git
+[submodule "tmux/plugins/tmux-online-status"]
+	path = tmux/plugins/tmux-online-status
+	url = https://github.com/tmux-plugins/tmux-online-status.git
+[submodule "tmux/plugins/tmux-open"]
+	path = tmux/plugins/tmux-open
+	url = https://github.com/tmux-plugins/tmux-open.git
+[submodule "tmux/plugins/tmux-plugin-sysstat"]
+	path = tmux/plugins/tmux-plugin-sysstat
+	url = https://github.com/samoshkin/tmux-plugin-sysstat.git
+[submodule "tmux/plugins/tmux-prefix-highlight"]
+	path = tmux/plugins/tmux-prefix-highlight
+	url = https://github.com/tmux-plugins/tmux-prefix-highlight.git
+[submodule "tmux/plugins/tmux-sidebar"]
+	path = tmux/plugins/tmux-sidebar
+	url = https://github.com/tmux-plugins/tmux-sidebar.git
+[submodule "tmux/plugins/tpm"]
+	path = tmux/plugins/tpm
+	url = https://github.com/tmux-plugins/tpm.git
diff --git a/Makefile b/Makefile
index 513fa69..3dca333 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ zsh:
 	rm ~/.zimrc
 	ln -s ~/.dotfiles/zsh/.zimrc ~/.zimrc
 
-i3:
+i3: dep
 	ln -s ~/.dotfiles/i3 ~/.config/i3
 
 .PHONY: clean zsh git vim tmux i3
@@ -30,4 +30,11 @@ clean:
 	rm -rf ~/.vim ~/.vimrc ~/.tmux ~/.tmux.conf ~/.gitconfig ~/.config/i3
 	rm -rf ~/.zshrc ~/.zimrc ~/.zim ~/.zlogin
 
+dep:
+	git clone https://aur.archlinux.org/powerline-fonts-git.git /tmp/powerline-font
+	cd /tmp/powerline-font && makepkg -Acs && sudo pacman -U *.pkg.*
+	git clone https://aur.archlinux.org/bumblebee-status-git.git /tmp/bumblebee
+	cd /tmp/bumblebee && makepkg -Acs && sudo pacman -U *.pkg.*
+	sudo pacman -S awesome-terminal-fonts
+
 all: clean tmux vim git zsh i3
diff --git a/i3/scripts/dmenu/__pycache__/Dmenu.cpython-36.pyc b/i3/scripts/dmenu/__pycache__/Dmenu.cpython-36.pyc
deleted file mode 100644
index 68927ea..0000000
Binary files a/i3/scripts/dmenu/__pycache__/Dmenu.cpython-36.pyc and /dev/null differ
diff --git a/i3/scripts/dmenu/database.sqlite b/i3/scripts/dmenu/database.sqlite
index 3473b14..e9a5a0e 100644
Binary files a/i3/scripts/dmenu/database.sqlite and b/i3/scripts/dmenu/database.sqlite differ
diff --git a/i3/scripts/dmenu/modules/__pycache__/Application.cpython-36.pyc b/i3/scripts/dmenu/modules/__pycache__/Application.cpython-36.pyc
deleted file mode 100644
index 1d31706..0000000
Binary files a/i3/scripts/dmenu/modules/__pycache__/Application.cpython-36.pyc and /dev/null differ
diff --git a/i3/scripts/dmenu/modules/__pycache__/MPC.cpython-36.pyc b/i3/scripts/dmenu/modules/__pycache__/MPC.cpython-36.pyc
deleted file mode 100644
index e8e050f..0000000
Binary files a/i3/scripts/dmenu/modules/__pycache__/MPC.cpython-36.pyc and /dev/null differ
diff --git a/i3/scripts/dmenu/modules/__pycache__/Module.cpython-36.pyc b/i3/scripts/dmenu/modules/__pycache__/Module.cpython-36.pyc
deleted file mode 100644
index 98af5de..0000000
Binary files a/i3/scripts/dmenu/modules/__pycache__/Module.cpython-36.pyc and /dev/null differ
diff --git a/i3/scripts/dmenu/modules/__pycache__/__init__.cpython-36.pyc b/i3/scripts/dmenu/modules/__pycache__/__init__.cpython-36.pyc
deleted file mode 100644
index 5e7a2f8..0000000
Binary files a/i3/scripts/dmenu/modules/__pycache__/__init__.cpython-36.pyc and /dev/null differ
diff --git a/tmux/plugins/tmux-copycat b/tmux/plugins/tmux-copycat
index 6f9b9cd..bcb40ac 160000
--- a/tmux/plugins/tmux-copycat
+++ b/tmux/plugins/tmux-copycat
@@ -1 +1 @@
-Subproject commit 6f9b9cd2d93872cef60e3ea7f7ae89598569ed25
+Subproject commit bcb40aca696a8f80d67e1c97455afe3e2eb76dee
diff --git a/tmux/plugins/tmux-prefix-highlight b/tmux/plugins/tmux-prefix-highlight
index 34f7125..70d880b 160000
--- a/tmux/plugins/tmux-prefix-highlight
+++ b/tmux/plugins/tmux-prefix-highlight
@@ -1 +1 @@
-Subproject commit 34f7125ae46e5123bedad03e08027332d1186186
+Subproject commit 70d880b492b2f61e5304d3cce9bd1432c89cc8f9
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/archlinux-aur/PKGBUILD b/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/archlinux-aur/PKGBUILD
deleted file mode 100644
index 75158be..0000000
--- a/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/archlinux-aur/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Julien Pecqueur (JPEC) <jpec[at]julienpecqueur[dot]net>
-pkgname=liquidprompt-git
-pkgver=20130314
-pkgrel=3
-pkgdesc="An intelligent and non intrusive prompt for bash and zsh"
-url="https://github.com/nojhan/liquidprompt"
-arch=('any')
-license=('AGPLv3')
-optdepends=('screen' 'acpi')
-makedepends=('git')
-md5sums=('SKIP')
-install=liquidprompt.install
-_gitroot="git://github.com/nojhan/liquidprompt.git"
-_gitname="liquidprompt"
-
-build() {
-  cd ${srcdir}/
-  msg "Connecting to the GIT server...."
-  if [[ -d ${srcdir}/${_gitname} ]] ; then
-    cd ${_gitname}
-    git reset --hard
-    git pull origin
-    msg "The local files are updated..."
-  else
-    msg "Cloning git repo..."
-    git clone ${_gitroot}
-    cd ${_gitname}
-  fi
-  git reset --hard
-  msg "GIT checkout done."
-}
-
-package() {
-  cd "${srcdir}/${_gitname}"
-  # install files
-  install -Dm755 liquidprompt "$pkgdir/usr/bin/liquidprompt"
-  install -Dm644 liquidpromptrc-dist "$pkgdir/etc/liquidpromptrc"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/archlinux-aur/liquidprompt.install b/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/archlinux-aur/liquidprompt.install
deleted file mode 100644
index 80cf376..0000000
--- a/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/archlinux-aur/liquidprompt.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-	 echo "Use 'source liquidprompt' to enable the prompt."
-}
-
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/debian/create_deb.sh b/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/debian/create_deb.sh
deleted file mode 100755
index daf559e..0000000
--- a/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/debian/create_deb.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-echo "Creating Debian's package..."
-nano ./liquidprompt/DEBIAN/control
-
-echo "Copying files..."
-cp ../../liquidprompt ./liquidprompt/usr/bin/liquidprompt
-cp ../../liquidpromptrc-dist ./liquidprompt/etc/liquidpromptrc
-chmod a+x ./liquidprompt/usr/bin/liquidprompt
-
-echo "Building liquidprompt.deb..."
-dpkg-deb -b liquidprompt
-
-echo "Deleting files..."
-rm -f ./liquidprompt/etc/*
-rm -f ./liquidprompt/usr/bin/*
-
-echo "Done !"
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/debian/liquidprompt/DEBIAN/control b/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/debian/liquidprompt/DEBIAN/control
deleted file mode 100644
index 95ee5ce..0000000
--- a/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/debian/liquidprompt/DEBIAN/control
+++ /dev/null
@@ -1,11 +0,0 @@
-Package: liquidprompt
-Version: 1.3-0
-Section: base
-Priority: optional
-Architecture: all
-Depends: bash
-Recommends: acpi
-Suggests: git, screen, tmux
-Maintainer: Julien Pecqueur <jpec@julienpecqueur.net>
-Description: A slick adaptative prompt for Bash and Zsh.
-Homepage: http://github.com/nojhan/liquidprompt