Updated for UX 4.0

[platform/core/uifw/efl-theme-tizen.git] / themes / widgets / genlist / genlist_normal.edc

diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
old mode 100644 (file)
new mode 100755 (executable)
index a907900..ed032ce
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -20,34 +20,19 @@
  * vim:ts=3
 */
 
-/* genlist multisense sample/tone listing */
-   sounds {
-      sample {
-         name: "button-pressed" RAW;
-         source: "button-pressed.wav";
-      }
-   }
-   group { name: "elm/genlist/item/default/default";
-      alias: "elm/genlist/item_odd/default/default";
-      alias: "elm/genlist/item_compress/default/default";
-      alias: "elm/genlist/item_compress_odd/default/default";
-      alias: "elm/genlist/tree/default/default";
-      alias: "elm/genlist/tree_odd/default/default";
-      alias: "elm/genlist/tree_compress/default/default";
-      alias: "elm/genlist/tree_compress_odd/default/default";
-
+   group { GENLIST_NAME("default/default")
       alias: "elm/list/item/default";
       alias: "elm/list/item_odd/default";
       alias: "elm/list/item_compress/default";
       alias: "elm/list/item_compress_odd/default";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.swallow.icon elm.swallow.end";
 
       parts {
-         GENLIST_PART_BG_IMAGE
          GENLIST_PART_BASE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
          GENLIST_PART_PADDING_RIGHT
@@ -55,9 +40,9 @@
          GENLIST_PART_PADDING_BOTTOM
 
          GENLIST_PART_ICON("elm.swallow.icon",
-            GENLIST_DESCRIPTION_LTB("elm.padding.left",
-               "elm.padding.top", "elm.padding.bottom",
-               fixed: 1 0;)
+            GENLIST_DESCRIPTION_LTB("elm.padding.left", "elm.padding.top", "elm.padding.bottom",
+               fixed: 1 0;
+            )
          )
          GENLIST_PART_LISTITEM_("elm.text", GENLIST_HEIGHT_1LINE,
             "elm.swallow.icon", "elm.swallow.end",
@@ -65,7 +50,8 @@
          )
          GENLIST_PART_ICON("elm.swallow.end",
             GENLIST_DESCRIPTION_R("elm.padding.right",
-               fixed: 1 0;)
+               fixed: 1 0;
+            )
          )
          GENLIST_PART_FLIP
       }
@@ -75,21 +61,156 @@
 // -------------------------------------------------------------------
 // Tizen Theme -------------------------------------------------------
 // -------------------------------------------------------------------
-   group { name: "elm/genlist/item/1icon/default";
-      alias: "elm/genlist/item_odd/1icon/default";
-      alias: "elm/genlist/item_compress/1icon/default";
-      alias: "elm/genlist/item_compress_odd/1icon/default";
-      alias: "elm/genlist/tree/1icon/default";
-      alias: "elm/genlist/tree_odd/1icon/default";
-      alias: "elm/genlist/tree_compress/1icon/default";
-      alias: "elm/genlist/tree_compress_odd/1icon/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+// 2.2.6.1
+   group {  GENLIST_NAME("editfield/default")
+      alias: "elm/layout/item/editfield/default";
+
+      GENLIST_PROLOG_NORMAL
+      images {
+         image: "00_EditField_rename.png" COMP;
+      }
+
+      data.item: "contents" "elm.icon.entry elm.icon.eraser";
+
+      parts {
+         GENLIST_PART_BASE
+         GENLIST_PART_BG_NORMAL
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT
+         GENLIST_PART_PADDING_RIGHT
+         GENLIST_PART_PADDING_TOP_SIZE(29)
+         GENLIST_PART_PADDING_BOTTOM_SIZE(27)
+
+         GENLIST_PART_ICON("elm.icon.entry",
+            GENLIST_DESCRIPTION(
+               "elm.padding.left", "elm.icon.eraser",
+               "elm.padding.top", "elm.padding.bottom",
+               min: 0 48; // This is tuned value for exact entry size.
+            )
+         )
+         GENLIST_PART_ICON("elm.icon.eraser",
+            GENLIST_DESCRIPTION_RTB("elm.padding.right",
+               "elm.padding.top", "elm.padding.bottom",
+               fixed: 1 0;
+               visible: 0;
+               min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
+               max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
+            )
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         )
+         GENLIST_PART_IMAGE("elm.icon.rename",
+            GENLIST_DESCRIPTION_ENVELOP("elm.icon.eraser",
+               fixed: 1 0;
+               visible: 1;
+               image.normal: "00_EditField_rename.png";
+               min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
+               max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
+               color: GENLIST_ENTRY_RENAME_COLOR;
+            )
+            description { state: "hide" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         )
+         GENLIST_PART_FLIP
+      }
+      GENLIST_PROGRAMS_NORMAL( target: "elm.icon.entry"; target: "elm.icon.rename"; )
+      GENLIST_PROGRAMS_ENTRY
+   }
+
+// 2.2.6.1 (without genlist background)
+   group {  GENLIST_NAME("editfield/no_bg/default")
+      alias: "elm/layout/editfield/no_bg/default";
+      inherit: "elm/genlist/item/editfield/default";
+
+      parts {
+         GENLIST_PART_BG_NORMAL_OFF
+      }
+   }
+
+// 2.2.6.2
+   group { GENLIST_NAME("editfield/title/default")
+      alias: "elm/layout/editfield/title/default";
+
+      GENLIST_PROLOG_NORMAL
+      images {
+         image: "00_EditField_rename.png" COMP;
+      }
+      data.item: "contents" "elm.icon.entry elm.icon.eraser";
+      data.item: "texts" "elm.text";
+      parts {
+         GENLIST_PART_BASE
+         GENLIST_PART_BG_NORMAL
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT
+         GENLIST_PART_PADDING_RIGHT
+         GENLIST_PART_PADDING_TOP_SIZE(22)
+         GENLIST_PART_PADDING_BOTTOM_SIZE(22)
+
+         GENLIST_PART_SUBITEM_SETTINGS_LRT("elm.text", GENLIST_HEIGHT_2LINE_SUB,
+            "elm.padding.left", "elm.padding.right", "elm.padding.top"
+         )
+         GENLIST_PART_ICON("elm.icon.entry",
+            GENLIST_DESCRIPTION(
+               "elm.padding.left", "elm.icon.eraser",
+               "elm.text", "elm.padding.bottom",
+               min: 0 48; // This is tuned value for exact entry size.
+            )
+         )
+         GENLIST_PART_ICON("elm.icon.eraser",
+            GENLIST_DESCRIPTION_RTB("elm.padding.right",
+               "elm.text", "elm.padding.bottom",
+               fixed: 1 0;
+               visible: 0;
+               min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
+               max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
+            )
+            description { state: "show" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         )
+         GENLIST_PART_IMAGE("elm.icon.rename",
+            GENLIST_DESCRIPTION_ENVELOP("elm.icon.eraser",
+               visible: 1;
+               fixed: 1 0;
+               image.normal: "00_EditField_rename.png";
+               min: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
+               max: GENLIST_ICON_ENTRY_SIZE GENLIST_ICON_ENTRY_SIZE;
+               color: GENLIST_ENTRY_RENAME_COLOR;
+            )
+            description { state: "hide" 0.0;
+               inherit: "default" 0.0;
+               visible: 0;
+            }
+         )
+         GENLIST_PART_FLIP
+      }
+      GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon.entry"; target: "elm.icon.rename"; )
+      GENLIST_PROGRAMS_ENTRY
+   }
+
+// 2.2.6.2 (without genlist background)
+   group {  GENLIST_NAME("editfield/title/no_bg/default")
+      alias: "elm/layout/editfield/title/no_bg/default";
+      inherit: "elm/genlist/item/editfield/title/default";
+
+      parts {
+         GENLIST_PART_BG_NORMAL_OFF
+      }
+   }
+
+   group {  GENLIST_NAME("1icon/default")
+      GENLIST_PROLOG_NORMAL
+
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
          GENLIST_PART_BASE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
          GENLIST_PART_PADDING_RIGHT
@@ -108,14 +229,7 @@
       GENLIST_PROGRAMS_NORMAL( target: "elm.icon"; )
    }
 
-   group { name: "elm/genlist/item/1icon/with_no_line/default";
-      alias: "elm/genlist/item_odd/1icon/with_no_line/default";
-      alias: "elm/genlist/item_compress/1icon/with_no_line/default";
-      alias: "elm/genlist/item_compress_odd/1icon/with_no_line/default";
-      alias: "elm/genlist/tree/1icon/with_no_line/default";
-      alias: "elm/genlist/tree_odd/1icon/with_no_line/default";
-      alias: "elm/genlist/tree_compress/1icon/with_no_line/default";
-      alias: "elm/genlist/tree_compress_odd/1icon/with_no_line/default";
+   group { GENLIST_NAME("1icon/with_no_line/default")
       inherit: "elm/genlist/item/1icon/default";
 
       parts {
@@ -132,14 +246,7 @@
       }
    }
 
-   group { name: "elm/genlist/item/1icon/no_padding/default";
-      alias: "elm/genlist/item_odd/1icon/no_padding/default";
-      alias: "elm/genlist/item_compress/1icon/no_padding/default";
-      alias: "elm/genlist/item_compress_odd/1icon/no_padding/default";
-      alias: "elm/genlist/tree/1icon/no_padding/default";
-      alias: "elm/genlist/tree_odd/1icon/no_padding/default";
-      alias: "elm/genlist/tree_compress/1icon/no_padding/default";
-      alias: "elm/genlist/tree_compress_odd/1icon/no_padding/default";
+   group { GENLIST_NAME("1icon/no_padding/default")
       inherit: "elm/genlist/item/1icon/default";
 
       parts {
@@ -152,20 +259,13 @@
 // 1 line -------------------------------------------------------
 // -------------------------------------------------------------------
 // 2.2.1.1
-   group { name: "elm/genlist/item/1text/default";
-      alias: "elm/genlist/item_odd/1text/default";
-      alias: "elm/genlist/item_compress/1text/default";
-      alias: "elm/genlist/item_compress_odd/1text/default";
-      alias: "elm/genlist/tree/1text/default";
-      alias: "elm/genlist/tree_odd/1text/default";
-      alias: "elm/genlist/tree_compress/1text/default";
-      alias: "elm/genlist/tree_compress_odd/1text/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("1text/default")
+      GENLIST_PROLOG_NORMAL
+
       data.item: "texts" "elm.text";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -182,21 +282,12 @@
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; )
    }
 // 2.2.1.1 (textblock)
-   group { name: "elm/genlist/item/1text.tb/default";
-      alias: "elm/genlist/item_odd/1text.tb/default";
-      alias: "elm/genlist/item_compress/1text.tb/default";
-      alias: "elm/genlist/item_compress_odd/1text.tb/default";
-      alias: "elm/genlist/tree/1text.tb/default";
-      alias: "elm/genlist/tree_odd/1text.tb/default";
-      alias: "elm/genlist/tree_compress/1text.tb/default";
-      alias: "elm/genlist/tree_compress_odd/1text.tb/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("1text.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text";
-
       parts {
-         GENLIST_PART_BG_IMAGE
          GENLIST_PART_BASE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
          GENLIST_PART_PADDING_RIGHT
@@ -213,20 +304,11 @@
    }
 
 // 2.2.1.2
-   group { name: "elm/genlist/item/2text/default";
-      alias: "elm/genlist/item_odd/2text/default";
-      alias: "elm/genlist/item_compress/2text/default";
-      alias: "elm/genlist/item_compress_odd/2text/default";
-      alias: "elm/genlist/tree/2text/default";
-      alias: "elm/genlist/tree_odd/2text/default";
-      alias: "elm/genlist/tree_compress/2text/default";
-      alias: "elm/genlist/tree_compress_odd/2text/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
-
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -248,10 +330,7 @@
    }
 
 // 2.2.1.3
-   group { name: "elm/genlist/item/2text.6/default";
-      alias: "elm/genlist/item_odd/2text.6/default";
-      alias: "elm/genlist/item_compress/2text.6/default";
-      alias: "elm/genlist/item_compress_odd/2text.6/default";
+   group { GENLIST_NAME("2text.6/default")
       inherit: "elm/genlist/item/2text/default";
 
       parts {
@@ -266,17 +345,14 @@
    }
 
 // 2.2.1.4
-   group { name: "elm/genlist/item/1text.1icon/default";
-      alias: "elm/genlist/item_odd/1text.1icon/default";
-      alias: "elm/genlist/item_compress/1text.1icon/default";
-      alias: "elm/genlist/item_compress_odd/1text.1icon/default";
+   group { GENLIST_NAME("1text.1icon/default")
+      GENLIST_PROLOG_NORMAL
 
-      GENLIST_DATA_ITEM_NORMAL
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -297,10 +373,7 @@
    }
 
 // 2.2.1.5
-   group { name: "elm/genlist/item/1text.1icon.4/default";
-      alias: "elm/genlist/item_odd/1text.1icon.4/default";
-      alias: "elm/genlist/item_compress/1text.1icon.4/default";
-      alias: "elm/genlist/item_compress_odd/1text.1icon.4/default";
+   group { GENLIST_NAME("1text.1icon.4/default")
       inherit: "elm/genlist/item/1text.1icon/default";
 
       parts {
@@ -309,10 +382,7 @@
    }
 
 // 2.2.1.6
-   group { name: "elm/genlist/item/1text.1icon.6/default";
-      alias: "elm/genlist/item_odd/1text.1icon.6/default";
-      alias: "elm/genlist/item_compress/1text.1icon.6/default";
-      alias: "elm/genlist/item_compress_odd/1text.1icon.6/default";
+   group { GENLIST_NAME("1text.1icon.6/default")
       inherit: "elm/genlist/item/1text.1icon/default";
 
       parts {
@@ -322,10 +392,7 @@
 
 
 // 2.2.1.7
-      group { name: "elm/genlist/item/1text.1icon.7/default";
-      alias: "elm/genlist/item_odd/1text.1icon.7/default";
-      alias: "elm/genlist/item_compress/1text.1icon.7/default";
-      alias: "elm/genlist/item_compress_odd/1text.1icon.7/default";
+      group { GENLIST_NAME("1text.1icon.7/default")
       inherit: "elm/genlist/item/1text.1icon/default";
 
       parts {
@@ -334,10 +401,7 @@
    }
 
 // 2.2.1.8
-   group { name: "elm/genlist/item/1text.1icon.5/default";
-      alias: "elm/genlist/item_odd/1text.1icon.5/default";
-      alias: "elm/genlist/item_compress/1text.1icon.5/default";
-      alias: "elm/genlist/item_compress_odd/1text.1icon.5/default";
+   group { GENLIST_NAME("1text.1icon.5/default")
       inherit: "elm/genlist/item/1text.1icon/default";
 
       parts {
@@ -345,18 +409,30 @@
       }
    }
 
-// 2.2.1.9
-   group { name: "elm/genlist/item/1text.2icon.3/default";
-      alias: "elm/genlist/item_odd/1text.2icon.3/default";
-      alias: "elm/genlist/item_compress/1text.2icon.3/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon.3/default";
+// 2.2.1.8.1 (Circle)
+   group { GENLIST_NAME("1text.1icon.5.thumb.circle/default")
+      inherit: "elm/genlist/item/1text.1icon.5/default";
+
+      GENLIST_INHERIT_THUMB_CIRCLE_LARGE("elm.icon")
+      GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; target: "elm.thumb"; )
+   }
+
+// 2.2.1.8.1 (Square)
+   group { GENLIST_NAME("1text.1icon.5.thumb.square/default")
+      inherit: "elm/genlist/item/1text.1icon.5/default";
+
+      GENLIST_INHERIT_THUMB_SQUARE_LARGE("elm.icon")
+      GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; target: "elm.thumb"; )
+   }
 
-      GENLIST_DATA_ITEM_NORMAL
+// 2.2.1.9
+   group { GENLIST_NAME("1text.2icon.3/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon.1 elm.icon.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -384,21 +460,17 @@
    }
 
 // 2.2.1.9 (textblock)
-   group { name: "elm/genlist/item/1text.2icon.3.tb/default";
-      alias: "elm/genlist/item_odd/1text.2icon.3.tb/default";
-      alias: "elm/genlist/item_compress/1text.2icon.3.tb/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon.3.tb/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("1text.2icon.3.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon.1 elm.icon.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
-         GENLIST_PART_PADDING_RIGHT_SIZE( 0 )
+         GENLIST_PART_PADDING_RIGHT
          GENLIST_PART_PADDING_TOP
          GENLIST_PART_PADDING_BOTTOM
 
@@ -422,14 +494,7 @@
    }
 
 // 2.2.1.10
-   group { name: "elm/genlist/item/1text.1icon.2/default";
-      alias: "elm/genlist/item_odd/1text.1icon.2/default";
-      alias: "elm/genlist/item_compress/1text.1icon.2/default";
-      alias: "elm/genlist/item_compress_odd/1text.1icon.2/default";
-      alias: "elm/genlist/tree/1text.1icon.2/default";
-      alias: "elm/genlist/tree_odd/1text.1icon.2/default";
-      alias: "elm/genlist/tree_compress/1text.1icon.2/default";
-      alias: "elm/genlist/tree_compress_odd/1text.1icon.2/default";
+   group { GENLIST_NAME("1text.1icon.2/default")
       // FIXME: just for backward compatibility
       alias: "elm/genlist/item/1text.1/expandable_n_depth/default";
       alias: "elm/genlist/item_odd/1text.1/expandable_n_depth/default";
@@ -447,13 +512,12 @@
       alias: "elm/genlist/tree_odd/1text.2/expandable_n_depth/default";
       alias: "elm/genlist/tree_compress/1text.2/expandable_n_depth/default";
 
-
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -470,18 +534,30 @@
       GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; )
    }
 
-// 2.2.1.10 (textblock)
-   group { name: "elm/genlist/item/1text.1icon.2.tb/default";
-      alias: "elm/genlist/item_odd/1text.1icon.2.tb/default";
-      alias: "elm/genlist/item_compress/1text.1icon.2.tb/default";
-      alias: "elm/genlist/item_compress_odd/1text.1icon.2.tb/default";
+// 2.2.1.10.1 (circle)
+   group { GENLIST_NAME("1text.1icon.2.thumb.circle/default")
+      inherit: "elm/genlist/item/1text.1icon.2/default";
+
+      GENLIST_INHERIT_THUMB_CIRCLE_MEDIUM("elm.icon")
+      GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; target: "elm.thumb"; )
+   }
 
-      GENLIST_DATA_ITEM_NORMAL
+// 2.2.1.10.1 (square)
+   group { GENLIST_NAME("1text.1icon.2.thumb.square/default")
+      inherit: "elm/genlist/item/1text.1icon.2/default";
+
+      GENLIST_INHERIT_THUMB_SQUARE_MEDIUM("elm.icon")
+      GENLIST_PROGRAMS_NORMAL( target: "elm.text"; target: "elm.icon"; target: "elm.thumb"; )
+   }
+
+// 2.2.1.10 (textblock)
+   group { GENLIST_NAME("1text.1icon.2.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -498,17 +574,13 @@
    }
 
 // 2.2.1.11
-   group { name: "elm/genlist/item/2text.1icon/default";
-      alias: "elm/genlist/item_odd/2text.1icon/default";
-      alias: "elm/genlist/item_compress/2text.1icon/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.1icon/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -526,14 +598,7 @@
    }
 
 // 2.2.1.12
-   group { name: "elm/genlist/item/2text.1icon.6/default";
-      alias: "elm/genlist/item_odd/2text.1icon.6/default";
-      alias: "elm/genlist/item_compress/2text.1icon.6/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.6/default";
-      alias: "elm/genlist/tree/2text.1icon.6/default";
-      alias: "elm/genlist/tree_odd/2text.1icon.6/default";
-      alias: "elm/genlist/tree_compress/2text.1icon.6/default";
-      alias: "elm/genlist/tree_compress_odd/2text.1icon.6/default";
+   group { GENLIST_NAME("2text.1icon.6/default")
       inherit: "elm/genlist/item/2text.1icon/default";
 
       parts {
@@ -547,17 +612,13 @@
    }
 
 // 2.2.1.13
-   group { name: "elm/genlist/item/1text.2icon/default";
-      alias: "elm/genlist/item_odd/1text.2icon/default";
-      alias: "elm/genlist/item_compress/1text.2icon/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("1text.2icon/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon.1 elm.icon.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -576,17 +637,13 @@
    }
 
 // 2.2.1.13 (textblock)
-   group { name: "elm/genlist/item/1text.2icon.tb/default";
-      alias: "elm/genlist/item_odd/1text.2icon.tb/default";
-      alias: "elm/genlist/item_compress/1text.2icon.tb/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon.tb/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("1text.2icon.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon.1 elm.icon.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -605,10 +662,7 @@
    }
 
 // 2.2.1.14
-   group { name: "elm/genlist/item/1text.2icon.6/default";
-      alias: "elm/genlist/item_odd/1text.2icon.6/default";
-      alias: "elm/genlist/item_compress/1text.2icon.6/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon.6/default";
+   group { GENLIST_NAME("1text.2icon.6/default")
       inherit: "elm/genlist/item/1text.2icon/default";
 
       parts {
@@ -618,10 +672,7 @@
    }
 
 // 2.2.1.14 (textblock)
-   group { name: "elm/genlist/item/1text.2icon.6.tb/default";
-      alias: "elm/genlist/item_odd/1text.2icon.6.tb/default";
-      alias: "elm/genlist/item_compress/1text.2icon.6.tb/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon.6.tb/default";
+   group { GENLIST_NAME("1text.2icon.6.tb/default")
       inherit: "elm/genlist/item/1text.2icon.tb/default";
 
       parts {
@@ -630,10 +681,7 @@
    }
 
 // 2.2.1.15
-   group { name: "elm/genlist/item/1text.2icon.7/default";
-      alias: "elm/genlist/item_odd/1text.2icon.7/default";
-      alias: "elm/genlist/item_compress/1text.2icon.7/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon.7/default";
+   group { GENLIST_NAME("1text.2icon.7/default")
       inherit: "elm/genlist/item/1text.2icon/default";
 
       parts {
@@ -643,10 +691,7 @@
 
 // 2.2.1.16
 // 2.2.1.20
-   group { name: "elm/genlist/item/1text.1icon.3/default";
-      alias: "elm/genlist/item_odd/1text.1icon.3/default";
-      alias: "elm/genlist/item_compress/1text.1icon.3/default";
-      alias: "elm/genlist/item_compress_odd/1text.1icon.3/default";
+   group { GENLIST_NAME("1text.1icon.3/default")
       inherit: "elm/genlist/item/1text.1icon.2/default";
 
       parts {
@@ -656,10 +701,7 @@
 
 // 2.2.1.16 (textblock)
 // 2.2.1.20 (textblock)
-   group { name: "elm/genlist/item/1text.1icon.3.tb/default";
-      alias: "elm/genlist/item_odd/1text.1icon.3.tb/default";
-      alias: "elm/genlist/item_compress/1text.1icon.3.tb/default";
-      alias: "elm/genlist/item_compress_odd/1text.1icon.3.tb/default";
+   group { GENLIST_NAME("1text.1icon.3.tb/default")
       inherit: "elm/genlist/item/1text.1icon.2.tb/default";
 
       parts {
@@ -668,10 +710,7 @@
    }
 
 // 2.2.1.17
-   group { name: "elm/genlist/item/1text.2icon.4/default";
-      alias: "elm/genlist/item_odd/1text.2icon.4/default";
-      alias: "elm/genlist/item_compress/1text.2icon.4/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon.4/default";
+   group { GENLIST_NAME("1text.2icon.4/default")
       inherit: "elm/genlist/item/1text.2icon/default";
 
       parts {
@@ -681,10 +720,7 @@
    }
 
 // 2.2.1.17 (textblock)
-   group { name: "elm/genlist/item/1text.2icon.4.tb/default";
-      alias: "elm/genlist/item_odd/1text.2icon.4.tb/default";
-      alias: "elm/genlist/item_compress/1text.2icon.4.tb/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon.4.tb/default";
+   group { GENLIST_NAME("1text.2icon.4.tb/default")
       inherit: "elm/genlist/item/1text.2icon.tb/default";
 
       parts {
@@ -695,17 +731,13 @@
 
 // 2.2.1.18
 // 2.2.1.23
-   group { name: "elm/genlist/item/1text.2icon.2/default";
-      alias: "elm/genlist/item_odd/1text.2icon.2/default";
-      alias: "elm/genlist/item_compress/1text.2icon.2/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon.2/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("1text.2icon.2/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon.1 elm.icon.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -725,17 +757,13 @@
 
 // 2.2.1.19
 // 2.2.1.25
-   group { name: "elm/genlist/item/1text.3icon/default";
-      alias: "elm/genlist/item_odd/1text.3icon/default";
-      alias: "elm/genlist/item_compress/1text.3icon/default";
-      alias: "elm/genlist/item_compress_odd/1text.3icon/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("1text.3icon/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -757,10 +785,7 @@
    }
 
 // 2.2.1.21
-   group { name: "elm/genlist/item/1text.2icon.8/default";
-      alias: "elm/genlist/item_odd/1text.2icon.8/default";
-      alias: "elm/genlist/item_compress/1text.2icon.8/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon.8/default";
+   group { GENLIST_NAME("1text.2icon.8/default")
       inherit: "elm/genlist/item/1text.2icon/default";
 
       parts {
@@ -770,10 +795,7 @@
    }
 
 // 2.2.1.22
-   group { name: "elm/genlist/item/1text.2icon.9/default";
-      alias: "elm/genlist/item_odd/1text.2icon.9/default";
-      alias: "elm/genlist/item_compress/1text.2icon.9/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon.9/default";
+   group { GENLIST_NAME("1text.2icon.9/default")
       inherit: "elm/genlist/item/1text.2icon/default";
 
       parts {
@@ -783,17 +805,13 @@
    }
 
 // 2.2.1.24
-   group { name: "elm/genlist/item/1text.3icon.2/default";
-      alias: "elm/genlist/item_odd/1text.3icon.2/default";
-      alias: "elm/genlist/item_compress/1text.3icon.2/default";
-      alias: "elm/genlist/item_compress_odd/1text.3icon.2/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("1text.3icon.2/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -815,16 +833,12 @@
    }
 
 // 2.2.1.26
-   group { name: "elm/genlist/item/2text.4/default";
-      alias: "elm/genlist/item_odd/2text.4/default";
-      alias: "elm/genlist/item_compress/2text.4/default";
-      alias: "elm/genlist/item_compress_odd/2text.4/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.4/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -833,30 +847,27 @@
          GENLIST_PART_PADDING_BOTTOM
 
          GENLIST_PART_SUBITEM_LR("elm.text.1", GENLIST_HEIGHT_1LINE,
-            "elm.padding.left", "elm.elm.divider1.left",
+            "elm.padding.left", "elm.divider1.left",
          )
-         GENLIST_PART_PADDING_R("elm.elm.divider1.left", "elm.divider1")
+         GENLIST_PART_PADDING_R("elm.divider1.left", "elm.divider1")
          GENLIST_PART_DIVIDER_R("elm.text.2.left")
          GENLIST_PART_PADDING_R("elm.text.2.left", "elm.text.2")
          GENLIST_PART_SUBITEM_R_FIXED("elm.text.2", 200, GENLIST_HEIGHT_1LINE,
             "elm.padding.right")
          GENLIST_PART_FLIP
       }
-      GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
+      GENLIST_PROGRAMS_NORMAL(
+         target: "elm.text.1"; target: "elm.text.2";
          target: "elm.divider1"; target: "elm.divider2"; )
    }
 
 // 2.2.1.26 (textblock)
-   group { name: "elm/genlist/item/2text.4.tb/default";
-      alias: "elm/genlist/item_odd/2text.4.tb/default";
-      alias: "elm/genlist/item_compress/2text.4.tb/default";
-      alias: "elm/genlist/item_compress_odd/2text.4.tb/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.4.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -878,16 +889,12 @@
    }
 
 // 2.2.1.27
-   group { name: "elm/genlist/item/2text.5/default";
-      alias: "elm/genlist/item_odd/2text.5/default";
-      alias: "elm/genlist/item_compress/2text.5/default";
-      alias: "elm/genlist/item_compress_odd/2text.5/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.5/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -908,10 +915,7 @@
    }
 
 // 2.2.1.28
-   group { name: "elm/genlist/item/1text.1icon.divider/default";
-      alias: "elm/genlist/item_odd/1text.1icon.divider/default";
-      alias: "elm/genlist/item_compress/1text.1icon.divider/default";
-      alias: "elm/genlist/item_compress_odd/1text.1icon.divider/default";
+   group { GENLIST_NAME("1text.1icon.divider/default")
       inherit: "elm/genlist/item/1text.1icon.7/default";
 
       parts {
@@ -926,10 +930,7 @@
    }
 
 // 2.2.1.29
-   group { name: "elm/genlist/item/1text.2icon.divider/default";
-      alias: "elm/genlist/item_odd/1text.2icon.divider/default";
-      alias: "elm/genlist/item_compress/1text.2icon.divider/default";
-      alias: "elm/genlist/item_compress_odd/1text.2icon.divider/default";
+   group { GENLIST_NAME("1text.2icon.divider/default")
       inherit: "elm/genlist/item/1text.2icon.7/default";
 
       parts {
@@ -945,16 +946,12 @@
 // 2 line -------------------------------------------------------
 // -------------------------------------------------------------------
 // 2.2.2.1
-   group { name: "elm/genlist/item/2text.2/default";
-      alias: "elm/genlist/item_odd/2text.2/default";
-      alias: "elm/genlist/item_compress/2text.2/default";
-      alias: "elm/genlist/item_compress_odd/2text.2/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.2/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -974,16 +971,12 @@
    }
 
 // 2.2.2.1 (textblock)
-   group { name: "elm/genlist/item/2text.2.tb/default";
-      alias: "elm/genlist/item_odd/2text.2.tb/default";
-      alias: "elm/genlist/item_compress/2text.2.tb/default";
-      alias: "elm/genlist/item_compress_odd/2text.2.tb/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.2.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1004,16 +997,12 @@
    }
 
 // 2.2.2.2
-   group { name: "elm/genlist/item/2text.3/default";
-      alias: "elm/genlist/item_odd/2text.3/default";
-      alias: "elm/genlist/item_compress/2text.3/default";
-      alias: "elm/genlist/item_compress_odd/2text.3/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.3/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1034,16 +1023,12 @@
    }
 
 // 2.2.2.3
-   group { name: "elm/genlist/item/3text/default";
-      alias: "elm/genlist/item_odd/3text/default";
-      alias: "elm/genlist/item_compress/3text/default";
-      alias: "elm/genlist/item_compress_odd/3text/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("3text/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1066,16 +1051,12 @@
    }
 
 // 2.2.2.3 (textblock)
-   group { name: "elm/genlist/item/3text.tb/default";
-      alias: "elm/genlist/item_odd/3text.tb/default";
-      alias: "elm/genlist/item_compress/3text.tb/default";
-      alias: "elm/genlist/item_compress_odd/3text.tb/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("3text.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1099,17 +1080,13 @@
    }
 
 // 2.2.2.4
-   group { name: "elm/genlist/item/2text.1icon.2/default";
-      alias: "elm/genlist/item_odd/2text.1icon.2/default";
-      alias: "elm/genlist/item_compress/2text.1icon.2/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.2/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.1icon.2/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1130,11 +1107,37 @@
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
    }
 
+// 2.2.2.4 (textblock)
+   group { GENLIST_NAME("2text.1icon.2.tb/default")
+      GENLIST_PROLOG_NORMAL
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon";
+
+      parts {
+         GENLIST_PART_BG_NORMAL
+         GENLIST_PART_BASE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT
+         GENLIST_PART_PADDING_RIGHT
+         GENLIST_PART_PADDING_TOP_2LINE
+         GENLIST_PART_PADDING_BOTTOM_2LINE
+
+         GENLIST_PART_LISTITEM_TB_("elm.text.1", GENLIST_HEIGHT_2LINE_MAIN,
+            "elm.padding.left", "elm.padding.icon.left",
+            "elm.padding.top", "elm.text.2",
+         )
+         GENLIST_PART_SUBITEM_LRB_TB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB,
+            "elm.padding.left", "elm.padding.icon.left", "elm.padding.bottom")
+         GENLIST_PART_PADDING_R("elm.padding.icon.left", "elm.icon")
+         GENLIST_PART_ICON_BTN_01_RTB("elm.icon", "elm.padding.right", "elm.padding.top", "elm.padding.bottom")
+         GENLIST_PART_FLIP
+      }
+      GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.icon"; )
+   }
+
+
 // 2.2.2.5
-   group { name: "elm/genlist/item/2text.1icon.10/default";
-      alias: "elm/genlist/item_odd/2text.1icon.10/default";
-      alias: "elm/genlist/item_compress/2text.1icon.10/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.10/default";
+   group { GENLIST_NAME("2text.1icon.10/default")
       inherit: "elm/genlist/item/2text.1icon.2/default";
 
       parts {
@@ -1143,17 +1146,13 @@
    }
 
 // 2.2.2.5 (textblock)
-   group { name: "elm/genlist/item/2text.1icon.10.tb/default";
-      alias: "elm/genlist/item_odd/2text.1icon.10.tb/default";
-      alias: "elm/genlist/item_compress/2text.1icon.10.tb/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.10.tb/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.1icon.10.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1176,21 +1175,13 @@
    }
 
 // 2.2.2.6
-   group { name: "elm/genlist/item/2text.5icon/default";
-      alias: "elm/genlist/item_odd/2text.5icon/default";
-      alias: "elm/genlist/item_compress/2text.5icon/default";
-      alias: "elm/genlist/item_compress_odd/2text.5icon/default";
-      alias: "elm/genlist/tree/2text.5icon/default";
-      alias: "elm/genlist/tree_odd/2text.5icon/default";
-      alias: "elm/genlist/tree_compress/2text.5icon/default";
-      alias: "elm/genlist/tree_compress_odd/2text.5icon/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.5icon/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1225,17 +1216,13 @@
    }
 
 // 2.2.2.7
-   group { name: "elm/genlist/item/3text.1icon/default";
-      alias: "elm/genlist/item_odd/3text.1icon/default";
-      alias: "elm/genlist/item_compress/3text.1icon/default";
-      alias: "elm/genlist/item_compress_odd/3text.1icon/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("3text.1icon/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1266,17 +1253,13 @@
    }
 
 // 2.2.2.7 (textblock)
-   group { name: "elm/genlist/item/3text.1icon.tb/default";
-      alias: "elm/genlist/item_odd/3text.1icon.tb/default";
-      alias: "elm/genlist/item_compress/3text.1icon.tb/default";
-      alias: "elm/genlist/item_compress_odd/3text.1icon.tb/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("3text.1icon.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1308,17 +1291,13 @@
    }
 
 // 2.2.2.8
-   group { name: "elm/genlist/item/2text.2icon/default";
-      alias: "elm/genlist/item_odd/2text.2icon/default";
-      alias: "elm/genlist/item_compress/2text.2icon/default";
-      alias: "elm/genlist/item_compress_odd/2text.2icon/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.2icon/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1349,10 +1328,7 @@
    }
 
 // 2.2.2.9
-   group { name: "elm/genlist/item/2text.7/default";
-      alias: "elm/genlist/item_odd/2text.7/default";
-      alias: "elm/genlist/item_compress/2text.7/default";
-      alias: "elm/genlist/item_compress_odd/2text.7/default";
+   group { GENLIST_NAME("2text.7/default")
       inherit: "elm/genlist/item/2text.2/default";
 
       parts {
@@ -1366,10 +1342,7 @@
    }
 
 // 2.2.2.10
-   group { name: "elm/genlist/item/2text.1icon.7/default";
-      alias: "elm/genlist/item_odd/2text.1icon.7/default";
-      alias: "elm/genlist/item_compress/2text.1icon.7/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.7/default";
+   group { GENLIST_NAME("2text.1icon.7/default")
       inherit: "elm/genlist/item/2text.1icon.2/default";
 
       parts {
@@ -1384,17 +1357,13 @@
    }
 
 // 2.2.2.10 (textblock)
-   group { name: "elm/genlist/item/2text.1icon.7.tb/default";
-      alias: "elm/genlist/item_odd/2text.1icon.7.tb/default";
-      alias: "elm/genlist/item_compress/2text.1icon.7.tb/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.7.tb/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.1icon.7.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1417,10 +1386,7 @@
    }
 
 // 2.2.2.11
-   group { name: "elm/genlist/item/2text.1icon.11/default";
-      alias: "elm/genlist/item_odd/2text.1icon.11/default";
-      alias: "elm/genlist/item_compress/2text.1icon.11/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.11/default";
+   group { GENLIST_NAME("2text.1icon.11/default")
       inherit: "elm/genlist/item/2text.1icon.2/default";
       parts {
          part { name: "elm.text.2";
@@ -1434,17 +1400,13 @@
    }
 
 // 2.2.2.12
-   group { name: "elm/genlist/item/2text.2icon.2/default";
-      alias: "elm/genlist/item_odd/2text.2icon.2/default";
-      alias: "elm/genlist/item_compress/2text.2icon.2/default";
-      alias: "elm/genlist/item_compress_odd/2text.2icon.2/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.2icon.2/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1481,17 +1443,13 @@
    }
 
 // 2.2.2.13
-   group { name: "elm/genlist/item/2text.1icon.5/default";
-      alias: "elm/genlist/item_odd/2text.1icon.5/default";
-      alias: "elm/genlist/item_compress/2text.1icon.5/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.5/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.1icon.5/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1514,17 +1472,13 @@
    }
 
 // 2.2.2.14
-   group { name: "elm/genlist/item/2text.1icon.4/default";
-      alias: "elm/genlist/item_odd/2text.1icon.4/default";
-      alias: "elm/genlist/item_compress/2text.1icon.4/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.4/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.1icon.4/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1545,18 +1499,32 @@
          target: "elm.icon"; )
    }
 
-// 2.2.2.14 (textblock)
-   group { name: "elm/genlist/item/2text.1icon.4.tb/default";
-      alias: "elm/genlist/item_odd/2text.1icon.4.tb/default";
-      alias: "elm/genlist/item_compress/2text.1icon.4.tb/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.4.tb/default";
+// 2.2.2.14.1 (circle)
+   group { GENLIST_NAME("2text.1icon.4.thumb.circle/default")
+      inherit: "elm/genlist/item/2text.1icon.4/default";
+
+      GENLIST_INHERIT_THUMB_CIRCLE_MEDIUM("elm.icon")
+      GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
+         target: "elm.icon"; target: "elm.thumb"; )
+   }
+
+// 2.2.2.14.1 (square)
+   group { GENLIST_NAME("2text.1icon.4.thumb.square/default")
+      inherit: "elm/genlist/item/2text.1icon.4/default";
+
+      GENLIST_INHERIT_THUMB_SQUARE_MEDIUM("elm.icon")
+      GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
+         target: "elm.icon"; target: "elm.thumb"; )
+   }
 
-      GENLIST_DATA_ITEM_NORMAL
+// 2.2.2.14 (textblock)
+   group { GENLIST_NAME("2text.1icon.4.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1578,17 +1546,13 @@
    }
 
 // 2.2.2.15
-   group { name: "elm/genlist/item/3text.1icon.2/default";
-      alias: "elm/genlist/item_odd/3text.1icon.2/default";
-      alias: "elm/genlist/item_compress/3text.1icon.2/default";
-      alias: "elm/genlist/item_compress_odd/3text.1icon.2/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("3text.1icon.2/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1612,10 +1576,7 @@
    }
 
 // 2.2.2.16
-   group { name: "elm/genlist/item/2text.1icon.8/default";
-      alias: "elm/genlist/item_odd/2text.1icon.8/default";
-      alias: "elm/genlist/item_compress/2text.1icon.8/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.8/default";
+   group { GENLIST_NAME("2text.1icon.8/default")
       inherit: "elm/genlist/item/2text.1icon.4/default";
 
       parts {
@@ -1629,17 +1590,13 @@
    }
 
 // 2.2.2.17
-   group { name: "elm/genlist/item/2text.6icon/default";
-      alias: "elm/genlist/item_odd/2text.6icon/default";
-      alias: "elm/genlist/item_compress/2text.6icon/default";
-      alias: "elm/genlist/item_compress_odd/2text.6icon/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.6icon/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5 elm.icon.6";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1676,14 +1633,13 @@
    }
 
 // 2.2.2.17 (textblock)
-   group { name: "elm/genlist/item_compress/2text.6icon.tb/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.6icon.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5 elm.icon.6";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1720,17 +1676,13 @@
    }
 
 // 2.2.2.18
-   group { name: "elm/genlist/item/2text.2icon.4/default";
-      alias: "elm/genlist/item_odd/2text.2icon.4/default";
-      alias: "elm/genlist/item_compress/2text.2icon.4/default";
-      alias: "elm/genlist/item_compress_odd/2text.2icon.4/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.2icon.4/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1756,15 +1708,13 @@
 
 
 // 2.2.2.18 (textblock)
-   group { name: "elm/genlist/item/2text.2icon.4.tb/default";
-      alias: "elm/genlist/item_compress/2text.2icon.4.tb/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.2icon.4.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1789,17 +1739,13 @@
    }
 
 // 2.2.2.19
-   group { name: "elm/genlist/item/2text.2icon.6/default";
-      alias: "elm/genlist/item_odd/2text.2icon.6/default";
-      alias: "elm/genlist/item_compress/2text.2icon.6/default";
-      alias: "elm/genlist/item_compress_odd/2text.2icon.6/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.2icon.6/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1825,14 +1771,13 @@
    }
 
 // 2.2.2.19 (textblock)
-   group { name: "elm/genlist/item_compress/2text.2icon.6.tb/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.2icon.6.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1859,17 +1804,13 @@
    }
 
 // 2.2.2.20
-   group { name: "elm/genlist/item/2text.2icon.8/default";
-      alias: "elm/genlist/item_odd/2text.2icon.8/default";
-      alias: "elm/genlist/item_compress/2text.2icon.8/default";
-      alias: "elm/genlist/item_compress_odd/2text.2icon.8/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.2icon.8/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1894,17 +1835,13 @@
    }
 
 // 2.2.2.20 (textblock)
-   group { name: "elm/genlist/item/2text.2icon.8.tb/default";
-      alias: "elm/genlist/item_odd/2text.2icon.8.tb/default";
-      alias: "elm/genlist/item_compress/2text.2icon.8.tb/default";
-      alias: "elm/genlist/item_compress_odd/2text.2icon.8.tb/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.2icon.8.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1929,22 +1866,19 @@
    }
 
 // 2.2.2.21
-   group { name: "elm/genlist/item/2text.2icon.progress/default";
-      alias: "elm/genlist/item_odd/2text.2icon.progress/default";
-      alias: "elm/genlist/item_compress/2text.2icon.progress/default";
-      alias: "elm/genlist/item_compress_odd/2text.2icon.progress/default";
+   group { GENLIST_NAME("2text.2icon.progress/default")
       // FIXME: deprecated name, will be removed
       alias: "elm/genlist/item/1text.2icon.5/default";
       alias: "elm/genlist/item_odd/1text.2icon.5/default";
       alias: "elm/genlist/item_compress/1text.2icon.5/default";
       alias: "elm/genlist/item_compress_odd/1text.2icon.5/default";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.swallow.progress ";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -1975,22 +1909,19 @@
    }
 
 // 2.2.2.22
-   group { name: "elm/genlist/item/3text.3icon.progress/default";
-      alias: "elm/genlist/item_odd/3text.3icon.progress/default";
-      alias: "elm/genlist/item_compress/3text.3icon.progress/default";
-      alias: "elm/genlist/item_compress_odd/3text.3icon.progress/default";
+   group { GENLIST_NAME("3text.3icon.progress/default")
       // FIXME: deprecated name, will be removed
       alias: "elm/genlist/item/3text.3icon/default";
       alias: "elm/genlist/item_odd/3text.3icon/default";
       alias: "elm/genlist/item_compress/3text.3icon/default";
       alias: "elm/genlist/item_compress_odd/3text.3icon/default";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.swallow.progress";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -2004,7 +1935,8 @@
             GENLIST_DESCRIPTION_LRT("elm.padding.icon1.right", "elm.padding.icon2.left",
                "elm.padding.top",
                min: 0 50;
-               GENLIST_PARAM_LISTITEM fixed: 1 1;
+               GENLIST_PARAM_PROGRESS_MAIN
+               fixed: 0 1;
             )
          )
          GENLIST_PART_ICON("elm.swallow.progress",
@@ -2040,17 +1972,13 @@
    }
 
 // 2.2.2.23
-   group { name: "elm/genlist/item/2text.1icon.divider/default";
-      alias: "elm/genlist/item_odd/2text.1icon.divider/default";
-      alias: "elm/genlist/item_compress/2text.1icon.divider/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.divider/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.1icon.divider/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -2075,17 +2003,13 @@
    }
 
 // 2.2.2.30
-   group { name: "elm/genlist/item/2text.3icon/default";
-      alias: "elm/genlist/item_odd/2text.3icon/default";
-      alias: "elm/genlist/item_compress/2text.3icon/default";
-      alias: "elm/genlist/item_compress_odd/2text.3icon/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.3icon/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -2113,7 +2037,7 @@
          // Virtual part for Maxmimum right X axis of TEXT
          GENLIST_PART_SPACER("elm.text.limit",
             GENLIST_DESCRIPTION_R("elm.padding.icon1.left",
-               min: (GENLIST_ICON_THUMBNAIL1_SIZE+GENLIST_PADDING_SIZE_DEFAULT) 0;
+               min: (GENLIST_ICON_LARGE_SIZE+GENLIST_PADDING_SIZE_DEFAULT) 0;
             )
          )
          GENLIST_PART_PADDING_R("elm.padding.icon1.left", "elm.icon.1")
@@ -2125,24 +2049,42 @@
    }
 
 // 2.2.2.31
-   group { name: "elm/genlist/item/2text.1icon.12/default";
-      alias: "elm/genlist/item_odd/2text.1icon.12/default";
-      alias: "elm/genlist/item_compress/2text.1icon.12/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.12/default";
-
+   group { GENLIST_NAME("2text.1icon.12/default")
       inherit: "elm/genlist/item/2text.1icon.2/default";
       parts {
          GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon", "elm.padding.right")
       }
    }
 
+// 2.2.2.31.1 (circle)
+   group { GENLIST_NAME("2text.1icon.12.thumb.circle/default")
+      inherit: "elm/genlist/item/2text.1icon.12/default";
+
+      GENLIST_INHERIT_THUMB_CIRCLE_LARGE("elm.icon")
+      GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
+         target: "elm.icon"; target: "elm.thumb"; )
+   }
+
+// 2.2.2.31.1 (square)
+   group { GENLIST_NAME("2text.1icon.12.thumb.square/default")
+      inherit: "elm/genlist/item/2text.1icon.12/default";
+
+      GENLIST_INHERIT_THUMB_SQUARE_LARGE("elm.icon")
+      GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2";
+         target: "elm.icon"; target: "elm.thumb"; )
+   }
+
+// 2.2.2.32
+   group { GENLIST_NAME("2text.1icon.12.tb/default")
+      inherit: "elm/genlist/item/2text.1icon.2.tb/default";
+      parts {
+         GENLIST_PART_ICON_THUMBNAIL1_R("elm.icon", "elm.padding.right")
+      }
+   }
+
 // 2.2.2.32
 // 2.2.2.36
-   group { name: "elm/genlist/item/2text.1icon.9/default";
-      alias: "elm/genlist/item_odd/2text.1icon.9/default";
-      alias: "elm/genlist/item_compress/2text.1icon.9/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.9/default";
-
+   group { GENLIST_NAME("2text.1icon.9/default")
       inherit:"elm/genlist/item/2text.1icon.4/default";
       parts {
          GENLIST_PART_ICON_CHECK_RADIO_L("elm.icon", "elm.padding.left")
@@ -2150,10 +2092,7 @@
    }
 
 // 2.2.2.33
-   group { name: "elm/genlist/item/2text.2icon.7/default";
-      alias: "elm/genlist/item_odd/2text.2icon.7/default";
-      alias: "elm/genlist/item_compress/2text.2icon.7/default";
-      alias: "elm/genlist/item_compress_odd/2text.2icon.7/default";
+   group { GENLIST_NAME("2text.2icon.7/default")
       inherit: "elm/genlist/item/2text.2icon.4/default";
 
       parts {
@@ -2163,17 +2102,13 @@
 
 // 2.2.2.34
 // 2.2.2.37
-   group { name: "elm/genlist/item/2text.2icon.5/default";
-      alias: "elm/genlist/item_odd/2text.2icon.5/default";
-      alias: "elm/genlist/item_compress/2text.2icon.5/default";
-      alias: "elm/genlist/item_compress_odd/2text.2icon.5/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.2icon.5/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -2197,17 +2132,13 @@
    }
 
 // 2.2.2.35
-   group { name: "elm/genlist/item/2text.3icon.4/default";
-      alias: "elm/genlist/item_odd/2text.3icon.4/default";
-      alias: "elm/genlist/item_compress/2text.3icon.4/default";
-      alias: "elm/genlist/item_compress_odd/2text.3icon.4/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.3icon.4/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -2234,12 +2165,8 @@
 
 
 // 2.2.2.38
-   group { name: "elm/genlist/item/4text.1icon.1/default";
-      alias: "elm/genlist/item_odd/4text.1icon.1/default";
-      alias: "elm/genlist/item_compress/4text.1icon.1/default";
-      alias: "elm/genlist/item_compress_odd/4text.1icon.1/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("4text.1icon.1/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4";
       data.item: "contents" "elm.icon.1";
 
@@ -2247,7 +2174,7 @@
          image: "00_list_bubble_bg.png" COMP;
       }
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -2279,12 +2206,8 @@
    }
 
 // 2.2.2.38 textblock
-      group { name: "elm/genlist/item/4text.1icon.1.tb/default";
-      alias: "elm/genlist/item_odd/4text.1icon.1.tb/default";
-      alias: "elm/genlist/item_compress/4text.1icon.1.tb/default";
-      alias: "elm/genlist/item_compress_odd/4text.1icon.1.tb/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+      group { GENLIST_NAME("4text.1icon.1.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4";
       data.item: "contents" "elm.icon.1";
 
@@ -2293,7 +2216,7 @@
       }
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -2328,17 +2251,13 @@
    }
 
 // 2.2.2.39
-   group { name: "elm/genlist/item/4text.1icon.2/default";
-      alias: "elm/genlist/item_odd/4text.1icon.2/default";
-      alias: "elm/genlist/item_compress/4text.1icon.2/default";
-      alias: "elm/genlist/item_compress_odd/4text.1icon.2/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("4text.1icon.2/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4";
       data.item: "contents" "elm.icon.1 ";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -2368,17 +2287,13 @@
          target: "elm.icon.1";)
    }
 // 2.2.2.39 (TEXTBLOCK)
-   group { name: "elm/genlist/item/4text.1icon.2.tb/default";
-      alias: "elm/genlist/item_odd/4text.1icon.2.tb/default";
-      alias: "elm/genlist/item_compress/4text.1icon.2.tb/default";
-      alias: "elm/genlist/item_compress_odd/4text.1icon.2.tb/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("4text.1icon.2.tb/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4";
       data.item: "contents" "elm.icon.1";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -2409,19 +2324,15 @@
    }
 
 // 2.2.2.40
-   group { name: "elm/genlist/item/4text.1/default";
-      alias: "elm/genlist/item_odd/4text.1/default";
-      alias: "elm/genlist/item_compress/4text.1/default";
-      alias: "elm/genlist/item_compress_odd/4text.1/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("4text.1/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4";
 
       images {
          image: "00_list_bubble_bg.png" COMP;
       }
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -2449,10 +2360,7 @@
    }
 
 // 2.2.2.41
-   group { name: "elm/genlist/item/4text.2/default";
-      alias: "elm/genlist/item_odd/4text.2/default";
-      alias: "elm/genlist/item_compress/4text.2/default";
-      alias: "elm/genlist/item_compress_odd/4text.2/default";
+   group { GENLIST_NAME("4text.2/default")
       inherit: "elm/genlist/item/4text.1/default";
       parts {
          part { name: "elm.bubble";
@@ -2466,17 +2374,13 @@
    }
 
 // 2.2.2.42
-   group { name: "elm/genlist/item/3text.1icon.3/default";
-      alias: "elm/genlist/item_odd/3text.1icon.3/default";
-      alias: "elm/genlist/item_compress/3text.1icon.3/default";
-      alias: "elm/genlist/item_compress_odd/3text.1icon.3/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("3text.1icon.3/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
       data.item: "contents" "elm.icon.1";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -2500,19 +2404,49 @@
          target: "elm.icon.1";)
    }
 
+// 2.2.2.42
+   group { GENLIST_NAME("3text.1icon.3.tb/default")
+      GENLIST_PROLOG_NORMAL
+      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
+      data.item: "contents" "elm.icon.1";
+
+      parts {
+         GENLIST_PART_BG_NORMAL
+         GENLIST_PART_BASE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT
+         GENLIST_PART_PADDING_RIGHT
+         GENLIST_PART_PADDING_TOP_2LINE
+         GENLIST_PART_PADDING_BOTTOM_2LINE
+
+         GENLIST_PART_LISTITEM_LRT_TB("elm.text.1", GENLIST_HEIGHT_2LINE_MAIN,
+            "elm.padding.left", "elm.padding.icon1.left",
+            "elm.padding.top",
+         )
+         GENLIST_PART_PADDING_R("elm.padding.icon1.left", "elm.icon.1")
+         GENLIST_PART_ICON_SMALL_RTB("elm.icon.1",
+            "elm.padding.right", "elm.padding.top", "elm.text.3"
+         )
+         GENLIST_PART_SUBITEM_TB_("elm.text.3", GENLIST_HEIGHT_2LINE_SUB,
+            "elm.padding.left", "elm.text.2", "elm.text.1", "elm.padding.bottom"
+         )
+         GENLIST_PART_SUBITEM_RTB_TB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB,
+            "elm.padding.right", "elm.text.1", "elm.padding.bottom")
+         GENLIST_PART_FLIP
+      }
+      GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
+         target: "elm.icon.1";)
+   }
 
-// 2.2.2.43
-   group { name: "elm/genlist/item/2text.4icon.1/default";
-      alias: "elm/genlist/item_odd/2text.4icon.1/default";
-      alias: "elm/genlist/item_compress/2text.4icon.1/default";
-      alias: "elm/genlist/item_compress_odd/2text.4icon.1/default";
 
-      GENLIST_DATA_ITEM_NORMAL
+// 2.2.2.43
+   group { GENLIST_NAME("2text.4icon.1/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -2545,12 +2479,8 @@
    }
 
 // 2.2.2.44
-   group { name: "elm/genlist/item/4text.1icon.3/default";
-      alias: "elm/genlist/item_odd/4text.1icon.3/default";
-      alias: "elm/genlist/item_compress/4text.1icon.3/default";
-      alias: "elm/genlist/item_compress_odd/4text.1icon.3/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("4text.1icon.3/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4";
       data.item: "contents" "elm.swallow.colorbar elm.icon.1";
 
@@ -2558,7 +2488,7 @@
          image: "00_list_bubble_bg.png" COMP;
       }
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP_2LINE
@@ -2571,19 +2501,21 @@
          GENLIST_PART_PADDING_L("elm.padding.icon1.right", "elm.icon.1")
 
 
-         GENLIST_PART_LISTITEM_("elm.text.1", GENLIST_HEIGHT_2LINE_MAIN,
-            "elm.padding.icon1.right", "elm.padding.bubble.left",
-            "elm.padding.top", "elm.text.3",
+         GENLIST_PART_LISTITEM_LRT("elm.text.1", GENLIST_HEIGHT_2LINE_MAIN,
+            "elm.padding.icon1.right", "elm.padding.bubble.left", "elm.padding.top",
          )
          GENLIST_PART_PADDING_R("elm.padding.bubble.left", "elm.bubble")
          GENLIST_PART_LIST_BUBBLE_TEXT_RTB("elm.text.4", GENLIST_HEIGHT_2LINE_MAIN,
-            "elm.padding.right", "elm.padding.top", "elm.text.3")
+            "elm.padding.right", "elm.padding.top", "elm.text.3"
+         )
 
-         GENLIST_PART_SUBITEM_LRB("elm.text.3", GENLIST_HEIGHT_2LINE_SUB,
-            "elm.padding.icon1.right", "elm.padding.text2.left", "elm.padding.bottom")
+         GENLIST_PART_SUBITEM_("elm.text.3", GENLIST_HEIGHT_2LINE_SUB,
+            "elm.padding.icon1.right", "elm.padding.text2.left", "elm.text.1", "elm.padding.bottom",
+         )
          GENLIST_PART_PADDING_R("elm.padding.text2.left", "elm.text.2")
          GENLIST_PART_SUBITEM_RTB("elm.text.2", GENLIST_HEIGHT_2LINE_SUB,
-            "elm.padding.right", "elm.text.1", "elm.padding.bottom")
+            "elm.padding.right", "elm.text.1", "elm.padding.bottom"
+         )
          GENLIST_PART_FLIP
       }
       GENLIST_PROGRAMS_NORMAL( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4";
@@ -2591,17 +2523,13 @@
    }
 
 // 2.2.2.45
-   group { name: "elm/genlist/item/3text.1icon.1/default";
-      alias: "elm/genlist/item_odd/3text.1icon.1/default";
-      alias: "elm/genlist/item_compress/3text.1icon.1/default";
-      alias: "elm/genlist/item_compress_odd/3text.1icon.1/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("3text.1icon.1/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -2625,17 +2553,13 @@
    }
 
 // 2.2.2.46
-   group { name: "elm/genlist/item/2text.2icon.1/default";
-      alias: "elm/genlist/item_odd/2text.2icon.1/default";
-      alias: "elm/genlist/item_compress/2text.2icon.1/default";
-      alias: "elm/genlist/item_compress_odd/2text.2icon.1/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("2text.2icon.1/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -2660,10 +2584,7 @@
    }
 
 // 2.2.2.47
-   group { name: "elm/genlist/item/2text.1icon.1/default";
-      alias: "elm/genlist/item_odd/2text.1icon.1/default";
-      alias: "elm/genlist/item_compress/2text.1icon.1/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.1/default";
+   group { GENLIST_NAME("2text.1icon.1/default")
       inherit: "elm/genlist/item/2text.1icon.2/default";
 
       parts {
@@ -2671,505 +2592,13 @@
       }
    }
 
-// -------------------------------------------------------------------
-// Email Style -------------------------------------------------------
-// -------------------------------------------------------------------
-
-#define GENLIST_EMAIL_MAIN_TEXT_SIZE                        40
-#define GENLIST_EMAIL_MAIN_TEXT_UNREAD_COLOR_STYLE          "#000000FF"
-#define GENLIST_EMAIL_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE      "#00000066"
-#define GENLIST_EMAIL_MAIN_TEXT_READ_COLOR_STYLE            "#808080FF"
-#define GENLIST_EMAIL_TEXT_FOCUS_COLOR                      255 255 255 255
-#define GENLIST_EMAIL_TEXT_FOCUS_COLOR_STYLE                "#FFFFFFFF"
-
-#define GENLIST_EMAIL_SUB_TEXT_SIZE                         32
-#define GENLIST_EMAIL_SUB_TEXT_COLOR_STYLE                  "#808080FF"
-
-#define GENLIST_EMAIL_COUNT_TEXT_SIZE                       28
-#define GENLIST_EMAIL_COUNT_TEXT_UNREAD_COLOR               59 115 182 255
-#define GENLIST_EMAIL_COUNT_TEXT_UNREAD_COLOR_STYLE         "#3B73B6FF"
-#define GENLIST_EMAIL_COUNT_TEXT_READ_COLOR                 128 128 128 255
-#define GENLIST_EMAIL_COUNT_TEXT_READ_COLOR_STYLE           "#808080FF"
-
-#define GENLIST_EMAIL_CONTENTS_TEXT_SIZE                    28
-#define GENLIST_EMAIL_CONTENTS_TEXT_COLOR_STYLE             "#808080FF"
-
-#define STYLE_TAG \
-      tag:  "br" "\n";\
-      tag:  "ps" "ps";\
-      tag:  "tab" "\t";\
-      tag:  "b" "+ font=Tizen:style=Bold";
-
-#define STYLE_TAG_MATCH \
-      tag:  "match" GENLIST_PART_MATCH_TAG_COLOR;
-
-#define STYLE_TAG_MATCH_EMAIL_FOCUS \
-      tag:  "match" GENLIST_EMAIL_TEXT_FOCUS_COLOR_STYLE;
-
-
-   styles {
-      style { name: "email_style_main";
-         base: "font=Tizen:style=Regular font_size="GENLIST_EMAIL_MAIN_TEXT_SIZE" color="GENLIST_EMAIL_MAIN_TEXT_UNREAD_COLOR_STYLE" text_class=list_item ellipsis=1.0";
-         STYLE_TAG
-         STYLE_TAG_MATCH
-      }
-      style { name: "email_style_main_dim";
-         base: "font=Tizen:style=Regular font_size="GENLIST_EMAIL_MAIN_TEXT_SIZE" color="GENLIST_EMAIL_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE" text_class=list_item ellipsis=1.0";
-         STYLE_TAG
-         STYLE_TAG_MATCH
-      }
-      style { name: "email_style_main_read";
-         base: "font=Tizen:style=Regular font_size="GENLIST_EMAIL_MAIN_TEXT_SIZE" color="GENLIST_EMAIL_MAIN_TEXT_READ_COLOR_STYLE" text_class=list_item ellipsis=1.0";
-         STYLE_TAG
-         STYLE_TAG_MATCH
-      }
-      style { name: "email_style_main_read_dim";
-         base: "font=Tizen:style=Regular font_size="GENLIST_EMAIL_MAIN_TEXT_SIZE" color="GENLIST_EMAIL_MAIN_TEXT_UNREAD_DIM_COLOR_STYLE" text_class=list_item ellipsis=1.0";
-         STYLE_TAG
-         STYLE_TAG_MATCH
-      }
-      style { name: "email_style_main_focus";
-         base: "font=Tizen:style=Regular font_size="GENLIST_EMAIL_MAIN_TEXT_SIZE" color="GENLIST_EMAIL_TEXT_FOCUS_COLOR_STYLE" text_class=list_item ellipsis=1.0";
-         STYLE_TAG
-         STYLE_TAG_MATCH_EMAIL_FOCUS
-      }
-      style { name: "email_style_sub";
-         base: "font=Tizen:style=Bold font_size="GENLIST_EMAIL_SUB_TEXT_SIZE" color="GENLIST_EMAIL_SUB_TEXT_COLOR_STYLE" text_class=tizen ellipsis=1.0";
-         STYLE_TAG
-         STYLE_TAG_MATCH
-      }
-      style { name: "email_style_sub_focus";
-         base: "font=Tizen:style=Regular font_size="GENLIST_EMAIL_SUB_TEXT_SIZE" color="GENLIST_EMAIL_TEXT_FOCUS_COLOR_STYLE" text_class=tizen ellipsis=1.0";
-         STYLE_TAG
-         STYLE_TAG_MATCH_EMAIL_FOCUS
-      }
-      style { name: "email_style_contents";
-         base: "font=Tizen:style=Medium font_size="GENLIST_EMAIL_CONTENTS_TEXT_SIZE" color="GENLIST_EMAIL_CONTENTS_TEXT_COLOR_STYLE" text_class=tizen ellipsis=1.0";
-         STYLE_TAG
-         STYLE_TAG_MATCH
-      }
-   }
-
-// email main text
-#define PARAM_EMAIL_MAIN \
-   text { \
-      align: 0 0.5; \
-      min: 0 1; \
-      style: "email_style_main"; \
-   }
-
-#define DESCRIPTION_EMAIL_MAIN_OTHERS \
-   description { state: "disabled" 0.0; \
-      inherit: "default" 0.0; \
-      text.style: "email_style_main_dim"; \
-   } \
-   description { state: "read" 0.0; \
-      inherit: "default" 0.0; \
-      text.style: "email_style_main_read"; \
-   } \
-   description { state: "read,disabled" 0.0; \
-      inherit: "default" 0.0; \
-      text.style: "email_style_main_read_dim"; \
-   } \
-   description { state: "selected" 0.0; \
-      inherit: "default" 0.0; \
-      text.style: "email_style_main_focus"; \
-   }
-
-// email sub text
-#define PARAM_EMAIL_SUB \
-   text { \
-      align: 0 0.5; \
-      min: 0 1; \
-      style: "email_style_sub"; \
-   }
-
-#define DESCRIPTION_EMAIL_SUB_OTHERS \
-   description { state: "selected" 0.0; \
-      inherit: "default" 0.0; \
-      text.style: "email_style_sub_focus"; \
-   }
-
-// email contents text
-#define PARAM_EMAIL_COUNT \
-   color: GENLIST_EMAIL_COUNT_TEXT_UNREAD_COLOR; \
-   text { \
-      align: 0 0.5; \
-      min: 0 1; \
-      font: "Tizen:style=Medium"; \
-      size: GENLIST_EMAIL_COUNT_TEXT_SIZE; \
-      text_class: "tizen"; \
-   }
-
-#define DESCRIPTION_EMAIL_COUNT_OTHERS \
-   description { state: "read" 0.0; \
-      inherit: "default" 0.0; \
-      color: GENLIST_EMAIL_COUNT_TEXT_READ_COLOR; \
-   } \
-   description { state: "selected" 0.0; \
-      inherit: "default" 0.0; \
-      color: GENLIST_EMAIL_TEXT_FOCUS_COLOR; \
-   }
-
-// email contents text
-#define PARAM_EMAIL_CONTENTS \
-   text { \
-      align: 0 0.5; \
-      min: 0 1; \
-      font: "Tizen:style=Medium"; \
-      style: "email_style_contents"; \
-   }
-
-#define HEIGHT_EMAIL_MAIN         54
-#define HEIGHT_EMAIL_SUB          42
-#define HEIGHT_EMAIL_CONTENTS      38
-
-// 2.2.3.5 (Email Style)
-   group { name: "elm/genlist/item/email.list/default";
-      alias: "elm/genlist/item_odd/email.list/default";
-      alias: "elm/genlist/item_compress/email.list/default";
-      alias: "elm/genlist/item_compress_odd/email.list/default";
-      alias: "elm/genlist/tree/email.list/default";
-      alias: "elm/genlist/tree_odd/email.list/default";
-      alias: "elm/genlist/tree_compress/email.list/default";
-      alias: "elm/genlist/tree_compress_odd/email.list/default";
-
-      GENLIST_DATA_ITEM_NORMAL
-      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4";
-      data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.4.touch";
-
-      parts {
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BASE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT
-         GENLIST_PART_PADDING_RIGHT
-         GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_SIZE_TOP_3LINE )
-         GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_SIZE_BOTTOM_3LINE )
-         GENLIST_PART_COLORBAR
-
-         GENLIST_PART_ICON_CHECK_RADIO_L("elm.icon.1", "elm.padding.left")
-         GENLIST_PART_PADDING_L("elm.padding.icon1.right", "elm.icon.1")
-
-         GENLIST_PART_TEXTBLOCK("elm.text.1",
-            GENLIST_DESCRIPTION_LRT("elm.padding.icon1.right", "elm.text.limit", "elm.padding.top",
-               PARAM_EMAIL_MAIN
-               min: 0 HEIGHT_EMAIL_MAIN;
-               fixed: 1 1; align: 0 0; text.max: 1 0;  // This limits text growing.
-            )
-            DESCRIPTION_EMAIL_MAIN_OTHERS
-         )
-         // FIXME: because script cannot be inherited, text.5 is defined here and can be inherited
-         GENLIST_PART_TEXT("elm.text.5",
-            GENLIST_DESCRIPTION_LT("elm.text.1", "elm.padding.top",
-               visible: 0;
-            )
-         )
-         // Virtual part for Maxmimum right X axis of TEXT
-         GENLIST_PART_SPACER("elm.text.limit",
-            GENLIST_DESCRIPTION_R("elm.icon.3",
-               min: 0 0;
-               max: 0 0;
-            )
-         )
-         GENLIST_PART_ICON("elm.icon.3",
-            GENLIST_DESCRIPTION_RTB("elm.padding.icon4.left", "elm.padding.top", "elm.text.3",)
-         )
-         GENLIST_PART_PADDING_R("elm.padding.icon4.left", "elm.icon.4")
-         GENLIST_PART_ICON("elm.icon.4",
-            GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top", "elm.text.3",
-               min: 38 38;
-               max: HEIGHT_EMAIL_MAIN HEIGHT_EMAIL_MAIN;
-               fixed: 1 1;
-            )
-         )
-         GENLIST_PART_ICON("elm.icon.4.touch",
-            GENLIST_DESCRIPTION_ENVELOP("elm.icon.4",
-               rel1.offset: -10 -17;
-               rel2.offset: 26 10;
-               fixed: 1 1;
-            )
-         )
-         GENLIST_PART_ICON("elm.icon.2",
-            GENLIST_DESCRIPTION_LT("elm.padding.icon1.right", "elm.text.1", )
-         )
-         GENLIST_PART_TEXTBLOCK("elm.text.3",
-            GENLIST_DESCRIPTION_LRT("elm.icon.2", "elm.text.4", "elm.text.1",
-               PARAM_EMAIL_SUB
-               min: 0 HEIGHT_EMAIL_SUB;
-               fixed: 0 1;
-            )
-            DESCRIPTION_EMAIL_SUB_OTHERS
-         )
-         GENLIST_PART_TEXTBLOCK("elm.text.4",
-            GENLIST_DESCRIPTION_RT("elm.padding.right", "elm.text.1",
-               PARAM_EMAIL_CONTENTS
-               GENLIST_PARAM_TEXT_LIMIT_RT
-               min: 0 HEIGHT_EMAIL_CONTENTS;
-               fixed: 0 1;
-            )
-         )
-         GENLIST_PART_TEXTBLOCK("elm.text.2",
-            GENLIST_DESCRIPTION("elm.padding.icon1.right", "elm.padding.right", "elm.text.3", "elm.padding.bottom",
-               PARAM_EMAIL_CONTENTS
-               min: 0 HEIGHT_EMAIL_CONTENTS;
-            )
-         )
-         GENLIST_PART_FLIP
-      }
-      GENLIST_PROGRAMS_READ_TEXT1( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
-         target: "elm.text.4"; target: "elm.text.5";
-         target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3";
-         target: "elm.icon.4";
-      )
-   }
-
-// email list with conversation text
-   group { name: "elm/genlist/item/email.list.conversation/default";
-      alias: "elm/genlist/item_odd/email.list.conversation/default";
-      alias: "elm/genlist/item_compress/email.list.conversation/default";
-      alias: "elm/genlist/item_compress_odd/email.list.conversation/default";
-      alias: "elm/genlist/tree/email.list.conversation/default";
-      alias: "elm/genlist/tree_odd/email.list.conversation/default";
-      alias: "elm/genlist/tree_compress/email.list.conversation/default";
-      alias: "elm/genlist/tree_compress_odd/email.list.conversation/default";
-      inherit: "elm/genlist/item/email.list/default";
-
-      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4 elm.text.5";
-      parts {
-         GENLIST_PART_TEXT("elm.text.5",
-            GENLIST_DESCRIPTION_LT("elm.text.1", "elm.padding.top",
-               PARAM_EMAIL_COUNT
-               min: 45 HEIGHT_EMAIL_MAIN;
-               max: 45 HEIGHT_EMAIL_MAIN;
-               text.min: 1 0;
-               text.align: 0.5 0.65;
-               fixed: 1 1;
-               visible: 1;
-            )
-            DESCRIPTION_EMAIL_COUNT_OTHERS
-         )
-         // Virtual part for Maxmimum right X axis of TEXT
-         GENLIST_PART_SPACER("elm.text.limit",
-            GENLIST_DESCRIPTION_RTB("elm.icon.3", "elm.padding.top", "elm.text.2",
-               min: 45 HEIGHT_EMAIL_MAIN;
-               max: 45 HEIGHT_EMAIL_MAIN;
-            )
-         )
-      }
-   }
-
-   // 2.2.3.13
-   // email outbox style
-   group { name: "elm/genlist/item/email.outbox/default";
-      alias: "elm/genlist/item_odd/email.outbox/default";
-      alias: "elm/genlist/item_compress/email.outbox/default";
-      alias: "elm/genlist/item_compress_odd/email.outbox/default";
-      alias: "elm/genlist/tree/email.outbox/default";
-      alias: "elm/genlist/tree_odd/email.outbox/default";
-      alias: "elm/genlist/tree_compress/email.outbox/default";
-      alias: "elm/genlist/tree_compress_odd/email.outbox/default";
-
-      GENLIST_DATA_ITEM_NORMAL
-      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
-      data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.4.touch elm.icon.5";
-
-      parts {
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BASE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT
-         GENLIST_PART_PADDING_RIGHT_EDIT
-         GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_SIZE_TOP_3LINE )
-         GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_SIZE_BOTTOM_3LINE )
-         GENLIST_PART_COLORBAR
-
-         GENLIST_PART_ICON_CHECK_RADIO_L("elm.icon.1", "elm.padding.left")
-         GENLIST_PART_PADDING_L("elm.padding.icon1.right", "elm.icon.1")
-
-         GENLIST_PART_TEXTBLOCK("elm.text.1",
-            GENLIST_DESCRIPTION_LRT("elm.padding.icon1.right", "elm.text.limit", "elm.padding.top",
-               PARAM_EMAIL_MAIN
-               min: 0 HEIGHT_EMAIL_MAIN;
-               fixed: 1 1; align: 0 0; text.max: 1 0;  // This limits text growing.
-            )
-            DESCRIPTION_EMAIL_MAIN_OTHERS
-         )
-         // FIXME: because script cannot be inherited, text.5 is defined here and can be inherited
-         GENLIST_PART_TEXT("elm.text.4",
-            GENLIST_DESCRIPTION_LTB("elm.text.1", "elm.padding.top", "elm.icon.5",
-               visible: 0;
-            )
-         )
-         // Virtual part for Maxmimum right X axis of TEXT
-         GENLIST_PART_SPACER("elm.text.limit",
-            GENLIST_DESCRIPTION_RTB("elm.icon.3", "elm.padding.top", "elm.text.2",
-               min: 0 0;
-               max: 0 0;
-            )
-         )
-         GENLIST_PART_ICON("elm.icon.3",
-            GENLIST_DESCRIPTION_RTB("elm.padding.icon4.left", "elm.padding.top", "elm.text.3",
-            )
-         )
-         GENLIST_PART_PADDING_R("elm.padding.icon4.left", "elm.icon.4")
-         GENLIST_PART_ICON("elm.icon.4",
-            GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top", "elm.text.3",
-               min: 38 38;
-               max: HEIGHT_EMAIL_MAIN HEIGHT_EMAIL_MAIN;
-               fixed: 1 1;
-            )
-         )
-         GENLIST_PART_ICON("elm.icon.4.touch",
-            GENLIST_DESCRIPTION_ENVELOP("elm.icon.4",
-               rel1.offset: -10 -17;
-               rel2.offset: 26 10;
-               fixed: 1 1;
-            )
-         )
-
-         GENLIST_PART_ICON("elm.icon.2",
-            GENLIST_DESCRIPTION_LT("elm.padding.icon1.right", "elm.text.1",
-               fixed: 1 1;
-            )
-         )
-         GENLIST_PART_TEXTBLOCK("elm.text.3",
-            GENLIST_DESCRIPTION_LRT("elm.icon.2", "elm.padding.icon5.left", "elm.text.1",
-               PARAM_EMAIL_SUB
-               min: 0 HEIGHT_EMAIL_SUB;
-               fixed: 0 1;
-            )
-            DESCRIPTION_EMAIL_SUB_OTHERS
-         )
-         GENLIST_PART_TEXTBLOCK("elm.text.2",
-            GENLIST_DESCRIPTION("elm.padding.icon1.right", "elm.padding.icon5.left", "elm.text.3", "elm.padding.bottom",
-               PARAM_EMAIL_CONTENTS
-               min: 0 HEIGHT_EMAIL_CONTENTS;
-            )
-         )
-         GENLIST_PART_PADDING_R("elm.padding.icon5.left", "elm.icon.5")
-         GENLIST_PART_ICON("elm.icon.5",
-            GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.text.1", "elm.padding.bottom",
-               min: 180 74;
-               max: 180 74;
-               fixed: 1 1;
-            )
-         )
-         GENLIST_PART_FLIP
-      }
-      GENLIST_PROGRAMS_READ_TEXT1( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
-         target: "elm.text.4";
-         target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3";
-         target: "elm.icon.4"; target: "elm.icon.5";
-      )
-   }
-
-// email outbox style with conversation
-   group { name: "elm/genlist/item/email.outbox.conversation/default";
-      alias: "elm/genlist/item_odd/email.outbox.conversation/default";
-      alias: "elm/genlist/item_compress/email.outbox.conversation/default";
-      alias: "elm/genlist/item_compress_odd/email.outbox.conversation/default";
-      alias: "elm/genlist/tree/email.outbox.conversation/default";
-      alias: "elm/genlist/tree_odd/email.outbox.conversation/default";
-      alias: "elm/genlist/tree_compress/email.outbox.conversation/default";
-      alias: "elm/genlist/tree_compress_odd/email.outbox.conversation/default";
-      inherit: "elm/genlist/item/email.outbox/default";
-
-      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4";
-
-      parts {
-         GENLIST_PART_TEXT("elm.text.4",
-            GENLIST_DESCRIPTION_LTB("elm.text.1", "elm.padding.top", "elm.icon.5",
-               PARAM_EMAIL_COUNT
-               min: 45 HEIGHT_EMAIL_MAIN;
-               max: 45 HEIGHT_EMAIL_MAIN;
-               text.min: 1 0;
-               text.align: 0.5 0.65;
-               fixed: 1 1;
-               visible: 1;
-            )
-            DESCRIPTION_EMAIL_COUNT_OTHERS
-         )
-         GENLIST_PART_SPACER("elm.text.limit",
-            GENLIST_DESCRIPTION_RTB("elm.icon.3", "elm.padding.top", "elm.text.2",
-               min: 45 HEIGHT_EMAIL_MAIN;
-               max: 45 HEIGHT_EMAIL_MAIN;
-               fixed: 1 1;
-            )
-         )
-      }
-   }
-
-// Reomve this later
-   group { name: "elm/genlist/item/3text.5icon/default";
-      alias: "elm/genlist/item_odd/3text.5icon/default";
-      alias: "elm/genlist/item_compress/3text.5icon/default";
-      alias: "elm/genlist/item_compress_odd/3text.5icon/default";
-      // FIXME: deprecated name, will be removed
-      alias: "elm/genlist/item/3text.4icon.2/default";
-      alias: "elm/genlist/item_odd/3text.4icon.2/default";
-      alias: "elm/genlist/item_compress/3text.4icon.2/default";
-      alias: "elm/genlist/item_compress_odd/3text.4icon.2/default";
-
-      GENLIST_DATA_ITEM_NORMAL
-      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
-      data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4";
-
-      parts {
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BASE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT
-         GENLIST_PART_PADDING_RIGHT_EDIT
-         GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_SIZE_TOP_3LINE )
-         GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_SIZE_BOTTOM_3LINE )
-         GENLIST_PART_COLORBAR
-
-         GENLIST_PART_ICON_CHECK_RADIO_L("elm.icon.1", "elm.padding.left")
-         GENLIST_PART_PADDING_L("elm.padding.icon1.right", "elm.icon.1")
-
-         GENLIST_PART_TEXT("elm.text.1",
-            GENLIST_DESCRIPTION_LRT("elm.padding.icon1.right", "elm.padding.icon3.left", "elm.padding.top",
-               GENLIST_PARAM_LISTITEM
-               min: 0 HEIGHT_EMAIL_MAIN; fixed:1 1;)
-            GENLIST_DESCRIPTION_LISTITEM_OTHERS
-         )
-         GENLIST_PART_PADDING_R("elm.padding.icon3.left", "elm.icon.3")
-         GENLIST_PART_ICON_SMALL_RTB("elm.icon.3", "elm.padding.right", "elm.padding.top", "elm.icon.4")
-
-         GENLIST_PART_SUBITEM_("elm.text.2", HEIGHT_EMAIL_SUB,
-            "elm.padding.icon1.right", "elm.padding.icon4.left", "elm.text.1", "elm.text.3",)
-
-         GENLIST_PART_ICON_SMALL_LTB("elm.icon.2", "elm.padding.icon1.right", "elm.text.2", "elm.padding.bottom")
-         GENLIST_PART_PADDING_L("elm.padding.icon2.right", "elm.icon.2")
-         GENLIST_PART_TEXTBLOCK("elm.text.3",
-            GENLIST_DESCRIPTION_LRB("elm.padding.icon2.right", "elm.padding.icon4.left", "elm.padding.bottom",
-               PARAM_EMAIL_CONTENTS
-               min: 0 HEIGHT_EMAIL_CONTENTS; fixed:1 1;)
-         )
-         GENLIST_PART_PADDING_R("elm.padding.icon4.left", "elm.icon.4")
-         GENLIST_PART_ICON("elm.icon.4",
-            GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.text.1", "elm.padding.bottom",
-            min: 0 80; fixed: 1 1;)
-         )
-         GENLIST_PART_FLIP
-      }
-      GENLIST_PROGRAMS_READ_TEXT1( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3";
-         target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2";
-         target: "elm.icon.3"; target: "elm.icon.4"; )
-   }
-
-// 2.2.4.1
-   group { name: "elm/genlist/item/multiline/1title.2text/default";
-      alias: "elm/genlist/item_odd/multiline/1title.2text/default";
-      alias: "elm/genlist/item_compress/multiline/1title.2text/default";
-      alias: "elm/genlist/item_compress_odd/multiline/1title.2text/default";
-
-      GENLIST_DATA_ITEM_NORMAL
-      data.item: "texts" "elm.title elm.text.1 elm.text.2";
+// 2.2.4.1
+   group { GENLIST_NAME("multiline/1title.2text/default")
+      GENLIST_PROLOG_NORMAL
+      data.item: "texts" "elm.title elm.text.1 elm.text.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -3182,7 +2611,8 @@
             GENLIST_DESCRIPTION_L("elm.padding.left",
                GENLIST_PARAM_LISTITEM
                min: 226 0;
-               fixed: 1 0;)
+               fixed: 1 0;
+            )
             GENLIST_DESCRIPTION_LISTITEM_OTHERS
          )
          GENLIST_PART_PADDING_L("elm.padding.title.right", "elm.title")
@@ -3191,14 +2621,16 @@
 
          GENLIST_PART_TEXTBLOCK("elm.text.1",
             GENLIST_DESCRIPTION_LRT("elm.divider.right", "elm.padding.right", "elm.padding.top",
-            GENLIST_PARAM_LISTITEM_TB_WRAP
-            min: 0 90; fixed: 1 1;)
+               GENLIST_PARAM_LISTITEM_TB_WRAP
+               min: 0 90; fixed: 0 1;
+            )
             GENLIST_DESCRIPTION_LISTITEM_OTHERS_TB_WRAP
          )
          GENLIST_PART_TEXTBLOCK("elm.text.2",
             GENLIST_DESCRIPTION("elm.divider.right", "elm.padding.right", "center_line2", "elm.padding.bottom",
-            GENLIST_PARAM_LISTITEM_TB_WRAP
-            min: 0 90; )
+               GENLIST_PARAM_LISTITEM_TB_WRAP
+               min: 0 90;
+            )
             GENLIST_DESCRIPTION_LISTITEM_OTHERS_TB_WRAP
          )
          GENLIST_PART_CENTER_LINE_LT("elm.divider2", "elm.text.1")
@@ -3211,16 +2643,12 @@
    }
 
 // 2.2.4.2
-   group { name: "elm/genlist/item/multiline/1title.1text/default";
-      alias: "elm/genlist/item_odd/multiline/1title.1text/default";
-      alias: "elm/genlist/item_compress/multiline/1title.1text/default";
-      alias: "elm/genlist/item_compress_odd/multiline/1title.1text/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("multiline/1title.1text/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.title elm.text";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -3232,7 +2660,9 @@
          GENLIST_PART_TEXT("elm.title",
             GENLIST_DESCRIPTION_L("elm.padding.left",
                GENLIST_PARAM_LISTITEM
-               min: 226 0; )
+               min: 226 0;
+               fixed: 1 0;
+            )
             GENLIST_DESCRIPTION_LISTITEM_OTHERS
          )
          GENLIST_PART_PADDING_L("elm.padding.title.right", "elm.title")
@@ -3241,28 +2671,26 @@
 
          GENLIST_PART_TEXTBLOCK("elm.text",
             GENLIST_DESCRIPTION("elm.divider.right", "elm.padding.right", "elm.padding.top", "elm.padding.bottom",
-            GENLIST_PARAM_LISTITEM_TB_WRAP
-            min: 0 48; )
+               GENLIST_PARAM_LISTITEM_TB_WRAP
+               //min: 0 48;
+            )
             GENLIST_DESCRIPTION_LISTITEM_OTHERS_TB_WRAP
          )
          GENLIST_PART_FLIP
       }
-      GENLIST_PROGRAMS_NORMAL( target: "elm.title"; target: "elm.text";
+      GENLIST_PROGRAMS_NORMAL( target: "elm.title";
+         target: "elm.text";
          target: "elm.divider1"; target:"elm.divider2";
       )
    }
 
 // 2.2.4.3
-   group { name: "elm/genlist/item/multiline/2text/default";
-      alias: "elm/genlist/item_odd/multiline/2ext/default";
-      alias: "elm/genlist/item_compress/multiline/2text/default";
-      alias: "elm/genlist/item_compress_odd/multiline/2text/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("multiline/2text/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -3273,14 +2701,17 @@
          GENLIST_PART_TEXT("elm.text.1",
             GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.right", "elm.padding.top",
                GENLIST_PARAM_LISTITEM
-               min: 0 GENLIST_HEIGHT_2LINE_MAIN; )
+               min: 0 GENLIST_HEIGHT_2LINE_MAIN;
+               fixed: 0 1;
+            )
             GENLIST_DESCRIPTION_LISTITEM_OTHERS
          )
          GENLIST_PART_PADDING_T_SIZE("elm.padding.text1.bottom", "elm.text.1", 16)
          GENLIST_PART_TEXTBLOCK("elm.text.2",
             GENLIST_DESCRIPTION("elm.padding.left", "elm.padding.right", "elm.padding.text1.bottom", "elm.padding.bottom",
                GENLIST_PARAM_SUBITEM_DEFAULT_TB_WRAP
-               min: 0 GENLIST_HEIGHT_MULTILINE_SUB; )
+               min: 0 GENLIST_HEIGHT_MULTILINE_SUB;
+            )
             GENLIST_DESCRIPTION_SUBITEM_DEFAULT_OTHERS_TB_WRAP
          )
          GENLIST_PART_FLIP
@@ -3289,22 +2720,19 @@
    }
 
 // 2.2.4.4
-   group { name: "elm/genlist/item/multiline/2text.5icon/default";
-      alias: "elm/genlist/item_odd/multiline/2ext.5icon/default";
-      alias: "elm/genlist/item_compress/multiline/2text.5icon/default";
-      alias: "elm/genlist/item_compress_odd/multiline/2text.5icon/default";
+   group { GENLIST_NAME("multiline/2text.5icon/default")
       // FIXME: deprecated name, wiil be removed
       alias: "elm/genlist/item/multiline/2text.1icon/default";
       alias: "elm/genlist/item_odd/multiline/2ext.1icon/default";
       alias: "elm/genlist/item_compress/multiline/2text.1icon/default";
       alias: "elm/genlist/item_compress_odd/multiline/2text.1icon/default";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -3344,17 +2772,13 @@
    }
 
 // 2.4.4.5
-   group { name: "elm/genlist/item/multiline/2text.1icon.2/default";
-      alias: "elm/genlist/item_odd/multiline/2ext.1icon.2/default";
-      alias: "elm/genlist/item_compress/multiline/2text.1icon.2/default";
-      alias: "elm/genlist/item_compress_odd/multiline/2text.1icon.2/default";
-
-      GENLIST_DATA_ITEM_NORMAL
+   group { GENLIST_NAME("multiline/2text.1icon.2/default")
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -3385,20 +2809,38 @@
 /************************************************************/
 /******************** Dialogue Group ************************/
 /************************************************************/
+// 2.2.6.1 (Dialogue)
+   group { GENLIST_NAME("dialogue/editfield/default")
+      alias: "elm/layout/dialogue/editfield/default";
+      inherit: "elm/genlist/item/editfield/default";
+
+      data.item: "contents" "elm.icon.entry elm.icon.rename elm.icon.eraser elm.icon.edit";
+
+      GENLIST_DIALOGUE_INHERIT_BODY( ; )
+      GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon.entry"; target: "elm.icon.rename"; target: "elm.icon.edit";)
+   }
+
+// 2.2.6.2 (Dialogue)
+   group { GENLIST_NAME("dialogue/editfield/title/default")
+      alias: "elm/layout/dialogue/editfield/title/default";
+      inherit: "elm/genlist/item/editfield/title/default";
 
+      data.item: "contents" "elm.icon.entry elm.icon.rename elm.icon.eraser elm.icon.edit";
+
+      GENLIST_DIALOGUE_INHERIT_BODY( ; )
+      GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon.entry"; target: "elm.icon.rename"; target: "elm.icon.edit";)
+   }
 
 // Dialogue Group Separators
 // default separator
-   group { name : "elm/genlist/item/dialogue/separator/default";
-      alias: "elm/genlist/item_odd/dialogue/separator/default";
-      alias: "elm/genlist/item_compress/dialogue/separator/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/separator/default";
+   group { GENLIST_NAME("dialogue/separator/default")
+      alias: "elm/layout/dialogue/separator";
 
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG(0 0 0 0, 0 0 0 0, 0 0 0 0)
          GENLIST_PART_BASE
          GENLIST_PART_SPACER("separator",
             description { state: "default" 0.0;
@@ -3411,16 +2853,14 @@
 
 // Dialogue Group Separators
 // default separator
-   group { name : "elm/genlist/item/dialogue/separator.2/default";
-      alias: "elm/genlist/item_odd/dialogue/separator.2/default";
-      alias: "elm/genlist/item_compress/dialogue/separator.2/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/separator.2/default";
+   group { GENLIST_NAME("dialogue/separator.2/default")
+      alias: "elm/layout/dialogue/separator.2";
 
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG(0 0 0 0, 0 0 0 0, 0 0 0 0)
          GENLIST_PART_BASE
          GENLIST_PART_SPACER("separator",
             description { state: "default" 0.0;
@@ -3431,34 +2871,28 @@
       }
    }
 
-   group { name: "elm/genlist/item/dialogue/1icon/default";
-      alias: "elm/genlist/item_odd/dialogue/1icon/default";
-      alias: "elm/genlist/item_compress/dialogue/1icon/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1icon/default";
+   group { GENLIST_NAME("dialogue/1icon/default")
       alias: "elm/layout/dialogue/1icon";
       inherit: "elm/genlist/item/1icon/default";
 
       data.item: "contents" "elm.icon elm.icon.edit";
 
       GENLIST_DIALOGUE_INHERIT_BODY( ; )
-      GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon";)
+      GENLIST_PROGRAMS_DIALOGUE( target: "elm.icon"; )
    }
 
 // 2.4.1.1
 // 2.5.2.1 (deprecated)
-   group { name: "elm/genlist/item/dialogue/1text/default";
-      alias: "elm/genlist/item_odd/dialogue/1text/default";
-      alias: "elm/genlist/item_compress/dialogue/1text/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1text/default";
+   group { GENLIST_NAME("dialogue/1text/default")
       alias: "elm/layout/dialogue/1text";
+      inherit: "elm/genlist/item/1text/default";
+
       // FIXME: temporary alias for back-wrad compatibility
       alias: "elm/genlist/item/dialogue/1text/expandable2/default";
       alias: "elm/genlist/item_odd/dialogue/1text/expandable2/default";
       alias: "elm/genlist/item_compress/dialogue/1text/expandable2/default";
       alias: "elm/genlist/item_compress_odd/dialogue/1text/expandable2/default";
 
-      inherit: "elm/genlist/item/1text/default";
-
       data.item: "contents" "elm.icon.edit";
       /*
       alias: "elm/genlist/item/dialogue.1text/default";
@@ -3471,10 +2905,7 @@
    }
 
 // 2.4.1.2
-   group { name: "elm/genlist/item/dialogue/1text.1icon/default";
-      alias: "elm/genlist/item_odd/dialogue/1text.1icon/default";
-      alias: "elm/genlist/item_compress/dialogue/1text.1icon/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon/default";
+   group { GENLIST_NAME("dialogue/1text.1icon/default")
       alias: "elm/layout/dialogue/1text.1icon";
       inherit: "elm/genlist/item/1text.1icon.6/default";
 
@@ -3486,28 +2917,38 @@
 
 // 2.4.1.3
 // 2.5.2.4 (expandable)
-   group { name: "elm/genlist/item/dialogue/1text.1icon.2/default";
-      alias: "elm/genlist/item_odd/dialogue/1text.1icon.2/default";
-      alias: "elm/genlist/item_compress/dialogue/1text.1icon.2/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon.2/default";
+   group { GENLIST_NAME("dialogue/1text.1icon.2/default")
       alias: "elm/layout/dialogue/1text.1icon.2";
+      inherit: "elm/genlist/item/1text.1icon.2/default";
+
       // FIXME: deprecated, only for backward compatibility
       alias: "elm/genlist/item/dialogue/1text.1icon.2/expandable2/default";
       alias: "elm/genlist/item_compress/dialogue/1text.1icon.2/expandable2/default";
 
-      inherit: "elm/genlist/item/1text.1icon.2/default";
-
       data.item: "contents" "elm.icon elm.icon.edit";
 
       GENLIST_DIALOGUE_INHERIT_BODY( ; )
       GENLIST_PROGRAMS_DIALOGUE( target: "elm.text"; target: "elm.icon"; )
    }
 
+// 2.4.1.3.1 (circle)
+   group { GENLIST_NAME("dialogue/1text.1icon.2.thumb.circle/default")
+      inherit: "elm/genlist/item/dialogue/1text.1icon.2/default";
+
+      GENLIST_INHERIT_THUMB_CIRCLE_MEDIUM_DIALOGUE("elm.icon")
+      GENLIST_PROGRAMS_DIALOGUE( target: "elm.text"; target: "elm.icon"; target: "elm.thumb"; )
+   }
+
+// 2.4.1.3.1 (square)
+   group { GENLIST_NAME("dialogue/1text.1icon.2.thumb.square/default")
+      inherit: "elm/genlist/item/dialogue/1text.1icon.2/default";
+
+      GENLIST_INHERIT_THUMB_SQUARE_MEDIUM_DIALOGUE("elm.icon")
+      GENLIST_PROGRAMS_DIALOGUE( target: "elm.text"; target: "elm.icon"; target: "elm.thumb"; )
+   }
+
 // 2.4.1.3 (TEXTBLOCK)
-   group { name: "elm/genlist/item/dialogue/1text.1icon.2.tb/default";
-      alias: "elm/genlist/item_odd/dialogue/1text.1icon.2.tb/default";
-      alias: "elm/genlist/item_compress/dialogue/1text.1icon.2.tb/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon.2.tb/default";
+   group { GENLIST_NAME("dialogue/1text.1icon.2.tb/default")
       alias: "elm/layout/dialogue/1text.1icon.2.tb";
       inherit: "elm/genlist/item/1text.1icon.2.tb/default";
 
@@ -3518,10 +2959,7 @@
    }
 
 // 2.4.1.4
-   group { name: "elm/genlist/item/dialogue/1text.2icon/default";
-      alias: "elm/genlist/item_odd/dialogue/1text.2icon/default";
-      alias: "elm/genlist/item_compress/dialogue/1text.2icon/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1text.2icon/default";
+   group { GENLIST_NAME("dialogue/1text.2icon/default")
       alias: "elm/layout/dialogue/1text.2icon";
       inherit: "elm/genlist/item/1text.2icon.7/default";
 
@@ -3532,10 +2970,7 @@
    }
 
 // 2.4.1.5
-   group { name: "elm/genlist/item/dialogue/2text.1icon.6/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.1icon.6/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.1icon.6/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.6/default";
+   group { GENLIST_NAME("dialogue/2text.1icon.6/default")
       alias: "elm/layout/dialogue/2text.1icon.6";
       inherit: "elm/genlist/item/2text.1icon.6/default";
 
@@ -3548,17 +2983,14 @@
 // 2.4.1.6
 // 2.4.1.15
 // 2.5.2.2 & 2.5.2.3 (expandable)
-   group { name: "elm/genlist/item/dialogue/1text.1icon.3/default";
-      alias: "elm/genlist/item_odd/dialogue/1text.1icon.3/default";
-      alias: "elm/genlist/item_compress/dialogue/1text.1icon.3/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon.3/default";
+   group { GENLIST_NAME("dialogue/1text.1icon.3/default")
       alias: "elm/layout/dialogue/1text.1icon.3";
+      inherit: "elm/genlist/item/1text.1icon.3/default";
+
       // FIXME: deprecated, only for backward compatibility
       alias: "elm/genlist/item/dialogue/1text.1icon/expandable2/default";
       alias: "elm/genlist/item_compress/dialogue/1text.1icon/expandable2/default";
 
-      inherit: "elm/genlist/item/1text.1icon.3/default";
-
       data.item: "contents" "elm.icon elm.icon.edit";
 
       GENLIST_DIALOGUE_INHERIT_BODY( ; )
@@ -3566,10 +2998,7 @@
    }
 
 // 2.4.1.6 (textblock)
-   group { name: "elm/genlist/item/dialogue/1text.1icon.3.tb/default";
-      alias: "elm/genlist/item_odd/dialogue/1text.1icon.3.tb/default";
-      alias: "elm/genlist/item_compress/dialogue/1text.1icon.3.tb/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon.3.tb/default";
+   group { GENLIST_NAME("dialogue/1text.1icon.3.tb/default")
       alias: "elm/layout/dialogue/1text.1icon.3.tb";
       inherit: "elm/genlist/item/1text.1icon.3.tb/default";
 
@@ -3581,10 +3010,7 @@
 
 // 2.4.1.7
 // 2.4.1.11
-   group { name: "elm/genlist/item/dialogue/1text.2icon.2/default";
-      alias: "elm/genlist/item_odd/dialogue/1text.2icon.2/default";
-      alias: "elm/genlist/item_compress/dialogue/1text.2icon.2/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1text.2icon.2/default";
+   group { GENLIST_NAME("dialogue/1text.2icon.2/default")
       alias: "elm/layout/dialogue/1text.2icon.2";
       inherit: "elm/genlist/item/1text.2icon.4/default";
 
@@ -3595,10 +3021,7 @@
    }
 
 // 2.4.1.8
-   group { name: "elm/genlist/item/dialogue/1text.3icon/default";
-      alias: "elm/genlist/item_odd/dialogue/1text.3icon/default";
-      alias: "elm/genlist/item_compress/dialogue/1text.3icon/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1text.3icon/default";
+   group { GENLIST_NAME("dialogue/1text.3icon/default")
       alias: "elm/layout/dialogue/1text.3icon";
       inherit: "elm/genlist/item/1text.3icon.2/default";
 
@@ -3610,21 +3033,17 @@
    }
 
 // 2.4.1.9  FIME: This style is not needed?? (slide has already 3icons style)
-   group { name: "elm/genlist/item/dialogue/3icon/default";
-      alias: "elm/genlist/item_odd/dialogue/3icon/default";
-      alias: "elm/genlist/item_compress/dialogue/3icon/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/3icon/default";
+   group { GENLIST_NAME("dialogue/3icon/default")
       alias: "elm/layout/dialogue/3icon";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_DIALOGUE
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.edit";
 
-      GENLIST_IMAGES_DIALOGUE_BG_IMAGE
       parts {
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_DIALOGUE
          GENLIST_PART_BASE
          GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT )
-         GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT )
+         GENLIST_PART_PADDING_RIGHT_EDIT
          GENLIST_PART_PADDING_TOP
          GENLIST_PART_PADDING_BOTTOM
 
@@ -3643,23 +3062,20 @@
    }
 
 // 2.4.1.9
-   group { name: "elm/genlist/item/dialogue/1text.1icon.5/default";
-      alias: "elm/genlist/item_odd/dialogue/1text.1icon.5/default";
-      alias: "elm/genlist/item_compress/dialogue/1text.1icon.5/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon.5/default";
+   group { GENLIST_NAME("dialogue/1text.1icon.5/default")
+      alias: "elm/layout/dialogue/1text.1icon.5";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_DIALOGUE
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon elm.icon.edit";
 
-      GENLIST_IMAGES_DIALOGUE_BG_IMAGE
       parts {
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_DIALOGUE
          GENLIST_PART_BASE
          GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT )
-         GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT )
-         GENLIST_PART_PADDING_TOP_SIZE(0)
-         GENLIST_PART_PADDING_BOTTOM_SIZE(0)
+         GENLIST_PART_PADDING_RIGHT_EDIT
+         GENLIST_PART_PADDING_TOP
+         GENLIST_PART_PADDING_BOTTOM
 
          GENLIST_PART_SUBITEM_("elm.text", GENLIST_HEIGHT_2LINE_SUB,
             "elm.padding.left", "elm.padding.right", "elm.padding.top", "elm.icon",
@@ -3676,22 +3092,18 @@
    }
 
 // 2.4.1.10
-   group { name: "elm/genlist/item/dialogue/2text.1icon.4/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.1icon.4/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.1icon.4/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.4/default";
+   group { GENLIST_NAME("dialogue/2text.1icon.4/default")
       alias: "elm/layout/dialogue/2text.1icon.4";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_DIALOGUE
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon elm.icon.edit";
 
-      GENLIST_IMAGES_DIALOGUE_BG_IMAGE
       parts {
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_DIALOGUE
          GENLIST_PART_BASE
          GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT )
-         GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT )
+         GENLIST_PART_PADDING_RIGHT_EDIT
          GENLIST_PART_PADDING_TOP_SIZE(16)
          GENLIST_PART_PADDING_BOTTOM_SIZE(16)
 
@@ -3716,17 +3128,15 @@
    }
 
 // 2.4.1.12
-   group { name: "elm/genlist/item/dialogue/2text.6/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.6/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.6/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.6/default";
+   group { GENLIST_NAME("dialogue/2text.6/default")
       alias: "elm/layout/dialogue/2text.6";
+      inherit: "elm/genlist/item/2text.5/default";
+
       // FIXME: deprecated, will be removed
       alias: "elm/genlist/item/dialogue.1title.1text/default";
       alias: "elm/genlist/item_odd/dialogue.1title.1text/default";
       alias: "elm/genlist/item_compress/dialogue.1title.1text/default";
       alias: "elm/genlist/item_compress_odd/dialogue.1title.1text/default";
-      inherit: "elm/genlist/item/2text.5/default";
 
       data.item: "contents" "elm.icon.edit";
 
@@ -3735,10 +3145,7 @@
    }
 
 // 2.4.1.13
-   group { name: "elm/genlist/item/dialogue/2text.9/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.9/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.9/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.9/default";
+   group { GENLIST_NAME("dialogue/2text.9/default")
       alias: "elm/layout/dialogue/2text.9";
       inherit: "elm/genlist/item/dialogue/2text.6/default";
 
@@ -3755,10 +3162,7 @@
    }
 
 // 2.4.1.14
-   group { name: "elm/genlist/item/dialogue/2text.4/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.4/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.4/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.4/default";
+   group { GENLIST_NAME("dialogue/2text.4/default")
       alias: "elm/layout/dialogue/2text.4";
       inherit: "elm/genlist/item/2text.4/default";
 
@@ -3770,10 +3174,7 @@
    }
 
 // 2.4.1.14 (textblcok)
-   group { name: "elm/genlist/item/dialogue/2text.4.tb/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.4.tb/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.4.tb/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.4.tb/default";
+   group { GENLIST_NAME("dialogue/2text.4.tb/default")
       alias: "elm/layout/dialogue/2text.4.tb";
       inherit: "elm/genlist/item/2text.4.tb/default";
 
@@ -3788,10 +3189,7 @@
    }
 
 // 2.4.1.16
-   group { name: "elm/genlist/item/dialogue/1text.3icon.2/default";
-      alias: "elm/genlist/item_odd/dialogue/1text.3icon.2/default";
-      alias: "elm/genlist/item_compress/dialogue/1text.3icon.2/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1text.3icon.2/default";
+   group { GENLIST_NAME("dialogue/1text.3icon.2/default")
       alias: "elm/layout/dialogue/1text.3icon.2";
       inherit: "elm/genlist/item/1text.3icon/default";
 
@@ -3803,10 +3201,7 @@
    }
 
 // 2.4.1.17
-   group { name: "elm/genlist/item/dialogue/1text.1icon.4/default";
-      alias: "elm/genlist/item_odd/dialogue/1text.1icon.4/default";
-      alias: "elm/genlist/item_compress/dialogue/1text.1icon.4/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon.4/default";
+   group { GENLIST_NAME("dialogue/1text.1icon.4/default")
       alias: "elm/layout/dialogue/1text.1icon.4";
       inherit: "elm/genlist/item/1text.1icon.5/default";
 
@@ -3818,10 +3213,7 @@
    }
 
 // 2.4.1.18
-   group { name: "elm/genlist/item/dialogue/2text.5/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.5/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.5/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.5/default";
+   group { GENLIST_NAME("dialogue/2text.5/default")
       alias: "elm/layout/dialogue/2text.5";
       inherit: "elm/genlist/item/2text.6/default";
 
@@ -3833,11 +3225,8 @@
 
 
 // 2.4.1.19
-   group { name: "elm/genlist/item/dialogue/multiline/1text.1icon/default";
-      alias: "elm/genlist/item_odd/dialogue/multiline/1text.1icon/default";
-      alias: "elm/genlist/item_compress/dialogue/multiline/1text.1icon/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/multiline/1text.1icon/default";
-      alias: "elm/layout/dialogue/1text.1icon.flexible";
+   group { GENLIST_NAME("dialogue/multiline/1text.1icon/default")
+      alias: "elm/layout/dialogue/multiline/1text.1icon.flexible";
       inherit: "elm/genlist/item/1text.1icon.3.tb/default";
 
       data.item: "contents" "elm.icon elm.icon.edit";
@@ -3859,10 +3248,7 @@
    }
 
 // 2.4.1.20
-   group { name: "elm/genlist/item/dialogue/1text.1icon.divider/default";
-      alias: "elm/genlist/item_odd/dialogue/1text.1icon.divider/default";
-      alias: "elm/genlist/item_compress/dialogue/1text.1icon.divider/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1text.1icon.divider/default";
+   group { GENLIST_NAME("dialogue/1text.1icon.divider/default")
       alias: "elm/layout/dialogue/1text.1icon.divider";
       inherit: "elm/genlist/item/1text.1icon.divider/default";
 
@@ -3873,10 +3259,7 @@
    }
 
 // 2.4.1.21
-   group { name: "elm/genlist/item/dialogue/1text.2icon.divider/default";
-      alias: "elm/genlist/item_odd/dialogue/1text.2icon.divider/default";
-      alias: "elm/genlist/item_compress/dialogue/1text.2icon.divider/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1text.2icon.divider/default";
+   group { GENLIST_NAME("dialogue/1text.2icon.divider/default")
       alias: "elm/layout/dialogue/1text.2icon.divider";
       inherit: "elm/genlist/item/1text.2icon.divider/default";
 
@@ -3890,10 +3273,7 @@
 
 
 // 2.4.2.1
-    group { name: "elm/genlist/item/dialogue/2text/default";
-      alias: "elm/genlist/item_odd/dialogue/2text/default";
-      alias: "elm/genlist/item_compress/dialogue/2text/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text/default";
+    group { GENLIST_NAME("dialogue/2text/default")
       alias: "elm/layout/dialogue/2text";
       inherit: "elm/genlist/item/2text.2/default";
 
@@ -3904,10 +3284,7 @@
    }
 
 // 2.4.2.2
-   group { name: "elm/genlist/item/dialogue/2text.2/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.2/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.2/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.2/default";
+   group { GENLIST_NAME("dialogue/2text.2/default")
       alias: "elm/layout/dialogue/2text.2";
       inherit: "elm/genlist/item/2text.3/default";
 
@@ -3918,10 +3295,7 @@
    }
 
 // 2.4.2.3
-   group { name: "elm/genlist/item/dialogue/2text.3/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.3/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.3/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.3/default";
+   group { GENLIST_NAME("dialogue/2text.3/default")
       alias: "elm/layout/dialogue/2text.3";
       inherit: "elm/genlist/item/2text.7/default";
 
@@ -3932,10 +3306,7 @@
    }
 
 // 2.4.2.4
-   group { name: "elm/genlist/item/dialogue/2text.1icon.2/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.1icon.2/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.1icon.2/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.2/default";
+   group { GENLIST_NAME("dialogue/2text.1icon.2/default")
       alias: "elm/layout/dialogue/2text.1icon.2";
       inherit: "elm/genlist/item/2text.1icon.4/default";
 
@@ -3947,10 +3318,7 @@
    }
 
 // 2.4.2.5
-   group { name: "elm/genlist/item/dialogue/2text.1icon.3/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.1icon.3/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.1icon.3/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.3/default";
+   group { GENLIST_NAME("dialogue/2text.1icon.3/default")
       alias: "elm/layout/dialogue/2text.1icon.3";
       inherit: "elm/genlist/item/2text.1icon.8/default";
 
@@ -3961,10 +3329,7 @@
    }
 
 // 2.4.2.6
-   group { name: "elm/genlist/item/dialogue/2text.3icon/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.3icon/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.3icon/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.3icon/default";
+   group { GENLIST_NAME("dialogue/2text.3icon/default")
       alias: "elm/layout/dialogue/2text.3icon";
       inherit: "elm/genlist/item/2text.2icon.8/default";
 
@@ -3979,10 +3344,7 @@
    }
 
 // 2.4.2.7
-   group { name: "elm/genlist/item/dialogue/2text.2icon/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.2icon/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.2icon/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.2icon/default";
+   group { GENLIST_NAME("dialogue/2text.2icon/default")
       alias: "elm/layout/dialogue/2text.2icon";
       inherit: "elm/genlist/item/2text.2icon.5/default";
 
@@ -3997,10 +3359,7 @@
    }
 
 // 2.4.2.8
-   group { name: "elm/genlist/item/dialogue/2text.2icon.2/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.2icon.2/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.2icon.2/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.2icon.2/default";
+   group { GENLIST_NAME("dialogue/2text.2icon.2/default")
       alias: "elm/layout/dialogue/2text.2icon.2";
       inherit: "elm/genlist/item/2text.2icon.6/default";
 
@@ -4012,10 +3371,7 @@
    }
 
 // 2.4.2.9
-   group { name: "elm/genlist/item/dialogue/2text.2icon.3/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.2icon.3/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.2icon.3/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.2icon.3/default";
+   group { GENLIST_NAME("dialogue/2text.2icon.3/default")
       alias: "elm/layout/dialogue/2text.2icon.3";
       inherit: "elm/genlist/item/2text.2icon.4/default";
 
@@ -4027,10 +3383,7 @@
    }
 
 // 2.4.2.9 (TEXTBLOCK)
-   group { name: "elm/genlist/item/dialogue/2text.2icon.3.tb/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.2icon.3.tb/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.2icon.3.tb/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.2icon.3.tb/default";
+   group { GENLIST_NAME("dialogue/2text.2icon.3.tb/default")
       alias: "elm/layout/dialogue/2text.2icon.3.tb";
       inherit: "elm/genlist/item/2text.2icon.4.tb/default";
 
@@ -4042,10 +3395,7 @@
    }
 
 // 2.4.2.10
-   group { name: "elm/genlist/item/dialogue/2text.1icon.5/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.1icon.5/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.1icon.5/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.5/default";
+   group { GENLIST_NAME("dialogue/2text.1icon.5/default")
       alias: "elm/layout/dialogue/2text.1icon.5";
       inherit: "elm/genlist/item/2text.1icon.5/default";
 
@@ -4058,134 +3408,123 @@
 
 
 // 2.4.2.11
-   group { name: "elm/genlist/item/dialogue/multiline/1title.1text/default";
-      alias: "elm/genlist/item_odd/dialogue/multiline/1title.1text/default";
-      alias: "elm/genlist/item_compress/dialogue/multiline/1title.1text/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/multiline/1title.1text/default";
+   group { GENLIST_NAME("dialogue/multiline/1title.1text/default")
       alias: "elm/layout/dialogue/multiline/1title.1text/default";
+      inherit: "elm/genlist/item/multiline/1title.1text/default";
+
       // FIXME: deprecated name, will be removed
       alias: "elm/genlist/item/dialogue/1title.1text.2/default";
       alias: "elm/genlist/item_odd/dialogue/1title.1text.2/default";
       alias: "elm/genlist/item_compress/dialogue/1title.1text.2/default";
       alias: "elm/genlist/item_compress_odd/dialogue/1title.1text.2/default";
       alias: "elm/layout/dialogue/1title.1text.2/default";
-      inherit: "elm/genlist/item/multiline/1title.1text/default";
+
 
       data.item: "contents" "elm.icon.edit";
 
       GENLIST_DIALOGUE_INHERIT_BODY( ; )
-      GENLIST_PROGRAMS_DIALOGUE( target: "elm.title"; target: "elm.text";
+      GENLIST_PROGRAMS_DIALOGUE( target: "elm.title";
+         target: "elm.text";
          target: "elm.divider1"; target:"elm.divider2"; )
    }
 
 // 2.4.2.12
-   group { name: "elm/genlist/item/dialogue/multiline/1title.2text/default";
-      alias: "elm/genlist/item_odd/dialogue/multiline/1title.2text/default";
-      alias: "elm/genlist/item_compress/dialogue/multiline/1title.2text/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/multiline/1title.2text/default";
+   group { GENLIST_NAME("dialogue/multiline/1title.2text/default")
       alias: "elm/layout/dialogue/multiline/1title.2text/default";
       inherit: "elm/genlist/item/multiline/1title.2text/default";
 
       data.item: "contents" "elm.icon.edit";
 
       GENLIST_DIALOGUE_INHERIT_BODY( ; )
-      GENLIST_PROGRAMS_DIALOGUE( target: "elm.title"; target: "elm.text.1"; target: "elm.text.2";
+      GENLIST_PROGRAMS_DIALOGUE( target: "elm.title";
+         target: "elm.text.1"; target: "elm.text.2";
          target: "elm.divider1"; target:"elm.divider2";
          target: "center_line"; target:"center_line2";)
    }
 
+#define GENLIST_PART_PASSWORD_RTB(NAME, BG_NAME, RIGHT, TOP, BOTTOM) \
+   GENLIST_PART_IMAGE(BG_NAME, \
+      GENLIST_DESCRIPTION_RTB(RIGHT, TOP, BOTTOM, \
+         GENLIST_PARAM_PASSWORD_IMAGE \
+         fixed: 1 0; \
+      ) \
+   ) \
+   GENLIST_PART_ICON(NAME, \
+      GENLIST_DESCRIPTION_ENVELOP(BG_NAME, \
+         rel1.offset: 1 1; \
+         rel2.offset: -1 -1; \
+      ) \
+   )
+
+#define GENLIST_PART_PASSWORD_LTB(NAME, BG_NAME, LEFT, TOP, BOTTOM) \
+   GENLIST_PART_IMAGE(BG_NAME, \
+      GENLIST_DESCRIPTION_LTB(LEFT, TOP, BOTTOM, \
+         GENLIST_PARAM_PASSWORD_IMAGE \
+         fixed: 1 0; \
+      ) \
+   ) \
+   GENLIST_PART_ICON(NAME, \
+      GENLIST_DESCRIPTION_ENVELOP(BG_NAME, \
+         rel1.offset: 1 1; \
+         rel2.offset: -1 -1; \
+      ) \
+   )
+
 //2.4.2.13 (password style)
-   group { name: "elm/genlist/item/dialogue/1text.4icon/default";
-      alias: "elm/genlist/item_odd/dialogue/1text.4icon/default";
-      alias: "elm/genlist/item_compress/dialogue/1text.4icon/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1text.4icon/default";
+   group { GENLIST_NAME("dialogue/1text.4icon/default")
       alias: "elm/layout/dialogue/4icon";
 
-      GENLIST_DATA_ITEM_NORMAL
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
       data.item: "texts" "elm.text";
-      data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.edit";
+      data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4";
 
       images {
          image : "00_search_edit_field_bg_02.png" COMP;
       }
-      GENLIST_IMAGES_DIALOGUE_BG_IMAGE
       parts {
-         GENLIST_PART_BG_IMAGE_DIALOGUE
          GENLIST_PART_BASE
-         GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT )
-         GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( 82+16 )
+         GENLIST_PART_BG_DIALOGUE
+         GENLIST_PART_PADDING_LEFT_SIZE(DIALOGUE_PADDING_SIZE_LEFT)
+         GENLIST_PART_PADDING_RIGHT_SIZE(DIALOGUE_PADDING_SIZE_RIGHT)
          GENLIST_PART_PADDING_TOP_SIZE(22)
-         GENLIST_PART_PADDING_BOTTOM_SIZE(29)
-         GENLIST_PART_SPACER("elm.padding.top2",
-            description { state: "default" 0.0;
-               min: 0 29;
-               max: -1 29;
-               fixed: 0 1;
-               rel1.to: "base";
-               rel2.to: "base";
-               rel2.relative: 1.0 0.0;
-               align: 0.5 0.0;
-            }
-         )
+         GENLIST_PART_PADDING_BOTTOM_SIZE(18)
          GENLIST_PART_TEXT( "elm.text",
-            GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.icon1.bg", "elm.padding.top",
-               min: 212 0;
-               fixed: 1 1;
+            GENLIST_DESCRIPTION_LRT("elm.padding.left", "elm.padding.right", "elm.padding.top",
+               fixed: 0 1;
+               min: 0 42;
                GENLIST_PARAM_PASSWORD_TITLE
             )
          )
+         GENLIST_PART_PADDING_T_SIZE("elm.padding.text.bottom", "elm.text", 18);
 
-         GENLIST_PART_IMAGE("elm.icon1.bg",
-            GENLIST_DESCRIPTION_RTB("elm.icon2.bg.left", "elm.padding.top2", "elm.padding.bottom",
-               GENLIST_PARAM_PASSWORD_IMAGE
-               fixed: 1 1;)
+         GENLIST_PART_PASSWORD_RTB("elm.icon.1", "elm.icon.1.bg",
+            "elm.padding.1", "elm.padding.text.bottom", "elm.padding.bottom"
          )
-         GENLIST_PART_ICON("elm.icon.1",
-            GENLIST_DESCRIPTION_ENVELOP("elm.icon1.bg",
-               rel1.offset: 1 1;
-               rel2.offset: -1 -1;
-            )
-         )
-
-         GENLIST_PART_PADDING_R_SIZE("elm.icon2.bg.left", "elm.icon2.bg", 22)
-         GENLIST_PART_IMAGE("elm.icon2.bg",
-            GENLIST_DESCRIPTION_RTB("elm.icon3.bg.left", "elm.padding.top2", "elm.padding.bottom",
-               GENLIST_PARAM_PASSWORD_IMAGE
-               fixed: 1 1;)
-         )
-         GENLIST_PART_ICON("elm.icon.2",
-            GENLIST_DESCRIPTION_ENVELOP("elm.icon2.bg",
-               rel1.offset: 1 1;
-               rel2.offset: -1 -1;
-            )
+         GENLIST_PART_PADDING_R_SIZE("elm.padding.1", "elm.icon.2.bg", 22)
+         GENLIST_PART_PASSWORD_RTB("elm.icon.2", "elm.icon.2.bg",
+            "elm.padding.center", "elm.padding.text.bottom", "elm.padding.bottom"
          )
-
-         GENLIST_PART_PADDING_R_SIZE("elm.icon3.bg.left", "elm.icon3.bg", 22)
-         GENLIST_PART_IMAGE("elm.icon3.bg",
-            GENLIST_DESCRIPTION_RTB("elm.icon4.bg.left", "elm.padding.top2", "elm.padding.bottom",
-               GENLIST_PARAM_PASSWORD_IMAGE
-               fixed: 1 1;)
-         )
-         GENLIST_PART_ICON("elm.icon.3",
-            GENLIST_DESCRIPTION_ENVELOP("elm.icon3.bg",
-               rel1.offset: 1 1;
-               rel2.offset: -1 -1;
-            )
+         GENLIST_PART_SPACER("elm.padding.center",
+            description { state: "default" 0.0.;
+               min: 22 0;
+               max: 22 0;
+               fixed: 1 1;
+               align: 0.5 0.5;
+               rel1 {
+                  relative: 0.5 0;
+               }
+               rel2 {
+                  relative: 0.5 1;
+               }
+            }
          )
-
-         GENLIST_PART_PADDING_R_SIZE("elm.icon4.bg.left", "elm.icon4.bg", 22)
-         GENLIST_PART_IMAGE("elm.icon4.bg",
-            GENLIST_DESCRIPTION_RTB("elm.padding.right", "elm.padding.top2", "elm.padding.bottom",
-            // Do not add fixed: 1 1; even thougn edje util error,
-            // For some reason, size calculation is not correct.
-               GENLIST_PARAM_PASSWORD_IMAGE)
-
+         GENLIST_PART_PASSWORD_LTB("elm.icon.3", "elm.icon.3.bg",
+            "elm.padding.center", "elm.padding.text.bottom", "elm.padding.bottom"
          )
-         GENLIST_PART_ICON("elm.icon.4",
-            GENLIST_DESCRIPTION_ENVELOP("elm.icon4.bg",
-               rel1.offset: 1 1;
-               rel2.offset: -1 -1;
-            )
+         GENLIST_PART_PADDING_L_SIZE("elm.padding.2", "elm.icon.3.bg", 22)
+         GENLIST_PART_PASSWORD_LTB("elm.icon.4", "elm.icon.4.bg",
+            "elm.padding.2", "elm.padding.text.bottom", "elm.padding.bottom"
          )
       }
       programs {
@@ -4194,10 +3533,7 @@
    }
 
 // 2.4.2.14
-   group { name: "elm/genlist/item/dialogue/2text.2icon.4/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.2icon.4/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.2icon.4/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.2icon.4/default";
+   group { GENLIST_NAME("dialogue/2text.2icon.4/default")
       alias: "elm/layout/dialogue/2text.2icon.4";
       inherit: "elm/genlist/item/2text.2icon/default";
 
@@ -4209,10 +3545,7 @@
    }
 
 // 2.4.2.15
-   group { name: "elm/genlist/item/dialogue/2text.1icon.10/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.1icon.10/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.1icon.10/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.10/default";
+   group { GENLIST_NAME("dialogue/2text.1icon.10/default")
       alias: "elm/layout/dialogue/2text.1icon.10";
       inherit: "elm/genlist/item/2text.1icon.divider/default";
 
@@ -4238,10 +3571,7 @@
 
 
 // 2.4.2.15 (textblock)
-   group { name: "elm/genlist/item/dialogue/2text.1icon.10.tb/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.1icon.10.tb/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.1icon.10.tb/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.10.tb/default";
+   group { GENLIST_NAME("dialogue/2text.1icon.10.tb/default")
       alias: "elm/layout/dialogue/2text.1icon.10.tb";
       inherit: "elm/genlist/item/2text.1icon.7.tb/default";
 
@@ -4253,10 +3583,7 @@
    }
 
 // 2.4.2.16
-   group { name: "elm/genlist/item/dialogue/2text.1icon.7/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.1icon.7/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.1icon.7/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.7/default";
+   group { GENLIST_NAME("dialogue/2text.1icon.7/default")
       alias: "elm/layout/dialogue/2text.1icon.12";
       inherit: "elm/genlist/item/2text.1icon.12/default";
 
@@ -4269,22 +3596,18 @@
 
 
 // 2.4.2.17
-   group { name: "elm/genlist/item/dialogue/2text.1icon.8/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.1icon.8/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.1icon.8/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.8/default";
+   group { GENLIST_NAME("dialogue/2text.1icon.8/default")
       alias: "elm/layout/dialogue/2text.1icon.8";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_DIALOGUE
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon elm.icon.edit";
 
-      GENLIST_IMAGES_DIALOGUE_BG_IMAGE
       parts {
-         GENLIST_PART_BG_IMAGE_DIALOGUE
          GENLIST_PART_BASE
+         GENLIST_PART_BG_DIALOGUE
          GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT )
-         GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT )
+         GENLIST_PART_PADDING_RIGHT_EDIT
          GENLIST_PART_PADDING_TOP_2LINE
          GENLIST_PART_PADDING_BOTTOM_2LINE
 
@@ -4293,7 +3616,7 @@
          GENLIST_PART_LISTITEM_("elm.text.1", GENLIST_HEIGHT_2LINE_MAIN,
             "elm.padding.left", "elm.text2.limit",
             "elm.text.2", "elm.padding.bottom",
-            fixed: 1 1; align: 0 0.5; text.max: 1 0;  // This limits text growing.
+             align: 0 0.5; text.max: 1 0;  // This limits text growing.
          )
          GENLIST_PART_PADDING_L("elm.padding.text1.right", "elm.text.1")
          GENLIST_PART_ICON_SMALL_LTB("elm.icon",
@@ -4306,16 +3629,15 @@
          )
          GENLIST_PART_FLIP
       }
-      GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2";
-         target: "elm.icon"; )
+      GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1";
+         target: "elm.text.2"; target: "elm.icon"; )
    }
 
 // 2.4.2.18
-   group { name: "elm/genlist/item/dialogue/multiline/2text/default";
-      alias: "elm/genlist/item_odd/dialogue/multiline/2text/default";
-      alias: "elm/genlist/item_compress/dialogue/multiline/2text/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/multiline/2text/default";
+   group { GENLIST_NAME("dialogue/multiline/2text/default")
       alias: "elm/layout/dialogue/multiline/2text/default";
+      inherit: "elm/genlist/item/multiline/2text/default";
+
       // FIXME: deprecated name, will be removed
       alias: "elm/genlist/item/multiline/dialogue/2text/default";
       alias: "elm/genlist/item_odd/multiline/dialogue/2text/default";
@@ -4323,8 +3645,6 @@
       alias: "elm/genlist/item_compress_odd/multiline/dialogue/2text/default";
       alias: "elm/layout/multiline/dialogue/2text/default";
 
-      inherit: "elm/genlist/item/multiline/2text/default";
-
       data.item: "contents" "elm.icon.edit";
 
       GENLIST_DIALOGUE_INHERIT_BODY( ; )
@@ -4332,22 +3652,18 @@
    }
 
 // 2.4.2.19
-   group { name: "elm/genlist/item/dialogue/2text.1icon.15/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.1icon.15/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.1icon.15/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.15/default";
+   group { GENLIST_NAME("dialogue/2text.1icon.15/default")
       alias: "elm/layout/dialogue/2text.1icon.15/default";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_DIALOGUE
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon elm.icon.edit";
 
-      GENLIST_IMAGES_DIALOGUE_BG_IMAGE
       parts {
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_DIALOGUE
          GENLIST_PART_BASE
          GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT )
-         GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT )
+         GENLIST_PART_PADDING_RIGHT_EDIT
          GENLIST_PART_PADDING_TOP_2LINE
          GENLIST_PART_PADDING_BOTTOM_2LINE
 
@@ -4372,10 +3688,7 @@
    }
 
 // 2.4.2.20
-   group { name: "elm/genlist/item/dialogue/2text.1icon.divider/default";
-      alias: "elm/genlist/item_odd/dialogue/2text.1icon.divider/default";
-      alias: "elm/genlist/item_compress/dialogue/2text.1icon.divider/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/2text.1icon.divider/default";
+   group { GENLIST_NAME("dialogue/2text.1icon.divider/default")
       alias: "elm/layout/dialogue/2text.1icon.divider/default";
       inherit: "elm/genlist/item/2text.1icon.divider/default";
 
@@ -4386,10 +3699,8 @@
    }
 
 // 2.4.2.21
-   group { name: "elm/genlist/item/dialogue/3text.2icon/default";
-      alias: "elm/genlist/item_odd/dialogue/3text.2icon/default";
-      alias: "elm/genlist/item_compress/dialogue/3text.2icon/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/3text.2icon/default";
+// FIXME: Why name is 3text ?? it's 2text
+   group { GENLIST_NAME("dialogue/3text.2icon/default")
       alias: "elm/layout/dialogue/3text.2icon/default";
       inherit: "elm/genlist/item/2text.2icon/default";
 
@@ -4401,60 +3712,63 @@
    }
 
 // 2.4.4.1 group title
-   group { name: "elm/genlist/item/dialogue/grouptitle/default";
-      alias: "elm/genlist/item_odd/dialogue/grouptitle/default";
-      alias: "elm/genlist/item_compress/dialogue/grouptitle/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/grouptitle/default";
+   group { GENLIST_NAME("dialogue/grouptitle/default")
       alias: "elm/layout/dialogue/grouptitle";
+
+      // FIXME: deprecated name, will be removed
       alias : "elm/genlist/item/dialogue/title/default";
       alias: "elm/genlist/item_odd/dialogue/title/default";
       alias: "elm/genlist/item_compress/dialogue/title/default";
       alias: "elm/genlist/item_compress_odd/dialogue/title/default";
       alias: "elm/layout/dialogue/title";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG
       data.item: "texts" "elm.text";
       data.item: "contents" "elm.icon";
-
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_TOP_SIZE( 0 )
+         GENLIST_PART_PADDING_BOTTOM_SIZE( 0 )
          GENLIST_PART_PADDING_RIGHT_SIZE( 26 )
 
          GENLIST_PART_TEXT("elm.text",
             repeat_events: 0;
-            GENLIST_DESCRIPTION_LR("elm.padding.left", "elm.icon",
+            GENLIST_DESCRIPTION("elm.padding.left", "elm.icon",
+               "elm.padding.top", "elm.padding.bottom",
                GENLIST_PARAM_DIALOGUE_GROUP_TITLE
                min: 0 GENLIST_HEIGHT_GROUPTITLE;
             )
          )
 
          GENLIST_PART_ICON("elm.icon",
-            GENLIST_DESCRIPTION_R("elm.padding.right",
+            GENLIST_DESCRIPTION_RTB("elm.padding.right",
+               "elm.padding.top", "elm.padding.bottom",
                min: 32 32; max: 32 32; fixed: 1 1;
             )
          )
          GENLIST_PART_FLIP
       }
-      GENLIST_PROGRAMS_INDEX( target: "elm.text"; target: "elm.icon"; )
+      GENLIST_PROGRAM_DISABLED( target: "elm.text"; target: "elm.icon"; )
    }
 
 // 2.4.4.2 Help Text
-   group { name: "elm/genlist/item/multiline/1text/default";
-      alias: "elm/genlist/item_odd/multiline/1text/default";
-      alias: "elm/genlist/item_compress/multiline/1text/default";
-      alias: "elm/genlist/item_compress_odd/multiline/1text/default";
+   group { GENLIST_NAME("multiline/1text/default");
+      alias: "elm/layout/multiline/1text/default";
+
+      // FIXME: name is not correct...
       alias: "elm/layout/dialogue/multiline/1text/default";
 
-      GENLIST_DATA_ITEM_NORMAL
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
       data.item: "texts" "elm.text";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_PADDING_LEFT_SIZE(38)
-         GENLIST_PART_PADDING_RIGHT_SIZE_EDIT(38)
+         GENLIST_PART_PADDING_RIGHT_SIZE(38)
          GENLIST_PART_PADDING_TOP_SIZE(0)
          GENLIST_PART_PADDING_BOTTOM_SIZE(0)
 
@@ -4468,22 +3782,18 @@
    }
 
 // 2.4.4.3
-   group { name: "elm/genlist/item/dialogue/bg/2text.1icon/default";
-      alias: "elm/genlist/item_odd/dialogue/bg/2text.1icon/default";
-      alias: "elm/genlist/item_compress/dialogue/bg/2text.1icon/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/bg/2text.1icon/default";
+   group { GENLIST_NAME("dialogue/bg/2text.1icon/default")
       alias: "elm/layout/dialogue/bg/2text.1icon/default";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_DIALOGUE
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon elm.icon.edit";
 
-      GENLIST_IMAGES_DIALOGUE_BG_IMAGE
       parts {
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_DIALOGUE
          GENLIST_PART_BASE
          GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT )
-         GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT )
+         GENLIST_PART_PADDING_RIGHT_EDIT
          GENLIST_PART_PADDING_TOP_SIZE(20)
          GENLIST_PART_PADDING_BOTTOM_SIZE(20)
 
@@ -4511,22 +3821,18 @@
    }
 
 // 2.4.4.4
-   group { name: "elm/genlist/item/dialogue/bg/3text.2icon/default";
-      alias: "elm/genlist/item_odd/dialogue/bg/3text.2icon/default";
-      alias: "elm/genlist/item_compress/dialogue/bg/3text.2icon/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/bg/3text.2icon/default";
+   group { GENLIST_NAME("dialogue/bg/3text.2icon/default")
       alias: "elm/layout/dialogue/bg/3text.2icon/default";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_DIALOGUE
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.edit";
 
-      GENLIST_IMAGES_DIALOGUE_BG_IMAGE
       parts {
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_DIALOGUE
          GENLIST_PART_BASE
          GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT )
-         GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT )
+         GENLIST_PART_PADDING_RIGHT_EDIT
          GENLIST_PART_PADDING_TOP_SIZE(20)
          GENLIST_PART_PADDING_BOTTOM_SIZE(20)
 
@@ -4563,28 +3869,24 @@
    }
 
 // 2.4.4.4 (Apps)
-   group { name: "elm/genlist/item/dialogue/bg/5text.6icon/default";
-      alias: "elm/genlist/item_odd/dialogue/bg/5text.6icon/default";
-      alias: "elm/genlist/item_compress/dialogue/bg/5text.6icon/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/bg/5text.6icon/default";
+   group { GENLIST_NAME("dialogue/bg/5text.6icon/default")
       alias: "elm/layout/dialogue/bg/5text.6icon/default";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_DIALOGUE
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4 elm.text.5";
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5 elm.icon.6 elm.icon.edit";
 
-      GENLIST_IMAGES_DIALOGUE_BG_IMAGE
       parts {
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_DIALOGUE
          GENLIST_PART_BASE
          GENLIST_PART_PADDING_LEFT_SIZE( DIALOGUE_PADDING_SIZE_LEFT )
-         GENLIST_PART_PADDING_RIGHT_SIZE_EDIT( DIALOGUE_PADDING_SIZE_RIGHT )
-         GENLIST_PART_PADDING_TOP_SIZE(9)
-         GENLIST_PART_PADDING_BOTTOM_SIZE(9)
+         GENLIST_PART_PADDING_RIGHT_EDIT
+         GENLIST_PART_PADDING_TOP_SIZE(13)
+         GENLIST_PART_PADDING_BOTTOM_SIZE(13)
 
          GENLIST_PART_ICON("elm.icon.1",
             GENLIST_DESCRIPTION_L("elm.padding.left",
-               min: 134 134; fixed: 1 1;)
+               min: 126 126; max: 126 126;  fixed: 1 1;)
          )
          GENLIST_PART_PADDING_L("elm.padding.icon1.right", "elm.icon.1")
          GENLIST_PART_TEXT("elm.text.1", GENLIST_DESCRIPTION_LRT(
@@ -4647,6 +3949,26 @@
          target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; target: "elm.icon.6"; )
    }
 
+// 2.4.4.4.1 (Circle)
+   group { GENLIST_NAME("dialogue/bg/5text.6icon.thumb.circle/default")
+      inherit: "elm/genlist/item/dialogue/bg/5text.6icon/default";
+
+      GENLIST_INHERIT_THUMB_CIRCLE_THUMB_DIALOGUE("elm.icon.1")
+      GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.text.5";
+         target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; target: "elm.icon.6";
+         target: "elm.thumb"; )
+   }
+
+// 2.4.4.4.1 (Square)
+   group { GENLIST_NAME("dialogue/bg/5text.6icon.thumb.square/default")
+      inherit: "elm/genlist/item/dialogue/bg/5text.6icon/default";
+
+      GENLIST_INHERIT_THUMB_SQUARE_THUMB_DIALOGUE("elm.icon.1")
+      GENLIST_PROGRAMS_DIALOGUE( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.text.5";
+         target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; target: "elm.icon.6";
+         target: "elm.thumb"; )
+   }
+
 #if 0
 // ???
    /* NOTE: This style is new mailbox style for email application. Otherwise do not use this. */
@@ -4662,8 +3984,8 @@
 
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT
@@ -4997,7 +4319,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.subject";
             target: "elm.text.name";
             target: "elm.text.date";
@@ -5007,7 +4329,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.subject";
             target: "elm.text.name";
             target: "elm.text.date";
@@ -5068,8 +4390,8 @@
       parts {
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_BG
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_LEFT
          GENLIST_PART_PADDING_RIGHT_EDIT
          part { name: "elm.icon";
@@ -5077,8 +4399,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
+               max: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
@@ -5164,7 +4486,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
@@ -5172,7 +4494,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text";
             transition: LINEAR 0.1;
          }
@@ -5207,8 +4529,8 @@
       parts {
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_BG
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_LEFT
          GENLIST_PART_PADDING_RIGHT_EDIT
          part { name: "elm.check";
@@ -5257,8 +4579,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
+               max: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
                fixed: 1 1;
                rel1.to_x: "elm.padding.right";
                rel2 {
@@ -5344,7 +4666,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
@@ -5352,7 +4674,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text";
             transition: LINEAR 0.1;
          }
@@ -5414,13 +4736,13 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             transition: LINEAR 0.1;
          }*/
          program { name: "go_disabled";
@@ -5479,13 +4801,13 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             transition: LINEAR 0.1;
          }*/
          program { name: "go_disabled";
@@ -5613,7 +4935,7 @@
       parts {
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_27_INC )
          GENLIST_PART_PADDING_RIGHT_EDIT
          GENLIST_PART_DIALOGUE_ITEM
@@ -5803,7 +5125,7 @@
       parts {
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_27_INC )
          GENLIST_PART_PADDING_RIGHT_EDIT
          GENLIST_PART_DIALOGUE_ITEM
@@ -5996,7 +5318,7 @@
       parts {
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_27_INC )
          GENLIST_PART_PADDING_RIGHT_EDIT
          GENLIST_PART_DIALOGUE_ITEM
@@ -6250,7 +5572,7 @@
       data.item: "flips" "elm.flip.icon elm.flip.content";
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC )
@@ -6335,7 +5657,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
@@ -6344,7 +5666,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             transition: LINEAR 0.1;
@@ -6378,7 +5700,7 @@
       data.item: "flips" "elm.flip.icon elm.flip.content";
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC )
@@ -6390,8 +5712,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
+               max: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
@@ -6496,7 +5818,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
@@ -6505,7 +5827,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             transition: LINEAR 0.1;
@@ -6539,7 +5861,7 @@
       data.item: "flips" "elm.flip.icon elm.flip.content";
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC )
@@ -6551,8 +5873,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
+               max: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
@@ -6657,7 +5979,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
@@ -6666,7 +5988,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             transition: LINEAR 0.1;
@@ -6700,7 +6022,7 @@
       data.item: "flips" "elm.flip.icon elm.flip.content";
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC )
@@ -6730,8 +6052,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
+               max: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
@@ -6765,8 +6087,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
+               max: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
                fixed: 1 1;
                rel1.to_x: "elm.padding.right";
                rel2 {
@@ -6870,7 +6192,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
@@ -6879,7 +6201,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             transition: LINEAR 0.1;
@@ -6913,7 +6235,7 @@
       data.item: "flips" "elm.flip.icon elm.flip.content";
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC )
@@ -6925,8 +6247,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
+               max: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
@@ -7074,7 +6396,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
@@ -7083,7 +6405,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             transition: LINEAR 0.1;
@@ -7113,7 +6435,7 @@
       alias: "elm/layout/dialogue/2text.2icon.3";
       inherit: "elm/genlist/item/2text.2icon.4/default";
       parts {
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
@@ -7124,7 +6446,7 @@
       alias: "elm/layout/dialogue/2text.2icon.3.tb";
       inherit: "elm/genlist/item/2text.2icon.4.tb/default";
       parts {
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
@@ -7146,7 +6468,7 @@
                color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_21_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_22_INC )
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_27_INC )
@@ -7255,7 +6577,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.title";
             target: "elm.text";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
@@ -7264,7 +6586,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.title";
             target: "elm.text";
             transition: LINEAR 0.1;
@@ -7475,7 +6797,7 @@
       data.item: "flips" "elm.flip.icon elm.flip.content";
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC )
@@ -7591,7 +6913,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
@@ -7600,7 +6922,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             transition: LINEAR 0.1;
@@ -7634,7 +6956,7 @@
       data.item: "flips" "elm.flip.icon elm.flip.content";
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC )
@@ -7757,7 +7079,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
@@ -7766,7 +7088,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             transition: LINEAR 0.1;
@@ -7802,7 +7124,7 @@
 
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC )
@@ -7925,7 +7247,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
          }
@@ -7933,7 +7255,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             transition: LINEAR 0.1;
@@ -8021,8 +7343,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
+               max: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 0.5;
@@ -8765,7 +8087,7 @@
       parts {
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_27_INC )
          GENLIST_PART_PADDING_RIGHT_EDIT
          GENLIST_PART_DIALOGUE_ITEM
@@ -8947,7 +8269,7 @@
 
       parts {
         GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_454_INC )
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_27_INC )
          GENLIST_PART_PADDING_RIGHT_EDIT
          GENLIST_PART_DIALOGUE_ITEM
@@ -9199,7 +8521,7 @@
 
       parts {
         GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_566_INC )
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_27_INC )
          GENLIST_PART_PADDING_RIGHT_EDIT
          GENLIST_PART_DIALOGUE_ITEM
@@ -10584,7 +9906,7 @@
       parts {
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_BG_IMAGE_DIALOGUE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_LEFT_SIZE( GENLIST_PADDING_32_INC )
          GENLIST_PART_PADDING_RIGHT_EDIT
          GENLIST_PART_DIALOGUE_ITEM
@@ -10616,14 +9938,14 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text";
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text";
             transition: LINEAR 0.1;
          }*/
@@ -10838,7 +10160,7 @@
       data.item: "flips" "elm.flip.icon elm.flip.content";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -10911,7 +10233,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text";
             transition: LINEAR 0.1;
          }
@@ -10946,8 +10268,8 @@
 
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT
@@ -11271,7 +10593,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             target: "elm.text.3";
@@ -11281,7 +10603,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             target: "elm.text.3";
@@ -11341,7 +10663,7 @@
 
       parts {
          GENLIST_PART_BASE_LIST_H( 129 )
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( 10 )
          GENLIST_PART_PADDING_BOTTOM_SIZE( 10 )
          GENLIST_PART_PADDING_LEFT
@@ -11441,7 +10763,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
@@ -11450,7 +10772,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             transition: LINEAR 0.1;
@@ -11484,7 +10806,7 @@
 
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT
@@ -11505,8 +10827,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
+               max: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
@@ -11543,8 +10865,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
+               max: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
@@ -11654,7 +10976,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
@@ -11663,7 +10985,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             transition: LINEAR 0.1;
@@ -11697,7 +11019,7 @@
 
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT
@@ -11707,8 +11029,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
+               max: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
@@ -11843,7 +11165,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
@@ -11851,7 +11173,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             transition: LINEAR 0.1;
          }
@@ -11905,7 +11227,7 @@
 
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT
@@ -12066,7 +11388,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
@@ -12075,7 +11397,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             transition: LINEAR 0.1;
@@ -12109,7 +11431,7 @@
 
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT
@@ -12119,8 +11441,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
+               max: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
@@ -12219,7 +11541,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
@@ -12227,7 +11549,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             transition: LINEAR 0.1;
          }
@@ -12277,7 +11599,7 @@
 
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT
@@ -12287,8 +11609,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
-               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
+               max: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
@@ -12491,7 +11813,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             target: "elm.text.3";
@@ -12501,7 +11823,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             target: "elm.text.3";
@@ -12559,7 +11881,7 @@
 
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM_SIZE( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT
@@ -12853,7 +12175,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             target: "elm.text.3";
@@ -12863,7 +12185,7 @@
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.1";
             target: "elm.text.2";
             target: "elm.text.3";
@@ -12903,8 +12225,8 @@
       }
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_SIZE_160_INC )
-         GENLIST_PART_BG
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_TOP_SIZE( 8 )
          GENLIST_PART_PADDING_BOTTOM_SIZE( 8 )
          GENLIST_PART_PADDING_LEFT
@@ -13194,7 +12516,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
+            target: "bg";
             target: "elm.text.subject";
             target: "elm.text.name";
             target: "elm.text.date";
@@ -13206,7 +12528,7 @@
             source: "elm";
             transition: LINEAR 0.1;
             script {
-               set_state(PART:"bg_image", "default", 0.0);
+               set_state(PART:"bg", "default", 0.0);
                set_state(PART:"elm.text.name", "default", 0.0);
                set_state(PART:"elm.text.date", "default", 0.0);
                set_state(PART:"elm.text.preview", "default", 0.0);
@@ -13287,7 +12609,7 @@
       data.item: "contents" "elm.swallow.icon elm.swallow.end";
       parts {
          GENLIST_PART_BASE_LIST_H( GENLIST_HEIGHT_93_INC )
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_PADDING_LEFT
          GENLIST_PART_PADDING_RIGHT_EDIT
          part { name: "elm.swallow.end";
@@ -13361,12 +12683,12 @@
       alias: "elm/genlist/item_compress/4text.6icon.2/default";
       alias: "elm/genlist/item_compress_odd/4text.6icon.2/default";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4";
       data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.icon.5";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -13406,7 +12728,7 @@
          )
          GENLIST_PART_FLIP
       }
-      GENLIST_PROGRAMS_READ_TEXT1( target: "elm.text.1"; target: "elm.text.2";
+      GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.text.3"; target: "elm.text.4";
          target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2";
          target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; )
@@ -13424,12 +12746,12 @@
       alias: "elm/genlist/item_compress/4text.5icon.2/default";
       alias: "elm/genlist/item_compress_odd/4text.5icon.2/default";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4";
       data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -13466,7 +12788,7 @@
          )
          GENLIST_PART_FLIP
       }
-      GENLIST_PROGRAMS_READ_TEXT1( target: "elm.text.1"; target: "elm.text.2";
+      GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.text.3"; target: "elm.text.4";
          target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2";
          target: "elm.icon.3"; target: "elm.icon.4"; )
@@ -13483,12 +12805,12 @@
       alias: "elm/genlist/item_compress/4text.5icon.4/default";
       alias: "elm/genlist/item_compress_odd/4text.5icon.4/default";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4";
       data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -13524,7 +12846,7 @@
          )
          GENLIST_PART_FLIP
       }
-      GENLIST_PROGRAMS_READ_TEXT1( target: "elm.text.1"; target: "elm.text.2";
+      GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.text.3"; target: "elm.text.4";
          target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2";
          target: "elm.icon.3"; target: "elm.icon.4"; )
@@ -13541,12 +12863,12 @@
       alias: "elm/genlist/item_compress/4text.4icon.2/default";
       alias: "elm/genlist/item_compress_odd/4text.4icon.2/default";
 
-      GENLIST_DATA_ITEM_NORMAL
+      GENLIST_PROLOG_NORMAL
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3 elm.text.4";
       data.item: "contents" "elm.swallow.colorbar elm.icon.1 elm.icon.2 elm.icon.3";
 
       parts {
-         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BG_NORMAL
          GENLIST_PART_BASE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT
@@ -13580,7 +12902,7 @@
          )
          GENLIST_PART_FLIP
       }
-      GENLIST_PROGRAMS_READ_TEXT1( target: "elm.text.1"; target: "elm.text.2";
+      GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2";
          target: "elm.text.3"; target: "elm.text.4";
          target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2";
          target: "elm.icon.3"; )