diff --git a/data/templates/Watchface2.edc b/data/templates/Watchface2.edc
index c77c767..f33daae 100644
--- a/data/templates/Watchface2.edc
+++ b/data/templates/Watchface2.edc
@@ -142,19 +142,6 @@ collections {
          }
       }
       programs {
-         program { "load";
-            signal: "load";
-            source: "";
-            action: STATE_SET "rotated";
-            target: "bg";
-            transition: LINEAR 30;
-            after: "reset";
-         }
-         program { "reset";
-            action: STATE_SET "default";
-            target: "bg";
-            after: "load";
-         }
          program { "hour_begin";
             signal: "load";
             source: "";
diff --git a/data/themes/default/theme_ext.edc b/data/themes/default/theme_ext.edc
index 5735153..3cfb2fb 100644
--- a/data/themes/default/theme_ext.edc
+++ b/data/themes/default/theme_ext.edc
@@ -160,14 +160,14 @@ group { name: "elm/list/h_item/enventor";
             color: 64 64 64 255;
             color_class: "list_item_base";
          }
-         description { state: "odd" 0.0;
+         description { state: "odd";
             color: 56 56 56 255;
             color_class: "list_item_base_odd";
          }
       }
       program {
          signal: "elm,state,odd"; source: "elm";
-         action: STATE_SET "odd" 1.0;
+         action: STATE_SET "odd";
          target: "base";
       }
       program {
@@ -603,7 +603,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,down,1*"; source: "sb_vbar_a1";
          action: STATE_SET "clicked" 0.0;
-         target: "sb_vbar_a1";
          target: "arrow1_vbar";
       }
       program {
@@ -614,13 +613,11 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,up,1"; source: "sb_vbar_a1";
          action: STATE_SET "default" 0.0;
-         target: "sb_vbar_a1";
          target: "arrow1_vbar";
       }
       program {
          signal: "mouse,down,1*"; source: "sb_vbar_a2";
          action: STATE_SET "clicked" 0.0;
-         target: "sb_vbar_a2";
          target: "arrow2_vbar";
       }
       program {
@@ -631,7 +628,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,up,1"; source: "sb_vbar_a2";
          action: STATE_SET "default" 0.0;
-         target: "sb_vbar_a2";
          target: "arrow2_vbar";
       }
       program {
@@ -763,7 +759,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,down,1*"; source: "sb_hbar_a1";
          action: STATE_SET "clicked" 0.0;
-         target: "sb_hbar_a1";
          target: "arrow1_hbar";
       }
       program {
@@ -774,13 +769,11 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,up,1"; source: "sb_hbar_a1";
          action: STATE_SET "default" 0.0;
-         target: "sb_hbar_a1";
          target: "arrow1_hbar";
       }
       program {
          signal: "mouse,down,1*"; source: "sb_hbar_a2";
          action: STATE_SET "clicked" 0.0;
-         target: "sb_hbar_a2";
          target: "arrow2_hbar";
       }
       program {
@@ -791,7 +784,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,up,1"; source: "sb_hbar_a2";
          action: STATE_SET "default" 0.0;
-         target: "sb_hbar_a2";
          target: "arrow2_hbar";
       }
       program {
@@ -1146,7 +1138,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,down,1*"; source: "elm.dragable.vbar";
          action: STATE_SET "clicked" 0.0;
-         target: "elm.dragable.vbar";
          target: "shadow_vbar";
          target: "glow_vbar";
          target: "center_glow_vbar";
@@ -1154,7 +1145,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,up,1"; source: "elm.dragable.vbar";
          action: STATE_SET "default" 0.0;
-         target: "elm.dragable.vbar";
          target: "shadow_vbar";
          target: "glow_vbar";
          target: "center_glow_vbar";
@@ -1162,7 +1152,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,down,1*"; source: "elm.dragable.hbar";
          action: STATE_SET "clicked" 0.0;
-         target: "elm.dragable.hbar";
          target: "shadow_hbar";
          target: "glow_hbar";
          target: "center_glow_hbar";
@@ -1170,7 +1159,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,up,1"; source: "elm.dragable.hbar";
          action: STATE_SET "default" 0.0;
-         target: "elm.dragable.hbar";
          target: "shadow_hbar";
          target: "glow_hbar";
          target: "center_glow_hbar";
@@ -1706,14 +1694,12 @@ group { name: "elm/button/base/enventor";
       program {
          signal: "elm,anim,activate"; source: "elm";
          action: STATE_SET "clicked" 0.0;
-         target: "base";
          target: "text2";
          after: "button_unpressed_anim";
       }
       program { name: "button_unpressed_anim";
          action: STATE_SET "default" 0.0;
          in: 0.5 0.0;
-         target: "base";
          target: "text2";
       }
       program {
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index ba58c12..5ac42a6 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -52,7 +52,7 @@ ctxpopup_dismissed_cb(void *data, Evas_Object *obj,
                       void *event_info EINA_UNUSED)
 {
    stats_data *sd = data;
-   efl_ui_focus_object_focus_set(base_enventor_get(), EINA_TRUE);
+   elm_object_focus_set(base_enventor_get(), EINA_TRUE);
    evas_object_del(obj);
    sd->ctxpopup = NULL;
 }
diff --git a/src/lib/enventor_object.eo b/src/lib/enventor_object.eo
index 1875b9f..7ea72f4 100644
--- a/src/lib/enventor_object.eo
+++ b/src/lib/enventor_object.eo
@@ -3,7 +3,7 @@ type Enventor_Syntax_Color_Type: __undefined_type;
 type Enventor_Template_Insert_Type: __undefined_type;
 type Edje_Part_Type: __undefined_type;
 
-class Enventor.Object (Efl.Ui.Widget, Efl.File, Efl.Ui.Focus.Object)
+class Enventor.Object extends Efl.Ui.Widget implements Efl.File, Efl.Ui.Focus.Object
 {
    legacy_prefix: enventor_object;
    eo_prefix: enventor_obj;
@@ -209,7 +209,7 @@ class Enventor.Object (Efl.Ui.Widget, Efl.File, Efl.Ui.Focus.Object)
       Efl.Gfx.Entity.visible { set; }
       Efl.Gfx.Entity.position { set; }
       Efl.Gfx.Entity.size { set; }
-      Efl.Canvas.Object.clip { set; }
+      Efl.Canvas.Object.clipper { set; }
       Efl.Canvas.Group.group_member_add;
       Efl.File.file { set; }
       Efl.Ui.Focus.Object.focus { set; get; }
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 3c2a6c8..fc19c9f 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -82,6 +82,9 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
    {NULL, NULL}
 };
 
+static Eina_Error ENVENTOR_FILE_SET_ERROR_NONE;
+static Eina_Error ENVENTOR_FILE_SET_ERROR_GENERIC;
+
 /*****************************************************************************/
 /* Internal method implementation                                            */
 /*****************************************************************************/
@@ -257,6 +260,8 @@ EOLIAN static void
 _enventor_object_class_constructor(Efl_Class *klass)
 {
    evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
+
+   ENVENTOR_FILE_SET_ERROR_GENERIC = eina_error_msg_static_register("Generic load error");
 }
 
 EOLIAN static void
@@ -312,9 +317,9 @@ _enventor_object_efl_gfx_entity_visible_set(Eo *obj EINA_UNUSED, Enventor_Object
 }
 
 EOLIAN static void
-_enventor_object_efl_canvas_object_clip_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *clip)
+_enventor_object_efl_canvas_object_clipper_set(Eo *obj, Enventor_Object_Data *pd EINA_UNUSED, Evas_Object *clip)
 {
-   efl_canvas_object_clip_set(efl_super(obj, MY_CLASS), clip);
+   efl_canvas_object_clipper_set(efl_super(obj, MY_CLASS), clip);
 
    Eina_Iterator *it = evas_object_smart_iterator_new(obj);
    Evas_Object *o;
@@ -384,11 +389,10 @@ _enventor_object_efl_object_destructor(Eo *obj, Enventor_Object_Data *pd)
    efl_destructor(efl_super(obj, MY_CLASS));
 }
 
-EOLIAN static Eina_Bool
+EOLIAN static Eina_Error
 _enventor_object_efl_file_file_set(Eo *obj EINA_UNUSED,
                                    Enventor_Object_Data *pd,
-                                   const char *file,
-                                   const char *group EINA_UNUSED)
+                                   const char *file)
 {
    build_edc_path_set(file);
    if (!file) goto err;
@@ -397,11 +401,12 @@ _enventor_object_efl_file_file_set(Eo *obj EINA_UNUSED,
    build_edc();
    edit_changed_set(pd->main_it->ed, EINA_FALSE);
 
-   return EINA_TRUE;
+   return 0;
 
 err:
+   eina_error_set( ENVENTOR_FILE_SET_ERROR_GENERIC);
    build_edc_path_set(NULL);
-   return EINA_FALSE;
+   return 1;
 }
 
 EOLIAN static Eina_List *
@@ -899,7 +904,7 @@ enventor_object_main_item_set(Enventor_Object *obj, const char *file)
    it->ed = edit_init(obj, it);
    it->pd = pd;
 
-   if (!efl_file_set(obj, file, NULL))
+   if (efl_file_set(obj, file))
      {
         edit_term(it->ed);
         pd->main_it = NULL;