Adds ColorCategorization in intermediate form and a minor update on ManualPicker