fixed color issues that re-emerged on the last merge.