projects / framework / uifw / efl-theme-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 084efc2)
[Genlist] Renamed BEAT_GENLIST_xxx macro to GENLIST_xxx. It's not good
authorDaniel Juyung Seo <juyung.seo@samsung.com>
Thu, 2 Jun 2011 02:16:36 +0000 (11:16 +0900)
committerDaniel Juyung Seo <juyung.seo@samsung.com>
Thu, 2 Jun 2011 02:16:36 +0000 (11:16 +0900)
to have a theme name in macro name.

themes/groups/genlist/genlist_edit.edc patch | blob | history
themes/groups/genlist/genlist_expandable_list.edc patch | blob | history
themes/groups/genlist/genlist_group_title.edc patch | blob | history
themes/groups/genlist/genlist_macro.edc patch | blob | history
themes/groups/genlist/genlist_styles.edc patch | blob | history
themes/inc/nbeat-black-inc.edc patch | blob | history
themes/inc/nbeat-inc.edc patch | blob | history

diff --git a/themes/groups/genlist/genlist_edit.edc b/themes/groups/genlist/genlist_edit.edc
index 6f0267f..8128768 100644 (file)
--- a/themes/groups/genlist/genlist_edit.edc
+++ b/themes/groups/genlist/genlist_edit.edc
@@ -47,9 +47,9 @@
                color: 0 0 0 0;
             }
          }
-         BEAT_GENLIST_PART_PADDING_TOP( 0 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 0 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_PADDING_TOP( 0 )
+         GENLIST_PART_PADDING_BOTTOM( 0 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
 
          part { name: "elm.padding.reorder";
             type: RECT;
@@ -278,7 +278,7 @@
              visible: 1;
           }
        }
-       BEAT_GENLIST_PART_DISCLIP
+       GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_disabled";
@@ -422,9 +422,9 @@
                color: 0 0 0 0;
             }
          }
-         BEAT_GENLIST_PART_PADDING_TOP( 0 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 0 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_PADDING_TOP( 0 )
+         GENLIST_PART_PADDING_BOTTOM( 0 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
 
          part { name: "elm.padding.reorder";
             type: RECT;
@@ -653,7 +653,7 @@
              visible: 1;
           }
        }
-       BEAT_GENLIST_PART_DISCLIP
+       GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_disabled";
@@ -793,9 +793,9 @@
                color: 0 0 0 0;
             }
          }
-         BEAT_GENLIST_PART_PADDING_TOP( 0 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 0 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_PADDING_TOP( 0 )
+         GENLIST_PART_PADDING_BOTTOM( 0 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
 
          part { name: "elm.edit_bg";
             type: RECT;
@@ -978,7 +978,7 @@
               visible: 0;
           }
        }
-       BEAT_GENLIST_PART_DISCLIP
+       GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_disabled";
@@ -1070,9 +1070,9 @@
                color: 0 0 0 0;
             }
          }
-         BEAT_GENLIST_PART_PADDING_TOP( 0 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 0 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_PADDING_TOP( 0 )
+         GENLIST_PART_PADDING_BOTTOM( 0 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
 
          part { name: "elm.edit_bg";
             type: RECT;
@@ -1219,7 +1219,7 @@
                align: 1.0 1.0;
           }
        }
-       BEAT_GENLIST_PART_DISCLIP
+       GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_disabled";
@@ -1324,12 +1324,12 @@
                color: 239 237 230 255;
             }
          }
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 0 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 0 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 0 )
+         GENLIST_PART_PADDING_BOTTOM( 0 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
 
          part { name: "elm.padding.icon.right";
             type: RECT;
@@ -1401,7 +1401,7 @@
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
          }
-       BEAT_GENLIST_PART_DISCLIP
+       GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
diff --git a/themes/groups/genlist/genlist_expandable_list.edc b/themes/groups/genlist/genlist_expandable_list.edc
index e40b1a9..95ed564 100644 (file)
--- a/themes/groups/genlist/genlist_expandable_list.edc
+++ b/themes/groups/genlist/genlist_expandable_list.edc
@@ -42,10 +42,10 @@
       parts { \
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT() \
          GENLIST_EXPANDABLE_PART_BASE( 70, GE_COLOR ) \
-         BEAT_GENLIST_PART_BOTTOM_EFFECT_LINE \
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 ) \
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 ) \
-         BEAT_GENLIST_PART_EXPANDABLE_SWALLOW_PADDING  \
+         GENLIST_PART_BOTTOM_EFFECT_LINE \
+         GENLIST_PART_PADDING_LEFT( 10 ) \
+         GENLIST_PART_PADDING_RIGHT( 10 ) \
+         GENLIST_PART_EXPANDABLE_SWALLOW_PADDING  \
          part { name: "touch_arrow"; \
             type: RECT; \
             clip_to: "disclip"; \
@@ -89,8 +89,8 @@
                inherit: "default" 0.0; \
                image.normal: "00_button_expand_opened.png"; \
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          } \
          part { name: "elm.padding.arrow.left"; \
             type: RECT; \
@@ -134,10 +134,10 @@
                inherit: "default" 0.0; \
                color: 225 225 225 255; \
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          } \
-         BEAT_GENLIST_PART_DISCLIP \
+         GENLIST_PART_DISCLIP \
       } \
       programs { \
          program { \
@@ -192,7 +192,7 @@
             target: "arrow"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_UNVISIBLE() \
+            GENLIST_PROGRAM_MAP_UNVISIBLE() \
             target: "base"; \
             target: "elm.text"; \
             target: "arrow"; \
@@ -200,7 +200,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START() \
+            GENLIST_PROGRAM_MAP_ROTATE_START() \
             target: "base"; \
             target: "elm.text"; \
             target: "arrow"; \
@@ -208,7 +208,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.3 ) \
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.3 ) \
             target: "base"; \
             target: "elm.text"; \
             target: "arrow"; \
@@ -216,7 +216,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_END() \
+            GENLIST_PROGRAM_MAP_END() \
             target: "base"; \
             target: "elm.text"; \
             target: "arrow"; \
@@ -224,7 +224,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2() \
+            GENLIST_PROGRAM_MAP_ROTATE_START2() \
             target: "base"; \
             target: "elm.text"; \
             target: "arrow"; \
@@ -232,7 +232,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.3 ) \
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.3 ) \
             target: "base"; \
             target: "elm.text"; \
             target: "arrow"; \
@@ -240,7 +240,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_END2() \
+            GENLIST_PROGRAM_MAP_END2() \
             target: "base"; \
             target: "elm.text"; \
             target: "arrow"; \
@@ -285,10 +285,10 @@
       parts { \
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT() \
          GENLIST_EXPANDABLE_PART_BASE( 70, GE_COLOR ) \
-         BEAT_GENLIST_PART_BOTTOM_EFFECT_LINE \
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 ) \
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 ) \
-         BEAT_GENLIST_PART_EXPANDABLE_SWALLOW_PADDING  \
+         GENLIST_PART_BOTTOM_EFFECT_LINE \
+         GENLIST_PART_PADDING_LEFT( 10 ) \
+         GENLIST_PART_PADDING_RIGHT( 10 ) \
+         GENLIST_PART_EXPANDABLE_SWALLOW_PADDING  \
          part { name: "elm.swallow.end"; \
             type: SWALLOW; \
             scale: 1; \
@@ -301,8 +301,8 @@
                   to_x: "elm.padding.right"; \
                } \
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          } \
         part { name: "elm.text"; \
             clip_to: "disclip"; \
@@ -332,10 +332,10 @@
                inherit: "default" 0.0; \
                color: 225 225 225 255; \
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          } \
-         BEAT_GENLIST_PART_DISCLIP \
+         GENLIST_PART_DISCLIP \
       } \
       programs { \
          program { name: "go_active"; \
@@ -366,7 +366,7 @@
             target: "disclip"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_UNVISIBLE() \
+            GENLIST_PROGRAM_MAP_UNVISIBLE() \
             target: "base"; \
             target: "elm.text"; \
             target: "elm.swallow.pad"; \
@@ -374,7 +374,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START() \
+            GENLIST_PROGRAM_MAP_ROTATE_START() \
             target: "base"; \
             target: "elm.text"; \
             target: "elm.swallow.pad"; \
@@ -382,7 +382,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.3 ) \
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.3 ) \
             target: "base"; \
             target: "elm.text"; \
             target: "elm.swallow.end"; \
@@ -390,7 +390,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_END() \
+            GENLIST_PROGRAM_MAP_END() \
             target: "base"; \
             target: "elm.text"; \
             target: "elm.swallow.end"; \
@@ -398,7 +398,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2() \
+            GENLIST_PROGRAM_MAP_ROTATE_START2() \
             target: "base"; \
             target: "elm.text"; \
             target: "elm.swallow.end"; \
@@ -406,7 +406,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.3 ) \
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.3 ) \
             target: "base"; \
             target: "elm.text"; \
             target: "elm.swallow.end"; \
