diff --git a/zsh/zsh.d/00-options b/zsh/zsh.d/00-options.zsh
similarity index 100%
rename from zsh/zsh.d/00-options
rename to zsh/zsh.d/00-options.zsh
diff --git a/zsh/zsh.d/10-environment b/zsh/zsh.d/10-environment.zsh
similarity index 100%
rename from zsh/zsh.d/10-environment
rename to zsh/zsh.d/10-environment.zsh
diff --git a/zsh/zsh.d/20-bindkeys b/zsh/zsh.d/20-bindkeys.zsh
similarity index 100%
rename from zsh/zsh.d/20-bindkeys
rename to zsh/zsh.d/20-bindkeys.zsh
diff --git a/zsh/zsh.d/20-complete b/zsh/zsh.d/20-complete.zsh
similarity index 100%
rename from zsh/zsh.d/20-complete
rename to zsh/zsh.d/20-complete.zsh
diff --git a/zsh/zsh.d/20-termcolors b/zsh/zsh.d/20-termcolors.zsh
similarity index 100%
rename from zsh/zsh.d/20-termcolors
rename to zsh/zsh.d/20-termcolors.zsh
diff --git a/zsh/zsh.d/30-aliases b/zsh/zsh.d/30-aliases.zsh
similarity index 100%
rename from zsh/zsh.d/30-aliases
rename to zsh/zsh.d/30-aliases.zsh
diff --git a/zsh/zsh.d/30-less b/zsh/zsh.d/30-less.zsh
similarity index 100%
rename from zsh/zsh.d/30-less
rename to zsh/zsh.d/30-less.zsh
diff --git a/zsh/zsh.d/30-prompt b/zsh/zsh.d/30-prompt.zsh
similarity index 100%
rename from zsh/zsh.d/30-prompt
rename to zsh/zsh.d/30-prompt.zsh
diff --git a/zsh/zsh.d/50-functions b/zsh/zsh.d/50-functions.zsh
similarity index 100%
rename from zsh/zsh.d/50-functions
rename to zsh/zsh.d/50-functions.zsh
diff --git a/zsh/zsh.d/90-virtualenv b/zsh/zsh.d/90-virtualenv.zsh
similarity index 100%
rename from zsh/zsh.d/90-virtualenv
rename to zsh/zsh.d/90-virtualenv.zsh
diff --git a/zsh/zsh.d/Darwin/50-darwin b/zsh/zsh.d/Darwin/50-darwin.zsh
similarity index 100%
rename from zsh/zsh.d/Darwin/50-darwin
rename to zsh/zsh.d/Darwin/50-darwin.zsh
diff --git a/zsh/zsh.d/Darwin/80-macportsDarwin b/zsh/zsh.d/Darwin/80-macportsDarwin.zsh
similarity index 100%
rename from zsh/zsh.d/Darwin/80-macportsDarwin
rename to zsh/zsh.d/Darwin/80-macportsDarwin.zsh
diff --git a/zsh/zsh.d/Darwin/90-coreutils.off b/zsh/zsh.d/Darwin/90-coreutils.off.zsh
similarity index 100%
rename from zsh/zsh.d/Darwin/90-coreutils.off
rename to zsh/zsh.d/Darwin/90-coreutils.off.zsh
diff --git a/zsh/zsh.d/Darwin/90-dsFunctions.off b/zsh/zsh.d/Darwin/90-dsFunctions.off.zsh
similarity index 100%
rename from zsh/zsh.d/Darwin/90-dsFunctions.off
rename to zsh/zsh.d/Darwin/90-dsFunctions.off.zsh
diff --git a/zsh/zsh.d/Linux/50-linux b/zsh/zsh.d/Linux/50-linux.zsh
similarity index 100%
rename from zsh/zsh.d/Linux/50-linux
rename to zsh/zsh.d/Linux/50-linux.zsh
diff --git a/zsh/zshrc b/zsh/zshrc
index 325f4fd..ebc6805 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -23,9 +23,10 @@ function loadRC {
     fi
 
     # Add local customization file, svn ignored
-    [ -f $1/99-local ] || echo "# Local customizations" > $1/99-local
+    [ -f $1/99-local.zsh ] || echo "# Local customizations" > $1/99-local.zsh
 
-    for zshFile in $1/[0-9]*[^off\|~]; do
+    # Process all .zsh files
+    for zshFile in $1/[0-9]*.zsh; do
         . $zshFile
     done