projects / profile / ivi / efl-theme-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: bcb31e2)
Fix genlist white theme
authorTae-Hwan Kim <the81.kim@samsung.com>
Tue, 31 Jul 2012 14:56:50 +0000 (23:56 +0900)
committerTae-Hwan Kim <the81.kim@samsung.com>
Wed, 1 Aug 2012 01:45:01 +0000 (10:45 +0900)
Change-Id: I8d7459d945cb227670e9f3674726fbd4972f1358

Makefile patch | blob | history
themes/Makefile patch | blob | history
themes/inc/tizen-hd-inc.edc patch | blob | history
themes/tizen.edc patch | blob | history
themes/widgets/genlist/genlist.edc patch | blob | history
themes/widgets/genlist/genlist_decorate.edc patch | blob | history
themes/widgets/genlist/genlist_expandable.edc patch | blob | history
themes/widgets/genlist/genlist_groupindex.edc [moved from themes/widgets/genlist/genlist_group_index.edc with 94% similarity] patch | blob | history
themes/widgets/genlist/genlist_macro.edc patch | blob | history
themes/widgets/genlist/genlist_normal.edc patch | blob | history
themes/widgets/genlist/genlist_sweep.edc patch | blob | history

diff --git a/Makefile b/Makefile
index 8d3d9dc..943d5b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ PREFIX ?= /usr
 all:
        cd themes && make
 
-install: all
+install: 
        cd themes && make $@
 
 uninstall:
diff --git a/themes/Makefile b/themes/Makefile
index 38e9202..d6a743b 100644 (file)
--- a/themes/Makefile
+++ b/themes/Makefile
@@ -12,7 +12,7 @@ SRC=tizen.edc
 
 all: $(TARGET)
 
-$(TARGET):
+$(TARGET): clean
        cp -f ./inc/$(@:.edj=-inc.edc) ./inc/$(TMP_INC)
        edje_cc $(EDJE_FLAGS_$(V)) -id ./images/$(@:.edj=) -sd ./sounds -fd ../objects $(SRC) $@
 
diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index d3abf22..28f6cbd 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -111,8 +111,6 @@
 #define GENGRID_PART_REORDER_BG_COLOR_INC 0 0 0 128
 #define GENGRID_PART_TEXTBLOCK_STYLE_COLOR_INC "#F9F9F9"
 
-#define GENLIST_ICON_SMALL_SIZE 32
-
 #define GENLIST_DIALOGUE_SEPARATOR_DEFAULT_HEIGHT 40
 
 //FIXME: Change from GENLIST_TREESIZE_DEFAULT to below macro
@@ -138,7 +136,6 @@
 #define GENLIST_HEIGHT_89_INC 89
 #define GENLIST_HEIGHT_93_INC 93
 #define GENLIST_HEIGHT_97_INC 97
-#define GENLIST_HEIGHT_113_INC 113
 #define GENLIST_HEIGHT_129_INC 129
 #define GENLIST_HEIGHT_161_INC 161
 #define GENLIST_HEIGHT_163_INC 163
@@ -216,7 +213,6 @@
 #define GENLIST_SIZE_60_INC 60
 #define GENLIST_SIZE_61_INC 61
 #define GENLIST_SIZE_SLIDE_60_INC 60
-#define GENLIST_SIZE_ICON_BIG 64
 #define GENLIST_SIZE_66_INC 66
 #define GENLIST_SIZE_74_INC 74
 #define GENLIST_SIZE_SLIDE_74_INC 74
@@ -376,36 +372,6 @@
 
 #define GENLIST_SWEEP_BG_COLOR_INC 45 45 45 255
 
-//old
-#if 0
-#define GENLIST_PART_DISCLIP_COLOR_INC 255 255 255 110 // alpha was 64
-#define GENLIST_PART_BG_COLOR_INC 0 0 0 255
-#define GENLIST_PART_BG_SELECTED_COLOR_INC 50 65 74 255
-#define GENLIST_PART_BG_UNSELECTED_COLOR_INC 0 0 0 0
-#define GENLIST_PART_DIALOGUE_BG_COLOR_INC 15 15 15 255
-#define GENLIST_PART_SELECT_ALL_BG_COLOR_INC 239 237 230 255
-#define GENLIST_PART_TEXT_COLOR_INC 249 249 249 255
-#define GENLIST_PART_TEXT_SELECTED_COLOR_INC 249 249 249 255
-#define GENLIST_PART_SUB_TEXT_COLOR_INC 168 168 168 255
-#define GENLIST_PART_SUB_TEXT_SETTINGS_COLOR_INC 85 177 220 255
-#define GENLIST_PART_MULTILINE_TEXT_COLOR_INC GENLIST_PART_TEXT_COLOR_INC
-#define GENLIST_PART_MULTILINE_TITLE_COLOR_INC 149 149 149 255
-#define GENLIST_PART_MULTILINE_TITLE_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_MULTILINE_TITLE_STYLE_SELECTED_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_MULTILINE_TEXT_STYLE_COLOR_INC "#959595FF"
-#define GENLIST_PART_MULTILINE_SUB_TEXT_STYLE_COLOR_INC "#a8a8a8"
-#define GENLIST_PART_MULTILINE_TEXT_STYLE_SELECTED_COLOR_INC "#959595FF"
-#define GENLIST_PART_MULTILINE_HELP_STYLE_COLOR_INC "#b4b4b4"
-#define GENLIST_PART_MATCH_TAG_COLOR_INC "+ color=#3F8DAD"
-#define GENLIST_PART_SLIDE_TEXT_COLOR_INC 255 255 255 255
-#define GENLIST_PART_BOTTOM_LINE_INC 87 87 87 255
-#define GENLIST_PART_DIALOGUE_SUBTITLE_TEXT_COLOR_INC 168 168 168 255
-#define GENLIST_PART_DIALOGUE_INDICATOR_BG_COLOR_INC 87 87 87 255
-#define GENLIST_PART_EMAIL_READ_TEXT_COLOR_INC 108 108 108 255
-#define GENLIST_PART_EMAIL_UNREAD_TEXT_COLOR_INC 0 0 0 255
-#define GENLIST_PART_EMAIL_URGENCY_UNREAD_TEXT_COLOR_INC 207 37 37 255
-#define GENLIST_PART_EMAIL_URGENCY_READ_TEXT_COLOR_INC 171 82 82 255
-#endif
 #define GENLIST_PART_EMAIL_MSGCOUNT_TEXT_COLOR_INC 255 255 255 255
 #define GENLIST_PART_TEXTBLOCK_STYLE_COLOR_INC "#a8a8a8FF"
 #define GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC "#959595"
@@ -414,116 +380,6 @@
 #define GENLIST_PART_TEXTBLOCK_SUB_STYLE_COLOR_INC "#a8a8a8"
 #define GENLIST_PART_TEXTBLOCK_URGENCY_READ_STYLE_COLOR_INC "#AB5252"
 #define GENLIST_PART_TEXTBLOCK_URGENCY_UNREAD_STYLE_COLOR_INC "#CF2525"
-#if 0
-#define GENLIST_GROUP_PART_TEXT_COLOR_INC 164 164 164 255
-#define GENLIST_GROUP_PART_BASE_EVENT_INC \
-         part { name: "base_event";\
-            type: RECT;\
-            repeat_events: 0;\
-            description { state: "default" 0.0;\
-               color: 0 0 0 0;\
-            }\
-         }
-#define GENLIST_GROUP_PART_BASE_IMAGE_INC
-         part { name: "base_image";\
-            repeat_events: 1;\
-            description { state: "default" 0.0;\
-               rel1.to: "rect";\
-               rel2.to: "rect";\
-               image {\
-                  normal: "00_index list_bg.png";\
-               }\
-            }\
-         }
-#define GENLIST_GROUP_BG_COLOR_DEFAULT_INC 66 66 66 255
-#define GENLIST_GROUP_BG_COLOR_ALPHA_OFF_INC 66 66 66 255
-#define GENLIST_GROUP_LEFT_BG_COLOR_INC 15 15 15 255
-#define GENLIST_EDIT_PART_LINE_INC 41 40 36 150
-#define GENLIST_EDIT_PART_BOTTOM_LINE_INC 82 82 82 255
-#define GENLIST_EDIT_BG_COLOR_INC 0 0 0 255
-#define GENLIST_EDIT_SELECT_ALL_BG_COLOR_INC 36 36 36 255
-#define GENLIST_EXPANDABLE_PART_BG_COLOR_INC GENLIST_PART_BG_COLOR_INC
-#define GENLIST_EXPANDABLE2_PART_BG_COLOR_INC 15 15 15 255
-#define GENLIST_EXPANDABLE2_NOSHADOW_BG_COLOR_INC 15 15 15 255
-#define GENLIST_EXPANDABLE3_PART_BG_COLOR_INC 30 30 30 255
-#define GENLIST_EXPANDABLE_PART_BG_IMAGE_INC \
-         part { name: "bg_image"; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               image { \
-                  normal: "00_list_expandable_bg.png"; \
-                  border: 0 0 12 6; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "selected" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_list_bar_press_1x80.png"; \
-            } \
-            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
-          }
-#define GENLIST_PART_BG_EXPANDABLE3_IMAGE_INC \
-         part { name: "bg_image"; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               image { \
-                  normal: "00_list_expandable_2_bg.png"; \
-                  border: 0 0 12 6; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "selected" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_list_bar_press_1x80.png"; \
-            } \
-            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
-         }
-#define GENLIST_EXPANDABLE3_PART_BG_IMAGE_INC \
-         part { name: "bg_image"; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               image { \
-                  normal: "00_list_expandable_2_bg.png"; \
-                  border: 0 0 12 6; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "selected" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_list_bar_press_1x80.png"; \
-            } \
-            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
-         }
-#define GENLIST_EXPANDABLE3_NOSHADOW_PART_BG_IMAGE_INC \
-         part { name: "bg_image"; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               image { \
-                  normal: "00_list_expandable_2_noshadow_bg.png"; \
-                  border: 0 0 0 6; \
-                  border_scale: 1; \
-               } \
-            } \
-            description { state: "selected" 0.0; \
-               inherit: "default" 0.0; \
-               image.normal: "00_list_bar_press_1x80.png"; \
-            } \
-            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
-         }
-#define GENLIST_DIALOGUE_EXPANDABLE2_PART_BG_COLOR_INC 31 31 31 255
-#define GENLIST_DIALOGUE_EXPANDABLE3_PART_BG_COLOR_INC 46 46 46 255
-#define GENLIST_GROUP_PART_BUBBLE_TEXT_COLOR_INC 57 166 215 255
-#define GENLIST_GROUP_PART_BUBBLE_BG_COLOR_INC 36 43 44 255
-#define GENLIST_BUBBLE_BG_COLOR_INC 153 153 153 255
-#endif
 
 #define CONTACT_DISPLAY_NAME_FONT_COLOR_INC  255 255 255 255
 #define CONTACT_DISPLAY_NAME_FONT_GRAY_COLOR_INC 230 230 230 255
diff --git a/themes/tizen.edc b/themes/tizen.edc
index f16c73b..acf530f 100644 (file)
--- a/themes/tizen.edc
+++ b/themes/tizen.edc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved 
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * PROPRIETARY/CONFIDENTIAL
  *
@@ -63,7 +63,7 @@ collections {
 #include "widgets/dayselector.edc"
 #include "widgets/diskselector.edc"
 #include "widgets/editfield.edc"
-#include "widgets/entry.edc"
+//#include "widgets/entry.edc"
 #include "widgets/gengrid.edc"
 #include "widgets/genlist/genlist.edc"
 #include "widgets/index.edc"
@@ -77,7 +77,7 @@ collections {
 #include "widgets/panes.edc"
 #include "widgets/photocam.edc"
 #include "widgets/popup.edc"
-#include "widgets/progressbar.edc"
+//#include "widgets/progressbar.edc"
 #include "widgets/radio.edc"
 #include "widgets/scroller.edc"
 #include "widgets/segmentedcontrol.edc"
@@ -95,7 +95,7 @@ sounds{
        sound :"Waterdrop.wav" 0 100;
 }
 
-haptics{ 
+haptics{
     haptic {
       name:"1_haptic" ;
       magnitude: 8000 ;
diff --git a/themes/widgets/genlist/genlist.edc b/themes/widgets/genlist/genlist.edc
index 80dae2d..4c5178a 100644 (file)
--- a/themes/widgets/genlist/genlist.edc
+++ b/themes/widgets/genlist/genlist.edc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved 
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * PROPRIETARY/CONFIDENTIAL
  *
@@ -25,7 +25,7 @@
 
 #include "genlist_normal.edc"
 #include "genlist_sweep.edc"
-#include "genlist_group_index.edc"
+#include "genlist_groupindex.edc"
 #include "genlist_expandable.edc"
 #include "genlist_decorate.edc"
 #include "../scroller.edc"
diff --git a/themes/widgets/genlist/genlist_decorate.edc b/themes/widgets/genlist/genlist_decorate.edc
index 1434928..0ffb540 100644 (file)
--- a/themes/widgets/genlist/genlist_decorate.edc
+++ b/themes/widgets/genlist/genlist_decorate.edc
@@ -46,7 +46,7 @@
          }
          GENLIST_PART_PADDING_TOP( 0 )
          GENLIST_PART_PADDING_BOTTOM( 0 )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.padding.reorder";
             type: RECT;
@@ -438,7 +438,7 @@
          }
          GENLIST_PART_PADDING_TOP( 0 )
          GENLIST_PART_PADDING_BOTTOM( 0 )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.padding.reorder";
             type: RECT;
@@ -810,7 +810,7 @@
          }
          GENLIST_PART_PADDING_TOP( 0 )
          GENLIST_PART_PADDING_BOTTOM( 0 )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.decorate_bg";
             type: RECT;
@@ -1129,7 +1129,7 @@
          }
          GENLIST_PART_PADDING_TOP( 0 )
          GENLIST_PART_PADDING_BOTTOM( 0 )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.decorate_bg";
             type: RECT;
@@ -1360,7 +1360,7 @@
          }
          GENLIST_PART_PADDING_TOP( 0 )
          GENLIST_PART_PADDING_BOTTOM( 0 )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.decorate_bg";
             type: RECT;
@@ -1594,7 +1594,7 @@
          }
          GENLIST_PART_PADDING_TOP( 0 )
          GENLIST_PART_PADDING_BOTTOM( 0 )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.decorate_bg";
             type: RECT;
@@ -1783,7 +1783,7 @@
          }
          GENLIST_PART_PADDING_TOP( 0 )
          GENLIST_PART_PADDING_BOTTOM( 0 )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.decorate_bg";
             type: RECT;
@@ -1998,7 +1998,7 @@
          }
          GENLIST_PART_PADDING_TOP( 0 )
          GENLIST_PART_PADDING_BOTTOM( 0 )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.decorate_bg";
             type: RECT;
@@ -2227,7 +2227,7 @@
             repeat_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_HEIGHT_113_INC;
+               min: 0 GENLIST_HEIGHT_1LINE;
                color: GENLIST_PART_EDIT_SELECT_ALL_BG_COLOR_INC;
             }
          }
@@ -2243,8 +2243,8 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( 0 )
          GENLIST_PART_PADDING_BOTTOM( 0 )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.padding.icon.right";
             type: RECT;
@@ -2368,7 +2368,7 @@
             repeat_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_HEIGHT_113_INC;
+               min: 0 GENLIST_HEIGHT_1LINE;
                color: GENLIST_PART_EDIT_SELECT_ALL_BG_COLOR_INC;
             }
          }
@@ -2386,7 +2386,7 @@
          GENLIST_PART_PADDING_TOP( 0 )
          GENLIST_PART_PADDING_BOTTOM( 0 )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.padding.icon.right";
             type: RECT;
@@ -2520,7 +2520,7 @@
          }
          GENLIST_PART_PADDING_TOP( 0 )
          GENLIST_PART_PADDING_BOTTOM( 0 )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.padding.reorder";
             type: RECT;
diff --git a/themes/widgets/genlist/genlist_expandable.edc b/themes/widgets/genlist/genlist_expandable.edc
index 06b8f20..3db3263 100644 (file)
--- a/themes/widgets/genlist/genlist_expandable.edc
+++ b/themes/widgets/genlist/genlist_expandable.edc
@@ -34,10 +34,10 @@
       } \
       parts { \
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT() \
-         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_113_INC, GE_COLOR ) \
+         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_1LINE, GE_COLOR ) \
          GENLIST_PART_BOTTOM_EFFECT_LINE \
          GENLIST_PART_PADDING_LEFT( GE_LEFT ) \
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC ) \
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) \
          GENLIST_PART_EXPANDABLE_SWALLOW_PADDING  \
          part { name: "touch_arrow"; \
             type: RECT; \
@@ -65,8 +65,8 @@
             mouse_events: 0; \
             scale: 1; \
             description { state: "default" 0.0; \
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG; \
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG; \
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; \
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE; \
                fixed: 1 1; \
                align: 1.0 0.5; \
                aspect: 1.0 1.0; \
@@ -270,10 +270,10 @@
       } \
       parts { \
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT() \
-         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_113_INC, GE_COLOR ) \
+         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_1LINE, GE_COLOR ) \
          GENLIST_PART_BOTTOM_EFFECT_LINE \
          GENLIST_PART_PADDING_LEFT( GE_LEFT ) \
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC ) \
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT ) \
          GENLIST_PART_EXPANDABLE_SWALLOW_PADDING  \
          part { name: "elm.swallow.end"; \
             type: SWALLOW; \
@@ -460,7 +460,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
          GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "touch_arrow";
@@ -489,8 +489,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                align: 1.0 0.5;
                aspect: 1.0 1.0;
@@ -711,7 +711,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
          GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "touch_arrow";
@@ -740,8 +740,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                align: 1.0 0.5;
                aspect: 1.0 1.0;
@@ -1005,7 +1005,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
          GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "touch_arrow";
@@ -1034,8 +1034,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                align: 1.0 0.5;
                aspect: 1.0 1.0;
@@ -1299,7 +1299,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
          GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "touch_arrow";
@@ -1328,8 +1328,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                align: 1.0 0.5;
                aspect: 1.0 1.0;
@@ -1594,7 +1594,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
          GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "touch_arrow";
@@ -1623,8 +1623,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                align: 1.0 0.5;
                aspect: 1.0 1.0;
@@ -1925,10 +1925,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_113_INC, GENLIST_PART_EXPANDABLE_2ND_DEPTH_BG_COLOR_INC )
+         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_1LINE, GENLIST_PART_EXPANDABLE_2ND_DEPTH_BG_COLOR_INC )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
          GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "touch_arrow";
@@ -1957,8 +1957,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                align: 1.0 0.5;
                aspect: 1.0 1.0;
@@ -2175,7 +2175,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "elm.swallow.colorbar";
             clip_to: "disclip";
@@ -2214,8 +2214,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                align: 1.0 0.5;
                aspect: 1.0 1.0;
@@ -2269,8 +2269,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                align: 0.0 0.5;
                rel1 {
@@ -2516,10 +2516,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_113_INC, GENLIST_PART_EXPANDABLE_2ND_DEPTH_BG_COLOR_INC )
+         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_1LINE, GENLIST_PART_EXPANDABLE_2ND_DEPTH_BG_COLOR_INC )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
          GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "elm.text";
@@ -2670,10 +2670,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_113_INC, GENLIST_PART_EXPANDABLE_2ND_DEPTH_BG_COLOR_INC )
+         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_1LINE, GENLIST_PART_EXPANDABLE_2ND_DEPTH_BG_COLOR_INC )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
          GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "elm.padding.icon.right";
@@ -2866,10 +2866,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_113_INC, GENLIST_PART_EXPANDABLE_2ND_DEPTH_BG_COLOR_INC )
+         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_1LINE, GENLIST_PART_EXPANDABLE_2ND_DEPTH_BG_COLOR_INC )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
          GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "elm.padding.icon.right";
@@ -2892,8 +2892,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                align: 0.0 0.5;
                rel1 {
@@ -3063,10 +3063,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_113_INC, GENLIST_PART_EXPANDABLE_2ND_DEPTH_BG_COLOR_INC )
+         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_1LINE, GENLIST_PART_EXPANDABLE_2ND_DEPTH_BG_COLOR_INC )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
          GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "elm.padding.icon1.right";
@@ -3125,8 +3125,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                align: 0.0 0.5;
                rel1 {
@@ -3303,10 +3303,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_113_INC, GENLIST_PART_EXPANDABLE_3ND_DEPTH_BG_COLOR_INC )
+         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_1LINE, GENLIST_PART_EXPANDABLE_3ND_DEPTH_BG_COLOR_INC )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
          GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "elm.text";
@@ -3457,7 +3457,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_113_INC, GENLIST_PART_EXPANDABLE_3ND_DEPTH_BG_COLOR_INC )
+         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_1LINE, GENLIST_PART_EXPANDABLE_3ND_DEPTH_BG_COLOR_INC )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_SIZE_48_INC )
          GENLIST_PART_PADDING_RIGHT( GENLIST_SIZE_16_INC )
@@ -3627,7 +3627,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             scale: 1;
             source: "elm/genlist/tree/1text.1/expandable_n_depth/effect_parts/default";
             description {
-               min: 16 GENLIST_HEIGHT_113_INC;
+               min: 16 GENLIST_HEIGHT_1LINE;
                state: "default" 0.0;
             }
             GENLIST_PART_MAP_START(-90.0, 0, 0)
@@ -3687,10 +3687,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
          image: "00_expandable_icon_folder_minus.png" COMP;
       }
       parts {
-         GENLIST_EXPANDABLE_PART_BASE_NEW( GENLIST_HEIGHT_113_INC, GENLIST_PART_BG_COLOR_INC )
+         GENLIST_EXPANDABLE_PART_BASE_NEW( GENLIST_HEIGHT_1LINE, GENLIST_PART_BG_COLOR_INC )
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.swallow.pad";
             type: SWALLOW;
             description { state: "default" 0.0;
@@ -3744,8 +3744,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                align: 0.0 0.5;
                aspect: 1.0 1.0;
@@ -3862,7 +3862,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             scale: 1;
             source: "elm/genlist/tree/1text.2/expandable_n_depth/effect_parts/default";
             description {
-               min: 16 GENLIST_HEIGHT_113_INC;
+               min: 16 GENLIST_HEIGHT_1LINE;
                state: "default" 0.0;
             }
             GENLIST_PART_MAP_START(-90.0, 0, 0)
diff --git a/themes/widgets/genlist/genlist_group_index.edc b/themes/widgets/genlist/genlist_groupindex.edc
similarity index 94%
rename from themes/widgets/genlist/genlist_group_index.edc
rename to themes/widgets/genlist/genlist_groupindex.edc
index 700e34c..36662cf 100644 (file)
--- a/themes/widgets/genlist/genlist_group_index.edc
+++ b/themes/widgets/genlist/genlist_groupindex.edc
@@ -19,7 +19,11 @@
  * vim:ts=3:expandtab
 */
 // 2.1.1
-   group { name: "elm/genlist/item/grouptitle/default";
+   group { name: "elm/genlist/item/groupindex/default";
+      alias: "elm/genlist/item_odd/groupindex/default";
+      alias: "elm/genlist/item_compress/groupindex/default";
+      alias: "elm/genlist/item_compress_odd/groupindex/default";
+         alias: "elm/genlist/item/grouptitle/default";
       alias: "elm/genlist/item_odd/grouptitle/default";
       alias: "elm/genlist/item_compress/grouptitle/default";
       alias: "elm/genlist/item_compress_odd/grouptitle/default";
@@ -34,8 +38,8 @@
       }
       parts {
          GENLIST_PART_INDEX_LIST_BASE_EVENT_INC
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "rect";
             type: RECT;
             repeat_events: 1;
@@ -98,6 +102,8 @@
       }
    }
 
+
+// FIXME: it seems that belows are not used anymore.
    group { name : "elm/genlist/item/grouptitle.readmessage/default";
       alias: "elm/genlist/item_odd/grouptitle.readmessage/default";
       alias: "elm/genlist/item_compress/grouptitle.readmessage/default";
@@ -230,8 +236,8 @@
 
       parts {
          GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_65_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.text";
             type: TEXT;
diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index d864fe3..1e8948b 100644 (file)
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -16,6 +16,41 @@
  *
  */
 
+// *************** Default Size Macro **************** //
+// if size is different for each theme, split it into each theme inc.
+
+
+#define GENLIST_HEIGHT_1LINE 113  // excep bottom 1 line
+//FIXME: Change from GENLIST_TREESIZE_DEFAULT to below macro
+#define GENLIST_TREESIZE_DEFAULT 32
+
+#define GENLIST_PADDING_SIZE_DEFAULT   16
+#define GENLIST_PADDING_SIZE_LEFT      GENLIST_PADDING_SIZE_DEFAULT
+#define GENLIST_PADDING_SIZE_RIGHT     GENLIST_PADDING_SIZE_DEFAULT
+
+#define GENLIST_TEXT2_WIDTH_MIN 150
+
+#define GENLIST_TEXT_BTN_HEIGHT   72
+#define GENLIST_ICON_SMALL_SIZE   32
+#define GENLIST_ICON_BIG_SIZE     64
+#define GENLIST_ICON_ONOFF_HEIGHT 80
+#define GENLIST_ICON_ONOFF_WIDTH  60
+#define GENLIST_ICON_CHECK_SIZE   60
+#define GENLIST_ICON_RADIO_SIZE   60
+
+// Group Title
+#define GENLIST_GT_PAD_T_H 36
+#define GENLIST_GT_PAD_B_H 10
+#define GENLIST_GT_TEXT_H  36
+#define GENLIST_GT_PAD_L_W 16
+#define GENLIST_GT_PAD_R_W 36
+#define GENLIST_GT_PAD_M_W 16
+#define GENLIST_GT_H       GENLIST_GT_PAD_T_H + GENLIST_GT_PAD_B_H + GENLIST_GT_TEXT_H
+
+#define GENLIST_DIALOGUE_SEPARATOR_DEFAULT_HEIGHT 40
+
+
+// *************** Function Macro ******************* //
 #define GENLIST_PART_BASE( param_item_height ) \
          part { name: "base"; \
             type: RECT; \
@@ -27,6 +62,17 @@
             } \
          }
 
+#define GENLIST_PART_BASE_BG( param_item_height ) \
+         part { name: "base"; \
+            type: RECT; \
+            repeat_events: 1; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: 0 param_item_height; \
+               color: GENLIST_PART_BG_COLOR_INC; \
+            } \
+         }
+
 /// This block events
 #define GENLIST_PART_BASE_EVENT_OFF \
          part { name: "base_event";\
diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index 40edde5..390f828 100644 (file)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -42,8 +42,8 @@
          GENLIST_PART_BASE( GENLIST_HEIGHT_93_INC )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.swallow.end";
             clip_to: "disclip";
             type: SWALLOW;
@@ -152,11 +152,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.swallow.end";
             clip_to: "disclip";
             type: SWALLOW;
@@ -254,90 +254,13 @@
       }
    }
 
-   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";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "contents" "elm.icon";
-      parts {
-         part { name: "base";
-            type: RECT;
-            repeat_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               color: GENLIST_PART_BG_COLOR_INC;
-            }
-         }
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-            }
-         }
-         GENLIST_PART_DISCLIP
-      }
-      programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-      }
-   }
-
-   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";
-      inherit: "elm/genlist/item/1icon/with_no_line/default";
-      parts {
-         part { name: "bottom_line";
-            insert_after: "elm.padding.right";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: 0 1;
-               fixed: 0 1;
-               visible: 1;
-               color: GENLIST_PART_LIST_LINE_COLOR_INC;
-               rel1 {
-                  relative: 0.0 1.0;
-                  offset: 0 -1;
-               }
-            }
-         }
-      }
-   }
-
-// 3.1.1
+// Tizen Theme -------------------------------------------------------------------
+// 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";
+
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text";
@@ -346,17 +269,21 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_DISCLIP
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         GENLIST_PART_FLIP
          part { name: "elm.text";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               align: 0.0 0.5;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                rel1 {
                   relative: 1.0 0.0;
                   to_x: "elm.padding.left";
@@ -365,11 +292,10 @@
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
                }
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_44_INC;
-                  min: 0 1;
+                  max: 1 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
                }
@@ -381,8 +307,6 @@
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -417,19 +341,16 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         //GENLIST_PROGRAM_FLIP_1TEXT
+         GENLIST_PROGRAM_FLIP_1TEXT
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
-
+// 2.2.1.1 (textblock)
    group { name: "elm/genlist/item_compress/1text.tb/default";
       inherit: "elm/genlist/item/1text/default";
       parts {
          part { name: "elm.text";
-            clip_to: "disclip";
             type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 0.0;
@@ -442,13 +363,12 @@
                align: 0.0 0.5;
                text {
                   style: "genlist_default_textblock_style";
-                  size: GENLIST_FONT_44_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
+               // FIXME: Why color textblock of is not changed by text.style?
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
                text.style: "genlist_default_textblock_selected_style";
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
@@ -456,318 +376,214 @@
          }
       }
    }
+// scaled automatically by icon size
+// 2.2.1.5
+// 2.2.1.6
+// 2.2.1.7
+   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";
+         alias: "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 { name: "elm/genlist/item/1text.2/default";
-      alias: "elm/genlist/item_odd/1text.2/default";
-      alias: "elm/genlist/item_compress/1text.2/default";
-      alias: "elm/genlist/item_compress_odd/1text.2/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+      inherit: "elm/genlist/item/1text/default";
+
+      data.item: "contents" "elm.icon";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "temp_center_line"; //temporary
-            clip_to: "disclip";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
+         part { name: "elm.text";
             description { state: "default" 0.0;
-               rel1 {
-                  relative: 0.0 0.5;
-                  to: "base";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon";
+                  offset: -GENLIST_PADDING_SIZE_DEFAULT 0;
                }
+            }
+            description { state: "selected" 0.0;
                rel2 {
-                  relative: 1.0 0.5;
-                  to: "base";
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon";
+                  offset: -GENLIST_PADDING_SIZE_DEFAULT 0;
                }
             }
          }
-         part { name: "elm.text";
+         part { name: "elm.icon";
             clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
+            type: SWALLOW;
             scale: 1;
-            multiline: 0;
             description { state: "default" 0.0;
                fixed: 1 1;
+               align: 1.0 0.5;
                rel1 {
-                  relative: 1.0 0.5;
-                  to_x: "elm.padding.left";
-                  to_y: "temp_center_line";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
                }
                rel2 {
-                  relative: 0.0 0.5;
+                  relative: 0.0 1.0;
                   to_x: "elm.padding.right";
-                  to_y: "temp_center_line";
                }
-               align: 0.0 0.5;
-               text {
-                  style: "genlist_default_textblock_style";
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
             }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
       }
       programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            GENLIST_PROGRAM_SCRIPT_FLIP_SELECT_1TEXT
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
+         GENLIST_PROGRAM_FLIP_1TEXT_1ICON
+      }
+   }
+// 2.2.1.4
+   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";
+      inherit: "elm/genlist/item/1text.1icon/default";
+
+      parts {
+         part { name: "elm.icon";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               min: 0 GENLIST_TEXT_BTN_HEIGHT;
+                          max: 0 GENLIST_TEXT_BTN_HEIGHT;
+
+            }
          }
-         //GENLIST_PROGRAM_FLIP_1TEXT
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
+// 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";
+      inherit: "elm/genlist/item/1text.1icon/default";
 
-// 3.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";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
+      parts {
+         part { name: "elm.icon";
+            description { state: "default" 0.0;
+               rel1.offset: GENLIST_PADDING_SIZE_DEFAULT 0;
+               rel2.offset: GENLIST_PADDING_SIZE_DEFAULT 0;
+            }
+         }
       }
+   }
+
+// Scalable icon
+   group { name: "elm/genlist/item/1text.1icon.1/default";
+      alias: "elm/genlist/item_odd/1text.1icon.1/default";
+      alias: "elm/genlist/item_compress/1text.1icon.1/default";
+      alias: "elm/genlist/item_compress_odd/1text.1icon.1/default";
+      inherit: "elm/genlist/item/1text.1icon/default";
+
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
+         part { name: "elm.text";
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_133_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.padding.right";
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon";
+                  offset: GENLIST_PADDING_SIZE_DEFAULT 0;
+               }
                rel2 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
                }
