Improve object highlighter
The current highlighter is poor and needs replacement.