syntax "yaml" "\.ya?ml$"
-header "^---" "%YAML"
+header "%YAML"
-color green "(^| )!!(binary|bool|float|int|map|null|omap|seq|set|str) "
-color brightcyan "\<(YES|yes|Y|y|ON|on|NO|no|N|n|OFF|off)\>"
-color brightcyan "\<(true|false)\>"
-color red ":[[:space:]]" "\[" "\]" ":[[:space:]]+[|>]" "^[[:space:]]*- "
-color brightyellow "[[:space:]][\*&][A-Za-z0-9]+"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color brightmagenta "^---" "^\.\.\." "^%YAML" "^%TAG"
-color ,green "[[:space:]]+$"
-color ,red " + +| + +"
+color type "(^| )!!(binary|bool|float|int|map|null|omap|seq|set|str) "
+color constant "\b(YES|yes|Y|y|ON|on|NO|no|N|n|OFF|off)\b"
+color constant "\b(true|false)\b"
+color statement ":[[:space:]]" "\[" "\]" ":[[:space:]]+[|>]" "^[[:space:]]*- "
+color identifier "[[:space:]][\*&][A-Za-z0-9]+"
+color type "([-\w]+:\s+)|([-\w]+:$)"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color special "^---" "^\.\.\." "^%YAML" "^%TAG"