renamed some files to evade conflicts
added factories for uicolor
added comments to color factories