Fix reorder mode for new UX & Change macors & Fix some incorrect text

style

Change-Id: I0ce85ca74b870c5b2d3bb40f71749ea4fcb54414

diff --git a/themes/inc/tizen-hd-inc.edc b/themes/inc/tizen-hd-inc.edc
index 2901bc4..800e4e6 100644 (file)
--- a/themes/inc/tizen-hd-inc.edc
+++ b/themes/inc/tizen-hd-inc.edc
@@ -184,10 +184,6 @@
 #define GENLIST_PADDING_88_INC 88
 #define GENLIST_PADDING_124_INC 124
 
-#define GENLIST_TEXT_SIZE_LIST_MAIN_TEXT 44
-#define GENLIST_TEXT_SIZE_LIST_BUBBLE_TEXT 32
-#define GENLIST_TEXT_SIZE_NAME_TEXT 32
-#define GENLIST_TEXT_SIZE_LIST_MESSAGE_TEXT 32
 #define GENLIST_FONT_27_INC 27
 #define GENLIST_FONT_28_INC 28
 #define GENLIST_FONT_30_INC 30
@@ -262,75 +258,91 @@
 #define GENLIST_TREESIZE_16_INC 16
 #define GENLIST_TREESIZE_20_INC 20
 
-#define GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD 249 249 249 255
-#define GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_READ 158 158 158 255
-#define GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_FOCUS 249 249 249 255
-
-#define GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT 100 100 100 255
-#define GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS 0 140 210 255
-#define GENLIST_TEXT_COLOR_LIST_SUB_TEXT_FOCUS 249 249 249 255
-
-#define GENLIST_TEXT_COLOR_FLEXIBLE_TEXT_MAIN 249 249 249 255
-#define GENLIST_TEXT_COLOR_FLEXIBLE_TEXT_SUB 149 149 149 255
-
-#define GENLIST_TEXT_COLOR_EDITFIELD_TEXT 70 70 70 255
-#define GENLIST_TEXT_COLOR_EDITFIELD_TEXT_CURSOR 0 140 210 255
-
-#define GENLIST_TEXT_COLOR_MULTILINE_TEXT 149 149 149 255
-
-#define GENLIST_TEXT_COLOR_INDEX_LIST 164 164 164 255
-#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_READ 249 249 249 255
-#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_UNREAD 249 249 249 255
-#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_FOCUS 249 249 249 255
-
-#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_02 104 137 152 255
-#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_02_FOCUS 249 249 249 255
-
-#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_03 104 137 152 255
-#define GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_03_FOCUS 249 249 249 255
-
-#define GENLIST_TEXT_COLOR_CONVERTOR_STYLE 249 249 249 255
-#define GENLIST_TEXT_COLOR_CONVERTOR_STYLE_FOCUS 249 249 249 255
-
-#define GENLIST_TEXT_COLOR_UNREAD_EMAIL 249 249 249 255
-#define GENLIST_TEXT_COLOR_CONTENTS_TEXT 210 210 210 255
-#define GENLIST_TEXT_COLOR_NAME_TEXT 129 129 129 255
-#define GENLIST_TEXT_COLOR_NAME_TEXT_DIM 0 140 210 255
-#define GENLIST_TEXT_COLOR_LIST_BUBBLE_TEXT 249 249 249 255
-#define GENLIST_TEXT_COLOR_LIST_MESSAGE_TEXT 249 249 249 255
-
+// Group Index (in genlist)
+#define GENLIST_INDEX_LIST_SIZE 32
+#define GENLIST_INDEX_LIST_COLOR 164 164 164 255
+
+// Genlist Text
+#define GENLIST_LIST_MAIN_TEXT_SIZE 44
+#define GENLIST_LIST_MAIN_TEXT_READ_COLOR 158 158 158 255
+#define GENLIST_LIST_MAIN_TEXT_READ_COLOR_STYLE "#646464FF"
+#define GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR 249 249 249 255
+#define GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR_STYLE "#F9F9F9FF"
+#define GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR 249 249 249 255
+#define GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR_STYLE "#F9F9F9FF"
+
+#define GENLIST_LIST_SUB_TEXT_SIZE 32
+#define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR 100 100 100 255
+#define GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR_STYLE "#646464FF"
+#define GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR 0 140 210 255
+#define GENLIST_LIST_SUB_TEXT_FOCUS_COLOR 249 249 249 255
+
+
+#define GENLIST_FLEXIBLE_TEXT_MAIN_SIZE 44
+#define GENLIST_FLEXIBLE_TEXT_MAIN_COLOR 249 249 249 255
+#define GENLIST_FLEXIBLE_TEXT_MAIN_COLOR_STYLE "#F9F9F9FF"
+#define GENLIST_FLEXIBLE_TEXT_SUB_SIZE 36
+#define GENLIST_FLEXIBLE_TEXT_SUB_COLOR 149 149 149 255
+#define GENLIST_FLEXIBLE_TEXT_SUB_COLOR_STYLE "#959595FF"
+
+#define GENLIST_MULTILINE_TEXT_SIZE 32
+#define GENLIST_MULTILINE_TEXT_COLOR 149 149 149 255
+#define GENLIST_MULTILINE_TEXT_COLOR_STYLE "#959595FF"
+
+#define GENLIST_3LINE_MAIN_TEXT_01_SIZE 40
+#define GENLIST_3LINE_MAIN_TEXT_01_READ_COLOR 249 249 249 255
+#define GENLIST_3LINE_MAIN_TEXT_01_UNREAD_COLOR 249 249 249 255
+#define GENLIST_3LINE_MAIN_TEXT_01_FOCUS_COLOR 249 249 249 255
+#define GENLIST_3LINE_MAIN_TEXT_02_SIZE 36
+#define GENLIST_3LINE_MAIN_TEXT_02_COLOR 104 137 152 255
+#define GENLIST_3LINE_MAIN_TEXT_02_COLOR_FOCUS 249 249 249 255
+#define GENLIST_3LINE_MAIN_TEXT_03_SIZE 30
+#define GENLIST_3LINE_MAIN_TEXT_03_COLOR 104 137 152 255
+#define GENLIST_3LINE_MAIN_TEXT_03_FOCUS_COLOR 249 249 249 255
+
+#define GENLIST_CONVERTOR_STYLE_SIZE 40
+#define GENLIST_CONVERTOR_STYLE_COLOR 0 0 0 255
+#define GENLIST_CONVERTOR_STYLE_FOCUS_COLOR 249 249 249 255
+
+#define GENLIST_UNREAD_EMAIL_SIZE 44
+#define GENLIST_UNREAD_EMAIL_COLOR 249 249 249 255
+
+#define GENLIST_CONTENTS_TEXT_SIZE 30
+#define GENLIST_CONTENTS_TEXT_COLOR 210 210 210 255
+
+#define GENLIST_NAME_TEXT_SIZE 32
+#define GENLIST_NAME_TEXT_COLOR 129 129 129 255
+#define GENLIST_NAME_TEXT_COLOR_STYLE "#808080FF"
+#define GENLIST_NAME_TEXT_DIM_COLOR 0 140 210 255
+
+#define GENLIST_LIST_BUBBLE_TEXT_SIZE 32
+#define GENLIST_LIST_BUBBLE_TEXT_COLOR 249 249 249 255
+#define GENLIST_LIST_BUBBLE_TEXT_COLOR_STYLE "#F9F9F9FF"
+#define GENLIST_LIST_MESSAGE_TEXT_SIZE 32
+#define GENLIST_LIST_MESSAGE_TEXT_COLOR 249 249 249 255
+#define GENLIST_LIST_MESSAGE_TEXT_COLOR_STYLE "#000000FF"
+
+#define GENLIST_DIALOGUE_GROUP_HELP_TEXT_SIZE 32
+#define GENLIST_DIALOGUE_GROUP_HELP_TEXT_COLOR_STYLE "#929292FF"
+
+
+
+
+// This is used??
 #define GENLIST_TEXT_COLOR_BUBBLE_READ_MESSAGE 0 0 0 255
-#define GENLIST_TEXT_COLOR_BUBBLE_MESSAGE_TIME 96 96 96 255
-#define GENLIST_TEXT_COLOR_BUBBLE_SENT_MESSAGE 0 0 0 255
-#define GENLIST_TEXT_COLOR_BUBBLE_SOS_MESSAGE 211 0 0 255
-#define GENLIST_TEXT_COLOR_BUBBLE_MESSAGE_DATE 164 164 164 255
-#define GENLIST_TEXT_COLOR_BUBBLE_LINK_MESSAGE 34 129 157 255
-#define GENLIST_TEXT_COLOR_BUBBLE_MESSAGE_FAILED 211 0 0 255
-#define GENLIST_TEXT_COLOR_BUBBLE_READ_MESSAGE_NAME 57 166 215 255
-#define GENLIST_TEXT_COLOR_BUBBLE_MESSAGE_HELP 146 146 146 255
 #define GENLIST_TEXT_COLOR_SWEEP_STYLE 118 118 118 255
 
-#define GENLIST_TEXT_COLOR_STYLE_NAME_TEXT "#808080FF"
-#define GENLIST_TEXT_COLOR_STYLE_LIST_MAIN_TEXT_READ "#F9F9F9FF"
-#define GENLIST_TEXT_COLOR_STYLE_LIST_SUB_TEXT "#646464FF"
-#define GENLIST_TEXT_COLOR_LIST_MESSAGE_TEXT_STYLE "#000000FF"
-#define GENLIST_PART_FONT_FLEXIBLE_TEXT_MAIN_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_FONT_FLEXIBLE_TEXT_SUB_STYLE_COLOR_INC "#959595FF"
-#define GENLIST_PART_FONT_MULTILINE_TEXT_STYLE_COLOR_INC "#959595FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_READ_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_UNREAD_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_FOCUS_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_STYLE_COLOR_INC "#688998FF"
-#define GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_FOCUS_STYLE_COLOR_INC "#F9F9F9FF"
-#define GENLIST_PART_FONT_HELP_TEXT_STYLE_COLOR_INC "#929292FF"
-#define GENLIST_TEXT_COLOR_LIST_BUBBLE_TEXT_STYLE "#F9F9F9FF"
+
+
 
 #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_LIST_BG_COLOR_INC 0 0 0 255
+#define GENLIST_PART_REORDER_BG_COLOR 236 240 242 255
+#define GENLIST_PART_FLIP_BG_COLOR 0 0 0 255
+#define GENLIST_PART_DIALOGUE_GROUP_BG_COLOR 0 0 0 255
+#define GENLIST_PART_LIST_BG_COLOR 0 0 0 255
 #define GENLIST_PART_LIST_LINE_COLOR_INC 68 68 68 255
 #define GENLIST_PART_LIST_PRESS_COLOR_INC 0 140 210 255
-#define GENLIST_PART_TEXT_PRESS_COLOR_INC 249 249 249 255
+
 #define GENLIST_PART_EXPANDABLE_2ND_DEPTH_BG_COLOR_INC 31 31 31 255
 #define GENLIST_PART_EXPANDABLE_3ND_DEPTH_BG_COLOR_INC 46 46 46 255
 #define GENLIST_PART_EDIT_SELECT_ALL_BG_COLOR_INC 36 36 36 255
@@ -339,15 +351,6 @@
 #define GENLIST_PART_BUBBLE_DATE_BG_COLOR_INC 66 66 66 255
 #define GENLIST_PART_BUBBLE_1PIXEL_LINE_COLOR_INC 153 153 153 255
 
-// Remove this, use GENLIST_PART_BASE_EVENT_OFF instead
-#define GENLIST_PART_INDEX_LIST_BASE_EVENT_INC \
-         part { name: "base_event";\
-            type: RECT;\
-            repeat_events: 0;\
-            description { state: "default" 0.0;\
-               color: 0 0 0 0;\
-            }\
-         }
 #define GENLIST_PART_INDEX_LIST_BASE_IMAGE_INC \
          part { name: "base_image";\
             repeat_events: 1;\
@@ -361,7 +364,6 @@
             }\
          }
 
-#define GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC "#F9F9F9FF"
 #define GENLIST_PART_MATCH_TAG_COLOR_INC "+ color=#3F8DAD"
 
 #define GENLIST_DIALOGUE_GT_TEXT_COLOR 102 102 102 255

diff --git a/themes/widgets/genlist/genlist.edc b/themes/widgets/genlist/genlist.edc
index b37c39c..f968b7f 100644 (file)
--- a/themes/widgets/genlist/genlist.edc
+++ b/themes/widgets/genlist/genlist.edc
@@ -68,7 +68,7 @@
                visible: 0;
                align: 0.0 0.0;
                rel2.relative: 0.0  1.0;
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          part { name: "elm.padding.right";
@@ -80,7 +80,7 @@
                visible: 0;
                align: 1.0 0.0;
                rel1.relative: 1.0  0.0;
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          part { name: "elm.swallow.content";

diff --git a/themes/widgets/genlist/genlist_decorate.edc b/themes/widgets/genlist/genlist_decorate.edc
index fa3cb31..38ce843 100644 (file)
--- a/themes/widgets/genlist/genlist_decorate.edc
+++ b/themes/widgets/genlist/genlist_decorate.edc
@@ -19,7 +19,7 @@
 /*
  * vim:ts=3
  */
-
+// 2.2.7
    group { name: "elm/genlist/item/edit_default/default";
       alias: "elm/genlist/item_odd/edit_default/default";
       alias: "elm/genlist/item_compress/edit_default/default";
@@ -36,383 +36,96 @@
          image: "01_list_reorder_bg_below.png" COMP;
       }
       parts {
-         part { name: "base";
-            type: RECT;
-            repeat_events: 1;
-            scale: 1;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         GENLIST_PART_PADDING_TOP( 0 )
-         GENLIST_PART_PADDING_BOTTOM( 0 )
-         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
-
-         part { name: "elm.padding.reorder";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
-               fixed: 1 0;
-               visible: 0;
-               rel2.relative: 0.0 1.0;
-               align: 1.0 0.0;
-            }
-            description { state: "reorder" 0.0;
-               inherit: "default" 0.0;
-               align: 0.0 0.0;
-            }
-         }
-         part { name: "elm.decorate_bg";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.reorder";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_y: "elm.padding.bottom";
-               }
-               color: GENLIST_PART_LIST_BG_COLOR_INC;
-            }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: GENLIST_PART_LIST_PRESS_COLOR_INC;
-            }
-        }
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE_REORDER( 112 )
+         GENLIST_PART_BOTTOM_LINE
 
-        part { name: "elm.padding.left";
-           type: RECT;
-           scale: 1;
-           description { state: "default" 0.0;
-              min: GENLIST_SIZE_16_INC 0;
-              fixed: 1 0;
-              visible: 0;
-              rel1 {
-                 relative: 1.0 0.0;
-                 to_x: "elm.padding.reorder";
-              }
-              rel2.to_x: "elm.padding.reorder";
-              rel2.relative: 0.0  1.0;
-              align: 0.0 0.0;
-           }
-        }
+         GENLIST_PART_PADDING_RIGHT( 16 )
 
-        part { name: "elm.edit.icon.1";
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.left", "reorder.padding.left", 16)
+         part { name: "elm.edit.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               align: 1.0 0.5;
-               rel1 {
-                  relative: 1.0 1.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  offset: 0 0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.bottom";
-               }
-            }
-            description { state: "enabled" 0.0;
+            GENLIST_DESCRIPTION_L("elm.padding.icon1.left", min: 60 0; align: 1 0.5; )
+            description { state: "decorate" 0.0;
                inherit: "default" 0.0;
-               align: 0.0 0.5;
+               align: 0 0.5;
             }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
          }
-
-         part { name: "elm.padding.icon1.right";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
-               fixed: 1 0;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.edit.icon.1";
-               }
-               rel2.to_x: "elm.edit.icon.1";
-               align: 0.0 0.0;
-            }
-         }
-
+         GENLIST_PART_PADDING_LEFT_TO("elm.padding.icon1.right", "elm.edit.icon.1", 16)
          part { name: "elm.swallow.decorate.content";
             clip_to: "disclip";
             type: SWALLOW;
             mouse_events: 1;
             scale: 1;
-            description { state: "default" 0.0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "elm.padding.icon1.right";
-                  to_y: "elm.padding.top";
-               }
-               rel2 {
-                  relative: 0.2 0.0;
-                  to_x: "elm.edit.icon.2";
-                  to_y: "elm.padding.bottom";
-               }
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 0;
-            }
-            description { state: "flipped" 0.0;
+            GENLIST_DESCRIPTION_LR( "elm.padding.icon1.right", "elm.padding.icon2.left", )
+            description { state: "flip_enabled" 0.0;
                inherit: "default" 0.0;
                rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.left";
-                  to_y: "elm.padding.top";
+                  relative: 0 0;
+                  to_x: "base";
+                  to_y: "base";
                }
                rel2 {
-                  relative: 1.3 0.0;
-                  to_x: "elm.padding.right";
-                  to_y: "elm.padding.bottom";
+                  relative: 1 1;
+                  to_x: "base";
+                  to_y: "base";
                }
             }
          }
