Tweak highlighting
Revamp highlighters