Color refactored