@@ -414,7 +414,7 @@
             target: "bottom_line"; \
          } \
          program { \
-            BEAT_GENLIST_PROGRAM_MAP_END2() \
+            GENLIST_PROGRAM_MAP_END2() \
             target: "base"; \
             target: "elm.text"; \
             target: "elm.swallow.end"; \
@@ -464,13 +464,13 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
          GENLIST_EXPANDABLE_PART_BASE( 81, GENLIST_EXPANDABLE_PART_BG_COLOR_INC)
-         BEAT_GENLIST_PART_BOTTOM_EFFECT_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
-         BEAT_GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
+         GENLIST_PART_BOTTOM_EFFECT_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
+         GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "touch_arrow";
             type: RECT;
             clip_to: "disclip";
@@ -514,8 +514,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                image.normal: "00_button_expand_opened.png";
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
          part { name: "elm.padding.arrow.left";
             type: RECT;
@@ -563,8 +563,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -595,10 +595,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          program {
@@ -655,7 +655,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "arrow";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START()
+            GENLIST_PROGRAM_MAP_ROTATE_START()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -665,7 +665,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -675,7 +675,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END()
+            GENLIST_PROGRAM_MAP_END()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -685,7 +685,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2()
+            GENLIST_PROGRAM_MAP_ROTATE_START2()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -695,7 +695,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -705,7 +705,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END2()
+            GENLIST_PROGRAM_MAP_END2()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -754,13 +754,13 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
          GENLIST_EXPANDABLE_PART_BASE( 81, GENLIST_EXPANDABLE_PART_BG_COLOR_INC )
-         BEAT_GENLIST_PART_BOTTOM_EFFECT_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
-         BEAT_GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
+         GENLIST_PART_BOTTOM_EFFECT_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
+         GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "touch_arrow";
             type: RECT;
             clip_to: "disclip";
@@ -804,8 +804,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                image.normal: "00_button_expand_opened.png";
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
          part { name: "elm.padding.arrow.left";
             type: RECT;
@@ -853,8 +853,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -885,10 +885,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          program {
@@ -945,7 +945,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "arrow";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START()
+            GENLIST_PROGRAM_MAP_ROTATE_START()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -955,7 +955,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -965,7 +965,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END()
+            GENLIST_PROGRAM_MAP_END()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -975,7 +975,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2()
+            GENLIST_PROGRAM_MAP_ROTATE_START2()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -985,7 +985,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -995,7 +995,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END2()
+            GENLIST_PROGRAM_MAP_END2()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -1044,13 +1044,13 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
          GENLIST_EXPANDABLE_PART_BASE( 81, GENLIST_EXPANDABLE_PART_BG_COLOR_INC )
-         BEAT_GENLIST_PART_BOTTOM_EFFECT_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
-         BEAT_GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
+         GENLIST_PART_BOTTOM_EFFECT_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
+         GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "touch_arrow";
             type: RECT;
             clip_to: "disclip";
@@ -1094,8 +1094,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                image.normal: "00_button_expand_opened.png";
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
          part { name: "elm.padding.arrow.left";
             type: RECT;
@@ -1143,8 +1143,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -1175,10 +1175,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          program {
@@ -1235,7 +1235,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "arrow";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START()
+            GENLIST_PROGRAM_MAP_ROTATE_START()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -1245,7 +1245,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -1255,7 +1255,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END()
+            GENLIST_PROGRAM_MAP_END()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -1265,7 +1265,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2()
+            GENLIST_PROGRAM_MAP_ROTATE_START2()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -1275,7 +1275,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -1285,7 +1285,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END2()
+            GENLIST_PROGRAM_MAP_END2()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -1335,13 +1335,13 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
          GENLIST_EXPANDABLE_PART_BASE( 81, GENLIST_EXPANDABLE_PART_BG_COLOR_INC )
-         BEAT_GENLIST_PART_BOTTOM_EFFECT_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
-         BEAT_GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
+         GENLIST_PART_BOTTOM_EFFECT_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
+         GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "touch_arrow";
             type: RECT;
             clip_to: "disclip";
@@ -1385,8 +1385,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                image.normal: "00_button_expand_opened.png";
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
          part { name: "elm.padding.arrow.left";
             type: RECT;
@@ -1468,8 +1468,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -1500,10 +1500,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          program {
@@ -1560,7 +1560,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "arrow";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START()
+            GENLIST_PROGRAM_MAP_ROTATE_START()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -1571,7 +1571,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -1582,7 +1582,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END()
+            GENLIST_PROGRAM_MAP_END()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -1593,7 +1593,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2()
+            GENLIST_PROGRAM_MAP_ROTATE_START2()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -1604,7 +1604,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -1615,7 +1615,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END2()
+            GENLIST_PROGRAM_MAP_END2()
             target: "base";
             target: "elm.text.1";
             target: "elm.text.2";
@@ -1667,11 +1667,11 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
          GENLIST_EXPANDABLE_PART_BASE( 71, 242 238 233 255 )
-         BEAT_GENLIST_PART_BOTTOM_EFFECT_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
-         BEAT_GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
+         GENLIST_PART_BOTTOM_EFFECT_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
+         GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "touch_arrow";
             type: RECT;
             clip_to: "disclip";
@@ -1715,8 +1715,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                image.normal: "00_button_expand_opened.png";
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
          part { name: "elm.padding.arrow.left";
             type: RECT;
@@ -1759,10 +1759,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          program {
@@ -1817,7 +1817,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "arrow";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START()
+            GENLIST_PROGRAM_MAP_ROTATE_START()
             target: "base";
             target: "elm.text";
             target: "arrow";
@@ -1826,7 +1826,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
             target: "base";
             target: "elm.text";
             target: "arrow";
@@ -1835,7 +1835,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END()
+            GENLIST_PROGRAM_MAP_END()
             target: "base";
             target: "elm.text";
             target: "arrow";
@@ -1844,7 +1844,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2()
+            GENLIST_PROGRAM_MAP_ROTATE_START2()
             target: "base";
             target: "elm.text";
             target: "arrow";
@@ -1853,7 +1853,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
             target: "base";
             target: "elm.text";
             target: "arrow";
@@ -1862,7 +1862,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END2()
+            GENLIST_PROGRAM_MAP_END2()
             target: "base";
             target: "elm.text";
             target: "arrow";
@@ -1908,11 +1908,11 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
          GENLIST_EXPANDABLE_PART_BASE( 71, 242 238 233 255 )
-         BEAT_GENLIST_PART_BOTTOM_EFFECT_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
-         BEAT_GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
+         GENLIST_PART_BOTTOM_EFFECT_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
+         GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "elm.text";
             clip_to: "disclip";
             type: TEXT;
@@ -1941,10 +1941,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                color: 225 225 225 255;
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -1975,7 +1975,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "disclip";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START()
+            GENLIST_PROGRAM_MAP_ROTATE_START()
             target: "base";
             target: "elm.text";
             target: "elm.rect.dialogue";
@@ -1983,7 +1983,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
             target: "base";
             target: "elm.text";
             target: "elm.rect.dialogue";
@@ -1991,7 +1991,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END()
+            GENLIST_PROGRAM_MAP_END()
             target: "base";
             target: "elm.text";
             target: "elm.rect.dialogue";
@@ -1999,7 +1999,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2()
+            GENLIST_PROGRAM_MAP_ROTATE_START2()
             target: "base";
             target: "elm.text";
             target: "elm.rect.dialogue";
@@ -2007,7 +2007,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
             target: "base";
             target: "elm.text";
             target: "elm.rect.dialogue";
@@ -2015,7 +2015,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END2()
+            GENLIST_PROGRAM_MAP_END2()
             target: "base";
             target: "elm.text";
             target: "elm.rect.dialogue";
@@ -2059,11 +2059,11 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
          GENLIST_EXPANDABLE_PART_BASE( 71, 242 238 233 255 )
-         BEAT_GENLIST_PART_BOTTOM_EFFECT_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
-         BEAT_GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
+         GENLIST_PART_BOTTOM_EFFECT_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
+         GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "elm.padding.icon.right";
             type: RECT;
             scale: 1;
@@ -2097,8 +2097,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                   to_x: "elm.swallow.pad";
                }
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
          part { name: "elm.text";
             clip_to: "disclip";
@@ -2126,10 +2126,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                color: 225 225 225 255;
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -2160,7 +2160,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "disclip";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START()
+            GENLIST_PROGRAM_MAP_ROTATE_START()
             target: "base";
             target: "elm.text";
             target: "elm.rect.dialogue";
@@ -2169,7 +2169,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
             target: "base";
             target: "elm.text";
             target: "elm.icon";
@@ -2178,7 +2178,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END()
+            GENLIST_PROGRAM_MAP_END()
             target: "base";
             target: "elm.text";
             target: "elm.icon";
@@ -2187,7 +2187,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2()
+            GENLIST_PROGRAM_MAP_ROTATE_START2()
             target: "base";
             target: "elm.text";
             target: "elm.icon";
@@ -2196,7 +2196,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
             target: "base";
             target: "elm.text";
             target: "elm.icon";
@@ -2205,7 +2205,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END2()
+            GENLIST_PROGRAM_MAP_END2()
             target: "base";
             target: "elm.text";
             target: "elm.icon";
@@ -2252,11 +2252,11 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
          GENLIST_EXPANDABLE_PART_BASE( 71, 242 238 233 255 )
-         BEAT_GENLIST_PART_BOTTOM_EFFECT_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
-         BEAT_GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
+         GENLIST_PART_BOTTOM_EFFECT_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
+         GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "elm.padding.icon.right";
             type: RECT;
             scale: 1;
@@ -2290,8 +2290,8 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                   to_x: "elm.swallow.pad";
                }
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
          part { name: "elm.text";
             clip_to: "disclip";
@@ -2319,10 +2319,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                color: 225 225 225 255;
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -2353,7 +2353,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "disclip";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START()
+            GENLIST_PROGRAM_MAP_ROTATE_START()
             target: "base";
             target: "elm.text";
             target: "elm.rect.dialogue";
@@ -2362,7 +2362,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
             target: "base";
             target: "elm.text";
             target: "elm.icon";
@@ -2371,7 +2371,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END()
+            GENLIST_PROGRAM_MAP_END()
             target: "base";
             target: "elm.text";
             target: "elm.icon";
@@ -2380,7 +2380,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2()
+            GENLIST_PROGRAM_MAP_ROTATE_START2()
             target: "base";
             target: "elm.text";
             target: "elm.icon";
@@ -2389,7 +2389,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
             target: "base";
             target: "elm.text";
             target: "elm.icon";
@@ -2398,7 +2398,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END2()
+            GENLIST_PROGRAM_MAP_END2()
             target: "base";
             target: "elm.text";
             target: "elm.icon";
@@ -2444,11 +2444,11 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
       parts {
          GENLIST_EXPANDABLE_PART_PERSPECTIVE_POINT()
          GENLIST_EXPANDABLE_PART_BASE( 71, 218 212 205 255 )
-         BEAT_GENLIST_PART_BOTTOM_EFFECT_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
-         BEAT_GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
+         GENLIST_PART_BOTTOM_EFFECT_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM
+         GENLIST_PART_EXPANDABLE_SWALLOW_PADDING
          part { name: "elm.text";
             clip_to: "disclip";
             type: TEXT;
@@ -2477,10 +2477,10 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
                inherit: "default" 0.0;
                color: 225 225 225 255;
             }
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0)
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0)
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -2511,7 +2511,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "disclip";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START()
+            GENLIST_PROGRAM_MAP_ROTATE_START()
             target: "base";
             target: "elm.text";
             target: "elm.rect.dialogue";
@@ -2519,7 +2519,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH( 0.4 )
             target: "base";
             target: "elm.text";
             target: "elm.rect.dialogue";
@@ -2527,7 +2527,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END()
+            GENLIST_PROGRAM_MAP_END()
             target: "base";
             target: "elm.text";
             target: "elm.rect.dialogue";
@@ -2535,7 +2535,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2()
+            GENLIST_PROGRAM_MAP_ROTATE_START2()
             target: "base";
             target: "elm.text";
             target: "elm.rect.dialogue";
@@ -2543,7 +2543,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
+            GENLIST_PROGRAM_MAP_ROTATE_FINISH2( 0.4 )
             target: "base";
             target: "elm.text";
             target: "elm.rect.dialogue";
@@ -2551,7 +2551,7 @@ GENLIST_EXPANDABLE_ITEM_GROUP("expandable3", GENLIST_EXPANDABLE3_PART_BG_COLOR_I
             target: "bottom_line";
          }
          program {
-            BEAT_GENLIST_PROGRAM_MAP_END2()
+            GENLIST_PROGRAM_MAP_END2()
             target: "base";
             target: "elm.text";
             target: "elm.rect.dialogue";
diff --git a/themes/groups/genlist/genlist_group_title.edc b/themes/groups/genlist/genlist_group_title.edc
index 8561328..bb7c261 100644 (file)
--- a/themes/groups/genlist/genlist_group_title.edc
+++ b/themes/groups/genlist/genlist_group_title.edc
@@ -42,8 +42,8 @@
       }
       parts {
          GENLIST_GROUP_PART_BASE_EVENT_INC
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "rect";
             type: RECT;
             repeat_events: 1;
@@ -125,8 +125,8 @@
                color: 0 0 0 0;
             }
          }
-         BEAT_GENLIST_PART_PADDING_LEFT( 15 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 15 )
+         GENLIST_PART_PADDING_LEFT( 15 )
+         GENLIST_PART_PADDING_RIGHT( 15 )
          part { name: "text_base";
             type: RECT;
             repeat_events: 1;
@@ -183,8 +183,8 @@
                color: 0 0 0 0;
             }
          }
-         BEAT_GENLIST_PART_PADDING_LEFT( 15 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 15 )
+         GENLIST_PART_PADDING_LEFT( 15 )
+         GENLIST_PART_PADDING_RIGHT( 15 )
          part { name: "text_base";
             type: RECT;
             repeat_events: 1;
@@ -234,9 +234,9 @@
       data.item: "treesize" "20";
 
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 41 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_BASE( 41 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
 
          part { name: "elm.text";
             type: TEXT;
@@ -283,7 +283,7 @@
       data.item: "treesize" "20";
 
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 21 )
+         GENLIST_PART_DIALOGUE_BASE( 21 )
          part { name: "bottom_line";
             type: RECT;
             description { state: "default" 0.0;
diff --git a/themes/groups/genlist/genlist_macro.edc b/themes/groups/genlist/genlist_macro.edc
index 79229ee..1718cea 100644 (file)
--- a/themes/groups/genlist/genlist_macro.edc
+++ b/themes/groups/genlist/genlist_macro.edc
@@ -23,7 +23,7 @@
  *
  */
 
-#define BEAT_GENLIST_PART_BASE( param_item_height ) \
+#define GENLIST_PART_BASE( param_item_height ) \
          part { name: "base"; \
             type: RECT; \
             repeat_events: 1; \
@@ -34,7 +34,7 @@
             } \
          }
 
-#define BEAT_GENLIST_PART_BG \
+#define GENLIST_PART_BG \
          part { name: "bg"; \
             type: RECT; \
             clip_to: "disclip"; \
@@ -64,7 +64,7 @@
             } \
          }
 
-#define BEAT_GENLIST_PART_BG_IMAGE \
+#define GENLIST_PART_BG_IMAGE \
          part { name: "bg_image"; \
             type: RECT; \
             clip_to: "disclip"; \
@@ -78,7 +78,7 @@
             } \
          }
 
-#define BEAT_GENLIST_PART_BOTTOM_LINE \
+#define GENLIST_PART_BOTTOM_LINE \
          part { name: "bottom_line"; \
             type: RECT; \
             clip_to: "disclip"; \
@@ -95,7 +95,7 @@
             } \
          }
 
-#define BEAT_GENLIST_PART_BOTTOM_EFFECT_LINE \
+#define GENLIST_PART_BOTTOM_EFFECT_LINE \
          part { name: "bottom_line"; \
             type: RECT; \
             clip_to: "disclip"; \
@@ -110,11 +110,11 @@
                   offset: 0 -1; \
                } \
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          }
 
-#define BEAT_GENLIST_PART_PADDING_TOP( param_padding_size ) \
+#define GENLIST_PART_PADDING_TOP( param_padding_size ) \
        part { name: "elm.padding.top"; \
             type: RECT; \
             scale: 1; \
@@ -128,7 +128,7 @@
             } \
          }
 
-#define BEAT_GENLIST_PART_PADDING_TEXT_TOP( param_padding_size ) \
+#define GENLIST_PART_PADDING_TEXT_TOP( param_padding_size ) \
        part { name: "elm.padding.text.top"; \
             type: RECT; \
             scale: 1; \
@@ -142,7 +142,7 @@
             } \
          }
 
-#define BEAT_GENLIST_PART_PADDING_BOTTOM( param_padding_size ) \
+#define GENLIST_PART_PADDING_BOTTOM( param_padding_size ) \
        part { name: "elm.padding.bottom"; \
             type: RECT; \
             scale: 1; \
@@ -155,7 +155,7 @@
             } \
          }
 
-#define BEAT_GENLIST_PART_PADDING_LEFT( param_padding_size ) \
+#define GENLIST_PART_PADDING_LEFT( param_padding_size ) \
          part { name: "elm.padding.left"; \
             type: RECT; \
             scale: 1; \
@@ -168,7 +168,7 @@
             } \
          }
 
-#define BEAT_GENLIST_PART_PADDING_RIGHT( param_padding_size ) \
+#define GENLIST_PART_PADDING_RIGHT( param_padding_size ) \
        part { name: "elm.padding.right"; \
             type: RECT; \
             scale: 1; \
@@ -181,7 +181,7 @@
             } \
          }
 
-#define BEAT_GENLIST_PART_DIALOGUE_BASE( param_item_height ) \
+#define GENLIST_PART_DIALOGUE_BASE( param_item_height ) \
          part { name: "base"; \
             type: RECT; \
             repeat_events: 1; \
@@ -192,7 +192,7 @@
             } \
          }
 
-#define BEAT_GENLIST_PART_DIALOGUE_ITEM \
+#define GENLIST_PART_DIALOGUE_ITEM \
          part { name: "elm.rect.dialogue"; \
             type: RECT; \
             scale: 1; \
@@ -205,7 +205,7 @@
             } \
          }
 
