Cleaned up color in prep for color updates