Colors refactoring