Cleaning up cmyk conversion
Renaming classes for consistency
Manually merging conflict