added color constants
merging
merging