Refactor ImageCM->ImageRGBA
More refactoring