removed unused data since we removed deprecated widgets.

74 files changed, 95 insertions, 7520 deletions

diff --git a/themes/groups/button.edc b/themes/groups/button.edc
index e85f6ae1..2ed4bcab 100644
--- a/themes/groups/button.edc
+++ b/themes/groups/button.edc
@@ -1401,461 +1401,6 @@
    }
 
 ///////////////////////////////////////////////////////////////////////////////////////
-   group {  name: "elm/button/base/navigationbar_next_btn/default";
-      //TODO: remove alias later.
-      alias: "elm/button/base/navigationbar_functionbutton/default";
-      script {
-         public button_state = BUTTON_STATE_ENABLED;
-      }
-      parts {
-         part { name: "button_image";
-            scale: 1;
-            description { state: "default" 0.0;
-               min: 16 50;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-            }
-         }
-         part { name: "padding_left";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel2 {
-                  relative: 0.0 1.0;
-               }
-               min: 2 2;
-               fixed: 1 0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "padding_after_right";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1 0;
-               min: 1 0;
-               rel1 {
-                  relative: 1 0.2;
-               }
-               rel2 {
-                  relative: 1 0.8;
-               }
-               fixed: 1 0;
-               color: NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC;
-            }
-         }
-         part { name: "padding_right";
-            type: RECT;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1 0;
-               min: 1 0;
-               rel1 {
-                  to: "padding_after_right";
-               }
-               rel2 {
-                  relative: 0 1;
-                  to: "padding_after_right";
-               }
-               fixed: 1 0;
-               color: NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC;
-            }
-         }
-         part { name: "padding_top";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 0.0 0.0;
-               rel2 {
-                  relative: 1.0 0.0;
-               }
-               min: 2 2;
-               fixed: 0 1;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "padding_bottom";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               align: 1.0 1.0;
-               rel1 {
-                  relative: 0.0 1.0;
-               }
-               min: 2 2;
-               fixed: 0 1;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "icon_rect";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0;
-               min: 0 40;
-               fixed: 1 0;
-               rel1 {
-                  relative: 0.0 1.0;
-                  to_x: "elm.swallow.content";
-                  to_y: "padding_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "elm.swallow.content";
-                  to_y: "padding_bottom";
-               }
-               align: 0.0 0.5;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "padding_icon_text";
-            type: RECT;
-            scale: 1;
-            mouse_events: 0;
-            description { state: "default" 0.0; //when only icon or no icon is there
-               align: 0.0 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to: "icon_rect";
-               }
-               rel2 {
-                  to: "icon_rect";
-               }
-               fixed: 1 0;
-               min: 0 0;
-               color: 0 0 0 0;
-            }
-            description { state: "icononly" 0.0;
-               inherit: "default" 0.0;
-            }
-            description { state: "visible" 0.0; //when icon is visible
-               align: 0.0 0.0;
-               rel1 {
-                  relative: 1.0 0.0;
-                  to: "icon_rect";
-               }
-               rel2 {
-                  to: "icon_rect";
-               }
-               fixed: 1 0;
-               min: 5 0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "elm.swallow.content";
-            type: SWALLOW;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               visible: 0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_left";
-                  to_y: "padding_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left";
-                  to_y: "padding_bottom";
-               }
-               fixed: 1 0;
-            }
-            description { state: "visible" 0.0;
-               fixed: 1 0;
-               align: 0.0 0.5;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_left";
-                  to_y: "padding_top";
-               }
-               rel2 {
-                  relative: 1.0 0.0;
-                  to_x: "padding_left";
-                  to_y: "padding_bottom";
-               }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-            }
-            description { state: "icononly" 0.0;
-               min: 40 40;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_left";
-                  to_y: "padding_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "padding_right";
-                  to_y: "padding_bottom";
-               }
-               aspect: 1.0 1.0;
-               aspect_preference: VERTICAL;
-            }
-         }
-         part { name: "elm.text";
-            type: TEXT;
-            mouse_events: 0;
-            scale: 1;
-            clip_to: "clipper";
-            description { state: "default" 0.0;
-               visible: 0;
-               rel1 {
-                  relative: 1.0 1.0;
-                  to_x: "padding_icon_text";
-                  to_y: "padding_top";
-               }
-               rel2 {
-                  relative: 0.0 0.0;
-                  to_x: "padding_right";
-                  to_y:"padding_bottom";
-               }
-               color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_NORMAL_COLOR_INC;
-               text {
-                  font: "SLP:style=Medium";
-                  size: 20;
-                  min: 0 0;
-               }
-            }
-            description { state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 80 40;
-            }
-            description { state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_PRESSED_COLOR_INC;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               color: 0 0 0 128;
-            }
-            description { state: "disabled_visible" 0.0;
-               inherit: "default" 0.0;
-               color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_COLOR_INC;
-               visible: 1;
-               min: 80 40;
-            }
-            description { state: "focused" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               min: 0 0;
-               color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_FOCUSED_COLOR_INC;
-            }
-         }
-         part { name: "over2";
-            type: RECT;
-            repeat_events: 1;
-            ignore_flags: ON_HOLD;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "over3";
-            type: RECT;
-            repeat_events: 1;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-         }
-         part { name: "clipper";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 255 255 255 255;
-            }
-         }
-         part { name: "disabler";
-            type: RECT;
-            description { state: "default" 0.0;
-               color: 0 0 0 0;
-               visible: 0;
-            }
-            description { state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-            }
-         }
-      }
-      programs {
-         program { name: "button_click";
-            signal: "mouse,down,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,press" "";
-            after: "button_click_anim";
-         }
-         program { name: "button_click_anim";
-            action: STATE_SET "clicked" 0.0;
-            target: "button_image";
-            after: "text_clicked";
-         }
-         program { name: "text_clicked";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "clicked", 0.0);
-            }
-         }
-         program { name: "button_unpress";
-            action: SIGNAL_EMIT "elm,action,unpress" "";
-         }
-         program { name: "button_mouseout_clicked";
-            signal: "mouse,up,1";
-            source: "over3";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (strcmp(st, "icononly"))
-                 {
-                    emit("elm,action,default,text,set", "");
-                    set_state(PART:"elm.text", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"button_image", "default", 0.0);
-            }
-            after: button_unpress;
-         }
-          program { name: "button_unclick3";
-            signal: "mouse,clicked,1";
-            source: "over2";
-            action: SIGNAL_EMIT "elm,action,click" "";
-         }
-         program { name: "text_show";
-            signal: "elm,state,text,visible";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "icononly"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "visible", 0.0);
-                 }
-               if (get_int(button_state) != BUTTON_STATE_DISABLED)
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-            }
-         }
-         program { name: "text_hide";
-            signal: "elm,state,text,hidden";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.swallow.content", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"padding_icon_text", "icononly", 0.0);
-                 }
-               set_state(PART:"elm.text", "default", 0.0);
-            }
-         }
-         program { name: "icon_show";
-            signal: "elm,state,icon,visible";
-            source: "elm";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 {
-                    set_state(PART:"elm.swallow.content", "visible", 0.0);
-                    set_state(PART:"padding_icon_text", "visible", 0.0);
-                 }
-               else
-                 {
-                    set_state(PART:"elm.swallow.content", "icononly", 0.0);
-                    set_state(PART:"padding_icon_text", "icononly", 0.0);
-                 }
-            }
-         }
-         program { name: "icon_hide";
-            signal: "elm,state,icon,hidden";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "elm.swallow.content";
-            target: "padding_icon_text";
-         }
-         program { name: "disable";
-            signal: "elm,state,disabled";
-            source: "elm";
-            action: STATE_SET "disabled" 0.0;
-            target: "button_image";
-            target: "disabler";
-            after: "disable_text";
-         }
-         program { name: "disable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "visible"))
-                 set_state(PART:"elm.text", "disabled_visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "disabled", 0.0);
-               set_int(button_state, BUTTON_STATE_DISABLED);
-            }
-         }
-         program { name: "enable";
-            signal: "elm,state,enabled";
-            source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            target: "disabler";
-            after: "enable_text";
-         }
-         program { name: "enable_text";
-            script {
-               new st[31];
-               new Float:vl;
-               get_state(PART:"elm.text", st, 30, vl);
-               if (!strcmp(st, "disabled_visible"))
-                 set_state(PART:"elm.text", "visible", 0.0);
-               else
-                 set_state(PART:"elm.text", "default", 0.0);
-               set_int(button_state, BUTTON_STATE_ENABLED);
-               }
-         }
-         program { name: "focused";
-            //signal: "elm,action,focus";
-            //source: "elm";
-            action: STATE_SET "focused" 0.0;
-            target: "button_image";
-            target: "elm.text";
-         }
-         program { name: "unfocused";
-            //signal: "elm,action,unfocus";
-            //source: "elm";
-            action: STATE_SET "default" 0.0;
-            target: "button_image";
-            after: "unfocus_text";
-         }
-         program { name: "unfocus_text";
-            action: STATE_SET "visible" 0.0;
-            target: "elm.text";
-         }
-      }
-   }
-
-///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/popup_button/default";
       alias: "elm/button/base/popup_button/menustyle";
       alias: "elm/button/base/popup_button/liststyle";
@@ -3185,7 +2730,7 @@
             }
             description { state: "disabled_visible" 0.0;
                inherit: "default" 0.0;
-               color: BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_COLOR_INC;
+               color: BUTTON_TEXT_STYLE1_TEXT_DISABLED_COLOR_INC;
                visible: 1;
                min: 80 0;
             }
@@ -5958,10 +5503,6 @@
    group { name: "elm/button/base/naviframe/back_btn/default";
        alias: "elm/button/base/naviframe/prev_btn/default";
        alias: "elm/button/base/naviframe/end_btn/default";
-       //TODO: Remove this alias later
-       alias: "elm/button/base/navigationbar_prev_btn/default";
-       alias: "elm/button/base/navigationbar_backbutton/default";
-       alias: "elm/button/base/navigationbar_end_btn/default";
        images {
          image: "00_winset_btn_prev.png" COMP;
          image: "00_winset_btn_prev_press.png" COMP;
@@ -5972,7 +5513,7 @@
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_NAVIBAR_BACK_BUTTON_BUTTON_IMAGE_MIN_INC;
+               min: BUTTON_NAVIFRAME_BACK_BUTTON_IMAGE_MIN_INC;
                color: 0 0 0 0;
             }
             description {
@@ -5993,7 +5534,7 @@
                rel1 { relative: 1 0.2; }
                rel2 { relative: 1 0.8; }
                fixed: 1 0;
-               color: NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_RIGHT_SEPARATOR_COLOR_INC;
             }
          }
          part {name: "padding_before_right";
@@ -6005,15 +5546,15 @@
                rel1 { relative: 0 0; to: "padding_right"; }
                rel2 { relative: 0 1; to: "padding_right"; }
                fixed: 1 0;
-               color: NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC;
+               color: BUTTON_NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC;
             }
          }
          part { name: "button_center_part";
             mouse_events: 0;
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_NAVIBAR_BACK_BUTTON_BG_MIN_MAX_INC;
-               max: BUTTON_NAVIBAR_BACK_BUTTON_BG_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC;
                align: 0.5 0.5;
                rel2 { relative: 0 1; to_x: "padding_before_right"; }
                image {
@@ -6478,10 +6019,6 @@
 ///////////////////////////////////////////////////////////////////////////////////////
       group { name: "elm/button/base/naviframe_control/default";
          alias: "elm/button/base/naviframe_control/center";
-         alias: "elm/button/base/navigationbar_control/default";
-         alias: "elm/button/base/navigationbar_control/left";
-         alias: "elm/button/base/navigationbar_control/right";
-         alias: "elm/button/base/navigationbar_control/center";
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
@@ -6494,12 +6031,12 @@
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_W_INC BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_H_INC;
+               min: BUTTON_NAVIFRAME_CENTER_BG_NORMAL_MIN_INC;
                color: 0 0 0 0;
                rel1.offset: 0 0;
                rel2.offset: -1 -1;
                image.normal: "00_Option_header_bt.png";
-               image.border: BUTTON_NAVIBAR_CENTER_BG_NORMAL_BORDER_INC;
+               image.border: BUTTON_NAVIFRAME_CENTER_BG_NORMAL_BORDER_INC;
                color: 255 255 255 255;
             }
             description { state: "disabled" 0.0;
@@ -6520,7 +6057,7 @@
                align: 0.0 0.0;
                rel1.relative: 0.0 0.0;
                rel2.relative: 0.0 0.0;
-               min: BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -6534,7 +6071,7 @@
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
                rel2.relative: 1.0 1.0;
-               min: BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -6555,7 +6092,7 @@
             }
             description { state: "visible" 0.0;
                visible: 1;
-               min: BUTTON_NAVIBAR_CENTER_ICON_RECT_VISIBLE_MIN_SIZE;
+               min: BUTTON_NAVIFRAME_CENTER_ICON_RECT_VISIBLE_MIN_SIZE;
                fixed: 1 0;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 1.0 0.0; to_x: "padding_left_top"; to_y: "padding_right_bottom"; }
@@ -6585,7 +6122,7 @@
                rel1 { relative: 1.0 0.0; to: "icon_rect"; }
                rel2 { relative: 1.0 1.0; to: "icon_rect"; }
                fixed: 1 0;
-               min: BUTTON_NAVIBAR_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC;
+               min: BUTTON_NAVIFRAME_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC;
                color: 0 0 0 0;
             }
             description { state: "icononly" 0.0;
@@ -6602,7 +6139,7 @@
                rel1 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "padding_right_bottom"; }
                fixed: 1 0;
-               min: BUTTON_NAVIBAR_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC;
+               min: BUTTON_NAVIFRAME_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC;
                color: 0 0 0 0;
             }
          }
@@ -6620,8 +6157,8 @@
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
-               min: BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
-               max: BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
                align: 1.0 0.5;
                rel1 { relative: 0.0 1.0; to_x: "padding_before_text"; to_y: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to_x: "padding_before_text"; to_y: "padding_right_bottom"; }
