Fixed colors, preparing to add time