More colour improvements