@@ -6630,8 +6167,8 @@
             }
             description { state: "icononly" 0.0;
                visible: 1;
-               min: BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
-               max: BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
                rel1 { relative: 1.0 1.0; to: "padding_left_top"; }
                rel2 { relative: 0.0 0.0; to: "padding_right_bottom"; }
                align: 0.5 0.5;
@@ -6652,7 +6189,7 @@
                color: 255 255 255 255;
                text {
                   font: "SLP:style=Medium";
-                  size: BUTTON_NAVIBAR_CENTER_TEXT_FONT_SIZE_INC;
+                  size: BUTTON_NAVIFRAME_CENTER_TEXT_FONT_SIZE_INC;
                   min: 0 0;
                   max: 1 0;
                   align: 0.5 0.5;
@@ -6868,7 +6405,6 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/naviframe_control/multiline";
-      alias: "elm/button/base/navigationbar_control/multiline";
       script {
          public button_state = BUTTON_STATE_ENABLED;
       }
@@ -6876,8 +6412,8 @@
       images.image: "00_Option_header_bt_dim.png" COMP;
       images.image: "00_Option_header_bt_press.png" COMP;
       styles{
-         style { name: "btn_multiline_navigationbar_controlbar_style";
-            base: "font=SLP:style=Medium font_size="BUTTON_NAVIBAR_MULTILINE_TEXT_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed";
+         style { name: "btn_multiline_naviframe_controlbar_style";
+            base: "font=SLP:style=Medium font_size="BUTTON_NAVIFRAME_MULTILINE_TEXT_FONT_SIZE_INC" align=center color=#ffffff wrap=mixed";
             tag: "br" "\n";
             tag: "ps" "ps";
             tag: "tab" "\t";
@@ -6889,11 +6425,11 @@
             mouse_events: 1;
             scale: 1;
             description { state: "default" 0.0;
-               min: BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_W_INC BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_H_INC;
+               min: BUTTON_NAVIFRAME_CENTER_BG_NORMAL_MIN_INC;
                rel1.offset: 0 0;
                rel2.offset: -1 -1;
                image.normal: "00_Option_header_bt.png";
-               image.border: BUTTON_NAVIBAR_CENTER_BG_NORMAL_BORDER_INC;
+               image.border: BUTTON_NAVIFRAME_CENTER_BG_NORMAL_BORDER_INC;
                color: 255 255 255 255;
             }
             description { state: "disabled" 0.0;
@@ -6918,7 +6454,7 @@
                rel2 {
                   relative: 0.0 0.0;
                }
-               min: BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -6932,7 +6468,7 @@
                align: 1.0 1.0;
                rel1.relative: 1.0 1.0;
                rel2.relative: 1.0 1.0;
-               min: BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC;
                fixed: 1 1;
                visible: 0;
             }
@@ -6980,7 +6516,7 @@
             }
             description { state: "visible" 0.0;
                inherit: "default" 0.0;
-               min: BUTTON_NAVIBAR_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC;
+               min: BUTTON_NAVIFRAME_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC;
                rel1 {
                   relative: 1.0 0.0;
                   to: "icon_rect";
@@ -7015,8 +6551,8 @@
             description { state: "visible" 0.0;
                fixed: 1 0;
                visible: 1;
-               min: BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
-               max: BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC;
                align: 0.0 0.5;
                rel1 {
                   relative: 1.0 1.0;
@@ -7030,8 +6566,8 @@
             }
             description { state: "icononly" 0.0;
                visible: 1;
-               min: BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
-               max: BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
+               min: BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
+               max: BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC;
                rel1 {
                   relative: 1.0 1.0;
                   to: "padding_left_top";
@@ -7062,7 +6598,7 @@
                align: 0.5 0.5;
                color: 255 255 255 255;
                text {
-                  style: "btn_multiline_navigationbar_controlbar_style";
+                  style: "btn_multiline_naviframe_controlbar_style";
                   min: 0 0;
                   max: 0 1;
                }
diff --git a/themes/groups/controlbar.edc b/themes/groups/controlbar.edc
index 25c108bb..2d4330ee 100644
--- a/themes/groups/controlbar.edc
+++ b/themes/groups/controlbar.edc
@@ -768,499 +768,6 @@
 	}
 
 	group{
-		name: "elm/controlbar/base/navigationbar";
-
-		parts{
-			part{
-				name: "bg_rect";
-				type: RECT;
-				scale: 1;
-				mouse_events:0;
-				description{
-					state: "default" 0.0;
-					rel1 {relative: 0.0 0.0; offset: 0 0;}
-					rel2 {relative: 1.0 1.0; offset: -1 -1;}
-					color: 0 0 0 0;
-				}
-			}
-			part{
-				name: "bg_image";
-				type: SWALLOW;
-				scale: 1;
-				mouse_events:0;
-				description{
-					state: "default" 0.0;
-					rel1 {relative: 0.0 0.0; offset: 0 0;}
-					rel2 {relative: 1.0 1.0; offset: -1 -1;}
-				}
-				description{
-					state: "large" 0.0;
-					min: 0 CONTROLBAR_LARGE_HEIGHT_INC;
-					fixed: 0 1;
-					align: 0.5 1.0;
-					rel1 {relative: 0.0 1.0; offset: 0 -1;}
-					rel2 {relative: 1.0 1.0; offset: -1 -1;}
-				}
-				description{
-					state: "small" 0.0;
-					min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
-					fixed: 0 1;
-					align: 0.5 1.0;
-					rel1 {relative: 0.0 1.0; offset: 0 -1;}
-					rel2 {relative: 1.0 1.0; offset: -1 -1;}
-				}
-				description{
-					state: "left" 0.0;
-					min: CONTROLBAR_WIDTH_INC 0;
-					fixed: 1 0;
-					align: 0.0 0.5;
-					rel1 {relative: 0.0 0.0; offset: 0 0;}
-					rel2 {relative: 0.0 1.0; offset: 0 -1;}
-				}
-				description{
-					state: "right" 0.0;
-					min: CONTROLBAR_WIDTH_INC 0;
-					fixed: 1 0;
-					align: 1.0 0.5;
-					rel1 {relative: 1.0 0.0; offset: -1 0;}
-					rel2 {relative: 1.0 1.0; offset: -1 -1;}
-				}
-			}
-			part {
-				name: "elm.dragable.box";
-				type: GROUP;
-				source: "elm/controlbar/item_bg_move/default";
-				mouse_events: 0;
-				scale: 1;
-				dragable {
-					x: 1 1 0;
-					y: 1 1 0;
-					confine: "bg_image";
-				}
-				description {
-					state: "default" 0.0;
-					rel1 {
-						relative: 0.0 0.0;
-						to: "bg_image";
-					}
-					rel2 {
-						relative: 0.0 1.0;
-						to: "bg_image";
-					}
-					color: 0 0 0 0;
-				}
-			}
-			part{
-				name: "elm.swallow.items";
-				type: SWALLOW;
-				scale: 1;
-				description{
-					state: "default" 0.0;
-					rel1 {relative: 0.0 0.0; offset: 5 0; to: "bg_image";}
-					rel2 {relative: 1.0 1.0; offset: -6 -1; to: "bg_image";}
-				}
-			}
-		}
-		programs{
-			program{
-				name: "default";
-				signal: "elm,state,default";
-				source: "elm";
-				action: STATE_SET "default" 0.0;
-				target: "bg_image";
-			}
-			program{
-				name: "large";
-				signal: "elm,state,large";
-				source: "elm";
-				action: STATE_SET "large" 0.0;
-				target: "bg_image";
-			}
-			program{
-				name: "small";
-				signal: "elm,state,small";
-				source: "elm";
-				action: STATE_SET "small" 0.0;
-				target: "bg_image";
-			}
-			program{
-				name: "left";
-				signal: "elm,state,left";
-				source: "elm";
-				action: STATE_SET "left" 0.0;
-				target: "bg_image";
-			}
-			program{
-				name: "right";
-				signal: "elm,state,right";
-				source: "elm";
-				action: STATE_SET "right" 0.0;
-				target: "bg_image";
-			}
-		}
-	}
-
-	group{
-		name: "elm/controlbar/background/navigationbar";
-
-		parts{
-			part{
-				name: "bg_image";
-				type: RECT;
-				scale: 1;
-				mouse_events:0;
-				description{
-					state: "default" 0.0;
-					rel1 {relative: 0.0 0.0; offset: 0 0;}
-					rel2 {relative: 1.0 1.0; offset: -1 -1;}
-					color: 255 255 255 0;
-				}
-				description{
-					state: "tabbar" 0.0;
-					inherit: "default" 0.0;
-				}
-				description{
-					state: "tabbar_left" 0.0;
-					inherit: "default" 0.0;
-				}
-				description{
-					state: "tabbar_right" 0.0;
-					inherit: "default" 0.0;
-				}
-			}
-		}
-		programs {
-			program {
-				name: "tabbar_bg";
-				signal: "elm,state,tabbar";
-				source: "elm";
-				action: STATE_SET "tabbar" 0.0;
-				target: "bg_image";
-			}
-			program {
-				name: "toolbar_bg";
-				signal: "elm,state,toolbar";
-				source: "elm";
-				action: STATE_SET "default" 0.0;
-				target: "bg_image";
-			}
-			program {
-				name: "tabbar_left_bg";
-				signal: "elm,state,tabbar_left";
-				source: "elm";
-				action: STATE_SET "tabbar_left" 0.0;
-				target: "bg_image";
-			}
-			program {
-				name: "tabbar_right_bg";
-				signal: "elm,state,tabbar_right";
-				source: "elm";
-				action: STATE_SET "tabbar_right" 0.0;
-				target: "bg_image";
-			}
-		}
-	}
-
-	group{
-		name: "elm/controlbar/item_bg/navigationbar";
-		images{
-			image: "00_winset_tabbar_press.png" COMP;
-			image: "00_winset_tabbar_press_left.png" COMP;
-			image: "00_winset_tabbar_press_right.png" COMP;
-			image: "00_winset_toolbar_press.png" COMP;
-			image: "00_winset_tabbar_focus.png" COMP;
-			image: "00_winset_tabbar_focus_left.png" COMP;
-			image: "00_winset_tabbar_focus_right.png" COMP;
-		}
-
-		parts{
-			part{
-				name: "bg_rect";
-				type: RECT;
-				scale: 1;
-				mouse_events: 1;
-				description{
-					state: "default" 0.0;
-					min: 0 0;
-					rel1 {relative: 0.0 0.0; offset: 0 0;}
-					rel2 {relative: 1.0 1.0; offset: -1 -1;}
-					color: 0 0 0 0;
-				}
-			}
-			part{
-				name: "bg_img";
-				type: IMAGE;
-				scale: 1;
-				mouse_events: 0;
-				description{
-					state: "default" 0.0;
-					visible: 0;
-					rel1 {relative: 0.0 0.0; offset: 0 0;}
-					rel2 {relative: 1.0 1.0; offset: -1 -1;}
-				}
-				description{
-					state: "pressed" 0.0;
-					inherit: "default" 0.0;
-					image.normal: "00_winset_tabbar_press.png";
-					image.border: 2 2 3 2;
-					color: 255 255 255 50;
-					visible: 1;
-				}
-				description{
-					state: "pressed_left" 0.0;
-					inherit: "default" 0.0;
-					image.normal: "00_winset_tabbar_press_left.png";
-					image.border: 2 3 2 2;
-					color: 255 255 255 50;
-					visible: 1;
-				}
-				description{
-					state: "pressed_right" 0.0;
-					inherit: "default" 0.0;
-					image.normal: "00_winset_tabbar_press_right.png";
-					image.border: 3 2 2 2;
-					color: 255 255 255 50;
-					visible: 1;
-				}
-				description{
-					state: "focused" 0.0;
-					inherit: "default" 0.0;
-					image.normal: "00_winset_tabbar_focus.png";
-					image.border: 2 2 3 2;
-					visible: 1;
-				}
-				description{
-					state: "focused_left" 0.0;
-					inherit: "default" 0.0;
-					image.normal: "00_winset_tabbar_focus_left.png";
-					image.border: 2 3 2 2;
-					visible: 1;
-				}
-				description{
-					state: "focused_right" 0.0;
-					inherit: "default" 0.0;
-					image.normal: "00_winset_tabbar_focus_right.png";
-					image.border: 3 2 2 2;
-					visible: 1;
-				}
-				description{
-					state: "toolbar_pressed" 0.0;
-					inherit: "default" 0.0;
-					rel1 {relative: 0.0 0.07; offset: 3 0;}
-					rel2 {relative: 1.0 0.93; offset: -3 0;}
-					image.normal: "00_winset_toolbar_press.png";
-					image.border: 3 3 3 3;
-					visible: 1;
-				}
-			}
-			part{
-				name: "left_line";
-				type: RECT;
-				scale: 1;
-				mouse_events: 0;
-				description{
-					state: "default" 0.0;
-					visible: 0;
-					rel1 {relative: 0.0 0.0; offset: 0 5;}
-					rel2 {relative: 0.0 1.0; offset: 1 -3;}
-					color: CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC;
-				}
-				description{
-					state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-			}
-			part{
-				name: "right_line";
-				type: RECT;
-				scale: 1;
-				mouse_events: 0;
-				description{
-					state: "default" 0.0;
-					visible: 0;
-					rel1 {relative: 1.0 0.0; offset: -1 5;}
-					rel2 {relative: 1.0 1.0; offset: 0 -3;}
-					color: CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC;
-				}
-				description{
-					state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-			}
-			part{
-				name: "top_line";
-				type: RECT;
-				scale: 1;
-				mouse_events: 0;
-				description{
-					state: "default" 0.0;
-					visible: 0;
-					rel1 {relative: 0.0 0.0; offset: 5 0;}
-					rel2 {relative: 1.0 0.0; offset: -5 1;}
-					color: CONTROLBAR_SEPARATEBAR_BRIGHT_COLOR_INC;
-				}
-				description{
-					state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-			}
-			part{
-				name: "bottom_line";
-				type: RECT;
-				scale: 1;
-				mouse_events: 0;
-				description{
-					state: "default" 0.0;
-					visible: 0;
-					rel1 {relative: 0.0 1.0; offset: 5 -1;}
-					rel2 {relative: 1.0 1.0; offset: -5 0;}
-					color: CONTROLBAR_SEPARATEBAR_DARK_COLOR_INC;
-				}
-				description{
-					state: "show" 0.0;
-					inherit: "default" 0.0;
-					visible: 1;
-				}
-			}
-			part{
-				name: "item";
-				type: SWALLOW;
-				scale: 1;
-				mouse_events: 1;
-				description{
-					state: "default" 0.0;
-					rel1 {to: "bg_rect"; offset: 5 10;}
-					rel2 {to: "bg_rect"; offset: -6 -10;}
-				}
-			}
-		}
-		programs {
-			program {
-				name: "selected";
-				signal: "elm,state,selected";
-				source: "elm";
-				action: STATE_SET "focused" 0.0;
-				target: "bg_img";
-			}
-			program {
-				name: "selected_left";
-				signal: "elm,state,selected_left";
-				source: "elm";
-				action: STATE_SET "focused_left" 0.0;
-				target: "bg_img";
-			}
-			program {
-				name: "selected_right";
-				signal: "elm,state,selected_right";
-				source: "elm";
-				action: STATE_SET "focused_right" 0.0;
-				target: "bg_img";
-			}
-			program {
-				name: "pressed";
-				signal: "elm,state,pressed";
-				source: "elm";
-				action: STATE_SET "pressed" 0.0;
-				target: "bg_img";
-			}
-			program {
-				name: "pressed_left";
-				signal: "elm,state,pressed_left";
-				source: "elm";
-				action: STATE_SET "pressed_left" 0.0;
-				target: "bg_img";
-			}
-			program {
-				name: "pressed_right";
-				signal: "elm,state,pressed_right";
-				source: "elm";
-				action: STATE_SET "pressed_right" 0.0;
-				target: "bg_img";
-			}
-			program {
-				name: "toolbar_pressed";
-				signal: "elm,state,toolbar_pressed";
-				source: "elm";
-				action: STATE_SET "toolbar_pressed" 0.0;
-				target: "bg_img";
-			}
-			program {
-				name: "unselected";
-				signal: "elm,state,unselected";
-				source: "elm";
-				action: STATE_SET "default" 0.0;
-				target: "bg_img";
-			}
-			program {
-				name: "unpressed";
-				signal: "elm,state,unpressed";
-				source: "elm";
-				action: STATE_SET "default" 0.0;
-				target: "bg_img";
-			}
-			program {
-				name: "left_line_show";
-				signal: "elm,state,left_line_show";
-				source: "elm";
-				action: STATE_SET "show" 0.0;
-				target: "left_line";
-			}
-			program {
-				name: "left_line_hide";
-				signal: "elm,state,left_line_hide";
-				source: "elm";
-				action: STATE_SET "default" 0.0;
-				target: "left_line";
-			}
-			program {
-				name: "right_line_show";
-				signal: "elm,state,right_line_show";
-				source: "elm";
-				action: STATE_SET "show" 0.0;
-				target: "right_line";
-			}
-			program {
-				name: "right_line_hide";
-				signal: "elm,state,right_line_hide";
-				source: "elm";
-				action: STATE_SET "default" 0.0;
-				target: "right_line";
-			}
-			program {
-				name: "top_line_show";
-				signal: "elm,state,top_line_show";
-				source: "elm";
-				action: STATE_SET "show" 0.0;
-				target: "top_line";
-			}
-			program {
-				name: "top_line_hide";
-				signal: "elm,state,top_line_hide";
-				source: "elm";
-				action: STATE_SET "default" 0.0;
-				target: "top_line";
-			}
-			program {
-				name: "bottom_line_show";
-				signal: "elm,state,bottom_line_show";
-				source: "elm";
-				action: STATE_SET "show" 0.0;
-				target: "bottom_line";
-			}
-			program {
-				name: "bottom_line_hide";
-				signal: "elm,state,bottom_line_hide";
-				source: "elm";
-				action: STATE_SET "default" 0.0;
-				target: "bottom_line";
-			}
-		}
-	}
-
-	group{
 		name: "elm/controlbar/base/naviframe";
 
 		parts{
diff --git a/themes/groups/dialoguegroup.edc b/themes/groups/dialoguegroup.edc
deleted file mode 100644
index 0ec1cbb0..00000000
--- a/themes/groups/dialoguegroup.edc
+++ /dev/null
@@ -1,4531 +0,0 @@
-/*
- *  nbeat-theme
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Seokjae Jeong <seok.j.jeong@samsung.com>, Myoungwoon Roy Kim <Myoungwoon.kim@samsung.com>, Jeonghyun Yun <jh0506.yun@samsung.com>, Jaehwan Kim <jae.hwan.kim@samsung.com>, Chuneon Park <chuneon.park@samsung.com>, Juyung Seo <juyung.seo@samsung.com>, Woohyun Jung <wh0705.jung@samsung.com>, Myungjae Lee <mjae.lee@samsung.com>, Hyoyoung Chang <hyoyoung.chang@samsung.com>, IlKook Yun <ilkook.yun@samsung.com>, CinWoo Kim <cinoo.kim@samsung.com> JiYeon Park <jy0703.park@samsung.com>
- * 
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * 
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-
-//////////////////////////////////////////////// dialogue group /////////////////////////////////////////////////////////
-#define DIALOGUE_GROUP_BACKGROUND(group_name, location,  height_offset, r_border, l_border, t_border, b_border, r_p_border, l_p_border, t_p_border, b_p_border) \
-   group{ \
-      name: "elm/dialoguegroup/"group_name"_"location"/default";\
-      images{\
-         image: "01_dialoguegroup_"group_name"_"location".png" COMP;\
-         image: "00_list_bar_group_"location"_focus.png" COMP;\
-      }\
-      script {\
-         public press_off = 0;\
-         public set_press_effect_on() {\
-            set_int(press_off, 0);\
-         }\
-         public set_press_effect_off() {\
-            set_int(press_off, 1);\
-         }\
-         public thumb_down() {\
-            if(get_int(press_off) == 1) {\
-               set_state(PART:"bg_press", "default", 0.0);\
-            } else {\
-               set_state(PART:"bg_press", "pressed", 0.0);\
-            }\
-         }\
-      }\
-      parts{\
-         part{\
-            name: "left";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 11 0;\
-               fixed: 1 0;\
-               align: 0 0.5;\
-               rel1.relative: 0.0 0.0;\
-               rel2.relative: 0.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "right";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 11 0;\
-               fixed: 1 0;\
-               align: 1 0.5;\
-               rel1.relative: 1.0 0.0;\
-               rel2.relative: 1.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "left1";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 15 0;\
-               fixed: 1 0;\
-               align: 0 0.5;\
-               rel1.relative: 0.0 0.0;\
-               rel2.relative: 0.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "right1";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 15 0;\
-               fixed: 1 0;\
-               align: 1 0.5;\
-               rel1.relative: 1.0 0.0;\
-               rel2.relative: 1.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "bg";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left";\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right";\
-               image.normal: "01_dialoguegroup_"group_name"_"location".png" ;\
-               image.border: r_border l_border t_border b_border;\
-               image.border_scale: 1;\
-            }\
-         }\
-         part{\
-            name: "bg_press";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left";\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right";\
-               image.normal: "00_list_bar_group_"location"_focus.png" ;\
-               image.border: r_p_border l_p_border t_p_border b_p_border;\
-               image.border_scale: 1;\
-            }\
-            description{\
-               state: "pressed" 0.0;\
-               inherit: "default" 0.0;\
-               visible: 1;\
-            }\
-         }\
-         part{\
-            name: "swallow";\
-            type: SWALLOW;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left1";\
-               rel1.to_y: "bg";\
-               rel1.offset: 0 0;\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right1";\
-               rel2.to_y: "bg";\
-               rel2.offset: -1 height_offset;\
-            }\
-         }\
-         part{\
-            name: "over";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               rel1.to: "bg";\
-               rel2.to: "bg";\
-               color: 255 255 255 180;\
-               image.normal: "01_dialoguegroup_"group_name"_"location".png" ;\
-               image.border: r_border l_border t_border b_border;\
-               image.border_scale: 1;\
-            }\
-            description{\
-               state: "disabled" 0.0;\
-               inherit: "default" 0.0;\
-               visible: 1;\
-            }\
-         }\
-      }\
-      programs {\
-         program {\
-            name:   "mouse_down";\
-            signal: "mouse,down,1";\
-            source: "swallow";\
-            script: {\
-               thumb_down();\
-            }\
-         }\
-         program {\
-            name:   "mouse_up";\
-            signal: "mouse,up,1";\
-            source: "swallow";\
-            action: STATE_SET "default" 0.0;\
-            target: "bg_press";\
-         }\
-         program { \
-            name: "press_effect_on";\
-            signal: "elm,state,press,on";\
-            source: "elm";\
-            script {\
-               set_press_effect_on();\
-            }\
-         }\
-         program { \
-            name: "press_effect_off";\
-            signal: "elm,state,press,off";\
-            source: "elm";\
-            script {\
-               set_press_effect_off();\
-            }\
-         }\
-         program { \
-            name: "disabled";\
-            signal: "elm,state,disabled";\
-            source: "elm";\
-            action: STATE_SET "disabled" 0.0;\
-            target: "over";\
-         }\
-         program { \
-            name: "enabled";\
-            signal: "elm,state,enabled";\
-            source: "elm";\
-            action: STATE_SET "default" 0.0;\
-            target: "over";\
-         }\
-      }\
-   }
-
-DIALOGUE_GROUP_BACKGROUND("bg", "default", -5, 13, 13, 10, 15, 13, 13, 39, 39);
-DIALOGUE_GROUP_BACKGROUND("bg", "top", -1, 13, 13, 10, 3, 13, 13, 39, 39);
-DIALOGUE_GROUP_BACKGROUND("bg", "middle", -1, 4, 4, 3, 3, 13, 13, 39, 39);
-DIALOGUE_GROUP_BACKGROUND("bg", "bottom", -5, 13, 13, 3, 15, 13, 13, 39, 44);
-
-#define DIALOGUE_GROUP_SUB_BACKGROUND(group_name, location,  height_offset, r_border, l_border, t_border, b_border, r_p_border, l_p_border, t_p_border, b_p_border) \
-   group{ \
-      name: "elm/dialoguegroup/"group_name"_"location"/default";\
-      images{\
-         image: "01_dialoguegroup_"group_name"_"location".png" COMP;\
-         image: "00_list_bar_group_"location"_focus.png" COMP;\
-         image: "01_dialoguegroup_sub_move.png" COMP ;\
-      }\
-      script {\
-         public press_off = 0;\
-         public set_press_effect_on() {\
-            set_int(press_off, 0);\
-         }\
-         public set_press_effect_off() {\
-            set_int(press_off, 1);\
-         }\
-         public thumb_down() {\
-            if(get_int(press_off) == 1) {\
-               set_state(PART:"bg_press", "default", 0.0);\
-            } else {\
-               set_state(PART:"bg_press", "pressed", 0.0);\
-            }\
-         }\
-      }\
-      parts{\
-         part { \
-            name: "point"; \
-            type: RECT; \
-            scale: 1; \
-            description { \
-               state: "default" 0.0; \
-               color: 0 0 0 0; \
-               rel1 { relative: 0.0 0.0; } \
-               rel2 { relative: 1.0 0.0; } \
-            } \
-         }\
-         part{\
-            name: "left";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 11 0;\
-               fixed: 1 0;\
-               align: 0 0.5;\
-               rel1.relative: 0.0 0.0;\
-               rel2.relative: 0.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "right";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 11 0;\
-               fixed: 1 0;\
-               align: 1 0.5;\
-               rel1.relative: 1.0 0.0;\
-               rel2.relative: 1.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "left1";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 15 0;\
-               fixed: 1 0;\
-               align: 0 0.5;\
-               rel1.relative: 0.0 0.0;\
-               rel2.relative: 0.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "right1";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 15 0;\
-               fixed: 1 0;\
-               align: 1 0.5;\
-               rel1.relative: 1.0 0.0;\
-               rel2.relative: 1.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "bg_rect";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left1";\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right1";\
-               image.normal: "01_dialoguegroup_sub_move.png" ;\
-            }\
-            description { \
-               state: "map_transition" 0.0; \
-               inherit: "default" 0.0; \
-               map { \
-                  perspective: "point"; \
-                  on: 1; \
-                  smooth: 1; \
-                  perspective_on: 1; \
-                  backface_cull: 1; \
-                  rotation { \
-                     center: "point"; \
-                     x: -90.0; \
-                     y: 0.0; \
-                     z: 0.0; \
-                  } \
-               } \
-            }\
-            description { \
-               state: "map_rotate" 0.0; \
-               inherit: "default" 0.0; \
-               map.rotation.x: 0.0; \
-               map.rotation.y: 0.0; \
-               map.rotation.z: 0.0; \
-            }\
-            description { \
-               state: "show_bg" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 0;\
-            }\
-         }\
-         part{\
-            name: "bg";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left";\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right";\
-               image.normal: "01_dialoguegroup_"group_name"_"location".png" ;\
-               image.border: r_border l_border t_border b_border;\
-               image.border_scale: 1;\
-            }\
-            description { \
-               state: "show_bg" 0.0; \
-               inherit: "default" 0.0; \
-               visible: 1;\
-            }\
-         }\
-         part{\
-            name: "bg_press";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left";\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right";\
-               image.normal: "00_list_bar_group_"location"_focus.png" ;\
-               image.border: r_p_border l_p_border t_p_border b_p_border;\
-               image.border_scale: 1;\
-            }\
-            description{\
-               state: "pressed" 0.0;\
-               inherit: "default" 0.0;\
-               visible: 1;\
-            }\
-         }\
-         part{\
-            name: "swallow";\
-            type: SWALLOW;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left1";\
-               rel1.to_y: "bg";\
-               rel1.offset: 0 0;\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right1";\
-               rel2.to_y: "bg";\
-               rel2.offset: -1 height_offset;\
-            }\
-            description { \
-               state: "map_transition" 0.0; \
-               inherit: "default" 0.0; \
-               map { \
-                  perspective: "point"; \
-                  on: 1; \
-                  smooth: 1; \
-                  perspective_on: 1; \
-                  backface_cull: 1; \
-                  rotation { \
-                     center: "point"; \
-                     x: -90.0; \
-                     y: 0.0; \
-                     z: 0.0; \
-                  } \
-               } \
-            }\
-            description { \
-               state: "map_rotate" 0.0; \
-               inherit: "default" 0.0; \
-               map.rotation.x: 0.0; \
-               map.rotation.y: 0.0; \
-               map.rotation.z: 0.0; \
-            }\
-         }\
-         part{\
-            name: "over";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               rel1.to: "bg";\
-               rel2.to: "bg";\
-               color: 255 255 255 180;\
-               image.normal: "01_dialoguegroup_"group_name"_"location".png" ;\
-               image.border: r_border l_border t_border b_border;\
-               image.border_scale: 1;\
-            }\
-         }\
-      }\
-      programs {\
-         program {\
-            name:   "mouse_down";\
-            signal: "mouse,down,1";\
-            source: "swallow";\
-            script: {\
-               thumb_down();\
-            }\
-         }\
-         program {\
-            name:   "mouse_up";\
-            signal: "mouse,up,1";\
-            source: "swallow";\
-            action: STATE_SET "default" 0.0;\
-            target: "bg_press";\
-         }\
-         program { \
-            name: "press_effect_on";\
-            signal: "elm,state,press,on";\
-            source: "elm";\
-            script {\
-               set_press_effect_on();\
-            }\
-         }\
-         program { \
-            name: "press_effect_off";\
-            signal: "elm,state,press,off";\
-            source: "elm";\
-            script {\
-               set_press_effect_off();\
-            }\
-         }\
-         program { \
-            name: "disabled";\
-            signal: "elm,state,disabled";\
-            source: "elm";\
-            action: STATE_SET "disabled" 0.0;\
-            target: "over";\
-         }\
-         program { \
-            name: "enabled";\
-            signal: "elm,state,enabled";\
-            source: "elm";\
-            action: STATE_SET "default" 0.0;\
-            target: "over";\
-         }\
-         program { \
-            name: "rotaion_transition"; \
-            signal: "flip_item"; \
-            action: STATE_SET "map_transition" 0.0; \
-            after: "rotation"; \
-            target: "bg_rect";\
-            target: "swallow";\
-         }\
-         program {\
-            name: "rotation"; \
-            action: STATE_SET "map_rotate" 0.0; \
-            transition: LINEAR 0.4; \
-            after: "rotation_finish";\
-            target: "bg_rect";\
-            target: "swallow";\
-         }\
-         program {\
-            name: "rotation_finish"; \
-            action: STATE_SET "show_bg" 0.0; \
-            target: "bg_rect";\
-            target: "bg";\
-         }\
-      }\
-   }
-
-DIALOGUE_GROUP_SUB_BACKGROUND("sub", "default", -5, 13, 13, 10, 15, 13, 13, 39, 39);
-DIALOGUE_GROUP_SUB_BACKGROUND("sub", "top", -1, 13, 13, 10, 3, 13, 13, 39, 39);
-DIALOGUE_GROUP_SUB_BACKGROUND("sub", "middle", -1, 4, 4, 3, 3, 13, 13, 39, 39);
-DIALOGUE_GROUP_SUB_BACKGROUND("sub", "bottom", -5, 13, 13, 3, 15, 13, 13, 39, 44);
-
-
-#define DIALOGUE_GROUP_EDIT_BACKGROUND(location, height_offset, r_border, l_border, t_border, b_border) \
-   group{ \
-      name: "elm/dialoguegroup/editfield_"location"/default";\
-      images{\
-         image: "01_dialoguegroup_bg_"location".png" COMP;\
-         image: "01_dialoguegroup_edit_"location".png" COMP;\
-      }\
-      parts{\
-         part{\
-            name: "left";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 11 0;\
-               fixed: 1 0;\
-               align: 0 0.5;\
-               rel1.relative: 0.0 0.0;\
-               rel2.relative: 0.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "right";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 11 0;\
-               fixed: 1 0;\
-               align: 1 0.5;\
-               rel1.relative: 1.0 0.0;\
-               rel2.relative: 1.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "left1";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 15 0;\
-               fixed: 1 0;\
-               align: 0 0.5;\
-               rel1.relative: 0.0 0.0;\
-               rel2.relative: 0.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "right1";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 15 0;\
-               fixed: 1 0;\
-               align: 1 0.5;\
-               rel1.relative: 1.0 0.0;\
-               rel2.relative: 1.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "bg";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left";\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right";\
-               image.normal: "01_dialoguegroup_bg_"location".png" ;\
-               image.border: r_border l_border t_border b_border;\
-               image.border_scale: 1;\
-            }\
-         }\
-         part{\
-            name: "inner_bg";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left";\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right";\
-               image.normal: "01_dialoguegroup_edit_"location".png" ;\
-               image.border: r_border l_border t_border b_border;\
-               image.border_scale: 1;\
-            }\
-         }\
-         part{\
-            name: "swallow";\
-            type: SWALLOW;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left1";\
-               rel1.to_y: "inner_bg";\
-               rel1.offset: 0 0;\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right1";\
-               rel2.to_y: "inner_bg";\
-               rel2.offset: -1 height_offset;\
-            }\
-         }\
-         part{\
-            name: "over";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               rel1.to: "bg";\
-               rel2.to: "bg";\
-               color: 255 255 255 180;\
-               image.normal: "01_dialoguegroup_bg_"location".png" ;\
-               image.border: r_border l_border t_border b_border;\
-               image.border_scale: 1;\
-            }\
-            description{\
-               state: "disabled" 0.0;\
-               inherit: "default" 0.0;\
-               visible: 1;\
-            }\
-         }\
-      }\
-      programs {\
-         program { \
-            name: "disabled";\
-            signal: "elm,state,disabled";\
-            source: "elm";\
-            action: STATE_SET "disabled" 0.0;\
-            target: "over";\
-         }\
-         program { \
-            name: "enabled";\
-            signal: "elm,state,enabled";\
-            source: "elm";\
-            action: STATE_SET "default" 0.0;\
-            target: "over";\
-         }\
-      }\
-   }
-
-DIALOGUE_GROUP_EDIT_BACKGROUND("default", -5, 13, 13, 10, 15);
-DIALOGUE_GROUP_EDIT_BACKGROUND("top", -1, 13, 13, 10, 4);
-DIALOGUE_GROUP_EDIT_BACKGROUND("middle", -1, 13, 13, 5, 5);
-DIALOGUE_GROUP_EDIT_BACKGROUND("bottom", -5, 13, 13, 5, 14);
-
-#define DIALOGUE_GROUP_EDIT_WITH_TITLE_BACKGROUND(location, inner_loc, height_offset, r_border, l_border, t_border, b_border, in_rborder, in_lborder, in_tborder, in_bborder) \
-        group{ \
-           name: "elm/dialoguegroup/editfield_with_title_"location"/default";\
-           images{\
-              image: "01_dialoguegroup_bg_"location".png" COMP;\
-              image: "01_dialoguegroup_edit_"location".png" COMP;\
-           }\
-           parts{\
-              part { name: "top";\
-                 type: RECT;\
-                 scale: 1;\
-                 ignore_flags: ON_HOLD;\
-                 description {\
-                    state: "default" 0.0;\
-                    visible: 0;\
-                    min: 0 30;\
-                    fixed: 1 1;\
-                    rel1.relative: 0.0 0.0;\
-                    rel2.relative: 1.0 0.0;\
-                    align: 0.5 0;\
-                 }\
-              }\
-              part{\
-                 name: "left";\
-                 type: RECT;\
-                 scale: 1;\
-                 mouse_events: 0;\
-                 description{\
-                    state: "default" 0.0;\
-                    visible: 0;\
-                    min: 11 0;\
-                    fixed: 1 0;\
-                    align: 0 0.5;\
-                    rel1.relative: 0.0 0.0;\
-                    rel2.relative: 0.0 1.0;\
-                 }\
-              }\
-              part{\
-                 name: "right";\
-                 type: RECT;\
-                 scale: 1;\
-                 mouse_events: 0;\
-                 description{\
-                    state: "default" 0.0;\
-                    visible: 0;\
-                    min: 11 0;\
-                    fixed: 1 0;\
-                    align: 1 0.5;\
-                    rel1.relative: 1.0 0.0;\
-                    rel2.relative: 1.0 1.0;\
-                 }\
-              }\
-              part{\
-                 name: "left1";\
-                 type: RECT;\
-                 scale: 1;\
-                 mouse_events: 0;\
-                 description{\
-                    state: "default" 0.0;\
-                    visible: 0;\
-                    min: 15 0;\
-                    fixed: 1 0;\
-                    align: 0 0.5;\
-                    rel1.relative: 0.0 0.0;\
-                    rel2.relative: 0.0 1.0;\
-                 }\
-              }\
-              part{\
-                 name: "right1";\
-                 type: RECT;\
-                 scale: 1;\
-                 mouse_events: 0;\
-                 description{\
-                    state: "default" 0.0;\
-                    visible: 0;\
-                    min: 15 0;\
-                    fixed: 1 0;\
-                    align: 1 0.5;\
-                    rel1.relative: 1.0 0.0;\
-                    rel2.relative: 1.0 1.0;\
-                 }\
-              }\
-              part{\
-                 name: "bg";\
-                 type: IMAGE;\
-                 description{\
-                    state: "default" 0.0;\
-                    rel1.relative: 1.0 0.0;\
-                    rel1.to_x: "left";\
-                    rel2.relative: 0.0 1.0;\
-                    rel2.to_x: "right";\
-                    image.normal: "01_dialoguegroup_bg_"location".png" ;\
-                    image.border: r_border l_border t_border b_border;\
-                    image.border_scale: 1;\
-                 }\
-              }\
-              part{\
-                 name: "inner_bg";\
-                 type: IMAGE;\
-                 description{\
-                    state: "default" 0.0;\
-                    rel1.relative: 1.0 1.0;\
-                    rel1.to_x: "left";\
-                    rel1.to_y: "top";\
-                    rel2.relative: 0.0 1.0;\
-                    rel2.to_x: "right";\
-                    image.normal: "01_dialoguegroup_edit_"inner_loc".png" ;\
-                    image.border: in_rborder in_lborder in_tborder in_bborder;\
-                    image.border_scale: 1;\
-                 }\
-              }\
-              part{\
-                 name: "swallow";\
-                 type: SWALLOW;\
-                 description{\
-                    state: "default" 0.0;\
-                    rel1.relative: 1.0 0.0;\
-                    rel1.to_x: "left1";\
-                    rel1.to_y: "bg";\
-                    rel1.offset: 0 0;\
-                    rel2.relative: 0.0 1.0;\
-                    rel2.to_x: "right1";\
-                    rel2.to_y: "bg";\
-                    rel2.offset: -1 height_offset;\
-                 }\
-              }\
-              part{\
-                 name: "over";\
-                 type: IMAGE;\
-                 description{\
-                    state: "default" 0.0;\
-                    visible: 0;\
-                    rel1.to: "bg";\
-                    rel2.to: "bg";\
-                    color : 255 255 255 180;\
-                    image.normal: "01_dialoguegroup_bg_"location".png" ;\
-                    image.border: r_border l_border t_border b_border;\
-                    image.border_scale: 1;\
-                 }\
-                 description{\
-                    state: "disabled" 0.0;\
-                    inherit: "default" 0.0;\
-                    visible: 1;\
-                 }\
-              }\
-           }\
-           programs {\
-              program { \
-                 name: "disabled";\
-                 signal: "elm,state,disabled";\
-                 source: "elm";\
-                 action: STATE_SET "disabled" 0.0;\
-                 target: "over";\
-              }\
-              program { \
-                 name: "enabled";\
-                 signal: "elm,state,enabled";\
-                 source: "elm";\
-                 action: STATE_SET "default" 0.0;\
-                 target: "over";\
-              }\
-           }\
-        }
-
-DIALOGUE_GROUP_EDIT_WITH_TITLE_BACKGROUND("default", "bottom", -5, 13, 13, 10, 15, 13, 13, 5, 14);
-DIALOGUE_GROUP_EDIT_WITH_TITLE_BACKGROUND("top", "middle", -1, 13, 13, 10, 4, 13, 13, 5, 5);
-DIALOGUE_GROUP_EDIT_WITH_TITLE_BACKGROUND("middle", "middle",  -1, 13, 13, 5, 5, 13, 13, 5, 5);
-DIALOGUE_GROUP_EDIT_WITH_TITLE_BACKGROUND("bottom", "bottom", -5, 13, 13, 5, 14, 13, 13, 5, 14);
-
-#define DIALOGUE_GROUP_EDIT_TITLE_BACKGROUND(location, height_offset, r_border, l_border, t_border, b_border) \
-   group{ \
-      name: "elm/dialoguegroup/edit_title_"location"/default";\
-      images{\
-         image: "01_dialoguegroup_bg_"location".png" COMP;\
-         image: "01_dialoguegroup_title_"location".png" COMP;\
-      }\
-      parts{\
-         part{\
-            name: "left";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 11 0;\
-               fixed: 1 0;\
-               align: 0 0.5;\
-               rel1.relative: 0.0 0.0;\
-               rel2.relative: 0.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "right";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 11 0;\
-               fixed: 1 0;\
-               align: 1 0.5;\
-               rel1.relative: 1.0 0.0;\
-               rel2.relative: 1.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "left1";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 15 0;\
-               fixed: 1 0;\
-               align: 0 0.5;\
-               rel1.relative: 0.0 0.0;\
-               rel2.relative: 0.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "right1";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 15 0;\
-               fixed: 1 0;\
-               align: 1 0.5;\
-               rel1.relative: 1.0 0.0;\
-               rel2.relative: 1.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "bg";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left";\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right";\
-               image.normal: "01_dialoguegroup_bg_"location".png" ;\
-               image.border: r_border l_border t_border b_border;\
-               image.border_scale: 1;\
-            }\
-         }\
-         part{\
-            name: "inner_bg";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left";\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right";\
-               image.normal: "01_dialoguegroup_title_"location".png" ;\
-               image.border: r_border l_border t_border b_border;\
-               image.border_scale: 1;\
-            }\
-         }\
-         part{\
-            name: "swallow";\
-            type: SWALLOW;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left1";\
-               rel1.to_y: "inner_bg";\
-               rel1.offset: 0 0;\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right1";\
-               rel2.to_y: "inner_bg";\
-               rel2.offset: -1 height_offset;\
-            }\
-         }\
-         part{\
-            name: "over";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               rel1.to: "inner_bg";\
-               rel2.to: "inner_bg";\
-               image.normal: "01_dialoguegroup_title_"location".png" ;\
-               image.border: r_border l_border t_border b_border;\
-               image.border_scale: 1;\
-               color: 255 255 255 180;\
-            }\
-            description{\
-               state: "disabled" 0.0;\
-               inherit: "default" 0.0;\
-               visible: 1;\
-            }\
-         }\
-      }\
-      programs {\
-         program { \
-            name: "disabled";\
-            signal: "elm,state,disabled";\
-            source: "elm";\
-            action: STATE_SET "disabled" 0.0;\
-            target: "over";\
-         }\
-         program { \
-            name: "enabled";\
-            signal: "elm,state,enabled";\
-            source: "elm";\
-            action: STATE_SET "default" 0.0;\
-            target: "over";\
-         }\
-      }\
-   }
-
-DIALOGUE_GROUP_EDIT_TITLE_BACKGROUND("default", -5, 13, 13, 10, 15);
-DIALOGUE_GROUP_EDIT_TITLE_BACKGROUND("top", -1, 13, 13, 10, 4);
-
-#define DIALOGUE_GROUP_HIDDEN_BACKGROUND(location, height_offset, r_border, l_border, t_border, b_border) \
-   group{ \
-      name: "elm/dialoguegroup/hidden_"location"/default";\
-      images{\
-         image: "01_dialoguegroup_bg_"location".png" COMP;\
-         image: "01_dialoguegroup_hidden_"location".png" COMP;\
-      }\
-      parts{\
-         part{\
-            name: "left";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 11 0;\
-               fixed: 1 0;\
-               align: 0 0.5;\
-               rel1.relative: 0.0 0.0;\
-               rel2.relative: 0.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "right";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 11 0;\
-               fixed: 1 0;\
-               align: 1 0.5;\
-               rel1.relative: 1.0 0.0;\
-               rel2.relative: 1.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "left1";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 15 0;\
-               fixed: 1 0;\
-               align: 0 0.5;\
-               rel1.relative: 0.0 0.0;\
-               rel2.relative: 0.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "right1";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 15 0;\
-               fixed: 1 0;\
-               align: 1 0.5;\
-               rel1.relative: 1.0 0.0;\
-               rel2.relative: 1.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "bg";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left";\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right";\
-               image.normal: "01_dialoguegroup_bg_"location".png" ;\
-               image.border: r_border l_border t_border b_border;\
-               image.border_scale: 1;\
-            }\
-         }\
-         part{\
-            name: "inner_bg";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left";\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right";\
-               image.normal: "01_dialoguegroup_hidden_"location".png" ;\
-               image.border: r_border l_border t_border b_border;\
-               image.border_scale: 1;\
-            }\
-         }\
-         part{\
-            name: "swallow";\
-            type: SWALLOW;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left1";\
-               rel1.to_y: "inner_bg";\
-               rel1.offset: 0 0;\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right1";\
-               rel2.to_y: "inner_bg";\
-               rel2.offset: -1 height_offset;\
-            }\
-         }\
-         part{\
-            name: "over";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               rel1.to: "inner_bg";\
-               rel2.to: "inner_bg";\
-               color: 255 255 255 180;\
-               image.normal: "01_dialoguegroup_hidden_"location".png" ;\
-               image.border: r_border l_border t_border b_border;\
-               image.border_scale: 1;\
-            }\
-            description{\
-               state: "disabled" 0.0;\
-               inherit: "default" 0.0;\
-               visible: 1;\
-            }\
-         }\
-      }\
-      programs {\
-         program { \
-            name: "disabled";\
-            signal: "elm,state,disabled";\
-            source: "elm";\
-            action: STATE_SET "disabled" 0.0;\
-            target: "over";\
-         }\
-         program { \
-            name: "enabled";\
-            signal: "elm,state,enabled";\
-            source: "elm";\
-            action: STATE_SET "default" 0.0;\
-            target: "over";\
-         }\
-      }\
-   }
-
-DIALOGUE_GROUP_HIDDEN_BACKGROUND("default", -5, 13, 13, 10, 15);
-DIALOGUE_GROUP_HIDDEN_BACKGROUND("top", -1, 13, 13, 10, 4);
-DIALOGUE_GROUP_HIDDEN_BACKGROUND("middle", -1, 13, 13, 5, 5);
-DIALOGUE_GROUP_HIDDEN_BACKGROUND("bottom", -5, 13, 13, 5, 14);
-
-#define DIALOGUE_GROUP_DATAVIEW_BACKGROUND(location, height_offset, r_border, l_border, t_border, b_border) \
-   group{ \
-      name: "elm/dialoguegroup/dataview_"location"/default";\
-      images{\
-         image: "01_dialoguegroup_dataview_"location".png" COMP;\
-      }\
-      parts{\
-         part{\
-            name: "left";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 11 0;\
-               fixed: 1 0;\
-               align: 0 0.5;\
-               rel1.relative: 0.0 0.0;\
-               rel2.relative: 0.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "right";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 11 0;\
-               fixed: 1 0;\
-               align: 1 0.5;\
-               rel1.relative: 1.0 0.0;\
-               rel2.relative: 1.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "left1";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 15 0;\
-               fixed: 1 0;\
-               align: 0 0.5;\
-               rel1.relative: 0.0 0.0;\
-               rel2.relative: 0.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "right1";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 15 0;\
-               fixed: 1 0;\
-               align: 1 0.5;\
-               rel1.relative: 1.0 0.0;\
-               rel2.relative: 1.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "bg";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left";\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right";\
-               image.normal: "01_dialoguegroup_dataview_"location".png" ;\
-               image.border: r_border l_border t_border b_border;\
-               image.border_scale: 1;\
-            }\
-         }\
-         part{\
-            name: "swallow";\
-            type: SWALLOW;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left1";\
-               rel1.to_y: "bg";\
-               rel1.offset: 0 0;\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right1";\
-               rel2.to_y: "bg";\
-               rel2.offset: -1 height_offset;\
-            }\
-         }\
-         part{\
-            name: "over";\
-            type: IMAGE;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               rel1.to: "bg";\
-               rel2.to: "bg";\
-               color: 255 255 255 180;\
-               image.normal: "01_dialoguegroup_dataview_"location".png" ;\
-               image.border: r_border l_border t_border b_border;\
-               image.border_scale: 1;\
-            }\
-            description{\
-               state: "disabled" 0.0;\
-               inherit: "default" 0.0;\
-               visible: 1;\
-            }\
-         }\
-      }\
-      programs {\
-         program { \
-            name: "disabled";\
-            signal: "elm,state,disabled";\
-            source: "elm";\
-            action: STATE_SET "disabled" 0.0;\
-            target: "over";\
-         }\
-         program { \
-            name: "enabled";\
-            signal: "elm,state,enabled";\
-            source: "elm";\
-            action: STATE_SET "default" 0.0;\
-            target: "over";\
-         }\
-      }\
-   }
-
-DIALOGUE_GROUP_DATAVIEW_BACKGROUND("default", -5, 13, 13, 10, 15);
-DIALOGUE_GROUP_DATAVIEW_BACKGROUND("top", -1, 13, 13, 10, 4);
-DIALOGUE_GROUP_DATAVIEW_BACKGROUND("middle", -1, 13, 13, 5, 5);
-DIALOGUE_GROUP_DATAVIEW_BACKGROUND("bottom", -5, 13, 13, 5, 14);
-
-#define DIALOGUE_GROUP_NO_BACKGROUND(location, height_offset) \
-   group{ \
-      name: "elm/dialoguegroup/no_bg_"location"/default";\
-      parts{\
-         part{\
-            name: "left";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 11 0;\
-               fixed: 1 0;\
-               align: 0 0.5;\
-               rel1.relative: 0.0 0.0;\
-               rel2.relative: 0.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "right";\
-            type: RECT;\
-            scale: 1;\
-            mouse_events: 0;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               min: 11 0;\
-               fixed: 1 0;\
-               align: 1 0.5;\
-               rel1.relative: 1.0 0.0;\
-               rel2.relative: 1.0 1.0;\
-            }\
-         }\
-         part{\
-            name: "bg";\
-            type: RECT;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left";\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right";\
-               color: 0 0 0 0;\
-            }\
-         }\
-         part{\
-            name: "swallow";\
-            type: SWALLOW;\
-            description{\
-               state: "default" 0.0;\
-               rel1.relative: 1.0 0.0;\
-               rel1.to_x: "left";\
-               rel1.to_y: "bg";\
-               rel1.offset: 0 0;\
-               rel2.relative: 0.0 1.0;\
-               rel2.to_x: "right";\
-               rel2.to_y: "bg";\
-               rel2.offset: -1 height_offset;\
-            }\
-         }\
-         part{\
-            name: "over";\
-            type: RECT;\
-            mouse_events: 1;\
-            description{\
-               state: "default" 0.0;\
-               visible: 0;\
-               rel1.to: "bg";\
-               rel2.to: "bg";\
-               color: 0 0 0 0;\
-            }\
-            description{\
-               state: "disabled" 0.0;\
-               inherit: "default" 0.0;\
-               visible: 1;\
-            }\
-         }\
-      }\
-      programs {\
-         program { \
-            name: "disabled";\
-            signal: "elm,state,disabled";\
-            source: "elm";\
-            action: STATE_SET "disabled" 0.0;\
-            target: "over";\
-         }\
-         program { \
-            name: "enabled";\
-            signal: "elm,state,enabled";\
-            source: "elm";\
-            action: STATE_SET "default" 0.0;\
-            target: "over";\
-         }\
-      }\
-   }
-
-DIALOGUE_GROUP_NO_BACKGROUND("default", -5);
-DIALOGUE_GROUP_NO_BACKGROUND("top", -1);
-DIALOGUE_GROUP_NO_BACKGROUND("middle", -1);
-DIALOGUE_GROUP_NO_BACKGROUND("bottom", -5);
-
-
-group { name: "elm/dialoguegroup/title/default";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 30;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;                    
-         }
-      }
-      part { name: "text";
-         type: TEXT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 0.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "left_padding";
-            rel2.relative: 1.0 0.5;
-            
-            color: DIALOGUEGROUP_ITEM_TITLE_TEXT_COLOR_INC;
-            text {
-               font: "SLP:style=Medium";
-               size: 20;
-               min: 0 0;
-               align: 0.0 0.5;
-            }
-         }      
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/default";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 80;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;                    
-         }
-      }
-      part { name: "right_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      }
-      part { name: "right_padding_e";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 5 0;
-            max: 5 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      } 
-      part { name: "text";
-         type: TEXT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 0.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "left_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "content";
-            
-            color: DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC;
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.5;
-            }
-         }
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;                                     
-            color: DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC;
-         }
-      }
-      part { name: "content";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding";
-         }      
-      }
-      part { name: "content_extended";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding_e";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding_e";
-         }      
-      } 
-      part { name: "over";
-         type: RECT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            color: 0 0 0 0;
-         }      
-         description { 
-            state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-   }
-   programs {
-      program {
-         name:   "mouse_down";
-         signal: "mouse,down,1";
-         source: "over";
-         action: STATE_SET "pressed" 0.0;
-         target: "text";
-      }
-      program {
-         name:   "mouse_up";
-         signal: "mouse,up,1";
-         source: "over";
-         action: STATE_SET "default" 0.0;
-         target: "text";
-      }
-      program { 
-         name: "highlight_off";
-         signal: "elm,text,highlight,off";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "over";
-      }
-      program { 
-         name: "highlight_on";
-         signal: "elm,text,highlight,on";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "over";
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/text_with_button";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 80;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;                    
-         }
-      }
-      part { name: "right_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      }
-      part { name: "right_padding_e";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 5 0;
-            max: 5 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      } 
-      part { name: "text";
-         type: TEXT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 0.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "left_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "content";       
-            color: DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC;
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.5;
-            }
-         }
-      }
-      part { name: "content";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding";
-         }      
-      }
-      part { name: "content_extended";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding_e";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding_e";
-         }      
-      } 
-   }
-}
-
-group { name: "elm/dialogueitem/base/text_with_button_with_event_rect";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 80;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part { name: "right_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part { name: "right_padding_e";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 5 0;
-            max: 5 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part { name: "text";
-         type: TEXT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            align: 0.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "left_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "content";
-            color: DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC;
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.5;
-            }
-         }
-      }
-      part { name: "content";
-         type: SWALLOW;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding";
-         }
-      }
-      part { name: "content_extended";
-         type: SWALLOW;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding_e";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding_e";
-         }
-      }
-      part { name: "event_rect";
-         type: "RECT";
-         repeat_events: 1;
-         description {
-            state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-      }
-   }
-   programs {
-      program {
-         name: "clicked";
-         source: "event_rect";
-         signal: "mouse,clicked,1";
-         action: SIGNAL_EMIT "clicked" "*";
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/text_with_button_2_wrap";
-   styles{
-      style { name: "dialogue_text_style";
-         base: "font=SLP:style=Roman font_size=32 align=left color="DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC_HEX" wrap=mixed";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "hilight" "+ font=SLP:style=Bold";
-         tag:  "b" "+ font=SLP:style=Bold";
-         tag:  "tab" "\t";
-      }
-      style { name: "dialogue_text_pressed_style";
-         base: "font=SLP:style=Roman font_size=32 align=left color="DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC_HEX" wrap=mixed";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "hilight" "+ font=SLP:style=Bold";
-         tag:  "b" "+ font=SLP:style=Bold";
-         tag:  "tab" "\t";
-      }
-   }    
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 80;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;                    
-         }
-      }
-      part { name: "right_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      }
-      part { name: "right_padding_e";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 5 0;
-            max: 5 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      } 
-      part {
-         name: "text";
-         type: TEXTBLOCK;
-         effect: SHADOW;
-         scale:1;       
-         description {
-            state: "default" 0.0;
-            text {
-               style: "dialogue_text_style";
-               min: 0 0;
-               max: 0 1;
-            }
-            rel1 { relative: 1.0 0.0; to_x: "left_padding"; to_y: "bg"; }  //1.0 0.0
-            rel2 { relative: 0.0 1.0; to_x: "content"; to_y: "bg"; }
-            align: 0.0 0.5;
-         }      
-         description {
-            state: "pressed" 0.0;
-            text {
-               style: "dialogue_text_pressed_style";
-               min: 0 0;
-               max: 0 1;
-            }
-            rel1 { relative: 1.0 0.0; to_x: "left_padding"; to_y: "bg"; }  //1.0 0.0
-            rel2 { relative: 0.0 1.0; to_x: "content"; to_y: "bg"; }
-            align: 0.0 0.5;
-         }      
-      }
-      part { name: "over";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-         description { 
-            state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "content";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding";
-         }      
-      }
-      part { name: "content_extended";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding_e";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding_e";
-         }      
-      } 
-   }
-   programs {
-      program {
-         name:   "mouse_down";
-         signal: "mouse,down,1";
-         source: "over";
-         action: STATE_SET "pressed" 0.0;
-         target: "text";
-      }
-      program {
-         name:   "mouse_up";
-         signal: "mouse,up,1";
-         source: "over";
-         action: STATE_SET "default" 0.0;
-         target: "text";
-      }
-      program { 
-         name: "highlight_off";
-         signal: "elm,text,highlight,off";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "over";
-      }
-      program { 
-         name: "highlight_on";
-         signal: "elm,text,highlight,on";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "over";
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/text_with_button_2";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 80;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;                    
-         }
-      }
-      part { name: "right_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      }
-      part { name: "right_padding_e";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 5 0;
-            max: 5 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      } 
-      part { name: "text";
-         type: TEXT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 0.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "left_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "content";
-            
-            color: DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC;
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.5;
-            }
-         }
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;                                     
-            color: DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC;
-         }
-      }
-      part { name: "over";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-         description { 
-            state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "content";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding";
-         }      
-      }
-      part { name: "content_extended";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding_e";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding_e";
-         }      
-      } 
-   }
-   programs {
-      program {
-         name:   "mouse_down";
-         signal: "mouse,down,1";
-         source: "over";
-         action: STATE_SET "pressed" 0.0;
-         target: "text";
-      }
-      program {
-         name:   "mouse_up";
-         signal: "mouse,up,1";
-         source: "over";
-         action: STATE_SET "default" 0.0;
-         target: "text";
-      }
-      program { 
-         name: "highlight_off";
-         signal: "elm,text,highlight,off";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "over";
-      }
-      program { 
-         name: "highlight_on";
-         signal: "elm,text,highlight,on";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "over";
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/button_with_text";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 80;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;                    
-         }
-      }
-      part { name: "left_padding1";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 10 0;
-            max: 10 9999;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel1.to_x: "content";
-            rel2.to_x: "content";
-         }
-      }
-      part { name: "right_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 10 0;
-            max: 10 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      }
-      part { name: "text";
-         type: TEXT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 0.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "left_padding1";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding";
-            
-            color: DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC;
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.5;
-            }
-         }
-      }
-      part { name: "content";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 0.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "left_padding";
-            rel2.relative: 1.0 0.5;
-            rel2.to_x: "left_padding";
-         }      
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/text_with_arrow";
-   images{
-      image: "00_list_on_arrow.png" COMP;       
-      image: "00_list_on_arrow_press.png" COMP;
-   }
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 80;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;                    
-         }
-      }
-      part { name: "right_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      }
-      part { name: "text";
-         type: TEXT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 0.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "left_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "arrow_image";
-            
-            color: DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC;
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.5;
-            }
-         }
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;                                     
-            color: DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC;
-         }
-      }
-      part { name: "arrow_image";
-         type: IMAGE;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            min: 15 28;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding";
-            image.normal: "00_list_on_arrow.png" ;
-         }      
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;     
-            image.normal: "00_list_on_arrow_press.png" ;
-         }
-      }
-      part { name: "over";
-         type: RECT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            color: 0 0 0 0;
-         }
-         description { 
-            state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-   }
-   programs {
-      program {
-         name:   "mouse_down";
-         signal: "mouse,down,1";
-         source: "over";
-         action: STATE_SET "pressed" 0.0;
-         target: "text";
-         target: "arrow_image";
-      }
-      program {
-         name:   "mouse_up";
-         signal: "mouse,up,1";
-         source: "over";
-         action: STATE_SET "default" 0.0;
-         target: "text";
-         target: "arrow_image";
-      }
-      program { 
-         name: "highlight_off";
-         signal: "elm,text,highlight,off";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "over";
-      }
-      program { 
-         name: "highlight_on";
-         signal: "elm,text,highlight,on";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "over";
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/default_dim";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 80;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;                    
-         }
-      }
-      part { name: "right_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      }
-      part { name: "right_padding_e";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 5 0;
-            max: 5 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      }
- 
-      part { name: "text";
-         type: TEXT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 0.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "left_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "content";
-            
-            color: 163 157 138 255;
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.5;
-            }
-         }
-      }
-      part { name: "content";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding";
-         }      
-      }
-      part { name: "content_extended";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding_e";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding_e";
-         }      
-      } 
-   }
-}
-
-group { name: "elm/dialogueitem/base/dataview";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 66;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 15 0;
-            fixed: 1 0;
-            align: 0.0 0.0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;                    
-         }
-      }
-      part { name: "right_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 5 0;
-            fixed: 1 0;
-            align: 1.0 0.0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      }
-      part { name: "right_padding1";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 176 0;
-            fixed: 1 0;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      }
-      part { name: "left.text";
-         type: TEXT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 0.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "left_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding1";                
-            color: 0 0 0 255;
-            text {
-               font: "SLP:style=Roman";
-               size: 30;
-               min: 0 0;
-               align: 0.0 0.5;
-            }
-         }
-      }
-      part { name: "right.text";
-         type: TEXT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 0.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding1";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding";
-            color: 90 73 40 255;
-            text {
-               font: "SLP:style=Medium";
-               size: 26;
-               min: 0 0;
-               align: 0.0 0.5;
-            }
-         }
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/two_line_text_with_button_2";
-   parts {
-      part { name: "base";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            min: 0 90;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "top1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 50;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-      }
-      part { name: "top2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 10;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-      }
-      part { name: "left";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 15 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part { name: "right";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 15 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part { name: "right_e";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 5 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      } 
-      part { name: "top.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left";
-               to_y: "top2";                                            
-            }
-            rel2 {
-               relative: 0.0 0.5;
-               to_x: "content";
-            }
-            color: DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_1_INC;
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.0;
-            }
-         }
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;                                     
-            color: DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC;
-         }
-      }
-      part { name: "bottom.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left";
-               to_y: "top1";            
-            }
-            rel2 {
-               relative: 0.0 1.0;
-               to_x: "content";
-            }
-            color: DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_1_INC;
-            text {
-               font: "SLP:style=Medium";
-               size: 24;
-               min: 0 0;
-               align: 0.0 0.0;
-            }
-         }
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;                                     
-            color: DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC; 
-         }
-      }
-      part { name: "over";
-         type: RECT;
-         description {
-            state: "default" 0.0;
-            color: 0 0 0 0;
-         }                              
-         description { 
-            state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "content";
-         type: SWALLOW;
-         scale: 1;
-         repeat_events: 0;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right";
-         }      
-      }
-      part { name: "content_extended";
-         type: SWALLOW;
-         scale: 1;
-         repeat_events: 0;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_e";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_e";
-         }      
-      }
- 
-   }
-   programs {
-      program {
-         name:   "mouse_down";
-         signal: "mouse,down,1";
-         source: "over";
-         action: STATE_SET "pressed" 0.0;
-         target: "top.text";
-         target: "bottom.text";
-      }
-      program {
-         name:   "mouse_up";
-         signal: "mouse,up,1";
-         source: "over";
-         action: STATE_SET "default" 0.0;
-         target: "top.text";
-         target: "bottom.text";
-      }
-      program { 
-         name: "highlight_off";
-         signal: "elm,text,highlight,off";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "over";
-      }
-      program { name: "highlight_on";
-         signal: "elm,text,highlight,on";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "over";
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/two_line_text_with_button";
-   parts {
-      part { name: "base";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            min: 0 90;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "top1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 50;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-      }
-      part { name: "top2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 10;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-      }
-      part { name: "left";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 15 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part { name: "right";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 15 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part { name: "right_e";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 5 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      } 
-      part { name: "top.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left";
-               to_y: "top2";                                            
-            }
-            rel2 {
-               relative: 1.0 0.5;
-               to_x: "content";
-            }
-            color: DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_1_INC;
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.0;
-            }
-         }
-      }
-      part { name: "bottom.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left";
-               to_y: "top1";            
-            }
-            rel2 {
-               relative: 1.0 1.0;
-               to_x: "content";
-            }
-            color: DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_1_INC;
-            text {
-               font: "SLP:style=Medium";
-               size: 24;
-               min: 0 0;
-               align: 0.0 0.0;
-            }
-         }
-      }
-      part { name: "content";
-         type: SWALLOW;
-         scale: 1;
-         repeat_events: 0;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right";
-         }      
-      }
-      part { name: "content_extended";
-         type: SWALLOW;
-         scale: 1;
-         repeat_events: 0;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_e";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_e";
-         }      
-      } 
-   }
-}
-
-group { name: "elm/dialogueitem/base/two_line_text";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            min: 0 90;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "top1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 50;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-      }
-      part { name: "top2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 10;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-      }
-      part { name: "left";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 15 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part { name: "right";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 15 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part { name: "right_e";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 5 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
- 
-      part { name: "top.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left";
-               to_y: "top2";                                            
-            }
-            rel2 {
-               relative: 1.0 0.5;
-               to_x: "content";
-            }
-            color: DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_1_INC;
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.0;
-            }
-         }
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;                                     
-            color: DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC;
-         }
-      }
-      part { name: "bottom.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left";
-               to_y: "top1";            
-            }
-            rel2 {
-               relative: 0.0 1.0;
-               to_x: "content";
-            }
-            color: DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_1_INC;
-            text {
-               font: "SLP:style=Medium";
-               size: 24;
-               min: 0 0;
-               align: 0.0 0.0;
-            }
-         }
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;                                     
-            color: DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC; 
-         }
-      }
-      part { name: "content";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right";
-         }      
-      }
-      part { name: "content_extended";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_e";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_e";
-         }      
-      } 
-      part { name: "over";
-         type: RECT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            color: 0 0 0 0;
-            visible: 1;
-         }
-         description { 
-            state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-   }
-   programs {
-      program {
-         name:   "mouse_down";
-         signal: "mouse,down,1";
-         source: "over";
-         action: STATE_SET "pressed" 0.0;
-         target: "top.text";
-         target: "bottom.text";
-      }
-      program {
-         name:   "mouse_up";
-         signal: "mouse,up,1";
-         source: "over";
-         action: STATE_SET "default" 0.0;
-         target: "top.text";
-         target: "bottom.text";
-      }
-      program { 
-         name: "highlight_off";
-         signal: "elm,text,highlight,off";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "over";
-      }
-      program { 
-         name: "highlight_on";
-         signal: "elm,text,highlight,on";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "over";
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/two_line_text_with_arrow";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            min: 0 90;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "top1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 50;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-      }
-      part { name: "top2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 10;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-      }
-      part { name: "left";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 15 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part { name: "right";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 15 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part { name: "top.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left";
-               to_y: "top2";                                            
-            }
-            rel2 {
-               relative: 1.0 0.5;
-               to_x: "arrow_image";
-            }
-            color: DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_1_INC;
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.0;
-            }
-         }
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;                                     
-            color: DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC;
-         }
-      }
-      part { name: "bottom.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left";
-               to_y: "top1";            
-            }
-            rel2 {
-               relative: 1.0 1.0;
-               to_x: "arrow_image";
-            }
-            color: DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_1_INC;
-            text {
-               font: "SLP:style=Medium";
-               size: 24;
-               min: 0 0;
-               align: 0.0 0.0;
-            }
-         }
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;                                     
-            color: DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC;
-         }
-      }
-      part { name: "arrow_image";
-         type: IMAGE;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            min: 15 28;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right";
-            image.normal: "00_list_on_arrow.png" ;
-         }      
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;     
-            image.normal: "00_list_on_arrow_press.png" ;
-         }
-      }
-      part { name: "over";
-         type: RECT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            color: 0 0 0 0;
-         }                              
-         description { 
-            state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-   }
-   programs {
-      program {
-         name:   "mouse_down";
-         signal: "mouse,down,1";
-         source: "over";
-         action: STATE_SET "pressed" 0.0;
-         target: "top.text";
-         target: "bottom.text";
-         target: "arrow_image";
-      }
-      program {
-         name:   "mouse_up";
-         signal: "mouse,up,1";
-         source: "over";
-         action: STATE_SET "default" 0.0;
-         target: "top.text";
-         target: "bottom.text";
-         target: "arrow_image";
-      }
-      program { 
-         name: "highlight_off";
-         signal: "elm,text,highlight,off";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "over";
-      }
-      program { 
-         name: "highlight_on";
-         signal: "elm,text,highlight,on";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "over";
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/edit_title_with_button";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 80;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;                    
-         }
-      }
-      part { name: "right_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      }
-      part { name: "right_padding_e";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 5 0;
-            max: 5 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-         }
-      } 
-      part { name: "text";
-         type: TEXT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 0.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "left_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "content";
-            
-            color: 255 255 255 255;
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.5;
-            }
-         }
-      }
-      part { name: "content";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding";
-         }      
-      }
-      part { name: "content_extended";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding_e";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding_e";
-         }      
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/edit_two_line_text";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            min: 0 90;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "top1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 40;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-      }
-      part { name: "top2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 10;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-      }
-      part { name: "left";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 15 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part { name: "right";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 15 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part { name: "right_e";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 5 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      } 
-      part { name: "top.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left";
-               to_y: "top2";                                            
-            }
-            rel2 {
-               relative: 0.0 0.5;
-               to_x: "content";
-            }
-            color: DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_2_INC;
-            text {
-               font: "SLP:style=Medium";
-               size: 24;
-               min: 0 0;
-               align: 0.0 0.0;
-            }
-         }
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;                                     
-            color: DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC; 
-         }
-      }
-      part { name: "bottom.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left";
-               to_y: "top1";            
-            }
-            rel2 {
-               relative: 0.0 1.0;
-               to_x: "content";
-            }
-            color: DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_2_INC;
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.0;
-            }
-         }
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;                                     
-            color: DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC;
-         }
-      }
-      part { name: "content";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right";
-         }      
-      }
-      part { name: "content_extended";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_e";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_e";
-         }      
-      } 
-      part { name: "over";
-         type: RECT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            color: 0 0 0 0;
-         }      
-         description { 
-            state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-   }
-   programs {
-      program {
-         name:   "mouse_down";
-         signal: "mouse,down,1";
-         source: "over";
-         action: STATE_SET "pressed" 0.0;
-         target: "top.text";
-         target: "bottom.text";
-      }
-      program {
-         name:   "mouse_up";
-         signal: "mouse,up,1";
-         source: "over";
-         action: STATE_SET "default" 0.0;
-         target: "top.text";
-         target: "bottom.text";
-      }
-      program { 
-         name: "highlight_off";
-         signal: "elm,text,highlight,off";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "over";
-      }
-      program { 
-         name: "highlight_on";
-         signal: "elm,text,highlight,on";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "over";
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/edit_two_line_text_with_arrow";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            min: 0 90;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "top1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 40;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-      }
-      part { name: "top2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 10;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-      }
-      part { name: "left";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 15 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part { name: "right";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 15 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part { name: "top.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left";
-               to_y: "top2";                                            
-            }
-            rel2 {
-               relative: 1.0 0.5;
-               to_x: "arrow_image";
-            }
-            color: DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_2_INC; 
-            text {
-               font: "SLP:style=Medium";
-               size: 24;
-               min: 0 0;
-               align: 0.0 0.0;
-            }
-         }
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;                                     
-            color: DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC;
-         }
-      }
-      part { name: "bottom.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left";
-               to_y: "top1";            
-            }
-            rel2 {
-               relative: 1.0 1.0;
-               to_x: "arrow_image";
-            }
-            color: DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_2_INC;
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.0;
-            }
-         }
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;                                     
-            color: DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC;                           
-         }
-      }
-      part { name: "arrow_image";
-         type: IMAGE;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            min: 15 28;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right";
-            image.normal: "00_list_on_arrow.png" ;
-         }      
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;     
-            image.normal: "00_list_on_arrow_press.png" ;
-         }
-      }
-      part { name: "over";
-         type: RECT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            color: 0 0 0 0;
-         }                              
-         description { 
-            state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-   }
-   programs {
-      program {
-         name:   "mouse_down";
-         signal: "mouse,down,1";
-         source: "over";
-         action: STATE_SET "pressed" 0.0;
-         target: "top.text";
-         target: "bottom.text";
-         target: "arrow_image";
-      }
-      program {
-         name:   "mouse_up";
-         signal: "mouse,up,1";
-         source: "over";
-         action: STATE_SET "default" 0.0;
-         target: "top.text";
-         target: "bottom.text";
-         target: "arrow_image";
-      }
-      program { 
-         name: "highlight_off";
-         signal: "elm,text,highlight,off";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "over";
-      }
-      program { 
-         name: "highlight_on";
-         signal: "elm,text,highlight,on";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "over";
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/edit_two_line_text_with_button";
-   parts {
-      part { name: "base";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            min: 0 90;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "top1";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 40;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-      }
-      part { name: "top2";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 0 10;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 0;
-         }
-      }
-      part { name: "left";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 15 0;
-            fixed: 1 1;
-            align: 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part { name: "right";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 15 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part { name: "right_e";
-         type: RECT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            min: 5 0;
-            fixed: 1 1;
-            align: 1 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      } 
-      part { name: "top.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left";
-               to_y: "top2";                                            
-            }
-            rel2 {
-               relative: 0.0 0.5;
-               to_x: "content";
-            }
-            color: DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_2_INC; 
-            text {
-               font: "SLP:style=Medium";
-               size: 24;
-               min: 0 0;
-               align: 0.0 0.0;
-            }
-         }
-      }
-      part { name: "bottom.text";
-         type: TEXT;
-         scale: 1;
-         ignore_flags: ON_HOLD;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 {
-               relative: 1.0 1.0;
-               to_x: "left";
-               to_y: "top1";            
-            }
-            rel2 {
-               relative: 0.0 1.0;
-               to_x: "content";
-            }
-            color: DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_2_INC; 
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.0;
-            }
-         }
-      }
-      part { name: "content";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right";
-         }      
-      }
-      part { name: "content_extended";
-         type: SWALLOW;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_e";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_e";
-         }      
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/list_on_off";
-   images{
-      image: "00_list_on_arrow.png" COMP;       
-      image: "00_list_on_arrow_press.png" COMP;
-   }
-   script        {
-      public off_style = 0;
-      
-      public set_on_style() {
-         set_int(off_style, 0);
-         set_state(PART:"on_off_text", "default", 0.0);
-      }
-      public set_off_style() {
-         set_int(off_style, 1);
-         set_state(PART:"on_off_text", "off_style", 0.0);
-      }
-      public thumb_up() {
-         if(get_int(off_style) == 1)
-           set_state(PART:"on_off_text", "off_style", 0.0);
-         else
-           set_state(PART:"on_off_text", "default", 0.0);
-         set_state(PART:"text", "default", 0.0);
-         set_state(PART:"arrow_image", "default", 0.0);
-      }
-   }
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 80;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;                    
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "right_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;                    
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "text_icon_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            rel1.relative : 0.0 0.0;
-            rel1.to_x : "arrow_image";
-            rel2.relative : 0.0 1.0;                    
-            rel2.to_x : "arrow_image";
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "text";
-         type: TEXT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 0.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "left_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "on_off_text";
-            color: DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC;
-            text {
-               font: "SLP:style=Roman";
-               size: 32;
-               min: 0 0;
-               align: 0.0 0.5;
-            }
-         }
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;             
-            color: DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC;
-         }
-      }
-      part { name: "on_off_text";
-         type: TEXT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "text_icon_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "text_icon_padding";
-            color: DIALOGUEGROUP_ITEM_ON_TEXT_COLOR_INC;
-            text {
-               font: "SLP:style=Roman";
-               size: 22;
-               min: 1 1;
-               align: 1.0 0.5;
-            }
-         }
-         description { 
-            state: "off_style" 0.0;
-            inherit: "default" 0.0;     
-            color: DIALOGUEGROUP_ITEM_OFF_TEXT_COLOR_INC;
-         }
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;     
-            color: DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC; 
-         }
-      }
-      part { name: "arrow_image";
-         type: IMAGE;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            align: 1.0 0.5;
-            min: 15 28;
-            fixed: 1 1;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding";
-            image.normal: "00_list_on_arrow.png" ;
-         }      
-         description { 
-            state: "pressed" 0.0;
-            inherit: "default" 0.0;     
-            image.normal: "00_list_on_arrow_press.png" ;
-         }
-      }
-      part { name: "over";
-         type: RECT;
-         scale: 1;
-         description { 
-            state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            color: 0 0 0 0;
-         }      
-         description { 
-            state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-   }
-   programs {
-      program { 
-         name: "on_style";
-         signal: "elm,state,on,style";
-         source: "elm";
-         script {
-            set_on_style();
-         }
-      }
-      program { 
-         name: "invert_off";
-         signal: "elm,state,off,style";
-         source: "elm";
-         script {
-            set_off_style();
-         }
-      }
-      program {
-         name:   "mouse_down";
-         signal: "mouse,down,1";
-         source: "over";
-         action: STATE_SET "pressed" 0.0;
-         target: "text";
-         target: "on_off_text";
-         target: "arrow_image";
-      }
-      program {
-         name:   "mouse_up";
-         signal: "mouse,up,1";
-         source: "over";
-         script {
-            thumb_up();
-         }                              
-      }
-      program { 
-         name: "highlight_off";
-         signal: "elm,text,highlight,off";
-         source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "over";
-      }
-      program { name: "highlight_on";
-         signal: "elm,text,highlight,on";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "over";
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/slider";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 80;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part { name: "right_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part { name: "slider";
-         type: SWALLOW;
-         description { 
-            state: "default" 0.0;
-            fixed: 1 1;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "left_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding";
-         }
-      }
-   }
-}
-
-group { name: "elm/dialogueitem/base/slider_with_numbers";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 80;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part { name: "right_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part { name: "start.text";
-         type: TEXT;
-         description { 
-            state: "default" 0.0;
-            fixed: 1 1;
-            align: 0.0 0.5;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "left_padding";
-            rel2.relative: 1.0 0.5;
-            rel2.to_x: "left_padding";
-            color: 163 158 151 255;
-            text {
-               font: "SLP:style=Bold";
-               size: 36;
-               min: 1 0;
-               align: 0.0 0.5;
-            }
-         }
-      }
-      part { name: "padding_before_slider";
-         type: RECT;
-         description { 
-            state: "default" 0.0;
-            fixed: 1 1;
-            visible: 0;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "start.text";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "start.text";
-            align: 1.0 0.5;
-            min: 10 1;
-         }
-      }
-      part { name: "slider";
-         type: SWALLOW;
-         description { 
-            state: "default" 0.0;
-            fixed: 1 1;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "start.text";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "end.text";
-         }      
-      }
-      part { name: "padding_after_slider";
-         type: RECT;
-         description { 
-            state: "default" 0.0;
-            fixed: 1 1;
-            visible: 0;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "end.text";
-            rel1.offset: 5 0;
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "end.text";
-            align: 1.0 0.5;
-            min: 10 1;
-         }
-      }
-      part { name: "end.text";
-         type: TEXT;
-         description { 
-            state: "default" 0.0;
-            fixed: 1 1;
-            align: 1.0 0.5;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding";
-            color: 163 158 151 255;
-            text {
-               font: "SLP:style=Bold";
-               size: 36;
-               min: 1 0;
-               align: 0.0 0.5;
-            }
-         }
-      }
-   }
-}
-
-
-group { name: "elm/dialogueitem/base/slider_with_text";
-   parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 0 80;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "left_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 0.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 0.0 0.0;
-            rel2.relative : 0.0 1.0;
-         }
-      }
-      part { name: "right_padding";
-         type: RECT;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 0;
-            max: 15 9999;
-            fixed: 1 1;
-            align: 1.0 0.0;
-            color: 0 0 0 0;
-            rel1.relative : 1.0 0.0;
-            rel2.relative : 1.0 1.0;
-         }
-      }
-      part { name: "slider";
-         type: SWALLOW;
-         description { 
-            state: "default" 0.0;
-            fixed: 1 1;
-            rel1.relative: 1.0 0.5;
-            rel1.to_x: "left_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "end.text";
-         }      
-      }
-      part { name: "padding_slider_text";
-         type: RECT;
-         description { 
-            state: "default" 0.0;
-            fixed: 1 1;
-            visible: 0;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "end.text";
-            rel1.offset: 5 0;
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "end.text";
-            align: 1.0 0.5;
-            min: 10 1;
-         }
-      }
-      part { name: "end.text";
-         type: TEXT;
-         description { 
-            state: "default" 0.0;
-            fixed: 1 1;
-            align: 1.0 0.5;
-            rel1.relative: 0.0 0.5;
-            rel1.to_x: "right_padding";
-            rel2.relative: 0.0 0.5;
-            rel2.to_x: "right_padding";
-            color: 122 122 122 255;
-            text {
-               font: "SLP:style=Bold";
-               size: 18;
-               min: 1 0;
-               align: 0.0 0.5;
-            }
-         }
-      }
-   }
-}
-
diff --git a/themes/groups/layout.edc b/themes/groups/layout.edc
index 2b6a73f0..0f7a81dc 100644
--- a/themes/groups/layout.edc
+++ b/themes/groups/layout.edc
@@ -318,7 +318,7 @@
             description {
                state: "default" 0.0;
                visible: 0;
-               min: 0 NAVIBAR_H_INC;
+               min: 0 NAVIFRAME_TITLE_H_INC;
                fixed: 0 1;
                rel1 { relative: 0.0 0.0; }
                rel2 { relative: 1.0 0.0; }
diff --git a/themes/groups/navigationbar.edc b/themes/groups/navigationbar.edc
deleted file mode 100644
index 5aab43af..00000000
--- a/themes/groups/navigationbar.edc
+++ /dev/null
@@ -1,548 +0,0 @@
-/*
- *  nbeat-theme
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Seokjae Jeong <seok.j.jeong@samsung.com>, Myoungwoon Roy Kim <Myoungwoon.kim@samsung.com>, Jeonghyun Yun <jh0506.yun@samsung.com>, Jaehwan Kim <jae.hwan.kim@samsung.com>, Chuneon Park <chuneon.park@samsung.com>, Juyung Seo <juyung.seo@samsung.com>, Woohyun Jung <wh0705.jung@samsung.com>, Myungjae Lee <mjae.lee@samsung.com>, Hyoyoung Chang <hyoyoung.chang@samsung.com>, IlKook Yun <ilkook.yun@samsung.com>, CinWoo Kim <cinoo.kim@samsung.com> JiYeon Park <jy0703.park@samsung.com>
- * 
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * 
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#define NAVIBAR_TITLE_SEPARATOR_SHADOW_H 5
-
-////////////////////////////////////////////////////////////////////////////////////////
-// NavigationBar
-////////////////////////////////////////////////////////////////////////////////////////
-
-group {
-   name: "elm/navigationbar/base/default";
-   images {
-      image: "00_winset_control_top_arrow.png" COMP;
-      image: "navibar_item_separator.png" COMP;
-      image: "navibar_item_separator_shadow.png" COMP;
-   }
-   parts {
-      part { name: "base";
-         type: RECT;
-         mouse_events: 0;
-         repeat_events: 1;
-         scale: 1 ;
-         description { state: "default" 0.0;
-            min: 1 NAVIBAR_H_INC;
-            align: 0.0 0.0;
-            fixed: 1 1;
-            rel2.relative: 1.0 0.0;
-            visible: 0;
-         }
-         description { state: "top" 0.0;
-            inherit: "default" 0.0;
-            min: 1 0;
-         }
-         description { state: "extended" 0.0;
-            inherit: "default" 0.0;
-            min: 1 NAVIBAR_EXTENDED_H_INC;
-         }
-      }
-      part { name: "clip_title";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-         }
-      }
-      part { name: "navigationitem";
-         type: RECT;
-         scale: 1;
-         clip_to: "clip_title";
-         description { state: "default" 0.0;
-            min: 1 (NAVIBAR_H_INC - NAVIBAR_TITLE_SEPARATOR_H_INC);
-            fixed: 0 1;
-            rel1 { relative: 0.0 0.0; to:"base"; }
-            rel2 { relative: 1.0 0.0; to:"base"; }
-            align: 0.5 0;
-            color: NAVIBAR_TITLE_BG_COLOR_INC;
-         }
-      }
-      part { name: "elm.rect.pada";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: NAVIBAR_INDICATOR_W_INC 0;
-            fixed: 1 0;
-            align: 0.0 0.5;
-            rel1 { relative: 0.0 0.0; to: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-            visible: 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: default 0.0;
-            min: NAVIBAR_PADDING_EXPANDED_INC 0;
-         }
-      }
-      part { name: "separator_1";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         clip_to: "clip_title";
-         description { state: "default" 0.0;
-            align: 1.0 0;
-            min: 1 0;
-            rel1 { relative: 0.0 0.2; to:"elm.rect.padb";}
-            rel2 { relative: 0.0 0.8; to:"elm.rect.padb";}
-            fixed: 1 0;
-            color: NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC;
-         }
-      }
-      part { name: "separator_2";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         clip_to: "clip_title";
-         description { state: "default" 0.0;
-            align: 1.0 0;
-            min: 1 0;
-            rel1 { relative: 0.0 0.0; to: "separator_1"; }
-            rel2 { relative: 0.0 1.0; to: "separator_1"; }
-            fixed: 1 0;
-            color: NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC;
-         }
-      }
-      part { name: "elm.rect.padb";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: NAVIBAR_INDICATOR_W_INC 0;
-            fixed: 1 0;
-            align: 1.0 0.5;
-            rel1 { relative: 1.0 0.0; to: "navigationitem"; }
-            rel2 { relative: 1.0 1.0; to: "navigationitem"; }
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXT;
-         scale: 1;
-         clip_to: "clip_title";
-         description { state: "default" 0.0;
-            text { font: "SLP:style=Medium";
-               size: NAVIBAR_TITLE_FONT_SIZE_INC;
-               min: 0 0;
-               align: 0.5 0.5;
-               max: 1 0;
-            }
-            color: NAVIBAR_TITLE_TEXT_COLOR_INC;
-            align: 0.5 0.5;
-            rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
-            rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
-         }
-      }
-      part { name: "events";
-          ignore_flags: ON_HOLD;
-          description { state: "default" 0.0;
-             rel2 { to: "elm.rect.padb"; relative: 0.0 1.0; }
-          }
-      }
-      part { name: "elm.swallow.prev_btn";
-         type: SWALLOW;
-         clip_to: "clip_title";
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            align: 0.0 0.5;
-            rel1 { relative: 0.0 0.0; to: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-         }
-      }
-      part {
-         name: "elm.swallow.icon";
-         type: SWALLOW;
-         clip_to: "clip_title";
-         scale: 1;
-         description { state: "default" 0.0;
-            max: NAVIBAR_ICON_SIZE_INC NAVIBAR_ICON_SIZE_INC;
-            rel1 { relative: 0.0 0.0; to_x: "padding_before_text";to_y: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to_x: "padding_before_text";to_y: "navigationitem"; }
-            aspect: 1.0 1.0;
-            aspect_preference: VERTICAL;
-            align: 1.0 0.5;
-         }
-      }
-      part { name: "padding_before_text";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 1.0 0.5;
-            rel1 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "navigationitem";}
-            fixed: 1 0;
-            min: NAVIBAR_ICON_PADDING_INC 0;
-            visible: 0;
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 { relative: 0.0 1.0; to_y: "base"; }
-            rel2 { relative: 1.0 1.0; }
-         }
-         description { state: "top" 0.0;
-            rel1 { relative: 0.0 0.0; }
-            rel2 { relative: 1.0 1.0; }
-         }
-      }
-      part { name: "navigationitem_separator";
-         type: IMAGE;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 1 NAVIBAR_TITLE_SEPARATOR_H_INC;
-            align: 0.5 1;
-            rel1 { to: "navigationitem"; relative: 0 1; }
-            rel2 { to: "base"; relative: 1 1; }
-            image { normal: "navibar_item_separator.png";
-               border: 0 0 1 0;
-            }
-         }
-      }
-      part { name: "navigationitem_separator_shadow";
-         type: IMAGE;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 1 NAVIBAR_TITLE_SEPARATOR_SHADOW_H;
-            fixed: 0 1;
-            align: 0.5 0;
-            color: 255 255 255 0;
-            rel1 { to: "navigationitem_separator"; relative: 0 1; }
-            rel2 { to: "navigationitem_separator"; relative: 1 1; }
-            image { normal: "navibar_item_separator_shadow.png"; }
-         }
-         description { state: "extended" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "naviarrow";
-         type: IMAGE;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: NAVIBAR_TOP_ARROW_W_INC NAVIBAR_TOP_ARROW_H_INC;
-            max: NAVIBAR_TOP_ARROW_W_INC NAVIBAR_TOP_ARROW_H_INC;
-            fixed: 1 1;
-            align: 0.5 1;
-            visible: 0;
-            rel1 { relative: 0 0; to: "navigationitem_separator"; offset: 0 1; }
-            rel2 { relative: 1 0; to: "navigationitem_separator"; offset: -1 0; }
-            image {
-               normal: "00_winset_control_top_arrow.png";
-            }
-         }
-         description { state: "extended" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "elm.swallow.title";
-          type: SWALLOW;
-          scale: 1;
-          clip_to: "clip_title";
-          description { state: "default" 0.0;
-             min: 0 NAVIBAR_TITLE_ITEM_H_INC;
-             max: 999999 NAVIBAR_TITLE_ITEM_H_INC;
-             fixed: 0 1;
-             align: 0.5 0.0;
-             rel1 { to: "navigationitem_separator"; }
-             rel2 { to: "navigationitem_separator"; }
-             visible: 0;
-          }
-          description { state: "extended" 0.0;
-             inherit: "default" 0.0;
-             visible: 1;
-          }
-       }
-   } /* end of parts */
-
-   programs {
-      program {
-         name: "moveup";
-         signal: "elm,state,item,moveup";
-         source: "elm";
-         action: STATE_SET "top" 0.0;
-         target: "base";
-         target: "elm.swallow.content";
-      }
-      program {
-         name: "movedown";
-         signal: "elm,state,item,movedown";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "base";
-         target: "elm.swallow.content";
-      }
-      program {
-         name: "click_title";
-         signal: "mouse,clicked,1";
-         source: "events";
-         action: SIGNAL_EMIT "elm,action,clicked" "elm";
-      }
-      program {
-         name: "extended_titlearea";
-         signal: "elm,state,show,title";
-         source: "elm";
-         action: STATE_SET "extended" 0.0;
-         target: "base";
-         target: "elm.swallow.title";
-         target: "navigationitem_separator_shadow";
-         transition: LINEAR 0.2;
-      }
-      program {
-         name: "extended_titlearea,noanimate";
-         signal: "elm,state,show,noanimate,title";
-         source: "elm";
-         action: STATE_SET "extended" 0.0;
-         target: "base";
-         target: "elm.swallow.title";
-         target: "navigationitem_separator_shadow";
-      }
-      program {
-         name: "show_extended";
-         signal: "elm,state,show,extended";
-         source: "elm";
-         action: STATE_SET "extended" 0.0;
-         target: "naviarrow";
-      }
-      program {
-         name: "hide_extended";
-         signal: "elm,state,hide,extended";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "naviarrow";
-      }
-      program {
-         name: "default_titlearea";
-         signal: "elm,state,hide,title";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "base";
-         target: "elm.swallow.title";
-         target: "navigationitem_separator_shadow";
-         transition: LINEAR 0.2;
-      }
-      program {
-         name: "default_titlearea_noanimate";
-         signal: "elm,state,hide,noanimate,title";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "base";
-         target: "elm.swallow.title";
-         target: "navigationitem_separator_shadow";
-      }
-      program {
-         name: "show_icon";
-         signal: "elm,state,icon,visible";
-         source: "elm";
-         action: STATE_SET "visible" 0.0;
-         target: "elm.rect.pada";
-      }
-      program {
-         name: "hide_icon";
-         signal: "elm,state,icon,hidden";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.rect.pada";
-      }
-   } /* end of programs */
-} /* end of group "navigationbar" */
-
-///////////////////////////////////////////////////////////////////////////////
-   group { name: "elm/pager/base/navigationbar";
-      parts {
-         part {
-            name: "clip";
-            type: RECT;
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               rel1 {
-                  to: "base";
-                  offset: -9999 -9999;
-               }
-               rel2 {
-                  to: "base";
-                  offset: 9999 9999;
-               }
-               color: 255 255 255 255;
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-            }
-            description {
-               state: "hidden" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 0;
-               visible: 0;
-            }
-            description {
-               state: "hidden2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 0;
-               visible: 0;
-            }
-         }
-         part {
-            name: "base";
-            type: RECT;
-            mouse_events:  0;
-            clip_to: "clip";
-            description {
-               state: "default" 0.0;
-               color: 0 0 0 0;
-            }
-            description {
-               state: "hidden" 0.0;
-               color: 0 0 0 0;
-               rel1.relative: -1.0 0.0;
-               rel2.relative: 0.0 1.0;
-            }
-            description {
-               state: "hidden2" 0.0;
-               color: 0 0 0 0;
-               rel1.relative: 1.0 0.0;
-               rel2.relative: 2.0 1.0;
-            }
-            description {
-               state: "visible" 0.0;
-               color: 0 0 0 0;
-               rel1.relative: 0.0 0.0;
-               rel2.relative: 1.0 1.0;
-            }
-         }
-         part {
-            name: "elm.swallow.content";
-            type: SWALLOW;
-            clip_to: "clip";
-            description {
-               state: "default" 0.0;
-               rel1.to: "base";
-               rel2.to: "base";
-            }
-         }
-      }
-      programs {
-         program {
-            name: "push_start";
-            signal: "elm,action,push";
-            source: "elm";
-            action:  STATE_SET "hidden2" 0.0;
-            target: "base";
-            target: "clip";
-            after: "show_start2";
-         }
-         program {
-            name: "show_start";
-            signal: "elm,action,show";
-            source: "elm";
-            action:  STATE_SET "hidden" 0.0;
-            target: "base";
-            target: "clip";
-            after: "show_start2";
-         }
-         program {
-            name: "show_start2";
-            action:  STATE_SET "visible" 0.0;
-            transition: DECELERATE 0.5;
-            target: "base";
-            target: "clip";
-            after: "show_end";
-         }
-         program {
-            name: "show_end";
-            action: SIGNAL_EMIT "elm,action,show,finished" "";
-         }
-         program {
-            name: "pop_start";
-            signal: "elm,action,pop";
-            source: "elm";
-            action:  STATE_SET "visible" 0.0;
-            target: "base";
-            target: "clip";
-            after: "pop_start2";
-         }
-         program {
-            name: "pop_start2";
-            action:  STATE_SET "hidden2" 0.0;
-            transition: DECELERATE 0.5;
-            target: "base";
-            target: "clip";
-            after: "hide_end";
-         }
-         program {
-            name: "hide_start";
-            signal: "elm,action,hide";
-            source: "elm";
-            action:  STATE_SET "visible" 0.0;
-            target: "base";
-            target: "clip";
-            after: "hide_start2";
-         }
-         program {
-            name: "hide_start2";
-            action:  STATE_SET "hidden" 0.0;
-            transition: DECELERATE 0.5;
-            target: "base";
-            target: "clip";
-            after: "hide_end";
-         }
-         program {
-            name: "hide_end";
-            action: SIGNAL_EMIT "elm,action,hide,finished" "";
-         }
-         program {
-            name: "reset";
-            signal: "elm,action,reset";
-            source: "elm";
-            action:  STATE_SET "default" 0.0;
-            target: "base";
-            target: "clip";
-         }
-         program {
-            name: "show_firstpage"; /*avoid effect in first page*/
-            signal: "elm,action,show,noanimate";
-            source: "elm";
-            action: STATE_SET "visible" 0.0;
-            target: "base";
-            target: "clip";
-            after: "show_end";
-         }
-         program {
-            name: "hide_firstpage"; /*avoid effect in first page*/
-            signal: "elm,action,hide,noanimate";
-            source: "elm";
-            action: STATE_SET "hidden" 0.0;
-            target: "base";
-            target: "clip";
-            after: "hide_end";
-         }
-      }
-   }
diff --git a/themes/groups/navigationbar_ex.edc b/themes/groups/navigationbar_ex.edc
deleted file mode 100644
index 5b4e3fce..00000000
--- a/themes/groups/navigationbar_ex.edc
+++ /dev/null
@@ -1,1107 +0,0 @@
-/*
- *  nbeat-theme
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact: Seokjae Jeong <seok.j.jeong@samsung.com>, Myoungwoon Roy Kim <Myoungwoon.kim@samsung.com>, Jeonghyun Yun <jh0506.yun@samsung.com>, Jaehwan Kim <jae.hwan.kim@samsung.com>, Chuneon Park <chuneon.park@samsung.com>, Juyung Seo <juyung.seo@samsung.com>, Woohyun Jung <wh0705.jung@samsung.com>, Myungjae Lee <mjae.lee@samsung.com>, Hyoyoung Chang <hyoyoung.chang@samsung.com>, IlKook Yun <ilkook.yun@samsung.com>, CinWoo Kim <cinoo.kim@samsung.com> JiYeon Park <jy0703.park@samsung.com>
- * 
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * 
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-////////////////////////////////////////////////////////////////////////////////////////
-// NavigationBar_ex
-////////////////////////////////////////////////////////////////////////////////////////
-group { name: "elm/navigationbar_ex/content/default";
-   parts {
-      part { name: "clip";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 {
-               to: "base";
-               offset: -9999 -9999;
-            }
-            rel2 {
-               to: "base";
-               offset: 9999 9999;
-            }
-            color: 255 255 255 255;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-         description { state: "hidden2" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-      }
-      part { name: "base";
-         type: RECT;
-         mouse_events:  0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-         description { state: "hidden" 0.0;
-            color: 0 0 0 0;
-            rel1.relative: -1.0 0.0;
-            rel2.relative: 0.0 1.0;
-         }
-         description { state: "hidden2" 0.0;
-            color: 0 0 0 0;
-            rel1.relative: 1.0 0.0;
-            rel2.relative: 2.0 1.0;
-         }
-         description { state: "visible" 0.0;
-            color: 0 0 0 0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 1.0;
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-         }
-      }
-   }
-   programs {
-      program { name: "push_start";
-         signal: "elm,action,push";
-         source: "elm";
-         action:  STATE_SET "hidden2" 0.0;
-         target: "base";
-         target: "clip";
-         after: "show_start2";
-      }
-      program { name: "show_start";
-         signal: "elm,action,show";
-         source: "elm";
-         action:  STATE_SET "hidden" 0.0;
-         target: "base";
-         target: "clip";
-         after: "show_start2";
-      }
-      program { name: "show_start2";
-         action:  STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
-         target: "base";
-         target: "clip";
-         after: "show_end";
-      }
-      program { name: "show_end";
-         action: SIGNAL_EMIT "elm,action,show,finished" "";
-      }
-      program { name: "pop_start";
-         signal: "elm,action,pop";
-         source: "elm";
-         action:  STATE_SET "visible" 0.0;
-         target: "base";
-         target: "clip";
-         after: "pop_start2";
-      }
-      program { name: "pop_start2";
-         action:  STATE_SET "hidden2" 0.0;
-         transition: DECELERATE 0.5;
-         target: "base";
-         target: "clip";
-         after: "hide_end";
-      }
-      program { name: "hide_start";
-         signal: "elm,action,hide";
-         source: "elm";
-         action:  STATE_SET "visible" 0.0;
-         target: "base";
-         target: "clip";
-         after: "hide_start2";
-      }
-      program { name: "hide_start2";
-         action:  STATE_SET "hidden" 0.0;
-         transition: DECELERATE 0.5;
-         target: "base";
-         target: "clip";
-         after: "hide_end";
-      }
-      program { name: "hide_end";
-         action: SIGNAL_EMIT "elm,action,hide,finished" "";
-      }
-      program { name: "reset";
-         signal: "elm,action,reset";
-         source: "elm";
-         action:  STATE_SET "default" 0.0;
-         target: "base";
-         target: "clip";
-      }
-      program { name: "show_firstpage"; /*avoid effect in first page*/
-         signal: "elm,action,show,noanimate";
-         source: "elm";
-         action: STATE_SET "visible" 0.0;
-         target: "base";
-         target: "clip";
-         after: "show_end";
-      }
-      program { name: "hide_firstpage"; /*avoid effect in first page*/
-         signal: "elm,action,hide,noanimate";
-         source: "elm";
-         action: STATE_SET "hidden" 0.0;
-         target: "base";
-         target: "clip";
-         after: "hide_end";
-      }
-   }
-}
-
-group { name: "elm/navigationbar_ex/item/title/default";
-   images {
-      image: "navibar_item_separator.png" COMP;
-   }
-   parts {
-      part { name: "base";
-         type: RECT;
-         mouse_events: 0;
-         repeat_events: 1;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 1 NAVIBAR_EX_H;
-            fixed: 1 1;
-            rel2.relative: 1.0 0.0;
-            align: 0.0 0.0;
-            visible: 0;
-         }
-         description { state: "top" 0.0;
-            inherit: "default" 0.0;
-            min: 1 0;
-         }
-      }
-      part { name: "navigationitem";
-         type: RECT;
-         mouse_events: 0;
-         clip_to: "clip_title";
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 1 (NAVIBAR_EX_H - NAVIBAR_EX_TITLE_SEPARATOR_H);
-            fixed: 0 1;
-            rel1 { relative: 0.0 0.0; to: "base";}
-            rel2 { relative: 1.0 0.0; to: "base";}
-            align: 0.5 0.0;
-            color: NAVIBAR_TITLE_BG_COLOR_INC;
-         }
-      }
-      part { name: "clip_title";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 { to: "base"; }
-            rel2 { to: "base"; }
-         }
-      }
-      part { name: "elm.swallow.back";
-         type: SWALLOW;
-         clip_to: "clip_title";
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            align: 0.0 0.5;
-            rel1 { relative: 0.0 0.0; to: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-         }
-      }
-      part { name: "elm.rect.pada";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: NAVIBAR_EX_TITLE_BACKBUTTON_W 0;
-            fixed: 1 0;
-            align: 0.0 0.5;
-            rel1 { relative: 0.0 0.0; to: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-            visible: 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            min: NAVIBAR_EX_PADDING_EXPANDED_INC 0;
-         }
-      }
-      part { name: "separator_1";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            align: 1.0 0;
-            min: 1 0;
-            rel1 { relative: 0.0 0.2; to:"elm.rect.padb";}
-            rel2 { relative: 0.0 0.8; to:"elm.rect.padb";}
-            fixed: 1 0;
-            color: NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC;
-         }
-      }
-      part { name: "separator_2";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            align: 1.0 0;
-            min: 1 0;
-            rel1 { relative: 0.0 0.0; to: "separator_1"; }
-            rel2 { relative: 0.0 1.0; to: "separator_1"; }
-            fixed: 1 0;
-            color: NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC;
-          }
-      }
-      part { name: "elm.rect.padb";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: NAVIBAR_EX_TITLE_INDICATOR_W 0;
-            fixed: 1 0;
-            align: 1.0 0.5;
-            rel1 { relative: 1.0 0.0; to: "navigationitem"; }
-            rel2 { relative: 1.0 1.0; to: "navigationitem"; }
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXT;
-         clip_to: "clip_title";
-         scale:1;
-         description { state: "default" 0.0;
-            text {
-                 font: "SLP:style=Medium";
-                 size: NAVIBAR_EX_TITLE_TEXT_FONT_SIZE;
-                 min: 0 0;
-                 align: 0.5 0.5;
-                 max: 1 0;
-            }
-            color: NAVIBAR_TITLE_TEXT_COLOR_INC;
-            align: 0.5 0.5;
-            rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
-            rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
-         }
-      }
-      part { name: "elm.swallow.icon";
-         type: SWALLOW;
-         clip_to: "clip_title";
-         scale: 1;
-         description { state: "default" 0.0;
-            max: NAVIBAR_EX_TITLE_ICON_WIDTH NAVIBAR_EX_TITLE_ICON_HEIGHT;
-            rel1 { relative: 0.0 0.0; to_x: "padding_before_text";to_y: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to_x: "padding_before_text";to_y: "navigationitem"; }
-            aspect: 1.0 1.0;
-            aspect_preference: VERTICAL;
-            align: 1.0 0.5;
-         }
-      }
-      part { name: "padding_before_text";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 1.0 0.5;
-            rel1 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "navigationitem";}
-            fixed: 1 0;
-            min: NAVIBAR_EX_ICON_PADDING_INC 0;
-            visible: 0;
-         }
-      }
-      part { name: "clip_content";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 { to: "elm.swallow.content"; }
-            rel2 { to: "elm.swallow.content"; }
-         }
-      }
-      part { name: "elm.swallow.content";
-         clip_to: "clip_content";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 { relative: 0.0 1.0; to: "base"; }
-            rel2 { relative: 1.0 1.0; }
-         }
-         description { state: "top" 0.0;
-            rel1 { relative: 0.0 0.0; }
-            rel2 { relative: 1.0 1.0; }
-         }
-      }
-      part { name: "navigationitem_separator";
-         type: IMAGE;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 1 NAVIBAR_EX_TITLE_SEPARATOR_H;
-            fixed: 0 1;
-            align: 0.5 1;
-            rel1 { to: "navigationitem"; relative: 0 1; }
-            rel2 { to: "base"; relative: 1 1; }
-            image { normal: "navibar_item_separator.png";
-                border: 0 0 1 0;
-            }
-         }
-      }
-   }
-   programs {
-      program {
-         name: "moveup";
-         signal: "elm,state,item,moveup";
-         source: "elm";
-         action: STATE_SET "top" 0.0;
-         target: "base";
-         target: "elm.swallow.content";
-      }
-      program {
-         name: "movedown";
-         signal: "elm,state,item,movedown";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "base";
-         target: "elm.swallow.content";
-      }
-      program {
-         name: "show_icon";
-         signal: "elm,state,icon,visible";
-         source: "elm";
-         action: STATE_SET "visible" 0.0;
-         target: "elm.rect.pada";
-      }
-      program {
-         name: "hide_icon";
-         signal: "elm,state,icon,hidden";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.rect.pada";
-      }
-   }
-}
-
-group { name: "elm/navigationbar_ex/item/title_option_header/default";
-   images {
-      image: "navibar_item_separator.png" COMP;
-      image: "navibar_item_separator_shadow.png" COMP;
-   }
-   parts {
-      part { name: "base";
-         type: RECT;
-         mouse_events: 0;
-         repeat_events: 1;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 1 NAVIBAR_EX_EXTENDED_H;
-            fixed: 1 1;
-            rel2.relative: 1.0 0.0;
-            align: 0.0 0.0;
-            visible: 0;
-         }
-         description { state: "top" 0.0;
-            inherit: "default" 0.0;
-            min: 1 0;
-         }
-         description { state: "closed" 0.0;
-            inherit: "default" 0.0;
-            min: 1 NAVIBAR_EX_H;
-         }
-      }
-      part { name: "navigationitem";
-         type: RECT;
-         mouse_events: 0;
-         clip_to: "clip_title";
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 1 (NAVIBAR_EX_H - NAVIBAR_EX_TITLE_SEPARATOR_H);
-            fixed: 0 1;
-            rel1 { relative: 0.0 0.0; to: "base";}
-            rel2 { relative: 1.0 0.0; to: "base";}
-            align: 0.5 0.0;
-            color: NAVIBAR_TITLE_BG_COLOR_INC;
-         }
-      }
-      part { name: "clip_title";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 { to: "base"; }
-            rel2 { to: "base"; }
-         }
-      }
-      part { name: "elm.swallow.back";
-         type: SWALLOW;
-         clip_to: "clip_title";
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            align: 0.0 0.5;
-            rel1 { relative: 0.0 0.0; to: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-         }
-      }
-      part { name: "elm.rect.pada";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: NAVIBAR_EX_TITLE_BACKBUTTON_W 0;
-            fixed: 1 0;
-            align: 0.0 0.5;
-            rel1 { relative: 0.0 0.0; to: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-            visible: 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            min: NAVIBAR_EX_PADDING_EXPANDED_INC 0;
-         }
-      }
-      part { name: "separator_1";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            align: 1.0 0;
-            min: 1 0;
-            rel1 { relative: 0.0 0.2; to:"elm.rect.padb";}
-            rel2 { relative: 0.0 0.8; to:"elm.rect.padb";}
-            fixed: 1 0;
-            color: NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC;
-         }
-      }
-      part { name: "separator_2";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            align: 1.0 0;
-            min: 1 0;
-            rel1 { relative: 0.0 0.0; to: "separator_1"; }
-            rel2 { relative: 0.0 1.0; to: "separator_1"; }
-            fixed: 1 0;
-            color: NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC;
-          }
-      }
-      part { name: "elm.rect.padb";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: NAVIBAR_EX_TITLE_INDICATOR_W 0;
-            fixed: 1 0;
-            align: 1.0 0.5;
-            rel1 { relative: 1.0 0.0; to: "navigationitem"; }
-            rel2 { relative: 1.0 1.0; to: "navigationitem"; }
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXT;
-         clip_to: "clip_title";
-         scale:1;
-         description { state: "default" 0.0;
-            text {
-                 font: "SLP:style=Medium";
-                 size: NAVIBAR_EX_TITLE_TEXT_FONT_SIZE;
-                 min: 0 0;
-                 align: 0.5 0.5;
-                 max: 1 0;
-            }
-            color: NAVIBAR_TITLE_TEXT_COLOR_INC;
-            align: 0.5 0.5;
-            rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
-            rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
-         }
-      }
-      part { name: "events";
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            rel1 { to: "elm.rect.pada"; relative: 1 0; }
-            rel2 { to: "elm.rect.padb"; relative: 0 1; }
-         }
-      }
-      part { name: "elm.swallow.icon";
-         type: SWALLOW;
-         clip_to: "clip_title";
-         scale: 1;
-         description { state: "default" 0.0;
-            max: NAVIBAR_EX_TITLE_ICON_WIDTH NAVIBAR_EX_TITLE_ICON_HEIGHT;
-            rel1 { relative: 0.0 0.0; to_x: "padding_before_text";to_y: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to_x: "padding_before_text";to_y: "navigationitem"; }
-            aspect: 1.0 1.0;
-            aspect_preference: VERTICAL;
-            align: 1.0 0.5;
-         }
-      }
-      part { name: "padding_before_text";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 1.0 0.5;
-            rel1 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "navigationitem";}
-            fixed: 1 0;
-            min: NAVIBAR_EX_ICON_PADDING_INC 0;
-            visible: 0;
-         }
-      }
-      part { name: "clip_content";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 { to: "elm.swallow.content"; }
-            rel2 { to: "elm.swallow.content"; }
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         scale: 1;
-         clip_to: "clip_content";
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 { relative: 0.0 1.0; to: "base"; }
-            rel2 { relative: 1.0 1.0; }
-         }
-         description { state: "top" 0.0;
-            rel1 { relative: 0.0 0.0; }
-            rel2 { relative: 1.0 1.0; }
-         }
-      }
-      part { name: "navigationitem_separator";
-         type: IMAGE;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 1 NAVIBAR_EX_TITLE_SEPARATOR_H;
-            fixed: 0 1;
-            align: 0.5 1;
-            rel1 { to: "navigationitem"; relative: 0 1; }
-            rel2 { to: "base"; relative: 1 1; }
-            image { normal: "navibar_item_separator.png";
-                border: 0 0 1 0;
-            }
-         }
-      }
-      part { name: "navigationitem_separator_shadow";
-         type: IMAGE;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 1 NAVIBAR_TITLE_SEPARATOR_SHADOW_H;
-            fixed: 0 1;
-            align: 0.5 0;
-            color: 255 255 255 255;
-            rel1 { to: "navigationitem_separator"; relative: 0 1; }
-            rel2 { to: "navigationitem_separator"; relative: 1 1; }
-            image { normal: "navibar_item_separator_shadow.png"; }
-         }
-         description { state: "closed" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-         }
-      }
-      part {
-         name: "naviarrow";
-         type: IMAGE;
-         mouse_events: 1;
-         clip_to: "clip_title";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 11;
-            max: 15 11;
-            fixed: 1 1;
-            align: 0.5 1.0;
-            rel1 { relative: 0 0; to: "navigationitem_separator"; offset: 0 1; }
-            rel2 { relative: 1 0; to: "navigationitem_separator"; offset: -1 0; }
-            image {
-               normal: "00_winset_control_top_arrow.png";
-            }
-         }
-      }
-      part { name: "elm.swallow.title";
-         type: SWALLOW;
-         scale: 1;
-         clip_to: "clip_title";
-         description { state: "default" 0.0;
-            min: 0 NAVIBAR_EX_TITLE_ITEM_H;
-            max: 999999 NAVIBAR_EX_TITLE_ITEM_H;
-            fixed: 0 1;
-            align: 0.5 0.0;
-            rel1 { to: "navigationitem_separator"; }
-            rel2 { to: "navigationitem_separator"; }
-            visible: 1;
-         }
-         description { state: "closed" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-   }
-   programs {
-      program {
-         name: "click";
-         signal: "mouse,up,1";
-         source: "events";
-         action: SIGNAL_EMIT "elm,action,clicked" "elm";
-      }
-      program {
-         name: "moveup";
-         signal: "elm,state,item,moveup";
-         source: "elm";
-         action: STATE_SET "top" 0.0;
-         target: "base";
-         target: "elm.swallow.content";
-      }
-      program {
-         name: "movedown";
-         signal: "elm,state,item,movedown";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "base";
-         target: "elm.swallow.content";
-         target: "navigationitem_separator_shadow";
-      }
-      program {
-         name: "extended_titlearea";
-         signal: "elm,state,show,title";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "base";
-         target: "elm.swallow.title";
-         target: "navigationitem_separator_shadow";
-         transition: LINEAR 0.2;
-      }
-      program {
-         name: "retract_titlearea";
-         signal: "elm,state,hide,title";
-         source: "elm";
-         action: STATE_SET "closed" 0.0;
-         target: "base";
-         target: "elm.swallow.title";
-         target: "navigationitem_separator_shadow";
-         transition: LINEAR 0.2;
-      }
-      program {
-         name: "extended_titlearea_noanimate";
-         signal: "elm,state,show,noanimate,title";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "base";
-         target: "elm.swallow.title";
-         target: "navigationitem_separator_shadow";
-      }
-      program {
-         name: "retract_titlearea_noanimate";
-         signal: "elm,state,hide,noanimate,title";
-         source: "elm";
-         action: STATE_SET "closed" 0.0;
-         target: "base";
-         target: "elm.swallow.title";
-         target: "navigationitem_separator_shadow";
-      }
-      program {
-         name: "show_icon";
-         signal: "elm,state,icon,visible";
-         source: "elm";
-         action: STATE_SET "visible" 0.0;
-         target: "elm.rect.pada";
-      }
-      program {
-         name: "hide_icon";
-         signal: "elm,state,icon,hidden";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.rect.pada";
-      }
-   }
-}
-
-group { name: "elm/navigationbar_ex/item/title_option_header2/default";
-   images {
-      image: "navibar_item_separator.png" COMP;
-      image: "navibar_item_separator_shadow.png" COMP;
-   }
-   parts {
-      part { name: "base";
-         type: RECT;
-         mouse_events: 0;
-         repeat_events: 1;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 1 NAVIBAR_EX_EXTENDED_H2;
-            fixed: 1 1;
-            rel2.relative: 1.0 0.0;
-            align: 0.0 0.0;
-            visible: 0;
-         }
-         description { state: "top" 0.0;
-            inherit: "default" 0.0;
-            min: 1 0;
-         }
-         description { state: "closed" 0.0;
-            inherit: "default" 0.0;
-            min: 1 NAVIBAR_EX_H;
-         }
-      }
-      part { name: "navigationitem";
-         type: RECT;
-         mouse_events: 0;
-         clip_to: "clip_title";
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 1 (NAVIBAR_EX_H - NAVIBAR_EX_TITLE_SEPARATOR_H);
-            fixed: 0 1;
-            rel1 { relative: 0.0 0.0; to: "base";}
-            rel2 { relative: 1.0 0.0; to: "base";}
-            align: 0.5 0.0;
-            color: NAVIBAR_TITLE_BG_COLOR_INC;
-         }
-      }
-      part { name: "clip_title";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 { to: "base"; }
-            rel2 { to: "base"; }
-         }
-      }
-      part { name: "elm.swallow.back";
-         type: SWALLOW;
-         clip_to: "clip_title";
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            align: 0.0 0.5;
-            rel1 { relative: 0.0 0.0; to: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-         }
-      }
-      part { name: "elm.rect.pada";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: NAVIBAR_EX_TITLE_BACKBUTTON_W 0;
-            fixed: 1 0;
-            align: 0.0 0.5;
-            rel1 { relative: 0.0 0.0; to: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to: "navigationitem"; }
-            visible: 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            min: NAVIBAR_EX_PADDING_EXPANDED_INC 0;
-         }
-      }
-      part { name: "separator_1";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            align: 1.0 0;
-            min: 1 0;
-            rel1 { relative: 0.0 0.2; to:"elm.rect.padb";}
-            rel2 { relative: 0.0 0.8; to:"elm.rect.padb";}
-            fixed: 1 0;
-            color: NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC;
-         }
-      }
-      part { name: "separator_2";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            align: 1.0 0;
-            min: 1 0;
-            rel1 { relative: 0.0 0.0; to: "separator_1"; }
-            rel2 { relative: 0.0 1.0; to: "separator_1"; }
-            fixed: 1 0;
-            color: NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC;
-          }
-      }
-      part { name: "elm.rect.padb";
-         type: RECT;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: NAVIBAR_EX_TITLE_INDICATOR_W 0;
-            fixed: 1 0;
-            align: 1.0 0.5;
-            rel1 { relative: 1.0 0.0; to: "navigationitem"; }
-            rel2 { relative: 1.0 1.0; to: "navigationitem"; }
-            visible: 0;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXT;
-         clip_to: "clip_title";
-         scale:1;
-         description { state: "default" 0.0;
-            text {
-                 font: "SLP:style=Medium";
-                 size: NAVIBAR_EX_TITLE_TEXT_FONT_SIZE;
-                 min: 0 0;
-                 align: 0.5 0.5;
-                 max: 1 0;
-            }
-            color: NAVIBAR_TITLE_TEXT_COLOR_INC;
-            align: 0.5 0.5;
-            rel1 { relative: 1.0 0.0; to: "elm.rect.pada"; }
-            rel2 { relative: 0.0 1.0; to: "elm.rect.padb"; }
-         }
-      }
-      part {
-         name: "events";
-         ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            rel1 { to: "elm.rect.pada"; relative: 1 0; }
-            rel2 { to: "elm.rect.padb"; relative: 0 1; }
-         }
-      }
-      part { name: "elm.swallow.icon";
-         type: SWALLOW;
-         clip_to: "clip_title";
-         scale: 1;
-         description { state: "default" 0.0;
-            max: NAVIBAR_EX_TITLE_ICON_WIDTH NAVIBAR_EX_TITLE_ICON_HEIGHT;
-            rel1 { relative: 0.0 0.0; to_x: "padding_before_text";to_y: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to_x: "padding_before_text";to_y: "navigationitem"; }
-            aspect: 1.0 1.0;
-            aspect_preference: VERTICAL;
-            align: 1.0 0.5;
-         }
-      }
-      part { name: "padding_before_text";
-         type: RECT;
-         scale: 1;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            align: 1.0 0.5;
-            rel1 { relative: 0.0 0.0; to_x: "elm.text"; to_y: "navigationitem"; }
-            rel2 { relative: 0.0 1.0; to_x: "elm.text"; to_y: "navigationitem";}
-            fixed: 1 0;
-            min: NAVIBAR_EX_ICON_PADDING_INC 0;
-            visible: 0;
-         }
-      }
-      part { name: "clip_content";
-         type: RECT;
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 { to: "elm.swallow.content"; }
-            rel2 { to: "elm.swallow.content"; }
-         }
-      }
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
-         scale: 1;
-         clip_to: "clip_content";
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1 { relative: 0.0 1.0; to: "base"; }
-            rel2 { relative: 1.0 1.0; }
-         }
-         description { state: "top" 0.0;
-            rel1 { relative: 0.0 0.0; }
-            rel2 { relative: 1.0 1.0; }
-         }
-      }
-      part { name: "navigationitem_separator";
-         type: IMAGE;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 1 NAVIBAR_EX_TITLE_SEPARATOR_H;
-            fixed: 0 1;
-            align: 0.5 1;
-            rel1 { to: "navigationitem"; relative: 0 1; }
-            rel2 { to: "base"; relative: 1 1; }
-            image { normal: "navibar_item_separator.png";
-                border: 0 0 1 0;
-            }
-         }
-      }
-      part { name: "navigationitem_separator_shadow";
-         type: IMAGE;
-         mouse_events: 0;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 1 NAVIBAR_TITLE_SEPARATOR_SHADOW_H;
-            fixed: 0 1;
-            align: 0.5 0;
-            color: 255 255 255 255;
-            rel1 { to: "navigationitem_separator"; relative: 0 1; }
-            rel2 { to: "navigationitem_separator"; relative: 1 1; }
-            image { normal: "navibar_item_separator_shadow.png"; }
-         }
-         description { state: "closed" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-         }
-      }
-      part { name: "naviarrow";
-         type: IMAGE;
-         mouse_events: 1;
-         clip_to: "clip_title";
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            min: 15 11;
-            max: 15 11;
-            fixed: 1 1;
-            align: 0.5 1.0;
-            rel1 { relative: 0 0; to: "navigationitem_separator"; offset: 0 1; }
-            rel2 { relative: 1 0; to: "navigationitem_separator"; offset: -1 0; }
-            image {
-               normal: "00_winset_control_top_arrow.png";
-            }
-         }
-      }
-      part { name: "elm.swallow.title";
-         type: SWALLOW;
-         scale: 1;
-         clip_to: "clip_title";
-         description { state: "default" 0.0;
-            min: 0 (NAVIBAR_EX_TITLE_ITEM_H * 2);
-            max: 999999 (NAVIBAR_EX_TITLE_ITEM_H * 2);
-            fixed: 0 1;
-            align: 0.5 0.0;
-            rel1 { to: "navigationitem_separator"; }
-            rel2 { to: "navigationitem_separator"; }
-            visible: 1;
-         }
-         description { state: "closed" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-   }
-   programs {
-      program {
-         name: "click";
-         signal: "mouse,up,1";
-         source: "events";
-         action: SIGNAL_EMIT "elm,action,clicked" "elm";
-      }
-      program {
-         name: "moveup";
-         signal: "elm,state,item,moveup";
-         source: "elm";
-         action: STATE_SET "top" 0.0;
-         target: "base";
-         target: "elm.swallow.content";
-      }
-      program {
-         name: "movedown";
-         signal: "elm,state,item,movedown";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "base";
-         target: "elm.swallow.content";
-         target: "navigationitem_separator_shadow";
-      }
-      program {
-         name: "extended_titlearea";
-         signal: "elm,state,show,title";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "base";
-         target: "elm.swallow.title";
-         target: "navigationitem_separator_shadow";
-         transition: LINEAR 0.2;
-      }
-      program {
-         name: "retract_titlearea";
-         signal: "elm,state,hide,title";
-         source: "elm";
-         action: STATE_SET "closed" 0.0;
-         target: "base";
-         target: "elm.swallow.title";
-         target: "navigationitem_separator_shadow";
-         transition: LINEAR 0.2;
-      }
-      program {
-         name: "extended_titlearea_noanimate";
-         signal: "elm,state,show,noanimate,title";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "base";
-         target: "elm.swallow.title";
-         target: "navigationitem_separator_shadow";
-      }
-      program {
-         name: "retract_titlearea_noanimate";
-         signal: "elm,state,hide,noanimate,title";
-         source: "elm";
-         action: STATE_SET "closed" 0.0;
-         target: "base";
-         target: "elm.swallow.title";
-         target: "navigationitem_separator_shadow";
-      }
-      program {
-         name: "show_icon";
-         signal: "elm,state,icon,visible";
-         source: "elm";
-         action: STATE_SET "visible" 0.0;
-         target: "elm.rect.pada";
-      }
-      program {
-         name: "hide_icon";
-         signal: "elm,state,icon,hidden";
-         source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "elm.rect.pada";
-      }
-   }
-}
-
-group { name: "elm/standard/navigationbar_ex/title_obj2";
-   parts {
-      part { name: "title_obj1";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 0 NAVIBAR_EX_TITLE_ITEM_H;
-            fixed: 0 1;
-            rel1 { relative: 0.0 0.0; }
-            rel2 { relative: 1.0 0.0; }
-            align: 0.0 0.0;
-         }
-      }
-      part { name: "title_obj2";
-         type: SWALLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 0 NAVIBAR_EX_TITLE_ITEM_H;
-            fixed: 0 1;
-            rel1 { relative: 0.0 1.0; to_y: "title_obj1"; }
-            rel2 { relative: 1.0 1.0; }
-            align: 0.0 0.0;
-         }
-      }
-   }
-} //end group
diff --git a/themes/images/nbeat/01_dialog_field_background.png b/themes/images/nbeat/01_dialog_field_background.png
deleted file mode 100644
index 967b5ede..00000000
--- a/themes/images/nbeat/01_dialog_field_background.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialog_field_bg.png b/themes/images/nbeat/01_dialog_field_bg.png
deleted file mode 100644
index bbbc8bb8..00000000
--- a/themes/images/nbeat/01_dialog_field_bg.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialog_field_bg_b.png b/themes/images/nbeat/01_dialog_field_bg_b.png
deleted file mode 100644
index c4f0f026..00000000
--- a/themes/images/nbeat/01_dialog_field_bg_b.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialog_field_bg_dim.png b/themes/images/nbeat/01_dialog_field_bg_dim.png
deleted file mode 100644
index 34115a08..00000000
--- a/themes/images/nbeat/01_dialog_field_bg_dim.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialog_field_bg_m.png b/themes/images/nbeat/01_dialog_field_bg_m.png
deleted file mode 100644
index 255c7661..00000000
--- a/themes/images/nbeat/01_dialog_field_bg_m.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialog_field_bg_t.png b/themes/images/nbeat/01_dialog_field_bg_t.png
deleted file mode 100644
index fd822e9a..00000000
--- a/themes/images/nbeat/01_dialog_field_bg_t.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialog_field_input.png b/themes/images/nbeat/01_dialog_field_input.png
deleted file mode 100644
index b3b9de5c..00000000
--- a/themes/images/nbeat/01_dialog_field_input.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialog_field_input_bottom.png b/themes/images/nbeat/01_dialog_field_input_bottom.png
deleted file mode 100644
index 82cb0c94..00000000
--- a/themes/images/nbeat/01_dialog_field_input_bottom.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialog_field_input_middle.png b/themes/images/nbeat/01_dialog_field_input_middle.png
deleted file mode 100644
index 66bc1765..00000000
--- a/themes/images/nbeat/01_dialog_field_input_middle.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialog_field_input_top.png b/themes/images/nbeat/01_dialog_field_input_top.png
deleted file mode 100644
index 314d6954..00000000
--- a/themes/images/nbeat/01_dialog_field_input_top.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_2line_bg.png b/themes/images/nbeat/01_dialogue_field_2line_bg.png
deleted file mode 100644
index ae5f4dbd..00000000
--- a/themes/images/nbeat/01_dialogue_field_2line_bg.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_bg.png b/themes/images/nbeat/01_dialogue_field_bg.png
deleted file mode 100644
index d696d4a7..00000000
--- a/themes/images/nbeat/01_dialogue_field_bg.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_bg_press.png b/themes/images/nbeat/01_dialogue_field_bg_press.png
deleted file mode 100644
index 5f61c226..00000000
--- a/themes/images/nbeat/01_dialogue_field_bg_press.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_bg_press_b.png b/themes/images/nbeat/01_dialogue_field_bg_press_b.png
deleted file mode 100644
index 564588d7..00000000
--- a/themes/images/nbeat/01_dialogue_field_bg_press_b.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_bg_press_m.png b/themes/images/nbeat/01_dialogue_field_bg_press_m.png
deleted file mode 100644
index ff5aed28..00000000
--- a/themes/images/nbeat/01_dialogue_field_bg_press_m.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_bg_press_t.png b/themes/images/nbeat/01_dialogue_field_bg_press_t.png
deleted file mode 100644
index 5cdb055f..00000000
--- a/themes/images/nbeat/01_dialogue_field_bg_press_t.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_check_press.png b/themes/images/nbeat/01_dialogue_field_check_press.png
deleted file mode 100644
index 7b3b25cd..00000000
--- a/themes/images/nbeat/01_dialogue_field_check_press.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_check_press_b.png b/themes/images/nbeat/01_dialogue_field_check_press_b.png
deleted file mode 100644
index 6da1d8cb..00000000
--- a/themes/images/nbeat/01_dialogue_field_check_press_b.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_check_press_m.png b/themes/images/nbeat/01_dialogue_field_check_press_m.png
deleted file mode 100644
index 399be8fb..00000000
--- a/themes/images/nbeat/01_dialogue_field_check_press_m.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_check_press_t.png b/themes/images/nbeat/01_dialogue_field_check_press_t.png
deleted file mode 100644
index 8da6ee64..00000000
--- a/themes/images/nbeat/01_dialogue_field_check_press_t.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_focus.png b/themes/images/nbeat/01_dialogue_field_focus.png
deleted file mode 100644
index b3b9de5c..00000000
--- a/themes/images/nbeat/01_dialogue_field_focus.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_left_press.png b/themes/images/nbeat/01_dialogue_field_left_press.png
deleted file mode 100644
index 8b9f2e11..00000000
--- a/themes/images/nbeat/01_dialogue_field_left_press.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_left_press_b.png b/themes/images/nbeat/01_dialogue_field_left_press_b.png
deleted file mode 100644
index 2fa73b67..00000000
--- a/themes/images/nbeat/01_dialogue_field_left_press_b.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_left_press_m.png b/themes/images/nbeat/01_dialogue_field_left_press_m.png
deleted file mode 100644
index 7ab25a56..00000000
--- a/themes/images/nbeat/01_dialogue_field_left_press_m.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_left_press_t.png b/themes/images/nbeat/01_dialogue_field_left_press_t.png
deleted file mode 100644
index f06ee4d1..00000000
--- a/themes/images/nbeat/01_dialogue_field_left_press_t.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_lighting.png b/themes/images/nbeat/01_dialogue_field_lighting.png
deleted file mode 100644
index d779146d..00000000
--- a/themes/images/nbeat/01_dialogue_field_lighting.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialogue_field_press.png b/themes/images/nbeat/01_dialogue_field_press.png
deleted file mode 100644
index b93a95c4..00000000
--- a/themes/images/nbeat/01_dialogue_field_press.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_bg_bottom.png b/themes/images/nbeat/01_dialoguegroup_bg_bottom.png
deleted file mode 100644
index bad5317b..00000000
--- a/themes/images/nbeat/01_dialoguegroup_bg_bottom.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_bg_bottom_no_line.png b/themes/images/nbeat/01_dialoguegroup_bg_bottom_no_line.png
deleted file mode 100644
index bad5317b..00000000
--- a/themes/images/nbeat/01_dialoguegroup_bg_bottom_no_line.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_bg_default_no_line.png b/themes/images/nbeat/01_dialoguegroup_bg_default_no_line.png
deleted file mode 100644
index 2d7aab1f..00000000
--- a/themes/images/nbeat/01_dialoguegroup_bg_default_no_line.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_bg_middle.png b/themes/images/nbeat/01_dialoguegroup_bg_middle.png
deleted file mode 100644
index 8c476c21..00000000
--- a/themes/images/nbeat/01_dialoguegroup_bg_middle.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_bg_middle_no_line.png b/themes/images/nbeat/01_dialoguegroup_bg_middle_no_line.png
deleted file mode 100644
index 6356edaf..00000000
--- a/themes/images/nbeat/01_dialoguegroup_bg_middle_no_line.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_bg_top.png b/themes/images/nbeat/01_dialoguegroup_bg_top.png
deleted file mode 100644
index 135625ae..00000000
--- a/themes/images/nbeat/01_dialoguegroup_bg_top.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_bg_top_no_line.png b/themes/images/nbeat/01_dialoguegroup_bg_top_no_line.png
deleted file mode 100644
index aa589f76..00000000
--- a/themes/images/nbeat/01_dialoguegroup_bg_top_no_line.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_dataview_bottom.png b/themes/images/nbeat/01_dialoguegroup_dataview_bottom.png
deleted file mode 100644
index 855327d9..00000000
--- a/themes/images/nbeat/01_dialoguegroup_dataview_bottom.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_dataview_default.png b/themes/images/nbeat/01_dialoguegroup_dataview_default.png
deleted file mode 100644
index 52e44452..00000000
--- a/themes/images/nbeat/01_dialoguegroup_dataview_default.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_dataview_middle.png b/themes/images/nbeat/01_dialoguegroup_dataview_middle.png
deleted file mode 100644
index 4c2cff72..00000000
--- a/themes/images/nbeat/01_dialoguegroup_dataview_middle.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_dataview_top.png b/themes/images/nbeat/01_dialoguegroup_dataview_top.png
deleted file mode 100644
index 7aa0ae6b..00000000
--- a/themes/images/nbeat/01_dialoguegroup_dataview_top.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_edit_bg_bottom.png b/themes/images/nbeat/01_dialoguegroup_edit_bg_bottom.png
deleted file mode 100644
index 8309e665..00000000
--- a/themes/images/nbeat/01_dialoguegroup_edit_bg_bottom.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_edit_bg_default.png b/themes/images/nbeat/01_dialoguegroup_edit_bg_default.png
deleted file mode 100644
index 3e335420..00000000
--- a/themes/images/nbeat/01_dialoguegroup_edit_bg_default.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_edit_bg_middle.png b/themes/images/nbeat/01_dialoguegroup_edit_bg_middle.png
deleted file mode 100644
index 50850735..00000000
--- a/themes/images/nbeat/01_dialoguegroup_edit_bg_middle.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_edit_bg_top.png b/themes/images/nbeat/01_dialoguegroup_edit_bg_top.png
deleted file mode 100644
index b1374556..00000000
--- a/themes/images/nbeat/01_dialoguegroup_edit_bg_top.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_edit_bottom.png b/themes/images/nbeat/01_dialoguegroup_edit_bottom.png
deleted file mode 100644
index 9ec412a8..00000000
--- a/themes/images/nbeat/01_dialoguegroup_edit_bottom.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_edit_default.png b/themes/images/nbeat/01_dialoguegroup_edit_default.png
deleted file mode 100644
index fc436fac..00000000
--- a/themes/images/nbeat/01_dialoguegroup_edit_default.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_edit_middle.png b/themes/images/nbeat/01_dialoguegroup_edit_middle.png
deleted file mode 100644
index e192653e..00000000
--- a/themes/images/nbeat/01_dialoguegroup_edit_middle.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_edit_noline_bottom.png b/themes/images/nbeat/01_dialoguegroup_edit_noline_bottom.png
deleted file mode 100644
index 99f007d1..00000000
--- a/themes/images/nbeat/01_dialoguegroup_edit_noline_bottom.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_edit_noline_default.png b/themes/images/nbeat/01_dialoguegroup_edit_noline_default.png
deleted file mode 100644
index daaf20d1..00000000
--- a/themes/images/nbeat/01_dialoguegroup_edit_noline_default.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_edit_noline_middle.png b/themes/images/nbeat/01_dialoguegroup_edit_noline_middle.png
deleted file mode 100644
index f4c06c7f..00000000
--- a/themes/images/nbeat/01_dialoguegroup_edit_noline_middle.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_edit_noline_top.png b/themes/images/nbeat/01_dialoguegroup_edit_noline_top.png
deleted file mode 100644
index f8dbd43f..00000000
--- a/themes/images/nbeat/01_dialoguegroup_edit_noline_top.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_edit_top.png b/themes/images/nbeat/01_dialoguegroup_edit_top.png
deleted file mode 100644
index dd0b05e0..00000000
--- a/themes/images/nbeat/01_dialoguegroup_edit_top.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_hidden_bottom.png b/themes/images/nbeat/01_dialoguegroup_hidden_bottom.png
deleted file mode 100644
index 22d6b6c0..00000000
--- a/themes/images/nbeat/01_dialoguegroup_hidden_bottom.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_hidden_default.png b/themes/images/nbeat/01_dialoguegroup_hidden_default.png
deleted file mode 100644
index acdba552..00000000
--- a/themes/images/nbeat/01_dialoguegroup_hidden_default.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_hidden_middle.png b/themes/images/nbeat/01_dialoguegroup_hidden_middle.png
deleted file mode 100644
index 4d0d1cec..00000000
--- a/themes/images/nbeat/01_dialoguegroup_hidden_middle.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_hidden_top.png b/themes/images/nbeat/01_dialoguegroup_hidden_top.png
deleted file mode 100644
index e024ab0c..00000000
--- a/themes/images/nbeat/01_dialoguegroup_hidden_top.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_sub_bottom.png b/themes/images/nbeat/01_dialoguegroup_sub_bottom.png
deleted file mode 100644
index dd959ca0..00000000
--- a/themes/images/nbeat/01_dialoguegroup_sub_bottom.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_sub_default.png b/themes/images/nbeat/01_dialoguegroup_sub_default.png
deleted file mode 100644
index fa698dee..00000000
--- a/themes/images/nbeat/01_dialoguegroup_sub_default.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_sub_middle.png b/themes/images/nbeat/01_dialoguegroup_sub_middle.png
deleted file mode 100644
index c14237b2..00000000
--- a/themes/images/nbeat/01_dialoguegroup_sub_middle.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_sub_move.png b/themes/images/nbeat/01_dialoguegroup_sub_move.png
deleted file mode 100644
index b87592ac..00000000
--- a/themes/images/nbeat/01_dialoguegroup_sub_move.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_sub_top.png b/themes/images/nbeat/01_dialoguegroup_sub_top.png
deleted file mode 100644
index c63aaf24..00000000
--- a/themes/images/nbeat/01_dialoguegroup_sub_top.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_title_default.png b/themes/images/nbeat/01_dialoguegroup_title_default.png
deleted file mode 100644
index c0e602fc..00000000
--- a/themes/images/nbeat/01_dialoguegroup_title_default.png
+++ /dev/null
diff --git a/themes/images/nbeat/01_dialoguegroup_title_top.png b/themes/images/nbeat/01_dialoguegroup_title_top.png
deleted file mode 100644
index d7abd4fc..00000000
--- a/themes/images/nbeat/01_dialoguegroup_title_top.png
+++ /dev/null
diff --git a/themes/images/nbeat/navibar_item_separator.png b/themes/images/nbeat/navibar_item_separator.png
deleted file mode 100644
index cf080bb8..00000000
--- a/themes/images/nbeat/navibar_item_separator.png
+++ /dev/null
diff --git a/themes/images/nbeat/navibar_item_separator_shadow.png b/themes/images/nbeat/navibar_item_separator_shadow.png
deleted file mode 100644
index 05d347df..00000000
--- a/themes/images/nbeat/navibar_item_separator_shadow.png
+++ /dev/null
diff --git a/themes/inc/nbeat-black-hd-inc.edc b/themes/inc/nbeat-black-hd-inc.edc
index ee762b8a..cfe5f518 100644
--- a/themes/inc/nbeat-black-hd-inc.edc
+++ b/themes/inc/nbeat-black-hd-inc.edc
@@ -56,21 +56,6 @@
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 235 236 237 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 50 65 74 255
 
