Fixing up color scheme