-               align: 1.0 0.5;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 1.0 0.5;
-                  text_class: "slp_medium";
-               }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
+
          }
-         part { name: "elm.padding.text2.left";
-            clip_to: "disclip";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.text.2";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text.2";
-               }
-               visible: 0;
-               align: 1.0 0.5;
-            }
-         }
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
+         part { name: "elm.icon";
             description { state: "default" 0.0;
+               align: 0.0 0.5;
                rel1 {
                   relative: 1.0 0.0;
                   to_x: "elm.padding.left";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.text2.left";
-               }
-               align: 0.0 0.5;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
                }
             }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
-            }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
-      }
-      programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_2TEXT
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
+// 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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "texts" "elm.text";
+      data.item: "contents" "elm.icon.1 elm.icon.2";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.text.2";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.1";
+            type: SWALLOW;
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_133_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.padding.right";
+               min: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
+               max: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+               }
                rel2 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
                }
                align: 1.0 0.5;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_SETTINGS_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 1.0 0.5;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.text2.left";
-            clip_to: "disclip";
+         part { name: "elm.padding.icon1.left";
             type: RECT;
-            mouse_events: 0;
+            clip_to: "disclip";
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE 0;
+               min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.text.2";
+               visible: 0;
+               rel1.to_x: "elm.icon.1";
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.text.2";
+                  to_x: "elm.icon.1";
                }
-               visible: 0;
-               align: 1.0 0.5;
+               align: 1.0 0.0;
             }
          }
-         part { name: "elm.text.1";
+         part { name: "elm.padding.icon1.left2";
+            type: RECT;
             clip_to: "disclip";
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_64_INC 0;
+               fixed: 1 0;
+               visible: 0;
+               rel1.to_x: "elm.icon.1";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.1";
+               }
+               align: 1.0 0.0;
+            }
+         }
+         part { name: "elm.text";
             type: TEXT;
+            clip_to: "disclip";
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
@@ -777,7 +593,7 @@
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.text2.left";
+                  to_x: "elm.padding.icon1.left2";
                }
                align: 0.0 0.5;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
@@ -785,6 +601,7 @@
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_44_INC;
                   min: 0 1;
+                  max: 1 0;
                   align: 0.0 0.5;
                   text_class: "list_item";
                }
@@ -795,22 +612,62 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+         part { name: "elm.padding.text.right";
+            type: RECT;
+            clip_to: "disclip";
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.text";
+               }
+               rel2.to_x: "elm.text";
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.icon.2.rect";
+            type: RECT;
+            clip_to: "disclip";
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.text.right";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon1.left";
+               }
+               align: 0.0 0.5;
+               color: 0 0 0 0;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.icon.2";
+            type: SWALLOW;
+            clip_to: "disclip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "elm.icon.2.rect";
+               rel2.to: "elm.icon.2.rect";
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
          GENLIST_PART_FLIP
          GENLIST_PART_DISCLIP
       }
       programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
          program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
+            target: "elm.text";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -818,8 +675,7 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
+            target: "elm.text";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -834,156 +690,189 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT
+         GENLIST_PROGRAM_FLIP_1TEXT_2ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-//3.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";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text";
-      data.item: "contents" "elm.icon";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+   group { name: "elm/genlist/item_compress/1text.2icon.3.tb/default";
+      inherit: "elm/genlist/item/1text.2icon.3/default";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon";
+         part { name: "elm.text";
+            type: TEXTBLOCK;
             clip_to: "disclip";
-            type: SWALLOW;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to_x: "elm.padding.right";
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+               }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon1.left2";
                }
-               align: 1.0 0.5;
+               align: 0.0 0.5;
+               text {
+                  style: "genlist_default_textblock_style";
+                  min: 0 1;
+                  max: 1 0;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_default_textblock_selected_style";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
+      }
+   }
+
+
+// 2.2.1.10
+// 2.2.1.20
+   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";
+      inherit: "elm/genlist/item/1text.1icon.1/default";
+
+      parts {
+         part { name: "elm.icon";
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.icon";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon";
-               }
-               align: 1.0 0.0;
-               visible: 0;
+               fixed: 1 1;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+      }
+   }
+
+// 2.2.1.10 textblock
+   group { name: "elm/genlist/item_compress/1text.1icon.2.tb/default";
+      inherit: "elm/genlist/item/1text.1icon.2/default";
+      parts {
          part { name: "elm.text";
             clip_to: "disclip";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               align: 0.0 0.5;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.icon";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon.left";
+                  to_x: "elm.padding.right";
                }
-               align: 0.0 0.5;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
+                  style: "genlist_default_textblock_style";
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "list_item";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
+               // FIXME: Why is not textblock changed by text.style?
                color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               text.style: "genlist_default_textblock_selected_style";
             }
+            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
       }
-      programs {
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
+   }
+
+// 2.2.1.16
+   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";
+      inherit: "elm/genlist/item/1text.1icon.1/default";
+
+      parts {
+         part { name: "elm.icon";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               min: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE;
+               max: GENLIST_ICON_CHECK_SIZE GENLIST_ICON_CHECK_SIZE;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         GENLIST_PROGRAM_FLIP_1TEXT_1ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
+
+// 2.2.1.13
+// 2.2.1.14
+// 2.2.1.15
+   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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text";
-      data.item: "contents" "elm.icon";
+      data.item: "contents" "elm.icon.1 elm.icon.2";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
-               rel1.to_x: "elm.padding.right";
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+               }
+               align: 0.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.icon1.right";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_SIZE_16_INC 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.1";
+               }
+               rel2.to_x: "elm.icon.1";
+               visible: 0;
+            }
+         }
+         part { name: "elm.icon.2";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+               }
                rel2 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
@@ -992,17 +881,17 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon.left";
+         part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.icon";
+               rel1.to_x: "elm.icon.2";
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.icon";
+                  to_x: "elm.icon.2";
                }
                align: 1.0 0.0;
                visible: 0;
@@ -1016,11 +905,11 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.icon1.right";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon.left";
+                  to_x: "elm.padding.icon2.left";
                }
                align: 0.0 0.5;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
@@ -1070,60 +959,92 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_1TEXT_1ICON
+         GENLIST_PROGRAM_FLIP_1TEXT_2ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
+// 2.2.1.18
+   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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text";
-      data.item: "contents" "elm.icon";
+      data.item: "contents" "elm.icon.1 elm.icon.2";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
-               max: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
+               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
                fixed: 1 1;
-               rel1.to_x: "elm.padding.right";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
                }
-               align: 1.0 0.5;
+               rel2.to_x: "elm.padding.left";
+               align: 0.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon.left";
+         part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.icon";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon";
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.1";
                }
-               align: 1.0 0.0;
+               rel2.to_x: "elm.icon.1";
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.icon.2";
+            clip_to: "disclip";
+            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;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.icon1.right";
+               }
+               rel2.to_x: "elm.padding.icon1.right";
+               align: 0.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.icon2.right";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.2";
+               }
+               rel2.to_x: "elm.icon.2";
+               align: 0.0 0.5;
                visible: 0;
             }
          }
@@ -1135,11 +1056,11 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.icon2.right";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon.left";
+                  to_x: "elm.padding.right";
                }
                align: 0.0 0.5;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
@@ -1189,16 +1110,16 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_1TEXT_1ICON
+         GENLIST_PROGRAM_FLIP_1TEXT_2ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
+// 3.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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text";
@@ -1208,76 +1129,95 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.1";
-            type: SWALLOW;
             clip_to: "disclip";
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
-               max: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
                }
-               align: 1.0 0.5;
+               align: 0.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon1.left";
-            type: RECT;
+         part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               visible: 0;
-               rel1.to_x: "elm.icon.1";
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.1";
+               }
+               rel2.to_x: "elm.icon.1";
+               visible: 0;
+            }
+         }
+         part { name: "elm.icon.2";
+            clip_to: "disclip";
+            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;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+               }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.icon.1";
+                  to_x: "elm.padding.right";
                }
-               align: 1.0 0.0;
+               align: 1.0 0.5;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon1.left2";
-            type: RECT;
+         part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_64_INC 0;
+               min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               visible: 0;
-               rel1.to_x: "elm.icon.1";
+               rel1.to_x: "elm.icon.2";
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.icon.1";
+                  to_x: "elm.icon.2";
                }
                align: 1.0 0.0;
+               visible: 0;
             }
          }
          part { name: "elm.text";
-            type: TEXT;
             clip_to: "disclip";
+            type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.icon1.right";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon1.left2";
+                  to_x: "elm.padding.icon2.left";
                }
                align: 0.0 0.5;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
@@ -1285,7 +1225,6 @@
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_44_INC;
                   min: 0 1;
-                  max: 1 0;
                   align: 0.0 0.5;
                   text_class: "list_item";
                }
@@ -1296,51 +1235,6 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.text.right";
-            type: RECT;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.text";
-               }
-               rel2.to_x: "elm.text";
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.2.rect";
-            type: RECT;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.text.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon1.left";
-               }
-               align: 0.0 0.5;
-               color: 0 0 0 0;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.icon.2";
-            type: SWALLOW;
-            clip_to: "disclip";
-            description { state: "default" 0.0;
-               rel1.to: "elm.icon.2.rect";
-               rel2.to: "elm.icon.2.rect";
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
          GENLIST_PART_FLIP
          GENLIST_PART_DISCLIP
       }
@@ -1378,28 +1272,27 @@
       }
    }
 
-   group { name: "elm/genlist/item_compress/1text.2icon.3.tb/default";
-      inherit: "elm/genlist/item/1text.2icon.3/default";
+   group { name: "elm/genlist/item_compress/1text.2icon.6.tb/default";
+      inherit: "elm/genlist/item/1text.2icon.6/default";
       parts {
          part { name: "elm.text";
-            type: TEXTBLOCK;
             clip_to: "disclip";
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.icon1.right";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon1.left2";
+                  to_x: "elm.padding.icon2.left";
                }
                align: 0.0 0.5;
                text {
                   style: "genlist_default_textblock_style";
                   min: 0 1;
-                  max: 1 0;
                   align: 0.0 0.5;
                }
             }
@@ -1412,100 +1305,98 @@
       }
    }
 
-// 3.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";
+// 2Text -------------------------------------------------------------------------
+// 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";
+
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text";
-      data.item: "contents" "elm.icon";
-      data.item: "flips" "elm.flip.content";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "flips" "elm.flip.icon elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_DISCLIP
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         GENLIST_PART_FLIP
+         part { name: "elm.text.1";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               fixed: 1 1;
+               align: 0.0 0.5;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                rel1 {
                   relative: 1.0 0.0;
                   to_x: "elm.padding.left";
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 1.0;
+                  to_x: "elm.text.2";
                }
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon";
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_44_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "list_item";
                }
-               rel2.to_x: "elm.icon";
-               visible: 0;
             }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text";
+         part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               fixed: 1 0;
+               min: GENLIST_TEXT2_WIDTH_MIN 0;
+               align: 1.0 0.5;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon.right";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
                }
                rel2 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
                }
-               align: 0.0 0.5;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
                   min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
+                  align: 1.0 0.5;
+                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
       }
       programs {
-         program { name: "go_active";
+       program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            GENLIST_PROGRAM_SCRIPT_FLIP_SELECT_1TEXT
+            GENLIST_PROGRAM_SCRIPT_FLIP_SELECT_2TEXT
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -1513,7 +1404,8 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -1528,46 +1420,29 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_1TEXT_1ICON
+         GENLIST_PROGRAM_FLIP_2TEXT
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-   group { name: "elm/genlist/item_compress/1text.1icon.2.tb/default";
-      inherit: "elm/genlist/item/1text.1icon.2/default";
+// 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";
+      inherit: "elm/genlist/item/2text/default";
+
       parts {
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
+         part { name: "elm.text.2";
             description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-               align: 0.0 0.5;
-               text {
-                  style: "genlist_default_textblock_style";
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_SETTINGS_COLOR_INC;
             }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
       }
    }
 
 
+// 2.2.1.11
 // 3.1.11
    group { name: "elm/genlist/item/2text.1icon/default";
       alias: "elm/genlist/item_odd/2text.1icon/default";
@@ -1582,18 +1457,18 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
@@ -1737,7 +1612,7 @@
       }
    }
 
-// 3.1.12
+// 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";
@@ -1751,18 +1626,18 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
@@ -1906,41 +1781,39 @@
       }
    }
 
-// 3.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";
+
+// 3.1.19
+   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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text";
-      data.item: "contents" "elm.icon.1 elm.icon.2";
+      data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
                   to_x: "elm.padding.left";
                }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-               }
+               rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -1950,13 +1823,14 @@
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
+               min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
                rel1 {
                   relative: 1.0 0.0;
                   to_x: "elm.icon.1";
                }
                rel2.to_x: "elm.icon.1";
+               align: 0.0 0.0;
                visible: 0;
             }
          }
@@ -1965,31 +1839,65 @@
             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;
                fixed: 1 1;
                rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.icon1.right";
                }
-               align: 1.0 0.5;
+               rel2.to_x: "elm.padding.icon1.right";
+               align: 0.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon2.left";
+         part { name: "elm.padding.icon2.right";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.icon.2";
-               rel2 {
-                  relative: 0.0 1.0;
+               rel1 {
+                  relative: 1.0 0.0;
                   to_x: "elm.icon.2";
                }
+               rel2.to_x: "elm.icon.2";
+               visible: 0;
+            }
+         }
+         part { name: "elm.icon.3";
+            clip_to: "disclip";
+            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;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+               }
+               align: 1.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.icon3.left";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.icon.3";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.3";
+               }
                align: 1.0 0.0;
                visible: 0;
             }
@@ -2002,11 +1910,11 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.icon2.right";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
+                  to_x: "elm.padding.icon3.left";
                }
                align: 0.0 0.5;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
@@ -2056,46 +1964,43 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_1TEXT_2ICON
+         GENLIST_PROGRAM_FLIP_1TEXT_3ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
+// 3.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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text";
-      data.item: "contents" "elm.icon.1 elm.icon.2";
+      data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
                   to_x: "elm.padding.left";
                }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-               }
+               rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -2112,24 +2017,55 @@
                   to_x: "elm.icon.1";
                }
                rel2.to_x: "elm.icon.1";
+               align: 0.0 0.5;
                visible: 0;
             }
          }
-         part { name: "elm.icon.2";
+         part { name: "elm.icon.3";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
+               rel1.to_x: "elm.padding.right";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+               }
+               align: 1.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.icon3.left";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
                rel1 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.icon.3";
                }
+               rel2.to_x: "elm.icon.3";
+               align: 1.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.icon.2";
+            clip_to: "disclip";
+            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;
+               fixed: 1 1;
+               rel1.to_x: "elm.padding.icon3.left";
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon3.left";
                }
                align: 1.0 0.5;
             }
@@ -2142,12 +2078,12 @@
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.icon.2";
-               rel2 {
-                  relative: 0.0 1.0;
+               rel1 {
+                  relative: 0.0 0.0;
                   to_x: "elm.icon.2";
                }
-               align: 1.0 0.0;
+               rel2.to_x: "elm.icon.2";
+               align: 0.0 0.5;
                visible: 0;
             }
          }
@@ -2213,95 +2149,106 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_1TEXT_2ICON
+         GENLIST_PROGRAM_FLIP_1TEXT_3ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-   group { name: "elm/genlist/item_compress/1text.2icon.6.tb/default";
-      inherit: "elm/genlist/item/1text.2icon.6/default";
+// 3.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";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "flips" "elm.flip.content";
+      images {
+         image: "00_list_bar_press_1x80.png" COMP;
+      }
       parts {
-         part { name: "elm.text";
+         GENLIST_PART_BASE( GENLIST_HEIGHT_97_INC )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.text.2";
             clip_to: "disclip";
-            type: TEXTBLOCK;
+            type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
-               }
+               min: GENLIST_SIZE_206_INC 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.padding.right";
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
+                  to_x: "elm.padding.right";
                }
-               align: 0.0 0.5;
+               align: 1.0 0.5;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
-                  style: "genlist_default_textblock_style";
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
                   min: 0 1;
                   align: 0.0 0.5;
+                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-      }
-   }
-
-   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";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text";
-      data.item: "contents" "elm.icon";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
-      parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
+         part { name: "elm.padding.text2.left";
+            type: RECT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.text.2";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.text.2";
                }
-               rel2.to_x: "elm.padding.left";
-               align: 0.0 0.5;
+               align: 1.0 0.5;
+               visible: 0;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon.right";
-            clip_to: "disclip";
+         part { name: "vertical_line";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: 1 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.padding.text2.left";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.text2.left";
+               }
+               align: 1.0 0.5;
+               color: GENLIST_PART_LIST_LINE_COLOR_INC;
+            }
+         }
+         part { name: "elm.padding.text1.right";
             type: RECT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon";
+               rel1.to_x: "vertical_line";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "vertical_line";
                }
-               rel2.to_x: "elm.icon";
+               align: 1.0 0.5;
                visible: 0;
             }
          }
-         part { name: "elm.text";
+         part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
@@ -2309,19 +2256,18 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.icon.right";
+                  to_x: "elm.padding.left";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 0.0  1.0;
+                  to_x: "elm.padding.text1.right";
                }
-               align: 0.0 0.5;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               color: GENLIST_PART_FONT_CONVERTOR_STYLE_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
+                  size: GENLIST_FONT_40_INC;
                   min: 0 1;
-                  align: 0.0 0.5;
+                  align: 1.0 0.5;
                   text_class: "list_item";
                }
             }
@@ -2335,12 +2281,18 @@
          GENLIST_PART_DISCLIP
       }
       programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
          program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -2348,7 +2300,8 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -2363,99 +2316,118 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_1TEXT_1ICON
+         program { name: "flip_enabled";
+            signal: "elm,state,flip,enabled";
+            source: "elm";
+            action: STATE_SET "flip_enabled" 0.0;
+            target: "elm.text.1";
+            target: "elm.flip.content";
+         }
+         program { name: "flip_disabled";
+            signal: "elm,state,flip,disabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text.1";
+            target: "elm.flip.content";
+         }
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
+// 3.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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text";
-      data.item: "contents" "elm.icon.1 elm.icon.2";
+      data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.1";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.text.1";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               fixed: 1 1;
+               min: GENLIST_SIZE_133_INC 0;
+               fixed: 1 0;
                rel1 {
                   relative: 1.0 0.0;
                   to_x: "elm.padding.left";
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "slp_medium";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon1.right";
-            clip_to: "disclip";
+         part { name: "elm.padding.text1.right";
             type: RECT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
+                   relative: 1.0 0.0;
+                   to_x: "elm.text.1";
                }
-               rel2.to_x: "elm.icon.1";
+               rel2.to_x: "elm.text.1";
+               align: 0.0 0.5;
                visible: 0;
             }
          }
-         part { name: "elm.icon.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
+         part { name: "vertical_line";
+            type: RECT;
+            mouse_events: 0;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-               }
+               min: 1 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.padding.text1.right";
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.text1.right";
                }
-               align: 1.0 0.5;
+               align: 0.0 0.5;
+               color: GENLIST_PART_LIST_LINE_COLOR_INC;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon2.left";
-            clip_to: "disclip";
+         part { name: "elm.padding.text2.left";
             type: RECT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.icon.2";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.2";
+               rel1 {
+                   relative: 1.0 0.0;
+                   to_x: "vertical_line";
                }
-               align: 1.0 0.0;
+               rel2.to_x: "vertical_line";
+               align: 0.0 0.5;
                visible: 0;
             }
          }
-         part { name: "elm.text";
+         part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
@@ -2463,13 +2435,12 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.text2.left";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
+                  relative: 0.0  1.0;
+                  to_x: "elm.padding.right";
                }
-               align: 0.0 0.5;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
@@ -2489,12 +2460,18 @@
          GENLIST_PART_DISCLIP
       }
       programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
          program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -2502,7 +2479,8 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -2517,117 +2495,102 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_1TEXT_2ICON
+         program { name: "flip_enabled";
+            signal: "elm,state,flip,enabled";
+            source: "elm";
+            action: STATE_SET "flip_enabled" 0.0;
+            target: "elm.text.2";
+            target: "elm.flip.content";
+         }
+         program { name: "flip_disabled";
+            signal: "elm,state,flip,disabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text.2";
+            target: "elm.flip.content";
+         }
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.1.18
-   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";
+// 3.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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text";
-      data.item: "contents" "elm.icon.1 elm.icon.2";
+      data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.1";
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.text.1";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               fixed: 1 1;
+               min: 0 GENLIST_SIZE_61_INC;
+               fixed: 0 1;
                rel1 {
-                  relative: 1.0 0.0;
+                  relative: 1.0 1.0;
                   to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
                }
-               rel2.to_x: "elm.padding.left";
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon1.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
                }
-               rel2.to_x: "elm.icon.1";
                align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_44_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "list_item";
                }
-               rel2.to_x: "elm.padding.icon1.right";
-               align: 0.0 0.5;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon2.right";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.2";
-               }
-               rel2.to_x: "elm.icon.2";
-               align: 0.0 0.5;
-               visible: 0;
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text";
+         part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon2.right";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 0.0 1.0;
+                  relative: 0.0 0.0;
                   to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.5;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               align: 0.0 0.0;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "list_item";
+                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
@@ -2640,12 +2603,18 @@
          GENLIST_PART_DISCLIP
       }
       programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
          program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -2653,7 +2622,8 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -2668,158 +2638,124 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_1TEXT_2ICON
+         GENLIST_PROGRAM_FLIP_2TEXT
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.1.19
-   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";
-      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";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+   group { name: "elm/genlist/item_compress/2text.2.tb/default";
+      inherit: "elm/genlist/item/2text.2/default";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.1";
+         part { name: "elm.text.2";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: TEXTBLOCK;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               fixed: 1 1;
                rel1 {
-                  relative: 1.0 0.0;
+                  relative: 1.0 1.0;
                   to_x: "elm.padding.left";
+                  to_y: "elm.text.1";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
                }
-               rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon1.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
+               text {
+                  style: "genlist_default_textblock_style";
+                  min: 0 1;
+                  align: 0.0 0.5;
                }
-               rel2.to_x: "elm.icon.1";
-               align: 0.0 0.0;
-               visible: 0;
             }
-         }
-         part { name: "elm.icon.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
-               }
-               rel2.to_x: "elm.padding.icon1.right";
-               align: 0.0 0.5;
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_default_textblock_selected_style";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon2.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.2";
-               }
-               rel2.to_x: "elm.icon.2";
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.3";
+      }
+   }
+
+//
+   group { name: "elm/genlist/item/2text.8/default";
+      alias: "elm/genlist/item_odd/2text.8/default";
+      alias: "elm/genlist/item_compress/2text.8/default";
+      alias: "elm/genlist/item_compress_odd/2text.8/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "flips" "elm.flip.content";
+      images {
+         image: "00_list_bar_press_1x80.png" COMP;
+      }
+      parts {
+         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.text.1";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: TEXTBLOCK;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: 0 GENLIST_SIZE_61_INC;
                fixed: 1 1;
                rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
                }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon3.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.icon.3";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.3";
+               align: 0.0 0.0;
+               text {
+                  style: "genlist_default_textblock_style";
+                  min: 0 1;
+                  align: 0.0 0.5;
                }
-               align: 1.0 0.0;
-               visible: 0;
             }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_default_textblock_selected_style";
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text";
+         part { name: "elm.text.2";
             clip_to: "disclip";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               fixed: 1 0;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon2.right";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon3.left";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.5;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               align: 0.0 0.0;
                text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
+                  style: "genlist_sub_textblock_style";
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "list_item";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               text.style: "genlist_sub_textblock_selected_style";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -2827,12 +2763,18 @@
          GENLIST_PART_DISCLIP
       }
       programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
          program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -2840,7 +2782,8 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -2855,156 +2798,94 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_1TEXT_2ICON
+         GENLIST_PROGRAM_FLIP_2TEXT
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
+// 3.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";
       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";
+      data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.1";
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.text.1";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               fixed: 1 1;
+               min: 0 GENLIST_SIZE_61_INC;
+               fixed: 0 1;
                rel1 {
                   relative: 1.0 0.0;
                   to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
                }
-               rel2.to_x: "elm.padding.left";
-               align: 0.0 0.5;
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 0.0 1.0;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_44_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "slp_roman";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon1.right";
+         part { name: "elm.text.2";
             clip_to: "disclip";
-            type: RECT;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
                }
-               rel2.to_x: "elm.icon.1";
-               align: 0.0 0.5;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.3";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               fixed: 1 1;
-               rel1.to_x: "elm.padding.right";
                rel2 {
-                  relative: 0.0 1.0;
+                  relative: 0.0 0.0;
                   to_x: "elm.padding.right";
+                  to_y: "elm.text.1";
+               }
+               align: 0.0 1.0;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "list_item";
                }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon3.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.icon.3";
-               }
-               rel2.to_x: "elm.icon.3";
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               fixed: 1 1;
-               rel1.to_x: "elm.padding.icon3.left";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon3.left";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon2.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.icon.2";
-               }
-               rel2.to_x: "elm.icon.2";
-               align: 0.0 0.5;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
-               }
-               align: 0.0 0.5;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -3012,12 +2893,18 @@
          GENLIST_PART_DISCLIP
       }
       programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
          program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -3025,7 +2912,8 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -3040,49 +2928,56 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_1TEXT_3ICON
+         GENLIST_PROGRAM_FLIP_2TEXT
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
+// 3.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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_97_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.text.2";
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.text.3";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_206_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.padding.right";
+               min: GENLIST_SIZE_133_INC GENLIST_SIZE_61_INC;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
                rel2 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
                }
-               align: 1.0 0.5;
+               align: 1.0 0.0;
                color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
                   min: 0 1;
-                  align: 0.0 0.5;
+                  align: 1.0 0.5;
                   text_class: "slp_medium";
                }
             }
@@ -3092,74 +2987,78 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.text2.left";
+         part { name: "elm.padding.text3.left";
+            clip_to: "disclip";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
+               min: GENLIST_ICON_SMALL_SIZE 0;
                fixed: 1 0;
-               rel1.to_x: "elm.text.2";
+               rel1.to_x: "elm.text.3";
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.text.2";
+                  to_x: "elm.text.3";
                }
                align: 1.0 0.5;
                visible: 0;
             }
          }
-         part { name: "vertical_line";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: 1 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.padding.text2.left";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.text2.left";
-               }
-               align: 1.0 0.5;
-               color: GENLIST_PART_LIST_LINE_COLOR_INC;
-            }
-         }
-         part { name: "elm.padding.text1.right";
-            type: RECT;
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "vertical_line";
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "vertical_line";
+                  to_x: "elm.padding.text3.left";
+                  to_y: "elm.text.3";
                }
-               align: 1.0 0.5;
-               visible: 0;
+               align: 0.0 0.5;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_44_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "list_item";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text.1";
+         part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                rel1 {
-                  relative: 1.0 0.0;
+                  relative: 1.0 1.0;
                   to_x: "elm.padding.left";
+                  to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 0.0  1.0;
-                  to_x: "elm.padding.text1.right";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
                }
-               color: GENLIST_PART_FONT_CONVERTOR_STYLE_COLOR_INC;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_40_INC;
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
                   min: 0 1;
-                  align: 1.0 0.5;
-                  text_class: "list_item";
+                  align: 0.0 0.5;
+                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
@@ -3184,6 +3083,7 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
+            target: "elm.text.3";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -3193,6 +3093,7 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
+            target: "elm.text.3";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -3207,116 +3108,136 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         program { name: "flip_enabled";
-            signal: "elm,state,flip,enabled";
-            source: "elm";
-            action: STATE_SET "flip_enabled" 0.0;
-            target: "elm.text.1";
-            target: "elm.flip.content";
-         }
-         program { name: "flip_disabled";
-            signal: "elm,state,flip,disabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text.1";
-            target: "elm.flip.content";
-         }
+         GENLIST_PROGRAM_FLIP_3TEXT
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+   group { name: "elm/genlist/item_compress/3text.tb/default";
+      inherit: "elm/genlist/item/3text/default";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.text.1";
+         part { name: "elm.text.2";
             clip_to: "disclip";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_133_INC 0;
-               fixed: 1 0;
                rel1 {
-                  relative: 1.0 0.0;
+                  relative: 1.0 1.0;
                   to_x: "elm.padding.left";
+                  to_y: "elm.text.1";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
                }
-               rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  style: "genlist_default_textblock_style";
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               text.style: "genlist_default_textblock_selected_style";
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.text1.right";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
+      }
+   }
+
+// 3.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";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon";
+      data.item: "flips" "elm.flip.content";
+      images {
+         image: "00_list_bar_press_1x80.png" COMP;
+      }
+      parts {
+         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
                rel1 {
-                   relative: 1.0 0.0;
-                   to_x: "elm.text.1";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
                }
-               rel2.to_x: "elm.text.1";
-               align: 0.0 0.5;
-               visible: 0;
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 1.0 0.5;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "vertical_line";
+         part { name: "elm.padding.icon.left";
+            clip_to: "disclip";
             type: RECT;
-            mouse_events: 0;
+            scale: 1;
             description { state: "default" 0.0;
-               min: 1 0;
+               min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.padding.text1.right";
+               rel1.to_x: "elm.icon";
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.text1.right";
+                  to_x: "elm.icon";
                }
-               align: 0.0 0.5;
-               color: GENLIST_PART_LIST_LINE_COLOR_INC;
+               align: 1.0 0.0;
+               visible: 0;
             }
          }
-         part { name: "elm.padding.text2.left";
-            type: RECT;
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
+               min: 0 GENLIST_SIZE_61_INC;
+               fixed: 0 1;
                rel1 {
-                   relative: 1.0 0.0;
-                   to_x: "vertical_line";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
                }
-               rel2.to_x: "vertical_line";
-               align: 0.0 0.5;
-               visible: 0;
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon.left";
+                  to_y: "elm.padding.top";
+               }
+               align: 0.0 0.0;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_44_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "list_item";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -3325,20 +3246,23 @@
             scale: 1;
             description { state: "default" 0.0;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.text2.left";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 0.0  1.0;
-                  to_x: "elm.padding.right";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon.left";
+                  to_y: "elm.padding.bottom";
                }
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               align: 0.0 0.0;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "list_item";
+                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
@@ -3386,32 +3310,20 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         program { name: "flip_enabled";
-            signal: "elm,state,flip,enabled";
-            source: "elm";
-            action: STATE_SET "flip_enabled" 0.0;
-            target: "elm.text.2";
-            target: "elm.flip.content";
-         }
-         program { name: "flip_disabled";
-            signal: "elm,state,flip,disabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text.2";
-            target: "elm.flip.content";
-         }
+         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
+// 3.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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
@@ -3422,8 +3334,46 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon";
+            clip_to: "disclip";
+            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;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 1.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.icon.left";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.icon";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon";
+               }
+               align: 1.0 0.0;
+               visible: 0;
+            }
+         }
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -3439,7 +3389,7 @@
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon.left";
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
@@ -3471,7 +3421,7 @@
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon.left";
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.0;
@@ -3529,13 +3479,13 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT
+         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-   group { name: "elm/genlist/item_compress/2text.2.tb/default";
-      inherit: "elm/genlist/item/2text.2/default";
+   group { name: "elm/genlist/item_compress/2text.1icon.10.tb/default";
+      inherit: "elm/genlist/item/2text.1icon.10/default";
       parts {
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -3550,7 +3500,7 @@
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon.left";
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.5;
@@ -3569,14 +3519,15 @@
       }
    }
 
-//
-   group { name: "elm/genlist/item/2text.8/default";
-      alias: "elm/genlist/item_odd/2text.8/default";
-      alias: "elm/genlist/item_compress/2text.8/default";
-      alias: "elm/genlist/item_compress_odd/2text.8/default";
+// 3.2.6
+   group { name: "elm/genlist/item/2text.1icon.3/default";
+      alias: "elm/genlist/item_odd/2text.1icon.3/default";
+      alias: "elm/genlist/item_compress/2text.1icon.3/default";
+      alias: "elm/genlist/item_compress_odd/2text.1icon.3/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
@@ -3587,16 +3538,16 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.text.1";
             clip_to: "disclip";
-            type: TEXTBLOCK;
+            type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 GENLIST_SIZE_61_INC;
-               fixed: 1 1;
+               fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "elm.padding.left";
@@ -3604,29 +3555,67 @@
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon.left";
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
-                  style: "genlist_default_textblock_style";
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_44_INC;
                   min: 0 1;
                   align: 0.0 0.5;
+                  text_class: "list_item";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.text.1";
+               }
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+         part { name: "elm.padding.icon.left";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.icon";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon";
+               }
+               align: 1.0 0.0;
+               visible: 0;
+            }
+         }
          part { name: "elm.text.2";
             clip_to: "disclip";
-            type: TEXTBLOCK;
+            type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               fixed: 1 0;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "elm.padding.left";
@@ -3634,19 +3623,22 @@
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon.left";
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.0;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
-                  style: "genlist_sub_textblock_style";
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
                   min: 0 1;
                   align: 0.0 0.5;
+                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_sub_textblock_selected_style";
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -3689,19 +3681,20 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT
+         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
+// 3.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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
+      data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
@@ -3712,19 +3705,19 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.text.1";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.text.3";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 0 1;
+               min: GENLIST_SIZE_133_INC GENLIST_SIZE_48_INC;
+               fixed: 1 1;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
                rel2 {
@@ -3732,14 +3725,101 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 1.0;
+               align: 1.0 1.0;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  min: 0 1;
+                  align: 1.0 0.5;
+                  text_class: "slp_medium";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.text3.left";
+            clip_to: "disclip";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_ICON_SMALL_SIZE 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.text.3";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.text.3";
+               }
+               align: 1.0 0.5;
+               visible: 0;
+            }
+         }
+         part { name: "elm.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.text.3";
+               }
+               align: 1.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.icon.left";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.icon";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon";
+               }
+               align: 1.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon.left";
+                  to_y: "elm.text.3";
+               }
+               align: 0.0 0.5;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_44_INC;
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "slp_roman";
+                  text_class: "list_item";
                }
             }
             description { state: "selected" 0.0;
@@ -3757,21 +3837,21 @@
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
+                  to_y: "elm.text.1";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.text.1";
+                  to_x: "elm.padding.text3.left";
+                  to_y: "elm.padding.bottom";
                }
