PH: Pushing up fix for the color helpers. Removed the other methods and exchanged out for this one. Less code, easier to test and all that.