Improved NonText and SpecialKey highlighting.