Establish more complete highlighting rules and fix some issues