-#define BEAT_GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM \
+#define GENLIST_PART_DIALOGUE_EXPANDABLE_ITEM \
          part { name: "elm.rect.dialogue"; \
             type: RECT; \
             scale: 1; \
@@ -216,11 +216,11 @@
                rel2.relative: 0.0 1.0; \
                align: 0.0 0.0; \
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          }
 
-#define BEAT_GENLIST_PART_SWALLOW_END( param_padding_size ) \
+#define GENLIST_PART_SWALLOW_END( param_padding_size ) \
          part { name: "elm.padding.left.swallow.end";\
             clip_to: "disclip"; \
             type: RECT;\
@@ -252,7 +252,7 @@
             }\
          }
 
-#define BEAT_GENLIST_PART_DISCLIP \
+#define GENLIST_PART_DISCLIP \
         part { name: "disclip"; \
             type: RECT; \
             description { state: "default" 0.0; \
@@ -263,7 +263,7 @@
             } \
          }
 
-#define BEAT_GENLIST_PART_LIST_PICKER_BASE( param_item_height ) \
+#define GENLIST_PART_LIST_PICKER_BASE( param_item_height ) \
          part { name: "base"; \
             type: RECT; \
             repeat_events: 1; \
@@ -274,7 +274,7 @@
             } \
          }
 
-#define BEAT_GENLIST_PART_LIST_PICKER_BOTTOM_LINE \
+#define GENLIST_PART_LIST_PICKER_BOTTOM_LINE \
          part { name: "bottom_line"; \
             type: RECT; \
             clip_to: "disclip"; \
@@ -303,7 +303,7 @@
                         } \
                 }
 
-#define BEAT_GENLIST_PART_MAP_START( param_x, param_y, param_z ) \
+#define GENLIST_PART_MAP_START( param_x, param_y, param_z ) \
                description { state: "map_transition" 0.0; \
                    inherit: "default" 0.0; \
                    color: 86 76 65 255; \
@@ -327,7 +327,7 @@
                         visible: 0; \
                 }
 
