diff --git a/dotfiles/my-aliases.zsh.original b/dotfiles/my-aliases.zsh.original
index 73fb5e9..441e89b 100644
--- a/dotfiles/my-aliases.zsh.original
+++ b/dotfiles/my-aliases.zsh.original
@@ -6,7 +6,12 @@ alias gcm="git commit -m"
 
 alias findzombie="ps -A -ostat,pid,ppid | grep -e '[zZ]'"
 
-
+# 🌟 Eza aliases - Modern replacement for ls (conditionally enabled by setup.sh)
+# These provide enhanced directory listing with icons, git status, and tree views
+# The setup script will enable these dynamically if eza is available, otherwise traditional ls aliases are used
+alias la-eza="eza -la --color=auto --group-directories-first"
+alias ll-eza="eza -laFh --color=auto --group-directories-first"
+alias l-eza="eza -1 --color=auto --group-directories-first"
 
 # 🎬 Plex Media Server Management - Sexy Edition
 alias plex="/home/acedanger/shell/plex/plex.sh"
@@ -21,9 +26,23 @@ alias dcdn="docker compose down"
 alias dcupd="docker compose up -d"
 alias dcpull="docker compose pull"
 alias lzd="lazydocker"
-alias cat="bat"
-alias fd="fd"
-alias fzf="fzf --preview='bat {}'"
+
+# 🌟 Eza aliases - Modern replacement for ls
+
+# 🌟 Eza aliases - Modern replacement for ls
+
+# 🌟 Eza aliases - Modern replacement for ls
+
+# 🌟 Eza aliases - Modern replacement for ls
+
+# 🌟 Eza aliases - Modern replacement for ls
+
+# 🌟 Eza aliases - Modern replacement for ls
+
+# 🌟 Eza aliases - Modern replacement for ls
+alias cat="batcat"
+alias fd="fdfind"
+alias fzf="fzf --preview='batcat {}'"
 
 # 🌟 Eza aliases - Modern replacement for ls
 alias ls="eza --icons=always -a --color=auto --group-directories-first"
diff --git a/setup/setup.sh b/setup/setup.sh
index 255932e..53ce751 100755
--- a/setup/setup.sh
+++ b/setup/setup.sh
@@ -384,7 +384,14 @@ grep -v "^alias fzf=" | \
 grep -v "^alias ls=" | \
 grep -v "^alias ll=" | \
 grep -v "^alias la=" | \
-grep -v "^alias l=" > "$ALIASES_FILE"
+grep -v "^alias l=" | \
+grep -v "^alias tree=" | \
+grep -v "^alias lt=" | \
+grep -v "^alias llt=" | \
+grep -v "^alias lg=" | \
+grep -v "^alias lh=" | \
+grep -v "^alias lr=" | \
+grep -v "^alias lx=" > "$ALIASES_FILE"
 
 # Function to check for command existence and add appropriate alias
 add_conditional_alias() {