-         part { name: "elm.padding.icon2.left";
-            type: RECT;
-            scale: 1;
-            description { state: "default" 0.0;
-               min: GENLIST_SIZE_16_INC 0;
-               fixed: 1 0;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.swallow.decorate.content";
-               }
-               rel2.to_x: "elm.swallow.decorate.content";
-               align: 0.0 0.0;
-            }
-         }
-
-       part { name: "elm.edit.icon.2";
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon2.left", "elm.edit.icon.2", 16)
+         part { name: "elm.edit.icon.2";
             clip_to: "disclip";
             type: SWALLOW;
-            description { state: "default" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               visible: 1;
-               rel1 {
-                  relative: 1.0  0.0;
-                  offset:   -GENLIST_SIZE_16_INC    GENLIST_SIZE_6_INC;
-               }
-               rel2 {
-                  relative: 1.0  1.0;
-                  offset:   -GENLIST_SIZE_16_INC -GENLIST_SIZE_8_INC;
-               }
+            scale: 1;
+            GENLIST_DESCRIPTION_R( "elm.padding.icon2.right", min: 48 48; align: 0 0.5; )
+            description { state: "decorate" 0.0;
+               inherit: "default" 0.0;
+               align: 1 0.5;
             }
-          description { state: "disabled" 0.0;
-             inherit: "default" 0.0;
-             visible: 0;
-          }
-          description { state: "enabled" 0.0;
-             inherit: "default" 0.0;
-               align: 1.0 0.5;
-          }
-       }
-
-       part { name: "bottom_line";
-          type: RECT;
-          clip_to: "disclip";
-          mouse_events: 0;
-          description { state: "default" 0.0;
-             min: 0 0;
-             fixed: 0 1;
-             visible: 1;
-             color: GENLIST_PART_LIST_LINE_COLOR_INC;
-             rel1 {
-                relative: 0.0 1.0;
-                to_x: "elm.decorate_bg";
-                offset: 0 -1;
-             }
-          }
-          description {
-              state: "hide" 0.0;
-              inherit: "default" 0.0;
-              visible: 0;
-          }
-          description {
-              state: "enabled" 0.0;
-              inherit: "default" 0.0;
-              min: 0 GENLIST_SIZE_8_INC;
-              fixed: 0 1;
-          }
-       }
-       part { name: "reorder_glow_above";
-          mouse_events: 0;
-          description { state: "default" 0.0;
-             visible: 0;
-             rel1.relative: 0.0 -0.3;
-             rel2.relative: 1.0 0.0;
-             image {
-                normal: "01_list_reorder_bg_above.png";
-             }
-             fill.smooth: 0;
-          }
-          description { state: "reorder" 0.0;
-             inherit: "default" 0.0;
-             visible: 1;
-          }
-       }
-       part { name: "reorder_glow_below";
-          mouse_events: 0;
-          description { state: "default" 0.0;
-             visible: 0;
-             rel1.relative: 0.0 1.0;
-             rel2.relative: 1.0 1.3;
-             image {
-                normal: "01_list_reorder_bg_below.png";
-             }
-             fill.smooth: 0;
-          }
-          description { state: "reorder" 0.0;
-             inherit: "default" 0.0;
-             visible: 1;
-          }
-       }
-       GENLIST_PART_DISCLIP
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+         }
+         GENLIST_PART_PADDING_RIGHT_TO("elm.padding.icon2.right", "elm.padding.right", 16)
+         GENLIST_PART_DISCLIP
       }
       programs {
-         program { name:    "go_active";
-            signal:  "elm,state,selected";
-            source:  "elm";
-            action: STATE_SET "selected" 0.0;
-            target:  "elm.decorate_bg";
-         }
-         program { name:    "go_passive";
-            signal:  "elm,state,unselected";
-            source:  "elm";
-            action: STATE_SET "default" 0.0;
-            transition: LINEAR 0.1;
-            target:  "elm.decorate_bg";
-         }
-         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";
-         }
-         // decorate mode enable signal
-         program { name: "decorate_mode_enabled_effect";
+         GENLIST_PROGRAM_DISCLIP( ; )
+         GENLIST_PROGRAM_SELECT( ; )
+         GENLIST_PROGRAM_REORDER
+         program { name: "decorate_enabled_effect";
             signal: "elm,state,decorate,enabled,effect";
             source: "elm";
-            action: STATE_SET "enabled" 0.0;
+            action: STATE_SET "decorate" 0.0;
             transition: DECELERATE 0.7;
             target: "elm.edit.icon.1";
             target: "elm.edit.icon.2";
-            target: "bottom_line";
          }
-         program { name: "decorate_mode_disabled_effect";
+         program { name: "decorate_disabled_effect";
             signal: "elm,state,decorate,disabled,effect";
             source: "elm";
             action: STATE_SET "default" 0.0;
             transition: DECELERATE 0.7;
             target: "elm.edit.icon.1";
             target: "elm.edit.icon.2";
-            target: "bottom_line";
          }
-         program { name: "decorate_mode_enabled";
+         program { name: "decorate_enabled";
             signal: "elm,state,decorate,enabled";
             source: "elm";
-            action: STATE_SET "enabled" 0.0;
+            action: STATE_SET "decorate" 0.0;
             target: "elm.edit.icon.1";
             target: "elm.edit.icon.2";
-            target: "bottom_line";
          }
-         program { name: "decorate_mode_disabled";
+         program { name: "decorate_disabled";
             signal: "elm,state,decorate,disabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
             target: "elm.edit.icon.1";
             target: "elm.edit.icon.2";
-            target: "bottom_line";
          }
-
-         // reorder signal
-         program { name: "reorder_enabled";
-            signal: "elm,state,reorder,enabled";
-            source: "elm";
-            action: STATE_SET "reorder" 0.0;
-            target: "elm.padding.reorder";
-         }
-         program { name: "reorder_disabled";
-            signal: "elm,state,reorder,disabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.padding.reorder";
-         }
-
-         program { name: "reorder_enabled_effect";
-            signal: "elm,state,reorder_enabled_effect";
-            source: "elm";
-            action: STATE_SET "reorder" 0.0;
-            transition: DECELERATE 0.7;
-            target: "elm.padding.reorder";
-         }
-         program { name: "reorder_disabled_effect";
-            signal: "elm,state,reorder_disabled_effect";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            transition: DECELERATE 0.7;
-            target: "elm.padding.reorder";
-         }
-        // reorder glow
-        program {
-            name:    "show_reorder_glow";
-            signal:  "elm,action,item,reorder_start";
-            source:  "elm";
-            action:  STATE_SET "reorder" 0.0;
-            target:  "reorder_glow_above";
-            target:  "reorder_glow_below";
-        }
-        program {
-            name:    "hide_reorder_glow";
-            signal:  "elm,action,item,reorder_end";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            target:  "reorder_glow_above";
-            target:  "reorder_glow_below";
-        }
-        // flip
-        program {
-            name:    "enable_flip_mode";
-            signal:  "elm,state,flip,enabled";
-            source:  "elm";
-            action:  STATE_SET "disabled" 0.0;
-            target:  "elm.edit.icon.2";
-            after:   "enable_flip_mode_next";
-        }
-        program {
-            name:    "enable_flip_mode_next";
-            action:  STATE_SET "flipped" 0.0;
-            transition: DECELERATE 0.5;
-            target:  "elm.swallow.decorate.content";
-        }
-        program {
-            name:    "disable_flip_mode";
-            signal:  "elm,state,flip,disabled";
-            source:  "elm";
-            action:  STATE_SET "default" 0.0;
-            transition: DECELERATE 0.5;
-            target:  "elm.swallow.decorate.content";
-            target:  "elm.edit.icon.2";
-        }
+         GENLIST_PROGRAM_FLIP_TARGET( target: "elm.edit.icon.1"; target: "elm.edit.icon.2";,
+                                      target: "elm.swallow.decorate.content"; )
       }
    }
 
@@ -552,7 +265,7 @@
                inherit: "default" 0.0;
                visible: 0;
             }
-            description { state: "flipped" 0.0;
+            description { state: "flip_enabled" 0.0;
                inherit: "default" 0.0;
                rel1 {
                   relative: 0.0 1.0;
@@ -684,7 +397,7 @@
          }
 
          // decorate mode enable signal
-         program { name: "decorate_mode_enabled_effect";
+         program { name: "decorate_enabled_effect";
             signal: "elm,state,decorate,enabled,effect";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
@@ -693,7 +406,7 @@
             target: "elm.edit.icon.2";
             target: "bottom_line";
          }
-         program { name: "decorate_mode_disabled_effect";
+         program { name: "decorate_disabled_effect";
             signal: "elm,state,decorate,disabled,effect";
             source: "elm";
             action: STATE_SET "default" 0.0;
@@ -702,7 +415,7 @@
             target: "elm.edit.icon.2";
             target: "bottom_line";
          }
-         program { name: "decorate_mode_enabled";
+         program { name: "decorate_enabled";
             signal: "elm,state,decorate,enabled";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
@@ -710,7 +423,7 @@
             target: "elm.edit.icon.2";
             target: "bottom_line";
          }
-         program { name: "decorate_mode_disabled";
+         program { name: "decorate_disabled";
             signal: "elm,state,decorate,disabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
@@ -825,7 +538,7 @@
                   relative: 1.0 0.0;
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
            }
            description { state: "selected" 0.0;
                inherit: "default" 0.0;
@@ -1049,7 +762,7 @@
          }
 
          // decorate mode enable signal
-         program { name: "decorate_mode_enabled_effect";
+         program { name: "genlist_Part_Base";
             signal: "elm,state,decorate,enabled,effect";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
@@ -1057,7 +770,7 @@
             target: "elm.edit.icon.1";
             target: "elm.edit.icon.2";
          }
-         program { name: "decorate_mode_disabled_effect";
+         program { name: "decorate_disabled_effect";
             signal: "elm,state,decorate,disabled,effect";
             source: "elm";
             action: STATE_SET "default" 0.0;
@@ -1065,14 +778,14 @@
             target: "elm.edit.icon.1";
             target: "elm.edit.icon.2";
          }
-         program { name: "decorate_mode_enabled";
+         program { name: "decorate_enabled";
             signal: "elm,state,decorate,enabled";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
             target: "elm.edit.icon.1";
             target: "elm.edit.icon.2";
          }
-         program { name: "decorate_mode_disabled";
+         program { name: "decorate_disabled";
             signal: "elm,state,decorate,disabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
@@ -1143,7 +856,7 @@
                   relative: 1.0 0.0;
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
            }
         }
          part { name: "elm.swallow.decorate.content";
@@ -1285,7 +998,7 @@
          }
 
          // decorate mode enable signal
-         program { name: "decorate_mode_enabled_effect";
+         program { name: "decorate_enabled_effect";
             signal: "elm,state,decorate,enabled,effect";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
@@ -1293,7 +1006,7 @@
             target: "elm.base.icon";
             target: "elm.edit.icon";
          }
-         program { name: "decorate_mode_disabled_effect";
+         program { name: "decorate_disabled_effect";
             signal: "elm,state,decorate,disabled,effect";
             source: "elm";
             action: STATE_SET "default" 0.0;
@@ -1301,14 +1014,14 @@
             target: "elm.base.icon";
             target: "elm.edit.icon";
          }
-         program { name: "decorate_mode_enabled";
+         program { name: "decorate_enabled";
             signal: "elm,state,decorate,enabled";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
             target: "elm.base.icon";
             target: "elm.edit.icon";
          }
-         program { name: "decorate_mode_disabled";
+         program { name: "decorate_disabled";
             signal: "elm,state,decorate,disabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
@@ -1374,7 +1087,7 @@
                   relative: 1.0 0.0;
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
            }
         }
          part { name: "elm.swallow.decorate.content";
@@ -1519,7 +1232,7 @@
          }
 
          // decorate mode enable signal
-         program { name: "decorate_mode_enabled_effect";
+         program { name: "decorate_enabled_effect";
             signal: "elm,state,decorate,enabled,effect";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
@@ -1527,7 +1240,7 @@
             target: "elm.base.icon";
             target: "elm.edit.icon";
          }
-         program { name: "decorate_mode_disabled_effect";
+         program { name: "decorate_disabled_effect";
             signal: "elm,state,decorate,disabled,effect";
             source: "elm";
             action: STATE_SET "default" 0.0;
@@ -1535,14 +1248,14 @@
             target: "elm.base.icon";
             target: "elm.edit.icon";
          }
-         program { name: "decorate_mode_enabled";
+         program { name: "decorate_enabled";
             signal: "elm,state,decorate,enabled";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
             target: "elm.base.icon";
             target: "elm.edit.icon";
          }
-         program { name: "decorate_mode_disabled";
+         program { name: "decorate_disabled";
             signal: "elm,state,decorate,disabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
@@ -1608,7 +1321,7 @@
                   relative: 1.0 0.0;
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
            }
         }
          part { name: "elm.swallow.decorate.content";
@@ -1707,8 +1420,7 @@
             target: "disclip";
          }
 
-         // decorate mode enable signal
-         program { name: "decorate_mode_enabled_effect";
+         program { name: "decorate_enabled_effect";
             signal: "elm,state,decorate,enabled,effect";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
@@ -1716,7 +1428,7 @@
             target: "elm.base.icon";
             target: "elm.edit.icon";
          }
-         program { name: "decorate_mode_disabled_effect";
+         program { name: "decorate_disabled_effect";
             signal: "elm,state,decorate,disabled,effect";
             source: "elm";
             action: STATE_SET "default" 0.0;
@@ -1724,14 +1436,14 @@
             target: "elm.base.icon";
             target: "elm.edit.icon";
          }
-         program { name: "decorate_mode_enabled";
+         program { name: "decorate_enabled";
             signal: "elm,state,decorate,enabled";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
             target: "elm.base.icon";
             target: "elm.edit.icon";
          }
-         program { name: "decorate_mode_disabled";
+         program { name: "decorate_disabled";
             signal: "elm,state,decorate,disabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
@@ -1797,7 +1509,7 @@
                   relative: 1.0 0.0;
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
            }
         }
          part { name: "elm.swallow.decorate.content";
@@ -1923,7 +1635,7 @@
          }
 
          // decorate mode enable signal
-         program { name: "decorate_mode_enabled_effect";
+         program { name: "decorate_enabled_effect";
             signal: "elm,state,decorate,enabled,effect";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
@@ -1931,7 +1643,7 @@
             target: "elm.base.icon";
             target: "elm.edit.icon";
          }
-         program { name: "decorate_mode_disabled_effect";
+         program { name: "decorate_disabled_effect";
             signal: "elm,state,decorate,disabled,effect";
             source: "elm";
             action: STATE_SET "default" 0.0;
@@ -1939,14 +1651,14 @@
             target: "elm.base.icon";
             target: "elm.edit.icon";
          }
-         program { name: "decorate_mode_enabled";
+         program { name: "decorate_enabled";
             signal: "elm,state,decorate,enabled";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
             target: "elm.base.icon";
             target: "elm.edit.icon";
          }
-         program { name: "decorate_mode_disabled";
+         program { name: "decorate_disabled";
             signal: "elm,state,decorate,disabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
@@ -2012,7 +1724,7 @@
                   relative: 1.0 0.0;
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
            }
         }
          part { name: "elm.swallow.decorate.content";
@@ -2154,7 +1866,7 @@
          }
 
          // decorate mode enable signal
-         program { name: "decorate_mode_enabled_effect";
+         program { name: "decorate_enabled_effect";
             signal: "elm,state,decorate,enabled,effect";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
@@ -2162,7 +1874,7 @@
             target: "elm.base.icon";
             target: "elm.edit.icon";
          }
-         program { name: "decorate_mode_disabled_effect";
+         program { name: "decorate_disabled_effect";
             signal: "elm,state,decorate,disabled,effect";
             source: "elm";
             action: STATE_SET "default" 0.0;
@@ -2170,14 +1882,14 @@
             target: "elm.base.icon";
             target: "elm.edit.icon";
          }
-         program { name: "decorate_mode_enabled";
+         program { name: "decorate_enabled";
             signal: "elm,state,decorate,enabled";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
             target: "elm.base.icon";
             target: "elm.edit.icon";
          }
-         program { name: "decorate_mode_disabled";
+         program { name: "decorate_disabled";
             signal: "elm,state,decorate,disabled";
             source: "elm";
             action: STATE_SET "default" 0.0;
@@ -2303,10 +2015,10 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -2314,7 +2026,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
          }
        GENLIST_PART_DISCLIP
@@ -2445,10 +2157,10 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -2456,7 +2168,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
          }
        GENLIST_PART_DISCLIP
@@ -2550,7 +2262,7 @@
                   relative: 1.0 0.0;
                   to_y: "elm.padding.bottom";
                }
-             color: GENLIST_PART_BG_COLOR_INC;
+             color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
@@ -2738,7 +2450,7 @@
             target: "disclip";
          }
          // decorate mode enable signal
-         program { name: "decorate_mode_enabled_effect";
+         program { name: "decorate_enabled_effect";
             signal: "elm,state,decorate,enabled,effect";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
@@ -2746,7 +2458,7 @@
             target: "elm.edit.icon.1";
             target: "bottom_line";
          }
-         program { name: "decorate_mode_disabled_effect";
+         program { name: "decorate_disabled_effect";
             signal: "elm,state,decorate,disabled,effect";
             source: "elm";
             action: STATE_SET "default" 0.0;
@@ -2754,14 +2466,14 @@
             target: "elm.edit.icon.1";
             target: "bottom_line";
          }
-         program { name: "decorate_mode_enabled";
+         program { name: "decorate_enabled";
             signal: "elm,state,decorate,enabled";
             source: "elm";
             action: STATE_SET "enabled" 0.0;
             target: "elm.edit.icon.1";
             target: "bottom_line";
          }
-         program { name: "decorate_mode_disabled";
+         program { name: "decorate_disabled";
             signal: "elm,state,decorate,disabled";
             source: "elm";
             action: STATE_SET "default" 0.0;

diff --git a/themes/widgets/genlist/genlist_expandable.edc b/themes/widgets/genlist/genlist_expandable.edc
index fa3778f..56b551a 100644 (file)
--- a/themes/widgets/genlist/genlist_expandable.edc
+++ b/themes/widgets/genlist/genlist_expandable.edc
@@ -115,10 +115,10 @@
                   relative: 0.0 1.0; \
                   to_x: "elm.padding.arrow.left"; \
                } \
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD; \
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR; \
                text { \
                   font: "SLP:style=Roman"; \
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT; \
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE; \
                   min: 0 1; \
                   align: 0.0 0.5; \
                   text_class: "list_item"; \
@@ -126,7 +126,7 @@
             } \
             description { state: "selected" 0.0; \
                inherit: "default" 0.0; \
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC; \
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR; \
             } \
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
@@ -306,10 +306,10 @@
                   relative: 0.0  1.0; \
                   offset:   0   0; \
                } \
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD; \
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR; \
                text { \
                   font: "SLP:style=Roman"; \
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT; \
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE; \
                   min: 0 1; \
                   align: 0.0 0.5; \
                   text_class: "list_item"; \
@@ -317,7 +317,7 @@
             } \
             description { state: "selected" 0.0; \
                inherit: "default" 0.0; \
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC; \
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR; \
             } \
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
@@ -424,10 +424,10 @@
    }
 
 /* legacy styles */
-GENLIST_EXPANDABLE_TREE_GROUP("expandable", GENLIST_PART_BG_COLOR_INC, GENLIST_PADDING_32_INC)
+GENLIST_EXPANDABLE_TREE_GROUP("expandable", GENLIST_PART_DIALOGUE_GROUP_BG_COLOR, GENLIST_PADDING_32_INC)
 GENLIST_EXPANDABLE_TREE_GROUP("expandable2", GENLIST_PART_EXPANDABLE_2ND_DEPTH_BG_COLOR_INC, GENLIST_PADDING_32_INC)
 
-GENLIST_EXPANDABLE_ITEM_GROUP("expandable", GENLIST_PART_BG_COLOR_INC, GENLIST_PADDING_16_INC)
+GENLIST_EXPANDABLE_ITEM_GROUP("expandable", GENLIST_PART_DIALOGUE_GROUP_BG_COLOR, GENLIST_PADDING_16_INC)
 GENLIST_EXPANDABLE_ITEM_GROUP("expandable2", GENLIST_PART_EXPANDABLE_2ND_DEPTH_BG_COLOR_INC, GENLIST_PADDING_16_INC)
 GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_PART_EXPANDABLE_3ND_DEPTH_BG_COLOR_INC, GENLIST_PADDING_16_INC)
 
@@ -455,7 +455,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_129_INC, GENLIST_PART_BG_COLOR_INC)
+         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_129_INC, GENLIST_PART_DIALOGUE_GROUP_BG_COLOR)
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
@@ -544,10 +544,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   to_x: "elm.padding.arrow.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Regular";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -555,7 +555,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -708,7 +708,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_129_INC, GENLIST_PART_BG_COLOR_INC)
+         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_129_INC, GENLIST_PART_DIALOGUE_GROUP_BG_COLOR)
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
@@ -797,10 +797,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   to_x: "elm.padding.arrow.left";
                   to_y: "elm.padding.top";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Regular";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -808,7 +808,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -830,7 +830,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   to_x: "elm.padding.arrow.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -841,7 +841,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -1004,7 +1004,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_129_INC, GENLIST_PART_BG_COLOR_INC )
+         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_129_INC, GENLIST_PART_DIALOGUE_GROUP_BG_COLOR )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
@@ -1093,10 +1093,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   to_x: "elm.padding.arrow.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Regular";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_regular";
@@ -1104,7 +1104,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -1126,7 +1126,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   to_x: "elm.padding.arrow.left";
                   to_y: "elm.text.1";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -1137,7 +1137,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -1300,7 +1300,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_129_INC, GENLIST_PART_BG_COLOR_INC )
+         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_129_INC, GENLIST_PART_DIALOGUE_GROUP_BG_COLOR )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
@@ -1389,10 +1389,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   to_x: "elm.padding.arrow.left";
                   to_y: "elm.padding.top";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Regular";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -1400,7 +1400,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -1422,7 +1422,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   to_x: "elm.padding.arrow.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -1433,7 +1433,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -1597,7 +1597,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_129_INC, GENLIST_PART_BG_COLOR_INC )
+         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_129_INC, GENLIST_PART_DIALOGUE_GROUP_BG_COLOR )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
@@ -1720,10 +1720,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   to_x: "elm.padding.arrow.left";
                   to_y: "elm.padding.top";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Regular";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -1731,7 +1731,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -1753,7 +1753,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   to_x: "elm.padding.arrow.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -1764,7 +1764,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -2017,10 +2017,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   relative: 0.0 1.0;
                   to_x: "elm.padding.arrow.left";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Regular";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -2028,7 +2028,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -2182,7 +2182,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
       }
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
-         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_129_INC, GENLIST_PART_BG_COLOR_INC )
+         GENLIST_EXPANDABLE_PART_BASE( GENLIST_HEIGHT_129_INC, GENLIST_PART_DIALOGUE_GROUP_BG_COLOR )
          GENLIST_PART_BOTTOM_EFFECT_LINE
          GENLIST_PART_PADDING_TOP( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_BOTTOM( GENLIST_PADDING_10_INC )
@@ -2314,10 +2314,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   to_x: "elm.padding.arrow.left";
                   to_y: "elm.padding.top";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Regular";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -2325,7 +2325,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -2347,7 +2347,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   to_x: "elm.padding.arrow.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -2358,7 +2358,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -2552,10 +2552,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   relative: 0.0  1.0;
                   offset:   0   0;
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Regular";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -2563,7 +2563,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -2742,10 +2742,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   relative: 0.0  1.0;
                   to_x: "elm.padding.right";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Regular";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -2753,7 +2753,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -2940,10 +2940,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   relative: 0.0  1.0;
                   to_x: "elm.padding.right";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Regular";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -2951,7 +2951,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -3174,10 +3174,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   relative: 0.0  1.0;
                   to_x: "elm.padding.right";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Regular";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -3185,7 +3185,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -3346,10 +3346,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   relative: 0.0  1.0;
                   offset:   0   0;
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Regular";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -3357,7 +3357,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -3502,10 +3502,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   relative: 0.0  1.0;
                   offset:   0   0;
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Regular";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -3513,7 +3513,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
@@ -3710,7 +3710,7 @@ 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_1LINE, GENLIST_PART_BG_COLOR_INC )
+         GENLIST_EXPANDABLE_PART_BASE_NEW( GENLIST_HEIGHT_1LINE, GENLIST_PART_DIALOGUE_GROUP_BG_COLOR )
          GENLIST_PART_BOTTOM_LINE
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
@@ -3799,10 +3799,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -3810,7 +3810,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("1text/expandable3", GENLIST_PART_EXPANDABLE_3ND_D
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
          }
          GENLIST_PART_DISCLIP

diff --git a/themes/widgets/genlist/genlist_groupindex.edc b/themes/widgets/genlist/genlist_groupindex.edc
index a9bbdd2..b1f8e1a 100644 (file)
--- a/themes/widgets/genlist/genlist_groupindex.edc
+++ b/themes/widgets/genlist/genlist_groupindex.edc
@@ -37,7 +37,7 @@
          image: "00_index list_bg.png" COMP;
       }
       parts {
-         GENLIST_PART_INDEX_LIST_BASE_EVENT_INC
+         GENLIST_PART_BASE_EVENT_OFF
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          part { name: "rect";
@@ -69,10 +69,10 @@
                   offset: 0 0;
                   to_x: "elm.padding.right";
                }
-               color: GENLIST_TEXT_COLOR_INDEX_LIST;
+               color: GENLIST_INDEX_LIST_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: GENLIST_INDEX_LIST_SIZE;
                   min: 1 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -121,7 +121,7 @@
             scale: 1;
             description { state: "default" 0.0;
                min: 0 GENLIST_HEIGHT_62_INC;
-               color: GENLIST_PART_LIST_BG_COLOR_INC;
+               color: GENLIST_PART_LIST_BG_COLOR;
             }
          }
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_24_INC )
@@ -180,7 +180,7 @@
             scale: 1;
             description { state: "default" 0.0;
                min: 0 GENLIST_HEIGHT_62_INC;
-               color: GENLIST_PART_LIST_BG_COLOR_INC;
+               color: GENLIST_PART_LIST_BG_COLOR;
             }
          }
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_24_INC )

diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc
index 0d8c0f4..0e4223a 100644 (file)
--- a/themes/widgets/genlist/genlist_macro.edc
+++ b/themes/widgets/genlist/genlist_macro.edc
@@ -43,18 +43,21 @@
 #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_GROUP_TITLE_PADDING_TOP_SIZE 36
+#define GENLIST_DIALOGUE_GROUP_TITLE_PADDING_BOTTOM_SIZE 10
+#define GENLIST_DIALOGUE_GROUP_TITLE_TEXT_HEIGHT 36
+#define GENLIST_DIALOGUE_GROUP_TITLE_HEIGHT GENLIST_DIALOGUE_GROUP_TITLE_PADDING_TOP_SIZE + GENLIST_DIALOGUE_GROUP_TITLE_PADDING_BOTTOM_SIZE + GENLIST_DIALOGUE_GROUP_TITLE_TEXT_HEIGHT
 
 #define GENLIST_DIALOGUE_SEPARATOR_DEFAULT_HEIGHT 40
-
-
-#define GENLIST_DESCRIPT_DEFAULT( left, right, top, bottom ) \
+#define GENLIST_DIALOGUE_ITEM_WIDTH 10
+
+// EDJE description have 24 patterns
+//      |   top  |
+// ---------------------
+// left |  HERE  | right
+// ---------------------
+//      | bottom |
+#define GENLIST_DESCRIPTION( left, right, top, bottom, param ) \
       description { state: "default" 0.0;\
          rel1 { \
             relative: 1 1; \
@@ -66,9 +69,69 @@
             to_x: right;\
             to_y: bottom;\
          }\
+         param\
+      }
+
+// ---------------------
+// left |--> HERE
+// ---------------------
+#define GENLIST_DESCRIPTION_L( left, param ) \
+      description { state: "default" 0.0;\
+         align: 0 0.5; \
+         fixed: 1 0; \
+         rel1 { \
+            relative: 1 0; \
+            to_x: left; \
+            to_y: "base"; \
+         }\
+         rel2 { \
+            relative: 1 1;\
+            to_x: left; \
+            to_y: "base"; \
+         }\
+         param\
+      }
+
+// ---------------------
+//   HERE  <--| right
+// ---------------------
+#define GENLIST_DESCRIPTION_R( right, param ) \
+      description { state: "default" 0.0;\
+         align: 1 0.5; \
+         fixed: 1 0; \
+         rel1 { \
+            relative: 0 0; \
+            to_x: right; \
+            to_y: "base"; \
+         }\
+         rel2 {\
+            relative: 0 1;\
+            to_x: right; \
+            to_y: "base"; \
+         }\
+         param\
+      }
 
-#define GENLIST_DESCRIPT_DOT_LT( left, top ) \
+// --------------------------
+// left |--> HERE  <--| right
+// --------------------------
+#define GENLIST_DESCRIPTION_LR( left, right, param ) \
       description { state: "default" 0.0;\
+         rel1 { \
+            relative: 1 0; \
+            to_x: left; \
+            to_y: "base"; \
+         }\
+         rel2 {\
+            relative: 0 1;\
+            to_x: right;\
+            to_y: "base"; \
+         }\
+         param\
+      }
+
+#define GENLIST_DESCRIPT_DOT_LT( NAME, left, top, param ) \
+      description { state: NAME 0.0;\
          align: 0 0;\
          rel1 { \
             relative: 1 1; \
@@ -80,9 +143,11 @@
             to_x: left;\
             to_y: top;\
          }\
+         param\
+      }
 
-#define GENLIST_DESCRIPT_DOT_RT( right, top ) \
-      description { state: "default" 0.0;\
+#define GENLIST_DESCRIPT_DOT_RT( NAME, right, top, param ) \
+      description { state: NAME 0.0;\
          align: 1 0;\
          rel1 { \
             relative: 0 1; \
@@ -94,9 +159,11 @@
             to_x: right;\
             to_y: top;\
          }\
+         param\
+      }
 
-#define GENLIST_DESCRIPT_DOT_LB( left, bottom ) \
-      description { state: "default" 0.0;\
+#define GENLIST_DESCRIPT_DOT_LB( NAME, left, bottom, param ) \
+      description { state: NAME 0.0;\
          align: 0 1;\
          rel1 { \
             relative: 1 0; \
@@ -108,9 +175,11 @@
             to_x: left;\
             to_y: bottom;\
          }\
+         param\
+      }\
 
-#define GENLIST_DESCRIPT_DOT_RB( right, bottom ) \
-      description { state: "default" 0.0;\
+#define GENLIST_DESCRIPT_DOT_RB( NAME, right, bottom, param ) \
+      description { state: NAME 0.0;\
          align: 1 1;\
          rel1 { \
             relative: 0 0; \
@@ -122,9 +191,11 @@
             to_x: right;\
             to_y: bottom;\
          }\
+         param\
+      }
 
-#define GENLIST_DESCRIPT_LINE_LEFT( left, top, bottom ) \
-      description { state: "default" 0.0;\
+#define GENLIST_DESCRIPT_LINE_LEFT( NAME, left, top, bottom, param ) \
+      description { state: NAME 0.0;\
          align: 0 0.5;\
          rel1 { \
             relative: 1 1; \
@@ -136,9 +207,11 @@
             to_x: left;\
             to_y: bottom;\
          }\
+         param\
+      }
 
-#define GENLIST_DESCRIPT_LINE_RIGHT( right, top, bottom ) \
-      description { state: "default" 0.0;\
+#define GENLIST_DESCRIPT_LINE_RIGHT( NAME, right, top, bottom, param ) \
+      description { state: NAME 0.0;\
          align: 1 0.5;\
          rel1 { \
             relative: 0 1; \
@@ -150,9 +223,11 @@
             to_x: right;\
             to_y: bottom;\
          }\
+         param\
+      }
 
-#define GENLIST_DESCRIPT_LINE_TOP( left,  right, top ) \
-      description { state: "default" 0.0;\
+#define GENLIST_DESCRIPT_LINE_TOP( NAME, left, right, top, param ) \
+      description { state: NAME 0.0;\
          align: 0.5 0;\
          rel1 { \
             relative: 1 1; \
@@ -164,9 +239,11 @@
             to_x: right;\
             to_y: top;\
          }\
+         param\
+      }
 
-#define GENLIST_DESCRIPT_LINE_BOTTOM( left,  right, bottom ) \
-      description { state: "default" 0.0;\
+#define GENLIST_DESCRIPT_LINE_BOTTOM( NAME, left, right, bottom, param ) \
+      description { state: NAME 0.0;\
          align: 0.5 1;\
          rel1 { \
             relative: 1 0; \
@@ -178,45 +255,81 @@
             to_x: right;\
             to_y: bottom;\
          }\
+         param\
+      }
 
-#define GENLIST_PADDING(NAME, SIZE_X, SIZE_Y, DESCRIPT) \
+#define GENLIST_PADDING(NAME, DESCRIPT) \
        part { name: NAME; \
             type: RECT; \
             scale: 1; \
             DESCRIPT \
-               min: SIZE_X SIZE_Y; \
-               fixed: 1 1; \
-               visible: 0; \
-            }\
-       } \
-
+       }
 
 // *************** Function Macro ******************* //
-#define GENLIST_PART_BASE( param_item_height ) \
+#define GENLIST_PART_BASE( 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; \
+               min: 0 HEIGHT; \
+               align: 0.5 0.5; \
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR; \
             } \
          }
 
-#define GENLIST_PART_BASE_BG( param_item_height ) \
+#define GENLIST_PART_BASE_REORDER( 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; \
+               min: 0 HEIGHT; \
+               align: 0 0; \
+               color: 0 0 0 0;\
+               rel1 { \
+                  relative: 1 1; \
+                  to_x: "reorder.padding.left"; \
+                  to_y: "reorder.padding.top"; \
+               } \
+            } \
+         } \
+         part { name: "reorder.padding.left"; \
+            type: RECT; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               visible: 0; \
+               rel2.relative: 0 1; \
+               align: 0 0.5; \
+            } \
+            description { state: "reorder" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+               fixed: 1 0; \
+               min: 16 0; \
+               color: GENLIST_PART_REORDER_BG_COLOR; \
+            } \
+         } \
+       part { name: "reorder.padding.top"; \
+            type: RECT; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               visible: 0; \
+               rel2.relative: 1 0; \
+               align: 0.5 0; \
+            } \
+            description { state: "reorder" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+               fixed: 0 1; \
+               min: 0 8; \
+               color: GENLIST_PART_REORDER_BG_COLOR; \
             } \
          }
 
-/// This block events
+/// Why is this needed??? (event block??)
 #define GENLIST_PART_BASE_EVENT_OFF \
-         part { name: "base_event";\
+         part { name: "base";\
             type: RECT;\
             repeat_events: 0;\
             description { state: "default" 0.0;\
@@ -224,13 +337,47 @@
             }\
          }
 
+#define GENLIST_PART_BOTTOM_LINE \
+         part { name: "bottom_line"; \
+            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; \
+               } \
+            } \
+            description { state: "reorder" 0.0; \
+               inherit: "default" 0.0; \
+               color: 0 0 0 0; \
+            } \
+         }
+
+#define GENLIST_PART_BG_IMAGE \
+         part { name: "bg_image"; \
+            type: RECT; \
+            clip_to: "disclip"; \
+            mouse_events: 0; \
+            description { state: "default" 0.0; \
+               color: GENLIST_PART_LIST_BG_COLOR; \
+            } \
+            description { state: "selected" 0.0; \
+               inherit: "default" 0.0; \
+               color: GENLIST_PART_LIST_PRESS_COLOR_INC; \
+            } \
+         }
+
 #define GENLIST_PART_BG \
          part { name: "bg"; \
             type: RECT; \
             clip_to: "disclip"; \
             mouse_events: 0; \
             description { state: "default" 0.0; \
-               color: GENLIST_PART_BG_COLOR_INC; \
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR; \
             } \
             description { state: "hide" 0.0; \
                inherit: "default" 0.0; \
@@ -254,36 +401,6 @@
             } \
          }
 
-#define GENLIST_PART_BG_IMAGE \
-         part { name: "bg_image"; \
-            type: RECT; \
-            clip_to: "disclip"; \
-            mouse_events: 0; \
-            description { state: "default" 0.0; \
-               color: GENLIST_PART_LIST_BG_COLOR_INC; \
-            } \
-            description { state: "selected" 0.0; \
-               inherit: "default" 0.0; \
-               color: GENLIST_PART_LIST_PRESS_COLOR_INC; \
-            } \
-         }
-
-#define GENLIST_PART_BOTTOM_LINE \
-         part { name: "bottom_line"; \
-            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; \
-               } \
-            } \
-         }
-
 #define GENLIST_PART_BOTTOM_EFFECT_LINE \
          part { name: "bottom_line"; \
             type: RECT; \
@@ -302,8 +419,8 @@
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          }
 
-#define GENLIST_PART_PADDING_TOP( param_padding_size ) \
-       part { name: "elm.padding.top"; \
+#define GENLIST_PART_PADDING_TEXT_TOP( param_padding_size ) \
+       part { name: "elm.padding.text.top"; \
             type: RECT; \
             scale: 1; \
             description { \
@@ -316,72 +433,173 @@
             } \
          }
 
-#define GENLIST_PART_PADDING_TEXT_TOP( param_padding_size ) \
-       part { name: "elm.padding.text.top"; \
+
+#define GENLIST_PART_PADDING( NAME, SIZE, REL1, REL2 ) \
+       part { name: NAME; \
             type: RECT; \
             scale: 1; \
-            description { \
-               state: "default" 0.0; \
-               min: 0 param_padding_size; \
-               fixed: 0 1; \
+            description { state: "default" 0.0; \
+               min: SIZE 0; \
+               fixed: 1 0; \
                visible: 0; \
-               rel2.relative: 1.0 0.0; \
-               align: 0.0 0.0; \
+               align: 0.5 0.5; \
+               rel1 { \
+                  relative: REL1; \
+                  to: "base"; \
+               } \
+               rel2 { \
+                  relative: REL2; \
+                  to: "base"; \
+               } \
             } \
          }
 
-#define GENLIST_PART_PADDING_BOTTOM( param_padding_size ) \
-       part { name: "elm.padding.bottom"; \
+#define GENLIST_PART_PADDING_LEFT( SIZE ) \
+         part { name: "elm.padding.left"; \
             type: RECT; \
             scale: 1; \
             description { state: "default" 0.0; \
-               min: 0 param_padding_size; \
-               fixed: 0 1; \
+               min: SIZE 0; \
+               max: SIZE 0; \
+               fixed: 1 0; \
                visible: 0; \
-               rel1.relative: 0.0 1.0; \
-               align: 1.0 1.0; \
+               align: 0.0 0.5; \
+               rel1.to: "base"; \
+               rel2.to: "base"; \
+               rel2.relative: 0.0 1.0; \
             } \
          }
 
-#define GENLIST_PART_PADDING_LEFT( param_padding_size ) \
-         part { name: "elm.padding.left"; \
+#define GENLIST_PART_PADDING_LEFT_TO( NAME, LEFT, SIZE ) \
+       part { name: NAME; \
             type: RECT; \
             scale: 1; \
             description { state: "default" 0.0; \
-               min: param_padding_size 0; \
+               min: SIZE 0; \
                fixed: 1 0; \
                visible: 0; \
-               rel2.relative: 0.0 1.0; \
-               align: 0.0 0.0; \
+               align: 0 0.5; \
+               rel1 { \
+                  relative: 1 0.5; \
+                  to_x: LEFT; \
+                  to_y: LEFT; \
+               } \
+               rel2 { \
+                  relative: 1 0.5; \
+                  to_x: LEFT; \
+                  to_y: LEFT; \
+               } \
             } \
          }
 
-#define GENLIST_PART_PADDING_RIGHT( param_padding_size ) \
+#define GENLIST_PART_PADDING_RIGHT( SIZE ) \
        part { name: "elm.padding.right"; \
             type: RECT; \
             scale: 1; \
             description { state: "default" 0.0; \
-               min: param_padding_size 0; \
+               min: SIZE 0; \
+               max: SIZE 0; \
                fixed: 1 0; \
                visible: 0; \
-               rel1.relative: 1.0  0.0; \
-               align: 1.0 0.0; \
+               align: 1.0 0.5; \
+               rel1.to: "base"; \
+               rel2.to: "base"; \
+               rel1.relative: 1 0; \
             } \
          }
 
-#define GENLIST_DIALOGUE_PART_BASE( param_item_height ) \
-         part { name: "base_part"; \
+#define GENLIST_PART_PADDING_RIGHT_TO( NAME, RIGHT, SIZE ) \
+       part { name: NAME; \
             type: RECT; \
-            clip_to: "disclip"; \
-            repeat_events: 1; \
             scale: 1; \
             description { state: "default" 0.0; \
-               min: 0 param_item_height; \
-               color: LAYOUT_GROUP_LIST_BG_COLOR_INC; \
+               min: SIZE 0; \
+               fixed: 1 0; \
+               visible: 0; \
+               align: 1 0.5; \
+               rel1 { \
+                  relative: 0 0.5; \
+                  to: RIGHT; \
+               } \
+               rel2 { \
+                  relative: 0 0.5; \
+                  to: RIGHT; \
+               } \
+            } \
+         }
+
+#define GENLIST_PART_PADDING_TOP( SIZE ) \
+       part { name: "elm.padding.top"; \
+            type: RECT; \
+            scale: 1; \
+            description { \
+               state: "default" 0.0; \
+               min: 0 SIZE; \
+               fixed: 0 1; \
+               visible: 0; \
+               rel1.to: "base"; \
+               rel2.to: "base"; \
+               rel2.relative: 1.0 0.0; \
+               align: 0.5 0.0; \
+            } \
+         }
+
+#define GENLIST_PART_PADDING_TOP_TO( NAME, TOP, SIZE ) \
+       part { name: NAME; \
+            type: RECT; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: 0 SIZE; \
+               fixed: 0 1; \
+               visible: 0; \
+               align: 0.5 0; \
+               rel1 { \
+                  relative: 0.5 1; \
+                  to: TOP; \
+               } \
+               rel2 { \
+                  relative: 0.5 1; \
+                  to: TOP; \
+               } \
+            } \
+         }
+
+#define GENLIST_PART_PADDING_BOTTOM( SIZE ) \
+       part { name: "elm.padding.bottom"; \
+            type: RECT; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: 0 SIZE; \
+               fixed: 0 1; \
+               visible: 0; \
+               color: 0 0 0 0; \
+               rel1.to: "base"; \
+               rel2.to: "base"; \
+               rel1.relative: 0.0 1.0; \
+               align: 0.5 1.0; \
+            } \
+         }
+
+#define GENLIST_PART_PADDING_BOTTOM_TO( NAME, BOTTOM, SIZE ) \
+       part { name: NAME; \
+            type: RECT; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: 0 SIZE; \
+               fixed: 0 1; \
+               visible: 0; \
+               align: 0.5 1; \
+               rel1 { \
+                  relative: 0.5 0; \
+                  to: BOTTOM; \
+               } \
+               rel2 { \
+                  relative: 0.5 0; \
+                  to: BOTTOM; \
+               } \
             } \
          }
 
-// FIXME: Use above instead
 #define GENLIST_PART_DIALOGUE_BASE( param_item_height ) \
          part { name: "base"; \
             type: RECT; \
@@ -501,13 +719,13 @@
                part { name: "point"; \
                        type: RECT; \
                        scale: 1; \
-                        description { \
-                                state: "default" 0.0; \
-                                color: 0 0 0 0; \
-                                rel1 { relative: 0.0 0.0; } \
-                                rel2 { relative: 1.0 0.0; } \
-                        } \
-                }
+         description { \
+            state: "default" 0.0; \
+            color: 0 0 0 0; \
+            rel1 { relative: 0.0 0.0; } \
+            rel2 { relative: 1.0 0.0; } \
+         } \
+      }
 
 #define GENLIST_PART_MAP_START( param_x, param_y, param_z ) \
                description { state: "map_transition" 0.0; \
@@ -559,7 +777,7 @@
             scale: 1; \
             description { state: "default" 0.0; \
                min: 0 param_item_height; \
-               color: GENLIST_PART_BG_COLOR_INC; \
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR; \
             } \
             GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
             GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
@@ -773,50 +991,95 @@
             } \
          }
 
+// 2.2.7 Genlist_Edit mode (Rename)
 #define GENLIST_PART_FLIP \
-         part { name: "elm.flip.icon"; \
-            clip_to: "disclip"; \
-            type: SWALLOW; \
+         part { name: "flip_event_block";\
+            type: RECT;\
+            mouse_events: 0; \
+            repeat_events: 0;\
+            description { state: "default" 0.0;\
+               visible: 0; \
+               color: 0 0 0 0; \
+            } \
+            description { state: "flip_enabled" 0.0; \
+               inherit: "default" 0.0; \
+               visible: 1; \
+               color: GENLIST_PART_FLIP_BG_COLOR;\
+            }\
+         }\
+         part { name: "elm.flip.content.left"; \
+            type: RECT; \
             scale: 1; \
             description { state: "default" 0.0; \
+               min: 16 0; \
+               fixed: 1 0; \
                visible: 0; \
-               fixed: 1 1; \
-               align: 1 0; \
-               min: 80 0; \
+               align: 0 0.5; \
                rel1 { \
-                  relative: 0.0  0.0; \
-                  to_x: "elm.padding.right"; \
+                  relative: 0 0; \
+                  to_x: "base"; \
+                  to_y: "base"; \
                } \
                rel2 { \
-                  relative: 0.0  1.0; \
-                  to_x: "elm.padding.right"; \
+                  relative: 0 1; \
+                  to_x: "base"; \
+                  to_y: "base"; \
                } \
             } \
+         } \
+         part { name: "elm.flip.content"; \
+            clip_to: "disclip"; \
+            type: SWALLOW; \
+            scale: 1; \
+            GENLIST_DESCRIPTION_LR("elm.flip.content.left", "elm.flip.icon.left", fixed: 1 1; visible: 0;) \
             description { state: "flip_enabled" 0.0; \
                inherit: "default" 0.0; \
                visible: 1; \
             } \
          } \
-         part { name: "elm.flip.content"; \
+         GENLIST_PART_PADDING_RIGHT_TO("elm.flip.icon.left", "elm.flip.icon", 16) \
+         part { name: "elm.flip.icon"; \
             clip_to: "disclip"; \
             type: SWALLOW; \
             scale: 1; \
             description { state: "default" 0.0; \
                visible: 0; \
                fixed: 1 1; \
+               align: 1 0.5; \
+               max: 132 72; \
                rel1 { \
-                  relative: 1.0  0.5; \
-                  to_x: "elm.padding.left"; \
+                  relative: 0 0; \
+                  to_x: "elm.flip.icon.right"; \
                } \
                rel2 { \
-                  relative: 0.0  0.5; \
-                  to_x: "elm.flip.icon"; \
+                  relative: 0 1; \
+                  to_x: "elm.flip.icon.right"; \
                } \
             } \
             description { state: "flip_enabled" 0.0; \
                inherit: "default" 0.0; \
                visible: 1; \
             } \
+         } \
+         part { name: "elm.flip.icon.right"; \
+            type: RECT; \
+            scale: 1; \
+            description { state: "default" 0.0; \
+               min: 16 0; \
+               fixed: 1 0; \
+               visible: 0; \
+               align: 1 0.5; \
+               rel1 { \
+                  relative: 1 0; \
+                  to_x: "base"; \
+                  to_y: "base"; \
+               } \
+               rel2 { \
+                  relative: 1 1; \
+                  to_x: "base"; \
+                  to_y: "base"; \
+               } \
+            } \
          }
 
 #define GENLIST_DESCRIPTION_INVISIBLE_SELECTED \
@@ -1138,6 +1401,143 @@
             action: PLAY_SAMPLE "button-pressed" 1.0; \
          }
 
+// 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
+#define GENLIST_PROGRAM_DISCLIP( TARGET ) \
+         program { name: "enabled"; \
+            signal: "elm,state,enabled"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "disclip"; \
+            TARGET \
+         } \
+         program { name: "disabled"; \
+            signal: "elm,state,disabled"; \
+            source: "elm"; \
+            action: STATE_SET "disabled" 0.0; \
+            target: "disclip"; \
+            TARGET \
+         }
+
+#define GENLIST_PROGRAM_SELECT( TARGET ) \
+         program { name: "selected"; \
+            signal: "elm,state,selected"; \
+            source: "elm"; \
+            action: STATE_SET "selected" 0.0; \
+            target: "bg_image"; \
+            TARGET \
+            after: "play_button_press"; \
+         } \
+         program { name: "unselected"; \
+            signal: "elm,state,unselected"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "bg_image"; \
+            TARGET \
+            transition: LINEAR 0.1; \
+         } \
+         program { name: "play_button_press"; \
+            action: PLAY_SAMPLE "button-pressed" 1.0; \
+         }
+
 
 
+#define GENLIST_PROGRAM_REORDER \
+         program { name: "reorder_enabled"; \
+            signal: "elm,state,reorder,mode_set"; \
+            source: "elm"; \
+            action: STATE_SET "reorder" 0.0; \
+            target: "base"; \
+            target: "reorder.padding.left"; \
+            target: "reorder.padding.top"; \
+            target: "bottom_line"; \
+         } \
+         program { name: "reorder_disabled"; \
+            signal: "elm,state,reorder,mode_unset"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            target: "base"; \
+            target: "reorder.padding.left"; \
+            target: "reorder.padding.top"; \
+            target: "bottom_line"; \
+         } \
+         program { name: "reorder_enabled_effect"; \
+            signal: "elm,state,reorder_enabled_effect"; \
+            source: "elm"; \
+            action: STATE_SET "reorder" 0.0; \
+            transition: DECELERATE 0.7; \
+            target: "base"; \
+            target: "reorder.padding.left"; \
+            target: "reorder.padding.top"; \
+            target: "bottom_line"; \
+         } \
+         program { name: "reorder_disabled_effect"; \
+            signal: "elm,state,reorder_disabled_effect"; \
+            source: "elm"; \
+            action: STATE_SET "default" 0.0; \
+            transition: DECELERATE 0.7; \
+            target: "base"; \
+            target: "reorder.padding.left"; \
+            target: "reorder.padding.top"; \
+            target: "bottom_line"; \
+         } \
+
+#define GENLIST_PROGRAM_FLIP_TARGET( DISABLE_TARGET, FLIP_TARGET ) \
+         program { name: "flip_enabled"; \
+            signal:  "elm,state,flip,enabled"; \
+            source:  "elm"; \
+            action:  STATE_SET "flip_enabled" 0.0; \
+            DISABLE_TARGET \
+            after:   "flip_enabled_next"; \
+         } \
+         program { name:    "flip_enabled_next"; \
+            action:  STATE_SET "flip_enabled" 0.0; \
+            transition: DECELERATE 0.5; \
+            FLIP_TARGET \
+         } \
+         program { name:    "flip_disabled"; \
+            signal:  "elm,state,flip,disabled"; \
+            source:  "elm"; \
+            action:  STATE_SET "default" 0.0; \
+            transition: DECELERATE 0.5; \
+            FLIP_TARGET \
+            after:   "flip_disabled_next"; \
+         } \
+         program { name:    "flip_disabled_next"; \
+            source:  "elm"; \
+            action:  STATE_SET "default" 0.0; \
+            DISABLE_TARGET \
+         }
+
+#define GENLIST_PROGRAM_FLIP( TARGET ) \
+         program { name: "flip_enabled"; \
+            signal:  "elm,state,flip,enabled"; \
+            source:  "elm"; \
+            action:  STATE_SET "flip_enabled" 0.0; \
+            TARGET \
+            after:   "flip_enabled_next"; \
+         } \
+         program { name:    "flip_enabled_next"; \
+            action:  STATE_SET "flip_enabled" 0.0; \
+            transition: DECELERATE 0.5; \
+            target: "elm.flip.content"; \
+            target: "elm.flip.icon"; \
+         } \
+         program { name:    "flip_disabled"; \
+            signal:  "elm,state,flip,disabled"; \
+            source:  "elm"; \
+            action:  STATE_SET "default" 0.0; \
+            transition: DECELERATE 0.5; \
+            target: "elm.flip.content"; \
+            target: "elm.flip.icon"; \
+            after:   "flip_disabled_next"; \
+         } \
+         program { name:    "flip_disabled_next"; \
+            source:  "elm"; \
+            action:  STATE_SET "default" 0.0; \
+            TARGET \
+         }
 /* genlist multisense macro - end */

diff --git a/themes/widgets/genlist/genlist_normal.edc b/themes/widgets/genlist/genlist_normal.edc
index 980e3f7..7a9653a 100644 (file)
--- a/themes/widgets/genlist/genlist_normal.edc
+++ b/themes/widgets/genlist/genlist_normal.edc
@@ -80,7 +80,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
          }
          part { name: "elm.swallow.icon";
@@ -187,10 +187,10 @@
                   relative: 0.0  1.0;
                   offset:   0   0;
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -198,7 +198,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
          }
          part { name: "elm.swallow.icon";
@@ -269,80 +269,44 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         GENLIST_PART_DISCLIP
-         GENLIST_PART_BASE( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BASE_REORDER( GENLIST_HEIGHT_1LINE )
          GENLIST_PART_BOTTOM_LINE
+
          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;
+            GENLIST_DESCRIPTION_LR("elm.padding.left", "elm.padding.right", \
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.padding.right";
-               }
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   max: 1 1;
-                  align: 0.0 0.5;
+                  align: 0 0.5;
                   text_class: "list_item";
                }
-            }
+            )
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
-            GENLIST_DESCRIPTION_INVISIBLE_SELECTED
+            //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
-         GENLIST_PROGRAM_PLAY_BUTTON_PRESS
+         GENLIST_PROGRAM_DISCLIP( ; )
+         GENLIST_PROGRAM_SELECT( target: "elm.text"; )
+         GENLIST_PROGRAM_REORDER
+         GENLIST_PROGRAM_FLIP( target: "elm.text"; )
       }
    }
 // 2.2.1.1 (textblock)
@@ -362,14 +326,14 @@
                }
                align: 0.0 0.5;
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                }
             }
             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";
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -489,7 +453,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
 
          }
