Merge "More colors, now with material colors" into mnc-dev