Refine highlighting