-#define BEAT_GENLIST_PART_MAP_FINISH( param_x, param_y, param_z ) \
+#define GENLIST_PART_MAP_FINISH( param_x, param_y, param_z ) \
                 description { \
                         state: "map_rotate" 0.0; \
                         inherit: "default" 0.0; \
@@ -346,7 +346,7 @@
                        } \
                } \
 
-#define BEAT_GENLIST_PART_MAP_BASE( param_item_height ) \
+#define GENLIST_PART_MAP_BASE( param_item_height ) \
          part { name: "base"; \
             type: RECT; \
             repeat_events: 1; \
@@ -355,8 +355,8 @@
                min: 0 param_item_height; \
                color: GENLIST_PART_BG_COLOR_INC; \
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          }
 
 #define GENLIST_EXPANDABLE_PART_BASE( GE_HEIGHT , GE_COLOR ) \
@@ -372,48 +372,48 @@
                inherit: "default" 0.0; \
                color: GENLIST_PART_BG_SELECTED_COLOR_INC; \
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          }
 
-#define BEAT_GENLIST_PROGRAM_MAP_UNVISIBLE() \
+#define GENLIST_PROGRAM_MAP_UNVISIBLE() \
                 name: "unvisible"; \
                 signal: "elm,state,unvisible"; \
                 action: STATE_SET "map_transition" 0.0;
 
-#define BEAT_GENLIST_PROGRAM_MAP_ROTATE_START() \
+#define GENLIST_PROGRAM_MAP_ROTATE_START() \
                 name: "rotaion_transition"; \
                 signal: "flip_item"; \
                 action: STATE_SET "map_transition" 0.0; \
                 after: "rotation";
 
-#define BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH( second ) \
+#define GENLIST_PROGRAM_MAP_ROTATE_FINISH( second ) \
                 name: "rotation"; \
                 action: STATE_SET "map_rotate" 0.0; \
                 transition: LINEAR second; \
                 after: "rotation_end";
 
-#define BEAT_GENLIST_PROGRAM_MAP_END() \
+#define GENLIST_PROGRAM_MAP_END() \
                 name: "rotation_end"; \
                 action: STATE_SET "default" 0.0;
 
-#define BEAT_GENLIST_PROGRAM_MAP_ROTATE_START2() \
+#define GENLIST_PROGRAM_MAP_ROTATE_START2() \
                 name: "rotation_transition2"; \
                 signal: "elm,state,contract_flip"; \
                 action: STATE_SET "map_rotate" 0.0; \
                 after: "rotation2";
 
-#define BEAT_GENLIST_PROGRAM_MAP_ROTATE_FINISH2( second ) \
+#define GENLIST_PROGRAM_MAP_ROTATE_FINISH2( second ) \
                 name: "rotation2"; \
                 action: STATE_SET "map_transition" 0.0; \
                 transition: LINEAR second; \
                 after: "rotation3";
 
-#define BEAT_GENLIST_PROGRAM_MAP_END2() \
+#define GENLIST_PROGRAM_MAP_END2() \
                 name: "rotation3"; \
                 action: STATE_SET "hide" 0.0;
 
-#define BEAT_GENLIST_PART_EXPANDABLE2_NOSHADOW_BASE( param_item_height ) \
+#define GENLIST_PART_EXPANDABLE2_NOSHADOW_BASE( param_item_height ) \
          part { name: "base"; \
             type: RECT; \
             repeat_events: 1; \
@@ -422,11 +422,11 @@
                min: 0 param_item_height; \
                color: GENLIST_EXPANDABLE2_NOSHADOW_BG_COLOR_INC; \
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          }
 
-#define BEAT_GENLIST_PART_EXPANDABLE_SWALLOW_PADDING \
+#define GENLIST_PART_EXPANDABLE_SWALLOW_PADDING \
          part { name: "elm.swallow.pad"; \
             type: SWALLOW; \
             description { state: "default" 0.0; \
@@ -438,11 +438,11 @@
                } \
                rel2.to_x: "elm.padding.left"; \
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          } \
 
-#define BEAT_GENLIST_PART_PADDING_LEFT_SLIDE( param_padding_size ) \
+#define GENLIST_PART_PADDING_LEFT_SLIDE( param_padding_size ) \
          part { name: "elm.padding.left"; \
             type: RECT; \
             scale: 1; \
@@ -458,7 +458,7 @@
          }
 
 /* only for demo */
-#define BEAT_GENLIST_PART_BUTTON( param_name, param_text_name, param_text, param_left, param_right, param_top, param_bottom ) \
+#define GENLIST_PART_BUTTON( param_name, param_text_name, param_text, param_left, param_right, param_top, param_bottom ) \
        part { name: param_name; \
          mouse_events: 1; \
          description { state: "default" 0.0; \
@@ -501,7 +501,7 @@
       }
 
 /* only for demo */
-#define BEAT_GENLIST_PROGRAM_BUTTON( param_name_focused, param_name_normal, param_part_name ) \
+#define GENLIST_PROGRAM_BUTTON( param_name_focused, param_name_normal, param_part_name ) \
       program { name: param_name_focused; \
          source: param_part_name; \
          signal: "mouse,down,1"; \
@@ -515,7 +515,7 @@
          target: param_part_name; \
       }
 
-#define BEAT_GENLIST_PROGRAM_SLIDE_WITH_AFTER( param_name, param_state, param_next ) \
+#define GENLIST_PROGRAM_SLIDE_WITH_AFTER( param_name, param_state, param_next ) \
       program { name: param_name; \
          action:  STATE_SET "hide" param_state; \
          target: "bg"; \
@@ -523,7 +523,7 @@
          after: param_next; \
       }
 
-#define BEAT_GENLIST_PROGRAM_SLIDE( param_name, param_state_name, param_state_value ) \
+#define GENLIST_PROGRAM_SLIDE( param_name, param_state_name, param_state_value ) \
       program { name: param_name; \
          action:  STATE_SET param_state_name param_state_value; \
          target: "bg"; \
@@ -542,7 +542,7 @@
       color: 0 0 0 (255*(1-param_state_value/0.20)); \
    }
 
-#define BEAT_GENLIST_EDIT_PART_BASE( param_item_height ) \
+#define GENLIST_EDIT_PART_BASE( param_item_height ) \
          part { name: "base"; \
             type: RECT; \
             repeat_events: 0; \
@@ -553,7 +553,7 @@
             } \
          }
 
-#define BEAT_GENLIST_PART_RENAME \
+#define GENLIST_PART_RENAME \
          part { name: "elm.edit.rename"; \
             clip_to: "disclip"; \
             type: SWALLOW; \
@@ -577,13 +577,13 @@
             } \
          }
 
-#define BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED \
+#define GENLIST_DESCRIPTION_RENAME_ENABLED \
             description { state: "rename_enabled" 0.0; \
                inherit: "default" 0.0; \
                visible: 0; \
             }
 
-#define BEAT_GENLIST_PROGRAM_RENAME_1TEXT \
+#define GENLIST_PROGRAM_RENAME_1TEXT \
          program { name: "rename_enabled"; \
             signal: "elm,state,rename,enabled"; \
             source: "elm"; \
@@ -599,7 +599,7 @@
             target: "elm.edit.rename"; \
          }
 
-#define BEAT_GENLIST_PROGRAM_RENAME_1TEXT_1ICON \
+#define GENLIST_PROGRAM_RENAME_1TEXT_1ICON \
          program { name: "rename_enabled"; \
             signal: "elm,state,rename,enabled"; \
             source: "elm"; \
@@ -617,7 +617,7 @@
             target: "elm.edit.rename"; \
          }
 
-#define BEAT_GENLIST_PROGRAM_RENAME_1TEXT_2ICON \
+#define GENLIST_PROGRAM_RENAME_1TEXT_2ICON \
          program { name: "rename_enabled"; \
             signal: "elm,state,rename,enabled"; \
             source: "elm"; \
@@ -637,7 +637,7 @@
             target: "elm.edit.rename"; \
          }
 
-#define BEAT_GENLIST_PROGRAM_RENAME_1TEXT_3ICON \
+#define GENLIST_PROGRAM_RENAME_1TEXT_3ICON \
          program { name: "rename_enabled"; \
             signal: "elm,state,rename,enabled"; \
             source: "elm"; \
@@ -659,7 +659,7 @@
             target: "elm.edit.rename"; \
          }
 
-#define BEAT_GENLIST_PROGRAM_RENAME_2TEXT \
+#define GENLIST_PROGRAM_RENAME_2TEXT \
          program { name: "rename_enabled"; \
             signal: "elm,state,rename,enabled"; \
             source: "elm"; \
@@ -677,7 +677,7 @@
             target: "elm.edit.rename"; \
          }
 
-#define BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON \
+#define GENLIST_PROGRAM_RENAME_2TEXT_1ICON \
          program { name: "rename_enabled"; \
             signal: "elm,state,rename,enabled"; \
             source: "elm"; \
@@ -697,7 +697,7 @@
             target: "elm.edit.rename"; \
          }
 
-#define BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON \
+#define GENLIST_PROGRAM_RENAME_2TEXT_2ICON \
          program { name: "rename_enabled"; \
             signal: "elm,state,rename,enabled"; \
             source: "elm"; \
@@ -719,7 +719,7 @@
             target: "elm.edit.rename"; \
          }
 
-#define BEAT_GENLIST_PROGRAM_RENAME_2TEXT_3ICON \
+#define GENLIST_PROGRAM_RENAME_2TEXT_3ICON \
          program { name: "rename_enabled"; \
             signal: "elm,state,rename,enabled"; \
             source: "elm"; \
@@ -743,7 +743,7 @@
             target: "elm.edit.rename"; \
          }
 
-#define BEAT_GENLIST_PROGRAM_RENAME_3TEXT \
+#define GENLIST_PROGRAM_RENAME_3TEXT \
          program { name: "rename_enabled"; \
             signal: "elm,state,rename,enabled"; \
             source: "elm"; \
@@ -763,7 +763,7 @@
             target: "elm.edit.rename"; \
          }
 
