Fixed how colors are selected for charts