diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 9d82e6b..595c899 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -2,11 +2,10 @@
 [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] &&
     source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 
-# Some variables
-ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern regexp root line)
-ZLE_RPROMPT_INDENT=0
+# Load the completion system
+autoload -Uz compinit && compinit
 
-# Load the .zsh files
+# Source *.zsh files
 for zfile in $ZDOTDIR/*.zsh; do
     source $zfile
 done
diff --git a/zsh/.config/zsh/completion.zsh b/zsh/.config/zsh/completion.zsh
deleted file mode 100644
index e868054..0000000
--- a/zsh/.config/zsh/completion.zsh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Load the completion system
-autoload -Uz compinit && compinit
-
-# Case insensitive completion for lowercase
-zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}'
-
-# Highlighted tab selection
-zstyle ':completion:*' menu yes select
diff --git a/zsh/.config/zsh/options.zsh b/zsh/.config/zsh/options.zsh
new file mode 100644
index 0000000..848ddfd
--- /dev/null
+++ b/zsh/.config/zsh/options.zsh
@@ -0,0 +1,14 @@
+# Case insensitive completion for lowercase
+zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}'
+
+# Highlighted tab selection
+zstyle ':completion:*' menu yes select
+
+# Friendly names in Antidote
+zstyle ':antidote:bundle' use-friendly-names 'yes'
+
+# Syntax highlighters
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern regexp root line)
+
+# Right indentation off
+ZLE_RPROMPT_INDENT=0