-#define NAVIBAR_TITLE_TEXT_COLOR_INC 235 236 237 255
-#define NAVIBAR_TITLE_BG_COLOR_INC 50 65 74 255
-#define NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC 0 15 30 255
-#define NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC 69 87 94 255
-#define NAVIBAR_TOP_ARROW_W_INC 19
-#define NAVIBAR_TOP_ARROW_H_INC 14
-#define NAVIBAR_TITLE_SEPARATOR_H_INC 8
-#define NAVIBAR_H_INC 98
-#define NAVIBAR_EXTENDED_H_INC 196
-#define NAVIBAR_TITLE_ITEM_H_INC 106
-#define NAVIBAR_ICON_SIZE_INC 32
-#define NAVIBAR_INDICATOR_W_INC 128
-#define NAVIBAR_TITLE_FONT_SIZE_INC 36
-#define NAVIBAR_PADDING_EXPANDED_INC 141
-#define NAVIBAR_ICON_PADDING_INC 16
 #define PROGRESSBAR_TITLE_FONT_SIZE_INC 28
 #define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20
 
@@ -350,32 +335,14 @@
 #define GENLIST_GROUP_PART_BUBBLE_BG_COLOR_INC 36 43 44 255
 #define GENLIST_BUBBLE_BG_COLOR_INC 153 153 153 255
 
