Changed highlighting from using fill to CSS classes.

Removed this.__highlight__ flag as a result.