464 refactor color variables take two

This is only the commits dealing with color variables, applied to the master branch as of this morning (Friday 7/18). I'm going to close the earlier pull request.

This resolves #464.