move highlighting into a plugin