fixes for more color classes, line chart bugs