diff --git a/lib/directories.zsh b/lib/directories.zsh
index 8927a56ad..9ea770b96 100644
--- a/lib/directories.zsh
+++ b/lib/directories.zsh
@@ -35,6 +35,6 @@ compdef _dirs d
 
 # List directory contents
 alias lsa='ls -lah'
-alias l='ls -lah'
-alias ll='ls -lh'
+alias l='ls --group-directories-first -h --color -FC'
+alias ll='ls -FC -lv --group-directories-first'
 alias la='ls -lAh'
diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index 585e969d8..891435f62 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -71,9 +71,9 @@ case "$OSTYPE" in
     ;;
   *)
     if test-ls-args ls --color; then
-      alias ls='ls --color=tty'
+      alias ls='ls --group-directories-first -h --color -FC'
     elif test-ls-args ls -G; then
-      alias ls='ls -G'
+      alias ls='ls --group-directories-first -h --color -FC'
     fi
     ;;
 esac