diff --git a/puppet.jsf b/puppet.jsf
index e0fa7c7..ed21370 100644
--- a/puppet.jsf
+++ b/puppet.jsf
@@ -8,7 +8,7 @@
 =Type		bold
 =Keyword	bold
 =Bad		bold red
-=Var		yellow
+=Var		fg_310 # brown
 =Brace		magenta
 
 =KeywordAttr	bold
@@ -24,7 +24,8 @@
 	"'"		char		recolor=-1
 	"/"		regex		recolor=-1
 	"$"		variable	recolor=-1
-	"a-zA-Z_"	ident		buffer
+	"A-Z"		type		recolor=-1
+	"a-z"		ident		buffer
 	
 :comment Comment
 	*		comment
@@ -80,6 +81,10 @@
 	*		idle		noeat
 	"a-zA-Z0-9_:"	variable
 
+:type Type
+	*		idle		noeat
+	"a-zA-Z0-9_"	type
+
 :ident Idle
 	*		idle		noeat strings
 	"case"		kw