-               align: 0.0 1.0;
+               align: 0.0 0.5;
                color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "list_item";
+                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
@@ -3796,6 +3876,7 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
+            target: "elm.text.3";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -3805,6 +3886,7 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
+            target: "elm.text.3";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -3819,19 +3901,20 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT
+         GENLIST_PROGRAM_FLIP_3TEXT_1ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
+// 3.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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon.1 elm.icon.2";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
@@ -3842,15 +3925,53 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.text.3";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.1";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_133_INC GENLIST_SIZE_61_INC;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.text.1";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 0.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.icon1.right";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.1";
+               }
+               rel2.to_x: "elm.icon.1";
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.icon.2";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
@@ -3860,38 +3981,25 @@
                rel2 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               align: 1.0 0.0;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 1.0 0.5;
-                  text_class: "slp_medium";
+                  to_y: "elm.text.1";
                }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.text3.left";
+         part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
             type: RECT;
-            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE 0;
+               min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.text.3";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text.3";
+               rel1 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.icon.2";
                }
-               align: 1.0 0.5;
+               rel2.to_x: "elm.icon.2";
+               align: 1.0 0.0;
                visible: 0;
             }
          }
@@ -3901,6 +4009,8 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_61_INC;
+               fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "elm.padding.left";
@@ -3908,10 +4018,10 @@
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.text3.left";
-                  to_y: "elm.text.3";
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.top";
                }
-               align: 0.0 0.5;
+               align: 0.0 0.0;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
@@ -3935,7 +4045,7 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.icon1.right";
                   to_y: "elm.text.1";
                }
                rel2 {
@@ -3974,7 +4084,6 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
-            target: "elm.text.3";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -3984,7 +4093,6 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
-            target: "elm.text.3";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -3999,103 +4107,31 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_3TEXT
+         GENLIST_PROGRAM_FLIP_2TEXT_2ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-   group { name: "elm/genlist/item_compress/3text.tb/default";
-      inherit: "elm/genlist/item/3text/default";
-      parts {
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.1";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 0.5;
-               text {
-                  style: "genlist_default_textblock_style";
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-      }
-   }
-
-// 3.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";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+// 3.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";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "flips" "elm.flip.content";
+      images {
+         image: "00_list_bar_press_1x80.png" COMP;
+      }
       parts {
          GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.icon";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon";
-               }
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -4111,7 +4147,7 @@
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon.left";
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
@@ -4143,11 +4179,11 @@
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.icon.left";
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_SETTINGS_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -4201,16 +4237,16 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
+         GENLIST_PROGRAM_FLIP_2TEXT
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
+// 3.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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
@@ -4225,15 +4261,13 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
@@ -4316,7 +4350,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_SETTINGS_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -4375,8 +4409,8 @@
       }
    }
 
-   group { name: "elm/genlist/item_compress/2text.1icon.10.tb/default";
-      inherit: "elm/genlist/item/2text.1icon.10/default";
+   group { name: "elm/genlist/item_compress/2text.1icon.7.tb/default";
+      inherit: "elm/genlist/item/2text.1icon.7/default";
       parts {
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -4410,11 +4444,11 @@
       }
    }
 
-// 3.2.6
-   group { name: "elm/genlist/item/2text.1icon.3/default";
-      alias: "elm/genlist/item_odd/2text.1icon.3/default";
-      alias: "elm/genlist/item_compress/2text.1icon.3/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.3/default";
+// 3.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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
@@ -4429,47 +4463,15 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 0 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon.left";
-                  to_y: "elm.padding.top";
-               }
-               align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon";
             clip_to: "disclip";
             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;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
@@ -4477,9 +4479,9 @@
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 1.0;
+                  relative: 0.0 0.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.text.1";
+                  to_y: "elm.padding.bottom";
                }
                align: 1.0 0.5;
             }
@@ -4501,6 +4503,40 @@
                visible: 0;
             }
          }
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_61_INC;
+               fixed: 0 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon.left";
+                  to_y: "elm.padding.top";
+               }
+               align: 0.0 0.0;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_44_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "list_item";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
@@ -4518,7 +4554,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_SETTINGS_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -4577,15 +4613,15 @@
       }
    }
 
-// 3.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";
+// 3.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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
-      data.item: "contents" "elm.icon";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon.1 elm.icon.2";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
@@ -4596,114 +4632,65 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.text.3";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.2";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_133_INC GENLIST_SIZE_48_INC;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
-                  relative: 0.0 0.0;
+                  relative: 0.0 1.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
+                  to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               align: 1.0 1.0;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 1.0 0.5;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.text3.left";
+         part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
             type: RECT;
-            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE 0;
+               min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.text.3";
+               rel1.to_x: "elm.icon.2";
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.text.3";
+                  to_x: "elm.icon.2";
                }
-               align: 1.0 0.5;
+               align: 1.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.icon";
+        part { name: "elm.text.1";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               fixed: 1 1;
+               min: 0 GENLIST_SIZE_61_INC;
+               fixed: 0 1;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.text.3";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.top";
                }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.icon";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon";
-               }
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon.left";
-                  to_y: "elm.text.3";
-               }
-               align: 0.0 0.5;
+               align: 0.0 0.0;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
@@ -4725,14 +4712,17 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               min: 0 0;
+               max: GENLIST_SIZE_576_INC 0;
+               fixed: 1 0;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "elm.padding.left";
                   to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.text3.left";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.5;
@@ -4740,7 +4730,7 @@
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
-                  min: 0 1;
+                  min: 1 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
                }
@@ -4751,6 +4741,44 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+         part { name: "elm.padding.text2.right";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               visible: 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.text.2";
+               }
+               rel2.to_x: "elm.text.2";
+               align: 0.0 0.0;
+            }
+         }
+         part { name: "elm.icon.1";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.text2.right";
+                  to_y: "elm.text.1";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.text2.right";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 0.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
          GENLIST_PART_FLIP
          GENLIST_PART_DISCLIP
       }
@@ -4767,7 +4795,6 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
-            target: "elm.text.3";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -4777,7 +4804,6 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
-            target: "elm.text.3";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -4792,20 +4818,20 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_3TEXT_1ICON
+         GENLIST_PROGRAM_FLIP_2TEXT_2ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
+// 3.2.13
+   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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon.1 elm.icon.2";
+      data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
@@ -4816,20 +4842,20 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.1";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "elm.padding.left";
-                  to_y: "elm.text.1";
+                  to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 1.0 0.0;
@@ -4840,7 +4866,7 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon1.right";
+         part { name: "elm.padding.icon.right";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
@@ -4849,51 +4875,13 @@
                fixed: 1 0;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
+                  to_x: "elm.icon";
                }
-               rel2.to_x: "elm.icon.1";
+               rel2.to_x: "elm.icon";
                align: 0.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.icon.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.text.1";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon2.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.icon.2";
-               }
-               rel2.to_x: "elm.icon.2";
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -4904,12 +4892,12 @@
                fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.icon.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
@@ -4926,6 +4914,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.text.2";
@@ -4936,7 +4925,7 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.icon.right";
                   to_y: "elm.text.1";
                }
                rel2 {
@@ -4957,6 +4946,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          GENLIST_PART_FLIP
@@ -4972,9 +4962,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
+            GENLIST_PROGRAM_SCRIPT_FLIP_SELECT_2TEXT
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -4998,34 +4986,17 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT_2ICON
+         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+   group { name: "elm/genlist/item_compress/2text.1icon.4.tb/default";
+      inherit: "elm/genlist/item/2text.1icon.4/default";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
          part { name: "elm.text.1";
             clip_to: "disclip";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
@@ -5033,7 +5004,7 @@
                fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.icon.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
@@ -5042,9 +5013,8 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
-                  font: "SLP:style=Roman";
+                  style: "genlist_default_textblock_style";
                   size: GENLIST_FONT_44_INC;
                   min: 0 1;
                   align: 0.0 0.5;
@@ -5053,19 +5023,20 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               text.style: "genlist_default_textblock_selected_style";
             }
+            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.icon.right";
                   to_y: "elm.text.1";
                }
                rel2 {
@@ -5073,74 +5044,32 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_SETTINGS_COLOR_INC;
+               align: 0.0 0.5;
                text {
-                  font: "SLP:style=Medium";
+                  style: "genlist_default_textblock_style";
                   size: GENLIST_FONT_32_INC;
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               text.style: "genlist_default_textblock_selected_style";
             }
+            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
-      }
-      programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_2TEXT
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.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";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
+// 3.2.14
+   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";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
       data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       images {
@@ -5152,63 +5081,118 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon";
             clip_to: "disclip";
             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;
                fixed: 1 1;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.bottom";
                }
-               align: 1.0 0.5;
+               align: 0.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon.left";
+         part { name: "elm.padding.icon.right";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.icon";
-               rel2 {
-                  relative: 0.0 1.0;
+               rel1 {
+                  relative: 1.0 0.0;
                   to_x: "elm.icon";
                }
-               align: 1.0 0.0;
+               rel2.to_x: "elm.icon";
+               align: 0.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.text.1";
+         part { name: "elm.text.3";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 GENLIST_SIZE_61_INC;
+               max: GENLIST_SIZE_192_INC GENLIST_SIZE_61_INC;
                fixed: 0 1;
                rel1 {
-                  relative: 1.0 1.0;
+                  relative: 0.0 1.0;
                   to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon.left";
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
-               align: 0.0 0.0;
+               align: 1.0 0.0;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  min: 0 1;
+                  max: 1 0;
+                  align: 1.0 0.5;
+                  text_class: "slp_medium";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.text3.left";
+            clip_to: "disclip";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_ICON_SMALL_SIZE 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.text.3";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.text.3";
+               }
+               align: 1.0 0.5;
+               visible: 0;
+            }
+         }
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.text3.left";
+                  to_y: "elm.text.3";
+               }
+               align: 0.0 0.5;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
@@ -5222,6 +5206,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.text.2";
@@ -5232,16 +5217,15 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.icon.right";
                   to_y: "elm.text.1";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.icon.left";
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_SETTINGS_COLOR_INC;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -5254,6 +5238,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          GENLIST_PART_FLIP
@@ -5269,9 +5254,7 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
+            GENLIST_PROGRAM_SCRIPT_FLIP_SELECT_3TEXT
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -5281,6 +5264,7 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
+            target: "elm.text.3";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -5295,51 +5279,16 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
+         GENLIST_PROGRAM_FLIP_3TEXT_1ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-   group { name: "elm/genlist/item_compress/2text.1icon.7.tb/default";
-      inherit: "elm/genlist/item/2text.1icon.7/default";
-      parts {
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.1";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 0.5;
-               text {
-                  style: "genlist_default_textblock_style";
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-      }
-   }
-
-// 3.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";
+// 3.2.15
+   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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
@@ -5354,43 +5303,43 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.bottom";
                }
-               align: 1.0 0.5;
+               align: 0.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon.left";
+         part { name: "elm.padding.icon.right";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.icon";
-               rel2 {
-                  relative: 0.0 1.0;
+               rel1 {
+                  relative: 1.0 0.0;
                   to_x: "elm.icon";
                }
-               align: 1.0 0.0;
+               rel2.to_x: "elm.icon";
+               align: 0.0 0.0;
                visible: 0;
             }
          }
@@ -5404,12 +5353,12 @@
                fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.icon.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon.left";
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
@@ -5436,15 +5385,14 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.icon.right";
                   to_y: "elm.text.1";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.icon.left";
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.0;
                color: GENLIST_PART_FONT_LIST_SUB_TEXT_SETTINGS_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
@@ -5504,11 +5452,11 @@
       }
    }
 
-// 3.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";
+// 3.2.16
+   group { name: "elm/genlist/item/2text.2icon.3/default";
+      alias: "elm/genlist/item_odd/2text.2icon.3/default";
+      alias: "elm/genlist/item_compress/2text.2icon.3/default";
+      alias: "elm/genlist/item_compress_odd/2text.2icon.3/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
@@ -5523,47 +5471,47 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.2";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.bottom";
                }
-               align: 1.0 0.5;
+               align: 0.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon2.left";
+         part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.icon.2";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.2";
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.1";
                }
-               align: 1.0 0.0;
+               rel2.to_x: "elm.icon.1";
+               align: 0.0 0.0;
                visible: 0;
             }
          }
-        part { name: "elm.text.1";
+         part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
@@ -5573,7 +5521,7 @@
                fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.icon1.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
@@ -5597,76 +5545,70 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text.2";
+         part { name: "elm.icon.2";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 0;
-               max: GENLIST_SIZE_576_INC 0;
-               fixed: 1 0;
+               fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.1";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 0.5;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 1 1;
-                  align: 0.0 0.5;
-                  text_class: "slp_medium";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.text.1";
                }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.text2.right";
+         part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               visible: 0;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.text.2";
+                  relative: 0.0 0.0;
+                  to_x: "elm.icon.2";
                }
-               rel2.to_x: "elm.text.2";
-               align: 0.0 0.0;
+               rel2.to_x: "elm.icon.2";
+               align: 1.0 0.0;
+               visible: 0;
             }
          }
-         part { name: "elm.icon.1";
+         part { name: "elm.text.2";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.text2.right";
+                  to_x: "elm.padding.icon1.right";
                   to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.text2.right";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.5;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "slp_medium";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -5714,15 +5656,50 @@
       }
    }
 
-// 3.2.13
-   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";
+   group { name: "elm/genlist/item_compress/2text.2icon.3.tb/default";
+      inherit: "elm/genlist/item/2text.2icon.3/default";
+      parts {
+         part { name: "elm.text.2";
+            clip_to: "disclip";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.text.1";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 0.0 0.5;
+               text {
+                  style: "genlist_default_textblock_style";
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_default_textblock_selected_style";
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+      }
+   }
+
+// 3.2.17
+   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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon";
+      data.item: "contents" "elm.icon.1 elm.icon.2";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
@@ -5733,15 +5710,15 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
@@ -5757,7 +5734,7 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon.right";
+         part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
@@ -5766,13 +5743,51 @@
                fixed: 1 0;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.icon";
+                  to_x: "elm.icon.1";
                }
-               rel2.to_x: "elm.icon";
+               rel2.to_x: "elm.icon.1";
                align: 0.0 0.0;
                visible: 0;
             }
          }
+         part { name: "elm.icon.2";
+            clip_to: "disclip";
+            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;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 1.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.icon2.left";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.icon.2";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.2";
+               }
+               align: 1.0 0.0;
+               visible: 0;
+            }
+         }
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -5783,12 +5798,12 @@
                fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
+                  to_x: "elm.padding.icon1.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
@@ -5805,7 +5820,6 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.text.2";
@@ -5816,12 +5830,12 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
+                  to_x: "elm.padding.icon1.right";
                   to_y: "elm.text.1";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
                color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
@@ -5837,7 +5851,6 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          GENLIST_PART_FLIP
@@ -5853,7 +5866,9 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            GENLIST_PROGRAM_SCRIPT_FLIP_SELECT_2TEXT
+            target: "bg_image";
+            target: "elm.text.1";
+            target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -5877,13 +5892,13 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
+         GENLIST_PROGRAM_FLIP_2TEXT_2ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-   group { name: "elm/genlist/item_compress/2text.1icon.4.tb/default";
-      inherit: "elm/genlist/item/2text.1icon.4/default";
+   group { name: "elm/genlist/item_compress/2text.2icon.4.tb/default";
+      inherit: "elm/genlist/item/2text.2icon.4/default";
       parts {
          part { name: "elm.text.1";
             clip_to: "disclip";
@@ -5895,12 +5910,12 @@
                fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
+                  to_x: "elm.padding.icon1.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
@@ -5916,7 +5931,6 @@
                inherit: "default" 0.0;
                text.style: "genlist_default_textblock_selected_style";
             }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.text.2";
@@ -5927,40 +5941,39 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
+                  to_x: "elm.padding.icon1.right";
                   to_y: "elm.text.1";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.5;
                text {
                   style: "genlist_default_textblock_style";
                   size: GENLIST_FONT_32_INC;
                   min: 0 1;
                   align: 0.0 0.5;
+                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
                text.style: "genlist_default_textblock_selected_style";
             }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
       }
    }
 
-// 3.2.14
-   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";
+// 3.2.18
+   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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
+      data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       images {
@@ -5972,19 +5985,18 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
-                  offset: 0 0;
                   to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
@@ -6013,77 +6025,25 @@
                visible: 0;
             }
          }
-         part { name: "elm.text.3";
+         part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 GENLIST_SIZE_61_INC;
-               max: GENLIST_SIZE_192_INC GENLIST_SIZE_61_INC;
                fixed: 0 1;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               align: 1.0 0.0;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  max: 1 0;
-                  align: 1.0 0.5;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
-            }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.text3.left";
-            clip_to: "disclip";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.text.3";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text.3";
-               }
-               align: 1.0 0.5;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
                   relative: 1.0 1.0;
                   to_x: "elm.padding.icon.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.text3.left";
-                  to_y: "elm.text.3";
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
                }
-               align: 0.0 0.5;
+               align: 0.0 0.0;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
@@ -6097,7 +6057,6 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.text.2";
@@ -6129,7 +6088,6 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          GENLIST_PART_FLIP
@@ -6145,7 +6103,9 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            GENLIST_PROGRAM_SCRIPT_FLIP_SELECT_3TEXT
+            target: "bg_image";
+            target: "elm.text.1";
+            target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -6155,7 +6115,6 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
-            target: "elm.text.3";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -6170,81 +6129,44 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_3TEXT_1ICON
+         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.2.15
-   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 { name: "elm/genlist/item_compress/multiline/dialogue/2text/default";
+      alias: "elm/genlist/item_compress_odd/multiline/dialogue/2text/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon.right";
-            clip_to: "disclip";
+         part { name: "base";
             type: RECT;
-            scale: 1;
+            repeat_events: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon";
-               }
-               rel2.to_x: "elm.icon";
-               align: 0.0 0.0;
-               visible: 0;
+               color: GENLIST_PART_BG_COLOR_INC;
             }
          }
+         GENLIST_PART_DIALOGUE_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_18_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
+               min: 0 GENLIST_SIZE_48_INC;
                fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
@@ -6266,17 +6188,16 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
+                  to_x: "elm.padding.left";
                   to_y: "elm.text.1";
                }
                rel2 {
@@ -6284,22 +6205,17 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_SETTINGS_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  style: "genlist_textblock_sub_style";
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               text.style: "genlist_textblock_sub_selected_style";
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         GENLIST_PART_FLIP
          GENLIST_PART_DISCLIP
       }
       programs {
@@ -6338,16 +6254,15 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.2.16
-   group { name: "elm/genlist/item/2text.2icon.3/default";
-      alias: "elm/genlist/item_odd/2text.2icon.3/default";
-      alias: "elm/genlist/item_compress/2text.2icon.3/default";
-      alias: "elm/genlist/item_compress_odd/2text.2icon.3/default";
+// 3.2.19
+   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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
@@ -6362,15 +6277,15 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
@@ -6402,6 +6317,44 @@
                visible: 0;
             }
          }
+         part { name: "elm.icon.2";
+            clip_to: "disclip";
+            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;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 1.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.icon2.left";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.icon.2";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.2";
+               }
+               align: 1.0 0.0;
+               visible: 0;
+            }
+         }
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -6436,42 +6389,6 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.icon.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.text.1";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon2.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.icon.2";
-               }
-               rel2.to_x: "elm.icon.2";
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
@@ -6547,46 +6464,11 @@
       }
    }
 
-   group { name: "elm/genlist/item_compress/2text.2icon.3.tb/default";
-      inherit: "elm/genlist/item/2text.2icon.3/default";
-      parts {
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.text.1";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 0.5;
-               text {
-                  style: "genlist_default_textblock_style";
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-      }
-   }
-
-// 3.2.17
-   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";
+// 3.2.20
+   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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
@@ -6601,15 +6483,15 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
@@ -6646,36 +6528,36 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.icon1.right";
                   to_y: "elm.padding.bottom";
                }
-               align: 1.0 0.5;
+               align: 0.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon2.left";
+         part { name: "elm.padding.icon2.right";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.icon.2";
-               rel2 {
-                  relative: 0.0 1.0;
+               rel1 {
+                  relative: 1.0 0.0;
                   to_x: "elm.icon.2";
                }
-               align: 1.0 0.0;
+               rel2.to_x: "elm.icon.2";
+               align: 0.0 0.0;
                visible: 0;
             }
          }
@@ -6689,12 +6571,12 @@
                fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.icon2.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
@@ -6721,12 +6603,12 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.icon2.right";
                   to_y: "elm.text.1";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.icon2.left";
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
                color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
@@ -6788,131 +6670,104 @@
       }
    }
 
-   group { name: "elm/genlist/item_compress/2text.2icon.4.tb/default";
-      inherit: "elm/genlist/item/2text.2icon.4/default";
+// ???
+   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";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
+      data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.swallow.colorbar";
+      data.item: "flips" "elm.flip.content";
+      images {
+         image: "00_list_bar_press_1x80.png" COMP;
+      }
       parts {
-         part { name: "elm.text.1";
+         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.swallow.colorbar";
             clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 0 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.top";
-               }
+               min: GENLIST_SIZE_10_INC GENLIST_SIZE_21_INC;
+               fixed: 1 1;
+               rel2.relative: 0.0 0.0;
                align: 0.0 0.0;
-               text {
-                  style: "genlist_default_textblock_style";
-                  size: GENLIST_FONT_44_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text.2";
+         part { name: "elm.text.3";
             clip_to: "disclip";
-            type: TEXTBLOCK;
+            type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               min: GENLIST_SIZE_133_INC GENLIST_SIZE_61_INC;
+               fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.text.1";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.icon2.left";
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
+               align: 1.0 1.0;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
-                  style: "genlist_default_textblock_style";
+                  font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
                   min: 0 1;
-                  align: 0.0 0.5;
+                  align: 1.0 0.5;
                   text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-      }
-   }
-
-// 3.2.18
-   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";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
-      parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon";
+         part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.text.3";
                }
-               align: 0.0 0.5;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon.right";
+         part { name: "elm.padding.icon1.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon";
+               rel1.to_x: "elm.icon.1";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.1";
                }
-               rel2.to_x: "elm.icon";
-               align: 0.0 0.0;
+               align: 1.0 0.0;
                visible: 0;
             }
          }
@@ -6926,12 +6781,12 @@
                fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon1.left";
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
@@ -6950,6 +6805,22 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+         part { name: "elm.padding.text3.left";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1.to: "elm.text.3";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to: "elm.text.3";
+               }
+               align: 1.0 1.0;
+               visible: 0;
+            }
+         }
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
@@ -6958,14 +6829,15 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
+                  to_x: "elm.padding.left";
                   to_y: "elm.text.1";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.text3.left";
                   to_y: "elm.padding.bottom";
                }
+               align: 0.0 0.5;
                color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
@@ -6981,6 +6853,120 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+         part { name: "elm.padding.icon2.left";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.text.2";
+               }
+               rel2.to_x: "elm.text.2";
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.icon.2";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.text.1";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 0.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.icon3.left";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.2";
+               }
+               rel2.to_x: "elm.icon.2";
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.icon.3";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon3.left";
+                  to_y: "elm.text.1";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.icon3.left";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 0.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.icon4.left";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.3";
+               }
+               rel2.to_x: "elm.icon.3";
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.icon.4";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon4.left";
+                  to_y: "elm.text.1";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.icon4.left";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 0.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
          GENLIST_PART_FLIP
          GENLIST_PART_DISCLIP
       }
@@ -6997,6 +6983,7 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
+            target: "elm.text.3";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -7006,6 +6993,7 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
+            target: "elm.text.3";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -7020,385 +7008,252 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
+         GENLIST_PROGRAM_FLIP_3TEXT_2ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
 // ???
-   group { name: "elm/genlist/item_compress/multiline/dialogue/2text/default";
-      alias: "elm/genlist/item_compress_odd/multiline/dialogue/2text/default";
+   /* NOTE: This style is new mailbox style for email application. Otherwise do not use this. */
+   group { name: "elm/genlist/item/3text.5icon.2/default";
+      alias: "elm/genlist/item_odd/3text.5icon.2/default";
+      alias: "elm/genlist/item_compress/3text.5icon.2/default";
+      alias: "elm/genlist/item_compress_odd/3text.5icon.2/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "texts" "elm.text.subject elm.text.name elm.text.date";
+      data.item: "contents" "elm.icon.important elm.icon.num elm.icon.attach elm.icon.colorbar elm.swallow.outbox.progress elm.icon.checkbox";
+      data.item: "flips" "elm.flip.content";
+      images {
+         image: "00_list_bar_press_1x80.png" COMP;
+      }
       parts {
-         part { name: "base";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: GENLIST_PART_BG_COLOR_INC;
-            }
-         }
-         GENLIST_PART_DIALOGUE_BG_IMAGE
+         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
+         GENLIST_PART_BG
+         GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_18_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_DIALOGUE_ITEM
-         GENLIST_PART_DIALOGUE_RIGHT_LINE
-         part { name: "elm.text.1";
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.colorbar";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_48_INC;
-               fixed: 0 1;
+               min: GENLIST_SIZE_10_INC GENLIST_SIZE_21_INC;
+               fixed: 1 1;
+               rel2.relative: 0.0 0.0;
+               align: 0.0 0.0;
+            }
+         }
+         part { name: "elm.icon.checkbox";
+            clip_to: "disclip";
+            type: SWALLOW;
+            mouse_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
+                  relative: 1.0 0.0;
                   to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 1.0;
+                  relative: 0.0 0.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
+                  to_y: "elm.padding.bottom";
                }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               align: 0.0 0.5;
             }
          }
-         part { name: "elm.text.2";
+         part { name: "elm.text.date";
             clip_to: "disclip";
-            type: TEXTBLOCK;
+            type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               min: GENLIST_SIZE_154_INC GENLIST_SIZE_61_INC;
+               fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.1";
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
+               align: 1.0 1.0;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
-                  style: "genlist_textblock_sub_style";
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
                   min: 0 1;
-                  align: 0.0 0.5;
+                  align: 1.0 0.5;
+                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_textblock_sub_selected_style";
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         GENLIST_PART_DISCLIP
-      }
-      programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
-      }
-   }
-
-// 3.2.19
-   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";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon.1 elm.icon.2";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
-      parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.1";
+         part { name: "elm.icon.important";
             clip_to: "disclip";
             type: SWALLOW;
+            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               min: GENLIST_SIZE_56_INC GENLIST_SIZE_61_INC;
                fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.text.date";
                }
-               align: 0.0 0.5;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon1.right";
+         part { name: "elm.padding.icon.important.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
-               }
-               rel2.to_x: "elm.icon.1";
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               fixed: 1 1;
-               rel1 {
+               rel1{
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
+                  to_x: "elm.icon.important";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.important";
                }
-               align: 1.0 0.5;
+               align: 1.0 0.0;
+               visible: 0;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon2.left";
+         part { name: "elm.padding.icon.checkbox.right";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.icon.2";
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.checkbox";
+                  to_y: "elm.padding.top";
+               }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.2";
+                  relative: 1.0 0.0;
+                  to_x:  "elm.icon.checkbox";
+                  to_y: "elm.padding.bottom";
                }
                align: 1.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.text.1";
+         part { name: "elm.text.subject.rect";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 GENLIST_SIZE_61_INC;
-               fixed: 0 1;
+               fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.icon.checkbox.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon.important.left";
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               visible: 0;
+            }
+         }
+         part { name: "elm.text.subject";
+            clip_to: "disclip";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "elm.text.subject.rect";
+               rel2.to: "elm.text.subject.rect";
+               align: 0.0 0.0;
                text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
+                  style: "genlist_email_textblock_unread_style";
                   min: 0 1;
+                  max: 0 1;
                   align: 0.0 0.5;
-                  text_class: "list_item";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               text.style: "genlist_email_textblock_selected_style";
+            }
+            description { state: "read" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_email_textblock_read_style";
+            }
+            description { state: "unread" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_email_textblock_unread_style";
+            }
+            description { state: "urgency_read" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_email_textblock_urgency_read_style";
+            }
+            description { state: "urgency_unread" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_email_textblock_urgency_unread_style";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text.2";
+         part { name: "elm.text.name";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: TEXTBLOCK;
             scale: 1;
             description { state: "default" 0.0;
+               fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.text.1";
+                  to_x: "elm.padding.icon.checkbox.right";
+                  to_y: "elm.text.subject";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.icon2.left";
+                  to_x: "elm.padding.icon.num.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               align: 0.0 0.5;
                text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  style: "genlist_email_textblock2_style";
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
-      }
-      programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_2TEXT_2ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
-      }
-   }
-
-// 3.2.20
-   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";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon.1 elm.icon.2";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
-      parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.1";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 0.5;
+               text.style: "genlist_email_textblock2_selected_style";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon1.right";
+         part { name: "elm.padding.icon.num.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
@@ -7406,37 +7261,43 @@
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.num";
+                  to_y: "elm.text.subject";
                }
