Preparation for new mixing part 8

Same as pull request 2016, plus a modification to give meaningful names (instead of numbers) to the mixing options.
The default is still the old mixing.