Updated Highlighter and concomitant classes