-#define BEAT_GENLIST_PROGRAM_RENAME_3TEXT_1ICON \
+#define GENLIST_PROGRAM_RENAME_3TEXT_1ICON \
          program { name: "rename_enabled"; \
             signal: "elm,state,rename,enabled"; \
             source: "elm"; \
@@ -785,7 +785,7 @@
             target: "elm.edit.rename"; \
          }
 
-#define BEAT_GENLIST_PROGRAM_RENAME_3TEXT_2ICON \
+#define GENLIST_PROGRAM_RENAME_3TEXT_2ICON \
          program { name: "rename_enabled"; \
             signal: "elm,state,rename,enabled"; \
             source: "elm"; \
@@ -809,7 +809,7 @@
             target: "elm.edit.rename"; \
          }
 
-#define BEAT_GENLIST_PROGRAM_RENAME_3TEXT_3ICON \
+#define GENLIST_PROGRAM_RENAME_3TEXT_3ICON \
          program { name: "rename_enabled"; \
             signal: "elm,state,rename,enabled"; \
             source: "elm"; \
diff --git a/themes/groups/genlist/genlist_styles.edc b/themes/groups/genlist/genlist_styles.edc
index 340cd27..9b86d2c 100644 (file)
--- a/themes/groups/genlist/genlist_styles.edc
+++ b/themes/groups/genlist/genlist_styles.edc
@@ -49,11 +49,11 @@
          }
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 58 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 15 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 15 )
+         GENLIST_PART_BASE( 58 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 15 )
+         GENLIST_PART_PADDING_RIGHT( 15 )
          part { name: "elm.swallow.end";
             clip_to: "disclip";
             type: SWALLOW;
@@ -106,7 +106,7 @@
                rel2.to_x: "elm.padding.left";
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -160,11 +160,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 70 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 70 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.swallow.end";
             clip_to: "disclip";
             type: SWALLOW;
@@ -221,7 +221,7 @@
                rel2.to_x: "elm.padding.left";
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -275,9 +275,9 @@
                color: GENLIST_PART_BG_COLOR_INC;
             }
          }
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BOTTOM_LINE
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -292,7 +292,7 @@
                }
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -327,11 +327,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.text";
             clip_to: "disclip";
             type: TEXT;
@@ -358,10 +358,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -396,7 +396,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT
+         GENLIST_PROGRAM_RENAME_1TEXT
       }
    }
 
@@ -412,11 +412,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
@@ -443,7 +443,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.text2.left";
             clip_to: "disclip";
@@ -489,10 +489,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -529,7 +529,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT
+         GENLIST_PROGRAM_RENAME_2TEXT
       }
    }
 
@@ -545,11 +545,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
@@ -576,7 +576,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.text2.left";
             clip_to: "disclip";
@@ -622,10 +622,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -662,7 +662,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT
+         GENLIST_PROGRAM_RENAME_2TEXT
       }
    }
 
@@ -679,11 +679,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -697,7 +697,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
@@ -742,10 +742,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -775,7 +775,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_1ICON
       }
    }
 
@@ -792,11 +792,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -812,7 +812,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
@@ -857,10 +857,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -890,7 +890,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_1ICON
       }
    }
 
@@ -907,11 +907,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -927,7 +927,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
@@ -972,10 +972,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -1005,7 +1005,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_1ICON
       }
    }
 
@@ -1022,11 +1022,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             type: SWALLOW;
             clip_to: "disclip";
@@ -1045,7 +1045,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.left";
             type: RECT;
@@ -1093,7 +1093,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.text.right";
             type: RECT;
@@ -1129,10 +1129,10 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -1162,7 +1162,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_2ICON
       }
    }
 
@@ -1179,11 +1179,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -1202,7 +1202,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -1246,10 +1246,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -1279,7 +1279,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_1ICON
       }
    }
 
@@ -1296,11 +1296,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -1319,7 +1319,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -1362,7 +1362,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.text2.left";
             clip_to: "disclip";
@@ -1408,10 +1408,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -1443,7 +1443,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -1460,11 +1460,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -1483,7 +1483,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -1526,7 +1526,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.text2.left";
             clip_to: "disclip";
@@ -1572,10 +1572,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -1607,7 +1607,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -1624,11 +1624,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -1647,7 +1647,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -1680,7 +1680,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -1725,10 +1725,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -1758,7 +1758,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_2ICON
       }
    }
 
@@ -1775,11 +1775,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -1798,7 +1798,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -1833,7 +1833,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -1878,10 +1878,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -1911,7 +1911,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_2ICON
       }
    }
 
@@ -1928,11 +1928,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -1948,7 +1948,7 @@
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -1992,10 +1992,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -2025,7 +2025,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_1ICON
       }
    }
 
@@ -2042,11 +2042,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -2062,7 +2062,7 @@
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -2097,7 +2097,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -2142,10 +2142,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -2175,7 +2175,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_2ICON
       }
    }
 
@@ -2192,11 +2192,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -2212,7 +2212,7 @@
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -2245,7 +2245,7 @@
                rel2.to_x: "elm.padding.icon1.right";
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.right";
             type: RECT;
@@ -2289,10 +2289,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -2322,7 +2322,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_2ICON
       }
    }
 
@@ -2339,11 +2339,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -2359,7 +2359,7 @@
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -2392,7 +2392,7 @@
                rel2.to_x: "elm.padding.icon1.right";
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.right";
             clip_to: "disclip";
@@ -2427,7 +2427,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon3.left";
             clip_to: "disclip";
@@ -2472,10 +2472,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -2505,7 +2505,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_2ICON
       }
    }
 
@@ -2522,11 +2522,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -2542,7 +2542,7 @@
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -2575,7 +2575,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon3.left";
             clip_to: "disclip";
@@ -2608,7 +2608,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -2653,10 +2653,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -2686,7 +2686,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_3ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_3ICON
       }
    }
 
@@ -2702,11 +2702,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 61 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 61 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
@@ -2733,7 +2733,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.text2.left";
             type: RECT;
@@ -2808,10 +2808,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -2877,11 +2877,11 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -2982,10 +2982,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -3051,13 +3051,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -3089,7 +3089,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -3120,10 +3120,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -3160,7 +3160,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT
+         GENLIST_PROGRAM_RENAME_2TEXT
       }
    }
 
@@ -3176,13 +3176,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -3214,7 +3214,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -3245,10 +3245,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -3285,7 +3285,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT
+         GENLIST_PROGRAM_RENAME_2TEXT
       }
    }
 
@@ -3301,13 +3301,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.text.3";
             clip_to: "disclip";
             type: TEXT;
@@ -3339,7 +3339,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.text3.left";
             clip_to: "disclip";
@@ -3387,7 +3387,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -3417,10 +3417,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -3459,7 +3459,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_3TEXT
+         GENLIST_PROGRAM_RENAME_3TEXT
       }
    }
 
@@ -3476,13 +3476,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -3501,7 +3501,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
@@ -3550,7 +3550,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -3581,10 +3581,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -3621,7 +3621,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -3638,13 +3638,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -3665,7 +3665,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
@@ -3714,7 +3714,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -3745,10 +3745,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -3785,7 +3785,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -3802,13 +3802,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -3840,7 +3840,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.icon";
             clip_to: "disclip";
@@ -3860,7 +3860,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
@@ -3907,10 +3907,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -3947,7 +3947,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -3964,13 +3964,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.text.3";
             clip_to: "disclip";
             type: TEXT;
@@ -4002,7 +4002,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.text3.left";
             clip_to: "disclip";
@@ -4041,7 +4041,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
@@ -4088,7 +4088,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -4119,10 +4119,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -4161,7 +4161,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_3TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_3TEXT_1ICON
       }
    }
 
@@ -4178,13 +4178,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -4205,7 +4205,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -4243,7 +4243,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -4292,7 +4292,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -4322,10 +4322,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -4362,7 +4362,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_2ICON
       }
    }
 
@@ -4378,13 +4378,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -4416,7 +4416,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -4447,10 +4447,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -4487,7 +4487,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT
+         GENLIST_PROGRAM_RENAME_2TEXT
       }
    }
 
@@ -4504,13 +4504,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -4529,7 +4529,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
@@ -4578,7 +4578,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -4609,10 +4609,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -4649,7 +4649,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -4666,13 +4666,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -4693,7 +4693,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
@@ -4742,7 +4742,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -4773,10 +4773,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -4813,7 +4813,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -4830,13 +4830,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.2";
             clip_to: "disclip";
             type: SWALLOW;
@@ -4857,7 +4857,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -4906,7 +4906,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -4940,7 +4940,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.text2.right";
             clip_to: "disclip";
@@ -4978,10 +4978,10 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -5018,7 +5018,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_2ICON
       }
    }
 
@@ -5035,13 +5035,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -5062,7 +5062,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -5111,7 +5111,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -5141,10 +5141,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -5181,7 +5181,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -5198,13 +5198,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -5226,7 +5226,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -5275,7 +5275,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.text3.left";
             clip_to: "disclip";
@@ -5323,7 +5323,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -5353,10 +5353,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -5395,7 +5395,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_3TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_3TEXT_1ICON
       }
    }
 
@@ -5412,13 +5412,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -5439,7 +5439,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -5488,7 +5488,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -5518,10 +5518,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -5558,7 +5558,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -5575,13 +5575,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -5602,7 +5602,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -5651,7 +5651,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.icon.2";
             clip_to: "disclip";
@@ -5671,7 +5671,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -5717,10 +5717,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -5757,7 +5757,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_2ICON
       }
    }
 
@@ -5774,13 +5774,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -5801,7 +5801,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -5839,7 +5839,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -5888,7 +5888,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -5918,10 +5918,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -5958,7 +5958,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_2ICON
       }
    }
 
