Move highlight to autoload/ from plugin/
Improve highlight
Merge branch 'improve/highlight' into master