Merge "Refactor color definition for customization"