Fixed mapping of labels and colors.

Now truly going through the dictionaries instead of trusting that the elements
will be in the same order.