diff --git a/setup.sh b/setup.sh
index e893fc8..a84a739 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,9 +1,10 @@
 #!/bin/zsh
 
 dfdir=$(cd "$(dirname "$0")" && pwd)
+sys=`uname -s | tr A-Z a-z`
 
 print -P "%BSymlinking config files%b"
-for dotfile in `ls .`
+for dotfile in `ls $dfdir`
 do
     # metafiles; don't link them
     [ $dotfile = 'setup.sh' ] && continue
@@ -21,14 +22,14 @@ do
     spaces=''
     for (( i=0; $i < $filler; i++ )); do spaces="$spaces " done
 
-    echo -n "  $dest"
+    echo -n "  $dest$spaces"
     if [[ $action = 'linked' ]]; then
         ln -fs "$dfdir/$dotfile" "$dest"
         action="%F{yellow}$action%f"
     else
         action="%F{green}$action%f"
     fi
-    print -P "$spaces%F{green}$action%f"
+    print -P $action
 done
 
 echo "touch $HOME/.hushlogin"