Colors module refactoring