-#define DIALOGUEGROUP_ITEM_TITLE_TEXT_COLOR_INC 130 130 130 255
-#define DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC 255 255 255 255
-#define DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC_HEX "#000000"
-#define DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_1_INC 147 131 81 255
-#define DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_1_INC  255 255 255 255
-#define DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_2_INC 147 131 81 255
-#define DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_2_INC 255 255 255 255
-#define DIALOGUEGROUP_ITEM_ON_TEXT_COLOR_INC 212 188 116 255
-#define DIALOGUEGROUP_ITEM_OFF_TEXT_COLOR_INC 212 188 116 255
-#define DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_SETTING_INC 255 255 255 255
-#define DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_SETTING_INC 147 131 81 255
-#define DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC 255 255 255 255
-#define DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC_HEX "#ffffff"
-
 #define CONTACT_DISPLAY_NAME_FONT_COLOR_INC  255 255 255 255
 #define CONTACT_DISPLAY_NAME_FONT_GRAY_COLOR_INC 230 230 230 255
 
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_NORMAL_COLOR_INC 146 124 98 255
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_PRESSED_COLOR_INC 217 147 26 255
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_FOCUSED_COLOR_INC 217 147 26 255
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_COLOR_INC 180 180 160 255
-
 #define BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC 249 249 249 255
 #define BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC 249 249 249 255
 #define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 249 249 249 255
 #define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 108 115 118 255
