Improve highlighting of characters and strings