-               rel2.to_x: "elm.icon.1";
-               align: 0.0 0.0;
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.icon.num";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 1.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.icon.2";
+         part { name: "elm.icon.num";
             clip_to: "disclip";
             type: SWALLOW;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_SIZE_112_INC GENLIST_SIZE_45_INC;
+               max: GENLIST_SIZE_112_INC GENLIST_SIZE_45_INC;
                fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.padding.top";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon.attach.left";
+                  to_y: "elm.text.subject";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon.attach.left";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.5;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon2.right";
+         part { name: "elm.padding.icon.attach.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
@@ -7444,78 +7305,64 @@
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.2";
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.attach";
+                  to_y: "elm.text.subject";
                }
-               rel2.to_x: "elm.icon.2";
-               align: 0.0 0.0;
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.icon.attach";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 1.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.text.1";
+         part { name: "elm.icon.attach";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 0 1;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon2.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
+                  to_x: "elm.text.date";
+                  to_y: "elm.text.subject";
                }
-               align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.text.date";
+                  to_y: "elm.padding.bottom";
                }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+         part { name: "elm.swallow.outbox.progress";
+            type: SWALLOW;
             scale: 1;
+            mouse_events: 1;
+            repeat_events: 0;
             description { state: "default" 0.0;
+               min: GENLIST_SIZE_168_INC 0;
+               fixed: 1 1;
+               color: 0 0 0 0;
+               align: 1.0 0.5;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon2.right";
-                  to_y: "elm.text.1";
+                  relative: 0.0 1.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 0.0;
+                  offset: 0 0;
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          GENLIST_PART_FLIP
          GENLIST_PART_DISCLIP
@@ -7531,8 +7378,9 @@
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
+            target: "elm.text.subject";
+            target: "elm.text.name";
+            target: "elm.text.date";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -7540,8 +7388,9 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
+            target: "elm.text.subject";
+            target: "elm.text.name";
+            target: "elm.text.date";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -7556,33 +7405,59 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT_2ICON
+         program { name: "go_read";
+            signal: "elm,state,read";
+            source: "elm";
+            action: STATE_SET "read" 0.0;
+            target: "elm.text.subject";
+         }
+         program { name: "go_unread";
+            signal: "elm,state,unread";
+            source: "elm";
+            action: STATE_SET "unread" 0.0;
+            target: "elm.text.subject";
+         }
+         program { name: "go_urgeny_unread";
+            signal: "elm,state,urgency_unread";
+            source: "elm";
+            action: STATE_SET "urgency_unread" 0.0;
+            target: "elm.text.subject";
+         }
+         program { name: "go_urgency_read";
+            signal: "elm,state,urgency_read";
+            source: "elm";
+            action: STATE_SET "urgency_read" 0.0;
+            target: "elm.text.subject";
+         }
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
 // ???
-   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";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
-      data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.swallow.colorbar";
+   /* NOTE: This style is a temporary style for email application. Otherwise do not use this. */
+   group { name: "elm/genlist/item/4text.8icon/default";
+      alias: "elm/genlist/item_odd/4text.8icon/default";
+      alias: "elm/genlist/item_compress/4text.8icon/default";
+      alias: "elm/genlist/item_compress_odd/4text.8icon/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text.subject elm.text.name elm.text.date elm.text.preview elm.text.num";
+      data.item: "contents" "elm.icon.important elm.icon.important.touch elm.icon.num elm.icon.attach elm.icon.colorbar elm.swallow.outbox.progress elm.icon.checkbox elm.icon.checkbox.touch elm.icon.priority elm.icon.lastverb elm.icon.appointment";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
+         image: "M02_button_06_normal.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
+         GENLIST_PART_BASE( GENLIST_SIZE_160_INC )
+         GENLIST_PART_BG
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.swallow.colorbar";
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_8_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_8_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.colorbar";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
@@ -7593,380 +7468,353 @@
                align: 0.0 0.0;
             }
          }
-         part { name: "elm.text.3";
+
+         part { name: "elm.icon.checkbox.touch";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: SWALLOW;
+            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_133_INC GENLIST_SIZE_61_INC;
+               max: GENLIST_PADDING_74_INC GENLIST_SIZE_160_INC;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               align: 1.0 1.0;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 1.0 0.5;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               align: 0.0 0.5;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.icon.1";
+         part { name: "elm.icon.checkbox";
             clip_to: "disclip";
             type: SWALLOW;
+            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
+               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               fixed: 1 1;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.text.3";
+                  to_y: "elm.padding.bottom";
                }
-               align: 1.0 0.5;
+               align: 0.0 0.5;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon1.left";
+         part { name: "elm.padding.icon.checkbox.right";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.icon.1";
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.checkbox";
+                  to_y: "elm.padding.top";
+               }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.1";
+                  relative: 1.0 0.0;
+                  to_x:  "elm.icon.checkbox";
+                  to_y: "elm.padding.bottom";
                }
                align: 1.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.text.1";
+
+         part { name: "elm.icon.important";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: SWALLOW;
+            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 0 1;
+               min: GENLIST_SIZE_56_INC GENLIST_SIZE_SLIDE_60_INC;
+               fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon1.left";
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
-               align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
+               align: 1.0 0.0;
             }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+
+         part { name: "elm.icon.important.touch";
+            clip_to: "disclip";
+            type: SWALLOW;
+            mouse_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_SIZE_56_INC GENLIST_SIZE_SLIDE_60_INC;
+               fixed: 1 1;
+               rel1 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               align: 1.0 0.0;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.text3.left";
+
+         part { name: "elm.padding.icon.important.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to: "elm.text.3";
+               rel1{
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.important";
+               }
                rel2 {
                   relative: 0.0 1.0;
-                  to: "elm.text.3";
+                  to_x: "elm.icon.important";
                }
-               align: 1.0 1.0;
+               align: 1.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.text.2";
+         part { name: "elm.icon.num";
             clip_to: "disclip";
-            type: TEXT;
+            type: IMAGE;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               max: 0 GENLIST_SIZE_SLIDE_60_INC;
+               fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.1";
+                  relative: 0.0 1.0;
+                  offset: 0 GENLIST_SIZE_8_INC;
+                  to_x: "elm.padding.icon.important.left";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.text3.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 0.5;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "slp_medium";
+                  relative: 0.0 1.0;
+                  offset: 0 GENLIST_SIZE_8_INC;
+                  to_x: "elm.padding.icon.important.left";
+                  to_y: "elm.padding.top";
                }
+               align: 1.0 0.0;
+               image.normal: "M02_button_06_normal.png";
+               image.border: 5 5 5 5;
             }
-            description { state: "selected" 0.0;
+            description { state: "num_enable" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               max: GENLIST_HEIGHT_62_INC GENLIST_SIZE_SLIDE_60_INC;
+               min: GENLIST_SIZE_46_INC GENLIST_SIZE_44_INC;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon2.left";
+
+         part { name: "elm.text.num";
             clip_to: "disclip";
-            type: RECT;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
+               max: 0 GENLIST_SIZE_SLIDE_60_INC;
+               fixed: 1 1;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.text.2";
+                  relative: 0.0 1.0;
+                  offset: 0 GENLIST_SIZE_8_INC;
+                  to_x: "elm.padding.icon.important.left";
+                  to_y: "elm.padding.top";
                }
-               rel2.to_x: "elm.text.2";
-               align: 0.0 0.0;
-               visible: 0;
+               rel2 {
+                  relative: 0.0 1.0;
+                  offset: 0 GENLIST_SIZE_8_INC;
+                  to_x: "elm.padding.icon.important.left";
+                  to_y: "elm.padding.top";
+               }
+               align: 1.0 0.0;
+            }
+            description { state: "num_enable" 0.0;
+               inherit: "default" 0.0;
+               max: GENLIST_HEIGHT_62_INC GENLIST_SIZE_SLIDE_60_INC;
+               min: GENLIST_SIZE_46_INC GENLIST_SIZE_44_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  min: 1 1;
+                  align: 0.5 0.5;
+                  text_class: "slp_medium";
+               }
+               color: GENLIST_PART_FONT_CONVERTOR_STYLE_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.icon.2";
+
+         part { name: "elm.icon.attach";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               min: 0 GENLIST_SIZE_SLIDE_60_INC;
                fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.text.1";
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.num";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.bottom";
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.num";
+                  to_y: "elm.padding.top";
                }
-               align: 0.0 0.5;
+               align: 1.0 0.0;
+            }
+            description { state: "attach_enable" 0.0;
+               inherit: "default" 0.0;
+               min: GENLIST_SIZE_48_INC GENLIST_SIZE_SLIDE_60_INC;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon3.left";
+         part { name: "elm.text.subject";
             clip_to: "disclip";
-            type: RECT;
+            type: TEXTBLOCK;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
+               min: 0 GENLIST_SIZE_SLIDE_60_INC;
+               fixed: 1 1;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.2";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon.checkbox.right";
+                  to_y: "elm.padding.top";
                }
-               rel2.to_x: "elm.icon.2";
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.3";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon3.left";
-                  to_y: "elm.text.1";
+               rel2{
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.attach";
+                  to_y: "elm.padding.top";
                }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon3.left";
-                  to_y: "elm.padding.bottom";
+               align: 0.0 0.0;
+               text {
+                  style: "genlist_email_textblock_unread_style";
+                  min: 0 1;
+                  max: 0 1;
+                  align: 0.0 0.5;
                }
-               align: 0.0 0.5;
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_email_textblock_selected_style";
+            }
+            description { state: "read" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_email_textblock_read_style";
+            }
+            description { state: "unread" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_email_textblock_unread_style";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon4.left";
+
+         part { name: "elm.padding.intermediate";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
+               min: 0 GENLIST_PADDING_4_INC;
+               fixed: 0 1;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.3";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon.checkbox.right";
+                  to_y: "elm.icon.attach";
                }
-               rel2.to_x: "elm.icon.3";
-               align: 0.0 0.0;
+               rel2 {
+                  relative: 1.0 1.0;
+                  to_x:  "elm.padding.icon.checkbox.right";
+                  to_y: "elm.icon.attach";
+               }
+               align: 1.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.icon.4";
+
+         part { name: "elm.icon.priority";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               min: 0 GENLIST_SIZE_40_INC;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon4.left";
-                  to_y: "elm.text.1";
+                  to_x: "elm.padding.icon.checkbox.right";
+                  to_y: "elm.padding.intermediate";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon4.left";
-                  to_y: "elm.padding.bottom";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon.checkbox.right";
+                  to_y: "elm.padding.intermediate";
                }
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
-      }
-      programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            target: "elm.text.3";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            target: "elm.text.3";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_3TEXT_2ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
-      }
-   }
-
-// ???
-   /* NOTE: This style is new mailbox style for email application. Otherwise do not use this. */
-   group { name: "elm/genlist/item/3text.5icon.2/default";
-      alias: "elm/genlist/item_odd/3text.5icon.2/default";
-      alias: "elm/genlist/item_compress/3text.5icon.2/default";
-      alias: "elm/genlist/item_compress_odd/3text.5icon.2/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.subject elm.text.name elm.text.date";
-      data.item: "contents" "elm.icon.important elm.icon.num elm.icon.attach elm.icon.colorbar elm.swallow.outbox.progress elm.icon.checkbox";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
-      parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.colorbar";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_10_INC GENLIST_SIZE_21_INC;
-               fixed: 1 1;
-               rel2.relative: 0.0 0.0;
                align: 0.0 0.0;
             }
+            description { state: "priority_enable" 0.0;
+               inherit: "default" 0.0;
+               min: GENLIST_SIZE_48_INC GENLIST_SIZE_40_INC;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.icon.checkbox";
+         part { name: "elm.icon.lastverb";
             clip_to: "disclip";
             type: SWALLOW;
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               min: 0 GENLIST_SIZE_40_INC;
                fixed: 1 1;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon.checkbox.right";
+                  to_y: "elm.icon.priority";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon.checkbox.right";
+                  to_y: "elm.icon.priority";
                }
-               align: 0.0 0.5;
+               align: 0.0 0.0;
+            }
+            description { state: "lastverb_enable" 0.0;
+               inherit: "default" 0.0;
+               min: GENLIST_SIZE_48_INC GENLIST_SIZE_40_INC;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+
          part { name: "elm.text.date";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_154_INC GENLIST_SIZE_61_INC;
+               min: GENLIST_SIZE_154_INC GENLIST_SIZE_40_INC;
                fixed: 1 1;
                rel1 {
                   to_x: "elm.padding.right";
@@ -7993,241 +7841,89 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.icon.important";
+
+         part { name: "elm.icon.appointment";
             clip_to: "disclip";
             type: SWALLOW;
-            mouse_events: 1;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_56_INC GENLIST_SIZE_61_INC;
+               min: 0 GENLIST_SIZE_40_INC;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
+                  to_y: "elm.padding.intermediate";
                }
                rel2 {
-                  relative: 0.0 0.0;
+                  relative: 0.0 1.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.text.date";
+                  to_y: "elm.padding.intermediate";
                }
-               align: 1.0 0.5;
+               align: 1.0 0.0;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon.important.left";
+         part { name: "elm.text.name";
             clip_to: "disclip";
-            type: RECT;
+            type: TEXTBLOCK;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1{
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.important";
+               min: 0 GENLIST_SIZE_40_INC;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.icon.priority";
+                  to_y: "elm.padding.intermediate";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.icon.important";
+                  to_x: "elm.icon.appointment";
+                  to_y: "elm.padding.intermediate";
+               }
+               align: 0.0 0.0;
+               text {
+                  style: "genlist_email_textblock2_style";
+                  min: 0 1;
+                  align: 0.0 0.5;
                }
-               align: 1.0 0.0;
-               visible: 0;
             }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_email_textblock2_selected_style";
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon.checkbox.right";
+         part { name: "elm.text.preview";
             clip_to: "disclip";
-            type: RECT;
+            type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
+               min: 0 GENLIST_SIZE_40_INC;
+               fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.icon.checkbox";
-                  to_y: "elm.padding.top";
+                  to_x: "elm.icon.lastverb";
+                  to_y: "elm.padding.bottom";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x:  "elm.icon.checkbox";
+                  relative: 0.0 0.0;
+                  to_x: "elm.text.date";
                   to_y: "elm.padding.bottom";
                }
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text.subject.rect";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon.important.left";
-                  to_y: "elm.padding.top";
-               }
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text.subject";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "elm.text.subject.rect";
-               rel2.to: "elm.text.subject.rect";
-               align: 0.0 0.0;
-               text {
-                  style: "genlist_email_textblock_unread_style";
-                  min: 0 1;
-                  max: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_selected_style";
-            }
-            description { state: "read" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_read_style";
-            }
-            description { state: "unread" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_unread_style";
-            }
-            description { state: "urgency_read" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_urgency_read_style";
-            }
-            description { state: "urgency_unread" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_urgency_unread_style";
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.text.name";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
-                  to_y: "elm.text.subject";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon.num.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 0.5;
+               align: 0.0 1.0;
+               color: GENLIST_PART_FONT_CONTENTS_TEXT_COLOR_INC;
                text {
-                  style: "genlist_email_textblock2_style";
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_30_INC;
                   min: 0 1;
                   align: 0.0 0.5;
+                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock2_selected_style";
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon.num.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.num";
-                  to_y: "elm.text.subject";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.icon.num";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.num";
-            clip_to: "disclip";
-            type: SWALLOW;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_112_INC GENLIST_SIZE_45_INC;
-               max: GENLIST_SIZE_112_INC GENLIST_SIZE_45_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon.attach.left";
-                  to_y: "elm.text.subject";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon.attach.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon.attach.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.attach";
-                  to_y: "elm.text.subject";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.icon.attach";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.attach";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text.date";
-                  to_y: "elm.text.subject";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.text.date";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 1.0 0.5;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -8272,6 +7968,7 @@
             target: "elm.text.subject";
             target: "elm.text.name";
             target: "elm.text.date";
+            target: "elm.text.preview";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -8282,6 +7979,7 @@
             target: "elm.text.subject";
             target: "elm.text.name";
             target: "elm.text.date";
+            target: "elm.text.preview";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -8308,513 +8006,348 @@
             action: STATE_SET "unread" 0.0;
             target: "elm.text.subject";
          }
-         program { name: "go_urgeny_unread";
-            signal: "elm,state,urgency_unread";
+         program { name: "go_attach";
+            signal: "elm,state,attach";
             source: "elm";
-            action: STATE_SET "urgency_unread" 0.0;
-            target: "elm.text.subject";
+            action: STATE_SET "attach_enable" 0.0;
+            target: "elm.icon.attach";
          }
-         program { name: "go_urgency_read";
-            signal: "elm,state,urgency_read";
+         program { name: "go_priority";
+            signal: "elm,state,priority";
             source: "elm";
-            action: STATE_SET "urgency_read" 0.0;
-            target: "elm.text.subject";
+            action: STATE_SET "priority_enable" 0.0;
+            target: "elm.icon.priority";
+         }
+         program { name: "go_lastverb";
+            signal: "elm,state,lastverb";
+            source: "elm";
+            action: STATE_SET "lastverb_enable" 0.0;
+            target: "elm.icon.lastverb";
+         }
+         program { name: "go_num";
+            signal: "elm,state,num";
+            source: "elm";
+            action: STATE_SET "num_enable" 0.0;
+            target: "elm.icon.num";
+            target: "elm.text.num";
+         }
+         program { name: "click";
+            signal: "mouse,up,1";
+            source: "elm.icon.checkbox.touch";
+            action: SIGNAL_EMIT "elm,action,check,toggle" "";
          }
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
+
 // ???
    /* NOTE: This style is a temporary style for email application. Otherwise do not use this. */
-   group { name: "elm/genlist/item/4text.8icon/default";
-      alias: "elm/genlist/item_odd/4text.8icon/default";
-      alias: "elm/genlist/item_compress/4text.8icon/default";
-      alias: "elm/genlist/item_compress_odd/4text.8icon/default";
+   group { name: "elm/genlist/item/3text.6icon/default";
+      alias: "elm/genlist/item_odd/3text.6icon/default";
+      alias: "elm/genlist/item_compress/3text.6icon/default";
+      alias: "elm/genlist/item_compress_odd/3text.6icon/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.subject elm.text.name elm.text.date elm.text.preview elm.text.num";
-      data.item: "contents" "elm.icon.important elm.icon.important.touch elm.icon.num elm.icon.attach elm.icon.colorbar elm.swallow.outbox.progress elm.icon.checkbox elm.icon.checkbox.touch elm.icon.priority elm.icon.lastverb elm.icon.appointment";
+      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
+      data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.swallow.colorbar elm.swallow.outbox.progress";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
-         image: "M02_button_06_normal.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_SIZE_160_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
          GENLIST_PART_BG
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_8_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_8_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.colorbar";
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.swallow.colorbar";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_SIZE_10_INC GENLIST_SIZE_21_INC;
-               fixed: 1 1;
                rel2.relative: 0.0 0.0;
                align: 0.0 0.0;
             }
          }
-
-         part { name: "elm.icon.checkbox.touch";
+         part { name: "elm.text.3";
             clip_to: "disclip";
-            type: SWALLOW;
-            mouse_events: 1;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               max: GENLIST_PADDING_74_INC GENLIST_SIZE_160_INC;
-               fixed: 1 1;
+               min: GENLIST_SIZE_154_INC GENLIST_SIZE_61_INC;
                rel1 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.5;
+               align: 1.0 1.0;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  min: 0 1;
+                  align: 1.0 0.5;
+                  text_class: "slp_medium";
+               }
             }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.icon.checkbox";
+         part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
-            mouse_events: 1;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               fixed: 1 1;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 0.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
+                  to_y: "elm.text.3";
                }
-               align: 0.0 0.5;
+               align: 1.0 0.0;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon.checkbox.right";
+         part { name: "elm.padding.icon1.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.checkbox";
-                  to_y: "elm.padding.top";
-               }
+               rel1.to_x: "elm.icon.1";
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x:  "elm.icon.checkbox";
-                  to_y: "elm.padding.bottom";
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.1";
                }
                align: 1.0 0.0;
                visible: 0;
             }
          }
-
-         part { name: "elm.icon.important";
+         part { name: "elm.text1.rect";
             clip_to: "disclip";
-            type: SWALLOW;
-            mouse_events: 1;
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_56_INC GENLIST_SIZE_SLIDE_60_INC;
-               fixed: 1 1;
+               min: 0 GENLIST_SIZE_61_INC;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 1.0;
+                  to_x: "elm.swallow.colorbar";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon1.left";
                   to_y: "elm.padding.top";
                }
-               align: 1.0 0.0;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1.to: "elm.text1.rect";
+               rel2.to: "elm.text1.rect";
+               align: 0.0 0.0;
+               text {
+                  style: "genlist_email_textblock_unread_style";
+                  min: 0 1;
+                  max: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_email_textblock_selected_style";
+            }
+            description { state: "read" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_email_textblock_read_style";
+            }
+            description { state: "unread" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_email_textblock_unread_style";
+            }
+            description { state: "urgency_read" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_email_textblock_urgency_read_style";
+            }
+            description { state: "urgency_unread" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_email_textblock_urgency_unread_style";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-
-         part { name: "elm.icon.important.touch";
+         part { name: "elm.text.2";
             clip_to: "disclip";
-            type: SWALLOW;
-            mouse_events: 1;
+            type: TEXTBLOCK;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_56_INC GENLIST_SIZE_SLIDE_60_INC;
-               fixed: 1 1;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.bottom";
                }
-               align: 1.0 0.0;
+               align: 0.0 0.5;
+               text {
+                  style: "genlist_email_textblock2_style";
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_email_textblock2_selected_style";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-
-         part { name: "elm.padding.icon.important.left";
+         part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1{
+               rel1 {
                   relative: 0.0 1.0;
-                  to_x: "elm.icon.important";
+                  to_x: "elm.icon.2";
+                  to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.important";
+                  relative: 0.0 0.0;
+                  to_x: "elm.icon.2";
+                  to_y: "elm.padding.bottom";
                }
                align: 1.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.icon.num";
+         part { name: "elm.icon.2";
             clip_to: "disclip";
-            type: IMAGE;
-            mouse_events: 0;
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               max: 0 GENLIST_SIZE_SLIDE_60_INC;
-               fixed: 1 1;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
                rel1 {
                   relative: 0.0 1.0;
-                  offset: 0 GENLIST_SIZE_8_INC;
-                  to_x: "elm.padding.icon.important.left";
-                  to_y: "elm.padding.top";
+                  to_x: "elm.padding.icon3.left";
+                  to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  offset: 0 GENLIST_SIZE_8_INC;
-                  to_x: "elm.padding.icon.important.left";
-                  to_y: "elm.padding.top";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon3.left";
+                  to_y: "elm.padding.bottom";
                }
-               align: 1.0 0.0;
-               image.normal: "M02_button_06_normal.png";
-               image.border: 5 5 5 5;
-            }
-            description { state: "num_enable" 0.0;
-               inherit: "default" 0.0;
-               max: GENLIST_HEIGHT_62_INC GENLIST_SIZE_SLIDE_60_INC;
-               min: GENLIST_SIZE_46_INC GENLIST_SIZE_44_INC;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-
-         part { name: "elm.text.num";
+         part { name: "elm.padding.icon3.left";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               max: 0 GENLIST_SIZE_SLIDE_60_INC;
-               fixed: 1 1;
+               min: GENLIST_PADDING_16_INC 0;
                rel1 {
                   relative: 0.0 1.0;
-                  offset: 0 GENLIST_SIZE_8_INC;
-                  to_x: "elm.padding.icon.important.left";
-                  to_y: "elm.padding.top";
+                  to_x: "elm.icon.3";
+                  to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  offset: 0 GENLIST_SIZE_8_INC;
-                  to_x: "elm.padding.icon.important.left";
-                  to_y: "elm.padding.top";
+                  relative: 0.0 0.0;
+                  to_x: "elm.icon.3";
+                  to_y: "elm.padding.bottom";
                }
                align: 1.0 0.0;
+               visible: 0;
             }
-            description { state: "num_enable" 0.0;
-               inherit: "default" 0.0;
-               max: GENLIST_HEIGHT_62_INC GENLIST_SIZE_SLIDE_60_INC;
-               min: GENLIST_SIZE_46_INC GENLIST_SIZE_44_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 1 1;
-                  align: 0.5 0.5;
-                  text_class: "slp_medium";
-               }
-               color: GENLIST_PART_FONT_CONVERTOR_STYLE_COLOR_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-
-         part { name: "elm.icon.attach";
+         part { name: "elm.icon.3";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_SLIDE_60_INC;
-               fixed: 1 1;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
                rel1 {
                   relative: 0.0 1.0;
-                  to_x: "elm.icon.num";
-                  to_y: "elm.padding.top";
+                  to_x: "elm.padding.icon4.left";
+                  to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.num";
-                  to_y: "elm.padding.top";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon4.left";
+                  to_y: "elm.padding.bottom";
                }
-               align: 1.0 0.0;
-            }
-            description { state: "attach_enable" 0.0;
-               inherit: "default" 0.0;
-               min: GENLIST_SIZE_48_INC GENLIST_SIZE_SLIDE_60_INC;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text.subject";
+         part { name: "elm.padding.icon4.left";
             clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_SLIDE_60_INC;
-               fixed: 1 1;
+               min: GENLIST_PADDING_16_INC 0;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2{
                   relative: 0.0 1.0;
-                  to_x: "elm.icon.attach";
-                  to_y: "elm.padding.top";
+                  to_x: "elm.icon.4";
+                  to_y: "elm.text.1";
                }
-               align: 0.0 0.0;
-               text {
-                  style: "genlist_email_textblock_unread_style";
-                  min: 0 1;
-                  max: 0 1;
-                  align: 0.0 0.5;
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.icon.4";
+                  to_y: "elm.padding.bottom";
                }
+               align: 1.0 0.0;
+               visible: 0;
             }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_selected_style";
-            }
-            description { state: "read" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_read_style";
-            }
-            description { state: "unread" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_unread_style";
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-
-         part { name: "elm.padding.intermediate";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_PADDING_4_INC;
-               fixed: 0 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
-                  to_y: "elm.icon.attach";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x:  "elm.padding.icon.checkbox.right";
-                  to_y: "elm.icon.attach";
-               }
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
-
-         part { name: "elm.icon.priority";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_40_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
-                  to_y: "elm.padding.intermediate";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
-                  to_y: "elm.padding.intermediate";
-               }
-               align: 0.0 0.0;
-            }
-            description { state: "priority_enable" 0.0;
-               inherit: "default" 0.0;
-               min: GENLIST_SIZE_48_INC GENLIST_SIZE_40_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.icon.lastverb";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_40_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
-                  to_y: "elm.icon.priority";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.checkbox.right";
-                  to_y: "elm.icon.priority";
-               }
-               align: 0.0 0.0;
-            }
-            description { state: "lastverb_enable" 0.0;
-               inherit: "default" 0.0;
-               min: GENLIST_SIZE_48_INC GENLIST_SIZE_40_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-
-         part { name: "elm.text.date";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_154_INC GENLIST_SIZE_40_INC;
-               fixed: 1 1;
-               rel1 {
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 1.0 1.0;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 1.0 0.5;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-
-         part { name: "elm.icon.appointment";
+         part { name: "elm.icon.4";
             clip_to: "disclip";
             type: SWALLOW;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_40_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.intermediate";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.intermediate";
-               }
-               align: 1.0 0.0;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.text.name";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_40_INC;
-               fixed: 1 1;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.icon.priority";
-                  to_y: "elm.padding.intermediate";
-               }
-               rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.icon.appointment";
-                  to_y: "elm.padding.intermediate";
-               }
-               align: 0.0 0.0;
-               text {
-                  style: "genlist_email_textblock2_style";
-                  min: 0 1;
-                  align: 0.0 0.5;
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_email_textblock2_selected_style";
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.text.preview";
-            clip_to: "disclip";
-            type: TEXT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_40_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.lastverb";
-                  to_y: "elm.padding.bottom";
+                  to_x: "elm.text.3";
+                  to_y: "elm.text.1";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.text.date";
+                  to_x: "elm.text.3";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 1.0;
-               color: GENLIST_PART_FONT_CONTENTS_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_30_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -8825,7 +8358,6 @@
             repeat_events: 0;
             description { state: "default" 0.0;
                min: GENLIST_SIZE_168_INC 0;
-               fixed: 1 1;
                color: 0 0 0 0;
                align: 1.0 0.5;
                rel1 {
@@ -8856,10 +8388,9 @@
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
-            target: "elm.text.subject";
-            target: "elm.text.name";
-            target: "elm.text.date";
-            target: "elm.text.preview";
+            target: "elm.text.1";
+            target: "elm.text.2";
+            target: "elm.text.3";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -8867,10 +8398,9 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text.subject";
-            target: "elm.text.name";
-            target: "elm.text.date";
-            target: "elm.text.preview";
+            target: "elm.text.1";
+            target: "elm.text.2";
+            target: "elm.text.3";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -8885,125 +8415,73 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
+         GENLIST_PROGRAM_FLIP_3TEXT_2ICON
          program { name: "go_read";
             signal: "elm,state,read";
             source: "elm";
             action: STATE_SET "read" 0.0;
-            target: "elm.text.subject";
+            target: "elm.text.1";
          }
          program { name: "go_unread";
             signal: "elm,state,unread";
             source: "elm";
             action: STATE_SET "unread" 0.0;
-            target: "elm.text.subject";
-         }
-         program { name: "go_attach";
-            signal: "elm,state,attach";
-            source: "elm";
-            action: STATE_SET "attach_enable" 0.0;
-            target: "elm.icon.attach";
-         }
-         program { name: "go_priority";
-            signal: "elm,state,priority";
-            source: "elm";
-            action: STATE_SET "priority_enable" 0.0;
-            target: "elm.icon.priority";
+            target: "elm.text.1";
          }
-         program { name: "go_lastverb";
-            signal: "elm,state,lastverb";
+         program { name: "go_urgeny_unread";
+            signal: "elm,state,urgency_unread";
             source: "elm";
-            action: STATE_SET "lastverb_enable" 0.0;
-            target: "elm.icon.lastverb";
+            action: STATE_SET "urgency_unread" 0.0;
+            target: "elm.text.1";
          }
-         program { name: "go_num";
-            signal: "elm,state,num";
+         program { name: "go_urgency_read";
+            signal: "elm,state,urgency_read";
             source: "elm";
-            action: STATE_SET "num_enable" 0.0;
-            target: "elm.icon.num";
-            target: "elm.text.num";
-         }
-         program { name: "click";
-            signal: "mouse,up,1";
-            source: "elm.icon.checkbox.touch";
-            action: SIGNAL_EMIT "elm,action,check,toggle" "";
+            action: STATE_SET "urgency_read" 0.0;
+            target: "elm.text.1";
          }
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-
-// ???
-   /* NOTE: This style is a temporary style for email application. Otherwise do not use this. */
-   group { name: "elm/genlist/item/3text.6icon/default";
-      alias: "elm/genlist/item_odd/3text.6icon/default";
-      alias: "elm/genlist/item_compress/3text.6icon/default";
-      alias: "elm/genlist/item_compress_odd/3text.6icon/default";
+// 3.2.24
+   group { name: "elm/genlist/item/2text.3icon.2/default";
+      alias: "elm/genlist/item_odd/2text.3icon.2/default";
+      alias: "elm/genlist/item_compress/2text.3icon.2/default";
+      alias: "elm/genlist/item_compress_odd/2text.3icon.2/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
-      data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3 elm.icon.4 elm.swallow.colorbar elm.swallow.outbox.progress";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon.1 elm.icon.2 elm.swallow.colorbar";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
          GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.swallow.colorbar";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_SIZE_10_INC GENLIST_SIZE_21_INC;
+               fixed: 1 1;
                rel2.relative: 0.0 0.0;
                align: 0.0 0.0;
             }
          }
-         part { name: "elm.text.3";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_154_INC GENLIST_SIZE_61_INC;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 1.0 1.0;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 1.0 0.5;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.icon.1";
+         part { name: "elm.icon.2";
             clip_to: "disclip";
             type: SWALLOW;
-            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
@@ -9012,258 +8490,351 @@
                rel2 {
                   relative: 0.0 0.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.text.3";
+                  to_y: "elm.padding.bottom";
                }
-               align: 1.0 0.0;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon1.left";
+         part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
-               rel1.to_x: "elm.icon.1";
+               fixed: 1 0;
+               rel1.to_x: "elm.icon.2";
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.icon.1";
+                  to_x: "elm.icon.2";
                }
                align: 1.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.text1.rect";
+         part { name: "elm.text.2";
             clip_to: "disclip";
-            type: RECT;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
+               min: 0 GENLIST_SIZE_48_INC;
+               fixed: 0 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.swallow.colorbar";
-                  to_y: "elm.padding.top";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.icon1.left";
-                  to_y: "elm.padding.top";
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1.to: "elm.text1.rect";
-               rel2.to: "elm.text1.rect";
-               align: 0.0 0.0;
+               align: 0.0 1.0;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
-                  style: "genlist_email_textblock_unread_style";
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
                   min: 0 1;
-                  max: 0 1;
                   align: 0.0 0.5;
+                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_selected_style";
-            }
-            description { state: "read" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_read_style";
-            }
-            description { state: "unread" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_unread_style";
-            }
-            description { state: "urgency_read" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_urgency_read_style";
-            }
-            description { state: "urgency_unread" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_email_textblock_urgency_unread_style";
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text.2";
+         part { name: "elm.text.1";
             clip_to: "disclip";
-            type: TEXTBLOCK;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               min: 0 0;
+               max: GENLIST_SIZE_560_INC 0;
+               fixed: 1 0;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "elm.padding.left";
-                  to_y: "elm.text.1";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.bottom";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.text.2";
                }
                align: 0.0 0.5;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
-                  style: "genlist_email_textblock2_style";
-                  min: 0 1;
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_44_INC;
+                  min: 1 1;
                   align: 0.0 0.5;
+                  text_class: "list_item";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_email_textblock2_selected_style";
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon2.left";
+         part { name: "elm.padding.icon1.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.2";
-                  to_y: "elm.text.1";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.icon.2";
-                  to_y: "elm.padding.bottom";
+                  relative: 1.0 0.0;
+                  to_x: "elm.text.1";
                }
-               align: 1.0 0.0;
+               rel2.to_x: "elm.text.1";
+               align: 0.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.icon.2";
+         part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
                max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               fixed: 1 1;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon3.left";
-                  to_y: "elm.text.1";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.left";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon3.left";
-                  to_y: "elm.padding.bottom";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.icon1.left";
+                  to_y: "elm.text.2";
                }
-               align: 1.0 0.5;
+               align: 0.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon3.left";
+         GENLIST_PART_FLIP
+         GENLIST_PART_DISCLIP
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg_image";
+            target: "elm.text.1";
+            target: "elm.text.2";
+            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
+         }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg_image";
+            target: "elm.text.1";
+            target: "elm.text.2";
+            transition: LINEAR 0.1;
+         }
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+         GENLIST_PROGRAM_FLIP_2TEXT_2ICON
+         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
+      }
+   }
+
+// 3.2.25
+   group { name: "elm/genlist/item/2text.3icon.3/default";
+      alias: "elm/genlist/item_odd/2text.3icon.3/default";
+      alias: "elm/genlist/item_compress/2text.3icon.3/default";
+      alias: "elm/genlist/item_compress_odd/2text.3icon.3/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon.1 elm.icon.2 elm.swallow.colorbar";
+      data.item: "flips" "elm.flip.content";
+      images {
+         image: "00_list_bar_press_1x80.png" COMP;
+      }
+      parts {
+         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.swallow.colorbar";
             clip_to: "disclip";
-            type: RECT;
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
+               min: GENLIST_SIZE_10_INC GENLIST_SIZE_21_INC;
+               fixed: 1 1;
+               rel2.relative: 0.0 0.0;
+               align: 0.0 0.0;
+            }
+         }
+         part { name: "elm.icon.1";
+            clip_to: "disclip";
+            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;
+               fixed: 1 1;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.3";
-                  to_y: "elm.text.1";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.icon.3";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.bottom";
                }
-               align: 1.0 0.0;
+               align: 0.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.icon1.right";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.1";
+               }
+               rel2.to_x: "elm.icon.1";
+               align: 0.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.icon.3";
+         part { name: "elm.icon.2";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon4.left";
-                  to_y: "elm.text.1";
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon4.left";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
                align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon4.left";
+         part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.4";
-                  to_y: "elm.text.1";
-               }
-               rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.icon.4";
-                  to_y: "elm.padding.bottom";
+                  to_x: "elm.icon.2";
                }
+               rel2.to_x: "elm.icon.2";
                align: 1.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.icon.4";
+         part { name: "elm.text.1";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               min: 0 GENLIST_SIZE_61_INC;
+               fixed: 1 1;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.text.3";
-                  to_y: "elm.text.1";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.text.3";
-                  to_y: "elm.padding.bottom";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.top";
                }
-               align: 1.0 0.5;
+               align: 0.0 0.0;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_44_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "list_item";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.swallow.outbox.progress";
-            type: SWALLOW;
+         part { name: "elm.text.2";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
-            mouse_events: 1;
-            repeat_events: 0;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_168_INC 0;
-               color: 0 0 0 0;
-               align: 1.0 0.5;
                rel1 {
-                  relative: 0.0 1.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.text.1";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "slp_medium";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          GENLIST_PART_FLIP
          GENLIST_PART_DISCLIP
@@ -9281,7 +8852,6 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
-            target: "elm.text.3";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -9291,7 +8861,6 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
-            target: "elm.text.3";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -9306,44 +8875,20 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_3TEXT_2ICON
-         program { name: "go_read";
-            signal: "elm,state,read";
-            source: "elm";
-            action: STATE_SET "read" 0.0;
-            target: "elm.text.1";
-         }
-         program { name: "go_unread";
-            signal: "elm,state,unread";
-            source: "elm";
-            action: STATE_SET "unread" 0.0;
-            target: "elm.text.1";
-         }
-         program { name: "go_urgeny_unread";
-            signal: "elm,state,urgency_unread";
-            source: "elm";
-            action: STATE_SET "urgency_unread" 0.0;
-            target: "elm.text.1";
-         }
-         program { name: "go_urgency_read";
-            signal: "elm,state,urgency_read";
-            source: "elm";
-            action: STATE_SET "urgency_read" 0.0;
-            target: "elm.text.1";
-         }
+         GENLIST_PROGRAM_FLIP_2TEXT_2ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.2.24
-   group { name: "elm/genlist/item/2text.3icon.2/default";
-      alias: "elm/genlist/item_odd/2text.3icon.2/default";
-      alias: "elm/genlist/item_compress/2text.3icon.2/default";
-      alias: "elm/genlist/item_compress_odd/2text.3icon.2/default";
+// 3.2.26
+   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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon.1 elm.icon.2 elm.swallow.colorbar";
+      data.item: "contents" "elm.icon.1 elm.icon.2";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
@@ -9354,32 +8899,95 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.swallow.colorbar";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_10_INC GENLIST_SIZE_21_INC;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
-               rel2.relative: 0.0 0.0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 0.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.icon1.right";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.1";
+               }
+               rel2.to_x: "elm.icon.1";
                align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_61_INC;
+               fixed: 0 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               align: 0.0 0.0;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_44_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "list_item";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.icon.2";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
+                  to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 0.0 0.0;
+                  relative: 0.0 1.0;
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
@@ -9388,17 +8996,16 @@
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.padding.icon2.left";
-            clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.icon.2";
-               rel2 {
-                  relative: 0.0 1.0;
+               rel1 {
+                  relative: 0.0 0.0;
                   to_x: "elm.icon.2";
                }
+               rel2.to_x: "elm.icon.2";
                align: 1.0 0.0;
                visible: 0;
             }
@@ -9409,19 +9016,17 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_48_INC;
-               fixed: 0 1;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.text.1";
                }
                rel2 {
                   relative: 0.0 0.0;
+                  offset: 0 0;
                   to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 1.0;
                color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
@@ -9437,79 +9042,6 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 0;
-               max: GENLIST_SIZE_560_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.2";
-               }
-               align: 0.0 0.5;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
-                  min: 1 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon1.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.text.1";
-               }
-               rel2.to_x: "elm.text.1";
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.1";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.left";
-                  to_y: "elm.text.2";
-               }
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
          GENLIST_PART_FLIP
          GENLIST_PART_DISCLIP
       }
@@ -9554,83 +9086,104 @@
       }
    }
 
-// 3.2.25
-   group { name: "elm/genlist/item/2text.3icon.3/default";
-      alias: "elm/genlist/item_odd/2text.3icon.3/default";
-      alias: "elm/genlist/item_compress/2text.3icon.3/default";
-      alias: "elm/genlist/item_compress_odd/2text.3icon.3/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon.1 elm.icon.2 elm.swallow.colorbar";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+   group { name: "elm/genlist/item_compress/2text.2icon.6.tb/default";
+      inherit: "elm/genlist/item/2text.2icon.6/default";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.swallow.colorbar";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_10_INC GENLIST_SIZE_21_INC;
-               fixed: 1 1;
-               rel2.relative: 0.0 0.0;
-               align: 0.0 0.0;
-            }
-         }
-         part { name: "elm.icon.1";
+         part { name: "elm.text.1";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: TEXTBLOCK;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               fixed: 1 1;
+               min: 0 GENLIST_SIZE_61_INC;
+               fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.icon1.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
                }
-               align: 0.0 0.5;
+               align: 0.0 0.0;
+               text {
+                  style: "genlist_default_textblock_style";
+                  size: GENLIST_FONT_44_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "list_item";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_default_textblock_selected_style";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon1.right";
+         part { name: "elm.text.2";
             clip_to: "disclip";
-            type: RECT;
+            type: TEXTBLOCK;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.text.1";
                }
-               rel2.to_x: "elm.icon.1";
-               align: 0.0 0.0;
-               visible: 0;
+               rel2 {
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.bottom";
+               }
+               text {
+                  style: "genlist_default_textblock_style";
+                  size: GENLIST_FONT_32_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "slp_medium";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_default_textblock_selected_style";
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.icon.2";
+      }
+   }
+
+// 3.2.27
+   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";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon";
+      data.item: "flips" "elm.flip.content";
+      images {
+         image: "00_list_bar_press_1x80.png" COMP;
+      }
+      parts {
+         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
+               max: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
@@ -9638,7 +9191,7 @@
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 1.0;
+                  relative: 0.0 0.0;
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
@@ -9646,18 +9199,18 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon2.left";
+         part { name: "elm.padding.icon.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.icon.2";
+               rel1.to_x: "elm.icon";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon";
                }
-               rel2.to_x: "elm.icon.2";
                align: 1.0 0.0;
                visible: 0;
             }
@@ -9669,15 +9222,15 @@
             scale: 1;
             description { state: "default" 0.0;
                min: 0 GENLIST_SIZE_61_INC;
-               fixed: 1 1;
+               fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
+                  to_x: "elm.padding.icon.left";
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
@@ -9704,14 +9257,15 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.left";
                   to_y: "elm.text.1";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.icon2.left";
+                  to_x: "elm.padding.icon.left";
                   to_y: "elm.padding.bottom";
                }
+               align: 0.0 0.0;
                color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
@@ -9766,165 +9320,112 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT_2ICON
+         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.2.26
-   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";
+// ???
+   /* NOTE: This style is a temporary style for email application. Otherwise do not use this. */
+   group { name: "elm/genlist/item/2text.1icon.13/default";
+      alias: "elm/genlist/item_odd/2text.1icon.13/default";
+      alias: "elm/genlist/item_compress/2text.1icon.13/default";
+      alias: "elm/genlist/item_compress_odd/2text.1icon.13/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon.1 elm.icon.2";
+      data.item: "texts" "elm.text elm.text.msgcount";
+      data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_BG
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.1";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
+                  relative: 1.0 0.0;
                   to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 0.0;
+                  relative: 1.0 1.0;
                   to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
                }
                align: 0.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon1.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
-               }
-               rel2.to_x: "elm.icon.1";
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text.1";
+         part { name: "elm.text.msgcount";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 0 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               align: 0 0;
+               color: GENLIST_PART_EMAIL_MSGCOUNT_TEXT_COLOR_INC;
+               rel1.to: "elm.icon";
+               rel2.to: "elm.icon";
                text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_28_INC;
                   min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
+                  align: 0.5 0.5;
+                  text_class: "slp_medium";
                }
+               align: 0.0 0.5;
             }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.icon.2";
+         part { name: "elm.padding.icon.right";
             clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.text.1";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon2.left";
             type: RECT;
             scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
+            description {
+               state: "default" 0.0;
+               min: GENLIST_SIZE_16_INC 0;
                fixed: 1 0;
                rel1 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.icon.2";
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon";
                }
-               rel2.to_x: "elm.icon.2";
-               align: 1.0 0.0;
+               rel2.to_x: "elm.icon";
                visible: 0;
             }
          }
-         part { name: "elm.text.2";
+         part { name: "elm.text";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.text.1";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.icon.right";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.bottom";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
                }
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               align: 0.0 0.5;
+               color: GENLIST_PART_FONT_UNREAD_EMAIL_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_44_INC;
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "slp_medium";
+                  text_class: "list_item";
                }
             }
             description { state: "selected" 0.0;
@@ -9937,18 +9438,12 @@
          GENLIST_PART_DISCLIP
       }
       programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
          program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
+            target: "elm.text";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -9956,8 +9451,7 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
+            target: "elm.text";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -9972,130 +9466,118 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT_2ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-   group { name: "elm/genlist/item_compress/2text.2icon.6.tb/default";
-      inherit: "elm/genlist/item/2text.2icon.6/default";
+// ???
+   /* NOTE: This style is a temporary style for email application. Otherwise do not use this. */
+   group { name: "elm/genlist/item/2text.1icon.14/default";
+      alias: "elm/genlist/item_odd/2text.1icon.14/default";
+      alias: "elm/genlist/item_compress/2text.1icon.14/default";
+      alias: "elm/genlist/item_compress_odd/2text.1icon.14/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text elm.text.msgcount";
+      data.item: "contents" "elm.check elm.icon";
+      data.item: "flips" "elm.flip.content";
+      images {
+         image: "00_list_bar_press_1x80.png" COMP;
+      }
       parts {
-         part { name: "elm.text.1";
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_BG
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.check";
             clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
+            type: SWALLOW;
+            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 0 1;
+               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.padding.top";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               align: 0.0 0.0;
-               text {
-                  style: "genlist_default_textblock_style";
-                  size: GENLIST_FONT_44_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
                }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               align: 0.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text.2";
+
+         part { name: "elm.padding.icon.checkbox.right";
             clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.text.1";
+                  relative: 1.0 0.0;
+                  to_x: "elm.check";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.bottom";
-               }
-               text {
-                  style: "genlist_default_textblock_style";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "slp_medium";
+                  relative: 1.0 1.0;
+                  to_x:  "elm.check";
                }
+               align: 1.0 0.0;
+               visible: 0;
             }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-      }
-   }
-
-// 3.2.27
-   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";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
-      parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
-               max: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
+               rel1.to_x: "elm.padding.right";
                rel2 {
-                  relative: 0.0 0.0;
+                  relative: 0.0 1.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
                }
                align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+         part { name: "elm.text.msgcount";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description {
+               state: "default" 0.0;
+               fixed: 1 1;
+               align: 0 0;
+               color: GENLIST_PART_EMAIL_MSGCOUNT_TEXT_COLOR_INC;
+               rel1.to: "elm.icon";
+               rel2.to: "elm.icon";
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_28_INC;
+                  min: 0 1;
+                  align: 0.5 0.5;
+                  text_class: "slp_medium";
+               }
+               align: 0.0 0.5;
+            }
+         }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
+            description {
+               state: "default" 0.0;
+               min: GENLIST_SIZE_16_INC 0;
                fixed: 1 0;
                rel1.to_x: "elm.icon";
                rel2 {
@@ -10106,64 +9588,26 @@
                visible: 0;
             }
          }
-         part { name: "elm.text.1";
+         part { name: "elm.text";
             clip_to: "disclip";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 0 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.icon.checkbox.right";
                }
                rel2 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.icon.left";
-                  to_y: "elm.padding.top";
-               }
-               align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.1";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon.left";
-                  to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               align: 0.0 0.5;
                text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  style: "genlist_email_textblock_unread_style";
                   min: 0 1;
+                  max: 0 1;
                   align: 0.0 0.5;
-                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
@@ -10176,18 +9620,12 @@
          GENLIST_PART_DISCLIP
       }
       programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
          program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
+            target: "elm.text";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -10195,8 +9633,7 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
+            target: "elm.text";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -10211,110 +9648,166 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// ???
-   /* NOTE: This style is a temporary style for email application. Otherwise do not use this. */
-   group { name: "elm/genlist/item/2text.1icon.13/default";
-      alias: "elm/genlist/item_odd/2text.1icon.13/default";
-      alias: "elm/genlist/item_compress/2text.1icon.13/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.13/default";
+// 3.2.28
+   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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text elm.text.msgcount";
-      data.item: "contents" "elm.icon";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
-         GENLIST_PART_BG
+         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon";
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.3";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
+               max: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
                fixed: 1 1;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.5;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text.msgcount";
+         part { name: "elm.padding.icon3.left";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.icon.3";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.3";
+               }
+               align: 1.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
-            description {
-               state: "default" 0.0;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_48_INC;
                fixed: 1 1;
-               align: 0 0;
-               color: GENLIST_PART_EMAIL_MSGCOUNT_TEXT_COLOR_INC;
-               rel1.to: "elm.icon";
-               rel2.to: "elm.icon";
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.icon2.right";
+                  to_y: "elm.padding.bottom";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon3.left";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 0.0 1.0;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_28_INC;
+                  size: GENLIST_FONT_32_INC;
                   min: 0 1;
-                  align: 0.5 0.5;
+                  align: 0.0 0.5;
                   text_class: "slp_medium";
                }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.icon.2";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.text.2";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
+               }
                align: 0.0 0.5;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon.right";
+         part { name: "elm.padding.icon2.right";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
-            description {
-               state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.icon";
+                  to_x: "elm.icon.2";
                }
-               rel2.to_x: "elm.icon";
+               rel2.to_x: "elm.icon.2";
+               align: 0.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.text";
+         part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               min: 0 0;
+               max: GENLIST_SIZE_576_INC 0;
+               fixed: 1 0;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon.right";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.text.2";
                }
                align: 0.0 0.5;
-               color: GENLIST_PART_FONT_UNREAD_EMAIL_COLOR_INC;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_44_INC;
-                  min: 0 1;
+                  min: 1 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
                }
@@ -10325,16 +9818,60 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+
+         part { name: "elm.padding.icon1.left";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.text.1";
+               }
+               rel2.to_x: "elm.text.1";
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.icon.1";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.icon1.left";
+                  to_y: "elm.text.2";
+               }
+               align: 0.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
          GENLIST_PART_FLIP
          GENLIST_PART_DISCLIP
       }
       programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
          program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -10342,7 +9879,8 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -10357,148 +9895,128 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
+         GENLIST_PROGRAM_FLIP_2TEXT_3ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// ???
-   /* NOTE: This style is a temporary style for email application. Otherwise do not use this. */
-   group { name: "elm/genlist/item/2text.1icon.14/default";
-      alias: "elm/genlist/item_odd/2text.1icon.14/default";
-      alias: "elm/genlist/item_compress/2text.1icon.14/default";
-      alias: "elm/genlist/item_compress_odd/2text.1icon.14/default";
+// 3.2.29
+   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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text elm.text.msgcount";
-      data.item: "contents" "elm.check elm.icon";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
-         GENLIST_PART_BG
+         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.check";
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
-            mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.5;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-
-         part { name: "elm.padding.icon.checkbox.right";
+         part { name: "elm.padding.icon.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.check";
-               }
+               rel1.to_x: "elm.icon";
                rel2 {
-                  relative: 1.0 1.0;
-                  to_x:  "elm.check";
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon";
                }
                align: 1.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.icon";
+         part { name: "elm.text.1";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               fixed: 1 1;
-               rel1.to_x: "elm.padding.right";
+               min: 0 GENLIST_SIZE_61_INC;
+               fixed: 0 1;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
+               }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon.left";
+                  to_y: "elm.padding.bottom";
                }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.text.msgcount";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-               fixed: 1 1;
-               align: 0 0;
-               color: GENLIST_PART_EMAIL_MSGCOUNT_TEXT_COLOR_INC;
-               rel1.to: "elm.icon";
-               rel2.to: "elm.icon";
+               align: 0.0 1.0;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_28_INC;
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_44_INC;
                   min: 0 1;
-                  align: 0.5 0.5;
-                  text_class: "slp_medium";
+                  align: 0.0 0.5;
+                  text_class: "slp_roman";
                }
-               align: 0.0 0.5;
             }
