diff --git a/zsh/zsh.d/10-environment b/zsh/zsh.d/10-environment
index 4d12ffc..dc189ef 100644
--- a/zsh/zsh.d/10-environment
+++ b/zsh/zsh.d/10-environment
@@ -15,13 +15,16 @@ LOGD=/var/log
 [ -z "$PS1" ] && return
 
 ## Vars only for interactive sessions
-EDITOR=vi
 PYTHONSTARTUP=~/.pythonrc.py
 LOGCHECK=30
 REPORTTIME=15
 WATCH=notme
 WATCHFMT="%n %a %l (%m) at %t."
 
+# Hack for svn
+EDITOR=vim
+VISUAL=vim
+
 # Set umask to collaborative mode
 umask 002
 #  vim: set ts=4 sw=4 tw=0 ft=zsh : 
diff --git a/zsh/zsh.d/Darwin/80-macportsDarwin b/zsh/zsh.d/Darwin/80-macportsDarwin
index 31f2bc9..df77e68 100644
--- a/zsh/zsh.d/Darwin/80-macportsDarwin
+++ b/zsh/zsh.d/Darwin/80-macportsDarwin
@@ -1,6 +1,52 @@
 # Mac Ports
-if [ -f /opt/local/etc/init.sh ]; then
-    source /opt/local/etc/init.sh
+[ ! -d /opt/local ] && return 
+
+# Setup PATH
+if [ -z "$PATH" ]; then
+  PATH=/opt/local/bin:/opt/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:~/bin
+else
+  PATH=/opt/local/bin:/opt/local/sbin:$PATH
 fi
+export PATH
+
+# # Setup MANPATH
+# if [ -z "$MANPATH" ]; then
+    # MANPATH=`/usr/bin/manpath`
+# fi
+# MANPATH=/opt/local/man:$MANPATH
+# export MANPTH
+
+# # Setup INFOPATH
+# if [ -z "$INFOPATH" ]; then
+  # INFOPATH=/opt/local/share/info:/opt/local/info:/usr/share/info
+# else
+  # INFOPATH=/opt/local/share/info:/opt/local/info:$INFOPATH
+# fi
+# export INFOPATH
+
+if [ -z "$PERL5LIB" ]; then
+  PERL5LIB=/opt/local/lib/perl5:/opt/local/lib/perl5/darwin
+else
+  PERL5LIB=/opt/local/lib/perl5:/opt/local/lib/perl5/darwin:$PERL5LIB
+fi
+export PERL5LIB
+
+# Add X11 paths (but only if the directories are readable)
+if [ -r /usr/X11R6/bin ]; then
+    PATH=$PATH:/usr/X11R6/bin
+    export PATH
+fi
+# if [ -r /usr/X11R6/man ]; then
+    # MANPATH=$MANPATH:/usr/X11R6/man
+    # export MANPATH
+# fi
+
+# PY_VER="2.7"
+
+# PYTHONPATH="/opt/local/lib/python/site-packages:/opt/local/Library/Frameworks/Python.framework/Versions/${PY_VER}/lib/python${PY_VER}/site-packages/"
+# #PYTHONHOME="/opt/local/Library/Frameworks/Python.framework/Versions/${PY_VER}"
+
+# export PYTHONPATH
+#export PYTHONHOME
 
 #  vim: set ts=4 sw=4 tw=0 ft=zsh : 
diff --git a/zsh/zsh.d/Darwin/90-coreutilsDarwin b/zsh/zsh.d/Darwin/90-coreutils
similarity index 100%
rename from zsh/zsh.d/Darwin/90-coreutilsDarwin
rename to zsh/zsh.d/Darwin/90-coreutils
diff --git a/zsh/zsh.d/Darwin/90-coreutilsBrew b/zsh/zsh.d/Darwin/90-coreutilsBrew
deleted file mode 100644
index 6dfc269..0000000
--- a/zsh/zsh.d/Darwin/90-coreutilsBrew
+++ /dev/null
@@ -1,13 +0,0 @@
-# Core Utils woth Brew
-#
-
-ver=`brew info coreutils 2>/dev/null| head -1|cut -d" " -f2`
-[ "$ver" = "" -o "$ver" = "No" ] && return 1
-
-if [ -f /etc/zsh/gdircolors ]; then
-    eval `gdircolors /etc/zsh/gdircolors`
-else
-    eval `gdircolors`
-fi
-source /usr/local/Cellar/coreutils/$ver/aliases
-#alias ls='ls -F -G' # We use OSX ls 'cause it shows extended attrs
diff --git a/zsh/zsh.d/Darwin/90-coreutilsMacports b/zsh/zsh.d/Darwin/90-coreutilsMacports
deleted file mode 100644
index 8514404..0000000
--- a/zsh/zsh.d/Darwin/90-coreutilsMacports
+++ /dev/null
@@ -1,19 +0,0 @@
-# Core Utils
-which gcp > /dev/null 
-if [ $? -eq 0 ]; then
-    if [ -f /etc/zsh/gdircolors ]; then
-        eval `gdircolors /etc/zsh/gdircolors`
-    else
-        eval `gdircolors`
-    fi
-    #alias ls='gls --color -F' # OSX ls is better (supports extended attributes)
-    alias ll='ls -l'
-    alias la='ls -a'
-    alias cp='gcp'
-    alias mv='gmv'
-    alias rm='grm'
-    alias du='gdu'
-    alias df='gdf -a'
-fi
-
-#  vim: set ts=4 sw=4 tw=0 ft=zsh : 
diff --git a/zsh/zsh.d/Darwin/90-macportsDarwin b/zsh/zsh.d/Darwin/90-macportsDarwin
deleted file mode 100644
index 31f2bc9..0000000
--- a/zsh/zsh.d/Darwin/90-macportsDarwin
+++ /dev/null
@@ -1,6 +0,0 @@
-# Mac Ports
-if [ -f /opt/local/etc/init.sh ]; then
-    source /opt/local/etc/init.sh
-fi
-
-#  vim: set ts=4 sw=4 tw=0 ft=zsh : 
diff --git a/zsh/zshrc b/zsh/zshrc
deleted file mode 100644
index bb47ff2..0000000
--- a/zsh/zshrc
+++ /dev/null
@@ -1,35 +0,0 @@
-# /etc/zshrc: system-wide .zshrc file for zsh(1).
-#
-# This file is sourced only for interactive shells. It
-# should contain commands to set up aliases, functions,
-# options, key bindings, etc.
-#
-# Global Order: zshenv, zprofile, zshrc, zlogin
-#
-KERNEL=`uname -s`
-LIBRARY="/etc/zsh.d"
-KERNLIB="${LIBRARY}/${KERNEL}"
-
-function loadRC {
-    if [ -d $1 ]; then
-        for zshFile in $1/*[^~]; do
-            . $zshFile
-        done
-    fi
-    unset zshFile
-}
-
-loadRC ${LIBRARY}
-loadRC ${KERNLIB}
-
-unset KERNEL
-unset LIBRARY
-unset KERNLIB
-
-# Local (per Host) customizations
-for localDir in /etc/zsh /etc /usr/local/etc /usr/local/etc/zsh; do
-    if [ -f ${localDir}/zshrc.local ]; then
-        . ${localDir}/zshrc.local
-    fi
-done
-unset localDir