More progress towards color picker