Improved highlighting of things