diff --git a/zshrc b/zshrc
index e9d181d..f80f16b 100644
--- a/zshrc
+++ b/zshrc
@@ -17,6 +17,9 @@ autoload -U compinit; compinit
 # retrieve information from version control systems
 autoload -Uz vcs_info
 
+# Case-insensitive, partial-word and then substring completion
+zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+
 # Offers menu when > selected elements appear
 zstyle ':completion:*' menu select
 
@@ -67,6 +70,7 @@ alias gc='g commit'
 alias gd='g diff'
 alias glog='g log --graph --oneline'
 alias gst='g status --short --branch'
+
 # update all repositories within the current directory
 alias update_repositories='find . -name ".git" -type d | xargs -P4 -I{} git --git-dir={} --work-tree={} pull'