diff --git a/legacy/elementary/data/themes/edc/elm/actionslider.edc b/legacy/elementary/data/themes/edc/elm/actionslider.edc
index 0950396de3..dc382c24bd 100644
--- a/legacy/elementary/data/themes/edc/elm/actionslider.edc
+++ b/legacy/elementary/data/themes/edc/elm/actionslider.edc
@@ -51,6 +51,7 @@ group { name: "elm/actionslider/base/default";
             text { font: FN; size: 10;
                align: 0.05 0.5;
                min: 1 1;
+               ellipsis: -1;
                text_class: "button";
             }
          }
@@ -69,6 +70,7 @@ group { name: "elm/actionslider/base/default";
             text { font: FN; size: 10;
                align: 0.5 0.5;
                min: 1 1;
+               ellipsis: -1;
                text_class: "check_off_text";
             }
          }
@@ -87,6 +89,7 @@ group { name: "elm/actionslider/base/default";
             text { font: FN; size: 10;
                align: 0.95 0.5;
                min: 1 1;
+               ellipsis: -1;
                text_class: "check_off_text";
             }
          }
diff --git a/legacy/elementary/data/themes/edc/elm/bubble.edc b/legacy/elementary/data/themes/edc/elm/bubble.edc
index 79a09b7db8..4fd5a28025 100644
--- a/legacy/elementary/data/themes/edc/elm/bubble.edc
+++ b/legacy/elementary/data/themes/edc/elm/bubble.edc
@@ -44,6 +44,7 @@ group { name: "elm/bubble/top_left/default";
             rel2.to: "elm.swallow.icon";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -88,6 +89,7 @@ group { name: "elm/bubble/top_left/default";
             color_class: "bubble_info";
             text { font: FNBD; size: 10;
                min: 1 1;
+               ellipsis: -1;
                max: 1 1;
                align: 1.0 0.0;
                text_class: "bubble_info";
@@ -231,6 +233,7 @@ group { name: "elm/bubble/top_right/default";
             rel2.to: "elm.swallow.icon";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -272,6 +275,7 @@ group { name: "elm/bubble/top_right/default";
             color_class: "bubble_info";
             text { font: FNBD; size: 10;
                min: 1 1;
+               ellipsis: -1;
                max: 1 1;
                align: 1.0 0.0;
                text_class: "bubble_info";
@@ -416,6 +420,7 @@ group { name: "elm/bubble/bottom_left/default";
             rel2.to: "elm.swallow.icon";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -460,6 +465,7 @@ group { name: "elm/bubble/bottom_left/default";
             color_class: "bubble_info";
             text { font: FNBD; size: 10;
                min: 1 1;
+               ellipsis: -1;
                max: 1 1;
                align: 1.0 1.0;
                text_class: "bubble_info";
@@ -596,6 +602,7 @@ group { name: "elm/bubble/bottom_right/default";
             rel2.to: "elm.swallow.icon";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -640,6 +647,7 @@ group { name: "elm/bubble/bottom_right/default";
             color_class: "bubble_info";
             text { font: FNBD; size: 10;
                min: 1 1;
+               ellipsis: -1;
                max: 1 1;
                align: 1.0 1.0;
                text_class: "bubble_info";
diff --git a/legacy/elementary/data/themes/edc/elm/button.edc b/legacy/elementary/data/themes/edc/elm/button.edc
index e2eb40cd9b..568d5c5dab 100644
--- a/legacy/elementary/data/themes/edc/elm/button.edc
+++ b/legacy/elementary/data/themes/edc/elm/button.edc
@@ -130,6 +130,7 @@ group { name: "elm/button/base/default";
             rel2.to: "elm.swallow.content";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -139,6 +140,7 @@ group { name: "elm/button/base/default";
             rel2.to: "elm.swallow.content";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -166,11 +168,13 @@ group { name: "elm/button/base/default";
             inherit: "default" 0.0;
             rel1.offset: 2 5;
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
          description { state: "textonly" 0.0;
             inherit: "default" 0.0;
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
          description { state: "disabled_visible" 0.0;
@@ -179,6 +183,7 @@ group { name: "elm/button/base/default";
             color_class: "button_text_disabled";
             color3: 255 255 255 255;
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
          description { state: "disabled_textonly" 0.0;
@@ -186,6 +191,7 @@ group { name: "elm/button/base/default";
             color_class: "button_text_disabled";
             color3: 255 255 255 255;
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
       }
@@ -415,6 +421,7 @@ group { name: "elm/button/base/anchor";
             rel2.to: "elm.swallow.content";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -424,6 +431,7 @@ group { name: "elm/button/base/anchor";
             rel2.to: "elm.swallow.content";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -452,11 +460,13 @@ group { name: "elm/button/base/anchor";
             inherit: "default" 0.0;
             rel1.offset: 0 0;
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
          description { state: "textonly" 0.0;
             inherit: "default" 0.0;
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
          description { state: "disabled_visible" 0.0;
@@ -464,12 +474,14 @@ group { name: "elm/button/base/anchor";
             rel1.offset: 0 0;
             color_class: "button_text_anchor_disabled";
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
          description { state: "disabled_textonly" 0.0;
             inherit: "default" 0.0;
             color_class: "button_text_anchor_disabled";
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
       }
@@ -486,6 +498,7 @@ group { name: "elm/button/base/anchor";
             text { font: FN; size: 10;
                text_source: "elm.text";
                min: 1 1;
+               ellipsis: -1;
                text_class: "button_anchor";
             }
             visible: 0;
@@ -803,11 +816,13 @@ group { name: "elm/button/base/hoversel_vertical/default";
             inherit: "default" 0.0;
             rel1.offset: 2 5;
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
          description { state: "textonly" 0.0;
             inherit: "default" 0.0;
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
          description { state: "disabled_visible" 0.0;
@@ -815,12 +830,14 @@ group { name: "elm/button/base/hoversel_vertical/default";
             rel1.offset: 2 5;
             color_class: "hoversel_text_disabled";
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
          description { state: "disabled_textonly" 0.0;
             inherit: "default" 0.0;
             color_class: "hoversel_text_disabled";
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
       }
@@ -1010,6 +1027,7 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
             rel2.to: "elm.swallow.content";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -1019,6 +1037,7 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
             rel2.to: "elm.swallow.content";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -1055,11 +1074,13 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
             inherit: "default" 0.0;
             rel1.offset: 2 5;
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
          description { state: "textonly" 0.0;
             inherit: "default" 0.0;
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
          description { state: "disabled_visible" 0.0;
@@ -1067,12 +1088,14 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
             rel1.offset: 2 5;
             color_class: "hoversel_text_disabled";
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
          description { state: "disabled_textonly" 0.0;
             inherit: "default" 0.0;
             color_class: "hoversel_text_disabled";
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
          }
       }
diff --git a/legacy/elementary/data/themes/edc/elm/calendar.edc b/legacy/elementary/data/themes/edc/elm/calendar.edc
index 477a46eb45..b1b15c8546 100644
--- a/legacy/elementary/data/themes/edc/elm/calendar.edc
+++ b/legacy/elementary/data/themes/edc/elm/calendar.edc
@@ -198,6 +198,7 @@
          color: FN_COL_DISABLE;\
          text { font: FN; size: 8; \
             min: 1 1; \
+            ellipsis: -1; \
          } \
       } \
    } \
@@ -280,6 +281,7 @@
          rel2.to: "cit_"#_pos".rect"; \
          text.style: "calendar_date_style"; \
          text.min: 1 1; \
+         text.ellipsis: -1; \
       } \
       description { state: "holiday" 0.0; \
          inherit: "default" 0.0; \
diff --git a/legacy/elementary/data/themes/edc/elm/check.edc b/legacy/elementary/data/themes/edc/elm/check.edc
index 2a6ad62acf..c8e07e41a7 100644
--- a/legacy/elementary/data/themes/edc/elm/check.edc
+++ b/legacy/elementary/data/themes/edc/elm/check.edc
@@ -174,6 +174,7 @@ group { name: "elm/check/base/default";
             rel2.to: "elm.swallow.content";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -183,6 +184,7 @@ group { name: "elm/check/base/default";
             rel2.to: "elm.swallow.content";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -211,12 +213,14 @@ group { name: "elm/check/base/default";
             inherit: "default" 0.0;
             visible: 1;
             text.min: 1 1;
+            text.ellipsis: -1;
          }
          description { state: "disabled_visible" 0.0;
             inherit: "default" 0.0;
             color: FN_COL_DISABLE;
             visible: 1;
             text.min: 1 1;
+            text.ellipsis: -1;
          }
       }
       part { name: "event"; type: RECT;
@@ -644,6 +648,7 @@ group { name: "elm/check/base/toggle";
             rel2.to: "elm.swallow.content";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -653,6 +658,7 @@ group { name: "elm/check/base/toggle";
             rel2.to: "elm.swallow.content";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -683,12 +689,14 @@ group { name: "elm/check/base/toggle";
             inherit: "default" 0.0;
             visible: 1;
             text.min: 1 1;
+            text.ellipsis: -1;
          }
          description { state: "disabled_visible" 0.0;
             inherit: "default" 0.0;
             color: FN_COL_DISABLE;
             visible: 1;
             text.min: 1 1;
+            text.ellipsis: -1;
          }
       }
       part { name: "event"; type: RECT;
diff --git a/legacy/elementary/data/themes/edc/elm/datetime.edc b/legacy/elementary/data/themes/edc/elm/datetime.edc
index 6e86d5a1bc..28708aaaf7 100644
--- a/legacy/elementary/data/themes/edc/elm/datetime.edc
+++ b/legacy/elementary/data/themes/edc/elm/datetime.edc
@@ -55,6 +55,7 @@
          text { \
             font: "Sans"; size: 10; \
             min: 1 0; \
+            ellipsis: -1; \
             align: 0.5 0.5; \
             text_class: "datetime_text"; \
          } \
diff --git a/legacy/elementary/data/themes/edc/elm/dayselector.edc b/legacy/elementary/data/themes/edc/elm/dayselector.edc
index 6bf5fc11ac..8c83ae5ec5 100644
--- a/legacy/elementary/data/themes/edc/elm/dayselector.edc
+++ b/legacy/elementary/data/themes/edc/elm/dayselector.edc
@@ -327,6 +327,7 @@ group { name: "elm/check/base/dayselector/default";
                font: FN;
                size: 10;
                min: 1 1;
+               ellipsis: -1;
                text_class: "button";
             }
             color: FN_COL_DEFAULT;
@@ -367,6 +368,7 @@ group { name: "elm/check/base/dayselector/default";
                font: FN;
                size: 10;
                min: 1 1;
+               ellipsis: -1;
                text_source: "elm.text";
                text_class: "button";
             }
diff --git a/legacy/elementary/data/themes/edc/elm/diskselector.edc b/legacy/elementary/data/themes/edc/elm/diskselector.edc
index 9ec4c09acd..a9003e7028 100644
--- a/legacy/elementary/data/themes/edc/elm/diskselector.edc
+++ b/legacy/elementary/data/themes/edc/elm/diskselector.edc
@@ -271,6 +271,7 @@ group { name: "elm/diskselector/item/datetime/default";
               font: "Sans,Edje-Vera";
               size: 10;
               min: 1 1;
+              ellipsis: -1;
            }
         }
         description { state: "center_sel" 0.0;
diff --git a/legacy/elementary/data/themes/edc/elm/entry.edc b/legacy/elementary/data/themes/edc/elm/entry.edc
index 75da5ee384..3a90c1c960 100644
--- a/legacy/elementary/data/themes/edc/elm/entry.edc
+++ b/legacy/elementary/data/themes/edc/elm/entry.edc
@@ -681,6 +681,7 @@ group { name: "elm/entry/base-nowrap/default";
          description { state: "default" 0.0;
             text { style: "entry_nowrap_style";
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.0;
             }
          }
@@ -731,6 +732,7 @@ group { name: "elm/entry/base-single/default";
          description { state: "default" 0.0;
             text { style: "entry_single_style";
                min: 1 1;
+               ellipsis: -1;
                max: 0 0;
                align: 0.0 0.5;
             }
@@ -756,6 +758,7 @@ group { name: "elm/entry/base-single-noedit/default";
          description { state: "default" 0.0;
             text { style: "entry_single_style";
                min: 1 1;
+               ellipsis: -1;
                max: 0 0;
                align: 0.0 0.5;
             }
@@ -852,6 +855,7 @@ group { name: "elm/entry/base-nowrap-noedit/default";
          description { state: "default" 0.0;
             text { style: "entry_style";
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.0;
             }
          }
@@ -892,6 +896,7 @@ group { name: "elm/entry/base-password/default";
             text { style: "entry_single_style";
                repch: "*";
                min: 1 1;
+               ellipsis: -1;
                max: 0 0;
                align: 0.0 0.5;
             }
diff --git a/legacy/elementary/data/themes/edc/elm/flipselector.edc b/legacy/elementary/data/themes/edc/elm/flipselector.edc
index e629d1be63..d0c72e0582 100644
--- a/legacy/elementary/data/themes/edc/elm/flipselector.edc
+++ b/legacy/elementary/data/themes/edc/elm/flipselector.edc
@@ -216,6 +216,7 @@ group { name: "elm/flipselector/base/default";
             rel2.offset: -3 -1;
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
             }
             color: FN_COL_DEFAULT;
@@ -283,6 +284,7 @@ group { name: "elm/flipselector/base/default";
             rel2.offset: -3 -1;
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
             }
             color: FN_COL_DEFAULT;
@@ -320,6 +322,7 @@ group { name: "elm/flipselector/base/default";
             rel2.offset: -3 -1;
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                source: "elm.top";
             }
@@ -363,6 +366,7 @@ group { name: "elm/flipselector/base/default";
             rel2.offset: -3 -3;
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
             }
             color: FN_COL_GREY_192;
diff --git a/legacy/elementary/data/themes/edc/elm/genlist.edc b/legacy/elementary/data/themes/edc/elm/genlist.edc
index 714701ef73..f498771949 100644
--- a/legacy/elementary/data/themes/edc/elm/genlist.edc
+++ b/legacy/elementary/data/themes/edc/elm/genlist.edc
@@ -170,6 +170,7 @@ group { "elm/genlist/item/group_index/default"; nomouse; program_source: "elm";
             color_class: "list_group_item";
             text { font: FNBD; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "list_group_item";
             }
@@ -396,6 +397,7 @@ group { "elm/genlist/item/default/default"; nomouse;
             color_class: "list_item";
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "list_item";
             }
@@ -607,6 +609,7 @@ group { "elm/genlist/item/default_style/default"; nomouse;
             color_class: "list_item";
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "list_item";
                style: "genlist_style";
@@ -964,6 +967,7 @@ group { "elm/genlist/item/end_icon/default"; nomouse;
             color_class: "list_item";
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "list_item";
             }
@@ -1140,6 +1144,7 @@ group { "elm/genlist/item/no_icon/default"; nomouse;
             color_class: "list_item";
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "list_item";
             }
@@ -1794,6 +1799,7 @@ group { "elm/genlist/item/icon_top_text_bottom/default"; nomouse;
             color_class: "list_item";
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "list_item";
             }
@@ -1927,6 +1933,7 @@ group { "elm/genlist/item/icon_top_text_bottom/default"; nomouse;
             color_class: "list_item";
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "list_item";
                text: "M";
@@ -2206,6 +2213,7 @@ group { "elm/genlist/item/double_label/default"; nomouse;
             align: 0.0 0.0;
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.0;
                text_class: "list_item";
             }
@@ -2309,6 +2317,7 @@ group { "elm/genlist/item/double_label/default"; nomouse;
             align: 0.0 1.0;
             text { font: FN; size: 8;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 1.0;
                text_class: "list_item_sub";
             }
@@ -2790,6 +2799,7 @@ group { "elm/genlist/item/message/default"; nomouse;
             align: 0.0 0.0;
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.0;
                text_class: "list_item";
             }
@@ -2896,6 +2906,7 @@ group { "elm/genlist/item/message/default"; nomouse;
             color_class: "list_item";
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "list_item";
             }
@@ -2985,6 +2996,7 @@ group { "elm/genlist/item/message/default"; nomouse;
             align: 0.0 1.0;
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 1.0;
                text_class: "list_item";
             }
@@ -3138,6 +3150,7 @@ group { "elm/genlist/item/media/default"; nomouse;
             align: 0.0 0.0;
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.0;
                text_class: "list_item";
             }
@@ -3240,6 +3253,7 @@ group { "elm/genlist/item/media/default"; nomouse;
             align: 0.0 1.0;
             text { font: FN; size: 8;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 1.0;
                text_class: "list_item_sub";
             }
@@ -3579,6 +3593,7 @@ group { "elm/genlist/item/media-album/default"; nomouse;
             align: 0.0 0.0;
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.0;
                text_class: "list_item";
             }
@@ -3680,6 +3695,7 @@ group { "elm/genlist/item/media-album/default"; nomouse;
             rel2.offset: 2 -1;
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text: ":";
             }
@@ -3704,6 +3720,7 @@ group { "elm/genlist/item/media-album/default"; nomouse;
             align: 0.0 0.0;
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.0;
                text_class: "list_item";
             }
@@ -3795,6 +3812,7 @@ group { "elm/genlist/item/media-album/default"; nomouse;
             align: 0.0 1.0;
             text { font: FN; size: 8;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 1.0;
                text_class: "list_item_sub";
             }
@@ -4124,6 +4142,7 @@ group { "elm/genlist/item/media-preview/default"; nomouse;
             align: 0.0 0.0;
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.0;
                text_class: "list_item";
             }
@@ -4226,6 +4245,7 @@ group { "elm/genlist/item/media-preview/default"; nomouse;
             align: 0.0 1.0;
             text { font: FN; size: 8;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 1.0;
                text_class: "list_item_sub";
             }
@@ -4673,6 +4693,7 @@ group { "elm/genlist/item/mode/default"; nomouse;
             color_class: "list_item";
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "list_item";
             }
diff --git a/legacy/elementary/data/themes/edc/elm/index.edc b/legacy/elementary/data/themes/edc/elm/index.edc
index c6522b693f..0f88ef6a66 100644
--- a/legacy/elementary/data/themes/edc/elm/index.edc
+++ b/legacy/elementary/data/themes/edc/elm/index.edc
@@ -60,6 +60,7 @@ group { name: "elm/index/base/vertical/default";
                font: FN;
                size: 20;
                min: 1 1;
+               ellipsis: -1;
                align: 1.0 0.5;
             }
          }
@@ -175,6 +176,7 @@ group { name: "elm/index/item/vertical/default";
                font: FN;
                size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
             }
          }
@@ -279,6 +281,7 @@ group { name: "elm/index/item_odd/vertical/default";
                font: FN;
                size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
             }
          }
@@ -408,6 +411,7 @@ group { name: "elm/index/base/horizontal/default";
                font: FN;
                size: 20;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 1;
             }
          }
@@ -513,6 +517,7 @@ group { name: "elm/index/item/horizontal/default";
                font: FN;
                size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
             }
          }
@@ -613,6 +618,7 @@ group { name: "elm/index/item_odd/horizontal/default";
                font: FN;
                size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
             }
          }
diff --git a/legacy/elementary/data/themes/edc/elm/label.edc b/legacy/elementary/data/themes/edc/elm/label.edc
index 6e4546e31e..098a7510b6 100644
--- a/legacy/elementary/data/themes/edc/elm/label.edc
+++ b/legacy/elementary/data/themes/edc/elm/label.edc
@@ -42,6 +42,7 @@ group { name: "elm/label/base/marker";
          description { state: "default" 0.0;
             text { style: "label_style2";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }
@@ -129,6 +130,7 @@ group { name: "elm/label/base/slide_long";
             text {
                style: "label_style";
                min: 1 1;
+               ellipsis: -1;
             }
          }
          description { state: "slide_begin" 0.0;
@@ -139,6 +141,7 @@ group { name: "elm/label/base/slide_long";
             text {
                style: "label_style";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }
@@ -239,6 +242,7 @@ group { name: "elm/label/base/slide_short";
             align: 1.0 0.0;
             text { style: "label_style";
                min: 1 1;
+               ellipsis: -1;
             }
          }
          description { state: "slide_begin" 0.0;
@@ -248,6 +252,7 @@ group { name: "elm/label/base/slide_short";
             align: 0.0 0.0;
             text { style: "label_style";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }
@@ -359,6 +364,7 @@ group { name: "elm/label/base/slide_bounce";
             align: 1.0 0.0;
             text { style: "label_style";
                min: 1 1;
+               ellipsis: -1;
             }
          }
          description { state: "slide_begin" 0.0;
@@ -368,6 +374,7 @@ group { name: "elm/label/base/slide_bounce";
             align: 0.0 0.0;
             text { style: "label_style";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }
diff --git a/legacy/elementary/data/themes/edc/elm/list.edc b/legacy/elementary/data/themes/edc/elm/list.edc
index b05038a9b5..aa836d4367 100644
--- a/legacy/elementary/data/themes/edc/elm/list.edc
+++ b/legacy/elementary/data/themes/edc/elm/list.edc
@@ -220,6 +220,7 @@ group { name: "elm/list/item/default";
             color_class: "list_item";
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "list_item";
             }
@@ -530,6 +531,7 @@ group { name: "elm/list/h_item/default";
             color_class: "list_item";
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "list_item";
             }
diff --git a/legacy/elementary/data/themes/edc/elm/map.edc b/legacy/elementary/data/themes/edc/elm/map.edc
index fe3170f715..c84533e744 100644
--- a/legacy/elementary/data/themes/edc/elm/map.edc
+++ b/legacy/elementary/data/themes/edc/elm/map.edc
@@ -42,6 +42,7 @@ group { name: "elm/map/marker/radio/default";
             text { font: FNBD; size: 10;
                text_class: "map_radio";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }
@@ -76,6 +77,7 @@ group { name: "elm/map/marker/empty/default";
             text { font: FNBD; size: 10;
                text_class: "map_empty";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }
@@ -116,6 +118,7 @@ group { name: "elm/map/scale/base/default";
             text { font: FNBD; size: 10;
                text_class: "map_scale";
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.0;
             }
          }
diff --git a/legacy/elementary/data/themes/edc/elm/menu.edc b/legacy/elementary/data/themes/edc/elm/menu.edc
index 9e8e106f8a..00618f21eb 100644
--- a/legacy/elementary/data/themes/edc/elm/menu.edc
+++ b/legacy/elementary/data/themes/edc/elm/menu.edc
@@ -84,6 +84,7 @@ group { name: "elm/menu/item/default";
             color: FN_COL_DEFAULT;
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "menu_item";
             }
@@ -462,6 +463,7 @@ group { name: "elm/menu/main_menu_submenu/default";
             color: FN_COL_DEFAULT;
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "menu_item";
             }
diff --git a/legacy/elementary/data/themes/edc/elm/multibuttonentry.edc b/legacy/elementary/data/themes/edc/elm/multibuttonentry.edc
index 6234dd1e01..5ea842830d 100644
--- a/legacy/elementary/data/themes/edc/elm/multibuttonentry.edc
+++ b/legacy/elementary/data/themes/edc/elm/multibuttonentry.edc
@@ -19,6 +19,7 @@ group { name: "elm/multibuttonentry/label/default";
             color_class: "multibuttonentry_label";
             text { font: FNBD; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "multibuttonentry_label";
             }
@@ -153,6 +154,7 @@ group { name: "elm/multibuttonentry/btn/default";
             color_class: "multibuttonentry_label";
             text { style: "multibuttonentry_textblock_style";
                min: 1 1;
+               ellipsis: -1;
                text_class: "multibuttonentry_label";
             }               
             visible: 0;
@@ -252,6 +254,7 @@ group { name: "elm/multibuttonentry/closedbutton/default";
             rel2.to: "bg";
             text { style: "textblock_style_multibuttonentry_default";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }
diff --git a/legacy/elementary/data/themes/edc/elm/popup.edc b/legacy/elementary/data/themes/edc/elm/popup.edc
index 2616a2869d..67dc6a8a40 100644
--- a/legacy/elementary/data/themes/edc/elm/popup.edc
+++ b/legacy/elementary/data/themes/edc/elm/popup.edc
@@ -205,6 +205,7 @@ group { name: "elm/popup/base/default";
             text {
               style: "popup_title_style";
               min: 1 1;
+              ellipsis: -1;
             }
             visible: 0;
             rel1.offset: 2 2;
diff --git a/legacy/elementary/data/themes/edc/elm/progress.edc b/legacy/elementary/data/themes/edc/elm/progress.edc
index 7d0a8ec89b..981c3c4bc6 100644
--- a/legacy/elementary/data/themes/edc/elm/progress.edc
+++ b/legacy/elementary/data/themes/edc/elm/progress.edc
@@ -106,6 +106,7 @@ group { name: "elm/progressbar/horizontal/default";
             rel2.to: "elm.swallow.content";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -138,6 +139,7 @@ group { name: "elm/progressbar/horizontal/default";
             rel1.offset: 2 2;
             rel2.offset: 2 -3;
             text.min: 1 1;
+            text.ellipsis: -1;
          }
          description { state: "disabled_visible" 0.0;
             inherit: "visible" 0.0;
@@ -661,6 +663,7 @@ group { name: "elm/progressbar/vertical/default";
             rel2.to: "elm.swallow.content";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -693,6 +696,7 @@ group { name: "elm/progressbar/vertical/default";
             rel1.offset: 2 2;
             rel2.offset: -3 2;
             text.min: 1 1;
+            text.ellipsis: -1;
          }
          description { state: "disabled_visible" 0.0;
             inherit: "visible" 0.0;
diff --git a/legacy/elementary/data/themes/edc/elm/radio.edc b/legacy/elementary/data/themes/edc/elm/radio.edc
index e391d90db2..5b31e21d10 100644
--- a/legacy/elementary/data/themes/edc/elm/radio.edc
+++ b/legacy/elementary/data/themes/edc/elm/radio.edc
@@ -143,6 +143,7 @@ group { name: "elm/radio/base/default";
             rel2.to: "elm.swallow.content";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -152,6 +153,7 @@ group { name: "elm/radio/base/default";
             rel2.to: "elm.swallow.content";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -180,6 +182,7 @@ group { name: "elm/radio/base/default";
             inherit: "default" 0.0;
             visible: 1;
             text.min: 1 1;
+            text.ellipsis: -1;
          }
          description { state: "disabled_visible" 0.0;
             inherit: "default" 0.0;
@@ -187,6 +190,7 @@ group { name: "elm/radio/base/default";
             color3: 255 255 255 25;
             visible: 1;
             text.min: 1 1;
+            text.ellipsis: -1;
          }
       }
       part { name: "event"; type: RECT;
diff --git a/legacy/elementary/data/themes/edc/elm/slider.edc b/legacy/elementary/data/themes/edc/elm/slider.edc
index 9e9e5618c0..589a534e5b 100644
--- a/legacy/elementary/data/themes/edc/elm/slider.edc
+++ b/legacy/elementary/data/themes/edc/elm/slider.edc
@@ -248,6 +248,7 @@ group { name: "elm/slider/horizontal/default";
             rel2.to: "elm.swallow.icon";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -280,6 +281,7 @@ group { name: "elm/slider/horizontal/default";
             rel1.offset: 2 2;
             rel2.offset: 2 -3;
             text.min: 1 1;
+            text.ellipsis: -1;
          }
          description { state: "disabled_visible" 0.0;
             inherit: "visible" 0.0;
@@ -321,6 +323,7 @@ group { name: "elm/slider/horizontal/default";
             rel2.to: "elm.swallow.end";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -961,6 +964,7 @@ group { name: "elm/slider/vertical/default";
             rel2.to: "elm.swallow.icon";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -982,6 +986,7 @@ group { name: "elm/slider/vertical/default";
             text { font: FN; size: 10;
                text_class: "slider";
                min: 1 0;
+               ellipsis: -1;
                align: 0.5 0.0;
             }
             visible: 0;
@@ -992,6 +997,8 @@ group { name: "elm/slider/vertical/default";
             rel1.offset: 2 2;
             rel2.offset: -3 2;
             text.min: 1 1;
+            text.ellipsis: -1;
+
          }
          description { state: "disabled_visible" 0.0;
             inherit: "visible" 0.0;
@@ -1033,6 +1040,7 @@ group { name: "elm/slider/vertical/default";
             rel2.to: "elm.swallow.end";
             text {
                min: 1 1;
+               ellipsis: -1;
                text: "M";
             }
          }
@@ -1081,6 +1089,7 @@ group { name: "elm/slider/vertical/default";
             inherit: "default" 0.0;
             visible: 1;
             text.min: 1 1;
+            text.ellipsis: -1;
          }
          description { state: "disabled_visible" 0.0;
             inherit: "visible" 0.0;
diff --git a/legacy/elementary/data/themes/edc/elm/toolbar.edc b/legacy/elementary/data/themes/edc/elm/toolbar.edc
index f0cb0a76e6..12e0c5cb3b 100644
--- a/legacy/elementary/data/themes/edc/elm/toolbar.edc
+++ b/legacy/elementary/data/themes/edc/elm/toolbar.edc
@@ -597,6 +597,7 @@ group { name: "elm/toolbar/item/default";
             color_class: "toolbar_item";
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "toolbar_item";
             }
@@ -689,6 +690,7 @@ group { name: "elm/toolbar/item/default";
             color_class: "toolbar_item";
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "toolbar_item";
             }
@@ -1044,6 +1046,7 @@ group { name: "elm/toolbar/item/item_horizontal";
             color_class: "toolbar_item";
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "toolbar_item";
             }
@@ -1105,6 +1108,7 @@ group { name: "elm/toolbar/item/item_horizontal";
             color_class: "toolbar_item";
             text { font: FN; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "toolbar_item";
             }
diff --git a/legacy/elementary/data/themes/edc/elm/tooltip.edc b/legacy/elementary/data/themes/edc/elm/tooltip.edc
index ec8b6e1aa3..4094b204a6 100644
--- a/legacy/elementary/data/themes/edc/elm/tooltip.edc
+++ b/legacy/elementary/data/themes/edc/elm/tooltip.edc
@@ -15,6 +15,7 @@ group { name: "elm/label/base/tooltip";
             text {
                style: "tooltip_style";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }