Refactor color enum