diff --git a/dot_zshrc b/dot_zshrc
index ca21636..1a4217b 100644
--- a/dot_zshrc
+++ b/dot_zshrc
@@ -36,6 +36,7 @@ z4h init || return
 # Export environment variables.
 export GPG_TTY=$TTY
 export SAVEHIST=200000
+export HISTSIZE=200000
 export HISTFILE=$HOME/.cache/zsh/history
 export SPACEVIMDIR="$HOME/.config/spacevim/"
 export FZF_MARKS_FILE=$HOME/.config/fzfmarks
@@ -46,15 +47,11 @@ z4h source $HOME/.config/local/env.zsh
 
 # Source Files
 z4h source $HOME/.config/zsh/sshagent.zsh
-#z4h source $Z4H/ohmyzsh/ohmyzsh/lib/history.zsh
-z4h source $Z4H/ohmyzsh/ohmyzsh/lib/functions.zsh
+z4h source $Z4H/ohmyzsh/ohmyzsh/lib/history.zsh
 z4h source $Z4H/ohmyzsh/ohmyzsh/lib/completion.zsh
 z4h source $Z4H/ohmyzsh/ohmyzsh/lib/directories.zsh
-z4h source $Z4H/ohmyzsh/ohmyzsh/lib/key-bindings.zsh
-z4h source $Z4H/ohmyzsh/ohmyzsh/lib/termsupport.zsh
 z4h source $Z4H/ohmyzsh/ohmyzsh/lib/clipboard.zsh
 z4h source $Z4H/ohmyzsh/ohmyzsh/lib/grep.zsh
-#z4h source $Z4H/ohmyzsh/ohmyzsh/plugins/fzf/fzf.plugin.zsh
 z4h source $Z4H/ohmyzsh/ohmyzsh/plugins/command-not-found/command-not-found.plugin.zsh
 z4h source $Z4H/urbainvaes/fzf-marks/fzf-marks.plugin.zsh
 #zinit pack for ls_colors
@@ -62,15 +59,13 @@ z4h source $Z4H/urbainvaes/fzf-marks/fzf-marks.plugin.zsh
 # Aliases
 z4h source $HOME/.config/zsh/aliases.zsh
 z4h source $HOME/.config/local/aliases.zsh
+
 # Add flags to existing aliases.
 #alias ls="${aliases[ls]:-ls} -A"
 
 # Define key bindings.
-z4h bindkey z4h-backward-kill-word  Ctrl+Backspace Ctrl+H
-z4h bindkey z4h-backward-kill-zword Ctrl+Alt+Backspace
 
 # Autoload functions.
-autoload -Uz zmv
 
 # Define functions and completions.
 function md() { [[ $# == 1 ]] && mkdir -p -- "$1" && cd -- "$1" }
@@ -78,12 +73,11 @@ compdef _directories md
 
 # Fix SSH Completions
 zstyle ':completion:*:*:*:users' ignored-patterns '*'
-#zstyle -e ':completion:*:(ssh|scp|sftp|rsh|rsync):hosts' hosts 'reply=(${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) /dev/null)"}%%[# ]*}//,/ })'
-zstyle ':completion:*:(scp|rsync):*' tag-order 'hosts:-host:host hosts:-domain:domain hosts:-ipaddr:ip\ address *'
-zstyle ':completion:*:(scp|rsync):*' group-order users files all-files hosts-domain hosts-host hosts-ipaddr
-zstyle ':completion:*:ssh:*' tag-order users 'hosts:-host:host hosts:-domain:domain hosts:-ipaddr:ip\ address *'
+zstyle -e ':completion:*:(ssh|scp|sftp|rsh|rsync):hosts' hosts 'reply=(${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) /dev/null)"}%%[# ]*}//,/ })'
+zstyle ':completion:*:(scp|ssh):*' tag-order 'hosts:-host:host hosts:-domain:domain hosts:-ipaddr:ip\ address *'
+zstyle ':completion:*:scp:*' group-order users files all-files hosts-domain hosts-host hosts-ipaddr
 zstyle ':completion:*:ssh:*' group-order hosts-domain hosts-host users hosts-ipaddr
-zstyle ':completion:*:*:*:hosts-host' ignored-patterns '*(.|:)*' loopback ip6-loopback localhost localhost4 localhost6 ip6-localhost broadcasthost pxm
+zstyle ':completion:*:*:*:hosts-host' ignored-patterns '*(.|:)*' loopback ip6-loopback localhost localhost4 localhost6 ip6-localhost broadcasthost
 zstyle ':completion:*:*:*:hosts-domain' ignored-patterns '<->.<->.<->.<->' '^[-[:alnum:]]##(.[-[:alnum:]]##)##' '*@*' '*localdomain*' '*.eeleater.org' '*.local'
 zstyle ':completion:*:*:*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.0.0.<->' '255.255.255.255' '::1' 'fe80::*'
 
@@ -91,6 +85,8 @@ zstyle ':completion:*:*:*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::
 [[ -z $z4h_win_home ]] || hash -d wsl=$z4h_win_home
 
 # Set shell options: http://zsh.sourceforge.net/Doc/Release/Options.html
-setopt multios prompt_subst auto_pushd pushd_ignore_dups pushdminus inc_append_history
+setopt multios
+setopt prompt_subst
+setopt inc_append_history
 
 z4h source $HOME/.config/local/rc.zsh