-         }
-         part { name: "elm.padding.icon.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description {
-               state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.icon";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon";
-               }
-               align: 1.0 0.0;
-               visible: 0;
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text";
+         part { name: "elm.text.2";
             clip_to: "disclip";
-            type: TEXTBLOCK;
+            type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon.checkbox.right";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 1.0;
+                  relative: 0.0 0.0;
                   to_x: "elm.padding.icon.left";
+                  to_y: "elm.text.1";
                }
-               align: 0.0 0.5;
+               align: 0.0 1.0;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
-                  style: "genlist_email_textblock_unread_style";
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
                   min: 0 1;
-                  max: 0 1;
                   align: 0.0 0.5;
+                  text_class: "list_item";
                }
             }
             description { state: "selected" 0.0;
@@ -10511,12 +10029,18 @@
          GENLIST_PART_DISCLIP
       }
       programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
          program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -10524,7 +10048,8 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "bg_image";
-            target: "elm.text";
+            target: "elm.text.1";
+            target: "elm.text.2";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -10539,19 +10064,20 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
+         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.2.28
-   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";
+// 3.2.30
+   group { name: "elm/genlist/item/1text.3icon.3/default";
+      alias: "elm/genlist/item_odd/1text.3icon.3/default";
+      alias: "elm/genlist/item_compress/1text.3icon.3/default";
+      alias: "elm/genlist/item_compress_odd/1text.3icon.3/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3";
+      data.item: "texts" "elm.text.1";
+      data.item: "contents" "elm.icon.1 elm.icon.2 elm.swallow.progress";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
@@ -10562,115 +10088,79 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.3";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
-               max: GENLIST_SIZE_96_INC GENLIST_SIZE_96_INC;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.bottom";
                }
-               align: 1.0 0.5;
+               align: 0.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon3.left";
+         part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.icon.3";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.3";
-               }
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_48_INC;
-               fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.icon2.right";
-                  to_y: "elm.padding.bottom";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon3.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 1.0;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "slp_medium";
+                  to_x: "elm.icon.1";
                }
+               rel2.to_x: "elm.icon.1";
+               align: 0.0 0.0;
+               visible: 0;
             }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.icon.2";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
                fixed: 1 1;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.2";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.5;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon2.right";
+         part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
+               rel1.to_x: "elm.icon.2";
+               rel2 {
+                  relative: 0.0 1.0;
                   to_x: "elm.icon.2";
                }
-               rel2.to_x: "elm.icon.2";
-               align: 0.0 0.0;
+               align: 1.0 0.0;
                visible: 0;
             }
          }
@@ -10680,25 +10170,24 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 0;
-               max: GENLIST_SIZE_576_INC 0;
-               fixed: 1 0;
+               min: 0 GENLIST_SIZE_61_INC;
+               fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  to_x: "elm.padding.icon1.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.2";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.top";
                }
-               align: 0.0 0.5;
+               align: 0 0;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_44_INC;
-                  min: 1 1;
+                  min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
                }
@@ -10709,41 +10198,23 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-
-         part { name: "elm.padding.icon1.left";
-            type: RECT;
+         part { name: "elm.swallow.progress";
+            clip_to: "disclip";
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.text.1";
-               }
-               rel2.to_x: "elm.text.1";
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.1";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               fixed: 1 1;
+               fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.left";
-                  to_y: "elm.padding.top";
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.left";
-                  to_y: "elm.text.2";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.text.1";
                }
-               align: 0.0 0.5;
+               align: 0.5 0.0;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -10762,7 +10233,6 @@
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
             target: "elm.text.1";
-            target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -10771,7 +10241,6 @@
             action: STATE_SET "default" 0.0;
             target: "bg_image";
             target: "elm.text.1";
-            target: "elm.text.2";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -10786,20 +10255,39 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT_3ICON
+         program { name: "flip_enabled";
+            signal: "elm,state,flip,enabled";
+            source: "elm";
+            action: STATE_SET "flip_enabled" 0.0;
+            target: "elm.text.1";
+            target: "elm.icon.1";
+            target: "elm.icon.2";
+            target: "elm.swallow.progress";
+            target: "elm.flip.content";
+         }
+         program { name: "flip_disabled";
+            signal: "elm,state,flip,disabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text.1";
+            target: "elm.icon.1";
+            target: "elm.icon.2";
+            target: "elm.swallow.progress";
+            target: "elm.flip.content";
+         }
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.2.29
-   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";
+// 3.2.30
+   group { name: "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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon";
+      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
+      data.item: "contents" "elm.icon.1 elm.icon.2 elm.swallow.progress";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
@@ -10810,15 +10298,51 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.1";
+            clip_to: "disclip";
+            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;
+               fixed: 1 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 0.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.icon1.right";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.1";
+               }
+               rel2.to_x: "elm.icon.1";
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.icon.2";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
@@ -10834,17 +10358,17 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon.left";
+         part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.icon";
+               rel1.to_x: "elm.icon.2";
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.icon";
+                  to_x: "elm.icon.2";
                }
                align: 1.0 0.0;
                visible: 0;
@@ -10860,22 +10384,22 @@
                fixed: 0 1;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.icon.left";
-                  to_y: "elm.padding.bottom";
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.top";
                }
-               align: 0.0 1.0;
+               align: 0 0;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_44_INC;
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "slp_roman";
+                  text_class: "list_item";
                }
             }
             description { state: "selected" 0.0;
@@ -10884,30 +10408,86 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+         part { name: "elm.swallow.progress";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 0 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.text.1";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.text.2";
+               }
+               align: 0.5 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_48_INC;
+               fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.padding.bottom";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon.left";
-                  to_y: "elm.text.1";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.bottom";
                }
-               align: 0.0 1.0;
+               align: 0 1;
                color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
+                  font: "SLP:style=Roman";
                   size: GENLIST_FONT_32_INC;
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "list_item";
+                  text_class: "slp_roman";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.text.3";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_48_INC;
+               fixed: 0 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.padding.bottom";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 1 1;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_32_INC;
+                  min: 0 1;
+                  align: 1.0 0.5;
+                  text_class: "slp_roman";
                }
             }
             description { state: "selected" 0.0;
@@ -10932,6 +10512,7 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
+            target: "elm.text.3";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -10941,6 +10522,7 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
+            target: "elm.text.3";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -10955,20 +10537,43 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT_1ICON
+         program { name: "flip_enabled";
+            signal: "elm,state,flip,enabled";
+            source: "elm";
+            action: STATE_SET "flip_enabled" 0.0;
+            target: "elm.text.1";
+            target: "elm.text.2";
+            target: "elm.text.3";
+            target: "elm.icon.1";
+            target: "elm.icon.2";
+            target: "elm.swallow.progress";
+            target: "elm.flip.content";
+         }
+         program { name: "flip_disabled";
+            signal: "elm,state,flip,disabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text.1";
+            target: "elm.text.2";
+            target: "elm.text.3";
+            target: "elm.icon.1";
+            target: "elm.icon.2";
+            target: "elm.swallow.progress";
+            target: "elm.flip.content";
+         }
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.2.30
-   group { name: "elm/genlist/item/1text.3icon.3/default";
-      alias: "elm/genlist/item_odd/1text.3icon.3/default";
-      alias: "elm/genlist/item_compress/1text.3icon.3/default";
-      alias: "elm/genlist/item_compress_odd/1text.3icon.3/default";
+// 3.2.31
+   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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1";
-      data.item: "contents" "elm.icon.1 elm.icon.2 elm.swallow.progress";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon.1 elm.icon.2";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
@@ -10979,15 +10584,15 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
@@ -11073,7 +10678,7 @@
                   to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.top";
                }
-               align: 0 0;
+               align: 0.0 0.0;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
@@ -11089,25 +10694,36 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.swallow.progress";
+         part { name: "elm.text.2";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "elm.padding.icon1.right";
                   to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 0.0 1.0;
+                  relative: 0.0 0.0;
                   to_x: "elm.padding.icon2.left";
-                  to_y: "elm.text.1";
+                  to_y: "elm.padding.bottom";
+               }
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "slp_medium";
                }
-               align: 0.5 0.0;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          GENLIST_PART_FLIP
          GENLIST_PART_DISCLIP
@@ -11124,6 +10740,7 @@
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
             target: "elm.text.1";
+            target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -11132,6 +10749,7 @@
             action: STATE_SET "default" 0.0;
             target: "bg_image";
             target: "elm.text.1";
+            target: "elm.text.2";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -11146,39 +10764,59 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         program { name: "flip_enabled";
-            signal: "elm,state,flip,enabled";
-            source: "elm";
-            action: STATE_SET "flip_enabled" 0.0;
-            target: "elm.text.1";
-            target: "elm.icon.1";
-            target: "elm.icon.2";
-            target: "elm.swallow.progress";
-            target: "elm.flip.content";
-         }
-         program { name: "flip_disabled";
-            signal: "elm,state,flip,disabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text.1";
-            target: "elm.icon.1";
-            target: "elm.icon.2";
-            target: "elm.swallow.progress";
-            target: "elm.flip.content";
-         }
+         GENLIST_PROGRAM_FLIP_2TEXT_2ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.2.30
-   group { name: "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";
+   group { name: "elm/genlist/item_compress/2text.2icon.8.tb/default";
+      inherit: "elm/genlist/item/2text.2icon.8/default";
+      parts {
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXTBLOCK;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_61_INC;
+               fixed: 0 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.top";
+               }
+               align: 0.0 0.0;
+               text {
+                  style: "genlist_default_textblock_style";
+                  size: GENLIST_FONT_44_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "slp_roman";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_default_textblock_selected_style";
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+      }
+   }
+
+// 3.2.33
+   group { name: "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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
-      data.item: "contents" "elm.icon.1 elm.icon.2 elm.swallow.progress";
+      data.item: "texts" "elm.text.1";
+      data.item: "contents" "elm.icon.1 elm.swallow.progress";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
@@ -11189,15 +10827,15 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
@@ -11229,42 +10867,6 @@
                visible: 0;
             }
          }
-         part { name: "elm.icon.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon2.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.icon.2";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.2";
-               }
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -11274,13 +10876,13 @@
                min: 0 GENLIST_SIZE_61_INC;
                fixed: 0 1;
                rel1 {
-                  relative: 1.0 0.0;
+                  relative: 1.0 1.0;
                   to_x: "elm.padding.icon1.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon2.left";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
                align: 0 0;
@@ -11311,79 +10913,11 @@
                   to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.text.2";
-               }
-               align: 0.5 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_48_INC;
-               fixed: 0 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.padding.bottom";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0 1;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "slp_roman";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.text.3";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_48_INC;
-               fixed: 0 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.padding.bottom";
-               }
-               rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 1 1;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
-                  align: 1.0 0.5;
-                  text_class: "slp_roman";
+                  to_x: "elm.padding.right";
+                  to_y: "elm.text.1";
                }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               align: 0.5 0.0;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -11402,8 +10936,6 @@
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
             target: "elm.text.1";
-            target: "elm.text.2";
-            target: "elm.text.3";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -11412,8 +10944,6 @@
             action: STATE_SET "default" 0.0;
             target: "bg_image";
             target: "elm.text.1";
-            target: "elm.text.2";
-            target: "elm.text.3";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -11433,10 +10963,7 @@
             source: "elm";
             action: STATE_SET "flip_enabled" 0.0;
             target: "elm.text.1";
-            target: "elm.text.2";
-            target: "elm.text.3";
             target: "elm.icon.1";
-            target: "elm.icon.2";
             target: "elm.swallow.progress";
             target: "elm.flip.content";
          }
@@ -11445,10 +10972,7 @@
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.text.1";
-            target: "elm.text.2";
-            target: "elm.text.3";
             target: "elm.icon.1";
-            target: "elm.icon.2";
             target: "elm.swallow.progress";
             target: "elm.flip.content";
          }
@@ -11456,15 +10980,15 @@
       }
    }
 
-// 3.2.31
-   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";
+// 3.2.33
+   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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon.1 elm.icon.2";
+      data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
@@ -11475,15 +10999,15 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
@@ -11504,7 +11028,7 @@
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
+               min: GENLIST_SIZE_16_INC 0;
                fixed: 1 0;
                rel1 {
                   relative: 1.0 0.0;
@@ -11520,53 +11044,93 @@
             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;
                fixed: 1 1;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon1.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.icon1.right";
                   to_y: "elm.padding.bottom";
                }
-               align: 1.0 0.5;
+               align: 0.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon2.left";
+         part { name: "elm.padding.icon2.right";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
+               min: GENLIST_SIZE_16_INC 0;
                fixed: 1 0;
-               rel1.to_x: "elm.icon.2";
-               rel2 {
-                  relative: 0.0 1.0;
+               rel1 {
+                  relative: 1.0 0.0;
                   to_x: "elm.icon.2";
                }
-               align: 1.0 0.0;
+               rel2.to_x: "elm.icon.2";
+               align: 0.0 0.0;
                visible: 0;
             }
          }
