cleaned up color variables