diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 8e193fd..884e97b 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -1,8 +1,8 @@
 # install zinit
-source $ZDOTDIR/zinit.zsh
+source $ZDOTDIR/zinit
 
 # load remote plugins
-zinit wait lucid light-mode for \
+zinit wait lucid light-mode id-as depth"1" for \
     wintermi/zsh-brew \
     hlissner/zsh-autopair \
     Aloxaf/fzf-tab \
@@ -14,26 +14,28 @@ zinit wait lucid light-mode for \
         zsh-users/zsh-completions
 
 # load prompt theme
-zinit ice as"command" from"gh-r" \
+zinit ice as"command" from"gh-r" id-as \
     atclone"./starship init zsh > init.zsh; ./starship completions zsh > _starship" \
     atpull"%atclone" src"init.zsh"
 zinit light starship/starship
 
 # load binaries
-zinit as"command" wait lucid light-mode from"gh-r" for \
+zinit as"command" wait lucid light-mode from"gh-r" id-as for \
     extract"!" lsd-rs/lsd \
     extract"!" zyedidia/micro \
     extract"!" cp"autocomplete/bat.zsh -> _bat" @sharkdp/bat \
-    extract"!" atclone="cp usr/bin/fastfetch .; rm -rf usr" atpull"%atclone" \
+    extract"!" pick"usr/bin/fastfetch" \
         fastfetch-cli/fastfetch \
     atclone"./zoxide init zsh > init.zsh" atpull"%atclone" src"init.zsh" \
         ajeetdsouza/zoxide \
     atclone"./fzf --zsh > init.zsh" atpull="%atclone" src"init.zsh" \
         junegunn/fzf \
-    atclone"./fnm env --use-on-cd > init.zsh" atpull"%atclone" src"init.zsh" Schniz/fnm
+    atclone"./fnm env --use-on-cd --shell zsh > init.zsh; ./fnm completions --shell zsh > _fnm" atpull"%atclone" src"init.zsh" Schniz/fnm
 
 # load local scripts
-source $ZDOTDIR/exports.zsh
-source $ZDOTDIR/aliases.zsh
-source $ZDOTDIR/options.zsh
-source $ZDOTDIR/bin.zsh
+zinit is-snippet id-as for \
+    $ZDOTDIR/snippets/exports \
+    $ZDOTDIR/snippets/aliases \
+    $ZDOTDIR/snippets/options \
+    $ZDOTDIR/snippets/bin
+
diff --git a/zsh/.config/zsh/aliases.zsh b/zsh/.config/zsh/snippets/aliases
similarity index 100%
rename from zsh/.config/zsh/aliases.zsh
rename to zsh/.config/zsh/snippets/aliases
diff --git a/zsh/.config/zsh/bin.zsh b/zsh/.config/zsh/snippets/bin
similarity index 100%
rename from zsh/.config/zsh/bin.zsh
rename to zsh/.config/zsh/snippets/bin
diff --git a/zsh/.config/zsh/exports.zsh b/zsh/.config/zsh/snippets/exports
similarity index 79%
rename from zsh/.config/zsh/exports.zsh
rename to zsh/.config/zsh/snippets/exports
index 347c61e..3d1cc39 100644
--- a/zsh/.config/zsh/exports.zsh
+++ b/zsh/.config/zsh/snippets/exports
@@ -1,13 +1,11 @@
 #!/usr/bin/env zsh
 
-HISTSIZE=1000000
-SAVEHIST=1000000
-
 export MANWIDTH=999
 
 export EDITOR="micro"
 export PAGER="bat"
 export VISUAL="micro"
 export SUDO_EDITOR="micro"
+export COMPANY_DIR="$HOME/Documents/work/company/"
 
 export STARSHIP_CONFIG="$XDG_CONFIG_HOME"/starship/starship.toml
diff --git a/zsh/.config/zsh/options.zsh b/zsh/.config/zsh/snippets/options
similarity index 92%
rename from zsh/.config/zsh/options.zsh
rename to zsh/.config/zsh/snippets/options
index 3bb969f..fba70e7 100644
--- a/zsh/.config/zsh/options.zsh
+++ b/zsh/.config/zsh/snippets/options
@@ -1,3 +1,5 @@
+#!/usr/bin/env zsh
+
 unsetopt BEEP
 setopt AUTO_CD
 setopt GLOB_DOTS
@@ -24,4 +26,4 @@ setopt HIST_SAVE_NO_DUPS         # Don't write duplicate entries in the history
 setopt HIST_REDUCE_BLANKS        # Remove superfluous blanks before recording entry.
 setopt HIST_VERIFY               # Don't execute immediately upon history expansion.
 
-zstyle ':fzf-tab:complete:cd:*' fzf-preview 'lsd -1 --color=always --icon=always $realpath'
+zstyle ':fzf-tab:complete:cd:*' fzf-preview "lsd -1 --color=always --icon=always $realpath"
diff --git a/zsh/.config/zsh/zinit.zsh b/zsh/.config/zsh/zinit
similarity index 100%
rename from zsh/.config/zsh/zinit.zsh
rename to zsh/.config/zsh/zinit