Folded #16 into main .xcf file