Color refactoring