diff --git a/completion.zsh b/completion.zsh
index e0edc76..dff71cf 100644
--- a/completion.zsh
+++ b/completion.zsh
@@ -11,6 +11,9 @@ compinit
 
 zmodload -i zsh/complist
 
+## case-insensitive (all),partial-word and then substring completion
+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+
 zstyle ':completion:*' list-colors ''
 zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )