Added Underscore, clues highlighting