diff --git a/data/themes/edc/about-e.edc b/data/themes/edc/about-e.edc
index 1e25d70bd..1fc8c096b 100644
--- a/data/themes/edc/about-e.edc
+++ b/data/themes/edc/about-e.edc
@@ -167,6 +167,7 @@ group { name: "e/widgets/about/main";
             rel2.offset: 3 3;
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.0;
                text_class: "about_title";
             }
@@ -184,6 +185,7 @@ group { name: "e/widgets/about/main";
             rel2.offset: -4 3;
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 1.0 0.0;
                text_class: "about_version";
             }
@@ -221,6 +223,7 @@ group { name: "e/widgets/about/main";
             align: 0.5 1.0;
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "button";
             }
diff --git a/data/themes/edc/about-theme.edc b/data/themes/edc/about-theme.edc
index 44f5cde12..f2523bfa4 100644
--- a/data/themes/edc/about-theme.edc
+++ b/data/themes/edc/about-theme.edc
@@ -35,6 +35,7 @@ group { name: "e/theme/about";
             text { font: "Sans:style=Bold"; size: 64;
                text: "Dark";
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
             }
          }
@@ -55,6 +56,7 @@ group { name: "e/theme/about";
             text { font: "Sans"; size: 10;
                text: "The default theme for Enlightenment";
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 1.0;
             }
          }
@@ -107,6 +109,7 @@ group { name: "e/theme/about";
             min: 85 0;
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "button";
             }
@@ -145,6 +148,7 @@ group { name: "e/theme/about";
             min: 85 0;
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "button";
             }
diff --git a/data/themes/edc/battery.edc b/data/themes/edc/battery.edc
index e04f2f886..d6dee02d5 100644
--- a/data/themes/edc/battery.edc
+++ b/data/themes/edc/battery.edc
@@ -319,6 +319,7 @@ group { name: "e/modules/battery/popup";
             text { font: "Sans:style=Bold"; size: 10;
                text: "Your battery is low!";
                min: 1 1;
+               ellipsis: -1;
                text_class: "module_large";
             }
          }
@@ -334,6 +335,7 @@ group { name: "e/modules/battery/popup";
             text { font: "Sans"; size: 10;
                text: "AC power is recommended.";
                min: 1 1;
+               ellipsis: -1;
                text_class: "module_normal";
             }
          }
diff --git a/data/themes/edc/border.edc b/data/themes/edc/border.edc
index 192579174..bd6a4e213 100644
--- a/data/themes/edc/border.edc
+++ b/data/themes/edc/border.edc
@@ -1025,6 +1025,7 @@ group { name: "e/widgets/border/default/move";
             color_class: "move_text";
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                text_class: "move_text";
             }
          }
diff --git a/data/themes/edc/button.edc b/data/themes/edc/button.edc
index efee63414..2a4c8fe0e 100644
--- a/data/themes/edc/button.edc
+++ b/data/themes/edc/button.edc
@@ -71,6 +71,7 @@
             color_class: "button_text";
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "button";
             }
diff --git a/data/themes/edc/check.edc b/data/themes/edc/check.edc
index 2a5274f9b..80d98639b 100644
--- a/data/themes/edc/check.edc
+++ b/data/themes/edc/check.edc
@@ -78,6 +78,7 @@ group { name: "e/widgets/check";
             color_class: "check_text";
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "check_button";
             }
diff --git a/data/themes/edc/clock.edc b/data/themes/edc/clock.edc
index a63a151be..367da4afa 100644
--- a/data/themes/edc/clock.edc
+++ b/data/themes/edc/clock.edc
@@ -435,6 +435,8 @@ group { name: "e/modules/clock/digital";
              inherit: "default" 0.0;
              visible: 1;
              fixed: 1 1;
+             text.min: 1 1;
+             text.ellipsis: -1;
           }
        }
                        
