Update list of types to highlight

Mostly for new types. testmode file updated a smidge too.