Folded #18 into main .xcf file