Some adjustments to NonText highlighting.