random cleanup of color variables
cleaned up color variable names, added comments
improved comments
merged with 464-