diff --git a/zshenv b/zshenv
index 20f5f17..e226332 100644
--- a/zshenv
+++ b/zshenv
@@ -5,8 +5,8 @@
 # Enable saving command history to file
 [ ! -d $HOME/.cache/zsh ] && mkdir -p $HOME/.cache/zsh
 HISTFILE=$HOME/.cache/zsh/histfile
-HISTSIZE=5000
-SAVEHIST=5000
+HISTSIZE=20000
+SAVEHIST=20000
 
 # Enable time stats for long lasting commands
 REPORTTIME=5
diff --git a/zshrc b/zshrc
index 4c849fd..c82543d 100644
--- a/zshrc
+++ b/zshrc
@@ -38,12 +38,13 @@ source-plugin sandbox
 source-plugin notes
 
 # Remove duplicates from history
-setopt hist_ignore_all_dups
-setopt hist_reduce_blanks
-setopt hist_save_no_dups
+setopt histignoredups
 
 # Enable multi-terminal history
-setopt inc_append_history
+setopt share_history
+
+# Disable error when no glob matches are found
+setopt nonomatch
 
 # Enable comments in the prompt
 setopt interactive_comments
@@ -52,10 +53,13 @@ setopt interactive_comments
 setopt ignore_eof
 
 # Disable sound
-unsetopt beep
+setopt nobeep
 
 # Disable tty flow control, allows vim to use '<Ctrl>S'
-unsetopt flow_control && stty -ixon
+setopt noflowcontrol
+
+# Enable completions in the middle of a word
+setopt completeinword
 
 # Initialize completions
 autoload -U compinit