diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc
index f17c766..d79e9bc 100644
--- a/config/zsh/.zshrc
+++ b/config/zsh/.zshrc
@@ -62,6 +62,8 @@ alias 9='cd -9'
 
 export PATH=$PATH:~/projects/system/dotfiles/scripts/
 
+VIRTUAL_ENV_DISABLE_PROMPT=true
+
 # Yazi wrapper
 function y() {
 	local tmp cwd; tmp="$(mktemp -t "yazi-cwd.XXXXXX")"
@@ -71,10 +73,16 @@ function y() {
 	command rm -f -- "$tmp"
 }
 
-source ~/.config/zsh/theme.zsh
+# Zoxide
 eval "$(zoxide init --cmd j zsh)"
 
-# for file in ~/projects/system/dotfiles/system/completions/*
-# do
-#     source $file
-# done
+# Theme
+source ~/.config/zsh/theme.zsh
+
+for file in ~/projects/system/dotfiles/system/zsh-completions/*
+do
+    source $file
+done
+
+ZSH_AUTOSUGGEST_STRATEGY=(completion history)
+source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
diff --git a/config/zsh/theme.zsh b/config/zsh/theme.zsh
index 4cd5e66..a5730dd 100644
--- a/config/zsh/theme.zsh
+++ b/config/zsh/theme.zsh
@@ -6,7 +6,7 @@ local vcs_info=''
 local venv_prompt=''
 
 precmd () {
-    vcs_info='git status'
+    vcs_info="git status"
 }
 
 
diff --git a/system/zsh-completions/dev-containers.zsh b/system/zsh-completions/dev-containers.zsh
new file mode 100644
index 0000000..3c44bb4
--- /dev/null
+++ b/system/zsh-completions/dev-containers.zsh
@@ -0,0 +1,5 @@
+#compdef _dev-containers dev-containers
+
+function _dev-containers {
+    _arguments -C "1: :(base compilerdesign jupyter node php postgres python rust torch-rocm vue webserver rm help shell)" "*::arg:->args"
+}