added some color constant things
merged
added back deleted files, merged
merged