@@ -596,10 +560,10 @@
                   to_x: "elm.padding.icon1.left2";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   max: 1 0;
                   align: 0.0 0.5;
@@ -608,7 +572,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -714,7 +678,7 @@
                }
                align: 0.0 0.5;
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   min: 0 1;
                   max: 1 0;
                   align: 0.0 0.5;
@@ -722,7 +686,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -770,7 +734,7 @@
                   to_x: "elm.padding.right";
                }
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   min: 0 1;
                   align: 0.0 0.5;
                }
@@ -778,8 +742,8 @@
             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";
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -912,10 +876,10 @@
                   to_x: "elm.padding.icon2.left";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -923,7 +887,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -1063,10 +1027,10 @@
                   to_x: "elm.padding.right";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -1074,7 +1038,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -1220,10 +1184,10 @@
                   to_x: "elm.padding.icon2.left";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -1231,7 +1195,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -1291,14 +1255,14 @@
                }
                align: 0.0 0.5;
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -1334,7 +1298,7 @@
             scale: 1;
             description { state: "default" 0.0;
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                rel1 {
                   relative: 1.0 0.0;
                   to_x: "elm.padding.left";
@@ -1345,7 +1309,7 @@
                }
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -1353,7 +1317,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -1367,7 +1331,7 @@
                fixed: 1 0;
                min: GENLIST_TEXT2_WIDTH_MIN 0;
                align: 1.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                rel1 {
                   relative: 0.0 0.0;
                   to_x: "elm.padding.right";
@@ -1386,7 +1350,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -1435,7 +1399,7 @@
       parts {
          part { name: "elm.text.2";
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
             }
          }
       }
@@ -1511,7 +1475,7 @@
                   to_x: "elm.padding.right";
                }
                align: 1.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -1522,7 +1486,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -1559,10 +1523,10 @@
                   to_x: "elm.padding.text2.left";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -1570,7 +1534,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -1680,7 +1644,7 @@
                   to_x: "elm.padding.right";
                }
                align: 1.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -1691,7 +1655,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -1727,10 +1691,10 @@
                   to_x: "elm.padding.text2.left";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -1738,7 +1702,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -1917,10 +1881,10 @@
                   to_x: "elm.padding.icon3.left";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -1928,7 +1892,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -2102,10 +2066,10 @@
                   to_x: "elm.padding.icon2.left";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -2113,7 +2077,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -2186,7 +2150,7 @@
                   to_x: "elm.padding.right";
                }
                align: 1.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -2197,7 +2161,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -2262,10 +2226,10 @@
                   relative: 0.0  1.0;
                   to_x: "elm.padding.text1.right";
                }
