Fix ordering of colors to match order within variables