I broke hilighting at some point. Maybe fixed?