-         part { name: "elm.text.1";
+         part { name: "elm.icon.3";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 0 1;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.padding.top";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
                }
+               align: 1.0 0.5;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.icon3.left";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_SIZE_16_INC 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.icon.3";
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
+                  to_x: "elm.icon.3";
+               }
+               align: 1.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_61_INC;
+               fixed: 0 1;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon2.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon3.left";
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
@@ -11593,12 +11157,12 @@
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.icon2.right";
                   to_y: "elm.text.1";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.icon2.left";
+                  to_x: "elm.padding.icon3.left";
                   to_y: "elm.padding.bottom";
                }
                color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
@@ -11660,54 +11224,15 @@
       }
    }
 
-   group { name: "elm/genlist/item_compress/2text.2icon.8.tb/default";
-      inherit: "elm/genlist/item/2text.2icon.8/default";
-      parts {
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 0 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.top";
-               }
-               align: 0.0 0.0;
-               text {
-                  style: "genlist_default_textblock_style";
-                  size: GENLIST_FONT_44_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "slp_roman";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-      }
-   }
-
-// 3.2.33
-   group { name: "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";
+// 3.2.34
+   group { name: "elm/genlist/item/2text.2icon.9/default";
+      alias: "elm/genlist/item_odd/2text.2icon.9/default";
+      alias: "elm/genlist/item_compress/2text.2icon.9/default";
+      alias: "elm/genlist/item_compress_odd/2text.2icon.9/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1";
-      data.item: "contents" "elm.icon.1 elm.swallow.progress";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon.1 elm.icon.2";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
@@ -11718,45 +11243,77 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.1";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.2";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
                fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.5;
+               align: 1.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon1.right";
+         part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
+               min: GENLIST_SIZE_16_INC 0;
                fixed: 1 0;
+               rel1.to_x: "elm.icon.2";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.2";
+               }
+               align: 1.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.text.2";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_48_INC;
+               fixed: 0 1;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
                }
-               rel2.to_x: "elm.icon.1";
-               align: 0.0 0.0;
-               visible: 0;
+               rel2 {
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 0.0 1.0;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "slp_medium";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.text.1";
             clip_to: "disclip";
@@ -11764,24 +11321,25 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 0 1;
+               min: 0 0;
+               max: GENLIST_SIZE_560_INC 0;
+               fixed: 1 0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.text.2";
                }
-               align: 0 0;
+               align: 0.0 0.5;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_44_INC;
-                  min: 0 1;
+                  min: 1 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
                }
@@ -11792,23 +11350,41 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.swallow.progress";
+         part { name: "elm.padding.icon1.left";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_SIZE_16_INC 0;
+               fixed: 1 0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.text.1";
+               }
+               rel2.to_x: "elm.text.1";
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               fixed: 0 1;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.text.1";
+                  to_x: "elm.padding.icon1.left";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.text.1";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.icon1.left";
+                  to_y: "elm.text.2";
                }
-               align: 0.5 0.0;
+               align: 0.0 0.5;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -11827,6 +11403,7 @@
             action: STATE_SET "selected" 0.0;
             target: "bg_image";
             target: "elm.text.1";
+            target: "elm.text.2";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -11835,6 +11412,7 @@
             action: STATE_SET "default" 0.0;
             target: "bg_image";
             target: "elm.text.1";
+            target: "elm.text.2";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -11849,136 +11427,38 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         program { name: "flip_enabled";
-            signal: "elm,state,flip,enabled";
-            source: "elm";
-            action: STATE_SET "flip_enabled" 0.0;
-            target: "elm.text.1";
-            target: "elm.icon.1";
-            target: "elm.swallow.progress";
-            target: "elm.flip.content";
-         }
-         program { name: "flip_disabled";
-            signal: "elm,state,flip,disabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text.1";
-            target: "elm.icon.1";
-            target: "elm.swallow.progress";
-            target: "elm.flip.content";
-         }
+         GENLIST_PROGRAM_FLIP_2TEXT_2ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.2.33
-   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";
+// 10.1 Help_dialogue group
+   group { name: "elm/genlist/item_compress/multiline/1text/default";
+      alias: "elm/genlist/item_compress_odd/multiline/1text/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
+      data.item: "texts" "elm.text.1";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.1";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon1.right";
-            clip_to: "disclip";
+         part { name: "base";
             type: RECT;
-            scale: 1;
+            repeat_events: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
-               }
-               rel2.to_x: "elm.icon.1";
-               align: 0.0 0.0;
-               visible: 0;
+               color: GENLIST_DIALOGUE_GROUP_BG_COLOR_INC;
             }
          }
-         part { name: "elm.icon.2";
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_22_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_22_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_32_INC )
+         part { name: "elm.text.1";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: TEXTBLOCK;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon2.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.2";
-               }
-               rel2.to_x: "elm.icon.2";
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.3";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               fixed: 1 1;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
@@ -11986,26 +11466,53 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               align: 1.0 0.5;
+               text {
+                  style: "genlist_textblock_help_style";
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon3.left";
-            clip_to: "disclip";
+         GENLIST_PART_DISCLIP
+      }
+      programs {
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
+   }
+
+// 3.4.1
+   group { name: "elm/genlist/item_compress/multiline/2text/default";
+      alias: "elm/genlist/item_compress_odd/multiline/2text/default";
+      alias: "elm/genlist/item_compress/multiline.2text/default";
+      alias: "elm/genlist/item_compress_odd/multiline.2text/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      parts {
+         part { name: "base";
             type: RECT;
-            scale: 1;
+            repeat_events: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.icon.3";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.3";
-               }
-               align: 1.0 0.0;
-               visible: 0;
+               color: GENLIST_PART_BG_COLOR_INC;
             }
          }
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_18_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -12016,19 +11523,19 @@
                fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon2.right";
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
-                  to_x: "elm.padding.icon3.left";
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
                color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
+                  size: GENLIST_FONT_42_INC;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -12038,40 +11545,34 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.icon2.right";
+                  to_x: "elm.padding.left";
                   to_y: "elm.text.1";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.icon3.left";
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  style: "genlist_textblock_flexible_sub_style";
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "slp_medium";
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               text.style: "genlist_textblock_flexible_sub_selected_style";
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         GENLIST_PART_FLIP
          GENLIST_PART_DISCLIP
       }
       programs {
@@ -12110,37 +11611,38 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         GENLIST_PROGRAM_FLIP_2TEXT_2ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 3.2.34
-   group { name: "elm/genlist/item/2text.2icon.9/default";
-      alias: "elm/genlist/item_odd/2text.2icon.9/default";
-      alias: "elm/genlist/item_compress/2text.2icon.9/default";
-      alias: "elm/genlist/item_compress_odd/2text.2icon.9/default";
+// 3.4.2
+   group { name: "elm/genlist/item/multiline/3text.2icon/default";
+      alias: "elm/genlist/item_odd/multiline/3text.2icon/default";
+      alias: "elm/genlist/item_compress/multiline/3text.2icon/default";
+      alias: "elm/genlist/item_compress_odd/multiline/3text.2icon/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
       data.item: "contents" "elm.icon.1 elm.icon.2";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_129_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_165_INC )
          GENLIST_PART_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.2";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
+               min: GENLIST_SIZE_176_INC GENLIST_SIZE_176_INC;
+               max: GENLIST_SIZE_176_INC GENLIST_SIZE_176_INC;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
@@ -12161,7 +11663,7 @@
             type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
+               min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
                rel1.to_x: "elm.icon.2";
                rel2 {
@@ -12172,32 +11674,44 @@
                visible: 0;
             }
          }
-         part { name: "elm.text.2";
+         part { name: "elm.text.1.rect";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 GENLIST_SIZE_48_INC;
                fixed: 0 1;
                rel1 {
-                  relative: 1.0 0.0;
+                  relative: 1.0 1.0;
                   to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
+                  to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
+                  relative: 0.0 1.0;
                   to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.bottom";
+                  to_y: "elm.padding.top";
                }
-               align: 0.0 1.0;
-               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               align: 0.0 0.0;
+               visible: 0;
+            }
+         }
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "elm.text.1.rect";
+               rel2.to: "elm.text.1.rect";
+               align: 0.0 0.0;
+               color: GENLIST_PART_FONT_3LINE_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_40_INC;
                   min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "slp_medium";
+                  text_class: "list_item";
                }
             }
             description { state: "selected" 0.0;
@@ -12206,33 +11720,32 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text.1";
+         part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 0;
-               max: GENLIST_SIZE_560_INC 0;
-               fixed: 1 0;
+               min: 0 GENLIST_SIZE_48_INC;
+               fixed: 0 1;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
+                  to_y: "elm.text.1.rect";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.2";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon2.left";
+                  to_y: "elm.text.1.rect";
                }
-               align: 0.0 0.5;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               align: 0.0 0.0;
+               color: GENLIST_PART_FONT_3LINE_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
-                  min: 1 1;
+                  size: GENLIST_FONT_36_INC;
+                  min: 0 1;
                   align: 0.0 0.5;
-                  text_class: "list_item";
+                  text_class: "slp_roman";
                }
             }
             description { state: "selected" 0.0;
@@ -12241,229 +11754,79 @@
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon1.left";
+         part { name: "elm.text.3";
             clip_to: "disclip";
-            type: RECT;
+            type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
-               fixed: 1 0;
+               min: 0 GENLIST_SIZE_35_INC;
+               fixed: 0 1;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.text.1";
-               }
-               rel2.to_x: "elm.text.1";
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.icon.1";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.left";
-                  to_y: "elm.text.2";
-               }
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
-      }
-      programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_2TEXT_2ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
-      }
-   }
-
-// 10.1 Help_dialogue group
-   group { name: "elm/genlist/item_compress/multiline/1text/default";
-      alias: "elm/genlist/item_compress_odd/multiline/1text/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1";
-      parts {
-         part { name: "base";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: GENLIST_DIALOGUE_GROUP_BG_COLOR_INC;
-            }
-         }
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_22_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_22_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_32_INC )
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
+                  to_x: "elm.padding.icon1.right";
+                  to_y: "elm.padding.bottom";
                }
                rel2 {
                   relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
+                  to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
+               align: 0.0 1.0;
+               color: GENLIST_PART_FONT_3LINE_MAIN_TEXT_3_COLOR_INC;
                text {
-                  style: "genlist_textblock_help_style";
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_30_INC;
                   min: 0 1;
                   align: 0.0 0.5;
+                  text_class: "slp_medium";
                }
             }
-         }
-         GENLIST_PART_DISCLIP
-      }
-      programs {
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-      }
-   }
-
-// 3.4.1
-   group { name: "elm/genlist/item_compress/multiline/2text/default";
-      alias: "elm/genlist/item_compress_odd/multiline/2text/default";
-      alias: "elm/genlist/item_compress/multiline.2text/default";
-      alias: "elm/genlist/item_compress_odd/multiline.2text/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      parts {
-         part { name: "base";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: GENLIST_PART_BG_COLOR_INC;
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_FONT_3LINE_MAIN_TEXT_3_FOCUS_COLOR_INC;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_18_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.text.1";
+         part { name: "elm.icon.1";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_61_INC;
-               fixed: 0 1;
+               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
+               fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
+                  to_y: "elm.text.2";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_42_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.bottom";
                }
+               align: 0.0 0.5;
             }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
-            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text.2";
+         part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
-            type: TEXTBLOCK;
-            mouse_events: 0;
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.1";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               text {
-                  style: "genlist_textblock_flexible_sub_style";
-                  min: 0 1;
-                  align: 0.0 0.5;
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.1";
                }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_textblock_flexible_sub_selected_style";
+               rel2.to_x: "elm.icon.1";
+               align: 0.0 0.0;
+               visible: 0;
             }
          }
+         GENLIST_PART_FLIP
          GENLIST_PART_DISCLIP
       }
       programs {
@@ -12479,6 +11842,7 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
+            target: "elm.text.3";
             GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
@@ -12488,6 +11852,7 @@
             target: "bg_image";
             target: "elm.text.1";
             target: "elm.text.2";
+            target: "elm.text.3";
             transition: LINEAR 0.1;
          }
          program { name: "go_disabled";
@@ -12502,15 +11867,16 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
+         GENLIST_PROGRAM_FLIP_3TEXT_2ICON
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
 // 3.4.2
-   group { name: "elm/genlist/item/multiline/3text.2icon/default";
-      alias: "elm/genlist/item_odd/multiline/3text.2icon/default";
-      alias: "elm/genlist/item_compress/multiline/3text.2icon/default";
-      alias: "elm/genlist/item_compress_odd/multiline/3text.2icon/default";
+   group { name: "elm/genlist/item/multiline/3text.2icon.2/default";
+      alias: "elm/genlist/item_odd/multiline/3text.2icon.2/default";
+      alias: "elm/genlist/item_compress/multiline/3text.2icon.2/default";
+      alias: "elm/genlist/item_compress_odd/multiline/3text.2icon.2/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
@@ -12525,15 +11891,15 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_16_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.2";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_176_INC GENLIST_SIZE_176_INC;
-               max: GENLIST_SIZE_176_INC GENLIST_SIZE_176_INC;
+               min: GENLIST_HEIGHT_164_INC GENLIST_HEIGHT_164_INC;
+               max: GENLIST_HEIGHT_164_INC GENLIST_HEIGHT_164_INC;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
@@ -12596,7 +11962,7 @@
                rel1.to: "elm.text.1.rect";
                rel2.to: "elm.text.1.rect";
                align: 0.0 0.0;
-               color: GENLIST_PART_FONT_3LINE_MAIN_TEXT_UNREAD_COLOR_INC;
+               color: GENLIST_PART_FONT_3LINE_MAIN_TEXT_READ_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_40_INC;
@@ -12630,7 +11996,7 @@
                   to_y: "elm.text.1.rect";
                }
                align: 0.0 0.0;
-               color: GENLIST_PART_FONT_3LINE_MAIN_TEXT_UNREAD_COLOR_INC;
+               color: GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_36_INC;
@@ -12763,15 +12129,15 @@
       }
    }
 
-// 3.4.2
-   group { name: "elm/genlist/item/multiline/3text.2icon.2/default";
-      alias: "elm/genlist/item_odd/multiline/3text.2icon.2/default";
-      alias: "elm/genlist/item_compress/multiline/3text.2icon.2/default";
-      alias: "elm/genlist/item_compress_odd/multiline/3text.2icon.2/default";
+// 3.4.3
+   group { name: "elm/genlist/item/multiline/3text.1icon/default";
+      alias: "elm/genlist/item_odd/multiline/3text.1icon/default";
+      alias: "elm/genlist/item_compress/multiline/3text.1icon/default";
+      alias: "elm/genlist/item_compress_odd/multiline/3text.1icon/default";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
-      data.item: "contents" "elm.icon.1 elm.icon.2";
+      data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       images {
          image: "00_list_bar_press_1x80.png" COMP;
@@ -12782,281 +12148,24 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_16_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.2";
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.text.1.rect";
             clip_to: "disclip";
-            type: SWALLOW;
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_HEIGHT_164_INC GENLIST_HEIGHT_164_INC;
-               max: GENLIST_HEIGHT_164_INC GENLIST_HEIGHT_164_INC;
-               fixed: 1 1;
+               min: 0 GENLIST_SIZE_48_INC;
+               fixed: 0 1;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 0.0 0.0;
+                  relative: 0.0 1.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 1.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon2.left";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1.to_x: "elm.icon.2";
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.icon.2";
-               }
-               align: 1.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text.1.rect";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_48_INC;
-               fixed: 0 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.top";
-               }
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text.1";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               rel1.to: "elm.text.1.rect";
-               rel2.to: "elm.text.1.rect";
-               align: 0.0 0.0;
-               color: GENLIST_PART_FONT_3LINE_MAIN_TEXT_READ_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_40_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.text.2";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_48_INC;
-               fixed: 0 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.1.rect";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.text.1.rect";
-               }
-               align: 0.0 0.0;
-               color: GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_36_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "slp_roman";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.text.3";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_35_INC;
-               fixed: 0 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.padding.bottom";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.icon2.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 1.0;
-               color: GENLIST_PART_FONT_3LINE_MAIN_TEXT_3_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_30_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "slp_medium";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_FONT_3LINE_MAIN_TEXT_3_FOCUS_COLOR_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.icon.1";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               max: GENLIST_ICON_SMALL_SIZE GENLIST_ICON_SMALL_SIZE;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.2";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
-               }
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon1.right";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon.1";
-               }
-               rel2.to_x: "elm.icon.1";
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
-      }
-      programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            target: "elm.text.3";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
-            target: "elm.text.2";
-            target: "elm.text.3";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_3TEXT_2ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
-      }
-   }
-
-// 3.4.3
-   group { name: "elm/genlist/item/multiline/3text.1icon/default";
-      alias: "elm/genlist/item_odd/multiline/3text.1icon/default";
-      alias: "elm/genlist/item_compress/multiline/3text.1icon/default";
-      alias: "elm/genlist/item_compress_odd/multiline/3text.1icon/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
-      data.item: "contents" "elm.icon";
-      data.item: "flips" "elm.flip.content";
-      images {
-         image: "00_list_bar_press_1x80.png" COMP;
-      }
-      parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_165_INC )
-         GENLIST_PART_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.text.1.rect";
-            clip_to: "disclip";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_48_INC;
-               fixed: 0 1;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
+                  to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
                visible: 0;
@@ -13258,8 +12367,8 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_16_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.text.1.rect";
             clip_to: "disclip";
             type: RECT;
@@ -13477,8 +12586,8 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_8_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_8_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.icon.1";
             clip_to: "disclip";
@@ -14141,8 +13250,8 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_8_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_8_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.icon.1";
             clip_to: "disclip";
@@ -14468,8 +13577,8 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( 0 )
          GENLIST_PART_PADDING_BOTTOM( 0 )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "vertical_line";
             clip_to: "disclip";
             type: RECT;
@@ -14679,8 +13788,8 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_16_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_18_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.title";
             clip_to: "disclip";
             type: TEXT;
@@ -14849,8 +13958,8 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_16_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_18_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -15008,8 +14117,8 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_16_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_18_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -15353,7 +14462,7 @@
 
 // Dialogue Group Separators
 // default separator
-// FIXME: style (dialgoue) might be moved to last words (as-is default)
+// FIXME: style (dialogue) might be moved to last words (as-is default)
 // FIXME: seperator --> separator typo
 // FIXME: Check whether below separators are used now..
    group { name : "elm/genlist/item/dialogue/separator/default";
@@ -15488,11 +14597,11 @@
       data.item: "texts" "elm.text";
       data.item: "flips" "elm.flip.content";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.text";
@@ -15578,11 +14687,11 @@
       data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon";
@@ -15695,11 +14804,11 @@
       data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon";
@@ -15707,8 +14816,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
@@ -15817,11 +14926,11 @@
       data.item: "contents" "elm.icon.1 elm.icon.2";
       data.item: "flips" "elm.flip.content";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon.1";
@@ -15829,8 +14938,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
@@ -15970,11 +15079,11 @@
       data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon";
@@ -15982,8 +15091,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
@@ -16126,128 +15235,7 @@
          GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
-
-// 4.1.6
-   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";
-      alias: "elm/layout/dialogue/1text.1icon.3";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text";
-      data.item: "contents" "elm.icon";
-      data.item: "flips" "elm.flip.content";
-      parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
-         GENLIST_PART_DIALOGUE_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_DIALOGUE_ITEM
-         GENLIST_PART_DIALOGUE_RIGHT_LINE
-         part { name: "elm.icon";
-            clip_to: "disclip";
-            type: SWALLOW;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
-               fixed: 1 1;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.left";
-               }
-               align: 0.0 0.5;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.padding.icon.right";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.icon";
-               }
-               rel2.to_x: "elm.icon";
-               align: 0.0 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "elm.text";
-            clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.icon.right";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
-               align: 0.0 0.0;
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_44_INC;
-                  min: 0 1;
-                  align: 0.0 0.5;
-                  text_class: "list_item";
-               }
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
-            }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         GENLIST_PART_FLIP
-         GENLIST_PART_DISCLIP
-      }
-      programs {
-         program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            transition: LINEAR 0.1;
-         }
-         program { name: "go_disabled";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "disclip";
-         }
-         program { name: "go_enabled";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "disclip";
-         }
-         GENLIST_PROGRAM_FLIP_1TEXT_1ICON
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
-      }
-   }
-
+//
 // 4.1.6 textblock for message
    group { name: "elm/genlist/item/dialogue/1text.1icon.6/default";
       alias: "elm/genlist/item_odd/dialogue/1text.1icon.6/default";
@@ -16260,11 +15248,11 @@
       data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon";
@@ -16378,11 +15366,11 @@
       data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon";
@@ -16503,7 +15491,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.text.1";
@@ -16604,11 +15592,11 @@
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "flips" "elm.flip.content";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.text.2";
@@ -16737,11 +15725,11 @@
       data.item: "contents" "elm.icon.1 elm.icon.2";
       data.item: "flips" "elm.flip.content";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon.1";
@@ -16785,8 +15773,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1.to_x: "elm.padding.right";
                rel2 {
@@ -16891,11 +15879,11 @@
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3";
       data.item: "flips" "elm.flip.content";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon.1";
@@ -16939,8 +15927,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1.to_x: "elm.padding.right";
                rel2 {
@@ -16972,8 +15960,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1.to_x: "elm.padding.icon3.left";
                rel2 {
@@ -17094,7 +16082,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_24_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.text.1";
@@ -17417,11 +16405,11 @@
       data.item: "selectraise" "on";
       data.item: "contents" "elm.icon.1 elm.icon.2 elm.icon.3";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon.1";
@@ -17544,13 +16532,13 @@
       data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_11_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_16_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.text.2";
@@ -17715,11 +16703,11 @@
       data.item: "texts" "elm.title elm.text";
       data.item: "flips" "elm.flip.content";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_27_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.title";
@@ -17876,11 +16864,11 @@
       data.item: "texts" "elm.title elm.text";
       data.item: "flips" "elm.flip.content.title elm.flip.content";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_27_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.title";
@@ -18066,11 +17054,11 @@
       data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_27_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.title";
@@ -18259,11 +17247,11 @@
       data.item: "contents" "elm.icon";
       data.item: "flips" "elm.flip.content.title elm.flip.content";
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_27_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.title";
@@ -18516,8 +17504,8 @@
          GENLIST_PART_BASE( GENLIST_HEIGHT_97_INC )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.text.2";
@@ -18723,11 +17711,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon.1";
@@ -18768,8 +17756,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
@@ -18800,8 +17788,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 0.0;
@@ -18914,7 +17902,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.text.1";
@@ -19042,7 +18030,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.text.1";
@@ -19171,7 +18159,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.text.1";
@@ -19300,7 +18288,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon";
@@ -19308,8 +18296,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
@@ -19462,7 +18450,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon";
@@ -19470,8 +18458,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
@@ -19624,7 +18612,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.swallow.colorbar";
@@ -19650,8 +18638,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
@@ -19685,8 +18673,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1.to_x: "elm.padding.right";
                rel2 {
@@ -19838,7 +18826,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon.1";
@@ -19884,8 +18872,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
@@ -20043,7 +19031,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon.1";
@@ -20051,8 +19039,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
@@ -20248,7 +19236,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon.1";
@@ -20256,8 +19244,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 1.0;
@@ -20294,8 +19282,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
@@ -20489,7 +19477,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon";
@@ -20497,8 +19485,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 1.0;
@@ -20660,7 +19648,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_21_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_22_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_27_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.title";
@@ -20807,7 +19795,7 @@
          GENLIST_PART_BASE( GENLIST_HEIGHT_142_INC )
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_27_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "vertical_line";
@@ -21304,7 +20292,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon.1";
@@ -21509,7 +20497,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC)
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon";
@@ -21669,7 +20657,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon";
@@ -21839,7 +20827,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.text.2";
@@ -22013,7 +21001,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon.1";
@@ -22178,7 +21166,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_48_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_48_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon1.bg";
             scale: 1;
             description { state: "default" 0.0;
@@ -22228,8 +21216,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 0.5;
@@ -22384,7 +21372,7 @@
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_32_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_32_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon1.bg";
             scale: 1;
             description { state: "default" 0.0;
@@ -22434,8 +21422,8 @@
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 0.0 0.5;
@@ -22617,8 +21605,8 @@
          GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_182_INC )
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_14_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_14_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon1.bg";
             scale: 1;
             description { state: "default" 0.0;
@@ -22905,11 +21893,11 @@
       data.item: "contents" "elm.icon";
 
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "elm.icon";
@@ -22976,8 +21964,8 @@
 
       parts {
          GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_73_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -23143,8 +22131,8 @@
 
       parts {
          GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_89_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_16_INC )
          part { name: "elm.icon.1";
             clip_to: "disclip";
@@ -23271,11 +22259,11 @@
       }
 
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_27_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "vertical_line";
@@ -23458,7 +22446,7 @@
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_27_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "vertical_line";
@@ -23711,7 +22699,7 @@
          GENLIST_PART_DIALOGUE_BG_IMAGE
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_27_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
          GENLIST_PART_DIALOGUE_RIGHT_LINE
          part { name: "vertical_line";
@@ -24124,11 +23112,11 @@
       data.item: "texts" "elm.text";
       data.item: "flips" "elm.flip.content";
       parts {
-         GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_113_INC )
+         GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_PADDING_TOP( 0 )
          GENLIST_PART_PADDING_BOTTOM( 0 )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.bg";
             type: RECT;
             scale: 1;
@@ -24329,8 +23317,8 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.text.1";
             clip_to: "disclip";
@@ -24633,6 +23621,139 @@
          }
       }
    }
+   // 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";
+         inherit: "elm/genlist/item/4text.1icon.1/default";
+      parts {
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXTBLOCK;
+            scale: 1;
+            description { state: "default" 0.0;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               fixed: 0 1;
+               min: 0 GENLIST_SIZE_SLIDE_60_INC;
+               rel1 { relative: 1.0 1.0;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 { relative: 0.0 1.0;
+                  to_x: "elm.padding.text1.right";
+                  to_y: "elm.padding.text1.right";
+               }
+               text {
+                  style: "genlist_default_textblock_style";
+                  min: 0 1;
+                  align: 0.0 0.5;
+               }
+            }
+            description { state: "read" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_READ_COLOR_INC;
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_FOCUS_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.text.2";
+            clip_to: "disclip";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_COLOR_INC;
+               fixed: 0 1;
+               align: 1.0 1.0;
+               min: 0 GENLIST_SIZE_SLIDE_60_INC;
+               rel1 { relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.bottom";
+               }
+               rel2 { relative: 0.0 1.0;
+                 to_x: "elm.padding.right";
+                 to_y: "elm.padding.bottom";
+               }
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  min: 1 1;
+                  align: 0.5 0.5;
+                  text_class: "slp_medium";
+              }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_FONT_LIST_SUB_TEXT_FOCUS_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.text.4";
+            clip_to: "disclip";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               color: GENLIST_PART_FONT_LIST_BUBBLE_TEXT_COLOR_INC;
+               fixed: 0 1;
+               align: 1.0 0.0;
+               min: GENLIST_SIZE_28_INC GENLIST_SIZE_48_INC;
+               rel1 { relative: 0 1;
+                  to_x: "elm.padding.bubble.text4.right";
+                  to_y: "elm.padding.top";
+               }
+               rel2 { relative: 0 0;
+                  to_x: "elm.padding.bubble.text4.right";
+                  to_y: "elm.text.2";
+               }
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  min: 1 1;
+                  align: 0.5 0.5;
+                  text_class: "slp_medium";
+               }
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.text.3";
+            clip_to: "disclip";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               color: GENLIST_PART_FONT_NAME_TEXT_COLOR_INC;
+               fixed: 0 1;
+               align: 0.0 0.0;
+               min: 0 GENLIST_SIZE_48_INC;
+               rel1 { relative: 1 1;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.text.1";
+               }
+               rel2 { relative: 0 1;
+                  to_x: "elm.padding.text3.right";
+                  to_y: "elm.padding.text3.right";
+               }
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "slp_medium";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         GENLIST_PART_FLIP
+         GENLIST_PART_DISCLIP
+      }
+   }
+
    // 2.2.2.39
    group { name: "elm/genlist/item/4text.1icon.2/default";
       alias: "elm/genlist/item_odd/4text.1icon.2/default";
@@ -24649,8 +23770,8 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.text.1";
             clip_to: "disclip";
@@ -24912,8 +24033,8 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.text.1";
             clip_to: "disclip";
@@ -25191,8 +24312,8 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.text.1";
             clip_to: "disclip";
@@ -25413,8 +24534,8 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
          part { name: "elm.text.1";
             clip_to: "disclip";
@@ -25652,15 +24773,15 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
-               max: GENLIST_SIZE_ICON_BIG GENLIST_SIZE_ICON_BIG;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
                fixed: 1 1;
                rel1 {
                   relative: 1.0 0.0;
@@ -25951,8 +25072,8 @@
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -26153,60 +25274,411 @@
                }
                align: 1.0 0.5;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.padding.text2.right";
+            clip_to: "disclip";
+            type: RECT;
+            scale: 1;
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               align: 1.0 0.0;
+               visible: 0;
+               min: GENLIST_PADDING_16_INC GENLIST_SIZE_48_INC;
+               max: GENLIST_PADDING_16_INC GENLIST_SIZE_48_INC;
+               rel1 { relative: 0 1;
+                  to_x: "elm.icon.4";
+                  to_y: "elm.text.1";
+               }
+               rel2 { relative: 0 0;
+                  to_x: "elm.icon.4";
+                  to_y: "elm.padding.bottom";
+               }
+            }
+         }
+         part { name: "elm.text.2";
+            clip_to: "disclip";
+            type: TEXT;
+            scale: 1;
+            description { state: "default" 0.0;
+               color: GENLIST_PART_FONT_NAME_TEXT_COLOR_INC;
+               fixed: 0 1;
+               align: 0.0 0.0;
+               min: 0 GENLIST_SIZE_48_INC;
+               rel1 { relative: 1 1;
+                  to_x: "elm.padding.left";
+                  to_y: "elm.text.1";
+               }
+               rel2 { relative: 0 1;
+                  to_x: "elm.padding.text2.right";
+                  to_y: "elm.padding.text2.right";
+               }
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "slp_medium";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         GENLIST_PART_FLIP
+         GENLIST_PART_DISCLIP
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "bg_image";
+            target: "elm.text.1";
+         }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "bg_image";
+            target: "elm.text.1";
+            transition: LINEAR 0.1;
+         }
+         program { name: "go_read";
+            signal: "elm,state,read";
+            source: "elm";
+            action: STATE_SET "read" 0.0;
+            target: "elm.text.1";
+         }
+         program { name: "go_unread";
+            signal: "elm,state,unread";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text.1";
+         }
+      }
+   }
+
+   group { name: "elm/genlist/item/dialogue/bg/2text.1icon.2/default";
+      alias: "elm/genlist/item_odd/dialogue/bg/2text.1icon.2/default";
+      alias: "elm/genlist/item_compress/dialogue/bg/2text.1icon.2/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/bg/2text.1icon.2/default";
+      alias: "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";
+      alias: "elm/layout/dialogue/bg/2text.1icon.2";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text.1 elm.text.2";
+      data.item: "contents" "elm.icon";
+      data.item: "flips" "elm.flip.content.1 elm.flip.content.2";
+      images {
+          image: "00_list_thumbnail_bg.png" COMP;
+      }
+      parts {
+         GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_291_INC )
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_32_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_32_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.bg";
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_SIZE_144_INC GENLIST_SIZE_90_INC;
+               fixed: 1 1;
+               align: 0.0 0.8;
+               rel1 {
+                  relative: 1.0 0.5;
+                  to_x: "elm.padding.left";
+               }
+               rel2 {
+                  relative: 1.0 0.5;
+                  to_x: "elm.padding.left";
+               }
+               image {
+                  normal: "00_list_thumbnail_bg.png";
+                  border: 1 1 1 1;
+                  border_scale: 1;
+                  middle: NONE;
+               }
+            }
+         }
+         part { name: "elm.icon";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               rel1.to: "elm.icon.bg";
+               rel2.to: "elm.icon.bg";
+            }
+         }
+         part { name: "elm.padding.icon.right";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1 {
+                   relative: 1.0 0.0;
+                   to_x: "elm.icon.bg";
+               }
+               rel2.to_x: "elm.icon.bg";
+               visible: 0;
+               align: 0.0 0.5;
+            }
+         }
+         part { name: "elm.padding.text.left";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1 {
+                   relative: 1.0 1.0;
+                   to_x: "elm.padding.icon.right";
+                   to_y: "elm.padding.top";
+               }
+               rel2.to_x: "elm.padding.icon.right";
+               visible: 0;
+               align: 1.0 0.5;
+            }
+         }
+         part { name: "vertical_line";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: 1 0;
+               fixed: 1 0;
+               color: GENLIST_PART_LIST_LINE_COLOR_INC;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.text.left";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.text.left";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 0.0 0.5;
+            }
+         }
+         part { name: "text_vertical_rect";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               color: GENLIST_DIALOGUE_GROUP_LEFT_BG_COLOR_INC;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "vertical_line";
+                  to_y: "elm.padding.top";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.text.left";
+                  to_y: "elm.padding.bottom";
+               }
+               align: 0.0 0.5;
+            }
+         }
+         part { name: "elm.padding.text.right";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1 {
+                   relative: 1.0 0.0;
+                   to_x: "text_vertical_rect";
+               }
+               rel2.to_x: "text_vertical_rect";
+               visible: 0;
+               align: 0.0 0.5;
+            }
+         }
+         part { name: "text_top_line";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: 0 1;
+               fixed: 0 1;
+               color: GENLIST_PART_LIST_LINE_COLOR_INC;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "text_vertical_rect";
+                  to_y: "text_vertical_rect";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_y: "text_vertical_rect";
+               }
+               align: 0.0 0.0;
+            }
+         }
+         part { name: "text_center_line";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: 0 1;
+               fixed: 0 1;
+               color: GENLIST_PART_LIST_LINE_COLOR_INC;
+               rel1 {
+                  relative: 1.0 0.5;
+                  to_x: "text_vertical_rect";
+               }
+               rel2.relative: 1.0 0.5;
+               align: 0.5 0.5;
+            }
+         }
+         part { name: "text_bottom_line";
+            type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               min: 0 1;
+               fixed: 0 1;
+               color: GENLIST_PART_LIST_LINE_COLOR_INC;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "text_vertical_rect";
+                  to_y: "text_vertical_rect";
+               }
+               rel2 {
+                  relative: 1.0 1.0;
+                  to_y: "text_vertical_rect";
+               }
+               align: 0.0 1.0;
+            }
+         }
+         part { name: "elm.text.bg.1";
+            clip_to: "disclip";
+            type: RECT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "text_vertical_rect";
+                  to_y: "text_top_line";
+               }
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "text_center_line";
+               }
+               color: GENLIST_PART_BG_COLOR_INC;
+            }
+         }
+         part { name: "elm.text.1";
+            type: TEXT;
+            mouse_events: 0;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 0 GENLIST_SIZE_54_INC;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.text.right";
+                  to_y: "elm.text.bg.1";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.text.bg.1";
+               }
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_48_INC;
+                  align: 0.0 0.5;
+                  text_class: "list_item";
+               }
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.flip.content.1";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 0;
+               fixed: 1 1;
+               rel1.to: "elm.text.1";
+               rel2.to: "elm.text.1";
+            }
+            description { state: "flip_enabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
          }