@@ -5975,13 +5975,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -6002,7 +6002,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -6051,7 +6051,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -6081,10 +6081,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -6121,7 +6121,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -6138,13 +6138,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -6165,7 +6165,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -6203,7 +6203,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -6252,7 +6252,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -6282,10 +6282,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -6322,7 +6322,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_2ICON
       }
    }
 
@@ -6339,13 +6339,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -6366,7 +6366,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -6404,7 +6404,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.right";
             clip_to: "disclip";
@@ -6453,7 +6453,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -6483,10 +6483,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -6523,7 +6523,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_2ICON
       }
    }
 
@@ -6540,13 +6540,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.swallow.colorbar";
             clip_to: "disclip";
             type: SWALLOW;
@@ -6589,7 +6589,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.icon.1";
             clip_to: "disclip";
@@ -6608,7 +6608,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.left";
             clip_to: "disclip";
@@ -6657,7 +6657,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -6691,7 +6691,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -6729,7 +6729,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon3.left";
             clip_to: "disclip";
@@ -6767,7 +6767,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon4.left";
             clip_to: "disclip";
@@ -6805,10 +6805,10 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -6847,7 +6847,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_3TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_3TEXT_2ICON
       }
    }
 
@@ -6864,13 +6864,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.swallow.colorbar";
             clip_to: "disclip";
             type: SWALLOW;
@@ -6900,7 +6900,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -6949,7 +6949,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.1";
             clip_to: "disclip";
@@ -6983,7 +6983,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.left";
             clip_to: "disclip";
@@ -7021,10 +7021,10 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -7061,7 +7061,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_2ICON
       }
    }
 
@@ -7078,13 +7078,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.swallow.colorbar";
             clip_to: "disclip";
             type: SWALLOW;
@@ -7116,7 +7116,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -7154,7 +7154,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -7203,7 +7203,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -7233,10 +7233,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -7273,7 +7273,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_2ICON
       }
    }
 
@@ -7290,13 +7290,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -7317,7 +7317,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -7366,7 +7366,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.icon.2";
             clip_to: "disclip";
@@ -7388,7 +7388,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             type: RECT;
@@ -7434,10 +7434,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -7474,7 +7474,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_2ICON
       }
    }
 
@@ -7491,13 +7491,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -7518,7 +7518,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
@@ -7567,7 +7567,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -7598,10 +7598,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -7638,7 +7638,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -7655,13 +7655,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.3";
             clip_to: "disclip";
             type: SWALLOW;
@@ -7682,7 +7682,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon3.left";
             clip_to: "disclip";
@@ -7731,7 +7731,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.icon.2";
             clip_to: "disclip";
@@ -7753,7 +7753,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.right";
             clip_to: "disclip";
@@ -7803,7 +7803,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
 
          part { name: "elm.padding.icon1.left";
@@ -7841,10 +7841,10 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -7881,7 +7881,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_3ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_3ICON
       }
    }
 
@@ -7898,13 +7898,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -7925,7 +7925,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
@@ -7974,7 +7974,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -8005,10 +8005,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -8045,7 +8045,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -8062,13 +8062,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -8089,7 +8089,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -8125,7 +8125,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -8174,7 +8174,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.swallow.progress";
             clip_to: "disclip";
@@ -8194,10 +8194,10 @@
                }
                align: 0.5 0.0;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -8268,13 +8268,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -8295,7 +8295,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -8331,7 +8331,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -8380,7 +8380,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -8410,10 +8410,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -8450,7 +8450,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_2ICON
       }
    }
 
@@ -8467,13 +8467,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -8494,7 +8494,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -8543,7 +8543,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.swallow.progress";
             clip_to: "disclip";
@@ -8563,10 +8563,10 @@
                }
                align: 0.5 0.0;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -8651,12 +8651,12 @@
                color: 249 249 249 255;
             }
          }
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 10 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 11 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 10 )
+         GENLIST_PART_PADDING_BOTTOM( 11 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -8716,7 +8716,7 @@
                text.style: "genlist_textblock_sub_selected_style";
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -8769,13 +8769,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 111 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 10 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 10 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 111 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 10 )
+         GENLIST_PART_PADDING_BOTTOM( 10 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.2";
             clip_to: "disclip";
             type: SWALLOW;
@@ -8796,7 +8796,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -8857,7 +8857,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -8890,7 +8890,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.3";
             clip_to: "disclip";
@@ -8923,7 +8923,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.icon.1";
             clip_to: "disclip";
@@ -8945,7 +8945,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -8963,8 +8963,8 @@
                visible: 0;
             }
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -9003,7 +9003,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_3TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_3TEXT_2ICON
       }
    }
 
@@ -9020,13 +9020,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 111 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 10 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 10 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 111 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 10 )
+         GENLIST_PART_PADDING_BOTTOM( 10 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.2";
             clip_to: "disclip";
             type: SWALLOW;
@@ -9047,7 +9047,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -9108,7 +9108,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -9141,7 +9141,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.3";
             clip_to: "disclip";
@@ -9174,7 +9174,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.icon.1";
             clip_to: "disclip";
@@ -9196,7 +9196,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -9214,8 +9214,8 @@
                visible: 0;
             }
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -9254,7 +9254,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_3TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_3TEXT_2ICON
       }
    }
 
@@ -9271,13 +9271,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 111 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 10 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 10 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 111 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 10 )
+         GENLIST_PART_PADDING_BOTTOM( 10 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.text.1.rect";
             clip_to: "disclip";
             type: RECT;
@@ -9321,7 +9321,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -9354,7 +9354,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.3";
             clip_to: "disclip";
@@ -9387,7 +9387,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.icon";
             clip_to: "disclip";
@@ -9409,7 +9409,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -9427,8 +9427,8 @@
                visible: 0;
             }
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -9467,7 +9467,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_3TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_3TEXT_1ICON
       }
    }
 
@@ -9484,13 +9484,13 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 111 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 10 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 10 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 111 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 10 )
+         GENLIST_PART_PADDING_BOTTOM( 10 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.text.1.rect";
             clip_to: "disclip";
             type: RECT;
@@ -9534,7 +9534,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -9567,7 +9567,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.3";
             clip_to: "disclip";
@@ -9600,7 +9600,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.icon";
             clip_to: "disclip";
@@ -9622,7 +9622,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -9640,8 +9640,8 @@
                visible: 0;
             }
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -9680,7 +9680,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_3TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_3TEXT_1ICON
       }
    }
 
@@ -9692,10 +9692,10 @@
       data.item: "selectraise" "on";
       data.item: "labels" "elm.title elm.text.1 elm.text.2";
       parts {
-         BEAT_GENLIST_PART_BASE( 142 )
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BASE( 142 )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "vertical_line";
             clip_to: "disclip";
             type: RECT;
@@ -9815,7 +9815,7 @@
                }
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -9882,12 +9882,12 @@
                color: 249 249 249 255;
             }
          }
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 10 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 11 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 10 )
+         GENLIST_PART_PADDING_BOTTOM( 11 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.title";
             clip_to: "disclip";
             type: TEXT;
@@ -9993,7 +9993,7 @@
                text.style: "genlist_textblock_selected_style";
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -10047,12 +10047,12 @@
                color: 249 249 249 255;
             }
          }
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 10 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 11 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 10 )
+         GENLIST_PART_PADDING_BOTTOM( 11 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -10103,7 +10103,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
@@ -10148,7 +10148,7 @@
                text.style: "genlist_textblock_sub_selected_style";
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -10202,12 +10202,12 @@
                color: 249 249 249 255;
             }
          }
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 10 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 11 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 10 )
+         GENLIST_PART_PADDING_BOTTOM( 11 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -10228,7 +10228,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -10305,7 +10305,7 @@
                text.style: "genlist_textblock_sub_selected_style";
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -10373,8 +10373,8 @@
                }
             }
          }
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 15 )
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_PADDING_BOTTOM( 15 )
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -10438,8 +10438,8 @@
                }
             }
          }
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 15 )
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_PADDING_BOTTOM( 15 )
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -10487,10 +10487,10 @@
       data.item: "treesize" "20";
 
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 41 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_DIALOGUE_BASE( 41 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_BOTTOM_LINE
          part { name: "elm.text";
             type: TEXT;
             scale: 1;
@@ -10530,7 +10530,7 @@
                }
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
    }
 
@@ -10544,9 +10544,9 @@
       data.item: "treesize" "20";
 
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 21 )
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DIALOGUE_BASE( 21 )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_DISCLIP
       }
    }
 
@@ -10560,9 +10560,9 @@
       data.item: "treesize" "20";
 
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 11 )
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DIALOGUE_BASE( 11 )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_DISCLIP
       }
    }
 
@@ -10576,7 +10576,7 @@
       data.item: "treesize" "20";
 
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 20 )
+         GENLIST_PART_DIALOGUE_BASE( 20 )
       }
    }
 
@@ -10590,7 +10590,7 @@
       data.item: "treesize" "20";
 
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 10 )
+         GENLIST_PART_DIALOGUE_BASE( 10 )
       }
    }
 
@@ -10604,9 +10604,9 @@
       data.item: "treesize" "20";
 
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 1 )
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DIALOGUE_BASE( 1 )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_DISCLIP
       }
    }
 
@@ -10623,12 +10623,12 @@
       data.item: "labels" "elm.text";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.text";
             clip_to: "disclip";
             type: TEXT;
@@ -10655,10 +10655,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -10693,7 +10693,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT
+         GENLIST_PROGRAM_RENAME_1TEXT
       }
    }
 
@@ -10707,12 +10707,12 @@
       data.item: "icons" "elm.icon";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -10726,7 +10726,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
@@ -10771,10 +10771,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -10804,7 +10804,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_1ICON
       }
    }
 
@@ -10818,12 +10818,12 @@
       data.item: "icons" "elm.icon";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -10842,7 +10842,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -10887,10 +10887,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -10920,7 +10920,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_1ICON
       }
    }
 
