diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index d2d3aed81..73c38ddfa 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -14,6 +14,14 @@ alias _='sudo'
 # Show history
 alias history='fc -l 1'
 
+# Enable ls colors
+LS_OPTIONS='-hF'
+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 $LS_OPTIONS" || alias ls="ls -G $LS_OPTIONS"
+fi
+
 # List direcory contents
 alias lsa='ls -lah'
 alias l='ls -la'
diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh
index aec67721a..e70741b5c 100644
--- a/lib/theme-and-appearance.zsh
+++ b/lib/theme-and-appearance.zsh
@@ -3,13 +3,6 @@ autoload colors; colors;
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
 #export LS_COLORS
 
-# Enable ls colors
-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'
-fi
-
 #setopt no_beep
 setopt auto_cd
 setopt multios
diff --git a/templates/zshrc.zsh-cadusk-linux b/templates/zshrc.zsh-cadusk
similarity index 100%
rename from templates/zshrc.zsh-cadusk-linux
rename to templates/zshrc.zsh-cadusk
diff --git a/templates/zshrc.zsh-cadusk-mac b/templates/zshrc.zsh-cadusk-mac
deleted file mode 100644
index 561564d9c..000000000
--- a/templates/zshrc.zsh-cadusk-mac
+++ /dev/null
@@ -1,45 +0,0 @@
-# Path to your oh-my-zsh configuration.
-ZSH=$HOME/.oh-my-zsh
-
-# Set name of the theme to load.
-# Look in ~/.oh-my-zsh/themes/
-# Optionally, if you set this to "random", it'll load a random theme each
-# time that oh-my-zsh is loaded.
-ZSH_THEME="mh"
-
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
-
-# Set to this to use case-sensitive completion
-# CASE_SENSITIVE="true"
-
-# Comment this out to disable weekly auto-update checks
-DISABLE_AUTO_UPDATE="true"
-
-# Uncomment following line if you want to disable colors in ls
-# DISABLE_LS_COLORS="true"
-
-# Uncomment following line if you want to disable autosetting terminal title.
-# DISABLE_AUTO_TITLE="true"
-
-# Uncomment following line if you want red dots to be displayed while waiting for completion
-# COMPLETION_WAITING_DOTS="true"
-
-# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
-# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git python pythonbrew vim-override)
-
-source $ZSH/oh-my-zsh.sh
-source `which virtualenvwrapper.sh`
-
-# Customize to your needs...
-if [ -z "$LC_ALL" ]; then export LC_ALL=en_US.UTF-8; fi
-if [ -z "$LANG" ]; then export LANG=en_US.UTF-8; fi
-
-if [ -e $HOME/bin ]; then export PATH="$HOME/bin:$PATH"; fi
-unsetopt correctall
-
-# Themes override ls alias from aliases.zsh
-alias tmux 'tmux -u2'