Migrated highlighting mode to Angular