Cleaned up color variables