Simplified color change logic, sped up debugging