Cleaning up some colors