Fix highlight type, add highlighting of format strings

Credit to cam72cam for patch