-         part { name: "elm.padding.text2.right";
+         part { name: "elm.text.bg.2";
             clip_to: "disclip";
             type: RECT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               fixed: 1 1;
-               align: 1.0 0.0;
-               visible: 0;
-               min: GENLIST_PADDING_16_INC GENLIST_SIZE_48_INC;
-               max: GENLIST_PADDING_16_INC GENLIST_SIZE_48_INC;
-               rel1 { relative: 0 1;
-                  to_x: "elm.icon.4";
-                  to_y: "elm.text.1";
+               rel1 {
+                  relative: 1.0 1.0;
+                  to_x: "text_vertical_rect";
+                  to_y: "text_center_line";
                }
-               rel2 { relative: 0 0;
-                  to_x: "elm.icon.4";
-                  to_y: "elm.padding.bottom";
+               rel2 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.right";
+                  to_y: "text_bottom_line";
                }
+               color: GENLIST_PART_BG_COLOR_INC;
             }
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
+            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_PART_FONT_NAME_TEXT_COLOR_INC;
-               fixed: 0 1;
-               align: 0.0 0.0;
-               min: 0 GENLIST_SIZE_48_INC;
-               rel1 { relative: 1 1;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.text.1";
+               min: 0 GENLIST_SIZE_54_INC;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.text.right";
+                  to_y: "elm.text.bg.2";
                }
-               rel2 { relative: 0 1;
-                  to_x: "elm.padding.text2.right";
-                  to_y: "elm.padding.text2.right";
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.text.bg.2";
                }
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  min: 0 1;
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_48_INC;
                   align: 0.0 0.5;
-                  text_class: "slp_medium";
+                  text_class: "slp_roman";
                }
             }
-            description { state: "selected" 0.0;
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.flip.content.2";
+            clip_to: "disclip";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 0;
+               fixed: 1 1;
+               rel1.to: "elm.text.2";
+               rel2.to: "elm.text.2";
+            }
+            description { state: "flip_enabled" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               visible: 1;
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         GENLIST_PART_FLIP
          GENLIST_PART_DISCLIP
       }
       programs {
@@ -26215,45 +25687,60 @@
          // signal: elm,state,%s,passive
          //   a "check" item named %s went passive
          // default is passive
-         program { name: "go_active";
+         /*program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
+            target: "elm.text";
+            target: "elm.text.sub";
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text.1";
+            target: "elm.text";
+            target: "elm.text.sub";
             transition: LINEAR 0.1;
+         }*/
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
-         program { name: "go_read";
-            signal: "elm,state,read";
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
             source: "elm";
-            action: STATE_SET "read" 0.0;
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+         program { name: "flip_enabled";
+            signal: "elm,state,flip,enabled";
+            source: "elm";
+            action: STATE_SET "flip_enabled" 0.0;
             target: "elm.text.1";
+            target: "elm.text.2";
+            target: "elm.flip.content.1";
+            target: "elm.flip.content.2";
          }
-         program { name: "go_unread";
-            signal: "elm,state,unread";
+         program { name: "flip_disabled";
+            signal: "elm,state,flip,disabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.text.1";
+            target: "elm.text.2";
+            target: "elm.flip.content.1";
+            target: "elm.flip.content.2";
          }
       }
    }
 
-   group { name: "elm/genlist/item/dialogue/bg/2text.1icon.2/default";
-      alias: "elm/genlist/item_odd/dialogue/bg/2text.1icon.2/default";
-      alias: "elm/genlist/item_compress/dialogue/bg/2text.1icon.2/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/bg/2text.1icon.2/default";
-      alias: "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";
-      alias: "elm/layout/dialogue/bg/2text.1icon.2";
+/* non-bottom-border-area version of 2text.1icon.2 */
+   group { name: "elm/genlist/item/dialogue/bg/2text.1icon.3/default";
+      alias: "elm/genlist/item_odd/dialogue/bg/2text.1icon.3/default";
+      alias: "elm/genlist/item_compress/dialogue/bg/2text.1icon.3/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/bg/2text.1icon.3/default";
+      alias: "elm/layout/dialogue/bg/2text.1icon.3";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
@@ -26263,17 +25750,17 @@
           image: "00_list_thumbnail_bg.png" COMP;
       }
       parts {
-         GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_291_INC )
+         GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_260_INC )
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_PADDING_BOTTOM( 0 )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.bg";
             scale: 1;
             description { state: "default" 0.0;
                min: GENLIST_SIZE_144_INC GENLIST_SIZE_90_INC;
                fixed: 1 1;
-               align: 0.0 0.8;
+               align: 0.0 0.7;
                rel1 {
                   relative: 1.0 0.5;
                   to_x: "elm.padding.left";
@@ -26334,9 +25821,7 @@
             type: RECT;
             mouse_events: 0;
             description { state: "default" 0.0;
-               min: 1 0;
-               fixed: 1 0;
-               color: GENLIST_PART_LIST_LINE_COLOR_INC;
+               visible: 0;
                rel1 {
                   relative: 1.0 1.0;
                   to_x: "elm.padding.text.left";
@@ -26347,14 +25832,14 @@
                   to_x: "elm.padding.text.left";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.5;
             }
          }
          part { name: "text_vertical_rect";
             type: RECT;
             mouse_events: 0;
+            scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
+               min: GENLIST_SIZE_16_INC 0;
                fixed: 1 0;
                color: GENLIST_DIALOGUE_GROUP_LEFT_BG_COLOR_INC;
                rel1 {
@@ -26413,10 +25898,10 @@
                fixed: 0 1;
                color: GENLIST_PART_LIST_LINE_COLOR_INC;
                rel1 {
-                  relative: 1.0 0.5;
+                  relative: 1.0 0.56;
                   to_x: "text_vertical_rect";
                }
-               rel2.relative: 1.0 0.5;
+               rel2.relative: 1.0 0.56;
                align: 0.5 0.5;
             }
          }
@@ -26485,7 +25970,6 @@
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.flip.content.1";
-            clip_to: "disclip";
             type: SWALLOW;
             description { state: "default" 0.0;
                visible: 0;
@@ -26532,31 +26016,118 @@
                rel2 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.text.bg.2";
-               }
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_48_INC;
-                  align: 0.0 0.5;
-                  text_class: "slp_roman";
+                  to_y: "elm.text.bg.2";
+               }
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_48_INC;
+                  text_class: "slp_roman";
+               }
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         part { name: "elm.flip.content.2";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               visible: 0;
+               fixed: 1 1;
+               rel1.to: "elm.text.2";
+               rel2.to: "elm.text.2";
+            }
+            description { state: "flip_enabled" 0.0;
+               inherit: "default" 0.0;
+               visible: 1;
+            }
+         }
+         GENLIST_PART_DISCLIP
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         /*program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "elm.text";
+            target: "elm.text.sub";
+         }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+            target: "elm.text.sub";
+            transition: LINEAR 0.1;
+         }*/
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
+         }
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+         program { name: "flip_enabled";
+            signal: "elm,state,flip,enabled";
+            source: "elm";
+            action: STATE_SET "flip_enabled" 0.0;
+            target: "elm.text.1";
+            target: "elm.text.2";
+            target: "elm.flip.content.1";
+            target: "elm.flip.content.2";
+         }
+         program { name: "flip_disabled";
+            signal: "elm,state,flip,disabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text.1";
+            target: "elm.text.2";
+            target: "elm.flip.content.1";
+            target: "elm.flip.content.2";
+         }
+      }
+   }
+
+   ///////// will be removed /////////
+   group { name: "elm/genlist/item/dialogue/1icon.2/default";
+      alias: "elm/genlist/item_odd/dialogue/1icon.2/default";
+      alias: "elm/genlist/item_compress/dialogue/1icon.2/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/1icon.2/default";
+      alias: "elm/layout/dialogue/1icon.2";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "contents" "elm.icon";
+
+      parts {
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_DIALOGUE_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_DIALOGUE_RIGHT_LINE
+         part { name: "elm.icon";
+            clip_to: "disclip";
+            type: SWALLOW;
+            scale: 1;
+            description { state: "default" 0.0;
+               rel1 {
+                  relative: 1.0 0.0;
+                  to_x: "elm.padding.left";
+               }
+               rel2 {
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
                }
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.flip.content.2";
-            clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               visible: 0;
-               fixed: 1 1;
-               rel1.to: "elm.text.2";
-               rel2.to: "elm.text.2";
-            }
-            description { state: "flip_enabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
          }
          GENLIST_PART_DISCLIP
       }
@@ -26570,15 +26141,15 @@
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
+            target: "bg_image";
             target: "elm.text";
-            target: "elm.text.sub";
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
+            target: "bg_image";
             target: "elm.text";
-            target: "elm.text.sub";
             transition: LINEAR 0.1;
          }*/
          program { name: "go_disabled";
@@ -26593,53 +26164,38 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         program { name: "flip_enabled";
-            signal: "elm,state,flip,enabled";
-            source: "elm";
-            action: STATE_SET "flip_enabled" 0.0;
-            target: "elm.text.1";
-            target: "elm.text.2";
-            target: "elm.flip.content.1";
-            target: "elm.flip.content.2";
-         }
-         program { name: "flip_disabled";
-            signal: "elm,state,flip,disabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text.1";
-            target: "elm.text.2";
-            target: "elm.flip.content.1";
-            target: "elm.flip.content.2";
-         }
       }
    }
 
-/* non-bottom-border-area version of 2text.1icon.2 */
-   group { name: "elm/genlist/item/dialogue/bg/2text.1icon.3/default";
-      alias: "elm/genlist/item_odd/dialogue/bg/2text.1icon.3/default";
-      alias: "elm/genlist/item_compress/dialogue/bg/2text.1icon.3/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/bg/2text.1icon.3/default";
-      alias: "elm/layout/dialogue/bg/2text.1icon.3";
+   //////////////////////// will be removed //////////////////////////
+   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";
+      alias: "elm/genlist/item/dialogue.1icon.2text/default";
+      alias: "elm/genlist/item_odd/dialogue.1icon.2text/default";
+      alias: "elm/genlist/item_compress/dialogue.1icon.2text/default";
+      alias: "elm/genlist/item_compress_odd/dialogue.1icon.2text/default";
+      alias: "elm/layout/dialogue/bg/2text.1icon";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "texts" "elm.text.1 elm.text.2";
       data.item: "contents" "elm.icon";
-      data.item: "flips" "elm.flip.content.1 elm.flip.content.2";
       images {
           image: "00_list_thumbnail_bg.png" COMP;
       }
       parts {
-         GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_260_INC )
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_BOTTOM( 0 )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
+         GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_190_INC )
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_46_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_48_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon.bg";
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_144_INC GENLIST_SIZE_90_INC;
+               min: GENLIST_SIZE_128_INC GENLIST_SIZE_128_INC;
                fixed: 1 1;
-               align: 0.0 0.7;
+               align: 0.0 0.5;
                rel1 {
                   relative: 1.0 0.5;
                   to_x: "elm.padding.left";
@@ -26668,7 +26224,7 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
+               min: GENLIST_PADDING_24_INC 0;
                fixed: 1 0;
                rel1 {
                    relative: 1.0 0.0;
@@ -26679,245 +26235,241 @@
                align: 0.0 0.5;
             }
          }
-         part { name: "elm.padding.text.left";
-            type: RECT;
+         part { name: "elm.text.1";
+            clip_to: "disclip";
+            type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                   relative: 1.0 1.0;
-                   to_x: "elm.padding.icon.right";
-                   to_y: "elm.padding.top";
-               }
-               rel2.to_x: "elm.padding.icon.right";
-               visible: 0;
-               align: 1.0 0.5;
-            }
-         }
-         part { name: "vertical_line";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               visible: 0;
+               min: 0 GENLIST_SIZE_54_INC;
+               fixed: 0 1;
+               align: 0 0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "elm.padding.text.left";
+                  to_x: "elm.padding.icon.right";
                   to_y: "elm.padding.top";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.text.left";
-                  to_y: "elm.padding.bottom";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.right";
+                  to_y: "elm.padding.top";
+               }
+               color: GENLIST_DIALOGUE_FONT_DETAIL_TEXT_MAIN_COLOR_INC;
+               text {
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_48_INC;
+                  align: 0.0 0.0;
+                  text_class: "list_item";
                }
             }
          }
-         part { name: "text_vertical_rect";
-            type: RECT;
+         part { name: "elm.text.2";
+            clip_to: "disclip";
+            type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
-               fixed: 1 0;
-               color: GENLIST_DIALOGUE_GROUP_LEFT_BG_COLOR_INC;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "vertical_line";
-                  to_y: "elm.padding.top";
+                  to_x: "elm.padding.icon.right";
+                  to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.text.left";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               align: 0.0 0.5;
-            }
-         }
-         part { name: "elm.padding.text.right";
-            type: RECT;
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               rel1 {
-                   relative: 1.0 0.0;
-                   to_x: "text_vertical_rect";
+               color: GENLIST_DIALOGUE_FONT_DETAIL_TEXT_SUB_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  align: 0.0 1.0;
+                  text_class: "slp_medium";
                }
-               rel2.to_x: "text_vertical_rect";
-               visible: 0;
-               align: 0.0 0.5;
             }
          }
-         part { name: "text_top_line";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: 0 1;
-               fixed: 0 1;
-               color: GENLIST_PART_LIST_LINE_COLOR_INC;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "text_vertical_rect";
-                  to_y: "text_vertical_rect";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_y: "text_vertical_rect";
-               }
-               align: 0.0 0.0;
-            }
+         GENLIST_PART_DISCLIP
+      }
+      programs {
+         // signal: elm,state,%s,active
+         //   a "check" item named %s went active
+         // signal: elm,state,%s,passive
+         //   a "check" item named %s went passive
+         // default is passive
+         /*program { name: "go_active";
+            signal: "elm,state,selected";
+            source: "elm";
+            action: STATE_SET "selected" 0.0;
+            target: "elm.text";
+            target: "elm.text.sub";
          }
-         part { name: "text_center_line";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: 0 1;
-               fixed: 0 1;
-               color: GENLIST_PART_LIST_LINE_COLOR_INC;
-               rel1 {
-                  relative: 1.0 0.56;
-                  to_x: "text_vertical_rect";
-               }
-               rel2.relative: 1.0 0.56;
-               align: 0.5 0.5;
-            }
+         program { name: "go_passive";
+            signal: "elm,state,unselected";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "elm.text";
+            target: "elm.text.sub";
+            transition: LINEAR 0.1;
+         }*/
+         program { name: "go_disabled";
+            signal: "elm,state,disabled";
+            source: "elm";
+            action: STATE_SET "disabled" 0.0;
+            target: "disclip";
          }
-         part { name: "text_bottom_line";
-            type: RECT;
-            mouse_events: 0;
+         program { name: "go_enabled";
+            signal: "elm,state,enabled";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "disclip";
+         }
+      }
+   }
+
+// 4.3.2 (old)
+   group { name: "elm/genlist/item/dialogue/bg/3text.1icon/default";
+      alias: "elm/genlist/item_odd/dialogue/bg/3text.1icon/default";
+      alias: "elm/genlist/item_compress/dialogue/bg/3text.1icon/default";
+      alias: "elm/genlist/item_compress_odd/dialogue/bg/3text.1icon/default";
+      alias: "elm/layout/dialogue/bg/3text.1icon";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
+      data.item: "contents" "elm.icon";
+      images {
+          image: "00_list_thumbnail_bg.png" COMP;
+      }
+      parts {
+         GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_190_INC )
+         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_34_INC )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_34_INC )
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.bg";
+            scale: 1;
             description { state: "default" 0.0;
-               min: 0 1;
-               fixed: 0 1;
-               color: GENLIST_PART_LIST_LINE_COLOR_INC;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "text_vertical_rect";
-                  to_y: "text_vertical_rect";
+               min: GENLIST_SIZE_128_INC GENLIST_SIZE_128_INC;
+               fixed: 1 1;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1.0 0.5;
+                  to_x: "elm.padding.left";
                }
                rel2 {
-                  relative: 1.0 1.0;
-                  to_y: "text_vertical_rect";
+                  relative: 1.0 0.5;
+                  to_x: "elm.padding.left";
+               }
+               image {
+                  normal: "00_list_thumbnail_bg.png";
+                  border: 1 1 1 1;
+                  border_scale: 1;
+                  middle: NONE;
                }
-               align: 0.0 1.0;
             }
          }
-         part { name: "elm.text.bg.1";
-            clip_to: "disclip";
+         part { name: "elm.icon";
+            type: SWALLOW;
+            description { state: "default" 0.0;
+               rel1.to: "elm.icon.bg";
+               rel2.to: "elm.icon.bg";
+            }
+         }
+         part { name: "elm.padding.icon.right";
             type: RECT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
+               min: GENLIST_PADDING_24_INC 0;
+               fixed: 1 0;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "text_vertical_rect";
-                  to_y: "text_top_line";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "text_center_line";
+                   relative: 1.0 0.0;
+                   to_x: "elm.icon.bg";
                }
-               color: GENLIST_PART_BG_COLOR_INC;
+               rel2.to_x: "elm.icon.bg";
+               visible: 0;
+               align: 0.0 0.5;
             }
          }
          part { name: "elm.text.1";
+            clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                min: 0 GENLIST_SIZE_54_INC;
+               fixed: 0 1;
+               align: 0 0;
                rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.text.right";
-                  to_y: "elm.text.bg.1";
+                  relative: 1.0 1.0;
+                  to_x: "elm.padding.icon.right";
+                  to_y: "elm.padding.top";
                }
                rel2 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.text.bg.1";
+                  to_y: "elm.padding.top";
                }
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               color: GENLIST_DIALOGUE_FONT_DETAIL_TEXT_MAIN_COLOR_INC;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_48_INC;
-                  align: 0.0 0.5;
+                  align: 0.0 0.0;
                   text_class: "list_item";
                }
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.flip.content.1";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               visible: 0;
-               fixed: 1 1;
-               rel1.to: "elm.text.1";
-               rel2.to: "elm.text.1";
-            }
-            description { state: "flip_enabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
          }
-         part { name: "elm.text.bg.2";
+         part { name: "elm.text.2";
             clip_to: "disclip";
-            type: RECT;
+            type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 1.0;
-                  to_x: "text_vertical_rect";
-                  to_y: "text_center_line";
+                  to_x: "elm.padding.icon.right";
+                  to_y: "elm.text.1";
                }
                rel2 {
-                  relative: 1.0 0.0;
+                  relative: 0.0 0.0;
                   to_x: "elm.padding.right";
-                  to_y: "text_bottom_line";
+                  to_y: "elm.text.3";
+               }
+               color: GENLIST_DIALOGUE_FONT_DETAIL_TEXT_SUB_COLOR_INC;
+               text {
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  align: 0.0 1.0;
+                  text_class: "slp_medium";
                }
-               color: GENLIST_PART_BG_COLOR_INC;
             }
          }
-         part { name: "elm.text.2";
+         part { name: "elm.text.3";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_54_INC;
+               min: 0 GENLIST_ICON_SMALL_SIZE;
+               fixed: 0 1;
+               align: 0 1;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.text.right";
-                  to_y: "elm.text.bg.2";
+                  to_x: "elm.padding.icon.right";
+                  to_y: "elm.padding.bottom";
                }
                rel2 {
-                  relative: 0.0 1.0;
+                  relative: 0.0 0.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.text.bg.2";
+                  to_y: "elm.padding.bottom";
                }
-               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
+               color: GENLIST_DIALOGUE_FONT_DETAIL_TEXT_SUB_COLOR_INC;
                text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_48_INC;
-                  text_class: "slp_roman";
+                  font: "SLP:style=Medium";
+                  size: GENLIST_FONT_32_INC;
+                  align: 0.0 1.0;
+                  text_class: "slp_medium";
                }
             }
-            GENLIST_DESCRIPTION_FLIP_ENABLED
-         }
-         part { name: "elm.flip.content.2";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               visible: 0;
-               fixed: 1 1;
-               rel1.to: "elm.text.2";
-               rel2.to: "elm.text.2";
-            }
-            description { state: "flip_enabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
          }
          GENLIST_PART_DISCLIP
       }
@@ -26954,49 +26506,32 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         program { name: "flip_enabled";
-            signal: "elm,state,flip,enabled";
-            source: "elm";
-            action: STATE_SET "flip_enabled" 0.0;
-            target: "elm.text.1";
-            target: "elm.text.2";
-            target: "elm.flip.content.1";
-            target: "elm.flip.content.2";
-         }
-         program { name: "flip_disabled";
-            signal: "elm,state,flip,disabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.text.1";
-            target: "elm.text.2";
-            target: "elm.flip.content.1";
-            target: "elm.flip.content.2";
-         }
       }
-   }
+  }
 
-   ///////// will be removed /////////
-   group { name: "elm/genlist/item/dialogue/1icon.2/default";
-      alias: "elm/genlist/item_odd/dialogue/1icon.2/default";
-      alias: "elm/genlist/item_compress/dialogue/1icon.2/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/1icon.2/default";
-      alias: "elm/layout/dialogue/1icon.2";
+////////////////////////////////////////////////////////
+// Check that belows are used
+   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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
       data.item: "contents" "elm.icon";
-
       parts {
-         GENLIST_PART_BASE( GENLIST_HEIGHT_113_INC )
-         GENLIST_PART_DIALOGUE_BG_IMAGE
-         GENLIST_PART_BOTTOM_LINE
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         GENLIST_PART_DIALOGUE_ITEM
-         GENLIST_PART_DIALOGUE_RIGHT_LINE
+         part { name: "base";
+            type: RECT;
+            repeat_events: 1;
+            scale: 1;
+            description { state: "default" 0.0;
+               color: GENLIST_PART_BG_COLOR_INC;
+            }
+         }
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
-            scale: 1;
             description { state: "default" 0.0;
                rel1 {
                   relative: 1.0 0.0;
@@ -27016,21 +26551,6 @@
          // signal: elm,state,%s,passive
          //   a "check" item named %s went passive
          // default is passive
-         /*program { name: "go_active";
-            signal: "elm,state,selected";
-            source: "elm";
-            action: STATE_SET "selected" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-         }
-         program { name: "go_passive";
-            signal: "elm,state,unselected";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "bg_image";
-            target: "elm.text";
-            transition: LINEAR 0.1;
-         }*/
          program { name: "go_disabled";
             signal: "elm,state,disabled";
             source: "elm";
@@ -27045,128 +26565,95 @@
          }
       }
    }
-
-   //////////////////////// will be removed //////////////////////////
-   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";
-      alias: "elm/genlist/item/dialogue.1icon.2text/default";
-      alias: "elm/genlist/item_odd/dialogue.1icon.2text/default";
-      alias: "elm/genlist/item_compress/dialogue.1icon.2text/default";
-      alias: "elm/genlist/item_compress_odd/dialogue.1icon.2text/default";
-      alias: "elm/layout/dialogue/bg/2text.1icon";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2";
-      data.item: "contents" "elm.icon";
-      images {
-          image: "00_list_thumbnail_bg.png" COMP;
-      }
+   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";
+      inherit: "elm/genlist/item/1icon/with_no_line/default";
       parts {
-         GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_190_INC )
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_46_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_48_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.bg";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_128_INC GENLIST_SIZE_128_INC;
-               fixed: 1 1;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 0.5;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 1.0 0.5;
-                  to_x: "elm.padding.left";
-               }
-               image {
-                  normal: "00_list_thumbnail_bg.png";
-                  border: 1 1 1 1;
-                  border_scale: 1;
-                  middle: NONE;
-               }
-            }
-         }
-         part { name: "elm.icon";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               rel1.to: "elm.icon.bg";
-               rel2.to: "elm.icon.bg";
-            }
-         }
-         part { name: "elm.padding.icon.right";
+         part { name: "bottom_line";
+            insert_after: "elm.padding.right";
             type: RECT;
             mouse_events: 0;
-            scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_24_INC 0;
-               fixed: 1 0;
+               min: 0 1;
+               fixed: 0 1;
+               visible: 1;
+               color: GENLIST_PART_LIST_LINE_COLOR_INC;
                rel1 {
-                   relative: 1.0 0.0;
-                   to_x: "elm.icon.bg";
+                  relative: 0.0 1.0;
+                  offset: 0 -1;
                }
-               rel2.to_x: "elm.icon.bg";
-               visible: 0;
-               align: 0.0 0.5;
             }
          }
-         part { name: "elm.text.1";
+      }
+   }
+   group { name: "elm/genlist/item/1text.2/default";
+      alias: "elm/genlist/item_odd/1text.2/default";
+      alias: "elm/genlist/item_compress/1text.2/default";
+      alias: "elm/genlist/item_compress_odd/1text.2/default";
+      data.item: "stacking" "above";
+      data.item: "selectraise" "on";
+      data.item: "texts" "elm.text";
+      data.item: "flips" "elm.flip.content";
+      images {
+         image: "00_list_bar_press_1x80.png" COMP;
+      }
+      parts {
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "temp_center_line"; //temporary
             clip_to: "disclip";
-            type: TEXT;
+            type: RECT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_54_INC;
-               fixed: 0 1;
-               align: 0 0;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
-                  to_y: "elm.padding.top";
+                  relative: 0.0 0.5;
+                  to: "base";
                }
                rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               color: GENLIST_DIALOGUE_FONT_DETAIL_TEXT_MAIN_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_48_INC;
-                  align: 0.0 0.0;
-                  text_class: "list_item";
+                  relative: 1.0 0.5;
+                  to: "base";
                }
             }
          }
-         part { name: "elm.text.2";
+         part { name: "elm.text";
             clip_to: "disclip";
-            type: TEXT;
+            type: TEXTBLOCK;
             mouse_events: 0;
             scale: 1;
+            multiline: 0;
             description { state: "default" 0.0;
+               fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
-                  to_y: "elm.text.1";
+                  relative: 1.0 0.5;
+                  to_x: "elm.padding.left";
+                  to_y: "temp_center_line";
                }
                rel2 {
-                  relative: 0.0 0.0;
+                  relative: 0.0 0.5;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
+                  to_y: "temp_center_line";
                }
-               color: GENLIST_DIALOGUE_FONT_DETAIL_TEXT_SUB_COLOR_INC;
+               align: 0.0 0.5;
                text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  align: 0.0 1.0;
-                  text_class: "slp_medium";
+                  style: "genlist_default_textblock_style";
+                  min: 0 1;
+                  align: 0.0 0.5;
                }
             }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               text.style: "genlist_default_textblock_selected_style";
+            }
+            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+         GENLIST_PART_FLIP
          GENLIST_PART_DISCLIP
       }
       programs {
@@ -27175,21 +26662,21 @@
          // signal: elm,state,%s,passive
          //   a "check" item named %s went passive
          // default is passive
-         /*program { name: "go_active";
+         program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
-            target: "elm.text";
-            target: "elm.text.sub";
+            GENLIST_PROGRAM_SCRIPT_FLIP_SELECT_1TEXT
+            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
+            target: "bg_image";
             target: "elm.text";
-            target: "elm.text.sub";
             transition: LINEAR 0.1;
-         }*/
+         }
          program { name: "go_disabled";
             signal: "elm,state,disabled";
             source: "elm";
@@ -27202,177 +26689,148 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
+         //GENLIST_PROGRAM_FLIP_1TEXT
+         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
    }
 
-// 4.3.2 (old)
-   group { name: "elm/genlist/item/dialogue/bg/3text.1icon/default";
-      alias: "elm/genlist/item_odd/dialogue/bg/3text.1icon/default";
-      alias: "elm/genlist/item_compress/dialogue/bg/3text.1icon/default";
-      alias: "elm/genlist/item_compress_odd/dialogue/bg/3text.1icon/default";
-      alias: "elm/layout/dialogue/bg/3text.1icon";
+// 3.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";
       data.item: "stacking" "above";
       data.item: "selectraise" "on";
-      data.item: "texts" "elm.text.1 elm.text.2 elm.text.3";
-      data.item: "contents" "elm.icon";
+      data.item: "texts" "elm.text";
+      data.item: "contents" "elm.icon.1 elm.icon.2";
+      data.item: "flips" "elm.flip.content";
       images {
-          image: "00_list_thumbnail_bg.png" COMP;
+         image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_DIALOGUE_BASE( GENLIST_HEIGHT_190_INC )
-         GENLIST_PART_PADDING_TOP( GENLIST_PADDING_34_INC )
-         GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_34_INC )
-         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_16_INC )
-         part { name: "elm.icon.bg";
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         part { name: "elm.icon.1";
+            clip_to: "disclip";
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_128_INC GENLIST_SIZE_128_INC;
+               min: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
+               max: GENLIST_SIZE_60_INC GENLIST_SIZE_60_INC;
                fixed: 1 1;
-               align: 0.0 0.5;
                rel1 {
-                  relative: 1.0 0.5;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 1.0 0.5;
+                  relative: 1.0 0.0;
                   to_x: "elm.padding.left";
                }
-               image {
-                  normal: "00_list_thumbnail_bg.png";
-                  border: 1 1 1 1;
-                  border_scale: 1;
-                  middle: NONE;
-               }
-            }
-         }
-         part { name: "elm.icon";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-               rel1.to: "elm.icon.bg";
-               rel2.to: "elm.icon.bg";
+               rel2.to_x: "elm.padding.left";
+               align: 0.0 0.5;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.padding.icon.right";
+         part { name: "elm.padding.icon1.right";
+            clip_to: "disclip";
             type: RECT;
-            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_PADDING_24_INC 0;
+               min: GENLIST_PADDING_16_INC 0;
                fixed: 1 0;
                rel1 {
-                   relative: 1.0 0.0;
-                   to_x: "elm.icon.bg";
+                  relative: 1.0 0.0;
+                  to_x: "elm.icon.1";
                }
-               rel2.to_x: "elm.icon.bg";
+               rel2.to_x: "elm.icon.1";
                visible: 0;
-               align: 0.0 0.5;
             }
          }
