Remove UIColor category, add Defines.h instead to the prefix header.
Add one more protocol statement for the compiler's happiness.