Index: tools/cfa.nanorc
===================================================================
--- tools/cfa.nanorc	(revision 6b0b624129f6017f7706b516a24a52e382e3a334)
+++ tools/cfa.nanorc	(revision c9c9fd7e3c551ae156e377a744ae57721ed7e8a4)
@@ -8,5 +8,5 @@
 
 # Types
-color green "\<(forall|otype|dtype|ftype|trait|mutex|_Bool|volatile)\>"
+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)\>"
@@ -14,5 +14,6 @@
 
 # Declarations
-color brightgreen "\<(struct|union|typedef|trait|coroutine|monitor)\>"
+color brightgreen "\<(struct|union|typedef|trait|coroutine|monitor|thread)\>"
+color brightgreen "\<(with)\>"
 
 # Control Flow Structures