Changed grep highlight, colour cleanup