Merge branch 'tweak-highlighter'