@@ -10934,12 +10934,12 @@
       data.item: "icons" "elm.icon.1 elm.icon.2";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -10958,7 +10958,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -10989,7 +10989,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
@@ -11034,10 +11034,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -11067,7 +11067,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_2ICON
       }
    }
 
@@ -11081,12 +11081,12 @@
       data.item: "icons" "elm.icon";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -11105,7 +11105,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -11149,7 +11149,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.text2.left";
             type: RECT;
@@ -11194,10 +11194,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -11229,7 +11229,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -11243,12 +11243,12 @@
       data.item: "icons" "elm.icon";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -11267,7 +11267,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             type: RECT;
@@ -11311,10 +11311,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -11344,7 +11344,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_1ICON
       }
    }
 
@@ -11358,12 +11358,12 @@
       data.item: "icons" "elm.icon.1 elm.icon.2";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -11382,7 +11382,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -11415,7 +11415,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -11460,10 +11460,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          program { name: "go_active";
@@ -11493,7 +11493,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_2ICON
       }
    }
 
@@ -11507,12 +11507,12 @@
       data.item: "icons" "elm.icon.1 elm.icon.2 elm.icon.3";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -11531,7 +11531,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -11564,7 +11564,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon3.left";
             clip_to: "disclip";
@@ -11597,7 +11597,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -11642,10 +11642,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -11680,7 +11680,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT_3ICON
+         GENLIST_PROGRAM_RENAME_1TEXT_3ICON
       }
    }
 
@@ -11692,12 +11692,12 @@
       data.item: "selectraise" "on";
       data.item: "icons" "elm.icon.1 elm.icon.2 elm.icon.3";
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -11716,7 +11716,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -11749,7 +11749,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon3.left";
             clip_to: "disclip";
@@ -11782,9 +11782,9 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -11817,14 +11817,14 @@
       data.item: "icons" "elm.icon";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 7 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 10 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 7 )
+         GENLIST_PART_PADDING_BOTTOM( 10 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
@@ -11856,7 +11856,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.text2.left";
             clip_to: "disclip";
@@ -11904,7 +11904,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.icon";
             clip_to: "disclip";
@@ -11925,10 +11925,10 @@
                }
                align: 0.0 1.0;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -11965,7 +11965,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -11982,11 +11982,11 @@
       data.item: "labels" "elm.title elm.text";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 17 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 17 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.title";
             clip_to: "disclip";
             type: TEXT;
@@ -12064,7 +12064,7 @@
                   align: 0.0 0.5;
                }
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.edit.rename";
             clip_to: "disclip";
@@ -12088,7 +12088,7 @@
                visible: 1;
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -12121,7 +12121,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT
+         GENLIST_PROGRAM_RENAME_1TEXT
       }
    }
 
@@ -12135,11 +12135,11 @@
       data.item: "icons" "elm.icon";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 17 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 17 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.title";
             clip_to: "disclip";
             type: TEXT;
@@ -12252,7 +12252,7 @@
                   align: 0.0 0.5;
                }
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.edit.rename";
             clip_to: "disclip";
@@ -12276,7 +12276,7 @@
                visible: 1;
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -12309,7 +12309,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_1TEXT
+         GENLIST_PROGRAM_RENAME_1TEXT
       }
    }
 
@@ -12322,11 +12322,11 @@
       data.item: "labels" "elm.text.1 elm.text.2";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 61 )
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 61 )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.text.2";
             clip_to: "disclip";
             type: TEXT;
@@ -12424,7 +12424,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.edit.rename";
             clip_to: "disclip";
@@ -12448,7 +12448,7 @@
                visible: 1;
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -12481,7 +12481,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT
+         GENLIST_PROGRAM_RENAME_2TEXT
       }
    }
 
@@ -12494,14 +12494,14 @@
       data.item: "labels" "elm.text.1 elm.text.2";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -12533,7 +12533,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -12563,10 +12563,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -12603,7 +12603,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT
+         GENLIST_PROGRAM_RENAME_2TEXT
       }
    }
 
@@ -12616,14 +12616,14 @@
       data.item: "labels" "elm.text.1 elm.text.2";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -12655,7 +12655,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -12686,10 +12686,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -12726,7 +12726,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT
+         GENLIST_PROGRAM_RENAME_2TEXT
       }
    }
 
@@ -12739,14 +12739,14 @@
       data.item: "labels" "elm.text.1 elm.text.2";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.text.1";
             clip_to: "disclip";
             type: TEXT;
@@ -12778,7 +12778,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -12808,10 +12808,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -12848,7 +12848,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT
+         GENLIST_PROGRAM_RENAME_2TEXT
       }
    }
 
@@ -12862,14 +12862,14 @@
       data.item: "icons" "elm.icon";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -12885,7 +12885,7 @@
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -12934,7 +12934,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -12964,10 +12964,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -13004,7 +13004,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -13018,14 +13018,14 @@
       data.item: "icons" "elm.icon";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -13041,7 +13041,7 @@
                rel2.to_x: "elm.padding.left";
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.right";
             clip_to: "disclip";
@@ -13090,7 +13090,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -13120,10 +13120,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -13160,7 +13160,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -13174,14 +13174,14 @@
       data.item: "icons" "elm.icon.1 elm.icon.2 elm.swallow.colorbar";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.swallow.colorbar";
             clip_to: "disclip";
             type: SWALLOW;
@@ -13218,7 +13218,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             type: RECT;
@@ -13250,7 +13250,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             type: RECT;
@@ -13298,7 +13298,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -13328,10 +13328,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -13368,7 +13368,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_2ICON
       }
    }
 
@@ -13382,14 +13382,14 @@
       data.item: "icons" "elm.icon.1 elm.icon.2";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -13410,7 +13410,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -13448,7 +13448,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.right";
             clip_to: "disclip";
@@ -13497,7 +13497,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -13527,10 +13527,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -13567,7 +13567,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_2ICON
       }
    }
 
@@ -13581,14 +13581,14 @@
       data.item: "icons" "elm.icon.1 elm.icon.2";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -13609,7 +13609,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -13658,7 +13658,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.icon.2";
             clip_to: "disclip";
@@ -13680,7 +13680,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -13726,10 +13726,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -13766,7 +13766,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_2ICON
       }
    }
 
@@ -13780,14 +13780,14 @@
       data.item: "icons" "elm.icon.1 elm.icon.2";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -13808,7 +13808,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -13846,7 +13846,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -13895,7 +13895,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -13925,10 +13925,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -13965,7 +13965,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_2ICON
       }
    }
 
@@ -13979,14 +13979,14 @@
       data.item: "icons" "elm.icon";
       data.item: "renames" "elm.edit.rename";
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -14007,7 +14007,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon.left";
             clip_to: "disclip";
@@ -14056,7 +14056,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -14087,10 +14087,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -14127,7 +14127,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_1ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_1ICON
       }
    }
 
@@ -14144,13 +14144,13 @@
                color: 249 249 249 255;
             }
          }
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 13 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 14 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 17 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 13 )
+         GENLIST_PART_PADDING_BOTTOM( 14 )
+         GENLIST_PART_PADDING_LEFT( 17 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.title";
             clip_to: "disclip";
             type: TEXT;
@@ -14240,7 +14240,7 @@
                text.style: "genlist_textblock_selected_style";
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -14288,11 +14288,11 @@
       data.item: "selectraise" "on";
       data.item: "labels" "elm.title elm.text.1 elm.text.2";
       parts {
-         BEAT_GENLIST_PART_BASE( 142 )
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 17 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 142 )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 17 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "vertical_line";
             clip_to: "disclip";
             type: RECT;
@@ -14412,7 +14412,7 @@
                }
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -14463,14 +14463,14 @@
          image : "00_input_bg.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 129 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 15 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 129 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 15 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "text";
             clip_to: "disclip";
             type: TEXT;
@@ -14720,7 +14720,7 @@
                align: 0.5 0.5;
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -14773,14 +14773,14 @@
          image: "00_list_bar_press_1x80.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_BASE( 81 )
-         BEAT_GENLIST_PART_BG_IMAGE
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_TOP( 6 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 6 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 81 )
+         GENLIST_PART_BG_IMAGE
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_TOP( 6 )
+         GENLIST_PART_PADDING_BOTTOM( 6 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon.1";
             clip_to: "disclip";
             type: SWALLOW;
@@ -14801,7 +14801,7 @@
                }
                align: 0.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon1.right";
             clip_to: "disclip";
@@ -14839,7 +14839,7 @@
                }
                align: 1.0 0.5;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.padding.icon2.left";
             clip_to: "disclip";
@@ -14888,7 +14888,7 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.text.2";
             clip_to: "disclip";
@@ -14918,10 +14918,10 @@
                inherit: "default" 0.0;
                color: GENLIST_PART_TEXT_SELECTED_COLOR_INC;
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
-         BEAT_GENLIST_PART_RENAME
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_RENAME
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -14958,7 +14958,7 @@
             action: STATE_SET "default" 0.0;
             target: "disclip";
          }
-         BEAT_GENLIST_PROGRAM_RENAME_2TEXT_2ICON
+         GENLIST_PROGRAM_RENAME_2TEXT_2ICON
       }
    }
 
@@ -14974,11 +14974,11 @@
           image: "00_list_thumbnail_bg.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 118 )
