Merge "Moving colorpicker items into its own library." into ics-ub-calendar-cream