-               color: GENLIST_TEXT_COLOR_CONVERTOR_STYLE;
+               color: GENLIST_CONVERTOR_STYLE_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_40_INC;
+                  size: GENLIST_CONVERTOR_STYLE_SIZE;
                   min: 0 1;
                   align: 1.0 0.5;
                   text_class: "list_item";
@@ -2273,7 +2237,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_CONVERTOR_STYLE_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -2366,7 +2330,7 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -2377,7 +2341,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
          }
          part { name: "elm.padding.text1.right";
@@ -2441,10 +2405,10 @@
                   relative: 0.0  1.0;
                   to_x: "elm.padding.right";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -2452,7 +2416,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -2552,10 +2516,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -2563,7 +2527,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -2584,7 +2548,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -2595,7 +2559,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -2664,14 +2628,14 @@
                }
                align: 0.0 0.5;
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -2718,14 +2682,14 @@
                }
                align: 0.0 0.0;
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -2748,14 +2712,14 @@
                }
                align: 0.0 0.0;
                text {
-                  style: "genlist_sub_textblock_style";
+                  style: "genlist_style_list_sub_text_default";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_sub_textblock_selected_style";
+               text.style: "genlist_style_list_sub_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -2842,10 +2806,10 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_roman";
@@ -2853,7 +2817,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -2874,7 +2838,7 @@
                   to_y: "elm.text.1";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -2885,7 +2849,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -2972,7 +2936,7 @@
                   to_y: "elm.padding.top";
                }
                align: 1.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -2983,7 +2947,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -3021,10 +2985,10 @@
                   to_y: "elm.text.3";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -3032,7 +2996,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -3052,7 +3016,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -3063,7 +3027,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -3134,14 +3098,14 @@
                }
                align: 0.0 0.5;
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -3224,10 +3188,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -3235,7 +3199,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -3256,7 +3220,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -3267,7 +3231,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -3393,10 +3357,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -3404,7 +3368,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -3425,7 +3389,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -3436,7 +3400,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -3505,14 +3469,14 @@
                }
                align: 0.0 0.5;
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -3559,10 +3523,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -3570,7 +3534,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -3627,7 +3591,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -3638,7 +3602,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -3726,7 +3690,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 1.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -3737,7 +3701,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -3813,10 +3777,10 @@
                   to_y: "elm.text.3";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -3824,7 +3788,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -3845,7 +3809,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -3856,7 +3820,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -4022,10 +3986,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -4033,7 +3997,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -4053,7 +4017,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -4064,7 +4028,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -4151,10 +4115,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -4162,7 +4126,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -4183,7 +4147,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -4194,7 +4158,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -4318,10 +4282,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -4329,7 +4293,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -4350,7 +4314,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -4361,7 +4325,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -4430,14 +4394,14 @@
                }
                align: 0.0 0.5;
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -4522,10 +4486,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -4533,7 +4497,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -4554,7 +4518,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -4565,7 +4529,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -4691,10 +4655,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -4702,7 +4666,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -4726,7 +4690,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -4737,7 +4701,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -4901,10 +4865,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -4912,7 +4876,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -4933,7 +4897,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -4944,7 +4908,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -5014,8 +4978,8 @@
                }
                align: 0.0 0.0;
                text {
-                  style: "genlist_default_textblock_style";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  style: "genlist_style_list_main_text_unread";
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -5023,7 +4987,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -5046,7 +5010,7 @@
                }
                align: 0.0 0.5;
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   size: GENLIST_FONT_32_INC;
                   min: 0 1;
                   align: 0.0 0.5;