+#define BUTTON_TEXT_STYLE1_TEXT_DISABLED_COLOR_INC 180 180 1 255
 
 #define BUTTON_TEXT_NAVIFRAME_NORMAL_COLOR_INC 211 211 211 255
 #define BUTTON_TEXT_NAVIFRAME_PRESSED_COLOR_INC 249 249 249 255
@@ -494,42 +461,21 @@
 #define BUTTON_CONTACT_PADDING_MIN_INC 16 1
 #define BUTTON_CONTACT_FONT_SIZE_INC 38
 
-#define BUTTON_NAVIBAR_BACK_BUTTON_BUTTON_IMAGE_MIN_INC 106 40
-#define BUTTON_NAVIBAR_BACK_BUTTON_BG_MIN_MAX_INC 36 32
-
-#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_W_INC 36
-#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_H_INC 74
-#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_BORDER_INC 5 5 5 5
-#define BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC 16 2
-#define BUTTON_NAVIBAR_CENTER_ICON_RECT_VISIBLE_MIN_SIZE 36 36
-#define BUTTON_NAVIBAR_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
-#define BUTTON_NAVIBAR_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
-#define BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC 36 36
-#define BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
-#define BUTTON_NAVIBAR_CENTER_TEXT_FONT_SIZE_INC 32
-#define BUTTON_NAVIBAR_MULTILINE_TEXT_FONT_SIZE_INC 24
-
-#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_W_INC 36
-#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_H_INC 74
-#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_BORDER_INC 5 5 5 5
-#define BUTTON_NAVIBAR_LEFT_PADDING_MIN_MAX_INC 16 5
-#define BUTTON_NAVIBAR_LEFT_ICON_RECT_VISIBLE_MIN_SIZE 36 36
-#define BUTTON_NAVIBAR_LEFT_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
-#define BUTTON_NAVIBAR_LEFT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
-#define BUTTON_NAVIBAR_LEFT_SWALLOW_VISIBLE_MIN_MAX_INC 36 36
-#define BUTTON_NAVIBAR_LEFT_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
-#define BUTTON_NAVIBAR_LEFT_TEXT_FONT_SIZE_INC 32
-
-#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_W_INC 36
-#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_H_INC 74
-#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_BORDER_INC 5 5 5 5
-#define BUTTON_NAVIBAR_RIGHT_PADDING_MIN_MAX_INC 16 5
-#define BUTTON_NAVIBAR_RIGHT_ICON_RECT_VISIBLE_MIN_SIZE 36 36
-#define BUTTON_NAVIBAR_RIGHT_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
-#define BUTTON_NAVIBAR_RIGHT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
-#define BUTTON_NAVIBAR_RIGHT_SWALLOW_VISIBLE_MIN_MAX_INC 36 36
-#define BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
-#define BUTTON_NAVIBAR_RIGHT_TEXT_FONT_SIZE_INC 32
+#define BUTTON_NAVIFRAME_BACK_BUTTON_IMAGE_MIN_INC 106 40
+#define BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC 36 32
+#define BUTTON_NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC 0 15 30 255
+#define BUTTON_NAVIFRAME_TITLE_RIGHT_SEPARATOR_COLOR_INC 69 87 94 255
+
+#define BUTTON_NAVIFRAME_CENTER_BG_NORMAL_MIN_INC 22 46
+#define BUTTON_NAVIFRAME_CENTER_BG_NORMAL_BORDER_INC 4 4 4 4
+#define BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC 16 2
+#define BUTTON_NAVIFRAME_CENTER_ICON_RECT_VISIBLE_MIN_SIZE 36 36
+#define BUTTON_NAVIFRAME_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
+#define BUTTON_NAVIFRAME_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
+#define BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC 36 36
+#define BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
+#define BUTTON_NAVIFRAME_CENTER_TEXT_FONT_SIZE_INC 32
+#define BUTTON_NAVIFRAME_MULTILINE_TEXT_FONT_SIZE_INC 24
 
 #define BUTTON_NAVIFRAME_BG_MIN_INC 124 74
 #define BUTTON_NAVIFRAME_VISIBLE_BG_MIN_INC 124 74
