Colors improvements