Index: tools/cfa.nanorc
===================================================================
--- tools/cfa.nanorc	(revision eda8175e2bd511ec53554e874a52684d2caab54b)
+++ tools/cfa.nanorc	(revision 371ef1de49951e26d6723735e3870a4ef017e260)
@@ -2,5 +2,5 @@
 ## WIP
 
-syntax "cfa" "\.cfa"
+syntax "cfa" "\.(c|h)fa"
 
 # Macros
@@ -9,6 +9,6 @@
 # Types
 color green "\<(forall|trait|(o|d|f|t)type|mutex|_Bool|volatile|virtual)\>"
-color green "\<(float|double|bool|char|int|short|long|sizeof|enum|void|auto)\>"
-color green "\<(static|const|struct|union|typedef|extern|(un)?signed|inline)\>"
+color green "\<(float|double|bool|char|int|short|long|enum|void|auto)\>"
+color green "\<(static|const|extern|(un)?signed|inline)\>" "\<(sizeof)\>"
 color green "\<((s?size)|one|zero|((u_?)?int(8|16|32|64|ptr)))_t\>"
 
@@ -19,8 +19,12 @@
 # Control Flow Structures
 color brightyellow "\<(if|else|while|do|for|switch|choose|case|default)\>"
+color brightyellow "\<(disable|enable|waitfor|when|timeout)\>"
 color brightyellow "\<(try|catch(Resume)?|finally)\>"
 
 # Control Flow Statements
 color magenta "\<(goto|return|break|continue|fallthr(u|ough)|throw(Resume)?)\>"
+
+# Escaped Keywords, now Identifiers.
+color white "`\w+`"
 
 # Operator Names