simpilfy highlighter registration
uniques: extract highlighter
Merge pull request #1 from jonatkins/master

merging from jonatkins:master