@@ -1017,21 +963,6 @@
 #define COLORPALETTE_BASE_WIDTH_INC 630
 #define COLORPALETTE_BASE_WIDTH_LANDSCAPE_INC 1152
 
-#define NAVIBAR_EX_EXTENDED_H 196
-#define NAVIBAR_EX_EXTENDED_H2 310
-#define NAVIBAR_EX_TITLE_SEPARATOR_H 8
-#define NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H 5
-#define NAVIBAR_EX_TITLE_ITEM_H 106
-#define NAVIBAR_EX_TITLE_ITEM_MAX_W 128
-#define NAVIBAR_EX_H 98
-#define NAVIBAR_EX_TITLE_TEXT_FONT_SIZE 36
-#define NAVIBAR_EX_TITLE_ICON_WIDTH 32
-#define NAVIBAR_EX_TITLE_ICON_HEIGHT 32
-#define NAVIBAR_EX_TITLE_INDICATOR_W 128
-#define NAVIBAR_EX_TITLE_BACKBUTTON_W 130
-#define NAVIBAR_EX_PADDING_EXPANDED_INC 150
-#define NAVIBAR_EX_ICON_PADDING_INC 8
-
 #define CALENDAR_DAY_FONT_SIZE_INC 24
 #define CALENDAR_DATE_FONT_SIZE_INC 32
 #define CALENDAR_MONTH_FONT_SIZE_INC 38
