Add the Mixup Plus puzzle
Refactor more
Add checkboxes to use the default values