diff --git a/Makefile b/Makefile
index af76bc8..fef6780 100644
--- a/Makefile
+++ b/Makefile
@@ -101,8 +101,7 @@ UNIX2DOS       ?= $(shell which unix2dos)
 UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version >/dev/null 2>&1 && echo "-q" || echo "")
 
 # Graphics processing
-GIMP           ?= gimp
-GIMP_FLAGS     ?= -n -i
+XCF2PNG        ?= xcf2png
 
 # NML
 NML            ?= nmlc
@@ -237,7 +236,7 @@ clean::
 
 ifdef GFX_SCRIPT_LIST_FILES
 
-ifneq ($(GIMP),)
+ifneq ($(XCF2PNG),)
 
 # Always include to force creation, if not existing
 include Makefile.gfx
@@ -257,9 +256,7 @@ Makefile.gfx: $(GFX_SCRIPT_LIST_FILES) Makefile Makefile.config
 			for i in `cat $$j | grep "\([pP][cCnN][xXgG]\)" | grep -v "^#" | cut -d\  -f1 | sed "s/\.\([pP][cCnN][xXgG]\)//"`; do\
 				echo "$$i.scm: $$j" >> $@;\
 				echo "GFX_FILES += $$i.png" >> $@;\
-				cat $(SCRIPT_DIR)/gimpscript > $$i.scm.new;\
-				grep $$i.png $$j | sed -f $(SCRIPT_DIR)/gimp.sed >> $$i.scm.new;\
-				echo "(gimp-quit 0)" >> $$i.scm.new;\
+				grep $$i.png $$j | tr -s " " | cut -d " " -f 2- > $$i.scm.new;\
 				cmp -s $$i.scm.new $$i.scm || cp $$i.scm.new $$i.scm;\
 				rm -f $$i.scm.new;\
 			done;\
@@ -268,8 +265,8 @@ Makefile.gfx: $(GFX_SCRIPT_LIST_FILES) Makefile Makefile.config
 
 # create the png file. And make sure it's re-created even when present in the repo
 %.png: %.scm
-	$(_E) "[GIMP] $@"
-	$(_V) $(GIMP) $(GIMP_FLAGS) -b - <$< >/dev/null
+	$(_E) "[XCF2PNG] $@"
+	$(_V) xcf2png $(shell cat $<) > $@
 
 clean::
 	$(_E) "[CLEAN GFX]"
@@ -285,7 +282,7 @@ else
 gfx: Makefile.gfx
 
 Makefile.gfx: FORCE
-	$(_E) "[GIMP disabled]"
+	$(_E) "[XCF2PNG disabled]"
 
 endif
 endif
@@ -719,7 +716,7 @@ endif
 	$(_E) "GRFID GRFID_FLAGS.      defaults: $(GRFID) $(GRFID_FLAGS)"
 	$(_E) "UNIX2DOS UNIX2DOS_FLAGS defaults: $(UNIX2DOS) $(UNIX2DOS_FLAGS)"
 ifdef GFX_SCRIPT_LIST_FILES
-	$(_E) "GIMP GIMP_FLAGS         defaults: $(GIMP) $(GIMP_FLAGS)"
+	$(_E) "XCF2PNG                 defaults: $(XCF2PNG)"
 endif
 	$(_E) "CP_FLAGS (for cp command):        $(CP_FLAGS)"
 	$(_E)
diff --git a/sprites/png/terrain/waterfeatures/waterfeatures.xcf2png b/sprites/png/terrain/waterfeatures/waterfeatures.xcf2png
index 3826ca0..3018e84 100644
--- a/sprites/png/terrain/waterfeatures/waterfeatures.xcf2png
+++ b/sprites/png/terrain/waterfeatures/waterfeatures.xcf2png
@@ -57,10 +57,10 @@ sprites/png/terrain/waterfeatures/rivermouth_arctic_se.gimp.png     sprites/sour
 sprites/png/terrain/waterfeatures/rivermouth_arctic_sw.gimp.png     sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic SeaWater Coast RiverbankMask RiverMouthSW
 
 # river banks arctic snow level 1
