Swapped contour comparison method

Now color first, then similarity