added colour, one small bug left to solve