masks transform along with color map (#988), plus some code cleanup

Joachim Wuttkerequested to merge
j.0 into main

Resolves #988 (closed).

Merge request reports