Really fixes the color pickers now