Added better highlighting features as described in #11