Rejigged some colors