Removed two highlight formats which are "experimental" and not
used by end users
Fixed all the errors found by Ryan