re-worked some colors