Cleaned up colors to allow for Foundation variable names & defaults