DEV-52539 - Improved Color selector