A few more bug fixes + allow non-gray colors.