Charts: Add color combos, fixes for heatmaps