Make the highlight classes more readable