Add attribute highlighting and don't require attributes to be on their own line