Enhanced and fixed highlighting.