Improve syntax highlighting for types

Here are various improvements of the regex used to match types. I think the commit messages are self explanatory ;)