@@ -5054,7 +5018,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -5142,7 +5106,7 @@
                   to_y: "elm.padding.top";
                }
                align: 1.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -5154,7 +5118,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -5193,10 +5157,10 @@
                   to_y: "elm.text.3";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -5204,7 +5168,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -5225,7 +5189,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -5236,7 +5200,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -5362,10 +5326,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -5373,7 +5337,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -5393,7 +5357,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -5404,7 +5368,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -5530,10 +5494,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -5541,7 +5505,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -5597,7 +5561,7 @@
                   to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -5608,7 +5572,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -5677,14 +5641,16 @@
                }
                align: 0.0 0.5;
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               // FIXME: Why color textblock of is not changed by text.style?
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -5807,10 +5773,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -5818,7 +5784,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -5838,7 +5804,7 @@
                   to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -5849,7 +5815,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -5920,8 +5886,8 @@
                }
                align: 0.0 0.0;
                text {
-                  style: "genlist_default_textblock_style";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  style: "genlist_style_list_main_text_unread";
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -5929,7 +5895,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -5950,7 +5916,7 @@
                   to_y: "elm.padding.bottom";
                }
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   size: GENLIST_FONT_32_INC;
                   min: 0 1;
                   align: 0.0 0.5;
@@ -5959,7 +5925,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -6044,10 +6010,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -6055,7 +6021,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -6075,7 +6041,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -6086,7 +6052,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -6134,7 +6100,7 @@
       }
    }
 
-// ???
+// 2.4.2.18
    group { name: "elm/genlist/item_compress/multiline/dialogue/2text/default";
       alias: "elm/genlist/item_compress_odd/multiline/dialogue/2text/default";
       data.item: "stacking" "above";
@@ -6145,7 +6111,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          GENLIST_PART_DIALOGUE_BG_IMAGE
@@ -6175,10 +6141,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -6186,7 +6152,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
          }
          part { name: "elm.text.2";
@@ -6206,15 +6172,11 @@
                   to_y: "elm.padding.bottom";
                }
                text {
-                  style: "genlist_textblock_sub_style";
+                  style: "genlist_style_flexible_text_sub";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_textblock_sub_selected_style";
-            }
          }
          GENLIST_PART_DISCLIP
       }
@@ -6374,10 +6336,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -6385,7 +6347,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -6405,7 +6367,7 @@
                   to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -6416,7 +6378,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -6580,10 +6542,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -6591,7 +6553,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -6611,7 +6573,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -6622,7 +6584,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -6721,7 +6683,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 1.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -6732,7 +6694,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -6790,10 +6752,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -6801,7 +6763,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -6838,7 +6800,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -6849,7 +6811,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -7087,7 +7049,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 1.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -7098,7 +7060,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -7664,7 +7626,7 @@
                   align: 0.5 0.5;
                   text_class: "slp_medium";
                }
-               color: GENLIST_TEXT_COLOR_CONVERTOR_STYLE;
+               color: GENLIST_CONVERTOR_STYLE_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -7826,7 +7788,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 1.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -7837,7 +7799,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -7912,10 +7874,10 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_CONTENTS_TEXT;
+               color: GENLIST_CONTENTS_TEXT_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_30_INC;
+                  size: GENLIST_CONTENTS_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
@@ -7923,7 +7885,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -8092,7 +8054,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 1.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -8103,7 +8065,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -8531,7 +8493,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -8542,7 +8504,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -8566,10 +8528,10 @@
                   to_y: "elm.text.2";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 1 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -8577,7 +8539,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -8790,10 +8752,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -8801,7 +8763,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -8821,7 +8783,7 @@
                   to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -8832,7 +8794,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -8958,10 +8920,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -8969,7 +8931,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -9027,7 +8989,7 @@
                   to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -9038,7 +9000,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -9109,8 +9071,8 @@
                }
                align: 0.0 0.0;
                text {
-                  style: "genlist_default_textblock_style";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  style: "genlist_style_list_main_text_unread";
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -9118,7 +9080,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -9140,7 +9102,7 @@
                   to_y: "elm.padding.bottom";
                }
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   size: GENLIST_FONT_32_INC;
                   min: 0 1;
                   align: 0.0 0.5;
@@ -9149,7 +9111,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -9234,10 +9196,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -9245,7 +9207,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -9266,7 +9228,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -9277,7 +9239,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -9419,19 +9381,15 @@
                   to_x: "elm.padding.right";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_UNREAD_EMAIL;
+               color: GENLIST_UNREAD_EMAIL_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_UNREAD_EMAIL_SIZE;
                   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
@@ -9612,7 +9570,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -9730,7 +9688,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -9741,7 +9699,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -9803,10 +9761,10 @@
                   to_y: "elm.text.2";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 1 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -9814,7 +9772,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -9978,10 +9936,10 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_roman";
@@ -9989,7 +9947,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -10010,7 +9968,7 @@
                   to_y: "elm.text.1";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -10021,7 +9979,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -10183,10 +10141,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0 0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -10194,7 +10152,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -10393,10 +10351,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0 0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -10404,7 +10362,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -10447,7 +10405,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0 1;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_32_INC;
@@ -10458,7 +10416,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -10481,7 +10439,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 1 1;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_32_INC;
@@ -10492,7 +10450,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -10679,10 +10637,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -10690,7 +10648,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -10710,7 +10668,7 @@
                   to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -10721,7 +10679,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -10792,8 +10750,8 @@
                }
                align: 0.0 0.0;
                text {
-                  style: "genlist_default_textblock_style";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  style: "genlist_style_list_main_text_unread";
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_roman";
@@ -10801,7 +10759,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -10886,10 +10844,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0 0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -10897,7 +10855,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -11134,10 +11092,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -11145,7 +11103,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -11165,7 +11123,7 @@
                   to_x: "elm.padding.icon3.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -11176,7 +11134,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -11300,7 +11258,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -11311,7 +11269,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -11335,10 +11293,10 @@
                   to_y: "elm.text.2";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 1 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -11346,7 +11304,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -11443,7 +11401,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          GENLIST_PART_BG_IMAGE
@@ -11468,7 +11426,7 @@
                   to_y: "elm.padding.bottom";
                }
                text {
-                  style: "genlist_textblock_help_style";
+                  style: "genlist_style_dialogue_group_help_text";
                   min: 0 1;
                   align: 0.0 0.5;
                }
@@ -11505,7 +11463,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          GENLIST_PART_BG_IMAGE
@@ -11533,10 +11491,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_42_INC;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -11544,7 +11502,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
          }
          part { name: "elm.text.2";
@@ -11564,15 +11522,11 @@
                   to_y: "elm.padding.bottom";
                }
                text {
-                  style: "genlist_textblock_flexible_sub_style";
+                  style: "genlist_style_flexible_text_sub";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_textblock_flexible_sub_selected_style";
-            }
          }
          GENLIST_PART_DISCLIP
       }
@@ -11706,10 +11660,10 @@
                rel1.to: "elm.text.1.rect";
                rel2.to: "elm.text.1.rect";
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_UNREAD;
+               color: GENLIST_3LINE_MAIN_TEXT_01_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_40_INC;
+                  size: GENLIST_3LINE_MAIN_TEXT_01_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -11717,7 +11671,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -11740,7 +11694,7 @@
                   to_y: "elm.text.1.rect";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_UNREAD;
+               color: GENLIST_3LINE_MAIN_TEXT_01_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_36_INC;
@@ -11751,7 +11705,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -11774,10 +11728,10 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_03;
+               color: GENLIST_3LINE_MAIN_TEXT_03_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_30_INC;
+                  size: GENLIST_3LINE_MAIN_TEXT_03_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
@@ -11785,7 +11739,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_03_FOCUS;
+               color: GENLIST_3LINE_MAIN_TEXT_03_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -11963,10 +11917,10 @@
                rel1.to: "elm.text.1.rect";
                rel2.to: "elm.text.1.rect";
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_READ;
+               color: GENLIST_3LINE_MAIN_TEXT_01_READ_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_40_INC;
+                  size: GENLIST_3LINE_MAIN_TEXT_01_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -11974,7 +11928,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -11997,10 +11951,10 @@
                   to_y: "elm.text.1.rect";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_02;
+               color: GENLIST_3LINE_MAIN_TEXT_02_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_36_INC;
+                  size: GENLIST_3LINE_MAIN_TEXT_02_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_roman";
@@ -12008,7 +11962,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_3LINE_MAIN_TEXT_02_COLOR_FOCUS;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -12031,10 +11985,10 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_03;
+               color: GENLIST_3LINE_MAIN_TEXT_03_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_30_INC;
+                  size: GENLIST_3LINE_MAIN_TEXT_03_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
@@ -12042,7 +11996,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_03_FOCUS;
+               color: GENLIST_3LINE_MAIN_TEXT_03_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -12182,10 +12136,10 @@
                rel1.to: "elm.text.1.rect";
                rel2.to: "elm.text.1.rect";
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_UNREAD;
+               color: GENLIST_3LINE_MAIN_TEXT_01_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_40_INC;
+                  size: GENLIST_3LINE_MAIN_TEXT_01_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -12193,7 +12147,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -12216,7 +12170,7 @@
                   to_y: "elm.text.1.rect";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_UNREAD;
+               color: GENLIST_3LINE_MAIN_TEXT_01_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_36_INC;
@@ -12227,7 +12181,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -12250,10 +12204,10 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_03;
+               color: GENLIST_3LINE_MAIN_TEXT_03_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_30_INC;
+                  size: GENLIST_3LINE_MAIN_TEXT_03_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
@@ -12261,7 +12215,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_03_FOCUS;
+               color: GENLIST_3LINE_MAIN_TEXT_03_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -12401,10 +12355,10 @@
                rel1.to: "elm.text.1.rect";
                rel2.to: "elm.text.1.rect";
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_UNREAD;
+               color: GENLIST_3LINE_MAIN_TEXT_01_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_40_INC;
+                  size: GENLIST_3LINE_MAIN_TEXT_01_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -12412,7 +12366,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -12435,10 +12389,10 @@
                   to_y: "elm.text.1.rect";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_02;
+               color: GENLIST_3LINE_MAIN_TEXT_02_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_36_INC;
+                  size: GENLIST_3LINE_MAIN_TEXT_02_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_roman";
@@ -12446,7 +12400,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_3LINE_MAIN_TEXT_02_COLOR_FOCUS;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -12469,10 +12423,10 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_03;
+               color: GENLIST_3LINE_MAIN_TEXT_03_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_30_INC;
+                  size: GENLIST_3LINE_MAIN_TEXT_03_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
@@ -12480,7 +12434,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_03_FOCUS;
+               color: GENLIST_3LINE_MAIN_TEXT_03_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -12754,10 +12708,10 @@
                }
                rel2.to: "elm.text.1.rect";
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_UNREAD;
+               color: GENLIST_3LINE_MAIN_TEXT_01_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_3LINE_MAIN_TEXT_01_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -12765,7 +12719,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -12810,7 +12764,7 @@
                   to_y: "elm.text.1.bottom";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_NAME_TEXT;
+               color: GENLIST_NAME_TEXT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -12821,7 +12775,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -12844,7 +12798,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 1.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -12855,7 +12809,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -12902,7 +12856,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -12913,7 +12867,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -12968,7 +12922,7 @@
       parts {
          part { name: "elm.text.1";
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_READ;
+               color: GENLIST_3LINE_MAIN_TEXT_01_READ_COLOR;
             }
          }
       }
