Fix bugs with color picker updates