-         BEAT_GENLIST_PART_PADDING_TOP( 29 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 30 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_BASE( 118 )
+         GENLIST_PART_PADDING_TOP( 29 )
+         GENLIST_PART_PADDING_BOTTOM( 30 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon1.bg";
             scale: 1;
             description { state: "default" 0.0;
@@ -15110,7 +15110,7 @@
                }
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -15160,11 +15160,11 @@
           image: "00_list_thumbnail_bg.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 118 )
-         BEAT_GENLIST_PART_PADDING_TOP( 21 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 21 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_BASE( 118 )
+         GENLIST_PART_PADDING_TOP( 21 )
+         GENLIST_PART_PADDING_BOTTOM( 21 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon1.bg";
             scale: 1;
             description { state: "default" 0.0;
@@ -15323,7 +15323,7 @@
                }
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -15373,11 +15373,11 @@
           image: "00_list_thumbnail_bg.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 114 )
-         BEAT_GENLIST_PART_PADDING_TOP( 9 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 9 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_BASE( 114 )
+         GENLIST_PART_PADDING_TOP( 9 )
+         GENLIST_PART_PADDING_BOTTOM( 9 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon1.bg";
             scale: 1;
             description { state: "default" 0.0;
@@ -15610,7 +15610,7 @@
                }
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -15667,10 +15667,10 @@
                color: GENLIST_PART_BG_COLOR_INC;
             }
          }
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -15686,7 +15686,7 @@
                }
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -15734,9 +15734,9 @@
       data.item: "icons" "elm.icon";
 
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 46 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_BASE( 46 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon";
            clip_to: "disclip";
             type: SWALLOW;
@@ -15752,7 +15752,7 @@
                }
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -15785,7 +15785,7 @@
       data.item: "icons" "elm.icon.1 elm.icon.2";
 
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 46 )
+         GENLIST_PART_DIALOGUE_BASE( 46 )
          part { name: "elm.icon.1";
            clip_to: "disclip";
             type: SWALLOW;
@@ -15802,7 +15802,7 @@
                rel2.relative: 0.979 1.0;
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -15840,7 +15840,7 @@
       data.item: "icons" "elm.icon.1 elm.icon.2 elm.icon.3";
 
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 46 )
+         GENLIST_PART_DIALOGUE_BASE( 46 )
          part { name: "elm.icon.1";
            clip_to: "disclip";
             type: SWALLOW;
@@ -15865,7 +15865,7 @@
                rel2.relative: 0.979 1.0;
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -15898,10 +15898,10 @@
       data.item: "icons" "elm.icon.1 elm.icon.2 elm.icon.3";
 
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 56 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_PADDING_TOP( 10 )
+         GENLIST_PART_DIALOGUE_BASE( 56 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_PADDING_TOP( 10 )
          part { name: "elm.icon.1";
            clip_to: "disclip";
             type: SWALLOW;
@@ -15990,7 +15990,7 @@
                align: 1.0 0.5;
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -16027,11 +16027,11 @@
       }
 
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 17 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 17 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "vertical_line";
             type: RECT;
             mouse_events: 0;
@@ -16149,7 +16149,7 @@
                visible: 1;
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -16202,11 +16202,11 @@
       data.item: "labels" "elm.title elm.text.1 elm.text.2 elm.text.3 elm.text.4";
 
       parts {
-         BEAT_GENLIST_PART_BASE( 284 )
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 17 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 284 )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 17 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "vertical_line";
             type: RECT;
             mouse_events: 0;
@@ -16401,7 +16401,7 @@
                }
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -16448,11 +16448,11 @@
       data.item: "renames" "elm.edit.rename.title elm.edit.rename.1 elm.edit.rename.2 elm.edit.rename.3 elm.edit.rename.4 elm.edit.rename.5";
 
       parts {
-         BEAT_GENLIST_PART_BASE( 354 )
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 17 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 354 )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 17 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "vertical_line";
             type: RECT;
             mouse_events: 0;
@@ -16549,7 +16549,7 @@
                   align: 0.0 0.5;
                }
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.edit.rename.title";
             clip_to: "disclip";
@@ -16604,7 +16604,7 @@
                   align: 0.0 0.5;
                }
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.edit.rename.1";
             clip_to: "disclip";
@@ -16643,7 +16643,7 @@
                   align: 0.0 0.5;
                }
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.edit.rename.2";
             clip_to: "disclip";
@@ -16682,7 +16682,7 @@
                   align: 0.0 0.5;
                }
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.edit.rename.3";
             clip_to: "disclip";
@@ -16721,7 +16721,7 @@
                   align: 0.0 0.5;
                }
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.edit.rename.4";
             clip_to: "disclip";
@@ -16760,7 +16760,7 @@
                   align: 0.0 0.5;
                }
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.edit.rename.5";
             clip_to: "disclip";
@@ -16776,7 +16776,7 @@
                visible: 1;
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -16863,11 +16863,11 @@
           image: "00_list_thumbnail_bg.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 182 )
-         BEAT_GENLIST_PART_PADDING_TOP( 20 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 20 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 10 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_BASE( 182 )
+         GENLIST_PART_PADDING_TOP( 20 )
+         GENLIST_PART_PADDING_BOTTOM( 20 )
+         GENLIST_PART_PADDING_LEFT( 10 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.bg";
             scale: 1;
             description { state: "default" 0.0;
@@ -17078,7 +17078,7 @@
                   align: 0.0 0.5;
                }
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.edit.rename.1";
             clip_to: "disclip";
@@ -17134,7 +17134,7 @@
                   align: 0.0 0.5;
                }
             }
-            BEAT_GENLIST_DESCRIPTION_RENAME_ENABLED
+            GENLIST_DESCRIPTION_RENAME_ENABLED
          }
          part { name: "elm.edit.rename.2";
             clip_to: "disclip";
@@ -17150,7 +17150,7 @@
                visible: 1;
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -17217,11 +17217,11 @@
       data.item: "icons" "elm.icon";
 
       parts {
-         BEAT_GENLIST_PART_BASE( 71 )
-         BEAT_GENLIST_PART_BOTTOM_LINE
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
-         BEAT_GENLIST_PART_DIALOGUE_ITEM
+         GENLIST_PART_BASE( 71 )
+         GENLIST_PART_BOTTOM_LINE
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_ITEM
          part { name: "elm.icon";
             clip_to: "disclip";
             type: SWALLOW;
@@ -17237,7 +17237,7 @@
                }
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -17292,11 +17292,11 @@
           image: "00_list_thumbnail_bg.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 118 )
-         BEAT_GENLIST_PART_PADDING_TOP( 29 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 30 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_BASE( 118 )
+         GENLIST_PART_PADDING_TOP( 29 )
+         GENLIST_PART_PADDING_BOTTOM( 30 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.bg";
             scale: 1;
             description { state: "default" 0.0;
@@ -17393,7 +17393,7 @@
                }
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
@@ -17444,11 +17444,11 @@
           image: "00_list_thumbnail_bg.png" COMP;
       }
       parts {
-         BEAT_GENLIST_PART_DIALOGUE_BASE( 118 )
-         BEAT_GENLIST_PART_PADDING_TOP( 21 )
-         BEAT_GENLIST_PART_PADDING_BOTTOM( 21 )
-         BEAT_GENLIST_PART_PADDING_LEFT( 20 )
-         BEAT_GENLIST_PART_PADDING_RIGHT( 10 )
+         GENLIST_PART_DIALOGUE_BASE( 118 )
+         GENLIST_PART_PADDING_TOP( 21 )
+         GENLIST_PART_PADDING_BOTTOM( 21 )
+         GENLIST_PART_PADDING_LEFT( 20 )
+         GENLIST_PART_PADDING_RIGHT( 10 )
          part { name: "elm.icon.bg";
             scale: 1;
             description { state: "default" 0.0;
@@ -17572,7 +17572,7 @@
                }
             }
          }
-         BEAT_GENLIST_PART_DISCLIP
+         GENLIST_PART_DISCLIP
       }
       programs {
          // signal: elm,state,%s,active
diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 9a79705..e417b3f 100644 (file)
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -75,8 +75,8 @@
                inherit: "default" 0.0; \
                visible: 1;\
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
           }
 #define GENLIST_PART_BG_EXPANDABLE3_IMAGE_INC \
          part { name: "bg_image"; \
@@ -90,8 +90,8 @@
                inherit: "default" 0.0; \
                visible: 1;\
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          }
 #define GENLIST_EXPANDABLE3_PART_BG_IMAGE_INC \
          part { name: "bg_image"; \
@@ -105,8 +105,8 @@
                inherit: "default" 0.0; \
                visible: 1;\
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          }
 #define GENLIST_EXPANDABLE3_NOSHADOW_PART_BG_IMAGE_INC \
          part { name: "bg_image"; \
@@ -120,8 +120,8 @@
                inherit: "default" 0.0; \
                visible: 1;\
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          }
 
 #define DIALOGUEGROUP_ITEM_TITLE_TEXT_COLOR_INC 130 130 130 255
diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index 85a3fb6..dde68b8 100644 (file)
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -89,8 +89,8 @@
                inherit: "default" 0.0; \
                image.normal: "00_list_bar_press_1x80.png"; \
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
           }
 #define GENLIST_PART_BG_EXPANDABLE3_IMAGE_INC \
          part { name: "bg_image"; \
@@ -107,8 +107,8 @@
                inherit: "default" 0.0; \
                image.normal: "00_list_bar_press_1x80.png"; \
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          }
 #define GENLIST_EXPANDABLE3_PART_BG_IMAGE_INC \
          part { name: "bg_image"; \
@@ -125,8 +125,8 @@
                inherit: "default" 0.0; \
                image.normal: "00_list_bar_press_1x80.png"; \
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          }
 #define GENLIST_EXPANDABLE3_NOSHADOW_PART_BG_IMAGE_INC \
          part { name: "bg_image"; \
@@ -143,8 +143,8 @@
                inherit: "default" 0.0; \
                image.normal: "00_list_bar_press_1x80.png"; \
             } \
-            BEAT_GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
-            BEAT_GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_START(-90.0, 0.0, 0.0) \
+            GENLIST_PART_MAP_FINISH(0.0, 0.0, 0.0) \
          }
 
 #define DIALOGUEGROUP_ITEM_TITLE_TEXT_COLOR_INC 104 94 82 255
Domain: UI Framework / Uncategorized;