diff --git a/legacy/edje/src/lib/edje_private.h b/legacy/edje/src/lib/edje_private.h
index 655aa77a99..e8c75d0e14 100644
--- a/legacy/edje/src/lib/edje_private.h
+++ b/legacy/edje/src/lib/edje_private.h
@@ -80,7 +80,7 @@ extern Eet_Data_Descriptor *_edje_edd_edje_part_description;
 extern Eet_Data_Descriptor *_edje_edd_edje_part_image_id;
 
 extern int              _edje_anim_count;
-extern Ecore_Timer     *_edje_timer;
+extern Ecore_Animator  *_edje_timer;
 extern Evas_List       *_edje_animators;
 extern Edje_Text_Style  _edje_text_styles[EDJE_TEXT_EFFECT_LAST];
 extern Evas_List       *_edje_edjes;
@@ -139,7 +139,6 @@ void          _edje_var_timer_del           (Edje *ed, int id);
 
 int           _edje_var_anim_add            (Edje *ed, double len, char *fname, int val);
 void          _edje_var_anim_del            (Edje *ed, int id);
-void          _edje_var_anim_frametime_reset(void);
     
 void          _edje_message_init            (void);
 void          _edje_message_shutdown        (void);
diff --git a/legacy/edje/src/lib/edje_program.c b/legacy/edje/src/lib/edje_program.c
index caf9ff64ca..ea404741b2 100644
--- a/legacy/edje/src/lib/edje_program.c
+++ b/legacy/edje/src/lib/edje_program.c
@@ -3,11 +3,9 @@
 
 static void _edje_emit_cb(Edje *ed, char *sig, char *src);
 
-static double       _edje_frametime = 1.0 / 60.0;
-
-int          _edje_anim_count = 0;
-Ecore_Timer *_edje_timer = NULL;
-Evas_List   *_edje_animators = NULL;
+int             _edje_anim_count = 0;
+Ecore_Animator *_edje_timer = NULL;
+Evas_List      *_edje_animators = NULL;
 
 /************************** API Routines **************************/
 
@@ -15,31 +13,24 @@ Evas_List   *_edje_animators = NULL;
 /** Set the frametime
  * @param t The frametime
  *
- * Sets the frametime in seconds, by default this is 1/60.
+ * Sets the frametime in seconds, by default this is 1/30.
  */
 void
 edje_frametime_set(double t)
 {
-   if (t == _edje_frametime) return;
-   _edje_frametime = t;
-   if (_edje_timer)
-     {
-	ecore_timer_del(_edje_timer);
-	_edje_timer = ecore_timer_add(_edje_frametime, _edje_timer_cb, NULL);
-     }
-   _edje_var_anim_frametime_reset();
+   ecore_animator_frametime_set(t);
 }
 
 /* FIXDOC: Expand */
 /** Get the frametime
  * @return The frametime
  *
- * Returns the frametime in seconds, by default this is 1/60.
+ * Returns the frametime in seconds, by default this is 1/30.
  */
 double
 edje_frametime_get(void)
 {
-   return _edje_frametime;
+   return ecore_animator_frametime_get();
 }
 
 /* FIXDOC: Expand */
@@ -501,7 +492,7 @@ _edje_program_run(Edje *ed, Edje_Program *pr, int force, char *ssig, char *ssrc)
 	     runp->edje = ed;
 	     runp->program = pr;
 	     if (!_edje_timer)
-	       _edje_timer = ecore_timer_add(_edje_frametime, _edje_timer_cb, NULL);
+	       _edje_timer = ecore_animator_add(_edje_timer_cb, NULL);
 	     _edje_anim_count++;
 	  }
 	else
diff --git a/legacy/edje/src/lib/edje_var.c b/legacy/edje/src/lib/edje_var.c
index 3a5ae8d5ff..df1ef55541 100644
--- a/legacy/edje/src/lib/edje_var.c
+++ b/legacy/edje/src/lib/edje_var.c
@@ -979,7 +979,7 @@ _edje_var_anim_add(Edje *ed, double len, char *fname, int val)
      _edje_anim_list = evas_list_append(_edje_anim_list, ed);
    ed->var_pool->animators = evas_list_prepend(ed->var_pool->animators, ea);
    if (!_edje_anim_timer)
-     _edje_anim_timer = ecore_timer_add(edje_frametime_get(), _edje_var_anim_cb, NULL);
+     _edje_anim_timer = ecore_animator_add(_edje_var_anim_cb, NULL);
    return ea->id;
 }
 
@@ -1019,16 +1019,3 @@ _edje_var_anim_del(Edje *ed, int id)
 	  }
      }
 }
-
-void
-_edje_var_anim_frametime_reset(void)
-{
-   double ft;
-   
-   if (_edje_anim_timer)
-     {
-	ft = edje_frametime_get();
-	ecore_timer_del(_edje_anim_timer);
-	_edje_anim_timer = ecore_timer_add(ft, _edje_var_anim_cb, NULL);
-     }
-}