@@ -818,6 +820,7 @@ group { name: "e/modules/clock/calendar/dayname";
             text { font: "Sans"; size: 8;
                text: "WWe";
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "module_small";
             }
@@ -880,6 +883,7 @@ group { name: "e/modules/clock/calendar/day";
             text { font: "Sans"; size: 10;
                text: "00";
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
             }
          }
@@ -911,6 +915,7 @@ group { name: "e/modules/clock/calendar/day";
             text { font: "Sans"; size: 10;
                text_source: "e.text.label";
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
             }
             visible: 0;
diff --git a/data/themes/edc/colors.edc b/data/themes/edc/colors.edc
index 15cbcec08..7c774057c 100644
--- a/data/themes/edc/colors.edc
+++ b/data/themes/edc/colors.edc
@@ -61,6 +61,7 @@ group { name: "e/modules/conf_colors/preview/text";
             text { font: "Sans"; size: 10;
                text: "Text";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }
@@ -74,6 +75,7 @@ group { name: "e/modules/conf_colors/preview/text";
             text { font: "Sans:style=Bold"; size: 16;
                text: "Ab";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }
diff --git a/data/themes/edc/comp.edc b/data/themes/edc/comp.edc
index 99ee56b31..c4af70975 100644
--- a/data/themes/edc/comp.edc
+++ b/data/themes/edc/comp.edc
@@ -14,6 +14,7 @@ group { name: "e/modules/comp/preview";
                text_class: "fileman_icon";
                align: 0.5 0.5;
                min: 1 1;
+               ellipsis: -1;
             }
             fixed: 0 1;
          }
diff --git a/data/themes/edc/cpufreq.edc b/data/themes/edc/cpufreq.edc
index bca297f63..cd53a8a0c 100644
--- a/data/themes/edc/cpufreq.edc
+++ b/data/themes/edc/cpufreq.edc
@@ -225,6 +225,7 @@ group { name: "e/modules/cpufreq/main";
             color_class: "module_label";
             text { font: "Sans"; size: 6;
                min: 1 1;
+               ellipsis: -1;
                text_class: "module_small";
             }
          }
diff --git a/data/themes/edc/desklock.edc b/data/themes/edc/desklock.edc
index 45cbbc9aa..065d32f82 100644
--- a/data/themes/edc/desklock.edc
+++ b/data/themes/edc/desklock.edc
@@ -121,6 +121,7 @@ group { name: "e/desklock/login_box";
                min: 1 1;
                align: 0.0 0.5;
                text_class: "desklock_passwd";
+               ellipsis: -1;
             }
             fixed: 1 1;
          }
diff --git a/data/themes/edc/dialog.edc b/data/themes/edc/dialog.edc
index 3d2e3aeb9..5fd81b9a7 100644
--- a/data/themes/edc/dialog.edc
+++ b/data/themes/edc/dialog.edc
@@ -103,6 +103,7 @@ group { name: "e/widgets/dialog/text";
             text {
                style: "dialog_style";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }
diff --git a/data/themes/edc/edgebindings.edc b/data/themes/edc/edgebindings.edc
index 9b9b25146..7322b15c3 100644
--- a/data/themes/edc/edgebindings.edc
+++ b/data/themes/edc/edgebindings.edc
@@ -69,6 +69,7 @@ group { name: "e/modules/conf_edgebindings/selection";
             text { font: "Sans"; size: 10;
                text_class: "label";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }
@@ -224,6 +225,7 @@ offset: -5 -45;
             text {
                style: "edge_binding_style";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }
diff --git a/data/themes/edc/entry.edc b/data/themes/edc/entry.edc
index f8898e5d4..004922467 100644
--- a/data/themes/edc/entry.edc
+++ b/data/themes/edc/entry.edc
@@ -74,6 +74,7 @@ group { name: "e/widgets/entry/text";
                text: "";
                style: "entry_textblock_style";
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
             }
          }
diff --git a/data/themes/edc/evrything.edc b/data/themes/edc/evrything.edc
index b0ba64180..0c3f5c1c1 100644
--- a/data/themes/edc/evrything.edc
+++ b/data/themes/edc/evrything.edc
@@ -457,7 +457,9 @@ group { name: "e/modules/everything/list";
             text { font: "Sans"; size: 10;
                align: 0.0 0.5;
                min: 1 1;
+               ellipsis: -1;
                text_class: "fileman_typebuf";
+               ellipsis: -1;
             }
          }
       }
@@ -762,6 +764,7 @@ group { name: "e/modules/everything/tab_item";
             color_class: "menu_item";
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "menu_item";
             }
@@ -1884,6 +1887,7 @@ group { name: "e/modules/everything/textblock";
             rel2.offset: -5 -5;
             text { style: "everything_textblock_style";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }
diff --git a/data/themes/edc/fileman.edc b/data/themes/edc/fileman.edc
index a2b994011..224e12107 100644
--- a/data/themes/edc/fileman.edc
+++ b/data/themes/edc/fileman.edc
@@ -87,6 +87,7 @@ group { name: "e/fileman/default/list/variable";
                min: 1 1;
                align: 0.0 0.5;
                text_class: "ilist_item";
+               ellipsis: 0.0;
             }
          }
          description { state: "selected" 0.0;
@@ -111,6 +112,7 @@ group { name: "e/fileman/default/list/variable";
                text_source: "e.text.label";
                align: 0.0 0.5;
                text_class: "ilist_item";
+               ellipsis: 0.0;
             }
             visible: 0;
          }
@@ -139,6 +141,7 @@ group { name: "e/fileman/default/list/variable";
                text_source: "e.text.label";
                align: 0.0 0.5;
                text_class: "ilist_item";
+               ellipsis: 0.0;
             }
             visible: 0;
          }
diff --git a/data/themes/edc/fontpreview.edc b/data/themes/edc/fontpreview.edc
index 5c5a43cb4..231899f82 100644
--- a/data/themes/edc/fontpreview.edc
+++ b/data/themes/edc/fontpreview.edc
@@ -11,6 +11,7 @@ group { name: "e/widgets/fontpreview";
             color3: 0 0 0 128;
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "_e_font_preview";
             }
diff --git a/data/themes/edc/ibar-ibox.edc b/data/themes/edc/ibar-ibox.edc
index d1bfb4634..b7091fc91 100644
--- a/data/themes/edc/ibar-ibox.edc
+++ b/data/themes/edc/ibar-ibox.edc
@@ -192,6 +192,7 @@ group { name: "e/modules/ibox/icon_overlay";
             color_class: "module_label";
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "module_normal";
             }
diff --git a/data/themes/edc/ilist.edc b/data/themes/edc/ilist.edc
index 0286dd428..2dc97bcdf 100644
--- a/data/themes/edc/ilist.edc
+++ b/data/themes/edc/ilist.edc
@@ -37,6 +37,7 @@ group { name: "e/ilist";
             color_class: "ilist_typebuf";
             text { font: "Sans:style=Bold"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "ilist_typebuf";
             }
@@ -146,6 +147,7 @@ group { name: "e/widgets/ilist";
             color_class: "ilist_item";
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "ilist_item";
             }
diff --git a/data/themes/edc/init.edc b/data/themes/edc/init.edc
index 648ea0a40..188e880b0 100644
--- a/data/themes/edc/init.edc
+++ b/data/themes/edc/init.edc
@@ -107,6 +107,7 @@ group { name: "e/init/splash";
             text { font: "Sans"; size: 8;
                text: "0.17.0";
                min: 1 1;
+               ellipsis: -1;
                align: 1.0 1.0;
                text_class: "init_version";
             }
diff --git a/data/themes/edc/label.edc b/data/themes/edc/label.edc
index 62c2d5690..6a65ef554 100644
--- a/data/themes/edc/label.edc
+++ b/data/themes/edc/label.edc
@@ -11,6 +11,7 @@ group { name: "e/widgets/label";
             color_class: "label_text";
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "label";
             }
diff --git a/data/themes/edc/menu.edc b/data/themes/edc/menu.edc
index dd8097fc6..064c707fa 100644
--- a/data/themes/edc/menu.edc
+++ b/data/themes/edc/menu.edc
@@ -260,6 +260,7 @@ group { name: "e/widgets/menu/default/label";
             color_class: "menu_item";
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "menu_item";
             }
diff --git a/data/themes/edc/radio.edc b/data/themes/edc/radio.edc
index 2fe82f232..f2bcad470 100644
--- a/data/themes/edc/radio.edc
+++ b/data/themes/edc/radio.edc
@@ -55,6 +55,7 @@ group { name: "e/widgets/radio";
             color_class: "radio_text";
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.0 0.5;
                text_class: "radio_button";
             }
diff --git a/data/themes/edc/randr.edc b/data/themes/edc/randr.edc
index 5e2a2f53f..35ac2b575 100644
--- a/data/themes/edc/randr.edc
+++ b/data/themes/edc/randr.edc
@@ -217,7 +217,8 @@ group { name: "e/conf/randr/main/frame";
             rel2.to: "e.swallow.preview";
             align: 0.5 1.0;
             text { style: "randr_name_style";
-               min: 1.0 1.0;
+               min: 1 1;
+               ellipsis: -1;
             }
          }
       }
@@ -231,7 +232,8 @@ group { name: "e/conf/randr/main/frame";
             rel2.to: "e.swallow.preview";
             align: 0.5 0.0;
             text { style: "randr_resolution_style";
-               min: 1.0 1.0;
+               min: 1 1;
+               ellipsis: -1;
             }
          }
       }
@@ -246,7 +248,8 @@ group { name: "e/conf/randr/main/frame";
             rel2.to: "e.swallow.preview";
             align: 0.5 0.0;
             text { style: "randr_position_style";
-               min: 1.0 1.0;
+               min: 1 1;
+               ellipsis: -1;
             }
          }
       }
