cleaned up color vars