diff --git a/include/gint/image.h b/include/gint/image.h
index ce4262b..49f9eba 100644
--- a/include/gint/image.h
+++ b/include/gint/image.h
@@ -263,10 +263,9 @@ struct gint_image_cmd
 {
 	/* Shader ID. This is used in Azur, and ignored in gint */
 	uint8_t shader_id;
-	/* Dynamic effects
-	    Bit 0:     VFLIP
-	    Bit 1:     HFLIP
-	    Bits 2-7:  0=NONE, 1=CLEARBG, 2=SWAPCOLOR, 3=DYE */
+	/* Dynamic effects not already dispatched by renderer
+	    Bit 0: VFLIP
+	    Bit 1: HFLIP */
 	uint8_t effect;
 
 	/* Number of pixels to render per line. For formats that force either x
diff --git a/src/render-cg/image/image_p4.c b/src/render-cg/image/image_p4.c
index 7bee888..e193f98 100644
--- a/src/render-cg/image/image_p4.c
+++ b/src/render-cg/image/image_p4.c
@@ -35,7 +35,6 @@ void dsubimage_p4_clearbg(int x, int y, image_t const *img,
 
 	if(!gint_image_mkcmd(&box, img, eff, false, false, &cmd, DWIDTH,
 		DHEIGHT)) return;
-	cmd.effect += 4;
 	cmd.color_1 = bg_color;
 	cmd.loop = gint_image_p4_clearbg;
 	gint_image_p4_loop(DWIDTH, &cmd);
diff --git a/src/render-cg/image/image_p4_clearbg_alt.c b/src/render-cg/image/image_p4_clearbg_alt.c
index fe5173b..3dec9b8 100644
--- a/src/render-cg/image/image_p4_clearbg_alt.c
+++ b/src/render-cg/image/image_p4_clearbg_alt.c
@@ -15,7 +15,6 @@ void dsubimage_p4_clearbg_alt(int x, int y, image_t const *img,
 
 	if(!gint_image_mkcmd(&box, img, eff, true, true, &cmd, DWIDTH,
 		DHEIGHT)) return;
-	cmd.effect += 16;
 	cmd.color_1 = bg_color;
 	cmd.loop = gint_image_p4_clearbg_alt;
 	gint_image_p4_loop(DWIDTH, &cmd);
diff --git a/src/render-cg/image/image_p4_dye.c b/src/render-cg/image/image_p4_dye.c
index 81eaa52..f47adeb 100644
--- a/src/render-cg/image/image_p4_dye.c
+++ b/src/render-cg/image/image_p4_dye.c
@@ -15,7 +15,6 @@ void dsubimage_p4_dye(int x, int y, image_t const *img,
 
 	if(!gint_image_mkcmd(&box, img, eff, true, true, &cmd, DWIDTH,
 		DHEIGHT)) return;
-	cmd.effect += 12;
 	cmd.color_1 = img->alpha;
 	cmd.color_2 = dye_color;
 	cmd.loop = gint_image_p4_dye;
diff --git a/src/render-cg/image/image_p4_swapcolor.c b/src/render-cg/image/image_p4_swapcolor.c
index d3630bf..cd2e2d1 100644
--- a/src/render-cg/image/image_p4_swapcolor.c
+++ b/src/render-cg/image/image_p4_swapcolor.c
@@ -16,7 +16,6 @@ void dsubimage_p4_swapcolor(int x, int y, image_t const *img,
 
 	if(!gint_image_mkcmd(&box, img, eff, true, true, &cmd, DWIDTH,
 		DHEIGHT)) return;
-	cmd.effect += 8;
 	cmd.color_1 = old_index;
 	cmd.color_2 = new_color;
 	cmd.loop = gint_image_p4_swapcolor;
@@ -38,7 +37,6 @@ void dsubimage_p4_addbg(int x, int y, image_t const *img,
 
 	if(!gint_image_mkcmd(&box, img, eff, true, true, &cmd, DWIDTH,
 		DHEIGHT)) return;
-	cmd.effect += 8;
 	cmd.color_1 = img->alpha;
 	cmd.color_2 = bg_color;
 	cmd.loop = gint_image_p4_swapcolor;
diff --git a/src/render-cg/image/image_p8.c b/src/render-cg/image/image_p8.c
index ec734b4..c6f5f8b 100644
--- a/src/render-cg/image/image_p8.c
+++ b/src/render-cg/image/image_p8.c
@@ -35,7 +35,6 @@ void dsubimage_p8_clearbg(int x, int y, image_t const *img,
 
 	if(!gint_image_mkcmd(&box, img, eff, false, true, &cmd, DWIDTH,
 		DHEIGHT)) return;
-	cmd.effect += 4;
 	cmd.color_1 = bg_color;
 	cmd.loop = gint_image_p8_clearbg;
 	gint_image_p8_loop(DWIDTH, &cmd);
diff --git a/src/render-cg/image/image_p8_dye.c b/src/render-cg/image/image_p8_dye.c
index aa0e4b7..38b9d77 100644
--- a/src/render-cg/image/image_p8_dye.c
+++ b/src/render-cg/image/image_p8_dye.c
@@ -15,7 +15,6 @@ void dsubimage_p8_dye(int x, int y, image_t const *img,
 
 	if(!gint_image_mkcmd(&box, img, eff, false, true, &cmd, DWIDTH,
 		DHEIGHT)) return;
-	cmd.effect += 12;
 	cmd.color_1 = img->alpha;
 	cmd.color_2 = dye_color;
 	cmd.loop = gint_image_p8_dye;
diff --git a/src/render-cg/image/image_p8_swapcolor.c b/src/render-cg/image/image_p8_swapcolor.c
index 55fe81f..2c85409 100644
--- a/src/render-cg/image/image_p8_swapcolor.c
+++ b/src/render-cg/image/image_p8_swapcolor.c
@@ -16,7 +16,6 @@ void dsubimage_p8_swapcolor(int x, int y, image_t const *img,
 
 	if(!gint_image_mkcmd(&box, img, eff, false, false, &cmd, DWIDTH,
 		DHEIGHT)) return;
-	cmd.effect += 8;
 	cmd.color_1 = old_index;
 	cmd.color_2 = new_color;
 	cmd.loop = gint_image_p8_swapcolor;
@@ -38,7 +37,6 @@ void dsubimage_p8_addbg(int x, int y, image_t const *img,
 
 	if(!gint_image_mkcmd(&box, img, eff, false, false, &cmd, DWIDTH,
 		DHEIGHT)) return;
-	cmd.effect += 8;
 	cmd.color_1 = img->alpha;
 	cmd.color_2 = bg_color;
 	cmd.loop = gint_image_p8_swapcolor;
diff --git a/src/render-cg/image/image_rgb16.c b/src/render-cg/image/image_rgb16.c
index b0dbf68..98196d6 100644
--- a/src/render-cg/image/image_rgb16.c
+++ b/src/render-cg/image/image_rgb16.c
@@ -36,7 +36,6 @@ void dsubimage_rgb16_clearbg(int x, int y, image_t const *img,
 
 	if(!gint_image_mkcmd(&box, img, eff, false, false, &cmd, DWIDTH,
 		DHEIGHT)) return;
-	cmd.effect += 4;
 	cmd.color_1 = bg_color;
 	cmd.loop = gint_image_rgb16_clearbg;
 	gint_image_rgb16_loop(DWIDTH, &cmd);
diff --git a/src/render-cg/image/image_rgb16_dye.c b/src/render-cg/image/image_rgb16_dye.c
index 0757fe8..4fc19c9 100644
--- a/src/render-cg/image/image_rgb16_dye.c
+++ b/src/render-cg/image/image_rgb16_dye.c
@@ -15,7 +15,6 @@ void dsubimage_rgb16_dye(int x, int y, image_t const *img,
 
 	if(!gint_image_mkcmd(&box, img, eff, false, false, &cmd, DWIDTH,
 		DHEIGHT)) return;
-	cmd.effect += 12;
 	cmd.color_1 = img->alpha;
 	cmd.color_2 = dye_color;
 	cmd.loop = gint_image_rgb16_dye;
diff --git a/src/render-cg/image/image_rgb16_swapcolor.c b/src/render-cg/image/image_rgb16_swapcolor.c
index 2167ce4..74322ff 100644
--- a/src/render-cg/image/image_rgb16_swapcolor.c
+++ b/src/render-cg/image/image_rgb16_swapcolor.c
@@ -16,7 +16,6 @@ void dsubimage_rgb16_swapcolor(int x, int y, image_t const *img,
 
 	if(!gint_image_mkcmd(&box, img, eff, false, false, &cmd, DWIDTH,
 		DHEIGHT)) return;
-	cmd.effect += 8;
 	cmd.color_1 = old_color;
 	cmd.color_2 = new_color;
 	cmd.loop = gint_image_rgb16_swapcolor;
@@ -38,7 +37,6 @@ void dsubimage_rgb16_addbg(int x, int y, image_t const *img,
 
 	if(!gint_image_mkcmd(&box, img, eff, false, false, &cmd, DWIDTH,
 		DHEIGHT)) return;
-	cmd.effect += 8;
 	cmd.color_1 = img->alpha;
 	cmd.color_2 = bg_color;
 	cmd.loop = gint_image_rgb16_swapcolor;