diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index ef77d84..b5195b8 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -58,25 +58,16 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        
-        evas_map_point_coord_set   (m, 0, x, y, 0);
-        evas_map_point_image_uv_set(m, 0, 0, 0);
-        evas_map_point_color_set   (m, 0, 255, 255, 255, 255);
-        
-        evas_map_point_coord_set   (m, 1, x + w, y, 0);
-        evas_map_point_image_uv_set(m, 1, w, 0);
-        evas_map_point_color_set   (m, 1, 255, 0, 0, 255);
-        
-        evas_map_point_coord_set   (m, 2, x + w, y + h, 0);
-        evas_map_point_image_uv_set(m, 2, w, h);
-        evas_map_point_color_set   (m, 2, 0, 0, 255, 255);
-        
-        evas_map_point_coord_set   (m, 3, x, y + h, 0);
-        evas_map_point_image_uv_set(m, 3, 0, h);
-        evas_map_point_color_set   (m, 3, 0, 0, 0, 0);
-        
+
+	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+
+        evas_map_point_color_set(m, 0, 255, 255, 255, 255);
+        evas_map_point_color_set(m, 1, 255, 0, 0, 255);
+        evas_map_point_color_set(m, 2, 0, 0, 255, 255);
+        evas_map_point_color_set(m, 3, 0, 0, 0, 0);
+
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
-        
+
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
diff --git a/src/bin/image_map_color_alpha_nearest_solid_rotate.c b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
index bd81b22..e4a252e 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -58,25 +58,16 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        
-        evas_map_point_coord_set   (m, 0, x, y, 0);
-        evas_map_point_image_uv_set(m, 0, 0, 0);
-        evas_map_point_color_set   (m, 0, 255, 255, 255, 255);
-        
-        evas_map_point_coord_set   (m, 1, x + w, y, 0);
-        evas_map_point_image_uv_set(m, 1, w, 0);
-        evas_map_point_color_set   (m, 1, 255, 0, 0, 255);
-        
-        evas_map_point_coord_set   (m, 2, x + w, y + h, 0);
-        evas_map_point_image_uv_set(m, 2, w, h);
-        evas_map_point_color_set   (m, 2, 0, 0, 255, 255);
-        
-        evas_map_point_coord_set   (m, 3, x, y + h, 0);
-        evas_map_point_image_uv_set(m, 3, 0, h);
-        evas_map_point_color_set   (m, 3, 0, 0, 0, 0);
-        
+
+	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+
+        evas_map_point_color_set(m, 0, 255, 255, 255, 255);
+        evas_map_point_color_set(m, 1, 255, 0, 0, 255);
+        evas_map_point_color_set(m, 2, 0, 0, 255, 255);
+        evas_map_point_color_set(m, 3, 0, 0, 0, 0);
+
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
-        
+
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index 7c27431..371adf4 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -56,25 +56,16 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        
-        evas_map_point_coord_set   (m, 0, x, y, 0);
-        evas_map_point_image_uv_set(m, 0, 0, 0);
-        evas_map_point_color_set   (m, 0, 255, 255, 255, 255);
-        
-        evas_map_point_coord_set   (m, 1, x + w, y, 0);
-        evas_map_point_image_uv_set(m, 1, w, 0);
-        evas_map_point_color_set   (m, 1, 255, 0, 0, 255);
-        
-        evas_map_point_coord_set   (m, 2, x + w, y + h, 0);
-        evas_map_point_image_uv_set(m, 2, w, h);
-        evas_map_point_color_set   (m, 2, 0, 0, 255, 255);
-        
-        evas_map_point_coord_set   (m, 3, x, y + h, 0);
-        evas_map_point_image_uv_set(m, 3, 0, h);
-        evas_map_point_color_set   (m, 3, 0, 0, 0, 0);
-        
+
+	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+
+        evas_map_point_color_set(m, 0, 255, 255, 255, 255);
+        evas_map_point_color_set(m, 1, 255, 0, 0, 255);
+        evas_map_point_color_set(m, 2, 0, 0, 255, 255);
+        evas_map_point_color_set(m, 3, 0, 0, 0, 0);
+
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
-        
+
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index b428542..c626802 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -56,25 +56,15 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        
-        evas_map_point_coord_set   (m, 0, x, y, 0);
-        evas_map_point_image_uv_set(m, 0, 0, 0);
-        evas_map_point_color_set   (m, 0, 255, 255, 255, 255);
-        
-        evas_map_point_coord_set   (m, 1, x + w, y, 0);
-        evas_map_point_image_uv_set(m, 1, w, 0);
-        evas_map_point_color_set   (m, 1, 255, 0, 0, 255);
-        
-        evas_map_point_coord_set   (m, 2, x + w, y + h, 0);
-        evas_map_point_image_uv_set(m, 2, w, h);
-        evas_map_point_color_set   (m, 2, 0, 0, 255, 255);
-        
-        evas_map_point_coord_set   (m, 3, x, y + h, 0);
-        evas_map_point_image_uv_set(m, 3, 0, h);
-        evas_map_point_color_set   (m, 3, 0, 0, 0, 0);
-        
+
+	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+
+        evas_map_point_color_set(m, 0, 255, 255, 255, 255);
+        evas_map_point_color_set(m, 1, 255, 0, 0, 255);
+        evas_map_point_color_set(m, 2, 0, 0, 255, 255);
+        evas_map_point_color_set(m, 3, 0, 0, 0, 0);
+
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
-        
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index 671ef3a..ca61461 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -58,25 +58,16 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        
-        evas_map_point_coord_set   (m, 0, x, y, 0);
-        evas_map_point_image_uv_set(m, 0, 0, 0);
-        evas_map_point_color_set   (m, 0, 255, 255, 255, 255);
-        
-        evas_map_point_coord_set   (m, 1, x + w, y, 0);
-        evas_map_point_image_uv_set(m, 1, w, 0);
-        evas_map_point_color_set   (m, 1, 255, 0, 0, 255);
-        
-        evas_map_point_coord_set   (m, 2, x + w, y + h, 0);
-        evas_map_point_image_uv_set(m, 2, w, h);
-        evas_map_point_color_set   (m, 2, 0, 0, 255, 255);
-        
-        evas_map_point_coord_set   (m, 3, x, y + h, 0);
-        evas_map_point_image_uv_set(m, 3, 0, h);
-        evas_map_point_color_set   (m, 3, 0, 255, 0, 255);
-        
+
+	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+
+        evas_map_point_color_set(m, 0, 255, 255, 255, 255);
+        evas_map_point_color_set(m, 1, 255, 0, 0, 255);
+        evas_map_point_color_set(m, 2, 0, 0, 255, 255);
+        evas_map_point_color_set(m, 3, 0, 255, 0, 255);
+
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
-        
+
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index ac45d5a..01421b6 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -58,25 +58,16 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        
-        evas_map_point_coord_set   (m, 0, x, y, 0);
-        evas_map_point_image_uv_set(m, 0, 0, 0);
-        evas_map_point_color_set   (m, 0, 255, 255, 255, 255);
-        
-        evas_map_point_coord_set   (m, 1, x + w, y, 0);
-        evas_map_point_image_uv_set(m, 1, w, 0);
-        evas_map_point_color_set   (m, 1, 255, 0, 0, 255);
-        
-        evas_map_point_coord_set   (m, 2, x + w, y + h, 0);
-        evas_map_point_image_uv_set(m, 2, w, h);
-        evas_map_point_color_set   (m, 2, 0, 0, 255, 255);
-        
-        evas_map_point_coord_set   (m, 3, x, y + h, 0);
-        evas_map_point_image_uv_set(m, 3, 0, h);
-        evas_map_point_color_set   (m, 3, 0, 255, 0, 255);
-        
+
+	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+
+        evas_map_point_color_set(m, 0, 255, 255, 255, 255);
+        evas_map_point_color_set(m, 1, 255, 0, 0, 255);
+        evas_map_point_color_set(m, 2, 0, 0, 255, 255);
+        evas_map_point_color_set(m, 3, 0, 255, 0, 255);
+
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
-        
+
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index 51b46a6..e9f860f 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -56,25 +56,16 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        
-        evas_map_point_coord_set   (m, 0, x, y, 0);
-        evas_map_point_image_uv_set(m, 0, 0, 0);
-        evas_map_point_color_set   (m, 0, 255, 255, 255, 255);
-        
-        evas_map_point_coord_set   (m, 1, x + w, y, 0);
-        evas_map_point_image_uv_set(m, 1, w, 0);
-        evas_map_point_color_set   (m, 1, 255, 0, 0, 255);
-        
-        evas_map_point_coord_set   (m, 2, x + w, y + h, 0);
-        evas_map_point_image_uv_set(m, 2, w, h);
-        evas_map_point_color_set   (m, 2, 0, 0, 255, 255);
-        
-        evas_map_point_coord_set   (m, 3, x, y + h, 0);
-        evas_map_point_image_uv_set(m, 3, 0, h);
-        evas_map_point_color_set   (m, 3, 0, 255, 0, 255);
-        
+
+	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+
+        evas_map_point_color_set(m, 0, 255, 255, 255, 255);
+        evas_map_point_color_set(m, 1, 255, 0, 0, 255);
+        evas_map_point_color_set(m, 2, 0, 0, 255, 255);
+        evas_map_point_color_set(m, 3, 0, 255, 0, 255);
+
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
-        
+
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index 75cc9f2..13abf4d 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -56,25 +56,16 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        
-        evas_map_point_coord_set   (m, 0, x, y, 0);
-        evas_map_point_image_uv_set(m, 0, 0, 0);
-        evas_map_point_color_set   (m, 0, 255, 255, 255, 255);
-        
-        evas_map_point_coord_set   (m, 1, x + w, y, 0);
-        evas_map_point_image_uv_set(m, 1, w, 0);
-        evas_map_point_color_set   (m, 1, 255, 0, 0, 255);
-        
-        evas_map_point_coord_set   (m, 2, x + w, y + h, 0);
-        evas_map_point_image_uv_set(m, 2, w, h);
-        evas_map_point_color_set   (m, 2, 0, 0, 255, 255);
-        
-        evas_map_point_coord_set   (m, 3, x, y + h, 0);
-        evas_map_point_image_uv_set(m, 3, 0, h);
-        evas_map_point_color_set   (m, 3, 0, 255, 0, 255);
-        
+
+	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+
+        evas_map_point_color_set(m, 0, 255, 255, 255, 255);
+        evas_map_point_color_set(m, 1, 255, 0, 0, 255);
+        evas_map_point_color_set(m, 2, 0, 0, 255, 255);
+        evas_map_point_color_set(m, 3, 0, 255, 0, 255);
+
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
-        
+
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index 44218d2..20ce49d 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -58,21 +58,11 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        
-        evas_map_point_coord_set   (m, 0, x, y, 0);
-        evas_map_point_image_uv_set(m, 0, 0, 0);
-        
-        evas_map_point_coord_set   (m, 1, x + w, y, 0);
-        evas_map_point_image_uv_set(m, 1, w, 0);
-        
-        evas_map_point_coord_set   (m, 2, x + w, y + h, 0);
-        evas_map_point_image_uv_set(m, 2, w, h);
-        
-        evas_map_point_coord_set   (m, 3, x, y + h, 0);
-        evas_map_point_image_uv_set(m, 3, 0, h);
-        
+
+	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
-        
+
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index 92f60ea..75c8532 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -58,21 +58,11 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        
-        evas_map_point_coord_set   (m, 0, x, y, 0);
-        evas_map_point_image_uv_set(m, 0, 0, 0);
-        
-        evas_map_point_coord_set   (m, 1, x + w, y, 0);
-        evas_map_point_image_uv_set(m, 1, w, 0);
-        
-        evas_map_point_coord_set   (m, 2, x + w, y + h, 0);
-        evas_map_point_image_uv_set(m, 2, w, h);
-        
-        evas_map_point_coord_set   (m, 3, x, y + h, 0);
-        evas_map_point_image_uv_set(m, 3, 0, h);
-        
+
+	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
-        
+
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index c5044c4..1654e37 100644
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -56,21 +56,11 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        
-        evas_map_point_coord_set   (m, 0, x, y, 0);
-        evas_map_point_image_uv_set(m, 0, 0, 0);
-        
-        evas_map_point_coord_set   (m, 1, x + w, y, 0);
-        evas_map_point_image_uv_set(m, 1, w, 0);
-        
-        evas_map_point_coord_set   (m, 2, x + w, y + h, 0);
-        evas_map_point_image_uv_set(m, 2, w, h);
-        
-        evas_map_point_coord_set   (m, 3, x, y + h, 0);
-        evas_map_point_image_uv_set(m, 3, 0, h);
-        
+
+	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
-        
+
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index cbdd692..3b08125 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -56,21 +56,11 @@ static void _loop(double t, int f)
         x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
 	y = (win_h / 2) - (h / 2);
         y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
-        
-        evas_map_point_coord_set   (m, 0, x, y, 0);
-        evas_map_point_image_uv_set(m, 0, 0, 0);
-        
-        evas_map_point_coord_set   (m, 1, x + w, y, 0);
-        evas_map_point_image_uv_set(m, 1, w, 0);
-        
-        evas_map_point_coord_set   (m, 2, x + w, y + h, 0);
-        evas_map_point_image_uv_set(m, 2, w, h);
-        
-        evas_map_point_coord_set   (m, 3, x, y + h, 0);
-        evas_map_point_image_uv_set(m, 3, 0, h);
-        
+
+	evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+
         evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
-        
+
         evas_object_map_enable_set(o_images[i], 1);
         evas_object_map_set(o_images[i], m);
      }