Update highlight system.
Revert new highlight system and just make to use buffer local variable.