Merge pull request #225 from mcrosa01/color-fixes

Color fixes