Fixing colors some more