Even more progress towards color picker