Updated colors, should at least match (roughly) the optimal scheme