Refactoring Color