Move color picker changes into UI library in bundle support