Add (de)highlight features & solve "class" name problem