Implemented new Color picker instead of old one