Just switch from parse_color to parse_color2, and apply the corresponding changes to serialization too. Test included.