diff --git a/.gitignore b/.gitignore
index 0aacd5b..367a897 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .zcompdump*
-keychain-config.zsh
 *.user.zsh
-*.start.zsh
+*.post.zsh
+*.pre.zsh
+*.zwc
diff --git a/.zshrc b/.zshrc
index be73f87..d3178c1 100644
--- a/.zshrc
+++ b/.zshrc
@@ -11,8 +11,12 @@ for S in \
 	85-compinit \
 	95-finish
 do
-	[ -e "$ZDOTDIR/$S.zsh" ] && source "$ZDOTDIR/$S.zsh"
+	N="${S//[0-9\-]/}"
+	[ -e "$ZDOTDIR/$S.pre.zsh" ]  && source "$ZDOTDIR/$S.pre.zsh"
+	[ -e "$ZDOTDIR/$S.zsh" ]      && source "$ZDOTDIR/$S.zsh"
 	[ -e "$ZDOTDIR/$S.user.zsh" ] && source "$ZDOTDIR/$S.user.zsh"
+	[ -e "$ZDOTDIR/$N.user.zsh" ] && source "$ZDOTDIR/$N.user.zsh"
+	[ -e "$ZDOTDIR/$S.post.zsh" ] && source "$ZDOTDIR/$S.post.zsh"
 done
 
 true