diff --git a/yaml.jsf b/yaml.jsf
index e15d6eb..9bff651 100644
--- a/yaml.jsf
+++ b/yaml.jsf
@@ -13,7 +13,6 @@
 =Reference	yellow
 =LocalType	fg_310 # brown
 =BlockDelim	bold blue
-=Key		fg_310
 
 =BadTab		inverse red
 
@@ -22,7 +21,7 @@
 	"\t"		bad_tab		recolor=-1
 	" "		line_start
 
-:idle Idle
+:idle Constant
 	*		idle
 	"\n"		line_start
 	"%"		directive	recolor=-1
@@ -30,16 +29,16 @@
 	"'"		string_sq_1	recolor=-1
 	"\""		string_dq_1	recolor=-1
 	"{[]}"		brace		recolor=-1
+	"."		maybe_block_end1
 	"*&"		maybe_reference
 	"!"		maybe_typecast
 
 :maybe_key Idle
 	*		maybe_key1	mark
-	"\n%#{[]}."	idle		noeat
+	"\n%#'\"{[]}*&!"	idle		noeat
 	"-"		maybe_block1	mark
-	"."		maybe_block_end1
 
-:maybe_key1 Idle
+:maybe_key1 Constant
 	*		idle		noeat
 	":"		key
 	" a-zA-Z0-9_-"	maybe_key1
@@ -48,7 +47,7 @@
 :key Idle
 	*		key_end		noeat recolormark
 
-:key_end Key
+:key_end Idle
 	*		idle		noeat
 
 # mark bad tabs until the first non-whitespace
@@ -90,29 +89,29 @@
 	*		string_dq
 	"\n"		string_dq	recolor=-2
 
-:maybe_block1 Idle
+:maybe_block1 Constant
 	*		maybe_key1	noeat
 	"-"		maybe_block2
 
-:maybe_block2 Idle
+:maybe_block2 Constant
 	*		maybe_key1	noeat
 	"-"		block		recolor=-3
 
 :block BlockDelim
 	*		idle		noeat
 
-:maybe_block_end1 Idle
+:maybe_block_end1 Constant
 	*		idle		noeat
 	"."		maybe_block_end2
 
-:maybe_block_end2 Idle
+:maybe_block_end2 Constant
 	*		idle		noeat
 	"."		block_end	recolor=-3
 
 :block_end BlockDelim
 	*		idle		noeat
 
-:maybe_reference Idle
+:maybe_reference Constant
 	*		idle
 	"a-zA-Z_"	reference	recolor=-2
 
@@ -120,7 +119,7 @@
 	*		idle		noeat
 	"a-zA-Z0-9_"	reference
 
-:maybe_typecast Idle
+:maybe_typecast Constant
 	*		idle		noeat
 	"a-zA-Z_"	local_type	recolor=-1
 	"!"		builtin_type