Rework of colour mixing

This will avoid situations where colours depend on the order of the reagents, or where different compositions have the same colours.