random cleanup of color variables
cleaned up color variable names, added comments