diff --git a/themes/inc/nbeat-black-inc.edc b/themes/inc/nbeat-black-inc.edc
index 450c05a6..9a170fd9 100644
--- a/themes/inc/nbeat-black-inc.edc
+++ b/themes/inc/nbeat-black-inc.edc
@@ -56,22 +56,6 @@
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 249 249 249 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 108 108 108 255
 
-#define NAVIBAR_TITLE_TEXT_COLOR_INC 235 236 237 255
-#define NAVIBAR_TITLE_BG_COLOR_INC 50 65 74 255
-#define NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC 0 15 30 255
-#define NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC 69 87 94 255
-#define NAVIBAR_TOP_ARROW_W_INC 15
-#define NAVIBAR_TOP_ARROW_H_INC 11
-#define NAVIBAR_TITLE_SEPARATOR_H_INC 5
-#define NAVIBAR_H_INC 55
-#define NAVIBAR_EXTENDED_H_INC 115
-#define NAVIBAR_TITLE_ITEM_H_INC 65
-#define NAVIBAR_ICON_SIZE_INC 20
-#define NAVIBAR_INDICATOR_W_INC 80
-#define NAVIBAR_TITLE_FONT_SIZE_INC 22
-#define NAVIBAR_PADDING_EXPANDED_INC 102
-#define NAVIBAR_ICON_PADDING_INC 10
-
 #define POPUP_DEFAULT_TITLE_TEXT_COLOR_INC 249 249 249 255
 #define POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC "#F9F9F9"
 #define POPUP_DIM_BG_COLOR 0 0 0 125
@@ -336,32 +320,14 @@
 #define GENLIST_GROUP_PART_BUBBLE_BG_COLOR_INC 36 43 44 255
 #define GENLIST_BUBBLE_BG_COLOR_INC 153 153 153 255
 
-#define DIALOGUEGROUP_ITEM_TITLE_TEXT_COLOR_INC 130 130 130 255
-#define DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC 255 255 255 255
-#define DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC_HEX "#000000"
-#define DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_1_INC 147 131 81 255
-#define DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_1_INC  255 255 255 255
-#define DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_2_INC 147 131 81 255
-#define DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_2_INC 255 255 255 255
-#define DIALOGUEGROUP_ITEM_ON_TEXT_COLOR_INC 212 188 116 255
-#define DIALOGUEGROUP_ITEM_OFF_TEXT_COLOR_INC 212 188 116 255
-#define DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_SETTING_INC 255 255 255 255
-#define DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_SETTING_INC 147 131 81 255
-#define DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC 255 255 255 255
-#define DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC_HEX "#ffffff"
-
 #define CONTACT_DISPLAY_NAME_FONT_COLOR_INC  255 255 255 255
 #define CONTACT_DISPLAY_NAME_FONT_GRAY_COLOR_INC 230 230 230 255
 
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_NORMAL_COLOR_INC 146 124 98 255
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_PRESSED_COLOR_INC 217 147 26 255
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_FOCUSED_COLOR_INC 217 147 26 255
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_COLOR_INC 180 180 160 255
-
 #define BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC 249 249 249 255
 #define BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC 249 249 249 255
 #define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 249 249 249 255
 #define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 108 115 118 255
+#define BUTTON_TEXT_STYLE1_TEXT_DISABLED_COLOR_INC 180 180 1 255
 
 #define BUTTON_TEXT_NAVIFRAME_NORMAL_COLOR_INC 249 249 249 255
 #define BUTTON_TEXT_NAVIFRAME_PRESSED_COLOR_INC 249 249 249 255
@@ -480,43 +446,21 @@
 #define BUTTON_CONTACT_PADDING_MIN_INC 10 1
 #define BUTTON_CONTACT_FONT_SIZE_INC 24
 
