Rework highlighting