diff --git a/zsh/zshrc b/zsh/zshrc
index 2f4b656..4bc169e 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -40,21 +40,26 @@ SAVEHIST=$HISTSIZE
 export LC_ALL='en_US.UTF-8'
 export WORKON_HOME=~/.virtualenvs
 
-alias em='emacs -nw'
+if [[ $(uname) = "Darwin" ]]; then
+    PATH=$PATH:~/Library/Anaconda/bin
+fi
 
 source $DOTCONFDIR/dotconf.sh
 
 
-# System specific config
-SYS=`uname`
-if [[ $SYS = "Linux" ]]; then
+# Alias configuration
+
+alias l='ls -lh --color'
+alias em='emacs -nw'
+alias ec='emacsclient -c'
+
+if [[ $(uname) = "Linux" ]]; then
     alias grep='grep --color'
     alias ls='ls --color'
     alias open='xdg-open'
-    alias l='ls -lh --color'
-    alias ec='emacsclient -c'
 fi
 
-if [[ $SYS = "Darwin" ]]; then
+if [[ $(uname) = "Darwin" ]]; then
     PATH=$PATH:~/Library/Anaconda/bin
+    alias grep='grep --color=always'
 fi