Syntax highlighting, some updates.