@@ -13046,7 +13000,7 @@
       parts {
          part { name: "elm.text.1";
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_READ;
+               color: GENLIST_3LINE_MAIN_TEXT_01_READ_COLOR;
             }
          }
       }
@@ -13118,7 +13072,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -13129,7 +13083,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -13146,7 +13100,7 @@
       parts {
          part { name: "elm.text.1";
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_READ;
+               color: GENLIST_3LINE_MAIN_TEXT_01_READ_COLOR;
             }
          }
       }
@@ -13226,7 +13180,7 @@
       parts {
          part { name: "elm.text.1";
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
             }
          }
       }
@@ -13409,10 +13363,10 @@
                }
                rel2.to: "elm.text.1.rect";
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_3LINE_MAIN_TEXT_01_UNREAD;
+               color: GENLIST_3LINE_MAIN_TEXT_01_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -13420,7 +13374,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -13465,7 +13419,7 @@
                   to_y: "elm.text.1.bottom";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -13476,7 +13430,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -13499,7 +13453,7 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -13510,7 +13464,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -13558,7 +13512,7 @@
       }
    }
 
-// 3.4.4
+// 2.2.4.1
    group { name: "elm/genlist/item/multiline/1title.2text/default";
       alias: "elm/genlist/item_odd/multiline/1title.2text/default";
       alias: "elm/genlist/item_compress/multiline/1title.2text/default";
@@ -13571,7 +13525,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          GENLIST_PART_BG_IMAGE
@@ -13631,15 +13585,11 @@
                }
                align: 0.0 0.5;
                text {
-                  style: "genlist_multiline_textblock_style";
+                  style: "genlist_style_multiline_text";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_multiline_textblock_selected_style";
-            }
          }
          part { name: "elm.padding.title.right";
             clip_to: "disclip";
@@ -13691,10 +13641,10 @@
                   to_x: "elm.padding.right";
                   to_y: "center_line";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_roman";
@@ -13717,10 +13667,10 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_roman";
@@ -13782,7 +13732,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          GENLIST_PART_BG_IMAGE
@@ -13808,19 +13758,15 @@
                   to_x: "elm.padding.left";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_MULTILINE_TEXT;
+               color: GENLIST_MULTILINE_TEXT_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: GENLIST_MULTILINE_TEXT_SIZE;
                   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;
-            }
          }
          part { name: "elm.padding.title.right";
             clip_to: "disclip";
@@ -13887,7 +13833,7 @@
                   to_y: "elm.padding.bottom";
                }
                text {
-                  style: "genlist_textblock_flexible_style";
+                  style: "genlist_style_multiline_list_main_text_unread";
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -13895,7 +13841,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_textblock_flexible_selected_style";
+               text.style: "genlist_style_multiline_list_main_text_focus";
             }
          }
          GENLIST_PART_DISCLIP
@@ -13952,7 +13898,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          GENLIST_PART_BG_IMAGE
@@ -13980,10 +13926,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_42_INC;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -13991,7 +13937,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
          }
          part { name: "elm.icon";
@@ -14047,15 +13993,11 @@
                   to_y: "elm.padding.bottom";
                }
                text {
-                  style: "genlist_textblock_sub_style";
+                  style: "genlist_style_flexible_text_sub";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_textblock_sub_selected_style";
-            }
          }
          GENLIST_PART_DISCLIP
       }
@@ -14111,7 +14053,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          GENLIST_PART_BG_IMAGE
@@ -14177,10 +14119,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_FONT_42_INC;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -14188,7 +14130,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
          }
          part { name: "elm.text.2";
@@ -14208,15 +14150,11 @@
                   to_y: "elm.padding.bottom";
                }
                text {
-                  style: "genlist_textblock_sub_style";
+                  style: "genlist_style_flexible_text_sub";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
-            description { state: "selected" 0.0;
-               inherit: "default" 0.0;
-               text.style: "genlist_textblock_sub_selected_style";
-            }
          }
          GENLIST_PART_DISCLIP
       }
@@ -14273,7 +14211,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: GENLIST_PART_LIST_BG_COLOR_INC;
+               color: GENLIST_PART_LIST_BG_COLOR;
             }
          }
          part { name: "elm.icon";
@@ -14338,7 +14276,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: GENLIST_PART_LIST_BG_COLOR_INC;
+               color: GENLIST_PART_LIST_BG_COLOR;
             }
          }
          part { name: "elm.icon";
@@ -14409,13 +14347,13 @@
       data.item: "treesize" "GENLIST_TREESIZE_DEFAULT";
 
       parts {
- //        GENLIST_PART_BASE_EVENT_OFF
+         // GENLIST_PART_BASE_EVENT_OFF
          GENLIST_PART_DISCLIP
-         GENLIST_DIALOGUE_PART_BASE(   GENLIST_GT_H )
-         GENLIST_PART_PADDING_TOP(     GENLIST_GT_PAD_T_H )
-         GENLIST_PART_PADDING_BOTTOM(  GENLIST_GT_PAD_B_H )
-         GENLIST_PART_PADDING_LEFT(    GENLIST_GT_PAD_L_W )
-         GENLIST_PART_PADDING_RIGHT(   GENLIST_GT_PAD_R_W )
+         GENLIST_PART_DIALOGUE_BASE( GENLIST_DIALOGUE_GROUP_TITLE_HEIGHT )
+         GENLIST_PART_PADDING_TOP( GENLIST_DIALOGUE_GROUP_TITLE_PADDING_TOP_SIZE )
+         GENLIST_PART_PADDING_BOTTOM( GENLIST_DIALOGUE_GROUP_TITLE_PADDING_BOTTOM_SIZE )
+         GENLIST_PART_PADDING_LEFT( 16 )
+         GENLIST_PART_PADDING_RIGHT( 17 )
          GENLIST_PART_BOTTOM_LINE
          part { name: "elm.text";
             type: TEXT;
@@ -14429,7 +14367,7 @@
                }
                rel2 {
                   relative: 0.0 0.0;
-                  offset: GENLIST_GT_PAD_M_W 0;
+                  offset: 32 0;
                   to_x: "elm.icon";
                   to_y: "elm.padding.bottom";
                }
@@ -14619,10 +14557,10 @@
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -14630,7 +14568,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -14742,10 +14680,10 @@
                   to_x: "elm.padding.icon.left";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -14753,7 +14691,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -14864,10 +14802,10 @@
                   to_x: "elm.padding.right";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -14875,7 +14813,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -15017,10 +14955,10 @@
                   to_x: "elm.padding.icon.left";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -15028,7 +14966,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -15138,7 +15076,7 @@
                   to_x: "elm.padding.right";
                }
                align: 1.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -15149,7 +15087,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -15184,10 +15122,10 @@
                   to_x: "elm.padding.text2.left";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -15195,7 +15133,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -15308,14 +15246,14 @@
                }
                align: 0.0 0.5;
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -15423,10 +15361,10 @@
                   to_x: "elm.padding.icon.left";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -15434,7 +15372,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -15515,7 +15453,7 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -15526,12 +15464,11 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.icon.1";
-            clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
             description { state: "default" 0.0;
@@ -15615,7 +15552,7 @@
                   to_x: "elm.padding.right";
                }
                align: 1.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -15626,7 +15563,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -15661,10 +15598,10 @@
                   to_x: "elm.padding.text2.left";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -15672,7 +15609,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -15818,10 +15755,10 @@
                   to_x: "elm.padding.icon2.left";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -15829,7 +15766,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -16005,10 +15942,10 @@
                   to_x: "elm.padding.icon2.left";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -16016,7 +15953,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -16107,7 +16044,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
          }
          part { name: "elm.icon1.bg";
@@ -16433,7 +16370,7 @@
                   to_y: "elm.padding.top";
                }
                align: 1.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -16444,7 +16381,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -16482,10 +16419,10 @@
                   to_y: "elm.text.2";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -16493,7 +16430,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -16597,10 +16534,10 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_MULTILINE_TEXT;
+               color: GENLIST_MULTILINE_TEXT_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: GENLIST_MULTILINE_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_roman";
@@ -16653,10 +16590,10 @@
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -16758,10 +16695,10 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_MULTILINE_TEXT;
+               color: GENLIST_MULTILINE_TEXT_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: GENLIST_MULTILINE_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
@@ -16829,10 +16766,10 @@
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -16948,10 +16885,10 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_MULTILINE_TEXT;
+               color: GENLIST_MULTILINE_TEXT_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: GENLIST_MULTILINE_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
@@ -17039,10 +16976,10 @@
                   relative: 0.0 1.0;
                   to_x: "elm.padding.icon.left";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -17141,10 +17078,10 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_MULTILINE_TEXT;
+               color: GENLIST_MULTILINE_TEXT_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: GENLIST_MULTILINE_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
@@ -17257,10 +17194,10 @@
                   relative: 0.0 1.0;
                   to_x: "elm.padding.icon.left";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -17268,7 +17205,7 @@
             }
             description { state: "contact_default_number_enabled" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -17396,10 +17333,10 @@
                }
                rel2.to_x: "elm.padding.right";
                align: 1.0 0.5;
-               color: GENLIST_TEXT_COLOR_MULTILINE_TEXT;
+               color: GENLIST_MULTILINE_TEXT_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: GENLIST_MULTILINE_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
@@ -17467,7 +17404,7 @@
                   relative: 0.0  1.0;
                   to_x: "elm.padding.text1.right";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_42_INC;
@@ -17478,7 +17415,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -17560,7 +17497,7 @@
                rel2.to_x: "elm.padding.right";
                align: 1.0 0.5;
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   size: GENLIST_FONT_32_INC;
                   min: 0 1;
                   align: 0.0 0.5;
@@ -17707,10 +17644,10 @@
                   to_x: "elm.padding.icon3.left";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -17718,7 +17655,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -17797,10 +17734,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -17808,7 +17745,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -17828,7 +17765,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -17839,7 +17776,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -17925,10 +17862,10 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -17936,7 +17873,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -17957,7 +17894,7 @@
                   to_y: "elm.text.1";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -17968,7 +17905,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -18054,10 +17991,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -18065,7 +18002,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -18085,7 +18022,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -18096,7 +18033,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -18216,10 +18153,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -18227,7 +18164,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -18247,7 +18184,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -18258,7 +18195,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -18378,10 +18315,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -18389,7 +18326,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -18409,7 +18346,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -18420,7 +18357,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -18592,10 +18529,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -18603,7 +18540,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -18623,7 +18560,7 @@
                   to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -18634,7 +18571,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -18797,10 +18734,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -18808,7 +18745,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -18828,7 +18765,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -18839,7 +18776,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -18964,10 +18901,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -18975,7 +18912,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -19033,7 +18970,7 @@
                   to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -19044,7 +18981,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -19207,10 +19144,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -19218,7 +19155,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -19238,7 +19175,7 @@
                   to_x: "elm.padding.icon2.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -19249,7 +19186,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -19300,6 +19237,41 @@
    group { name: "elm/genlist/item_compress/dialogue/2text.2icon.3.tb/default";
       inherit: "elm/genlist/item/dialogue/2text.2icon.3/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;
+               align: 0.0 0.0;
+               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";
+               }
+               text {
+                  style: "genlist_style_list_sub_text_default";
+                  min: 0 1;
+                  align: 0.0 0.5;
+                  text_class: "list_item";
+               }
+            }
+            description { state: "selected" 0.0;
+               inherit: "default" 0.0;
+               // FIXME: Why color textblock of is not changed by text.style?
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
+               text.style: "genlist_style_list_sub_text_focus";
+            }
+            GENLIST_DESCRIPTION_FLIP_ENABLED
+
+         }
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXTBLOCK;
@@ -19317,8 +19289,7 @@
                   to_y: "elm.padding.bottom";
                }
                text {
-                  style: "genlist_default_textblock_style";
-                  size: GENLIST_FONT_32_INC;
+                  style: "genlist_style_list_main_text_unread";
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
@@ -19326,7 +19297,9 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               // FIXME: Why color textblock of is not changed by text.style?
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -19410,10 +19383,10 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 1.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -19421,7 +19394,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -19442,7 +19415,7 @@
                   to_y: "elm.text.1";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -19453,7 +19426,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -19513,7 +19486,7 @@
             type: RECT;
             repeat_events: 1;
             description { state: "default" 0.0;
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          GENLIST_PART_DIALOGUE_BG_IMAGE
@@ -19541,10 +19514,10 @@
                   to_x: "elm.padding.left";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_MULTILINE_TEXT;
+               color: GENLIST_MULTILINE_TEXT_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: GENLIST_MULTILINE_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
@@ -19552,7 +19525,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
          }
          part { name: "vertical_line";
@@ -19604,14 +19577,14 @@
                   to_y: "elm.padding.bottom";
                }
                text {
-                  style: "genlist_textblock_flexible_style";
+                  style: "genlist_style_multiline_list_main_text_unread";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_textblock_selected_style";
+               text.style: "genlist_style_multiline_list_main_text_focus";
             }
          }
          GENLIST_PART_DISCLIP
@@ -19717,10 +19690,10 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_MULTILINE_TEXT;
+               color: GENLIST_MULTILINE_TEXT_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: GENLIST_MULTILINE_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
@@ -19759,10 +19732,10 @@
                   to_x: "elm.padding.right";
                   to_y: "center_line";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -19783,10 +19756,10 @@
                   relative: 0.0 1.0;
                   to_x: "elm.padding.right";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_roman";
@@ -19874,7 +19847,7 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -19886,7 +19859,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
          }
          part { name: "elm.padding.icon1.left";
@@ -20263,10 +20236,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -20274,7 +20247,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -20294,7 +20267,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -20305,7 +20278,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -20368,7 +20341,7 @@
          GENLIST_PART_DIALOGUE_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_BOTTOM( GENLIST_PADDING_10_INC )
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_32_INC )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
          GENLIST_PART_DIALOGUE_ITEM
@@ -20423,10 +20396,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -20434,7 +20407,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -20454,7 +20427,7 @@
                   to_x: "elm.padding.icon.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -20465,7 +20438,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -20590,10 +20563,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -20601,7 +20574,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -20621,7 +20594,7 @@
                   to_x: "elm.padding.icon.left";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -20632,7 +20605,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -20722,7 +20695,7 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -20733,7 +20706,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -20756,10 +20729,10 @@
                   to_y: "elm.padding.bottom";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 1 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -20767,7 +20740,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -20934,10 +20907,10 @@
                   to_y: "elm.padding.top";
                }
                align: 0.0 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -20945,7 +20918,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -20965,7 +20938,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.padding.bottom";
                }
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_SETTINGS;
+               color: GENLIST_LIST_SUB_TEXT_SETTINGS_COLOR;
                text {
                   font: "SLP:style=Medium";
                   size: GENLIST_FONT_32_INC;
@@ -20976,7 +20949,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -22190,10 +22163,10 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_MULTILINE_TEXT;
+               color: GENLIST_MULTILINE_TEXT_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: GENLIST_MULTILINE_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
@@ -22229,10 +22202,10 @@
                rel2.to_x: "elm.padding.title.right";
                align: 0.0 0.5;
                fixed: 1 1;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 1 1;
                   max: 1 1;
                   align: 0.0 0.5;
@@ -22418,10 +22391,10 @@
                }
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_MULTILINE_TEXT;
+               color: GENLIST_MULTILINE_TEXT_COLOR;
                text {
                   font: "SLP:style=Medium";
-                  size: GENLIST_FONT_32_INC;
+                  size: GENLIST_MULTILINE_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_medium";
@@ -22459,10 +22432,10 @@
                   to_x: "elm.padding.right";
                   to_y: "center1_line";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -22484,10 +22457,10 @@
                   to_x: "elm.padding.right";
                   to_y: "center2_line";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -22509,10 +22482,10 @@
                   to_x: "elm.padding.right";
                   to_y: "center3_line";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -22534,10 +22507,10 @@
                   to_x: "elm.padding.right";
                   to_y: "bottom_line";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -22742,10 +22715,10 @@
                   to_x: "elm.padding.right";
                   to_y: "center1_line";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -22782,10 +22755,10 @@
                   to_x: "elm.padding.right";
                   to_y: "center2_line";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_roman";
@@ -22822,10 +22795,10 @@
                   to_x: "elm.padding.right";
                   to_y: "center3_line";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_roman";
@@ -22862,10 +22835,10 @@
                   to_x: "elm.padding.right";
                   to_y: "center4_line";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_roman";
@@ -22902,10 +22875,10 @@
                   to_x: "elm.padding.right";
                   to_y: "bottom_line";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "slp_roman";
@@ -23091,7 +23064,7 @@
                   relative: 1.0 1.0;
                   to_x: "elm.padding.right";
                }
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          part { name: "elm.text";
@@ -23110,10 +23083,10 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.text.bg";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -23216,9 +23189,9 @@
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
          GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
 
-         GENLIST_PADDING("elm.icon.right", 16, 0, GENLIST_DESCRIPT_LINE_RIGHT("elm.text.4", "elm.padding.top", "elm.padding.bottom"))
-         GENLIST_PADDING("elm.text.1.right", 16, 0, GENLIST_DESCRIPT_LINE_RIGHT("elm.icon.1", "elm.padding.top", "elm.padding.bottom"))
-         GENLIST_PADDING("elm.text.3.right", 16, 0, GENLIST_DESCRIPT_LINE_RIGHT("elm.text.2", "elm.padding.top", "elm.padding.bottom"))
+         GENLIST_PADDING("elm.icon.right", GENLIST_DESCRIPT_LINE_RIGHT("default", "elm.text.4", "elm.padding.top", "elm.padding.bottom", min:16 0; visible: 0;))
+         GENLIST_PADDING("elm.text.1.right", GENLIST_DESCRIPT_LINE_RIGHT("default", "elm.icon.1", "elm.padding.top", "elm.padding.bottom", min:16 0; visible: 0;))
+         GENLIST_PADDING("elm.text.3.right", GENLIST_DESCRIPT_LINE_RIGHT("default", "elm.text.2", "elm.padding.top", "elm.padding.bottom", min:16 0; visible: 0;))
          part { name: "elm.bubble";
             type: IMAGE;
             description{ state: "default" 0.0;
@@ -23245,8 +23218,8 @@
             clip_to: "disclip";
             type: TEXT;
             scale: 1;
-            GENLIST_DESCRIPT_DOT_RT("elm.padding.right", "elm.padding.top")
-               color: GENLIST_TEXT_COLOR_LIST_BUBBLE_TEXT;
+            GENLIST_DESCRIPT_DOT_RT("default", "elm.padding.right", "elm.padding.top",
+               color: GENLIST_LIST_BUBBLE_TEXT_COLOR;
                fixed: 1 1;
                min: GENLIST_ICON_MEDIUM_SIZE 60;
                max: GENLIST_ICON_MEDIUM_SIZE 60;
@@ -23257,25 +23230,25 @@
                   align: 0.5 0.5;
                   text_class: "slp_medium";
                }
-            }
+            )
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
             scale: 1;
-            GENLIST_DESCRIPT_DOT_RT("elm.icon.right", "elm.padding.top")
+            GENLIST_DESCRIPT_DOT_RT("default", "elm.icon.right", "elm.padding.top",
                color: 0 255 255 255;
                fixed: 1 1;
                min: GENLIST_ICON_MEDIUM_SIZE GENLIST_ICON_MEDIUM_SIZE;
-            }
+            )
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
             scale: 1;
