diff --git a/zsh/rc.zsh b/zsh/rc.zsh
index 923c6db..72b46aa 100644
--- a/zsh/rc.zsh
+++ b/zsh/rc.zsh
@@ -6,12 +6,13 @@ export FZF_MARKS_FILE=$HOME/.config/fzfmarks
 export STARSHIP_CONFIG=$ZDOTDIR/starship.toml
 export ZSH_EVALCACHE_DIR="$HOME/.cache/evalcache"
 
-# Stuff
+# Setopt Stuff
 setopt multios
 setopt prompt_subst
 setopt auto_pushd
 setopt pushd_ignore_dups
 setopt pushdminus
+setopt inc_append_history
 
 # Zinit Clone if not exist
 [[ ! -f $HOME/.config/zinit/bin/zinit.zsh ]] && command git clone https://github.com/zdharma/zinit $HOME/.config/zinit/bin
@@ -28,20 +29,20 @@ zinit ice as"program" from"gh-r" mv"fd* -> fd" pick"fd/fd"; zinit light sharkdp/
 zinit ice as"program" from"gh-r" mv"bat* -> bat" pick"bat/bat"; zinit light sharkdp/bat
 zinit ice as"program" from"gh-r" mv"exa* -> exa"; zinit light ogham/exa
 zinit ice as"program" from"gh-r" mv"pet* -> pet" pick"usr/local/bin/pet"; zinit light knqyf263/pet
-zinit ice as"program" from"gh-r" mv"ripgrep* -> ripgrep" pick"ripgrep/rg"; zinit load BurntSushi/ripgrep
-zinit ice as"program" from"gh-r" mv"gopass* -> gopass" pick"gopass/gopass"; zinit load gopasspw/gopass
-zinit ice as"program" from"gh-r" mv"jq-* -> jq"; zinit load "stedolan/jq"
-zinit ice as"program" pick"emojify"; zinit load "mrowa44/emojify"
-
+zinit ice as"program" from"gh-r" mv"ripgrep* -> ripgrep" pick"ripgrep/rg"; zinit light BurntSushi/ripgrep
+zinit ice as"program" from"gh-r" mv"gopass* -> gopass" pick"gopass/gopass"; zinit light gopasspw/gopass
+zinit ice as"program" from"gh-r" mv"jq-* -> jq"; zinit light "stedolan/jq"
+zinit ice as"program" pick"emojify"; zinit light "mrowa44/emojify"
+zinit ice as"program" pick"ansi"; zinit light "fidian/ansi"
+zinit light "micha/resty"
 
 # Completions and Autosuggestions
-zinit ice wait lucid blockf atpull'zinit creinstall -q .'; zinit light zsh-users/zsh-completions
-zinit ice wait lucid atload"_zsh_autosuggest_start"; zinit light zsh-users/zsh-autosuggestions
+zinit ice wait lucid blockf atpull'zinit creinstall -q .'; zinit light "zsh-users/zsh-completions"
+zinit ice wait lucid atload"_zsh_autosuggest_start"; zinit light "zsh-users/zsh-autosuggestions"
 
-# History Stuff
-SAVEHIST=20000
-HISTFILE=$HOME/.cache/zsh/history
-setopt inc_append_history
+# History
+export SAVEHIST=20000
+export HISTFILE=$HOME/.cache/zsh/history
 
 # Library Files
 source $ZDOTDIR/files/aliases.zsh
@@ -69,27 +70,27 @@ zstyle ':completion:*:*:*:hosts-domain' ignored-patterns '<->.<->.<->.<->' '^[-[
 zstyle ':completion:*:*:*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.0.0.<->' '255.255.255.255' '::1' 'fe80::*'
 
 # Plugins
-zinit ice lucid; zinit light mroth/evalcache
+zinit ice lucid; zinit light "mroth/evalcache"
 zinit ice wait lucid; zinit snippet OMZP::command-not-found
 zinit ice wait lucid; zinit snippet OMZP::lando
 zinit ice wait lucid; zinit snippet OMZP::thefuck
 zinit ice wait lucid; zinit snippet OMZP::fzf
-zinit ice wait lucid; zinit light b4b4r07/enhancd
-zinit ice wait lucid; zinit light jreese/zsh-titles
-zinit ice wait lucid; zinit light wookayin/fzf-fasd
-zinit ice wait lucid; zinit light urbainvaes/fzf-marks
-zinit ice wait lucid; zinit light Aloxaf/fzf-tab
-zinit ice wait lucid; zinit light wfxr/forgit
-zinit ice wait lucid; zinit light reegnz/jq-zsh-plugin
-zinit ice wait lucid; zinit light asdf-vm/asdf
-zinit ice wait lucid; zinit light b4b4r07/emoji-cli
+zinit ice wait lucid; zinit light "b4b4r07/enhancd"
+zinit ice wait lucid; zinit light "jreese/zsh-titles"
+zinit ice wait lucid; zinit light "wookayin/fzf-fasd"
+zinit ice wait lucid; zinit light "urbainvaes/fzf-marks"
+zinit ice wait lucid; zinit light "Aloxaf/fzf-tab"
+zinit ice wait lucid; zinit light "wfxr/forgit"
+zinit ice wait lucid; zinit light "reegnz/jq-zsh-plugin"
+zinit ice wait lucid; zinit light "asdf-vm/asdf"
+zinit ice wait lucid; zinit light "b4b4r07/emoji-cli"
 
 # syntax highlighting
 zpcompinit
-zinit ice wait lucid atinit"zpcdreplay -q"; zinit light zsh-users/zsh-syntax-highlighting
+zinit ice wait lucid atinit"zpcdreplay -q"; zinit light "zsh-users/zsh-syntax-highlighting"
 
 # Theme
-zinit ice depth=1; zinit light romkatv/powerlevel10k
+zinit ice depth=1; zinit light "romkatv/powerlevel10k"
 #_evalcache starship init zsh
 
 # Local RC