Improve search highlighting
Minor highlight colour updates
Correct internal name and guard against unnecessary syntax reset