Use CPImageInBundle and CPColorWithImages everywhere excep in the external modules.
Some typo, and missing CPDictionary replacements