diff --git a/.config/yazi/theme.toml b/.config/yazi/theme.toml
new file mode 100644
index 0000000..b0dd1e2
--- /dev/null
+++ b/.config/yazi/theme.toml
@@ -0,0 +1,3 @@
+[flavor]
+dark = "tokyonight-night"
+light = "tokyonight-night"
diff --git a/zsh/.aliases b/zsh/.aliases
index 94c6686..d1942f6 100644
--- a/zsh/.aliases
+++ b/zsh/.aliases
@@ -41,11 +41,8 @@ alias yy='yazi'
 
 # alias ..='cd ..'
 # alias ...='cd ../..'
-alias cdf='cd $(fd -t d | fzf)'
-# alias cd='z'
-alias cdi='zoxide query -i'
-# alias z='zoxide query -i'
-
+# alias cdf='cd $(fd -t d | fzf)'
+# alias cdi='zoxide query -i'
 
 # ----------------------------
 # File & Disk Utilities
@@ -98,10 +95,18 @@ alias allcmds='compgen -c | sort -u | fzf'
 # ----------------------------
 
 help() {
-  "$@" --help 2>&1 | bat --plain --language=help
+  if builtin help "$1" &>/dev/null; then
+    builtin help "$1" | bat --plain
+  else
+    "$@" --help 2>&1 | bat --plain
+  fi
 }
 
-alias shelp='builtin help | bat --plain --language=help'
+# help() {
+#    "$@" --help 2>&1 | bat --plain --language=txt
+# }
+
+# alias shelp='builtin help | bat --plain --language=help'
 
 # alias bathelp='bat --plain --language=help'
 # help() {
@@ -124,13 +129,19 @@ fi
 # fi
 
 if command -v exa &> /dev/null; then
+    alias ls='exa'
     alias l='exa -l'
     alias lsl='exa --icons'
     alias ll='exa -al --icons'
     alias lt='exa -al --tree --level=2 --icons'
-elif command -v eza &> /dev/null; then
-    alias lg='eza -l  --icons --git -a'
-else
+fi
+
+if command -v eza &> /dev/null; then
+    alias lg='eza -l --icons --git -a'
+fi
+
+# Fallbacks if neither exa nor eza are found
+if ! command -v exa &> /dev/null && ! command -v eza &> /dev/null; then
     alias ls='ls --color=auto'
     alias ll='ls -lah'
     alias la='ls -A'
diff --git a/zsh/.exports b/zsh/.exports
index b424238..b52a5e2 100644
--- a/zsh/.exports
+++ b/zsh/.exports
@@ -21,5 +21,6 @@ export PATH="$PATH:$HOME/.local/bin"
 # SHELLEXPORTS="export TERM=xterm;stty rows $(tput lines) columns $(tput cols)"
 
 if command -v bat &> /dev/null; then
+#     export MANPAGER="sh -c 'col -bx | bat -l man -p'"
     export MANPAGER="sh -c 'sed -u -e \"s/\\x1B\[[0-9;]*m//g; s/.\\x08//g\" | bat -p -lman'"
 fi
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 92b17ec..e894aba 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -83,7 +83,7 @@ alias c='clear'
 # Shell integrations
 # eval "$(fzf --zsh)"
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
-eval "$(zoxide init --cmd cd zsh)"
+eval "$(zoxide init zsh)"
 
 # Sourcing
 source $HOME/.cargo/env