rewrite highlighting code (faster + more tolerant)