correct and move color logic