Added color picking