diff --git a/data/themes/edc/slider.edc b/data/themes/edc/slider.edc
index 34c5dd639..14d9baf07 100644
--- a/data/themes/edc/slider.edc
+++ b/data/themes/edc/slider.edc
@@ -92,6 +92,7 @@ group { name: "e/widgets/slider_horizontal";
          description { state: "active" 0.0;
             inherit: "default" 0.0;
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
             max: 99999 99999;
          }
@@ -318,6 +319,7 @@ group { name: "e/widgets/slider_vertical";
          description { state: "active" 0.0;
             inherit: "default" 0.0;
             text.min: 1 1;
+            text.ellipsis: -1;
             visible: 1;
             max: 99999 99999;
          }
diff --git a/data/themes/edc/sys.edc b/data/themes/edc/sys.edc
index f05c369c9..42767b13f 100644
--- a/data/themes/edc/sys.edc
+++ b/data/themes/edc/sys.edc
@@ -47,6 +47,7 @@ group { name: "e/sys/logout";
             min: 20 80;
             text { style: "sys_style";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }
diff --git a/data/themes/edc/syscon.edc b/data/themes/edc/syscon.edc
index 3f5cc8cea..d7b5cc3f2 100644
--- a/data/themes/edc/syscon.edc
+++ b/data/themes/edc/syscon.edc
@@ -79,6 +79,7 @@ group { name: "e/widgets/syscon/main";
             align: 0.5 1.0;
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "button";
             }
@@ -178,6 +179,7 @@ group { name: "e/widgets/syscon/item/button";
             color_class: "button_text";
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "button";
             }
diff --git a/data/themes/edc/temperature.edc b/data/themes/edc/temperature.edc
index aa04dce64..c5122a170 100644
--- a/data/themes/edc/temperature.edc
+++ b/data/themes/edc/temperature.edc
@@ -48,6 +48,7 @@ group { name: "e/modules/temperature/main";
             color_class: "module_label";
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                text_class: "module_small";
             }
          }
diff --git a/data/themes/edc/textblock.edc b/data/themes/edc/textblock.edc
index 88a228cad..0f75fed20 100644
--- a/data/themes/edc/textblock.edc
+++ b/data/themes/edc/textblock.edc
@@ -18,6 +18,7 @@ group { name: "e/widgets/textblock";
             text {
                style: "textblock_style";
                min: 1 1;
+               ellipsis: -1;
             }
          }
       }
diff --git a/data/themes/edc/toolbar.edc b/data/themes/edc/toolbar.edc
index 8754953bc..55205240e 100644
--- a/data/themes/edc/toolbar.edc
+++ b/data/themes/edc/toolbar.edc
@@ -261,6 +261,7 @@ group { name: "e/widgets/toolbar/item";
             color_class: "menu_item";
             text { font: "Sans"; size: 10;
                min: 1 1;
+               ellipsis: -1;
                align: 0.5 0.5;
                text_class: "menu_item";
             }
diff --git a/data/themes/edc/wizard.edc b/data/themes/edc/wizard.edc
index a5c67544e..e621840f5 100644
--- a/data/themes/edc/wizard.edc
+++ b/data/themes/edc/wizard.edc
@@ -104,6 +104,7 @@ group { name: "e/wizard/main";
             text { font: "Sans"; size: 10;
                text: "Next"; 
                min: 1 1;
+               ellipsis: -1;
             }
          }
          description { state: "disabled" 0.0;