Added: Highlighter (untested)