diff --git a/hybris.completions b/hybris.completions
new file mode 100644
index 0000000..a420e95
--- /dev/null
+++ b/hybris.completions
@@ -0,0 +1,3 @@
+# Some completions
+compctl -K _completemarks    j
+compdef    _path_commands    catwhich
diff --git a/hybris.zsh b/hybris.zsh
index 841fb03..6a5824d 100644
--- a/hybris.zsh
+++ b/hybris.zsh
@@ -40,7 +40,3 @@ export PATH=$HOME/.scripts:$PATH
 export READNULLCMD=${PAGER:-/usr/bin/pager}
 export WATCH=all
 export WATCHFMT="%n has %a %l from %M"
-
-# Some completions
-compctl -K _completemarks    j
-compdef    _path_commands    catwhich
diff --git a/zshrc b/zshrc
index e1be20c..73151a7 100644
--- a/zshrc
+++ b/zshrc
@@ -7,12 +7,14 @@ source "${HOME}/.zgen/zgen.zsh"
 # Plugins and configuration generator #
 #######################################
 if ! zgen saved; then
-  # Personnal configuration
+  # Configuration
   zgen load hybris42/zsh ${USER}.zsh
+  # Theme
   zgen load hybris42/zsh ${USER}.theme
-
-  # Personnal plugins
-  source ${HOME}/.zgen/hybris42/zsh-master/hybris.plugins
+  # Plugins
+  zgen load hybris42/zsh ${USER}.plugins
+  # Completions
+  zgen load hybris42/zsh ${USER}.completions
 
   # generate the init script from plugins above
   zgen save