Updated color logic