-            GENLIST_DESCRIPT_DOT_RB("elm.padding.right", "elm.padding.bottom")
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+            GENLIST_DESCRIPT_DOT_RB("default", "elm.padding.right", "elm.padding.bottom",
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                fixed: 1 1;
                min: 0 48;
                max: 300 48;
@@ -23286,10 +23259,10 @@
                   align: 0.5 0.5;
                   text_class: "slp_medium";
               }
-            }
+            )
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_FOCUS;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -23297,25 +23270,25 @@
             clip_to: "disclip";
             type: TEXT;
             scale: 1;
-            GENLIST_DESCRIPT_DEFAULT("elm.padding.left", "elm.text.1.right", "elm.padding.top", "elm.text.2");
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+            GENLIST_DESCRIPTION("elm.padding.left", "elm.text.1.right", "elm.padding.top", "elm.text.2",
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                fixed: 0 1;
                min: 0 60;
                max: -1 60;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   align: 0.0 0.5;
                   text_class: "list_item";
                }
-            }
+            )
             description { state: "read" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_READ;
+               color: GENLIST_LIST_MAIN_TEXT_READ_COLOR;
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_FOCUS;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -23323,8 +23296,8 @@
             clip_to: "disclip";
             type: TEXT;
             scale: 1;
-            GENLIST_DESCRIPT_DEFAULT("elm.padding.left", "elm.text.3.right", "elm.text.1", "elm.padding.bottom")
-               color: GENLIST_TEXT_COLOR_NAME_TEXT;
+            GENLIST_DESCRIPTION("elm.padding.left", "elm.text.3.right", "elm.text.1", "elm.padding.bottom",
+               color: GENLIST_NAME_TEXT_COLOR;
                fixed: 1 1;
                align: 0.0 0.5;
                min: 0 48;
@@ -23334,7 +23307,7 @@
                   align: 0.0 0.5;
                   text_class: "slp_medium";
                }
-            }
+            )
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          GENLIST_PART_FLIP
@@ -23390,7 +23363,7 @@
             clip_to: "disclip";
             type: TEXTBLOCK;
             scale: 1;
-            GENLIST_DESCRIPT_DOT_RT("elm.padding.right", "elm.padding.top")
+            GENLIST_DESCRIPT_DOT_RT("default", "elm.padding.right", "elm.padding.top",
                fixed: 1 1;
                min: GENLIST_ICON_MEDIUM_SIZE 60;
                max: GENLIST_ICON_MEDIUM_SIZE 60;
@@ -23399,28 +23372,28 @@
                   min: 1 1;
                   align: 0.5 0.5;
                }
-            }
+            )
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXTBLOCK;
             scale: 1;
-            GENLIST_DESCRIPT_DOT_RB("elm.padding.right", "elm.padding.bottom")
+            GENLIST_DESCRIPT_DOT_RB("default", "elm.padding.right", "elm.padding.bottom",
                fixed: 1 1;
                min: 0 48;
                max: 300 48;
                text {
-                  style: "genlist_sub_textblock_style";
+                  style: "genlist_style_list_sub_text_default";
                   min: 1 0;
                   align: 0.5 0.5;
               }
-            }
+            )
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
                           // FIXME: color is not chaned by textblock
-                          color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_FOCUS;
-               text.style: "genlist_sub_textblock_selected_style";
+                          color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
+               text.style: "genlist_style_list_sub_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -23428,26 +23401,26 @@
             clip_to: "disclip";
             type: TEXTBLOCK;
             scale: 1;
-            GENLIST_DESCRIPT_DEFAULT("elm.padding.left", "elm.text.1.right", "elm.padding.top", "elm.text.2");
+            GENLIST_DESCRIPTION("elm.padding.left", "elm.text.1.right", "elm.padding.top", "elm.text.2",
                fixed: 0 1;
                min: 0 60;
                max: -1 60;
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   align: 0.0 0.5;
                }
-            }
+            )
             description { state: "read" 0.0;
                inherit: "default" 0.0;
                           // FIXME: color is not chaned by textblock
-                          color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_READ;
-               text.style: "genlist_style_list_main_text_read";
+                          color: GENLIST_LIST_MAIN_TEXT_READ_COLOR;
+               text.style: "genlist_style_list_main_text_unread";
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
                           // FIXME: color is not chaned by textblock
-                          color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_FOCUS;
-               text.style: "genlist_default_textblock_selected_style";
+                          color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -23455,7 +23428,7 @@
             clip_to: "disclip";
             type: TEXT;
             scale: 1;
-            GENLIST_DESCRIPT_DEFAULT("elm.padding.left", "elm.text.3.right", "elm.text.1", "elm.padding.bottom")
+            GENLIST_DESCRIPTION("elm.padding.left", "elm.text.3.right", "elm.text.1", "elm.padding.bottom",
                fixed: 1 1;
                align: 0.0 0.5;
                min: 0 48;
@@ -23463,7 +23436,7 @@
                   style: "genlist_style_name_text";
                   align: 0.0 0.5;
                }
-            }
+            )
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
          GENLIST_PART_FLIP
@@ -23487,9 +23460,9 @@
             description { state: "default" 0.0;
                fixed: 1 1;
                max: -1 60;
-               color: GENLIST_TEXT_COLOR_LIST_MESSAGE_TEXT;
+               color: GENLIST_LIST_MESSAGE_TEXT_COLOR;
                text {
-                  font: GENLIST_TEXT_SIZE_LIST_MESSAGE_TEXT;
+                  font: GENLIST_LIST_MESSAGE_TEXT_SIZE;
                   min: 1 0;
                   align: 0.5 0.5;
                }
@@ -23549,7 +23522,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                fixed: 0 1;
                min: 0 GENLIST_SIZE_SLIDE_60_INC;
                rel1 { relative: 1.0 1.0;
@@ -23562,7 +23535,7 @@
                }
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -23570,11 +23543,11 @@
             }
             description { state: "read" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_READ;
+               color: GENLIST_LIST_MAIN_TEXT_READ_COLOR;
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_FOCUS;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -23603,7 +23576,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                fixed: 0 1;
                align: 1.0 1.0;
                min: 0 GENLIST_SIZE_SLIDE_60_INC;
@@ -23625,7 +23598,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_FOCUS;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -23692,7 +23665,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_BUBBLE_TEXT;
+               color: GENLIST_LIST_BUBBLE_TEXT_COLOR;
                fixed: 0 1;
                align: 1.0 0.0;
                min: GENLIST_SIZE_28_INC GENLIST_SIZE_48_INC;
@@ -23739,7 +23712,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_NAME_TEXT;
+               color: GENLIST_NAME_TEXT_COLOR;
                fixed: 0 1;
                align: 0.0 0.0;
                min: 0 GENLIST_SIZE_48_INC;
@@ -23761,7 +23734,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -23828,7 +23801,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                fixed: 0 1;
                min: 0 GENLIST_SIZE_SLIDE_60_INC;
                rel1 { relative: 1.0 1.0;
@@ -23841,7 +23814,7 @@
                }
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -23849,11 +23822,11 @@
             }
             description { state: "read" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_READ;
+               color: GENLIST_LIST_MAIN_TEXT_READ_COLOR;
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_FOCUS;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -23882,7 +23855,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                fixed: 0 1;
                align: 1.0 1.0;
                min: 0 GENLIST_SIZE_SLIDE_60_INC;
@@ -23904,7 +23877,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_FOCUS;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -23913,7 +23886,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MESSAGE_TEXT;
+               color: GENLIST_LIST_MESSAGE_TEXT_COLOR;
                fixed: 0 1;
                align: 1.0 0.0;
                min: 0 GENLIST_SIZE_48_INC;
@@ -23960,7 +23933,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_NAME_TEXT;
+               color: GENLIST_NAME_TEXT_COLOR;
                fixed: 0 1;
                align: 0.0 0.0;
                min: 0 GENLIST_SIZE_48_INC;
@@ -23982,7 +23955,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -24050,7 +24023,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                fixed: 0 1;
                min: 0 GENLIST_SIZE_SLIDE_60_INC;
                rel1 { relative: 1.0 1.0;
@@ -24063,7 +24036,7 @@
                }
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -24071,11 +24044,11 @@
             }
             description { state: "read" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_READ;
+               color: GENLIST_LIST_MAIN_TEXT_READ_COLOR;
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_FOCUS;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -24104,7 +24077,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                fixed: 0 1;
                align: 1.0 1.0;
                min: 0 GENLIST_SIZE_SLIDE_60_INC;
@@ -24126,7 +24099,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_FOCUS;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
 
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -24196,7 +24169,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_NAME_TEXT;
+               color: GENLIST_NAME_TEXT_COLOR;
                fixed: 0 1;
                align: 0.0 0.0;
                min: 0 GENLIST_SIZE_48_INC;
@@ -24218,7 +24191,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -24308,7 +24281,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                fixed: 0 1;
                min: 0 GENLIST_SIZE_SLIDE_60_INC;
                rel1 { relative: 1.0 1.0;
@@ -24321,7 +24294,7 @@
                }
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -24329,11 +24302,11 @@
             }
             description { state: "read" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_READ;
+               color: GENLIST_LIST_MAIN_TEXT_READ_COLOR;
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_FOCUS;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -24362,7 +24335,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_DEFAULT;
+               color: GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR;
                fixed: 0 1;
                align: 1.0 1.0;
                min: 0 GENLIST_SIZE_SLIDE_60_INC;
@@ -24384,7 +24357,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_SUB_TEXT_FOCUS;
+               color: GENLIST_LIST_SUB_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -24451,7 +24424,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_BUBBLE_TEXT;
+               color: GENLIST_LIST_BUBBLE_TEXT_COLOR;
                fixed: 0 1;
                align: 1.0 0.0;
                min: GENLIST_SIZE_28_INC GENLIST_SIZE_48_INC;
@@ -24498,7 +24471,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_NAME_TEXT;
+               color: GENLIST_NAME_TEXT_COLOR;
                fixed: 0 1;
                align: 0.0 0.0;
                min: 0 GENLIST_SIZE_48_INC;
@@ -24520,7 +24493,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -24629,7 +24602,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                fixed: 0 1;
                min: 0 GENLIST_SIZE_SLIDE_60_INC;
                rel1 { relative: 1.0 1.0;
@@ -24642,7 +24615,7 @@
                }
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -24650,11 +24623,11 @@
             }
             description { state: "read" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_READ;
+               color: GENLIST_LIST_MAIN_TEXT_READ_COLOR;
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_FOCUS;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -24809,7 +24782,7 @@
             type: TEXT;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_TEXT_COLOR_NAME_TEXT;
+               color: GENLIST_NAME_TEXT_COLOR;
                fixed: 0 1;
                align: 0.0 0.0;
                min: 0 GENLIST_SIZE_48_INC;
@@ -24831,7 +24804,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }
@@ -25084,7 +25057,7 @@
                   to_x: "elm.padding.right";
                   to_y: "text_center_line";
                }
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          part { name: "elm.text.1";
@@ -25103,7 +25076,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.text.bg.1";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_48_INC;
@@ -25143,7 +25116,7 @@
                   to_x: "elm.padding.right";
                   to_y: "text_bottom_line";
                }
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          part { name: "elm.text.2";
@@ -25163,7 +25136,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.text.bg.2";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_48_INC;
@@ -25448,7 +25421,7 @@
                   to_x: "elm.padding.right";
                   to_y: "text_center_line";
                }
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          part { name: "elm.text.1";
@@ -25467,7 +25440,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.text.bg.1";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_48_INC;
@@ -25506,7 +25479,7 @@
                   to_x: "elm.padding.right";
                   to_y: "text_bottom_line";
                }
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          part { name: "elm.text.2";
@@ -25526,7 +25499,7 @@
                   to_x: "elm.padding.right";
                   to_y: "elm.text.bg.2";
                }
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
                   size: GENLIST_FONT_48_INC;
@@ -26071,7 +26044,7 @@
             repeat_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               color: GENLIST_PART_BG_COLOR_INC;
+               color: GENLIST_PART_DIALOGUE_GROUP_BG_COLOR;
             }
          }
          GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
@@ -26188,14 +26161,14 @@
                }
                align: 0.0 0.5;
                text {
-                  style: "genlist_default_textblock_style";
+                  style: "genlist_style_list_main_text_unread";
                   min: 0 1;
                   align: 0.0 0.5;
                }
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               text.style: "genlist_default_textblock_selected_style";
+               text.style: "genlist_style_list_main_text_focus";
             }
             GENLIST_DESCRIPTION_INVISIBLE_SELECTED
             GENLIST_DESCRIPTION_FLIP_ENABLED
@@ -26343,10 +26316,10 @@
                   to_x: "elm.padding.icon2.left";
                }
                align: 0.0 0.5;
-               color: GENLIST_TEXT_COLOR_LIST_MAIN_TEXT_UNREAD;
+               color: GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR;
                text {
                   font: "SLP:style=Roman";
-                  size: GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+                  size: GENLIST_LIST_MAIN_TEXT_SIZE;
                   min: 0 1;
                   align: 0.0 0.5;
                   text_class: "list_item";
@@ -26354,7 +26327,7 @@
             }
             description { state: "selected" 0.0;
                inherit: "default" 0.0;
-               color: GENLIST_PART_TEXT_PRESS_COLOR_INC;
+               color: GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR;
             }
             GENLIST_DESCRIPTION_FLIP_ENABLED
          }

diff --git a/themes/widgets/genlist/genlist_sweep.edc b/themes/widgets/genlist/genlist_sweep.edc
index 572f94a..3232e4c 100644 (file)
--- a/themes/widgets/genlist/genlist_sweep.edc
+++ b/themes/widgets/genlist/genlist_sweep.edc
@@ -31,30 +31,18 @@
       data.item: "treesize" "GENLIST_TREESIZE_DEFAULT";
 
       parts {
+         GENLIST_PART_DISCLIP
          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 )
+         GENLIST_PART_PADDING_LEFT( 133 )
+         GENLIST_PART_PADDING_RIGHT( 133 )
 
          part { name: "elm.slide.swallow.1";
             type: SWALLOW;
             clip_to: "disclip";
             scale: 1;
             mouse_events: 1;
-            description { state: "default" 0.0;
-               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: "elm.padding.right";
-               }
-            }
+            GENLIST_DESCRIPTION_LR("elm.padding.left", "elm.padding.right", fixed: 0 1; min: 486 GENLIST_TEXT_BTN_HEIGHT; max: -1 GENLIST_TEXT_BTN_HEIGHT; align: 0.5 0.5;)
          }
          // Transparent part between base parts and slidable parts
          part { name: "event_block_layer";
@@ -78,14 +66,8 @@
             clip_to: "disclip";
             type: SWALLOW;
             description { state: "default" 0.0;
-               rel1 {
-                  relative: 0 0;
-                  to: "base";
-               }
-               rel2 {
-                  relative: 1 1;
-                  to: "base";
-               }
+               rel1.to: "base";
+               rel2.to: "base";
             }
             description { state: "slide" 0.0;
                inherit: "default" 0.0;
@@ -99,7 +81,6 @@
                }
             }
          }
