diff --git a/lib/appearance.zsh b/lib/appearance.zsh
index aec67721a..90d316d27 100644
--- a/lib/appearance.zsh
+++ b/lib/appearance.zsh
@@ -7,7 +7,7 @@ export LSCOLORS="Gxfxcxdxbxegedabagacad"
 if [ "$DISABLE_LS_COLORS" != "true" ]
 then
   # Find the option for using colors in ls, depending on the version: Linux or BSD
-  ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G'
+  ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=auto -A' || alias ls='ls -G -A'
 fi
 
 #setopt no_beep
diff --git a/lib/misc.zsh b/lib/misc.zsh
index 4c1743657..c7cfd93f7 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -9,5 +9,5 @@ bindkey "^[m" copy-prev-shell-word
 setopt long_list_jobs
 
 ## pager
-export PAGER=less
+export PAGER='less -MR'
 export LC_CTYPE=en_US.UTF-8
diff --git a/themes/alex.zsh-theme b/themes/alex.zsh-theme
index ea799565b..5b64657a2 100644
--- a/themes/alex.zsh-theme
+++ b/themes/alex.zsh-theme
@@ -1,36 +1,36 @@
 if [ $UID -eq 0 ]; then NCOLOUR="red"; else NCOLOUR="yellow"; fi
 
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[black]%}±"
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}±"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY='!'
-ZSH_THEME_GIT_PROMPT_CLEAN=''
-ZSH_THEME_GIT_PROMPT_MODIFIED='!'
-ZSH_THEME_GIT_PROMPT_ADDED='+'
-ZSH_THEME_GIT_PROMPT_RENAMED='%'
-ZSH_THEME_GIT_PROMPT_DELETED='x'
-ZSH_THEME_GIT_PROMPT_UNTRACKED='?'
-ZSH_THEME_GIT_PROMPT_UNMERGED='*'
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}!"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+ZSH_THEME_GIT_PROMPT_MODIFIED="%{$fg[red]%}!"
+ZSH_THEME_GIT_PROMPT_ADDED="%{$fg[red]%}+"
+ZSH_THEME_GIT_PROMPT_RENAMED="%{$fg[red]%}%"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[red]%}x"
+ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[red]%}?"
+ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[red]%}*"
 
-ZSH_THEME_HG_PROMPT_PREFIX="%{$fg_bold[black]%}☿"
+ZSH_THEME_HG_PROMPT_PREFIX="%{$fg[white]%}☿"
 ZSH_THEME_HG_PROMPT_SUFFIX="%{$reset_color%}"
-ZSH_THEME_HG_PROMPT_MODIFIED='!'
-ZSH_THEME_HG_PROMPT_ADDED='+'
-ZSH_THEME_HG_PROMPT_UNTRACKED='?'
-ZSH_THEME_HG_PROMPT_DELETED='x'
-ZSH_THEME_HG_PROMPT_DIRTY='!'
+ZSH_THEME_HG_PROMPT_MODIFIED="%{$fg[red]%}!"
+ZSH_THEME_HG_PROMPT_ADDED="%{$fg[red]%}+"
+ZSH_THEME_HG_PROMPT_UNTRACKED="%{$fg[red]%}?"
+ZSH_THEME_HG_PROMPT_DELETED="%{$fg[red]%}x"
+ZSH_THEME_HG_PROMPT_DIRTY="%{$fg[red]%}!"
 ZSH_THEME_HG_PROMPT_CLEAN=''
 
 EXIT_CODE_DISPLAY="%(?.%{$fg[green]%}.%{$fg[red]%}%? )"
 ZSH_THEME_EXIT_CODE=$EXIT_CODE_DISPLAY
-PROMPT_COLOUR=%{$fg[$NCOLOUR]%}
+PROMPT_COLOUR="$fg[$NCOLOUR]"
 
-PROMPT='${PROMPT_COLOUR}%D{%k:%M} %c ➤ %{$reset_color%}'
-RPROMPT='${ZSH_THEME_EXIT_CODE}$(git_prompt_info)$(hg_prompt_info)%{$reset_color%}'
+PROMPT='%{${PROMPT_COLOUR}%}%D{%k:%M} %c ➤ %{$reset_color%}'
+RPROMPT='%{$fg[grey]%}${ZSH_THEME_EXIT_CODE}$(git_prompt_info)$(hg_prompt_info)%{$reset_color%}'
 
 # See http://geoff.greer.fm/lscolors/
 #               ddllssppxxbbccuuggwwoo
 export LSCOLORS=exgxfxfxcxegedabagaead
-export LS_COLORS='di=34;40:ln=36;40:so=35;40:pi=35;40:ex=32;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;44:ow=0;43:'
+export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:'
 
 unfunction precmd
 unfunction preexec