Add more highlighting

Forgot it in the previous PR...sorry!