Fixed #39: showing highlights properly (with bit of style)