diff --git a/zshrc b/zshrc
index 9d5e010..2ca7044 100644
--- a/zshrc
+++ b/zshrc
@@ -6,22 +6,25 @@ plugin-load() { source ~/.config/zsh/$1/$1.plugin.zsh }
 plugin-load zsh-syntax-highlighting
 plugin-load zsh-history-substring-search
 
-# Disable sound
-unsetopt BEEP
-
 # Remove duplicates from history
-setopt HIST_IGNORE_ALL_DUPS
-setopt HIST_REDUCE_BLANKS
-setopt HIST_SAVE_NO_DUPS
+setopt hist_ignore_all_dups
+setopt hist_reduce_blanks
+setopt hist_save_no_dups
 
 # Enable multi-terminal history
-setopt INC_APPEND_HISTORY
-
-# Disable '<Ctrl>D' to logout
-setopt IGNORE_EOF
+setopt inc_append_history
 
 # Enable comments in the prompt
-setopt INTERACTIVE_COMMENTS
+setopt interactive_comments
+
+# Disable '<Ctrl>D' to logout
+setopt ignore_eof
+
+# Disable sound
+unsetopt beep
+
+# Disable tty flow control, allows vim to use '<Ctrl>S'
+unsetopt flow_control
 
 # Initialize completions
 autoload -U compinit
@@ -32,7 +35,7 @@ autoload -Uz promptinit
 promptinit
 prompt fresh
 
-# Enable vi mode
+# Enable vi mode line editor keymap
 bindkey -v
 
 # Enable yank, change, and delete whole line with 'Y', 'C', and 'D'
@@ -60,9 +63,6 @@ autoload -U edit-command-line
 zle -N edit-command-line
 bindkey -M vicmd '^V' edit-command-line
 
-# Disable tty flow control, allows vim to use '<Ctrl>S'
-stty -ixon
-
 # Remove duplicates from environment variables
 typeset -U PATH
 typeset -U MANPATH