Refactor color service out of mapping module