Add replacement back into tool UI
Indendation
Merge branch 'option-cutout-image-custom' into option-cutout-image
fix tests