-         part { name: "elm.text.1";
+         part { name: "elm.icon.2";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_SIZE_54_INC;
-               fixed: 0 1;
-               align: 0 0;
+               min: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               max: GENLIST_ICON_BIG_SIZE GENLIST_ICON_BIG_SIZE;
+               fixed: 1 1;
                rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
-                  to_y: "elm.padding.top";
+                  relative: 0.0 0.0;
+                  to_x: "elm.padding.right";
                }
                rel2 {
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
-                  to_y: "elm.padding.top";
-               }
-               color: GENLIST_DIALOGUE_FONT_DETAIL_TEXT_MAIN_COLOR_INC;
-               text {
-                  font: "SLP:style=Roman";
-                  size: GENLIST_FONT_48_INC;
-                  align: 0.0 0.0;
-                  text_class: "list_item";
                }
+               align: 1.0 0.5;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-         part { name: "elm.text.2";
+         part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
-            type: TEXT;
-            mouse_events: 0;
+            type: RECT;
             scale: 1;
             description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon.right";
-                  to_y: "elm.text.1";
-               }
+               min: GENLIST_PADDING_16_INC 0;
+               fixed: 1 0;
+               rel1.to_x: "elm.icon.2";
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.text.3";
-               }
-               color: GENLIST_DIALOGUE_FONT_DETAIL_TEXT_SUB_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  align: 0.0 1.0;
-                  text_class: "slp_medium";
+                  relative: 0.0 1.0;
+                  to_x: "elm.icon.2";
                }
+               align: 1.0 0.0;
+               visible: 0;
             }
          }
-         part { name: "elm.text.3";
+         part { name: "elm.text";
             clip_to: "disclip";
             type: TEXT;
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_ICON_SMALL_SIZE;
-               fixed: 0 1;
-               align: 0 1;
                rel1 {
                   relative: 1.0 0.0;
-                  to_x: "elm.padding.icon.right";
-                  to_y: "elm.padding.bottom";
+                  to_x: "elm.padding.icon1.right";
                }
                rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
+                  relative: 0.0 1.0;
+                  to_x: "elm.padding.icon2.left";
                }
-               color: GENLIST_DIALOGUE_FONT_DETAIL_TEXT_SUB_COLOR_INC;
+               align: 0.0 0.5;
+               color: GENLIST_PART_FONT_LIST_MAIN_TEXT_UNREAD_COLOR_INC;
                text {
-                  font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
-                  align: 0.0 1.0;
-                  text_class: "slp_medium";
+                  font: "SLP:style=Roman";
+                  size: GENLIST_FONT_44_INC;
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "list_item";
                }
             }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
+         GENLIST_PART_FLIP
          GENLIST_PART_DISCLIP
       }
       programs {
-         // signal: elm,state,%s,active
-         //   a "check" item named %s went active
-         // signal: elm,state,%s,passive
-         //   a "check" item named %s went passive
-         // default is passive
-         /*program { name: "go_active";
+         program { name: "go_active";
             signal: "elm,state,selected";
             source: "elm";
             action: STATE_SET "selected" 0.0;
+            target: "bg_image";
             target: "elm.text";
-            target: "elm.text.sub";
+            GENLIST_PROGRAM_AFTER_PLAY_BUTTON_PRESS
          }
          program { name: "go_passive";
             signal: "elm,state,unselected";
             source: "elm";
             action: STATE_SET "default" 0.0;
+            target: "bg_image";
             target: "elm.text";
-            target: "elm.text.sub";
             transition: LINEAR 0.1;
-         }*/
+         }
          program { name: "go_disabled";
             signal: "elm,state,disabled";
             source: "elm";
@@ -27385,7 +26843,8 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
+         GENLIST_PROGRAM_FLIP_1TEXT_2ICON
+         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
       }
-  }
+   }
 
-////////////////////////////////////////////////////////
diff --git a/themes/widgets/genlist/genlist_sweep.edc b/themes/widgets/genlist/genlist_sweep.edc
index 036b7ee..068833b 100644 (file)
--- a/themes/widgets/genlist/genlist_sweep.edc
+++ b/themes/widgets/genlist/genlist_sweep.edc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved 
+ * Copyright (c) 2010 Samsung Electronics Co., Ltd All Rights Reserved
  *
  * PROPRIETARY/CONFIDENTIAL
  *
@@ -31,61 +31,28 @@
       data.item: "treesize" "GENLIST_TREESIZE_DEFAULT";
 
       parts {
-         part { name: "base";
-            type: RECT;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_HEIGHT_113_INC;
-               color: GENLIST_SWEEP_BG_COLOR_INC;
-            }
-         }
-         part { name: "bottom_line";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: 0 1;
-               fixed: 0 1;
-               visible: 1;
-               color: GENLIST_PART_LIST_LINE_COLOR_INC;
-               rel1 {
-                  relative: 0.0 1.0;
-                  offset: 0 -1;
-                  to: "base";
-               }
-               rel2.to: "base";
-            }
-         }
-         part { name: "base.padding.rightmargin";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG 0;
-               fixed: 1 0;
-               visible: 0;
-               align: 1 0;
-               rel1 {
-                  relative: 1 0;
-                  to: "base";
-               }
-               rel2.to: "base";
-            }
-         }
+         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+
          part { name: "elm.slide.swallow.1";
             type: SWALLOW;
             clip_to: "disclip";
             scale: 1;
+            mouse_events: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_390_INC GENLIST_SIZE_74_INC;
-               max: GENLIST_SIZE_390_INC GENLIST_SIZE_74_INC;
                fixed: 1 1;
+               min: 486 GENLIST_TEXT_BTN_HEIGHT;
+               max: 486 GENLIST_TEXT_BTN_HEIGHT;
                align: 0.5 0.5;
+               rel1 {
+                  relative: 1 0;
+                  to_x: "elm.padding.left";
+               }
                rel2 {
                   relative: 0 1;
-                  to_x: "base.padding.rightmargin";
+                  to_x: "elm.padding.right";
                }
             }
          }
@@ -94,96 +61,81 @@
             type: RECT;
             clip_to: "disclip";
             mouse_events: 1;
+            insert_before: "elm.swallow.origin";
             description { state: "default" 0.0;
+               color: 0 0 0 0;
+               visible: 1;
                rel1.to: "base";
                rel2.to: "base";
-               color: 0 0 0 0;
             }
-            description { state: "repeat_events" 0.0;
+            description { state: "slide" 0.0;
                inherit: "default" 0.0;
                visible: 0;
             }
          }
-         part { name: "base.padding.sweepright";
-            type: RECT;
+         // Swallow part for original genlist item style
+         part { name: "elm.swallow.origin";
             clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
+            type: SWALLOW;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG 0;
-               fixed: 1 0;
-               visible: 0;
-               align: 1 0;
                rel1 {
-                  relative: 2 0;
+                  relative: 0 0;
                   to: "base";
                }
                rel2 {
-                  relative: 2 1;
+                  relative: 1 1;
                   to: "base";
                }
             }
-         }
-         // Swallow part for original genlist item style
-         part { name: "elm.swallow.origin";
-            clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-            }
             description { state: "slide" 0.0;
                inherit: "default" 0.0;
-               rel1.to: "base.padding.rightmargin";
+               rel1 {
+                  relative: 1 0;
+                  to: "base";
+               }
                rel2 {
-                  relative: 0 1;
-                  to: "base.padding.sweepright";
+                  relative: 2 1;
+                  to: "base";
                }
             }
          }
-         part { name: "disclip";
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_DISCLIP_COLOR_INC;
-            }
-         }
+         GENLIST_PART_DISCLIP
       }
       programs {
          program {
-            name:    "slide_right";
-            signal:  "elm,state,slide,active";
-            source:  "elm";
-            action:  STATE_SET "slide" 0.0;
-            target:  "elm.swallow.origin";
+            name: "slide_right";
+            signal: "elm,state,slide,active";
+            source: "elm";
+            action: STATE_SET "slide" 0.0;
+            target: "elm.swallow.origin";
             transition: ACCELERATE 0.5;
-            after:   "unblock_event";
+            after: "event_unblock";
          }
+         //FIXME: Eventhough event_block_layer is below elm.swallow.origin,
+         // Why event unblock/block shoud be done after/before.
          program {
-            name:    "unblock_event";
-            action:  STATE_SET "repeat_events" 0.0;
-            target:  "event_block_layer";
+            name: "event_unblock";
+            action: STATE_SET "slide" 0.0;
+            target: "event_block_layer";
          }
          program {
-            name:    "slide_left";
-            signal:  "elm,state,slide,passive";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "event_block_layer";
-            after:   "slide_left2";
+            name: "event_block";
+            signal: "elm,state,slide,passive";
+            source: "elm";
+            action: STATE_SET "default" 0.0;
+            target: "event_block_layer";
+            after:  "slide_left";
          }
          program {
-            name:    "slide_left2";
-            action:  STATE_SET "default" 0.0;
-            target:  "elm.swallow.origin";
+            name: "slide_left";
+            action: STATE_SET "default" 0.0;
+            target: "elm.swallow.origin";
             transition: DECELERATE 0.5;
-            after:   "slide_left_finished";
+            after: "signal";
          }
          program {
-            name:    "slide_left_finished";
-            action:  SIGNAL_EMIT "elm,state,slide,passive,finished" "elm";
+            name: "signal";
+            action: SIGNAL_EMIT "elm,state,slide,passive,finished" "elm";
          }
       }
    }
@@ -192,705 +144,175 @@
       alias: "elm/genlist/item_odd/mode/slide2/default";
       alias: "elm/genlist/item_compress/mode/slide2/default";
       alias: "elm/genlist/item_compress_odd/mode/slide2/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
+      inherit: "elm/genlist/item/mode/slide/default";
       data.item: "contents" "elm.slide.swallow.1 elm.slide.swallow.2";
-      data.item: "mode_part" "elm.swallow.origin";
-      data.item: "treesize" "GENLIST_TREESIZE_DEFAULT";
-
       parts {
-         part { name: "base";
-         type: RECT;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_HEIGHT_113_INC;
-               color: GENLIST_SWEEP_BG_COLOR_INC;
-            }
-         }
-         part { name: "bottom_line";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 0;
+         part { name: "elm.slide.swallow.1";
             description { state: "default" 0.0;
-               min: 0 1;
-               fixed: 0 1;
-               visible: 1;
-               color: GENLIST_PART_LIST_LINE_COLOR_INC;
+               min: 336 GENLIST_TEXT_BTN_HEIGHT;
+               max: 336 GENLIST_TEXT_BTN_HEIGHT;
+               align: 0 0.5;
                rel1 {
-                  relative: 0.0 1.0;
-                  offset: 0 -1;
-                  to: "base";
+                  relative: 1 0;
+                  to_x: "elm.padding.left";
+               }
+               rel2 {
+                  relative: 1 1;
+                  to_x: "elm.padding.left";
                }
-               rel2.to: "base";
             }
          }
-         part { name: "base.padding.rightmargin";
-            type: RECT;
+         part { name: "elm.slide.swallow.2";
+            type: SWALLOW;
             clip_to: "disclip";
-            mouse_events: 0;
             scale: 1;
+            mouse_events: 1;
+            insert_before: "event_block_layer";
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG 0;
-               fixed: 1 0;
-               visible: 0;
-               align: 1 0;
+               fixed: 1 1;
+               min: 336 GENLIST_TEXT_BTN_HEIGHT;
+               max: 336 GENLIST_TEXT_BTN_HEIGHT;
+               align: 1.0 0.5;
                rel1 {
-                  relative: 1 0;
-                  to: "base";
+                  relative: 0 0;
+                  to_x: "elm.padding.right";
+               }
+               rel2 {
+                  relative: 0 1;
+                  to_x: "elm.padding.right";
                }
-               rel2.to: "base";
             }
          }
-         part { name: "base.padding.center";
-            type: RECT;
+      }
+   }
+   group { name: "elm/genlist/item/mode/slide3/default";
+      alias: "elm/genlist/item_odd/mode/slide3/default";
+      alias: "elm/genlist/item_compress/mode/slide3/default";
+      alias: "elm/genlist/item_compress_odd/mode/slide3/default";
+      inherit: "elm/genlist/item/mode/slide2/default";
+      data.item: "contents" "elm.slide.swallow.1 elm.slide.swallow.2 elm.slide.swallow.3";
+      parts {
+         part { name: "elm.slide.swallow.1";
+            description { state: "default" 0.0;
+               min: 219 GENLIST_TEXT_BTN_HEIGHT;
+               max: 219 GENLIST_TEXT_BTN_HEIGHT;
+            }
+         }
+         part { name: "elm.slide.swallow.2";
+            type: SWALLOW;
             clip_to: "disclip";
-            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
-               max: GENLIST_SIZE_16_INC 0;
-               fixed: 1 0;
-               visible: 0;
+               min: 218 GENLIST_TEXT_BTN_HEIGHT;
+               max: 218 GENLIST_TEXT_BTN_HEIGHT;
                align: 0.5 0.5;
+               rel1 {
+                  relative: 1 0;
+                  to_x: "elm.slide.swallow.1";
+                  offset: GENLIST_PADDING_SIZE_DEFAULT 0;
+               }
                rel2 {
                   relative: 0 1;
-                  to_x: "base.padding.rightmargin";
+                  to_x: "elm.slide.swallow.3";
+                  offset: -GENLIST_PADDING_SIZE_DEFAULT 0;
                }
             }
          }
-         part { name: "elm.slide.swallow.1";
+         part { name: "elm.slide.swallow.3";
             type: SWALLOW;
             clip_to: "disclip";
             scale: 1;
+            insert_before: "elm.slide.swallow.2";
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_304_INC GENLIST_SIZE_74_INC;
-               max: GENLIST_SIZE_304_INC GENLIST_SIZE_74_INC;
+               min: 219 GENLIST_TEXT_BTN_HEIGHT;
+               max: 219 GENLIST_TEXT_BTN_HEIGHT;
+               fixed: 1 0;
                align: 1 0.5;
-               rel1.to_x: "base.padding.center";
+               rel1 {
+                  relative: 0 0;
+                  to: "elm.padding.right";
+               }
                rel2 {
                   relative: 0 1;
-                  to_x: "base.padding.center";
+                  to: "elm.padding.right";
                }
             }
          }
-         part { name: "elm.slide.swallow.2";
+      }
+   }
+
+   group { name: "elm/genlist/item/mode/slide4/default";
+      alias: "elm/genlist/item_odd/mode/slide4/default";
+      alias: "elm/genlist/item_compress/mode/slide4/default";
+      alias: "elm/genlist/item_compress_odd/mode/slide4/default";
+      inherit: "elm/genlist/item/mode/slide3/default";
+      data.item: "contents" "elm.slide.swallow.1 elm.slide.swallow.2 elm.slide.swallow.3 elm.slide.swallow.4";
+      parts {
+         part { name: "elm.slide.swallow.1";
             type: SWALLOW;
             clip_to: "disclip";
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_304_INC GENLIST_SIZE_74_INC;
-               max: GENLIST_SIZE_304_INC GENLIST_SIZE_74_INC;
-               align: 0 0.5;
-               rel1 {
-                  relative: 1 0;
-                  to_x: "base.padding.center";
-               }
-               rel2.to_x: "base.padding.center";
+               min: 156 GENLIST_TEXT_BTN_HEIGHT;
+               max: 156 GENLIST_TEXT_BTN_HEIGHT;
             }
          }
-         // Transparent part between base parts and slidable parts
-         part { name: "event_block_layer";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 1;
+         part { name: "elm.slide.swallow.2";
             description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-               color: 0 0 0 0;
-            }
-            description { state: "repeat_events" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
+               min: 156 GENLIST_TEXT_BTN_HEIGHT;
+               max: 156 GENLIST_TEXT_BTN_HEIGHT;
+               align: 0.0 0.5;
+               rel1 {
+                  relative: 1 0;
+                  to: "elm.slide.swallow.1";
+                  offset: GENLIST_PADDING_SIZE_DEFAULT 0;
+               }
+               rel2 {
+                  relative: 0 1;
+                  to: "elm.slide.swallow.4";
+               }
             }
          }
-         part { name: "base.padding.sweepright";
-            type: RECT;
+
+         part { name: "elm.slide.swallow.3";
+            type: SWALLOW;
             clip_to: "disclip";
-            mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG 0;
-               fixed: 1 0;
-               visible: 0;
-               align: 1 0;
+               min: 156 GENLIST_TEXT_BTN_HEIGHT;
+               max: 156 GENLIST_TEXT_BTN_HEIGHT;
+               align: 1.0 0.5;
                rel1 {
-                  relative: 2 0;
-                  to: "base";
+                  relative: 1 0;
+                  to: "elm.slide.swallow.1";
                }
                rel2 {
-                  relative: 2 1;
-                  to: "base";
+                  relative: 0 1;
+                  to: "elm.slide.swallow.4";
+                  offset: -GENLIST_PADDING_SIZE_DEFAULT 0;
                }
             }
          }
-         // Swallow part for original genlist item style
-         part { name: "elm.swallow.origin";
-            clip_to: "disclip";
+         part { name: "elm.slide.swallow.4";
             type: SWALLOW;
+            clip_to: "disclip";
+            scale: 1;
+            insert_before: "elm.slide.swallow.3";
             description { state: "default" 0.0;
-            }
-            description { state: "slide" 0.0;
-               inherit: "default" 0.0;
-               rel1.to: "base.padding.rightmargin";
+               min: 156 GENLIST_TEXT_BTN_HEIGHT;
+               max: 156 GENLIST_TEXT_BTN_HEIGHT;
+               fixed: 1 0;
+               align: 1 0.5;
+               rel1 {
+                  relative: 0 0;
+                  to: "elm.padding.right";
+               }
                rel2 {
                   relative: 0 1;
-                  to: "base.padding.sweepright";
+                  to: "elm.padding.right";
                }
             }
          }
-         part { name: "disclip";
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_DISCLIP_COLOR_INC;
-            }
-         }
-      }
-      programs {
-         program {
-            name:    "slide_right";
-            signal:  "elm,state,slide,active";
-            source:  "elm";
-            action:  STATE_SET "slide" 0.0;
-            target:  "elm.swallow.origin";
-            transition: ACCELERATE 0.5;
-            after:   "unblock_event";
-         }
-         program {
-            name:    "unblock_event";
-            action:  STATE_SET "repeat_events" 0.0;
-            target:  "event_block_layer";
-         }
-         program {
-            name:    "slide_left";
-            signal:  "elm,state,slide,passive";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "event_block_layer";
-            after:   "slide_left2";
-         }
-         program {
-            name:    "slide_left2";
-            action:  STATE_SET "default" 0.0;
-            target:  "elm.swallow.origin";
-            transition: DECELERATE 0.5;
-            after:   "slide_left_finished";
-         }
-         program {
-            name:    "slide_left_finished";
-            action:  SIGNAL_EMIT "elm,state,slide,passive,finished" "elm";
-         }
-      }
-   }
-
-   group { name: "elm/genlist/item/mode/slide3/default";
-      alias: "elm/genlist/item_odd/mode/slide3/default";
-      alias: "elm/genlist/item_compress/mode/slide3/default";
-      alias: "elm/genlist/item_compress_odd/mode/slide3/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "contents" "elm.slide.swallow.1 elm.slide.swallow.2 elm.slide.swallow.3";
-      data.item: "mode_part" "elm.swallow.origin";
-      data.item: "treesize" "GENLIST_TREESIZE_DEFAULT";
-
-      parts {
-         part { name: "base";
-         type: RECT;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_HEIGHT_113_INC;
-               color: GENLIST_SWEEP_BG_COLOR_INC;
-            }
-         }
-         part { name: "bottom_line";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: 0 1;
-               fixed: 0 1;
-               visible: 1;
-               color: GENLIST_PART_LIST_LINE_COLOR_INC;
-               rel1 {
-                  relative: 0.0 1.0;
-                  offset: 0 -1;
-                  to: "base";
-               }
-               rel2.to: "base";
-            }
-         }
-         part { name: "base.padding.rightmargin";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG 0;
-               fixed: 1 0;
-               visible: 0;
-               align: 1 0;
-               rel1 {
-                  relative: 1 0;
-                  to: "base";
-               }
-               rel2.to: "base";
-            }
-         }
-         part { name: "elm.slide.swallow.2";
-            type: SWALLOW;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_197_INC 0;
-               max: GENLIST_SIZE_197_INC 0;
-               fixed: 1 0;
-               align: 0.5 0.5;
-               rel2 {
-                  relative: 0 1;
-                  to_x: "base.padding.rightmargin";
-               }
-            }
-         }
-         part { name: "elm.padding.swallow.2.left";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
-               max: GENLIST_SIZE_16_INC 0;
-               fixed: 1 0;
-               align: 1 0.5;
-               visible: 0;
-               rel1.to: "elm.slide.swallow.2";
-               rel2 {
-                  relative: 0 1;
-                  to: "elm.slide.swallow.2";
-               }
-            }
-         }
-         part { name: "elm.slide.swallow.1";
-            type: SWALLOW;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_197_INC 0;
-               max: GENLIST_SIZE_197_INC 0;
-               fixed: 1 0;
-               align: 1 0.5;
-               rel1.to: "elm.padding.swallow.2.left";
-               rel2 {
-                  relative: 0 1;
-                  to: "elm.padding.swallow.2.left";
-               }
-            }
-         }
-         part { name: "elm.padding.swallow.2.right";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
-               max: GENLIST_SIZE_16_INC 0;
-               fixed: 1 0;
-               align: 0 0.5;
-               visible: 0;
-               rel1 {
-                  relative: 1 0;
-                  to: "elm.slide.swallow.2";
-               }
-               rel2.to: "elm.slide.swallow.2";
-            }
-         }
-         part { name: "elm.slide.swallow.3";
-            type: SWALLOW;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_197_INC 0;
-               max: GENLIST_SIZE_197_INC 0;
-               fixed: 1 0;
-               align: 0 0.5;
-               rel1 {
-                  relative: 1 0;
-                  to: "elm.padding.swallow.2.right";
-               }
-               rel2.to: "elm.padding.swallow.2.right";
-            }
-         }
-         // Transparent part between base parts and slidable parts
-         part { name: "event_block_layer";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 1;
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-               color: 0 0 0 0;
-            }
-            description { state: "repeat_events" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "base.padding.sweepright";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG 0;
-               fixed: 1 0;
-               visible: 0;
-               align: 1 0;
-               rel1 {
-                  relative: 2 0;
-                  to: "base";
-               }
-               rel2 {
-                  relative: 2 1;
-                  to: "base";
-               }
-            }
-         }
-         // Swallow part for original genlist item style
-         part { name: "elm.swallow.origin";
-            clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-            }
-            description { state: "slide" 0.0;
-               inherit: "default" 0.0;
-               rel1.to: "base.padding.rightmargin";
-               rel2 {
-                  relative: 0 1;
-                  to: "base.padding.sweepright";
-               }
-            }
-         }
-         part { name: "disclip";
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_DISCLIP_COLOR_INC;
-            }
-         }
-      }
-      programs {
-         program {
-            name:    "slide_right";
-            signal:  "elm,state,slide,active";
-            source:  "elm";
-            action:  STATE_SET "slide" 0.0;
-            target:  "elm.swallow.origin";
-            transition: ACCELERATE 0.5;
-            after:   "unblock_event";
-         }
-         program {
-            name:    "unblock_event";
-            action:  STATE_SET "repeat_events" 0.0;
-            target:  "event_block_layer";
-         }
-         program {
-            name:    "slide_left";
-            signal:  "elm,state,slide,passive";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "event_block_layer";
-            after:   "slide_left2";
-         }
-         program {
-            name:    "slide_left2";
-            action:  STATE_SET "default" 0.0;
-            target:  "elm.swallow.origin";
-            transition: DECELERATE 0.5;
-            after:   "slide_left_finished";
-         }
-         program {
-            name:    "slide_left_finished";
-            action:  SIGNAL_EMIT "elm,state,slide,passive,finished" "elm";
-         }
-      }
-   }
-
-   group { name: "elm/genlist/item/mode/slide4/default";
-      alias: "elm/genlist/item_odd/mode/slide4/default";
-      alias: "elm/genlist/item_compress/mode/slide4/default";
-      alias: "elm/genlist/item_compress_odd/mode/slide4/default";
-      data.item: "stacking" "above";
-      data.item: "selectraise" "on";
-      data.item: "contents" "elm.slide.swallow.1 elm.slide.swallow.2 elm.slide.swallow.3 elm.slide.swallow.4";
-      data.item: "mode_part" "elm.swallow.origin";
-      data.item: "treesize" "GENLIST_TREESIZE_DEFAULT";
-
-      parts {
-         part { name: "base";
-         type: RECT;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 0 GENLIST_HEIGHT_113_INC;
-               color: GENLIST_SWEEP_BG_COLOR_INC;
-            }
-         }
-         part { name: "bottom_line";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: 0 1;
-               fixed: 0 1;
-               visible: 1;
-               color: GENLIST_PART_LIST_LINE_COLOR_INC;
-               rel1 {
-                  relative: 0.0 1.0;
-                  offset: 0 -1;
-                  to: "base";
-               }
-               rel2.to: "base";
-            }
-         }
-         part { name: "base.padding.rightmargin";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG 0;
-               fixed: 1 0;
-               visible: 0;
-               align: 1 0;
-               rel1 {
-                  relative: 1 0;
-                  to: "base";
-               }
-               rel2.to: "base";
-            }
-         }
-         part { name: "base.padding.center";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_PADDING_16_INC 0;
-               max: GENLIST_PADDING_16_INC 0;
-               fixed: 1 0;
-               visible: 0;
-               align: 0.5 0.5;
-               rel2 {
-                  relative: 0 1;
-                  to_x: "base.padding.rightmargin";
-               }
-            }
-         }
-         part { name: "elm.slide.swallow.2";
-            type: SWALLOW;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_144_INC GENLIST_SIZE_74_INC;
-               max: GENLIST_SIZE_144_INC GENLIST_SIZE_74_INC;
-               fixed: 1 1;
-               align: 1 0.5;
-               rel1.to: "base.padding.center";
-               rel2 {
-                  relative: 0 1;
-                  to: "base.padding.center";
-               }
-            }
-         }
-         part { name: "elm.padding.swallow.2.left";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
-               max: GENLIST_SIZE_16_INC 0;
-               fixed: 1 0;
-               align: 1 0.5;
-               visible: 0;
-               rel1.to: "elm.slide.swallow.2";
-               rel2 {
-                  relative: 0 1;
-                  to: "elm.slide.swallow.2";
-               }
-            }
-         }
-         part { name: "elm.slide.swallow.1";
-            type: SWALLOW;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_144_INC GENLIST_SIZE_74_INC;
-               max: GENLIST_SIZE_144_INC GENLIST_SIZE_74_INC;
-               fixed: 1 1;
-               align: 1 0.5;
-               rel1.to: "elm.padding.swallow.2.left";
-               rel2 {
-                  relative: 0 1;
-                  to: "elm.padding.swallow.2.left";
-               }
-            }
-         }
-         part { name: "elm.slide.swallow.3";
-            type: SWALLOW;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_144_INC GENLIST_SIZE_74_INC;
-               max: GENLIST_SIZE_144_INC GENLIST_SIZE_74_INC;
-               fixed: 1 1;
-               align: 0 0.5;
-               rel1 {
-                  relative: 1 0;
-                  to: "base.padding.center";
-               }
-               rel2.to: "base.padding.center";
-            }
-         }
-         part { name: "elm.padding.swallow.3.right";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
-               max: GENLIST_SIZE_16_INC 0;
-               fixed: 1 0;
-               align: 0 0.5;
-               visible: 0;
-               rel1 {
-                  relative: 1 0;
-                  to: "elm.slide.swallow.3";
-               }
-               rel2.to: "elm.slide.swallow.2";
-            }
-         }
-         part { name: "elm.slide.swallow.4";
-            type: SWALLOW;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_144_INC GENLIST_SIZE_74_INC;
-               max: GENLIST_SIZE_144_INC GENLIST_SIZE_74_INC;
-               fixed: 1 1;
-               align: 0 0.5;
-               rel1 {
-                  relative: 1 0;
-                  to: "elm.padding.swallow.3.right";
-               }
-               rel2.to: "elm.padding.swallow.3.right";
-            }
-         }
-         // Transparent part between base parts and slidable parts
-         part { name: "event_block_layer";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 1;
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-               color: 0 0 0 0;
-            }
-            description { state: "repeat_events" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-         }
-         part { name: "base.padding.sweepright";
-            type: RECT;
-            clip_to: "disclip";
-            mouse_events: 0;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_ICON_BIG 0;
-               fixed: 1 0;
-               visible: 0;
-               align: 1 0;
-               rel1 {
-                  relative: 2 0;
-                  to: "base";
-               }
-               rel2 {
-                  relative: 2 1;
-                  to: "base";
-               }
-            }
-         }
-         // Swallow part for original genlist item style
-         part { name: "elm.swallow.origin";
-            clip_to: "disclip";
-            type: SWALLOW;
-            description { state: "default" 0.0;
-            }
-            description { state: "slide" 0.0;
-               inherit: "default" 0.0;
-               rel1.to: "base.padding.rightmargin";
-               rel2 {
-                  relative: 0 1;
-                  to: "base.padding.sweepright";
-               }
-            }
-         }
-         part { name: "disclip";
-            type: RECT;
-            description { state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: GENLIST_PART_DISCLIP_COLOR_INC;
-            }
-         }
-      }
-      programs {
-         program {
-            name:    "slide_right";
-            signal:  "elm,state,slide,active";
-            source:  "elm";
-            action:  STATE_SET "slide" 0.0;
-            target:  "elm.swallow.origin";
-            transition: ACCELERATE 0.5;
-            after:   "unblock_event";
-         }
-         program {
-            name:    "unblock_event";
-            action:  STATE_SET "repeat_events" 0.0;
-            target:  "event_block_layer";
-         }
-         program {
-            name:    "slide_left";
-            signal:  "elm,state,slide,passive";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "event_block_layer";
-            after:   "slide_left2";
-         }
-         program {
-            name:    "slide_left2";
-            action:  STATE_SET "default" 0.0;
-            target:  "elm.swallow.origin";
-            transition: DECELERATE 0.5;
-            after:   "slide_left_finished";
-         }
-         program {
-            name:    "slide_left_finished";
-            action:  SIGNAL_EMIT "elm,state,slide,passive,finished" "elm";
-         }
       }
    }
 
@@ -911,7 +333,7 @@
             clip_to: "disclip";
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_HEIGHT_113_INC;
+               min: 0 GENLIST_HEIGHT_1LINE;
                color: GENLIST_SWEEP_BG_COLOR_INC;
             }
          }
@@ -1373,7 +795,7 @@
             clip_to: "disclip";
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_HEIGHT_113_INC;
+               min: 0 GENLIST_HEIGHT_1LINE;
                color: GENLIST_SWEEP_BG_COLOR_INC;
             }
          }
Domain: UI Framework / EFL;