diff --git a/zsh/completion b/zsh/completion
index ce65393..5ee5aa5 100755
--- a/zsh/completion
+++ b/zsh/completion
@@ -39,63 +39,44 @@ zstyle ':completion:*:jobs' numbers true
 # kill/killall menu and general process listing
 zstyle ':completion:*:*:kill:*' menu yes select
 zstyle ':completion:*:*:kill:*' sort false
-zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=31;31'
+zstyle ':completion:*:processes' list-colors '=(#b) #([0-9]#)*=0=31;31'
 
 zstyle ':completion:*:*:killall:*' menu yes select
 
 case `uname -s` in
 	Linux)
-		zstyle ':completion:*:processes-names' command 'ps -e --no-headers -o args'
-	;;
-	FreeBSD|Interix|OpenBSD|SunOS)
-		zstyle ':completion:*:processes-names' command 'ps -e -o args | awk "NR != 1"'
-	;;
-	Darwin)
-		if [[ `sw_vers -productVersion` = 10<5->.<-> ]] ; then
-			zstyle ':completion:*:processes-names' command 'ps -e -o command | awk "NR != 1"'
-		else
-			zstyle ':completion:*:processes-names' command 'ps -A -o command | awk "NR != 1"'
-		fi
-	;;
-	CYGWIN*)
-		zstyle ':completion:*:processes-names' command 'ps -e -s | awk "NR != 1"'
-	;;
-esac
-
-case `uname -s` in
-	Linux)
-		zstyle ':completion:*:*:kill:*:processes' command 'ps --forest -U '${USERNAME}' -o pid,args | sed "/ps --forest -U '${USERNAME}' -o pid,args/d"'
+		zstyle ':completion:*processes' command 'ps --forest -U '${USERNAME}' -o pid,args | sed "/ps --forest -U '${USERNAME}' -o pid,args/d"'
 	;;
 	Interix)
-		zstyle ':completion:*:*:kill:*:processes' command 'ps -i -U '${USERNAME}' -o pid,args | sed "/ps -i -U '${USERNAME}' -o pid,args/d"'
+		zstyle ':completion:*processes' command 'ps -i -U '${USERNAME}' -o pid,args | sed "/ps -i -U '${USERNAME}' -o pid,args/d"'
 	;;
 	CYGWIN*)
-		zstyle ':completion:*:*:kill:*:processes' command 'ps -u '${USERNAME}' -s | sed "/ps -u '${USERNAME}' -s/d"'
+		zstyle ':completion:*processes' command 'ps -u '${USERNAME}' -s | sed "/ps -u '${USERNAME}' -s/d"'
 	;;
 	SunOS|FreeBSD|OpenBSD)
-		zstyle ':completion:*:*:kill:*:processes' command 'ps -U '${USERNAME}' -o pid,args | sed "/ps -U '${USERNAME}' -o pid,args/d"'
+		zstyle ':completion:*processes' command 'ps -U '${USERNAME}' -o pid,args | sed "/ps -U '${USERNAME}' -o pid,args/d"'
 	;;
 	Darwin)
-		zstyle ':completion:*:*:kill:*:processes' command 'ps -U '${USERNAME}' -o pid,command | sed "/ps -U '${USERNAME}' -o pid/d"'
+		zstyle ':completion:*processes' command 'ps -U '${USERNAME}' -o pid,command | sed "/ps -U '${USERNAME}' -o pid/d"'
 	;;
 esac
 
 case `uname -s` in
 	Interix|SunOS|FreeBSD|Linux)
-		zstyle ':completion:*:*:killall:*:processes-names' command "ps -U '${USERNAME}' -o comm"
+		zstyle ':completion:*:processes-names' command "ps -U '${USERNAME}' -o comm"
 	;;
 	CYGWIN*)
-		zstyle ':completion:*:*:killall:*:processes-names' command "ps -u '${USERNAME}' -s"
+		zstyle ':completion:*:processes-names' command "ps -u '${USERNAME}' -s"
 	;;
 	Darwin)
 		if [[ `sw_vers -productVersion` = 10<5->.<-> ]] ; then
-			zstyle ':completion:*:*:killall:*:processes-names' command "ps -U '${USERNAME}' -o comm"
+			zstyle ':completion:*:processes-names' command "ps -U '${USERNAME}' -o comm"
 		else
-			zstyle ':completion:*:*:killall:*:processes-names' command "ps -U '${USERNAME}' -o command"
+			zstyle ':completion:*:processes-names' command "ps -U '${USERNAME}' -o command"
 		fi
 	;;
 	OpenBSD)
-		zstyle ':completion:*:*:killall:*:processes-names' command "ps -U '${USERNAME}' -o command"
+		zstyle ':completion:*:processes-names' command "ps -U '${USERNAME}' -o command"
 	;;
 esac
 
diff --git a/zsh/prompt b/zsh/prompt
index c8a4f35..b2eda6e 100755
--- a/zsh/prompt
+++ b/zsh/prompt
@@ -1,11 +1,21 @@
 # prompt
 if [ "${TERM}" != "dumb" ] ; then
+	RESETCOLOR=$'%{\e[00;00m%}'
 	if [ -z "${SSH_TTY}" ] ; then
-		PROMPT=$'%{\e[00;00m%}%{\e[01;32m%}%n@%m %{\e[01;34m%}%~ %(?..%{\e[01;31m%})%(!.#.$) %{\e[00;00m%}'
+		HOSTCOLOR=$'%{\e[01;32m%}'
 	else
-		PROMPT=$'%{\e[00;00m%}%{\e[01;36m%}%n@%m %{\e[01;34m%}%~ %(?..%{\e[01;31m%})%(!.#.$) %{\e[00;00m%}'
+		HOSTCOLOR=$'%{\e[01;36m%}'
 	fi
-	RPROMPT=$'%{\e[00;00m%}%{\e[00;00m%}%1(j.%{\e[00;36m%}[%j].)%(?..%{\e[00;31m%}[%?])%{\e[01;33m%}%{\e[01;33m%}[%t]%{\e[00;00m%}'
+	PATHCOLOR=$'%{\e[01;34m%}'
+	ERRORCOLOR=$'%{\e[00;31m%}'
+	BOLDERRORCOLOR=$'%{\e[01;31m%}'
+	CLOCKCOLOR=$'%{\e[01;33m%}'
+	JOBCOLOR=$'%{\e[00;36m%}'
+	RPROMPT=${RESETCOLOR}$'%1(j.'${JOBCOLOR}$'[%j].)%(?..'${ERRORCOLOR}$'[%?])'${CLOCKCOLOR}$'[%t]'${RESETCOLOR}
 else
-	PROMPT=$'%n@%m %~ %(?..)%(!.#.$)'
+	RESETCOLOR=''
+	HOSTCOLOR=''
+	PATHCOLOR=''
+	BOLDERRORCOLOR=''
 fi
+PROMPT=${RESETCOLOR}${HOSTCOLOR}$'%n@%m '${PATHCOLOR}$'%45<...<%~ %(?..'${BOLDERRORCOLOR}$')%(!.#.$) '${RESETCOLOR}