make highlighting actually work

the highlighting from before was based on ids, which we don't
actually use in the markup. This makes it based on classnames.
Tested locally in chrome web inspector.

Change-Id: I49420c6896ad97ed2d3f8ab7afbb5ec4b1e2fe40