Adding color category, some Core Data cleanup.