-sprites/png/terrain/waterfeatures/riverbank_arctic_snow14_ne.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverbankNE SnowLv1 RiverbankNESnow
-sprites/png/terrain/waterfeatures/riverbank_arctic_snow14_nw.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverbankNW SnowLv1 RiverbankNWSnow
-sprites/png/terrain/waterfeatures/riverbank_arctic_snow14_se.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverbankSE SnowLv1 RiverbankSESnow
-sprites/png/terrain/waterfeatures/riverbank_arctic_snow14_sw.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverbankSW SnowLv1 RiverbankSWSnow
+sprites/png/terrain/waterfeatures/riverbank_arctic_snow14_ne.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankNE SnowLv1 RiverbankNESnow RiverbankMask
+sprites/png/terrain/waterfeatures/riverbank_arctic_snow14_nw.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankNW SnowLv1 RiverbankNWSnow RiverbankMask
+sprites/png/terrain/waterfeatures/riverbank_arctic_snow14_se.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankSE SnowLv1 RiverbankSESnow RiverbankMask
+sprites/png/terrain/waterfeatures/riverbank_arctic_snow14_sw.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankSW SnowLv1 RiverbankSWSnow RiverbankMask
 # sprites/png/terrain/rivercorner_Snow1_n.gimp.png    sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverCornersN SnowLv1 1RiverCornersBlueN
 # sprites/png/terrain/rivercorner_Snow1_s.gimp.png    sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverCornersS SnowLv1 RiverCornersBlueS
 # sprites/png/terrain/rivercorner_Snow1_e.gimp.png    sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverCornersE SnowLv1 RiverCornersBlueE
@@ -68,10 +68,10 @@ sprites/png/terrain/waterfeatures/riverbank_arctic_snow14_sw.gimp.png   sprites/
 # sprites/png/terrain/rivercorners_Snow1.gimp.png        sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverCornersSmall SnowLv1 RiverCornersBlue
 
 # river banks arctic snow level 2
-sprites/png/terrain/waterfeatures/riverbank_arctic_snow24_ne.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverbankNE SnowLv2 RiverbankNESnow
-sprites/png/terrain/waterfeatures/riverbank_arctic_snow24_nw.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverbankNW SnowLv2 RiverbankNWSnow
-sprites/png/terrain/waterfeatures/riverbank_arctic_snow24_se.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverbankSE SnowLv2 RiverbankSESnow
-sprites/png/terrain/waterfeatures/riverbank_arctic_snow24_sw.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverbankSW SnowLv2 RiverbankSWSnow
+sprites/png/terrain/waterfeatures/riverbank_arctic_snow24_ne.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankNE SnowLv2 RiverbankNESnow RiverbankMask
+sprites/png/terrain/waterfeatures/riverbank_arctic_snow24_nw.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankNW SnowLv2 RiverbankNWSnow RiverbankMask
+sprites/png/terrain/waterfeatures/riverbank_arctic_snow24_se.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankSE SnowLv2 RiverbankSESnow RiverbankMask
+sprites/png/terrain/waterfeatures/riverbank_arctic_snow24_sw.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankSW SnowLv2 RiverbankSWSnow RiverbankMask
 # sprites/png/terrain/rivercorner_Snow2_n.gimp.png    sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverCornersN SnowLv2 1RiverCornersBlueN
 # sprites/png/terrain/rivercorner_Snow2_s.gimp.png    sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverCornersS SnowLv2 RiverCornersBlueS
 # sprites/png/terrain/rivercorner_Snow2_e.gimp.png    sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverCornersE SnowLv2 RiverCornersBlueE
@@ -79,10 +79,10 @@ sprites/png/terrain/waterfeatures/riverbank_arctic_snow24_sw.gimp.png   sprites/
 # sprites/png/terrain/rivercorners_Snow2.gimp.png        sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverCornersSmall SnowLv2 RiverCornersBlue
 
 # river banks arctic snow level 3
-sprites/png/terrain/waterfeatures/riverbank_arctic_snow34_ne.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverbankNE SnowLv3 RiverbankNESnow
-sprites/png/terrain/waterfeatures/riverbank_arctic_snow34_nw.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverbankNW SnowLv3 RiverbankNWSnow
-sprites/png/terrain/waterfeatures/riverbank_arctic_snow34_se.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverbankSE SnowLv3 RiverbankSESnow
-sprites/png/terrain/waterfeatures/riverbank_arctic_snow34_sw.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverbankSW SnowLv3 RiverbankSWSnow
+sprites/png/terrain/waterfeatures/riverbank_arctic_snow34_ne.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankNE SnowLv3 RiverbankNESnow RiverbankMask
+sprites/png/terrain/waterfeatures/riverbank_arctic_snow34_nw.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankNW SnowLv3 RiverbankNWSnow RiverbankMask
+sprites/png/terrain/waterfeatures/riverbank_arctic_snow34_se.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankSE SnowLv3 RiverbankSESnow RiverbankMask
+sprites/png/terrain/waterfeatures/riverbank_arctic_snow34_sw.gimp.png   sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankSW SnowLv3 RiverbankSWSnow RiverbankMask
 # sprites/png/terrain/rivercorner_Snow3_n.gimp.png    sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverCornersN SnowLv3 1RiverCornersBlueN
 # sprites/png/terrain/rivercorner_Snow3_s.gimp.png    sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverCornersS SnowLv3 RiverCornersBlueS
 # sprites/png/terrain/rivercorner_Snow3_e.gimp.png    sprites/source/terrain/terrain.xcf    White BlueForShore GroundArctic GridArctic RiverbankMask RiverCornersE SnowLv3 RiverCornersBlueE