-#define BUTTON_NAVIBAR_BACK_BUTTON_BUTTON_IMAGE_MIN_INC 67 40
-#define BUTTON_NAVIBAR_BACK_BUTTON_BG_MIN_MAX_INC 22 20
-
-#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_W_INC 22
-#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_H_INC 46
-#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_BORDER_INC 4 4 4 4
-#define BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC 10 2
-#define BUTTON_NAVIBAR_CENTER_ICON_RECT_VISIBLE_MIN_SIZE 22 22
-#define BUTTON_NAVIBAR_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
-#define BUTTON_NAVIBAR_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
-#define BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC 22 22
-#define BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
-#define BUTTON_NAVIBAR_CENTER_TEXT_FONT_SIZE_INC 20
-#define BUTTON_NAVIBAR_MULTILINE_TEXT_FONT_SIZE_INC 17
-
-#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_W_INC 22
-#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_H_INC 46
-#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_BORDER_INC 4 4 4 4
-#define BUTTON_NAVIBAR_LEFT_PADDING_MIN_MAX_INC 10 5
-#define BUTTON_NAVIBAR_LEFT_ICON_RECT_VISIBLE_MIN_SIZE 22 22
-#define BUTTON_NAVIBAR_LEFT_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
-#define BUTTON_NAVIBAR_LEFT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
-#define BUTTON_NAVIBAR_LEFT_SWALLOW_VISIBLE_MIN_MAX_INC 22 22
-#define BUTTON_NAVIBAR_LEFT_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
-#define BUTTON_NAVIBAR_LEFT_TEXT_FONT_SIZE_INC 20
-
-#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_W_INC 22
-#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_H_INC 46
-#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_BORDER_INC 4 4 4 4
-#define BUTTON_NAVIBAR_RIGHT_PADDING_MIN_MAX_INC 10 5
-#define BUTTON_NAVIBAR_RIGHT_ICON_RECT_VISIBLE_MIN_SIZE 22 22
-#define BUTTON_NAVIBAR_RIGHT_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
-#define BUTTON_NAVIBAR_RIGHT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
-#define BUTTON_NAVIBAR_RIGHT_SWALLOW_VISIBLE_MIN_MAX_INC 22 22
-#define BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
-#define BUTTON_NAVIBAR_RIGHT_TEXT_FONT_SIZE_INC 20
-
+#define BUTTON_NAVIFRAME_BACK_BUTTON_IMAGE_MIN_INC 67 40
+#define BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC 22 20
+#define BUTTON_NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC 0 15 30 255
+#define BUTTON_NAVIFRAME_TITLE_RIGHT_SEPARATOR_COLOR_INC 69 87 94 255
+
+#define BUTTON_NAVIFRAME_CENTER_BG_NORMAL_MIN_INC 22 46
+#define BUTTON_NAVIFRAME_CENTER_BG_NORMAL_BORDER_INC 4 4 4 4
+#define BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC 10 2
+#define BUTTON_NAVIFRAME_CENTER_ICON_RECT_VISIBLE_MIN_SIZE 22 22
+#define BUTTON_NAVIFRAME_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
+#define BUTTON_NAVIFRAME_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
+#define BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC 22 22
+#define BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
+#define BUTTON_NAVIFRAME_CENTER_TEXT_FONT_SIZE_INC 20
+#define BUTTON_NAVIFRAME_MULTILINE_TEXT_FONT_SIZE_INC 17
 #define BUTTON_NAVIFRAME_BG_MIN_INC 100 42
 #define BUTTON_NAVIFRAME_VISIBLE_BG_MIN_INC 100 42
 #define BUTTON_NAVIFRAME_ICONONLY_BG_MIN_INC 42 42
@@ -1004,21 +948,6 @@
 #define COLORPALETTE_BASE_WIDTH_INC 422
 #define COLORPALETTE_BASE_WIDTH_LANDSCAPE_INC 760
 
-#define NAVIBAR_EX_EXTENDED_H 115
-#define NAVIBAR_EX_EXTENDED_H2 186
-#define NAVIBAR_EX_TITLE_SEPARATOR_H 5
-#define NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H 5
-#define NAVIBAR_EX_TITLE_ITEM_H 67
-#define NAVIBAR_EX_TITLE_ITEM_MAX_W 112
-#define NAVIBAR_EX_H 55
-#define NAVIBAR_EX_TITLE_TEXT_FONT_SIZE 22
-#define NAVIBAR_EX_TITLE_ICON_WIDTH 20
-#define NAVIBAR_EX_TITLE_ICON_HEIGHT 20
-#define NAVIBAR_EX_TITLE_INDICATOR_W 80
-#define NAVIBAR_EX_TITLE_BACKBUTTON_W 82
-#define NAVIBAR_EX_PADDING_EXPANDED_INC 96
-#define NAVIBAR_EX_ICON_PADDING_INC 4
-
 #define CALENDAR_DAY_FONT_SIZE_INC 15
 #define CALENDAR_DATE_FONT_SIZE_INC 20
 #define CALENDAR_MONTH_FONT_SIZE_INC 24
diff --git a/themes/inc/nbeat-hd-inc.edc b/themes/inc/nbeat-hd-inc.edc
index 0c157fdc..a2ffe8fc 100644
--- a/themes/inc/nbeat-hd-inc.edc
+++ b/themes/inc/nbeat-hd-inc.edc
@@ -56,21 +56,6 @@
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 73 44 7 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 219 201 174 255
 
-#define NAVIBAR_TITLE_TEXT_COLOR_INC 73 44 7 255
-#define NAVIBAR_TITLE_BG_COLOR_INC 219 201 174 255
-#define NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC 164 151 130 255
-#define NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC 238 223 194 255
-#define NAVIBAR_TOP_ARROW_W_INC 19
-#define NAVIBAR_TOP_ARROW_H_INC 14
-#define NAVIBAR_TITLE_SEPARATOR_H_INC 8
-#define NAVIBAR_H_INC 98
-#define NAVIBAR_EXTENDED_H_INC 196
-#define NAVIBAR_TITLE_ITEM_H_INC 106
-#define NAVIBAR_ICON_SIZE_INC 32
-#define NAVIBAR_INDICATOR_W_INC 128
-#define NAVIBAR_TITLE_FONT_SIZE_INC 36
-#define NAVIBAR_PADDING_EXPANDED_INC 141
-#define NAVIBAR_ICON_PADDING_INC 16
 #define PROGRESSBAR_TITLE_FONT_SIZE_INC 28
 #define PROGRESSBAR_STATUS_TEXT_FONT_SIZE_INC 20
 
@@ -360,32 +345,14 @@
 #define GENLIST_GROUP_PART_BUBBLE_BG_COLOR_INC 220 211 198 255
 #define GENLIST_BUBBLE_BG_COLOR_INC 192 192 192 255
 
-#define DIALOGUEGROUP_ITEM_TITLE_TEXT_COLOR_INC 104 94 82 255
-#define DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC 0 0 0 255
-#define DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC_HEX "#000000"
-#define DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_1_INC 0 0 0 255
-#define DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_1_INC 213 129 31 255
-#define DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_2_INC 147 131 81 255
-#define DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_2_INC 0 0 0 255
-#define DIALOGUEGROUP_ITEM_ON_TEXT_COLOR_INC 229 134 22 255
-#define DIALOGUEGROUP_ITEM_OFF_TEXT_COLOR_INC 56 56 56 255
-#define DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_SETTING_INC 0 0 0 255
-#define DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_SETTING_INC 213 129 31 255
-#define DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC 255 255 255 255
-#define DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC_HEX "#ffffff"
-
 #define CONTACT_DISPLAY_NAME_FONT_COLOR_INC  0 0 0 255
 #define CONTACT_DISPLAY_NAME_FONT_GRAY_COLOR_INC 167 167 167 255
 
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_NORMAL_COLOR_INC 146 124 98 255
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_PRESSED_COLOR_INC 217 147 26 255
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_FOCUSED_COLOR_INC 217 147 26 255
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_COLOR_INC 160 151 145 255
-
 #define BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC 78 73 69 255
 #define BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC 255 255 255 255
 #define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 255 255 255 255
 #define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 185 185 185 255
+#define BUTTON_TEXT_STYLE1_TEXT_DISABLED_COLOR_INC 160 151 1 255
 
 #define BUTTON_TEXT_NAVIFRAME_NORMAL_COLOR_INC 78 73 69 255
 #define BUTTON_TEXT_NAVIFRAME_PRESSED_COLOR_INC 255 255 255 255
@@ -509,42 +476,21 @@
 #define BUTTON_CONTACT_PADDING_MIN_INC 16 1
 #define BUTTON_CONTACT_FONT_SIZE_INC 38
 
-#define BUTTON_NAVIBAR_BACK_BUTTON_BUTTON_IMAGE_MIN_INC 106 40
-#define BUTTON_NAVIBAR_BACK_BUTTON_BG_MIN_MAX_INC 36 32
-
-#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_W_INC 36
-#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_H_INC 74
-#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_BORDER_INC 5 5 5 5
-#define BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC 16 2
-#define BUTTON_NAVIBAR_CENTER_ICON_RECT_VISIBLE_MIN_SIZE 36 36
-#define BUTTON_NAVIBAR_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
-#define BUTTON_NAVIBAR_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
-#define BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC 36 36
-#define BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
-#define BUTTON_NAVIBAR_CENTER_TEXT_FONT_SIZE_INC 32
-#define BUTTON_NAVIBAR_MULTILINE_TEXT_FONT_SIZE_INC 24
-
-#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_W_INC 36
-#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_H_INC 74
-#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_BORDER_INC 5 5 5 5
-#define BUTTON_NAVIBAR_LEFT_PADDING_MIN_MAX_INC 16 5
-#define BUTTON_NAVIBAR_LEFT_ICON_RECT_VISIBLE_MIN_SIZE 36 36
-#define BUTTON_NAVIBAR_LEFT_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
-#define BUTTON_NAVIBAR_LEFT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
-#define BUTTON_NAVIBAR_LEFT_SWALLOW_VISIBLE_MIN_MAX_INC 36 36
-#define BUTTON_NAVIBAR_LEFT_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
-#define BUTTON_NAVIBAR_LEFT_TEXT_FONT_SIZE_INC 32
-
-#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_W_INC 36
-#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_H_INC 74
-#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_BORDER_INC 5 5 5 5
-#define BUTTON_NAVIBAR_RIGHT_PADDING_MIN_MAX_INC 16 5
-#define BUTTON_NAVIBAR_RIGHT_ICON_RECT_VISIBLE_MIN_SIZE 36 36
-#define BUTTON_NAVIBAR_RIGHT_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
-#define BUTTON_NAVIBAR_RIGHT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
-#define BUTTON_NAVIBAR_RIGHT_SWALLOW_VISIBLE_MIN_MAX_INC 36 36
-#define BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
-#define BUTTON_NAVIBAR_RIGHT_TEXT_FONT_SIZE_INC 32
+#define BUTTON_NAVIFRAME_BACK_BUTTON_IMAGE_MIN_INC 106 40
+#define BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC 36 32
+#define BUTTON_NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC 164 151 130 255
+#define BUTTON_NAVIFRAME_TITLE_RIGHT_SEPARATOR_COLOR_INC 238 223 194 255
+
+#define BUTTON_NAVIFRAME_CENTER_BG_NORMAL_MIN_INC 22 46
+#define BUTTON_NAVIFRAME_CENTER_BG_NORMAL_BORDER_INC 4 4 4 4
+#define BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC 16 2
+#define BUTTON_NAVIFRAME_CENTER_ICON_RECT_VISIBLE_MIN_SIZE 36 36
+#define BUTTON_NAVIFRAME_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
+#define BUTTON_NAVIFRAME_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
+#define BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC 36 36
+#define BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC 38 38
+#define BUTTON_NAVIFRAME_CENTER_TEXT_FONT_SIZE_INC 32
+#define BUTTON_NAVIFRAME_MULTILINE_TEXT_FONT_SIZE_INC 24
 
 #define BUTTON_NAVIFRAME_BG_MIN_INC 124 74
 #define BUTTON_NAVIFRAME_VISIBLE_BG_MIN_INC 124 74
@@ -1031,21 +977,6 @@
 #define COLORPALETTE_BASE_WIDTH_INC 630
 #define COLORPALETTE_BASE_WIDTH_LANDSCAPE_INC 1152
 
-#define NAVIBAR_EX_EXTENDED_H 196
-#define NAVIBAR_EX_EXTENDED_H2 310
-#define NAVIBAR_EX_TITLE_SEPARATOR_H 8
-#define NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H 5
-#define NAVIBAR_EX_TITLE_ITEM_H 106
-#define NAVIBAR_EX_TITLE_ITEM_MAX_W 128
-#define NAVIBAR_EX_H 98
-#define NAVIBAR_EX_TITLE_TEXT_FONT_SIZE 36
-#define NAVIBAR_EX_TITLE_ICON_WIDTH 32
-#define NAVIBAR_EX_TITLE_ICON_HEIGHT 32
-#define NAVIBAR_EX_TITLE_INDICATOR_W 128
-#define NAVIBAR_EX_TITLE_BACKBUTTON_W 130
-#define NAVIBAR_EX_PADDING_EXPANDED_INC 150
-#define NAVIBAR_EX_ICON_PADDING_INC 8
-
 #define CALENDAR_DAY_FONT_SIZE_INC 24
 #define CALENDAR_DATE_FONT_SIZE_INC 32
 #define CALENDAR_MONTH_FONT_SIZE_INC 38
diff --git a/themes/inc/nbeat-inc.edc b/themes/inc/nbeat-inc.edc
index c7d6c0ed..171c503b 100644
--- a/themes/inc/nbeat-inc.edc
+++ b/themes/inc/nbeat-inc.edc
@@ -56,22 +56,6 @@
 #define NAVIFRAME_TITLE_TEXT_COLOR_INC 73 44 7 255
 #define NAVIFRAME_TITLE_BG_COLOR_INC 219 201 174 255
 
-#define NAVIBAR_TITLE_TEXT_COLOR_INC 73 44 7 255
-#define NAVIBAR_TITLE_BG_COLOR_INC 219 201 174 255
-#define NAVIBAR_TITLE_LEFT_SEPARATOR_COLOR_INC 164 151 130 255
-#define NAVIBAR_TITLE_RIGHT_SEPARATOR_COLOR_INC 238 223 194 255
-#define NAVIBAR_TOP_ARROW_W_INC 15
-#define NAVIBAR_TOP_ARROW_H_INC 11
-#define NAVIBAR_TITLE_SEPARATOR_H_INC 5
-#define NAVIBAR_H_INC 55
-#define NAVIBAR_EXTENDED_H_INC 115
-#define NAVIBAR_TITLE_ITEM_H_INC 65
-#define NAVIBAR_ICON_SIZE_INC 20
-#define NAVIBAR_INDICATOR_W_INC 80
-#define NAVIBAR_TITLE_FONT_SIZE_INC 22
-#define NAVIBAR_PADDING_EXPANDED_INC 102
-#define NAVIBAR_ICON_PADDING_INC 10
-
 #define POPUP_DEFAULT_TITLE_TEXT_COLOR_INC 255 255 255 255
 #define POPUP_DEFAULT_DESCRIPTION_TEXT_COLOR_INC "#000000"
 #define POPUP_DIM_BG_COLOR 61 59 56 204
@@ -360,32 +344,14 @@
 #define GENLIST_GROUP_PART_BUBBLE_BG_COLOR_INC 220 211 198 255
 #define GENLIST_BUBBLE_BG_COLOR_INC 192 192 192 255
 
-#define DIALOGUEGROUP_ITEM_TITLE_TEXT_COLOR_INC 104 94 82 255
-#define DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC 0 0 0 255
-#define DIALOGUEGROUP_ITEM_SINGLE_TEXT_COLOR_INC_HEX "#000000"
-#define DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_1_INC 0 0 0 255
-#define DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_1_INC 213 129 31 255
-#define DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_2_INC 147 131 81 255
-#define DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_2_INC 0 0 0 255
-#define DIALOGUEGROUP_ITEM_ON_TEXT_COLOR_INC 229 134 22 255
-#define DIALOGUEGROUP_ITEM_OFF_TEXT_COLOR_INC 56 56 56 255
-#define DIALOGUEGROUP_ITEM_TOP_TEXT_COLOR_SETTING_INC 0 0 0 255
-#define DIALOGUEGROUP_ITEM_BOTTOM_TEXT_COLOR_SETTING_INC 213 129 31 255
-#define DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC 255 255 255 255
-#define DIALOGUEGROUP_ITEM_PRESSED_TEXT_COLOR_INC_HEX "#ffffff"
-
 #define CONTACT_DISPLAY_NAME_FONT_COLOR_INC  0 0 0 255
 #define CONTACT_DISPLAY_NAME_FONT_GRAY_COLOR_INC 167 167 167 255
 
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_NORMAL_COLOR_INC 146 124 98 255
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_PRESSED_COLOR_INC 217 147 26 255
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_FOCUSED_COLOR_INC 217 147 26 255
-#define BUTTON_NAVIBAR_FUNCTION_BUTTON_TEXT_DISABLED_COLOR_INC 160 151 145 255
-
 #define BUTTON_TEXT_STYLE1_NORMAL_COLOR_INC 78 73 69 255
 #define BUTTON_TEXT_STYLE1_PRESSED_COLOR_INC 255 255 255 255
 #define BUTTON_TEXT_STYLE1_FOCUSED_COLOR_INC 255 255 255 255
 #define BUTTON_TEXT_STYLE1_DISABLED_COLOR_INC 185 185 185 255
+#define BUTTON_TEXT_STYLE1_TEXT_DISABLED_COLOR_INC 160 151 1 255
 
 #define BUTTON_TEXT_NAVIFRAME_NORMAL_COLOR_INC 78 73 69 255
 #define BUTTON_TEXT_NAVIFRAME_PRESSED_COLOR_INC 255 255 255 255
@@ -504,42 +470,21 @@
 #define BUTTON_CONTACT_PADDING_MIN_INC 10 1
 #define BUTTON_CONTACT_FONT_SIZE_INC 24
 
-#define BUTTON_NAVIBAR_BACK_BUTTON_BUTTON_IMAGE_MIN_INC 67 40
-#define BUTTON_NAVIBAR_BACK_BUTTON_BG_MIN_MAX_INC 22 20
-
-#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_W_INC 22
-#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_MIN_H_INC 46
-#define BUTTON_NAVIBAR_CENTER_BG_NORMAL_BORDER_INC 4 4 4 4
-#define BUTTON_NAVIBAR_CENTER_PADDING_MIN_MAX_INC 10 2
-#define BUTTON_NAVIBAR_CENTER_ICON_RECT_VISIBLE_MIN_SIZE 22 22
-#define BUTTON_NAVIBAR_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
-#define BUTTON_NAVIBAR_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
-#define BUTTON_NAVIBAR_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC 22 22
-#define BUTTON_NAVIBAR_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
-#define BUTTON_NAVIBAR_CENTER_TEXT_FONT_SIZE_INC 20
-#define BUTTON_NAVIBAR_MULTILINE_TEXT_FONT_SIZE_INC 17
-
-#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_W_INC 22
-#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_MIN_H_INC 46
-#define BUTTON_NAVIBAR_LEFT_BG_NORMAL_BORDER_INC 4 4 4 4
-#define BUTTON_NAVIBAR_LEFT_PADDING_MIN_MAX_INC 10 5
-#define BUTTON_NAVIBAR_LEFT_ICON_RECT_VISIBLE_MIN_SIZE 22 22
-#define BUTTON_NAVIBAR_LEFT_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
-#define BUTTON_NAVIBAR_LEFT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
-#define BUTTON_NAVIBAR_LEFT_SWALLOW_VISIBLE_MIN_MAX_INC 22 22
-#define BUTTON_NAVIBAR_LEFT_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
-#define BUTTON_NAVIBAR_LEFT_TEXT_FONT_SIZE_INC 20
-
-#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_W_INC 22
-#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_MIN_H_INC 46
-#define BUTTON_NAVIBAR_RIGHT_BG_NORMAL_BORDER_INC 4 4 4 4
-#define BUTTON_NAVIBAR_RIGHT_PADDING_MIN_MAX_INC 10 5
-#define BUTTON_NAVIBAR_RIGHT_ICON_RECT_VISIBLE_MIN_SIZE 22 22
-#define BUTTON_NAVIBAR_RIGHT_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
-#define BUTTON_NAVIBAR_RIGHT_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
-#define BUTTON_NAVIBAR_RIGHT_SWALLOW_VISIBLE_MIN_MAX_INC 22 22
-#define BUTTON_NAVIBAR_RIGHT_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
-#define BUTTON_NAVIBAR_RIGHT_TEXT_FONT_SIZE_INC 20
+#define BUTTON_NAVIFRAME_BACK_BUTTON_IMAGE_MIN_INC 67 40
+#define BUTTON_NAVIFRAME_BACK_BUTTON_BG_MIN_MAX_INC 22 20
+#define BUTTON_NAVIFRAME_TITLE_LEFT_SEPARATOR_COLOR_INC 164 151 130 255
+#define BUTTON_NAVIFRAME_TITLE_RIGHT_SEPARATOR_COLOR_INC 238 223 194 255
+
+#define BUTTON_NAVIFRAME_CENTER_BG_NORMAL_MIN_INC 22 46
+#define BUTTON_NAVIFRAME_CENTER_BG_NORMAL_BORDER_INC 4 4 4 4
+#define BUTTON_NAVIFRAME_CENTER_PADDING_MIN_MAX_INC 10 2
+#define BUTTON_NAVIFRAME_CENTER_ICON_RECT_VISIBLE_MIN_SIZE 22 22
+#define BUTTON_NAVIFRAME_CENTER_PADDING_AFTER_ICON_VISIBLE_MIN_INC 6 0
+#define BUTTON_NAVIFRAME_CENTER_PADDING_BEFORE_TEXT_DEFAULT_MIN_INC 6 0
+#define BUTTON_NAVIFRAME_CENTER_SWALLOW_VISIBLE_MIN_MAX_INC 22 22
+#define BUTTON_NAVIFRAME_CENTER_SWALLOW_ICONONLY_MIN_MAX_INC 30 30
+#define BUTTON_NAVIFRAME_CENTER_TEXT_FONT_SIZE_INC 20
+#define BUTTON_NAVIFRAME_MULTILINE_TEXT_FONT_SIZE_INC 17
 
 #define BUTTON_NAVIFRAME_BG_MIN_INC 100 42
 #define BUTTON_NAVIFRAME_VISIBLE_BG_MIN_INC 100 42
@@ -1028,21 +973,6 @@
 #define COLORPALETTE_BASE_WIDTH_INC 422
 #define COLORPALETTE_BASE_WIDTH_LANDSCAPE_INC 760
 
-#define NAVIBAR_EX_EXTENDED_H 115
-#define NAVIBAR_EX_EXTENDED_H2 186
-#define NAVIBAR_EX_TITLE_SEPARATOR_H 5
-#define NAVIBAR_EX_TITLE_SEPARATOR_SHADOW_H 5
-#define NAVIBAR_EX_TITLE_ITEM_H 67
-#define NAVIBAR_EX_TITLE_ITEM_MAX_W 112
-#define NAVIBAR_EX_H 55
-#define NAVIBAR_EX_TITLE_TEXT_FONT_SIZE 22
-#define NAVIBAR_EX_TITLE_ICON_WIDTH 20
-#define NAVIBAR_EX_TITLE_ICON_HEIGHT 20
-#define NAVIBAR_EX_TITLE_INDICATOR_W 80
-#define NAVIBAR_EX_TITLE_BACKBUTTON_W 82
-#define NAVIBAR_EX_PADDING_EXPANDED_INC 96
-#define NAVIBAR_EX_ICON_PADDING_INC 4
-
 #define CALENDAR_DAY_FONT_SIZE_INC 15
 #define CALENDAR_DATE_FONT_SIZE_INC 20
 #define CALENDAR_MONTH_FONT_SIZE_INC 24
diff --git a/themes/nbeat.edc b/themes/nbeat.edc
index 0416e409..4aa12741 100644
--- a/themes/nbeat.edc
+++ b/themes/nbeat.edc
@@ -57,7 +57,6 @@ collections {
 #include "groups/ctxpopup.edc"
 #include "groups/datefield.edc"
 #include "groups/dayselector.edc"
-#include "groups/dialoguegroup.edc"
 #include "groups/diskselector.edc"
 #include "groups/editfield.edc"
 #include "groups/entry.edc"
@@ -66,13 +65,11 @@ collections {
 #include "groups/imageslider.edc"
 #include "groups/index.edc"
 #include "groups/label.edc"
-#include "groups/navigationbar.edc"
 #include "groups/layout.edc"
 #include "groups/map.edc"
 #include "groups/multibuttonentry.edc"
 //#include "groups/multisense_ui.edc"
 #include "groups/naviframe.edc"
-#include "groups/navigationbar_ex.edc"
 #include "groups/nocontents.edc"
 #include "groups/pagecontrol.edc"
 #include "groups/panes.edc"