Rename/move highlighter -> highlightr