Major improvements to custom shop, color section, and spree's handling of color_types