Syntax highlighting: add missing tokens, order by name