-         GENLIST_PART_DISCLIP
       }
       programs {
          program {
@@ -147,20 +128,11 @@
       inherit: "elm/genlist/item/mode/slide/default";
       data.item: "contents" "elm.slide.swallow.1 elm.slide.swallow.2";
       parts {
+         GENLIST_PART_PADDING_LEFT( GENLIST_PADDING_SIZE_LEFT )
+         GENLIST_PART_PADDING_RIGHT( GENLIST_PADDING_SIZE_RIGHT )
+         GENLIST_PART_PADDING("elm.padding.center", GENLIST_PADDING_SIZE_DEFAULT, 0.5 0, 0.5 1)
          part { name: "elm.slide.swallow.1";
-            description { state: "default" 0.0;
-               min: 336 GENLIST_TEXT_BTN_HEIGHT;
-               max: 336 GENLIST_TEXT_BTN_HEIGHT;
-               align: 0 0.5;
-               rel1 {
-                  relative: 1 0;
-                  to_x: "elm.padding.left";
-               }
-               rel2 {
-                  relative: 1 1;
-                  to_x: "elm.padding.left";
-               }
-            }
+            GENLIST_DESCRIPTION_LR("elm.padding.left", "elm.padding.center", fixed: 1 1; min: 336 GENLIST_TEXT_BTN_HEIGHT; max: -1 GENLIST_TEXT_BTN_HEIGHT; align: 0.5 0.5;)
          }
          part { name: "elm.slide.swallow.2";
             type: SWALLOW;
@@ -168,20 +140,7 @@
             scale: 1;
             mouse_events: 1;
             insert_before: "event_block_layer";
-            description { state: "default" 0.0;
-               fixed: 1 1;
-               min: 336 GENLIST_TEXT_BTN_HEIGHT;
-               max: 336 GENLIST_TEXT_BTN_HEIGHT;
-               align: 1.0 0.5;
-               rel1 {
-                  relative: 0 0;
-                  to_x: "elm.padding.right";
-               }
-               rel2 {
-                  relative: 0 1;
-                  to_x: "elm.padding.right";
-               }
-            }
+            GENLIST_DESCRIPTION_LR("elm.padding.center", "elm.padding.right", fixed: 1 1; min: 336 GENLIST_TEXT_BTN_HEIGHT; max: -1 GENLIST_TEXT_BTN_HEIGHT; align: 0.5 0.5;)
          }
       }
    }
@@ -192,51 +151,21 @@
       inherit: "elm/genlist/item/mode/slide2/default";
       data.item: "contents" "elm.slide.swallow.1 elm.slide.swallow.2 elm.slide.swallow.3";
       parts {
+         GENLIST_PART_PADDING("elm.padding.center", GENLIST_PADDING_SIZE_DEFAULT, 0.333 0, 0.333 1)
+         GENLIST_PART_PADDING("elm.padding.center1", GENLIST_PADDING_SIZE_DEFAULT, 0.666 0, 0.666 1)
          part { name: "elm.slide.swallow.1";
-            description { state: "default" 0.0;
-               min: 219 GENLIST_TEXT_BTN_HEIGHT;
-               max: 219 GENLIST_TEXT_BTN_HEIGHT;
-            }
+            GENLIST_DESCRIPTION_LR("elm.padding.left", "elm.padding.center", fixed: 1 1; min: 219 GENLIST_TEXT_BTN_HEIGHT; max: -1 GENLIST_TEXT_BTN_HEIGHT; align: 0.5 0.5;)
          }
          part { name: "elm.slide.swallow.2";
-            type: SWALLOW;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.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: "elm.slide.swallow.3";
-                  offset: -GENLIST_PADDING_SIZE_DEFAULT 0;
-               }
-            }
+            GENLIST_DESCRIPTION_LR("elm.padding.center", "elm.padding.center1", fixed: 1 1; min: 218 GENLIST_TEXT_BTN_HEIGHT; max: -1 GENLIST_TEXT_BTN_HEIGHT; align: 0.5 0.5;)
          }
          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: 219 GENLIST_TEXT_BTN_HEIGHT;
-               max: 219 GENLIST_TEXT_BTN_HEIGHT;
-               fixed: 1 0;
-               align: 1 0.5;
-               rel1 {
-                  relative: 0 0;
-                  to: "elm.padding.right";
-               }
-               rel2 {
-                  relative: 0 1;
-                  to: "elm.padding.right";
-               }
-            }
+            mouse_events: 1;
+            insert_before: "event_block_layer";
+            GENLIST_DESCRIPTION_LR("elm.padding.center1", "elm.padding.right", fixed: 1 1; min: 219 GENLIST_TEXT_BTN_HEIGHT; max: -1 GENLIST_TEXT_BTN_HEIGHT; align: 0.5 0.5;)
          }
       }
    }
@@ -248,74 +177,30 @@
       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 {
+         GENLIST_PART_PADDING("elm.padding.center", GENLIST_PADDING_SIZE_DEFAULT, 0.25 0, 0.25 1)
+         GENLIST_PART_PADDING("elm.padding.center1", GENLIST_PADDING_SIZE_DEFAULT, 0.5 0, 0.5 1)
+         GENLIST_PART_PADDING("elm.padding.center2", GENLIST_PADDING_SIZE_DEFAULT, 0.75 0, 0.75 1)
          part { name: "elm.slide.swallow.1";
-            type: SWALLOW;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 156 GENLIST_TEXT_BTN_HEIGHT;
-               max: 156 GENLIST_TEXT_BTN_HEIGHT;
-            }
+            GENLIST_DESCRIPTION_LR("elm.padding.left", "elm.padding.center", fixed: 1 1; min: 156 GENLIST_TEXT_BTN_HEIGHT; max: -1 GENLIST_TEXT_BTN_HEIGHT; align: 0.5 0.5;)
          }
          part { name: "elm.slide.swallow.2";
-            description { state: "default" 0.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";
-               }
-            }
+            GENLIST_DESCRIPTION_LR("elm.padding.center", "elm.padding.center1", fixed: 1 1; min: 156 GENLIST_TEXT_BTN_HEIGHT; max: -1 GENLIST_TEXT_BTN_HEIGHT; align: 0.5 0.5;)
          }
-
          part { name: "elm.slide.swallow.3";
-            type: SWALLOW;
-            clip_to: "disclip";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 156 GENLIST_TEXT_BTN_HEIGHT;
-               max: 156 GENLIST_TEXT_BTN_HEIGHT;
-               align: 1.0 0.5;
-               rel1 {
-                  relative: 1 0;
-                  to: "elm.slide.swallow.1";
-               }
-               rel2 {
-                  relative: 0 1;
-                  to: "elm.slide.swallow.4";
-                  offset: -GENLIST_PADDING_SIZE_DEFAULT 0;
-               }
-            }
+            GENLIST_DESCRIPTION_LR("elm.padding.center1", "elm.padding.center2", fixed: 1 1; min: 156 GENLIST_TEXT_BTN_HEIGHT; max: -1 GENLIST_TEXT_BTN_HEIGHT; align: 0.5 0.5;)
          }
          part { name: "elm.slide.swallow.4";
             type: SWALLOW;
             clip_to: "disclip";
             scale: 1;
-            insert_before: "elm.slide.swallow.3";
-            description { state: "default" 0.0;
-               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: "elm.padding.right";
-               }
-            }
+            mouse_events: 1;
+            insert_before: "event_block_layer";
+            GENLIST_DESCRIPTION_LR("elm.padding.center2", "elm.padding.right", fixed: 1 1; min: 156 GENLIST_TEXT_BTN_HEIGHT; max: -1 GENLIST_TEXT_BTN_HEIGHT; align: 0.5 0.5;)
          }
       }
    }
 
+// ---------------------------------------- Belows are not used anymore ?? ------------------------------------------------------
    group { name: "elm/genlist/item/mode/slide.1text/default";
       alias: "elm/genlist/item_odd/mode/slide.1text/default";
       alias: "elm/genlist/item_compress/mode/slide.1text/default";
@@ -874,7 +759,7 @@
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: 0 GENLIST_TEXT_SIZE_LIST_MAIN_TEXT;
+               min: 0 GENLIST_LIST_MAIN_TEXT_SIZE;
                fixed: 0 1;
                align: 0.5 0;
                rel1 {

diff --git a/themes/widgets/genlist/genlist_textblock_style.edc b/themes/widgets/genlist/genlist_textblock_style.edc
index a3c6f0e..4b3cab5 100644 (file)
--- a/themes/widgets/genlist/genlist_textblock_style.edc
+++ b/themes/widgets/genlist/genlist_textblock_style.edc
@@ -29,105 +29,85 @@
 
 styles {
    style { name: "text_style"; // TODO: remove this later
-      base: "font=SLP:style=Roman font_size=28 color=#000000 wrap=char ellipsis=1.0 text_class=list_item";
+      base: "font=SLP:style=Regular font_size=28 color=#000000 wrap=char ellipsis=1.0 text_class=list_item";
       tag:  "br" "\n";
       tag:  "ps" "ps";
       tag:  "tab" "\t";
       tag:  "b" "+ font=SLP:style=Bold";
       tag:  "match" "+ color=#E58616FF";
    }
-   style { name: "genlist_default_textblock_style";
-      base: "font=SLP:style=Roman font_size="GENLIST_TEXT_SIZE_LIST_MAIN_TEXT" color="GENLIST_TEXT_COLOR_STYLE_LIST_MAIN_TEXT_READ" text_class=list_item ellipsis=1.0";
-      TEXTBLOCK_TAG
-   }
-   style { name: "genlist_default_textblock_selected_style";
-      base: "font=SLP:style=Roman font_size="GENLIST_TEXT_SIZE_LIST_MAIN_TEXT" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
+   style { name: "genlist_style_list_main_text_unread";
+      base: "font=SLP:style=Regular font_size="GENLIST_LIST_MAIN_TEXT_SIZE" color="GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR_STYLE" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
    style { name: "genlist_style_list_main_text_read";
-      base: "font=SLP:style=Roman font_size="GENLIST_TEXT_SIZE_LIST_MAIN_TEXT" color="GENLIST_TEXT_COLOR_STYLE_LIST_MAIN_TEXT_READ" text_class=list_item ellipsis=1.0";
-      TEXTBLOCK_TAG
-   }
-   style { name: "genlist_style_name_text";
-      base: "font=SLP:style=Medium font_size="GENLIST_TEXT_SIZE_NAME_TEXT" color="GENLIST_TEXT_COLOR_STYLE_NAME_TEXT" text_class=list_item ellipsis=1.0";
-      TEXTBLOCK_TAG
-   }
-   style { name: "genlist_style_list_message_text";
-      base: "font=SLP:style=Medium font_size="GENLIST_TEXT_SIZE_LIST_MESSAGE_TEXT" color="GENLIST_TEXT_COLOR_LIST_MESSAGE_TEXT_STYLE" text_class=list_item ellipsis=1.0";
-      TEXTBLOCK_TAG
-   }
-   style { name: "genlist_sub_textblock_style";
-      base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_32_INC" color="GENLIST_TEXT_COLOR_STYLE_LIST_SUB_TEXT" text_class=list_item ellipsis=1.0";
+      base: "font=SLP:style=Regular font_size="GENLIST_LIST_MAIN_TEXT_SIZE" color="GENLIST_LIST_MAIN_TEXT_READ_COLOR_STYLE" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_sub_textblock_selected_style";
-      base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_32_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
+   style { name: "genlist_style_list_main_text_focus";
+      base: "font=SLP:style=Regular font_size="GENLIST_LIST_MAIN_TEXT_SIZE" color="GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR_STYLE" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_multiline_textblock_style";
-      base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_32_INC" color="GENLIST_PART_FONT_MULTILINE_TEXT_STYLE_COLOR_INC" wrap=char text_class=list_item";
+   style { name: "genlist_style_list_sub_text_default";
+      base: "font=SLP:style=Medium font_size="GENLIST_LIST_SUB_TEXT_SIZE" color="GENLIST_LIST_SUB_TEXT_DEFAULT_COLOR_STYLE" ellipsis=1.0";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_multiline_textblock_selected_style";
-      base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_32_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" wrap=char text_class=list_item";
+   style { name: "genlist_style_list_sub_text_focus";
+      base: "font=SLP:style=Medium font_size="GENLIST_LIST_SUB_TEXT_SIZE" color="GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR_STYLE" ellipsis=1.0";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_textblock_style";
-      base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_42_INC" color="GENLIST_PART_FONT_3LINE_MAIN_TEXT_UNREAD_STYLE_COLOR_INC" wrap=char text_class=list_item";
-      TEXTBLOCK_TAG
-   }
-   style { name: "genlist_textblock_selected_style";
-      base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_42_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" wrap=char text_class=list_item";
+   style { name: "genlist_style_name_text";
+      base: "font=SLP:style=Medium font_size="GENLIST_NAME_TEXT_SIZE" color="GENLIST_NAME_TEXT_COLOR_STYLE" ellipsis=1.0";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_textblock_sub_style";
-      base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_36_INC" color="GENLIST_PART_FONT_3LINE_MAIN_TEXT_2_STYLE_COLOR_INC" wrap=char text_class=list_item";
+   style { name: "genlist_style_list_message_text";
+      base: "font=SLP:style=Medium font_size="GENLIST_LIST_MESSAGE_TEXT_SIZE" color="GENLIST_LIST_MESSAGE_TEXT_COLOR_STYLE" ellipsis=1.0";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_textblock_sub_selected_style";
-      base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_36_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" wrap=char text_class=list_item";
+   style { name: "genlist_style_multiline_text";
+      base: "font=SLP:style=Medium font_size="GENLIST_MULTILINE_TEXT_SIZE" color="GENLIST_MULTILINE_TEXT_COLOR_STYLE" wrap=mixed text_class=list_item";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_textblock_flexible_style";
-      base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_48_INC" color="GENLIST_PART_FONT_FLEXIBLE_TEXT_MAIN_STYLE_COLOR_INC" wrap=char text_class=list_item";
+   style { name: "genlist_style_multiline_list_main_text_unread";
+      base: "font=SLP:style=Regular font_size="GENLIST_LIST_MAIN_TEXT_SIZE" color="GENLIST_LIST_MAIN_TEXT_UNREAD_COLOR_STYLE" wrap=char text_class=list_item";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_textblock_flexible_selected_style";
-      base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_48_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" wrap=char text_class=list_item";
+   style { name: "genlist_style_multiline_list_main_text_focus";
+      base: "font=SLP:style=Regular font_size="GENLIST_LIST_MAIN_TEXT_SIZE" color="GENLIST_LIST_MAIN_TEXT_FOCUS_COLOR_STYLE" wrap=char text_class=list_item";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_textblock_flexible_sub_style";
-      base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_36_INC" color="GENLIST_PART_FONT_FLEXIBLE_TEXT_SUB_STYLE_COLOR_INC" wrap=char text_class=list_item";
+   style { name: "genlist_style_flexible_text_sub";
+      base: "font=SLP:style=Medium font_size="GENLIST_FLEXIBLE_TEXT_SUB_SIZE" color="GENLIST_FLEXIBLE_TEXT_SUB_COLOR_STYLE" wrap=char";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_textblock_flexible_sub_selected_style";
-      base: "font=SLP:style=Roman font_size="GENLIST_FONT_STYLE_36_INC" color="GENLIST_PART_TEXT_PRESS_STYLE_COLOR_INC" wrap=char text_class=list_item";
+   style { name: "genlist_style_dialogue_group_help_text";
+      base: "font=SLP:style=Medium font_size="GENLIST_DIALOGUE_GROUP_HELP_TEXT_SIZE" color="GENLIST_DIALOGUE_GROUP_HELP_TEXT_COLOR_STYLE" wrap=mixed text_class=list_item";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_textblock_help_style";
-      base: "font=SLP:style=Medium font_size="GENLIST_FONT_STYLE_32_INC" color="GENLIST_PART_FONT_HELP_TEXT_STYLE_COLOR_INC" wrap=mixed text_class=list_item";
+   style { name: "genlist_style_list_bubble_text";
+      base: "font=SLP:style=Medium font_size="GENLIST_LIST_BUBBLE_TEXT_SIZE" color="GENLIST_LIST_BUBBLE_TEXT_COLOR_STYLE"  text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
 
    /* email styles */
    style { name: "genlist_email_textblock_selected_style";
-      base: "font=SLP:style=Roman font_size="GENLIST_TEXT_SIZE_LIST_MAIN_TEXT" color="GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0";
+      base: "font=SLP:style=Regular font_size="GENLIST_LIST_MAIN_TEXT_SIZE" color="GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
    style { name: "genlist_email_textblock_read_style";
-      base: "font=SLP:style=Roman font_size="GENLIST_TEXT_SIZE_LIST_MAIN_TEXT" color="GENLIST_PART_TEXTBLOCK_READ_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
+      base: "font=SLP:style=Regular font_size="GENLIST_LIST_MAIN_TEXT_SIZE" color="GENLIST_PART_TEXTBLOCK_READ_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
    style { name: "genlist_email_textblock_unread_style";
-      base: "font=SLP:style=Roman font_size="GENLIST_TEXT_SIZE_LIST_MAIN_TEXT" color="GENLIST_PART_TEXTBLOCK_UNREAD_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
+      base: "font=SLP:style=Regular font_size="GENLIST_LIST_MAIN_TEXT_SIZE" color="GENLIST_PART_TEXTBLOCK_UNREAD_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
    style { name: "genlist_email_textblock_urgency_unread_style";
-      base: "font=SLP:style=Roman font_size="GENLIST_TEXT_SIZE_LIST_MAIN_TEXT" color="GENLIST_PART_TEXTBLOCK_URGENCY_UNREAD_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
+      base: "font=SLP:style=Regular font_size="GENLIST_LIST_MAIN_TEXT_SIZE" color="GENLIST_PART_TEXTBLOCK_URGENCY_UNREAD_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
    style { name: "genlist_email_textblock_urgency_read_style";
-      base: "font=SLP:style=Roman font_size="GENLIST_TEXT_SIZE_LIST_MAIN_TEXT" color="GENLIST_PART_TEXTBLOCK_URGENCY_READ_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
+      base: "font=SLP:style=Regular font_size="GENLIST_LIST_MAIN_TEXT_SIZE" color="GENLIST_PART_TEXTBLOCK_URGENCY_READ_STYLE_COLOR_INC" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
    style { name: "genlist_email_textblock2_style";
@@ -138,9 +118,6 @@ styles {
       base: "font=SLP:style=Medium font_size="GENLIST_FONT_32_INC" color="GENLIST_PART_TEXTBLOCK_STYLE_SELECTED_COLOR_INC" text_class=list_item ellipsis=1.0";
       TEXTBLOCK_TAG
    }
-   style { name: "genlist_style_list_bubble_text";
-      base: "font=SLP:style=Medium font_size="GENLIST_TEXT_SIZE_LIST_BUBBLE_TEXT" color="GENLIST_TEXT_COLOR_LIST_BUBBLE_TEXT_STYLE"  text_class=list_item ellipsis=1.0";
-      TEXTBLOCK_TAG
-   }
+
 
 }