Updated colors, more data