hotfix to validate on color and some refactoring author:nmcmahon1215 and ghfranzini