Updated Color logic