color picker improvements to retain current color