updated ColorPicker and CanvasWrapper