diff --git a/legacy/edje/src/lib/Edje_Edit.h b/legacy/edje/src/lib/Edje_Edit.h
index be70c514e4..283ca33f21 100644
--- a/legacy/edje/src/lib/Edje_Edit.h
+++ b/legacy/edje/src/lib/Edje_Edit.h
@@ -701,7 +701,8 @@ edje_edit_part_effect_set(
 EAPI const char *          ///@return The name of the selected state including the float value. Use edje_edit_string_free() when you don't need it anymore.
 edje_edit_part_selected_state_get(
    Evas_Object *obj,       ///< The edje object
-   const char *part        ///< The name of the part
+   const char *part,       ///< The name of the part
+   double *value           ///< Returns value of the state here
 );
 
 /**Set the current state in part.*/
@@ -709,7 +710,8 @@ EAPI Eina_Bool         ///@return 1 on success, 0 otherwise.
 edje_edit_part_selected_state_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the state to set (including the float value)
+   const char *state,       ///< The name of the state to set (not including the float value)
+   double value
 );
 
 /**Get mouse_events for part.*/
@@ -904,7 +906,9 @@ edje_edit_state_name_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part that contain state
    const char *state,      ///< The current name of the state
-   const char *new_name    ///< The new name to assign (including the value)
+   double value,
+   const char *new_name,    ///< The new name to assign
+   double new_value
 );
 
 /**Create a new state to the give part
@@ -913,7 +917,8 @@ EAPI void
 edje_edit_state_add(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *name        ///< The name for the new state (not including the state value)
+   const char *name,       ///< The name for the new state (not including the state value)
+   double value            ///< State value
 );
 
 /**Delete the given part state from the edje
@@ -922,7 +927,8 @@ EAPI void
 edje_edit_state_del(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part that contain state
-   const char *state       ///< The current name of the state (including the state value)
+   const char *state,      ///< The current name of the state (not including the state value)
+   double value
 );
 
 /**Check if a part state with the given name exist.
@@ -931,7 +937,8 @@ EAPI Eina_Bool         ///< 1 if the part state exist, 0 otherwise.
 edje_edit_state_exist(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the state to check (including the state value)
+   const char *state,      ///< The name of the state to check (not including the state value)
+   double value
 );
 
 /**Copies the state @p from into @p to. If @p to doesn't exist it will be created.
@@ -940,8 +947,10 @@ EAPI Eina_Bool        ///< 1 if it could be copied, 0 if something went wrong.
 edje_edit_state_copy(
    Evas_Object *obj,      ///< The edje object
    const char *part,      ///< The name of the part
-   const char *from,      ///< State to copy from (including state value)
-   const char *to         ///< State to copy into (not including state value if new)
+   const char *from,      ///< State to copy from (not including state value)
+   double val_from,
+   const char *to,        ///< State to copy into (not including state value)
+   double val_to
 );
 
 /**Get the rel1 relative x value of state*/
@@ -949,28 +958,32 @@ EAPI double                ///@return The 'rel1 relative X' value of the part st
 edje_edit_state_rel1_relative_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the part state (ex. "default 0.00")
+   const char *state,      ///< The name of the part state (ex. "default")
+   double value
 );
 /**Get the rel1 relative y value of state*/
 EAPI double                ///@return The 'rel1 relative Y' value of the part state
 edje_edit_state_rel1_relative_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Get the rel2 relative x value of state*/
 EAPI double                ///@return The 'rel2 relative X' value of the part state
 edje_edit_state_rel2_relative_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Get the rel2 relative y value of state*/
 EAPI double                ///@return The 'rel2 relative Y' value of the part state
 edje_edit_state_rel2_relative_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the rel1 relative x value of state*/
@@ -978,7 +991,8 @@ EAPI void
 edje_edit_state_rel1_relative_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double x                ///< The new 'rel1 relative X' value to set
 );
 /**Set the rel1 relative y value of state*/
@@ -986,7 +1000,8 @@ EAPI void
 edje_edit_state_rel1_relative_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double y                ///< The new 'rel1 relative Y' value to set
 );
 /**Set the rel2 relative x value of state*/
@@ -994,7 +1009,8 @@ EAPI void
 edje_edit_state_rel2_relative_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double x                ///< The new 'rel2 relative X' value to set
 );
 /**Set the rel2 relative y value of state*/
@@ -1002,7 +1018,8 @@ EAPI void
 edje_edit_state_rel2_relative_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double y                ///< The new 'rel2 relative Y' value to set
 );
 
@@ -1011,28 +1028,32 @@ EAPI int                   /// @return The 'rel1 offset X' value of the part sta
 edje_edit_state_rel1_offset_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Get the rel1 offset y value of state*/
 EAPI int                   /// @return The 'rel1 offset Y' value of the part state
 edje_edit_state_rel1_offset_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Get the rel2 offset x value of state*/
 EAPI int                   /// @return The 'rel2 offset X' value of the part state
 edje_edit_state_rel2_offset_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Get the rel2 offset y value of state*/
 EAPI int                   /// @return The 'rel2 offset Y' value of the part state
 edje_edit_state_rel2_offset_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the rel1 offset x value of state*/
@@ -1040,7 +1061,8 @@ EAPI void
 edje_edit_state_rel1_offset_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double x                ///< The new 'rel1 offset X' value to set
 );
 /**Get the rel1 offset y value of state*/
@@ -1048,7 +1070,8 @@ EAPI void
 edje_edit_state_rel1_offset_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double y                ///< The new 'rel1 offset Y' value to set
 );
 /**Get the rel2 offset x value of state*/
@@ -1056,7 +1079,8 @@ EAPI void
 edje_edit_state_rel2_offset_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double x                ///< The new 'rel2 offset X' value to set
 );
 /**Get the rel2 offset y value of state*/
@@ -1064,7 +1088,8 @@ EAPI void
 edje_edit_state_rel2_offset_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double y                ///< The new 'rel2 offset Y' value to set
 );
 
@@ -1073,28 +1098,32 @@ EAPI const char *          ///@return The name of the part to apply the relativi
 edje_edit_state_rel1_to_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Get the part name rel1y is relative to. The function return NULL if the part is relative to the whole interface.*/
 EAPI const char *          ///@return The name of the part to apply the relativity
 edje_edit_state_rel1_to_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Get the part name rel2x is relative to. The function return NULL if the part is relative to the whole interface.*/
 EAPI const char *         ///@return The name of the part to apply the relativity
 edje_edit_state_rel2_to_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Get the part name rel2y is relative to. The function return NULL if the part is relative to the whole interface.*/
 EAPI const char *         ///@return The name of the part to apply the relativity
 edje_edit_state_rel2_to_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the part rel1x is relative to. Set rel_to to NULL make the part relative to the whole interface.*/
@@ -1102,7 +1131,8 @@ EAPI void
 edje_edit_state_rel1_to_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *rel_to      ///< The name of the part that is used as container/parent
 );
 /**Set the part rel1y is relative to. Set rel_to to NULL make the part relative to the whole interface.*/
@@ -1110,7 +1140,8 @@ EAPI void
 edje_edit_state_rel1_to_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *rel_to      ///< The name of the part that is used as container/parent
 );
 /**Set the part rel2x is relative to. Set rel_to to NULL make the part relative to the whole interface.*/
@@ -1118,7 +1149,8 @@ EAPI void
 edje_edit_state_rel2_to_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *rel_to      ///< The name of the part that is used as container/parent
 );
 /**Set the part rel2y is relative to. Set rel_to to NULL make the part relative to the whole interface.*/
@@ -1126,7 +1158,8 @@ EAPI void
 edje_edit_state_rel2_to_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *rel_to      ///< The name of the part that is used as container/parent
 );
 
@@ -1135,7 +1168,8 @@ EAPI void
 edje_edit_state_color_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int *r,                 ///< A pointer to store the red value
    int *g,                 ///< A pointer to store the green value
    int *b,                 ///< A pointer to store the blue value
@@ -1146,7 +1180,8 @@ EAPI void
 edje_edit_state_color2_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int *r,                 ///< A pointer to store the red value
    int *g,                 ///< A pointer to store the green value
    int *b,                 ///< A pointer to store the blue value
@@ -1157,7 +1192,8 @@ EAPI void
 edje_edit_state_color3_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int *r,                 ///< A pointer to store the red value
    int *g,                 ///< A pointer to store the green value
    int *b,                 ///< A pointer to store the blue value
@@ -1169,7 +1205,8 @@ EAPI void
 edje_edit_state_color_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int r,                  ///< The red value of the color
    int g,                  ///< The green value of the color
    int b,                  ///< The blue value of the color
@@ -1180,7 +1217,8 @@ EAPI void
 edje_edit_state_color2_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int r,                  ///< The red value of the color
    int g,                  ///< The green value of the color
    int b,                  ///< The blue value of the color
@@ -1191,7 +1229,8 @@ EAPI void
 edje_edit_state_color3_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int r,                  ///< The red value of the color
    int g,                  ///< The green value of the color
    int b,                  ///< The blue value of the color
@@ -1203,21 +1242,24 @@ EAPI double                ///@return The horizontal align value for the given s
 edje_edit_state_align_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Get the align_y value of a part state.*/
 EAPI double                ///@return The vertical align value for the given state
 edje_edit_state_align_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Set the align_x value of a part state.*/
 EAPI void
 edje_edit_state_align_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double align            ///< The new horizontal align to set
 );
 /**Set the align_y value of a part state.*/
@@ -1225,7 +1267,8 @@ EAPI void
 edje_edit_state_align_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double align            ///< The new vertical align to set
 );
 /**Get the min_w value of a part state.*/
@@ -1233,14 +1276,16 @@ EAPI int                   ///@return The minimum width of a part state
 edje_edit_state_min_w_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Set the min_w value of a part state.*/
 EAPI void
 edje_edit_state_min_w_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int min_w               ///< The new minimum width to set for the part state
 );
 /**Get the min_h value of a part state.*/
@@ -1248,14 +1293,16 @@ EAPI int                   ///@return The minimum height of a part state
 edje_edit_state_min_h_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Set the min_h value of a part state.*/
 EAPI void
 edje_edit_state_min_h_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int min_h               ///< The new minimum height to set for the part state
 );
 
@@ -1264,14 +1311,16 @@ EAPI int                   ///@return The maximum width of a part state
 edje_edit_state_max_w_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Set the max_w value of a part state.*/
 EAPI void
 edje_edit_state_max_w_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int max_w               ///< The new maximum width to set for the part state
 );
 /**Get the max_h value of a part state.*/
@@ -1279,14 +1328,16 @@ EAPI int                   ///@return The maximum height of a part state
 edje_edit_state_max_h_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Set the max_h value of a part state.*/
 EAPI void
 edje_edit_state_max_h_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int max_h               ///< The new maximum height to set for the part state
 );
 
@@ -1295,21 +1346,24 @@ EAPI double                ///@return The aspect minimum value of a part state
 edje_edit_state_aspect_min_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Get the maximum aspect value of a part state.*/
 EAPI double                ///@return The aspect maximum value of a part state
 edje_edit_state_aspect_max_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Set the minimum aspect value of a part state.*/
 EAPI void
 edje_edit_state_aspect_min_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double aspect           ///< The new minimum aspect value to set
 );
 /**Set the maximum aspect value of a part state.*/
@@ -1317,7 +1371,8 @@ EAPI void
 edje_edit_state_aspect_max_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double aspect           ///< The new maximum aspect value to set
 );
 /**Get the aspect preference value of a part state.*/
@@ -1325,14 +1380,16 @@ EAPI unsigned char         ///@return The aspect preference (0=none, 1=vertical,
 edje_edit_state_aspect_pref_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 /**Set the aspect preference value of a part state.*/
 EAPI void
 edje_edit_state_aspect_pref_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    unsigned char pref      ///< The new aspect preference to set (0=none, 1=vertical, 2=horizontal, 3=both)
 );
 
@@ -1341,7 +1398,8 @@ EAPI double                ///@return The fill offset x relative to area
 edje_edit_state_fill_origin_relative_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Get the fill origin relative y value of a part state.*/
@@ -1349,7 +1407,8 @@ EAPI double                ///@return The fill origin y relative to area
 edje_edit_state_fill_origin_relative_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Get the fill origin offset x value of a part state.*/
@@ -1357,7 +1416,8 @@ EAPI int                   ///@return The fill origin offset x relative to area
 edje_edit_state_fill_origin_offset_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Get the fill origin offset y value of a part state.*/
@@ -1365,7 +1425,8 @@ EAPI int                   ///@return The fill origin offset y relative to area
 edje_edit_state_fill_origin_offset_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the fill origin relative x value of a part state.*/
@@ -1373,7 +1434,8 @@ EAPI void
 edje_edit_state_fill_origin_relative_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double x                ///< The new value to set
 );
 
@@ -1382,7 +1444,8 @@ EAPI void
 edje_edit_state_fill_origin_relative_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double x                ///< The new value to set
 );
 
@@ -1391,7 +1454,8 @@ EAPI void
 edje_edit_state_fill_origin_offset_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double x                ///< The new value to set
 );
 
@@ -1400,7 +1464,8 @@ EAPI void
 edje_edit_state_fill_origin_offset_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double y                ///< The new value to set
 );
 
@@ -1409,7 +1474,8 @@ EAPI double                ///@return The fill size offset x relative to area
 edje_edit_state_fill_size_relative_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Get the fill size relative y value of a part state.*/
@@ -1417,7 +1483,8 @@ EAPI double                ///@return The fill size y relative to area
 edje_edit_state_fill_size_relative_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Get the fill size offset x value of a part state.*/
@@ -1425,7 +1492,8 @@ EAPI int                    ///@return The fill size offset x relative to area
 edje_edit_state_fill_size_offset_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Get the fill size offset y value of a part state.*/
@@ -1433,7 +1501,8 @@ EAPI int                    ///@return The fill size offset y relative to area
 edje_edit_state_fill_size_offset_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the fill size relative x value of a part state.*/
@@ -1441,7 +1510,8 @@ EAPI void
 edje_edit_state_fill_size_relative_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double x                ///< The new value to set
 );
 
@@ -1450,7 +1520,8 @@ EAPI void
 edje_edit_state_fill_size_relative_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double x                ///< The new value to set
 );
 
@@ -1459,7 +1530,8 @@ EAPI void
 edje_edit_state_fill_size_offset_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double x                ///< The new value to set
 );
 
@@ -1468,7 +1540,8 @@ EAPI void
 edje_edit_state_fill_size_offset_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double y                ///< The new value to set
 );
 
@@ -1477,7 +1550,8 @@ EAPI Eina_Bool         ///@return EINA_TRUE if the state is visible
 edje_edit_state_visible_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the visibility of a part state.*/
@@ -1485,7 +1559,8 @@ EAPI void
 edje_edit_state_visible_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    Eina_Bool visible   ///< EINA_TRUE to set the state visible
 );
 
@@ -1494,7 +1569,8 @@ EAPI const char*           ///@return The current color_class of the part state
 edje_edit_state_color_class_get(
    Evas_Object *obj,      ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the color class for the given part state.*/
@@ -1502,7 +1578,8 @@ EAPI void
 edje_edit_state_color_class_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *color_class ///< The new color_class to assign
 );
 
@@ -1511,7 +1588,8 @@ EAPI const Eina_List *
 edje_edit_state_external_params_list_get( ///@return The list of Edje_External_Param
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Get the type and value of the paramater given*/
@@ -1519,10 +1597,11 @@ EAPI Eina_Bool
 edje_edit_state_external_param_get( ///@return True if the parameter was found, False otherwise
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *param,      ///< The name of the parameter to look for
    Edje_External_Param_Type *type, ///< Type will be stored here
-   void **value            ///< Pointer to value will be stored here. DO NOT FREE IT
+   void **val            ///< Pointer to value will be stored here. DO NOT FREE IT
 );
 
 /**Get external parameter of type INT*/
@@ -1530,9 +1609,10 @@ EAPI Eina_Bool
 edje_edit_state_external_param_int_get( ///@return True if succesful, False if not found or is of different type
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *param,      ///< The name of the parameter
-   int *value
+   int *val
 );
 
 /**Get external parameter of type BOOL*/
@@ -1541,8 +1621,9 @@ edje_edit_state_external_param_bool_get( ///@return True if succesful, False if
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
    const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   double value,
    const char *param,      ///< The name of the parameter
-   Eina_Bool *value
+   Eina_Bool *val
 );
 
 /**Get external parameter of type DOUBLE*/
@@ -1550,9 +1631,10 @@ EAPI Eina_Bool
 edje_edit_state_external_param_double_get( ///@return True if succesful, False if not found or is of different type
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *param,      ///< The name of the parameter
-   double *value
+   double *val
 );
 
 /**Get external parameter of type STRING*/
@@ -1560,9 +1642,10 @@ EAPI Eina_Bool
 edje_edit_state_external_param_string_get( ///@return True if succesful, False if not found or is of different type
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *param,      ///< The name of the parameter
-   const char **value
+   const char **val
 );
 
 /**Get external parameter of type CHOICE*/
@@ -1571,8 +1654,9 @@ edje_edit_state_external_param_choice_get( ///@return True if succesful, False i
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
    const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   double value,
    const char *param,      ///< The name of the parameter
-   const char **value
+   const char **val
 );
 
 /**Set the external parameter type and value, adding it if it didn't exist before*/
@@ -1580,7 +1664,8 @@ EAPI Eina_Bool
 edje_edit_state_external_param_set( ///@return True if it was set
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *param,      ///< The name of the parameter to set
    Edje_External_Param_Type type, ///< The type of the parameter
    ...                     ///< Value(s) according to type
@@ -1591,9 +1676,10 @@ EAPI Eina_Bool
 edje_edit_state_external_param_int_set( ///@return True if it was set
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *param,      ///< The name of the parameter
-   int value
+   int val
 );
 
 /**Set external parameter of type BOOL*/
@@ -1602,8 +1688,9 @@ edje_edit_state_external_param_bool_set( ///@return True if it was set
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
    const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   double value,
    const char *param,      ///< The name of the parameter
-   Eina_Bool value
+   Eina_Bool val
 );
 
 /**Set external parameter of type DOUBLE*/
@@ -1611,9 +1698,10 @@ EAPI Eina_Bool
 edje_edit_state_external_param_double_set( ///@return True if it was set
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *param,      ///< The name of the parameter
-   double value
+   double val
 );
 
 /**Set external parameter of type STRING*/
@@ -1621,9 +1709,10 @@ EAPI Eina_Bool
 edje_edit_state_external_param_string_set( ///@return True if it was set
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *param,      ///< The name of the parameter
-   const char *value
+   const char *val
 );
 
 /**Set external parameter of type CHOICE*/
@@ -1632,8 +1721,9 @@ edje_edit_state_external_param_choice_set( ///@return True if it was set
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
    const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   double value,
    const char *param,      ///< The name of the parameter
-   const char *value
+   const char *val
 );
 
 
@@ -1650,7 +1740,8 @@ EAPI const char *          ///@return A newly allocated string containing the te
 edje_edit_state_text_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,       ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the text of a part state.*/
@@ -1658,7 +1749,8 @@ EAPI void
 edje_edit_state_text_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *text        ///< The new text to assign
 );
 
@@ -1667,7 +1759,8 @@ EAPI int                   ///@return The font size in pixel or -1 on errors.
 edje_edit_state_text_size_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the text size of a part state.*/
@@ -1675,7 +1768,8 @@ EAPI void
 edje_edit_state_text_size_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int size                ///< The new font size to set (in pixel)
 );
 
@@ -1684,7 +1778,8 @@ EAPI double                ///@return The text align X value
 edje_edit_state_text_align_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Get the text vertical align of a part state. The value range is from 0.0(top) to 1.0(bottom)*/
@@ -1692,7 +1787,8 @@ EAPI double                ///@return The text align Y value
 edje_edit_state_text_align_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the text horizontal align of a part state. The value range is from 0.0(right) to 1.0(left)*/
@@ -1700,7 +1796,8 @@ EAPI void
 edje_edit_state_text_align_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double align            ///< The new text align X value
 );
 
@@ -1709,7 +1806,8 @@ EAPI void
 edje_edit_state_text_align_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double align            ///< The new text align Y value
 );
 
@@ -1718,7 +1816,8 @@ EAPI double                ///@return The text elipsis value
 edje_edit_state_text_elipsis_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the text vertical align of a part state. The value range is from 0.0(right) to 1.0(left)*/
@@ -1726,7 +1825,8 @@ EAPI void
 edje_edit_state_text_elipsis_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double balance          ///< The position where to cut the string
 );
 
@@ -1735,7 +1835,8 @@ EAPI Eina_Bool         ///@return 1 If the part fit it's container horizontally
 edje_edit_state_text_fit_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set if the text part should fit it's container horizontally */
@@ -1743,7 +1844,8 @@ EAPI void
 edje_edit_state_text_fit_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    Eina_Bool fit       ///< 1 to make the text fit it's container
 );
 
@@ -1752,7 +1854,8 @@ EAPI Eina_Bool         ///@return 1 If the part fit it's container vertically
 edje_edit_state_text_fit_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set if the text part should fit it's container vertically */
@@ -1760,7 +1863,8 @@ EAPI void
 edje_edit_state_text_fit_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    Eina_Bool fit       ///< 1 to make the text fit it's container
 );
 
@@ -1787,7 +1891,8 @@ EAPI const char *          ///@return The name of the font used in the given par
 edje_edit_state_font_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set font name for a given part state. */
@@ -1795,7 +1900,8 @@ EAPI void
 edje_edit_state_font_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *font        ///< The name of the font to use in the given part state
 );
 
@@ -1852,7 +1958,8 @@ EAPI const char *          ///@return The name of the image used by state
 edje_edit_state_image_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set normal image for a given part state.*/
@@ -1860,7 +1967,8 @@ EAPI void
 edje_edit_state_image_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *image       ///< The name of the image for the given state (must be an image contained in the edje file)
 );
 
@@ -1890,7 +1998,8 @@ EAPI void
 edje_edit_state_image_border_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int *l,                 ///< A pointer to store the left value
    int *r,                 ///< A pointer to store the right value
    int *t,                 ///< A pointer to store the top value
@@ -1902,7 +2011,8 @@ EAPI void
 edje_edit_state_image_border_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int l,                  ///< The new left border (or -1)
    int r,                  ///< The new right border (or -1)
    int t,                  ///< The new top border (or -1)
@@ -1914,7 +2024,8 @@ EAPI unsigned char         ///@return 1 if the center of the bordered image is d
 edje_edit_state_image_border_fill_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set if the image center should be draw. 1 means to draw the center, 0 to don't draw it.*/
@@ -1922,7 +2033,8 @@ EAPI void
 edje_edit_state_image_border_fill_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    unsigned char fill      ///< If set to 0 the image center isn't draw
 );
 
@@ -1933,7 +2045,8 @@ EAPI Eina_List *           ///@return A string list containing all the image nam
 edje_edit_state_tweens_list_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Add a new tween frame to the given part state
@@ -1943,7 +2056,8 @@ EAPI Eina_Bool         ///@return 1 on success, 0 otherwise
 edje_edit_state_tween_add(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *tween       ///< The name of the image to add.
 );
 
@@ -1955,7 +2069,8 @@ EAPI Eina_Bool         ///@return 1 on success, 0 otherwise
 edje_edit_state_tween_del(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *tween       ///< The name of the image to remove from the tween list.
 );
 
@@ -2052,7 +2167,8 @@ EAPI const char *          ///@return The type of gradient used in state
 edje_edit_state_gradient_type_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the type of gradient.
@@ -2062,7 +2178,8 @@ EAPI Eina_Bool         ///@return 1 on success, 0 otherwise
 edje_edit_state_gradient_type_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char *type        ///< The type of gradient to use
 );
 
@@ -2071,7 +2188,8 @@ EAPI Eina_Bool         ///@return 1 if use fill, 0 if use gradient_rel
 edje_edit_state_gradient_use_fill_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Get the spectra used by part state. Remember to free the string with edje_edit_string_free()*/
@@ -2079,7 +2197,8 @@ EAPI const char *          ///@return The spectra name used in state
 edje_edit_state_gradient_spectra_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the spectra used by part state.*/
@@ -2087,7 +2206,8 @@ EAPI Eina_Bool         ///@return 1 on success, 0 otherwise
 edje_edit_state_gradient_spectra_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    const char* spectra     ///< The spectra name to assign
 );
 
@@ -2096,7 +2216,8 @@ EAPI int                   ///@return The angle of the gradient
 edje_edit_state_gradient_angle_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the angle of the gradient.*/
@@ -2104,7 +2225,8 @@ EAPI void
 edje_edit_state_gradient_angle_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int angle               ///< The angle to set
 );
 
@@ -2113,7 +2235,8 @@ EAPI double                ///@return The gradien rel1 relative x value
 edje_edit_state_gradient_rel1_relative_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Get the gradien rel1 relative y value */
@@ -2121,7 +2244,8 @@ EAPI double                ///@return The gradien rel1 relative y value
 edje_edit_state_gradient_rel1_relative_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Get the gradien rel2 relative x value */
@@ -2129,7 +2253,8 @@ EAPI double                ///@return The gradien rel2 relative x value
 edje_edit_state_gradient_rel2_relative_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Get the gradien rel2 relative y value */
@@ -2137,7 +2262,8 @@ EAPI double                ///@return The gradien rel2 relative y value
 edje_edit_state_gradient_rel2_relative_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the gradien rel1 relative x value */
@@ -2145,7 +2271,8 @@ EAPI Eina_Bool         ///@return 1 on success, 0 otherwise
 edje_edit_state_gradient_rel1_relative_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double val
 );
 
@@ -2154,7 +2281,8 @@ EAPI Eina_Bool         ///@return 1 on success, 0 otherwise
 edje_edit_state_gradient_rel1_relative_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double val
 );
 
@@ -2163,7 +2291,8 @@ EAPI Eina_Bool         ///@return 1 on success, 0 otherwise
 edje_edit_state_gradient_rel2_relative_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double val
 );
 
@@ -2172,7 +2301,8 @@ EAPI Eina_Bool         ///@return 1 on success, 0 otherwise
 edje_edit_state_gradient_rel2_relative_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    double val
 );
 
@@ -2181,7 +2311,8 @@ EAPI int                   ///@return The gradient rel1 offset x value
 edje_edit_state_gradient_rel1_offset_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Get the gradien rel1 offset y value */
@@ -2189,7 +2320,8 @@ EAPI int                   ///@return The gradient rel1 offset y value
 edje_edit_state_gradient_rel1_offset_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Get the gradien rel2 offset x value */
@@ -2197,7 +2329,8 @@ EAPI int                   ///@return The gradient rel2 offset x value
 edje_edit_state_gradient_rel2_offset_x_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Get the gradien rel2 offset y value */
@@ -2205,7 +2338,8 @@ EAPI int                   ///@return The gradient rel2 offset y value
 edje_edit_state_gradient_rel2_offset_y_get(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state       ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value
 );
 
 /**Set the gradien rel1 offset x value */
@@ -2213,7 +2347,8 @@ EAPI Eina_Bool         ///@return 1 on success, 0 otherwise
 edje_edit_state_gradient_rel1_offset_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int val
 );
 
@@ -2222,7 +2357,8 @@ EAPI Eina_Bool         ///@return 1 on success, 0 otherwise
 edje_edit_state_gradient_rel1_offset_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int val
 );
 
@@ -2231,7 +2367,8 @@ EAPI Eina_Bool         ///@return 1 on success, 0 otherwise
 edje_edit_state_gradient_rel2_offset_x_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int val
 );
 
@@ -2240,7 +2377,8 @@ EAPI Eina_Bool         ///@return 1 on success, 0 otherwise
 edje_edit_state_gradient_rel2_offset_y_set(
    Evas_Object *obj,       ///< The edje object
    const char *part,       ///< The name of the part
-   const char *state,      ///< The name of the 'part state' (ex. "default 0.00")
+   const char *state,      ///< The name of the 'part state' (ex. "default")
+   double value,
    int val
 );
 
diff --git a/legacy/edje/src/lib/edje_edit.c b/legacy/edje/src/lib/edje_edit.c
index f7930e6ab9..edee6c6bd0 100644
--- a/legacy/edje/src/lib/edje_edit.c
+++ b/legacy/edje/src/lib/edje_edit.c
@@ -56,7 +56,7 @@
    Edje_Part_Description *pd; \
    ed = _edje_fetch(obj); \
    if (!ed) return RET; \
-   pd = _edje_part_description_find_byname(ed, part, state); \
+   pd = _edje_part_description_find_byname(ed, part, state, value); \
    if (!pd) return RET;
 
 /* Get epr(Edje_Program*) from obj(Evas_Object*) and prog(char*)*/
@@ -82,41 +82,25 @@ _alloc(size_t size)
 /*************/
 
 
+
+
+
+
+
+
 static Edje_Part_Description *
-_edje_part_description_find_byname(Edje *ed, const char *part, const char *state) //state include the value in the string (ex. "default 0.00")
+_edje_part_description_find_byname(Edje *ed, const char *part, const char *state, double value)
 {
    Edje_Real_Part *rp;
    Edje_Part_Description *pd;
-   char *delim;
-   double value;
-   char *name;
 
    if (!ed || !part || !state) return NULL;
 
    rp = _edje_real_part_get(ed, part);
    if (!rp) return NULL;
 
-   name = strdup(state);
-   delim = strrchr(name, (int)' ');
-   if (!delim)
-     {
-	free(name);
-	return NULL;
-     }
+   pd = _edje_part_description_find(ed, rp, state, value);
 
-   if (sscanf(delim, "%lf", &value) != 1)
-     {
-	free(name);
-	return NULL;
-     }
-
-   delim[0] = '\0';
-   //printf("SEARCH DESC(%s): %s %f\n", state, state, value);
-   pd = _edje_part_description_find(ed, rp, name, value);
-
-   free(name);
-
-   if (!pd) return NULL;
    return pd;
 }
 
@@ -1829,7 +1813,7 @@ _edje_edit_real_part_add(Evas_Object *obj, const char *name, Edje_Part_Type type
    ed->table_parts[ep->id % ed->table_parts_size] = rp;
 
    /* Create default description */
-   edje_edit_state_add(obj, name, "default");
+   edje_edit_state_add(obj, name, "default", 0.0);
 
    rp->param1.description = ep->default_desc;
    rp->chosen_description = rp->param1.description;
@@ -2051,30 +2035,28 @@ edje_edit_part_type_get(Evas_Object *obj, const char *part)
 }
 
 EAPI const char *
-edje_edit_part_selected_state_get(Evas_Object *obj, const char *part)
+edje_edit_part_selected_state_get(Evas_Object *obj, const char *part, double *value)
 {
-   char name[PATH_MAX];
-
    GET_RP_OR_RETURN(NULL);
 
    if (!rp->chosen_description)
-     return eina_stringshare_add("default 0.00");
+     {
+	if (value) *value = 0.0; // FIXME: Make sure edje_edit supports correctly the default having any value
+	return eina_stringshare_add("default");
+     }
 
-   snprintf(name, PATH_MAX, "%s %.2f",
-            rp->chosen_description->state.name,
-            rp->chosen_description->state.value);
-
-   return eina_stringshare_add(name);
+   if (value) *value = rp->chosen_description->state.value;
+   return eina_stringshare_add(rp->chosen_description->state.name);
 }
 
 EAPI Eina_Bool
-edje_edit_part_selected_state_set(Evas_Object *obj, const char *part, const char *state)
+edje_edit_part_selected_state_set(Evas_Object *obj, const char *part, const char *state, double value)
 {
    Edje_Part_Description *pd;
 
    GET_RP_OR_RETURN(0);
 
-   pd = _edje_part_description_find_byname(ed, part, state);
+   pd = _edje_part_description_find_byname(ed, part, state, value);
    if (!pd) return 0;
 
    //printf("EDJE: Set state: %s\n", pd->state.name);
@@ -2488,10 +2470,8 @@ edje_edit_part_states_list_get(Evas_Object *obj, const char *part)
 }
 
 EAPI int
-edje_edit_state_name_set(Evas_Object *obj, const char *part, const char *state, const char *new_name)//state and new_name include the value in the string (ex. "default 0.00")
+edje_edit_state_name_set(Evas_Object *obj, const char *part, const char *state, double value, const char *new_name, double new_value)
 {
-   char *delim;
-   double value;
    int part_id;
    int i;
 
@@ -2501,12 +2481,6 @@ edje_edit_state_name_set(Evas_Object *obj, const char *part, const char *state,
 
    if (!new_name) return 0;
 
-   /* split name from value */
-   delim = strrchr(new_name, (int)' ');
-   if (!delim) return 0;
-   if (sscanf(delim, "%lf", &value) != 1) return 0;
-   delim[0] = '\0';
-
    /* update programs */
    /* update the 'state' field in all programs. update only if program has
       a single target */
@@ -2534,16 +2508,13 @@ edje_edit_state_name_set(Evas_Object *obj, const char *part, const char *state,
    _edje_if_string_free(ed, pd->state.name);
    pd->state.name = (char *)eina_stringshare_add(new_name);
    /* set value */
-   pd->state.value = value;
-
-   delim[0] = ' ';
-   //printf("## SET OK %s %.2f\n", pd->state.name, pd->state.value);
+   pd->state.value = new_value;
 
    return 1;
 }
 
 EAPI void
-edje_edit_state_del(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_del(Evas_Object *obj, const char *part, const char *state, double value)
 {
    Edje_Part_Description *pd;
 
@@ -2551,7 +2522,7 @@ edje_edit_state_del(Evas_Object *obj, const char *part, const char *state)
 
    //printf("REMOVE STATE: %s IN PART: %s\n", state, part);
 
-   pd = _edje_part_description_find_byname(ed, part, state);
+   pd = _edje_part_description_find_byname(ed, part, state, value);
    if (!pd) return;
 
    rp->part->other_desc = eina_list_remove(rp->part->other_desc, pd);
@@ -2560,7 +2531,7 @@ edje_edit_state_del(Evas_Object *obj, const char *part, const char *state)
 }
 
 EAPI void
-edje_edit_state_add(Evas_Object *obj, const char *part, const char *name)
+edje_edit_state_add(Evas_Object *obj, const char *part, const char *name, double value)
 {
    Edje_Part_Description *pd;
 
@@ -2577,7 +2548,7 @@ edje_edit_state_add(Evas_Object *obj, const char *part, const char *name)
      rp->part->other_desc = eina_list_append(rp->part->other_desc, pd);
 
    pd->state.name = eina_stringshare_add(name);
-   pd->state.value = 0.0;
+   pd->state.value = value;
    pd->visible = 1;
    pd->align.x = 0.5;
    pd->align.y = 0.5;
@@ -2682,14 +2653,14 @@ edje_edit_state_add(Evas_Object *obj, const char *part, const char *name)
 }
 
 EAPI Eina_Bool
-edje_edit_state_exist(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_exist(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    return 1;
 }
 
 EAPI Eina_Bool
-edje_edit_state_copy(Evas_Object *obj, const char *part, const char *from, const char *to)
+edje_edit_state_copy(Evas_Object *obj, const char *part, const char *from, double val_from, const char *to, double val_to)
 {
    Edje_Part_Description *pdfrom, *pdto;
    Edje_Part_Image_Id *i;
@@ -2697,11 +2668,11 @@ edje_edit_state_copy(Evas_Object *obj, const char *part, const char *from, const
    Eina_List *l;
    GET_RP_OR_RETURN(0);
 
-   pdfrom = _edje_part_description_find_byname(ed, part, from);
+   pdfrom = _edje_part_description_find_byname(ed, part, from, val_from);
    if (!pdfrom)
      return 0;
 
-   pdto = _edje_part_description_find_byname(ed, part, to);
+   pdto = _edje_part_description_find_byname(ed, part, to, val_to);
    if (!pdto)
      {
 	pdto = _alloc(sizeof(Edje_Part_Description));
@@ -2710,7 +2681,7 @@ edje_edit_state_copy(Evas_Object *obj, const char *part, const char *from, const
 	/* No need to check for default desc, at this point it must exist */
 	rp->part->other_desc = eina_list_append(rp->part->other_desc, pdto);
 	pdto->state.name = eina_stringshare_add(to);
-	pdto->state.value = 0.0;
+	pdto->state.value = val_to;
      }
 
 #define PD_COPY(_x) pdto->_x = pdfrom->_x
@@ -2862,7 +2833,7 @@ edje_edit_state_copy(Evas_Object *obj, const char *part, const char *from, const
 
 //relative
 EAPI double
-edje_edit_state_rel1_relative_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_rel1_relative_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("Get rel1 rel of part: %s state: %s [%f]\n", part, state, pd->rel1.relative_x);
@@ -2870,7 +2841,7 @@ edje_edit_state_rel1_relative_x_get(Evas_Object *obj, const char *part, const ch
 }
 
 EAPI double
-edje_edit_state_rel1_relative_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_rel1_relative_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("Get rel1 rel of part: %s state: %s\n", part, state);
@@ -2878,7 +2849,7 @@ edje_edit_state_rel1_relative_y_get(Evas_Object *obj, const char *part, const ch
 }
 
 EAPI double
-edje_edit_state_rel2_relative_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_rel2_relative_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("Get rel2 rel of part: %s state: %s\n", part, state);
@@ -2886,7 +2857,7 @@ edje_edit_state_rel2_relative_x_get(Evas_Object *obj, const char *part, const ch
 }
 
 EAPI double
-edje_edit_state_rel2_relative_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_rel2_relative_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("Get rel2 rel of part: %s state: %s\n", part, state);
@@ -2894,7 +2865,7 @@ edje_edit_state_rel2_relative_y_get(Evas_Object *obj, const char *part, const ch
 }
 
 EAPI void
-edje_edit_state_rel1_relative_x_set(Evas_Object *obj, const char *part, const char *state, double x)
+edje_edit_state_rel1_relative_x_set(Evas_Object *obj, const char *part, const char *state, double value, double x)
 {
    GET_PD_OR_RETURN();
    //printf("Set rel1x of part: %s state: %s to: %f\n", part, state, x);
@@ -2904,7 +2875,7 @@ edje_edit_state_rel1_relative_x_set(Evas_Object *obj, const char *part, const ch
 }
 
 EAPI void
-edje_edit_state_rel1_relative_y_set(Evas_Object *obj, const char *part, const char *state, double y)
+edje_edit_state_rel1_relative_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y)
 {
    GET_PD_OR_RETURN();
    //printf("Set rel1y of part: %s state: %s to: %f\n", part, state, y);
@@ -2914,7 +2885,7 @@ edje_edit_state_rel1_relative_y_set(Evas_Object *obj, const char *part, const ch
 }
 
 EAPI void
-edje_edit_state_rel2_relative_x_set(Evas_Object *obj, const char *part, const char *state, double x)
+edje_edit_state_rel2_relative_x_set(Evas_Object *obj, const char *part, const char *state, double value, double x)
 {
    GET_PD_OR_RETURN();
    //printf("Set rel2x of part: %s state: %s to: %f\n", part, state, x);
@@ -2924,11 +2895,11 @@ edje_edit_state_rel2_relative_x_set(Evas_Object *obj, const char *part, const ch
 }
 
 EAPI void
-edje_edit_state_rel2_relative_y_set(Evas_Object *obj, const char *part, const char *state, double y)
+edje_edit_state_rel2_relative_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y)
 {
    GET_PD_OR_RETURN();
    //printf("Set rel2y of part: %s state: %s to: %f\n", part, state, y);
-   pd = _edje_part_description_find_byname(ed, part, state);
+   pd = _edje_part_description_find_byname(ed, part, state, value);
    //TODO check boudaries
    pd->rel2.relative_y = FROM_DOUBLE(y);
    edje_object_calc_force(obj);
@@ -2936,7 +2907,7 @@ edje_edit_state_rel2_relative_y_set(Evas_Object *obj, const char *part, const ch
 
 //offset
 EAPI int
-edje_edit_state_rel1_offset_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_rel1_offset_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("Get rel1 offset of part: %s state: %s\n", part, state);
@@ -2944,7 +2915,7 @@ edje_edit_state_rel1_offset_x_get(Evas_Object *obj, const char *part, const char
 }
 
 EAPI int
-edje_edit_state_rel1_offset_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_rel1_offset_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("Get rel1 offset of part: %s state: %s\n", part, state);
@@ -2952,7 +2923,7 @@ edje_edit_state_rel1_offset_y_get(Evas_Object *obj, const char *part, const char
 }
 
 EAPI int
-edje_edit_state_rel2_offset_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_rel2_offset_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("Get rel2 offset of part: %s state: %s\n", part, state);
@@ -2960,7 +2931,7 @@ edje_edit_state_rel2_offset_x_get(Evas_Object *obj, const char *part, const char
 }
 
 EAPI int
-edje_edit_state_rel2_offset_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_rel2_offset_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("Get rel2 offset of part: %s state: %s\n", part, state);
@@ -2968,7 +2939,7 @@ edje_edit_state_rel2_offset_y_get(Evas_Object *obj, const char *part, const char
 }
 
 EAPI void
-edje_edit_state_rel1_offset_x_set(Evas_Object *obj, const char *part, const char *state, double x)
+edje_edit_state_rel1_offset_x_set(Evas_Object *obj, const char *part, const char *state, double value, double x)
 {
    GET_PD_OR_RETURN();
    //printf("Set rel1x offset of part: %s state: %s to: %f\n", part, state, x);
@@ -2978,7 +2949,7 @@ edje_edit_state_rel1_offset_x_set(Evas_Object *obj, const char *part, const char
 }
 
 EAPI void
-edje_edit_state_rel1_offset_y_set(Evas_Object *obj, const char *part, const char *state, double y)
+edje_edit_state_rel1_offset_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y)
 {
    GET_PD_OR_RETURN();
    //printf("Set rel1y offset of part: %s state: %s to: %f\n", part, state, y);
@@ -2988,7 +2959,7 @@ edje_edit_state_rel1_offset_y_set(Evas_Object *obj, const char *part, const char
 }
 
 EAPI void
-edje_edit_state_rel2_offset_x_set(Evas_Object *obj, const char *part, const char *state, double x)
+edje_edit_state_rel2_offset_x_set(Evas_Object *obj, const char *part, const char *state, double value, double x)
 {
    GET_PD_OR_RETURN();
    //printf("Set rel2x offset of part: %s state: %s to: %f\n", part, state, x);
@@ -2998,7 +2969,7 @@ edje_edit_state_rel2_offset_x_set(Evas_Object *obj, const char *part, const char
 }
 
 EAPI void
-edje_edit_state_rel2_offset_y_set(Evas_Object *obj, const char *part, const char *state, double y)
+edje_edit_state_rel2_offset_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y)
 {
    GET_PD_OR_RETURN();
    //printf("Set rel2y offset of part: %s state: %s to: %f\n", part, state, y);
@@ -3009,7 +2980,7 @@ edje_edit_state_rel2_offset_y_set(Evas_Object *obj, const char *part, const char
 
 //relative to
 EAPI const char *
-edje_edit_state_rel1_to_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_rel1_to_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    Edje_Real_Part *rel;
 
@@ -3028,7 +2999,7 @@ edje_edit_state_rel1_to_x_get(Evas_Object *obj, const char *part, const char *st
 }
 
 EAPI const char *
-edje_edit_state_rel1_to_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_rel1_to_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    Edje_Real_Part *rel;
 
@@ -3047,7 +3018,7 @@ edje_edit_state_rel1_to_y_get(Evas_Object *obj, const char *part, const char *st
 }
 
 EAPI const char *
-edje_edit_state_rel2_to_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_rel2_to_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    Edje_Real_Part *rel;
 
@@ -3066,7 +3037,7 @@ edje_edit_state_rel2_to_x_get(Evas_Object *obj, const char *part, const char *st
 }
 
 EAPI const char *
-edje_edit_state_rel2_to_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_rel2_to_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    Edje_Real_Part *rel;
 
@@ -3086,7 +3057,7 @@ edje_edit_state_rel2_to_y_get(Evas_Object *obj, const char *part, const char *st
 
 EAPI void
 //note after this call edje_edit_part_selected_state_set() to update !! need to fix this
-edje_edit_state_rel1_to_x_set(Evas_Object *obj, const char *part, const char *state, const char *rel_to)
+edje_edit_state_rel1_to_x_set(Evas_Object *obj, const char *part, const char *state, double value, const char *rel_to)
 {
    Edje_Real_Part *relp;
 
@@ -3109,7 +3080,7 @@ edje_edit_state_rel1_to_x_set(Evas_Object *obj, const char *part, const char *st
 
 EAPI void
 //note after this call edje_edit_part_selected_state_set() to update !! need to fix this
-edje_edit_state_rel1_to_y_set(Evas_Object *obj, const char *part, const char *state, const char *rel_to)
+edje_edit_state_rel1_to_y_set(Evas_Object *obj, const char *part, const char *state, double value, const char *rel_to)
 {
    Edje_Real_Part *relp;
 
@@ -3132,7 +3103,7 @@ edje_edit_state_rel1_to_y_set(Evas_Object *obj, const char *part, const char *st
 
 EAPI void
 //note after this call edje_edit_part_selected_state_set() to update !! need to fix this
-edje_edit_state_rel2_to_x_set(Evas_Object *obj, const char *part, const char *state, const char *rel_to)
+edje_edit_state_rel2_to_x_set(Evas_Object *obj, const char *part, const char *state, double value, const char *rel_to)
 {
    Edje_Real_Part *relp;
 
@@ -3155,7 +3126,7 @@ edje_edit_state_rel2_to_x_set(Evas_Object *obj, const char *part, const char *st
 
 EAPI void
 //note after this call edje_edit_part_selected_state_set() to update !! need to fix this
-edje_edit_state_rel2_to_y_set(Evas_Object *obj, const char *part, const char *state, const char *rel_to)
+edje_edit_state_rel2_to_y_set(Evas_Object *obj, const char *part, const char *state, double value, const char *rel_to)
 {
    Edje_Real_Part *relp;
 
@@ -3178,7 +3149,7 @@ edje_edit_state_rel2_to_y_set(Evas_Object *obj, const char *part, const char *st
 
 //colors
 EAPI void
-edje_edit_state_color_get(Evas_Object *obj, const char *part, const char *state, int *r, int *g, int *b, int *a)
+edje_edit_state_color_get(Evas_Object *obj, const char *part, const char *state, double value, int *r, int *g, int *b, int *a)
 {
    GET_PD_OR_RETURN();
 
@@ -3191,7 +3162,7 @@ edje_edit_state_color_get(Evas_Object *obj, const char *part, const char *state,
 }
 
 EAPI void
-edje_edit_state_color2_get(Evas_Object *obj, const char *part, const char *state, int *r, int *g, int *b, int *a)
+edje_edit_state_color2_get(Evas_Object *obj, const char *part, const char *state, double value, int *r, int *g, int *b, int *a)
 {
    GET_PD_OR_RETURN();
 
@@ -3204,7 +3175,7 @@ edje_edit_state_color2_get(Evas_Object *obj, const char *part, const char *state
 }
 
 EAPI void
-edje_edit_state_color3_get(Evas_Object *obj, const char *part, const char *state, int *r, int *g, int *b, int *a)
+edje_edit_state_color3_get(Evas_Object *obj, const char *part, const char *state, double value, int *r, int *g, int *b, int *a)
 {
    GET_PD_OR_RETURN();
 
@@ -3217,7 +3188,7 @@ edje_edit_state_color3_get(Evas_Object *obj, const char *part, const char *state
 }
 
 EAPI void
-edje_edit_state_color_set(Evas_Object *obj, const char *part, const char *state, int r, int g, int b, int a)
+edje_edit_state_color_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a)
 {
    GET_PD_OR_RETURN();
 
@@ -3232,7 +3203,7 @@ edje_edit_state_color_set(Evas_Object *obj, const char *part, const char *state,
 }
 
 EAPI void
-edje_edit_state_color2_set(Evas_Object *obj, const char *part, const char *state, int r, int g, int b, int a)
+edje_edit_state_color2_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a)
 {
    GET_PD_OR_RETURN();
 
@@ -3247,7 +3218,7 @@ edje_edit_state_color2_set(Evas_Object *obj, const char *part, const char *state
 }
 
 EAPI void
-edje_edit_state_color3_set(Evas_Object *obj, const char *part, const char *state, int r, int g, int b, int a)
+edje_edit_state_color3_set(Evas_Object *obj, const char *part, const char *state, double value, int r, int g, int b, int a)
 {
    GET_PD_OR_RETURN();
 
@@ -3263,7 +3234,7 @@ edje_edit_state_color3_set(Evas_Object *obj, const char *part, const char *state
 
 //align
 EAPI double
-edje_edit_state_align_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_align_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
 
@@ -3273,7 +3244,7 @@ edje_edit_state_align_x_get(Evas_Object *obj, const char *part, const char *stat
 }
 
 EAPI double
-edje_edit_state_align_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_align_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
 
@@ -3283,7 +3254,7 @@ edje_edit_state_align_y_get(Evas_Object *obj, const char *part, const char *stat
 }
 
 EAPI void
-edje_edit_state_align_x_set(Evas_Object *obj, const char *part, const char *state, double align)
+edje_edit_state_align_x_set(Evas_Object *obj, const char *part, const char *state, double value, double align)
 {
    GET_PD_OR_RETURN();
    //printf("SET ALIGN_X of state '%s' [to: %f]\n", state, align);
@@ -3291,7 +3262,7 @@ edje_edit_state_align_x_set(Evas_Object *obj, const char *part, const char *stat
 }
 
 EAPI void
-edje_edit_state_align_y_set(Evas_Object *obj, const char *part, const char *state, double align)
+edje_edit_state_align_y_set(Evas_Object *obj, const char *part, const char *state, double value, double align)
 {
    GET_PD_OR_RETURN();
 
@@ -3301,7 +3272,7 @@ edje_edit_state_align_y_set(Evas_Object *obj, const char *part, const char *stat
 
 //min & max
 EAPI int
-edje_edit_state_min_w_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_min_w_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
 
@@ -3310,7 +3281,7 @@ edje_edit_state_min_w_get(Evas_Object *obj, const char *part, const char *state)
 }
 
 EAPI void
-edje_edit_state_min_w_set(Evas_Object *obj, const char *part, const char *state, int min_w)
+edje_edit_state_min_w_set(Evas_Object *obj, const char *part, const char *state, double value, int min_w)
 {
    GET_PD_OR_RETURN();
 
@@ -3319,7 +3290,7 @@ edje_edit_state_min_w_set(Evas_Object *obj, const char *part, const char *state,
 }
 
 EAPI int
-edje_edit_state_min_h_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_min_h_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
 
@@ -3328,7 +3299,7 @@ edje_edit_state_min_h_get(Evas_Object *obj, const char *part, const char *state)
 }
 
 EAPI void
-edje_edit_state_min_h_set(Evas_Object *obj, const char *part, const char *state, int min_h)
+edje_edit_state_min_h_set(Evas_Object *obj, const char *part, const char *state, double value, int min_h)
 {
    GET_PD_OR_RETURN();
 
@@ -3337,7 +3308,7 @@ edje_edit_state_min_h_set(Evas_Object *obj, const char *part, const char *state,
 }
 
 EAPI int
-edje_edit_state_max_w_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_max_w_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
 
@@ -3346,7 +3317,7 @@ edje_edit_state_max_w_get(Evas_Object *obj, const char *part, const char *state)
 }
 
 EAPI void
-edje_edit_state_max_w_set(Evas_Object *obj, const char *part, const char *state, int max_w)
+edje_edit_state_max_w_set(Evas_Object *obj, const char *part, const char *state, double value, int max_w)
 {
    GET_PD_OR_RETURN();
 
@@ -3355,7 +3326,7 @@ edje_edit_state_max_w_set(Evas_Object *obj, const char *part, const char *state,
 }
 
 EAPI int
-edje_edit_state_max_h_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_max_h_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
 
@@ -3364,7 +3335,7 @@ edje_edit_state_max_h_get(Evas_Object *obj, const char *part, const char *state)
 }
 
 EAPI void
-edje_edit_state_max_h_set(Evas_Object *obj, const char *part, const char *state, int max_h)
+edje_edit_state_max_h_set(Evas_Object *obj, const char *part, const char *state, double value, int max_h)
 {
    GET_PD_OR_RETURN();
 
@@ -3374,7 +3345,7 @@ edje_edit_state_max_h_set(Evas_Object *obj, const char *part, const char *state,
 
 //aspect
 EAPI double
-edje_edit_state_aspect_min_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_aspect_min_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
 
@@ -3383,7 +3354,7 @@ edje_edit_state_aspect_min_get(Evas_Object *obj, const char *part, const char *s
 }
 
 EAPI double
-edje_edit_state_aspect_max_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_aspect_max_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
 
@@ -3392,7 +3363,7 @@ edje_edit_state_aspect_max_get(Evas_Object *obj, const char *part, const char *s
 }
 
 EAPI void
-edje_edit_state_aspect_min_set(Evas_Object *obj, const char *part, const char *state, double aspect)
+edje_edit_state_aspect_min_set(Evas_Object *obj, const char *part, const char *state, double value, double aspect)
 {
    GET_PD_OR_RETURN();
 
@@ -3401,7 +3372,7 @@ edje_edit_state_aspect_min_set(Evas_Object *obj, const char *part, const char *s
 }
 
 EAPI void
-edje_edit_state_aspect_max_set(Evas_Object *obj, const char *part, const char *state, double aspect)
+edje_edit_state_aspect_max_set(Evas_Object *obj, const char *part, const char *state, double value, double aspect)
 {
    GET_PD_OR_RETURN();
 
@@ -3410,7 +3381,7 @@ edje_edit_state_aspect_max_set(Evas_Object *obj, const char *part, const char *s
 }
 
 EAPI unsigned char
-edje_edit_state_aspect_pref_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_aspect_pref_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
 
@@ -3419,7 +3390,7 @@ edje_edit_state_aspect_pref_get(Evas_Object *obj, const char *part, const char *
 }
 
 EAPI void
-edje_edit_state_aspect_pref_set(Evas_Object *obj, const char *part, const char *state, unsigned char pref)
+edje_edit_state_aspect_pref_set(Evas_Object *obj, const char *part, const char *state, double value, unsigned char pref)
 {
    GET_PD_OR_RETURN();
 
@@ -3429,7 +3400,7 @@ edje_edit_state_aspect_pref_set(Evas_Object *obj, const char *part, const char *
 
 //fill
 EAPI double
-edje_edit_state_fill_origin_relative_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_fill_origin_relative_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("Get state fill origin of part: %s state: %s\n", part, state);
@@ -3437,7 +3408,7 @@ edje_edit_state_fill_origin_relative_x_get(Evas_Object *obj, const char *part, c
 }
 
 EAPI double
-edje_edit_state_fill_origin_relative_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_fill_origin_relative_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("Get state fill origin of part: %s state: %s\n", part, state);
@@ -3445,7 +3416,7 @@ edje_edit_state_fill_origin_relative_y_get(Evas_Object *obj, const char *part, c
 }
 
 EAPI int
-edje_edit_state_fill_origin_offset_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_fill_origin_offset_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("Get state fill origin offset of part: %s state: %s\n", part, state);
@@ -3453,7 +3424,7 @@ edje_edit_state_fill_origin_offset_x_get(Evas_Object *obj, const char *part, con
 }
 
 EAPI int
-edje_edit_state_fill_origin_offset_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_fill_origin_offset_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("Get state fill origin offset of part: %s state: %s\n", part, state);
@@ -3462,7 +3433,7 @@ edje_edit_state_fill_origin_offset_y_get(Evas_Object *obj, const char *part, con
 
 
 EAPI void
-edje_edit_state_fill_origin_relative_x_set(Evas_Object *obj, const char *part, const char *state, double x)
+edje_edit_state_fill_origin_relative_x_set(Evas_Object *obj, const char *part, const char *state, double value, double x)
 {
    GET_PD_OR_RETURN();
    //printf("Set state fill origin of part: %s state: %s to: %f\n", part, state, x);
@@ -3471,7 +3442,7 @@ edje_edit_state_fill_origin_relative_x_set(Evas_Object *obj, const char *part, c
 }
 
 EAPI void
-edje_edit_state_fill_origin_relative_y_set(Evas_Object *obj, const char *part, const char *state, double y)
+edje_edit_state_fill_origin_relative_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y)
 {
    GET_PD_OR_RETURN();
    //printf("Set state fill origin of part: %s state: %s to: %f\n", part, state, y);
@@ -3480,7 +3451,7 @@ edje_edit_state_fill_origin_relative_y_set(Evas_Object *obj, const char *part, c
 }
 
 EAPI void
-edje_edit_state_fill_origin_offset_x_set(Evas_Object *obj, const char *part, const char *state, double x)
+edje_edit_state_fill_origin_offset_x_set(Evas_Object *obj, const char *part, const char *state, double value, double x)
 {
    GET_PD_OR_RETURN();
    //printf("Set state fill origin offset x of part: %s state: %s to: %f\n", part, state, x);
@@ -3489,7 +3460,7 @@ edje_edit_state_fill_origin_offset_x_set(Evas_Object *obj, const char *part, con
 }
 
 EAPI void
-edje_edit_state_fill_origin_offset_y_set(Evas_Object *obj, const char *part, const char *state, double y)
+edje_edit_state_fill_origin_offset_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y)
 {
    GET_PD_OR_RETURN();
    //printf("Set state fill origin offset y of part: %s state: %s to: %f\n", part, state, y);
@@ -3498,7 +3469,7 @@ edje_edit_state_fill_origin_offset_y_set(Evas_Object *obj, const char *part, con
 }
 
 EAPI double
-edje_edit_state_fill_size_relative_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_fill_size_relative_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0.0);
    //printf("Get state fill size of part: %s state: %s\n", part, state);
@@ -3506,7 +3477,7 @@ edje_edit_state_fill_size_relative_x_get(Evas_Object *obj, const char *part, con
 }
 
 EAPI double
-edje_edit_state_fill_size_relative_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_fill_size_relative_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0.0);
    //printf("Get state fill size of part: %s state: %s\n", part, state);
@@ -3514,7 +3485,7 @@ edje_edit_state_fill_size_relative_y_get(Evas_Object *obj, const char *part, con
 }
 
 EAPI int
-edje_edit_state_fill_size_offset_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_fill_size_offset_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("Get state fill size offset of part: %s state: %s\n", part, state);
@@ -3522,7 +3493,7 @@ edje_edit_state_fill_size_offset_x_get(Evas_Object *obj, const char *part, const
 }
 
 EAPI int
-edje_edit_state_fill_size_offset_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_fill_size_offset_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("Get state fill size offset of part: %s state: %s\n", part, state);
@@ -3530,7 +3501,7 @@ edje_edit_state_fill_size_offset_y_get(Evas_Object *obj, const char *part, const
 }
 
 EAPI void
-edje_edit_state_fill_size_relative_x_set(Evas_Object *obj, const char *part, const char *state, double x)
+edje_edit_state_fill_size_relative_x_set(Evas_Object *obj, const char *part, const char *state, double value, double x)
 {
    GET_PD_OR_RETURN();
    //printf("Set state fill size of part: %s state: %s to: %f\n", part, state, x);
@@ -3539,7 +3510,7 @@ edje_edit_state_fill_size_relative_x_set(Evas_Object *obj, const char *part, con
 }
 
 EAPI void
-edje_edit_state_fill_size_relative_y_set(Evas_Object *obj, const char *part, const char *state, double y)
+edje_edit_state_fill_size_relative_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y)
 {
    GET_PD_OR_RETURN();
    //printf("Set state fill size of part: %s state: %s to: %f\n", part, state, y);
@@ -3548,7 +3519,7 @@ edje_edit_state_fill_size_relative_y_set(Evas_Object *obj, const char *part, con
 }
 
 EAPI void
-edje_edit_state_fill_size_offset_x_set(Evas_Object *obj, const char *part, const char *state, double x)
+edje_edit_state_fill_size_offset_x_set(Evas_Object *obj, const char *part, const char *state, double value, double x)
 {
    GET_PD_OR_RETURN();
    //printf("Set state fill size offset x of part: %s state: %s to: %f\n", part, state, x);
@@ -3557,7 +3528,7 @@ edje_edit_state_fill_size_offset_x_set(Evas_Object *obj, const char *part, const
 }
 
 EAPI void
-edje_edit_state_fill_size_offset_y_set(Evas_Object *obj, const char *part, const char *state, double y)
+edje_edit_state_fill_size_offset_y_set(Evas_Object *obj, const char *part, const char *state, double value, double y)
 {
    GET_PD_OR_RETURN();
    //printf("Set state fill size offset y of part: %s state: %s to: %f\n", part, state, y);
@@ -3566,7 +3537,7 @@ edje_edit_state_fill_size_offset_y_set(Evas_Object *obj, const char *part, const
 }
 
 EAPI Eina_Bool
-edje_edit_state_visible_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_visible_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("Get state visible flag of part: %s state: %s\n", part, state);
@@ -3574,7 +3545,7 @@ edje_edit_state_visible_get(Evas_Object *obj, const char *part, const char *stat
 }
 
 EAPI void
-edje_edit_state_visible_set(Evas_Object *obj, const char *part, const char *state, Eina_Bool visible)
+edje_edit_state_visible_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool visible)
 {
    GET_PD_OR_RETURN();
    //printf("Set state visible flag of part: %s state: %s to: %d\n", part, state, visible);
@@ -3584,7 +3555,7 @@ edje_edit_state_visible_set(Evas_Object *obj, const char *part, const char *stat
 }
 
 EAPI const char*
-edje_edit_state_color_class_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_color_class_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(NULL);
    //printf("Get ColorClass of part: %s state: %s\n", part, state);
@@ -3592,7 +3563,7 @@ edje_edit_state_color_class_get(Evas_Object *obj, const char *part, const char *
 }
 
 EAPI void
-edje_edit_state_color_class_set(Evas_Object *obj, const char *part, const char *state, const char *color_class)
+edje_edit_state_color_class_set(Evas_Object *obj, const char *part, const char *state, double value, const char *color_class)
 {
    GET_PD_OR_RETURN();
    //printf("Set ColorClass of part: %s state: %s [to: %s]\n", part, state, color_class);
@@ -3601,14 +3572,14 @@ edje_edit_state_color_class_set(Evas_Object *obj, const char *part, const char *
 }
 
 EAPI const Eina_List *
-edje_edit_state_external_params_list_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_external_params_list_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(NULL);
    return pd->external_params;
 }
 
 EAPI Eina_Bool
-edje_edit_state_external_param_get(Evas_Object *obj, const char *part, const char *state, const char *param, Edje_External_Param_Type *type, void **value)
+edje_edit_state_external_param_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, Edje_External_Param_Type *type, void **val)
 {
    Eina_List *l;
    Edje_External_Param *p;
@@ -3618,19 +3589,19 @@ edje_edit_state_external_param_get(Evas_Object *obj, const char *part, const cha
       if (!strcmp(p->name, param))
 	{
 	   if (type) *type = p->type;
-	   if (value)
+	   if (val)
 	      switch (p->type)
 		{
 		 case EDJE_EXTERNAL_PARAM_TYPE_INT:
 		 case EDJE_EXTERNAL_PARAM_TYPE_BOOL:
-		    *value = &p->i;
+		    *val = &p->i;
 		    break;
 		 case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
-		    *value = &p->d;
+		    *val = &p->d;
 		    break;
 		 case EDJE_EXTERNAL_PARAM_TYPE_CHOICE:
 		 case EDJE_EXTERNAL_PARAM_TYPE_STRING:
-		    *value = (void *)p->s;
+		    *val = (void *)p->s;
 		    break;
 		 default:
 		    ERR("unknown external parameter type '%d'", p->type);
@@ -3642,7 +3613,7 @@ edje_edit_state_external_param_get(Evas_Object *obj, const char *part, const cha
 }
 
 EAPI Eina_Bool
-edje_edit_state_external_param_int_get(Evas_Object *obj, const char *part, const char *state, const char *param, int *value)
+edje_edit_state_external_param_int_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, int *val)
 {
    Eina_List *l;
    Edje_External_Param *p;
@@ -3653,8 +3624,8 @@ edje_edit_state_external_param_int_get(Evas_Object *obj, const char *part, const
 	{
 	   if (p->type != EDJE_EXTERNAL_PARAM_TYPE_INT)
 	     return EINA_FALSE;
-	   if (value)
-	     *value = p->i;
+	   if (val)
+	     *val = p->i;
 	   return EINA_TRUE;
 	}
 
@@ -3662,7 +3633,7 @@ edje_edit_state_external_param_int_get(Evas_Object *obj, const char *part, const
 }
 
 EAPI Eina_Bool
-edje_edit_state_external_param_bool_get(Evas_Object *obj, const char *part, const char *state, const char *param, Eina_Bool *value)
+edje_edit_state_external_param_bool_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, Eina_Bool *val)
 {
    Eina_List *l;
    Edje_External_Param *p;
@@ -3673,8 +3644,8 @@ edje_edit_state_external_param_bool_get(Evas_Object *obj, const char *part, cons
 	{
 	   if (p->type != EDJE_EXTERNAL_PARAM_TYPE_INT)
 	     return EINA_FALSE;
-	   if (value)
-	     *value = p->i;
+	   if (val)
+	     *val = p->i;
 	   return EINA_TRUE;
 	}
 
@@ -3682,7 +3653,7 @@ edje_edit_state_external_param_bool_get(Evas_Object *obj, const char *part, cons
 }
 
 EAPI Eina_Bool
-edje_edit_state_external_param_double_get(Evas_Object *obj, const char *part, const char *state, const char *param, double *value)
+edje_edit_state_external_param_double_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, double *val)
 {
    Eina_List *l;
    Edje_External_Param *p;
@@ -3693,8 +3664,8 @@ edje_edit_state_external_param_double_get(Evas_Object *obj, const char *part, co
 	{
 	   if (p->type != EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
 	     return EINA_FALSE;
-	   if (value)
-	     *value = p->d;
+	   if (val)
+	     *val = p->d;
 	   return EINA_TRUE;
 	}
 
@@ -3702,7 +3673,7 @@ edje_edit_state_external_param_double_get(Evas_Object *obj, const char *part, co
 }
 
 EAPI Eina_Bool
-edje_edit_state_external_param_string_get(Evas_Object *obj, const char *part, const char *state, const char *param, const char **value)
+edje_edit_state_external_param_string_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, const char **val)
 {
    Eina_List *l;
    Edje_External_Param *p;
@@ -3713,8 +3684,8 @@ edje_edit_state_external_param_string_get(Evas_Object *obj, const char *part, co
 	{
 	   if (p->type != EDJE_EXTERNAL_PARAM_TYPE_STRING)
 	     return EINA_FALSE;
-	   if (value)
-	     *value = p->s;
+	   if (val)
+	     *val = p->s;
 	   return EINA_TRUE;
 	}
 
@@ -3722,7 +3693,7 @@ edje_edit_state_external_param_string_get(Evas_Object *obj, const char *part, co
 }
 
 EAPI Eina_Bool
-edje_edit_state_external_param_choice_get(Evas_Object *obj, const char *part, const char *state, const char *param, const char **value)
+edje_edit_state_external_param_choice_get(Evas_Object *obj, const char *part, const char *state, double value, const char *param, const char **val)
 {
    Eina_List *l;
    Edje_External_Param *p;
@@ -3733,8 +3704,8 @@ edje_edit_state_external_param_choice_get(Evas_Object *obj, const char *part, co
 	{
 	   if (p->type != EDJE_EXTERNAL_PARAM_TYPE_CHOICE)
 	     return EINA_FALSE;
-	   if (value)
-	     *value = p->s;
+	   if (val)
+	     *val = p->s;
 	   return EINA_TRUE;
 	}
 
@@ -3750,7 +3721,7 @@ edje_edit_state_external_param_choice_get(Evas_Object *obj, const char *part, co
  *   - EDJE_EXTERNAL_PARAM_TYPE_CHOICE: char*
  */
 EAPI Eina_Bool
-edje_edit_state_external_param_set(Evas_Object *obj, const char *part, const char *state, const char *param, Edje_External_Param_Type type, ...)
+edje_edit_state_external_param_set(Evas_Object *obj, const char *part, const char *state, double value, const char *param, Edje_External_Param_Type type, ...)
 {
    va_list ap;
    Eina_List *l;
@@ -3819,33 +3790,33 @@ edje_edit_state_external_param_set(Evas_Object *obj, const char *part, const cha
 }
 
 EAPI Eina_Bool
-edje_edit_state_external_param_int_set(Evas_Object *obj, const char *part, const char *state, const char *param, int value)
+edje_edit_state_external_param_int_set(Evas_Object *obj, const char *part, const char *state, double value, const char *param, int val)
 {
-   return edje_edit_state_external_param_set(obj, part, state, param, EDJE_EXTERNAL_PARAM_TYPE_INT, value);
+   return edje_edit_state_external_param_set(obj, part, state, value, param, EDJE_EXTERNAL_PARAM_TYPE_INT, val);
 }
 
 EAPI Eina_Bool
-edje_edit_state_external_param_bool_set(Evas_Object *obj, const char *part, const char *state, const char *param, Eina_Bool value)
+edje_edit_state_external_param_bool_set(Evas_Object *obj, const char *part, const char *state, double value, const char *param, Eina_Bool val)
 {
-   return edje_edit_state_external_param_set(obj, part, state, param, EDJE_EXTERNAL_PARAM_TYPE_BOOL, (int)value);
+   return edje_edit_state_external_param_set(obj, part, state, value, param, EDJE_EXTERNAL_PARAM_TYPE_BOOL, (int)val);
 }
 
 EAPI Eina_Bool
-edje_edit_state_external_param_double_set(Evas_Object *obj, const char *part, const char *state, const char *param, double value)
+edje_edit_state_external_param_double_set(Evas_Object *obj, const char *part, const char *state, double value, const char *param, double val)
 {
-   return edje_edit_state_external_param_set(obj, part, state, param, EDJE_EXTERNAL_PARAM_TYPE_DOUBLE, value);
+   return edje_edit_state_external_param_set(obj, part, state, value, param, EDJE_EXTERNAL_PARAM_TYPE_DOUBLE, val);
 }
 
 EAPI Eina_Bool
-edje_edit_state_external_param_string_set(Evas_Object *obj, const char *part, const char *state, const char *param, const char *value)
+edje_edit_state_external_param_string_set(Evas_Object *obj, const char *part, const char *state, double value, const char *param, const char *val)
 {
-   return edje_edit_state_external_param_set(obj, part, state, param, EDJE_EXTERNAL_PARAM_TYPE_STRING, value);
+   return edje_edit_state_external_param_set(obj, part, state, value, param, EDJE_EXTERNAL_PARAM_TYPE_STRING, val);
 }
 
 EAPI Eina_Bool
-edje_edit_state_external_param_choice_set(Evas_Object *obj, const char *part, const char *state, const char *param, const char *value)
+edje_edit_state_external_param_choice_set(Evas_Object *obj, const char *part, const char *state, double value, const char *param, const char *val)
 {
-   return edje_edit_state_external_param_set(obj, part, state, param, EDJE_EXTERNAL_PARAM_TYPE_CHOICE, value);
+   return edje_edit_state_external_param_set(obj, part, state, value, param, EDJE_EXTERNAL_PARAM_TYPE_CHOICE, val);
 }
 
 /**************/
@@ -3853,7 +3824,7 @@ edje_edit_state_external_param_choice_set(Evas_Object *obj, const char *part, co
 /**************/
 
 EAPI const char *
-edje_edit_state_text_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_text_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(NULL);
 
@@ -3866,7 +3837,7 @@ edje_edit_state_text_get(Evas_Object *obj, const char *part, const char *state)
 }
 
 EAPI void
-edje_edit_state_text_set(Evas_Object *obj, const char *part, const char *state, const char *text)
+edje_edit_state_text_set(Evas_Object *obj, const char *part, const char *state, double value, const char *text)
 {
    GET_PD_OR_RETURN();
 
@@ -3881,7 +3852,7 @@ edje_edit_state_text_set(Evas_Object *obj, const char *part, const char *state,
 }
 
 EAPI int
-edje_edit_state_text_size_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_text_size_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(-1);
 
@@ -3890,7 +3861,7 @@ edje_edit_state_text_size_get(Evas_Object *obj, const char *part, const char *st
 }
 
 EAPI void
-edje_edit_state_text_size_set(Evas_Object *obj, const char *part, const char *state, int size)
+edje_edit_state_text_size_set(Evas_Object *obj, const char *part, const char *state, double value, int size)
 {
    GET_PD_OR_RETURN();
 
@@ -3904,7 +3875,7 @@ edje_edit_state_text_size_set(Evas_Object *obj, const char *part, const char *st
 }
 
 EAPI double
-edje_edit_state_text_align_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_text_align_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
 
@@ -3913,7 +3884,7 @@ edje_edit_state_text_align_x_get(Evas_Object *obj, const char *part, const char
 }
 
 EAPI void
-edje_edit_state_text_align_x_set(Evas_Object *obj, const char *part, const char *state, double align)
+edje_edit_state_text_align_x_set(Evas_Object *obj, const char *part, const char *state, double value, double align)
 {
    GET_PD_OR_RETURN();
 
@@ -3924,7 +3895,7 @@ edje_edit_state_text_align_x_set(Evas_Object *obj, const char *part, const char
 }
 
 EAPI double
-edje_edit_state_text_align_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_text_align_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0.0);
 
@@ -3933,7 +3904,7 @@ edje_edit_state_text_align_y_get(Evas_Object *obj, const char *part, const char
 }
 
 EAPI void
-edje_edit_state_text_align_y_set(Evas_Object *obj, const char *part, const char *state, double align)
+edje_edit_state_text_align_y_set(Evas_Object *obj, const char *part, const char *state, double value, double align)
 {
    GET_PD_OR_RETURN();
 
@@ -3944,7 +3915,7 @@ edje_edit_state_text_align_y_set(Evas_Object *obj, const char *part, const char
 }
 
 EAPI double
-edje_edit_state_text_elipsis_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_text_elipsis_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0.0);
 
@@ -3953,7 +3924,7 @@ edje_edit_state_text_elipsis_get(Evas_Object *obj, const char *part, const char
 }
 
 EAPI void
-edje_edit_state_text_elipsis_set(Evas_Object *obj, const char *part, const char *state, double balance)
+edje_edit_state_text_elipsis_set(Evas_Object *obj, const char *part, const char *state, double value, double balance)
 {
    GET_PD_OR_RETURN();
 
@@ -3964,7 +3935,7 @@ edje_edit_state_text_elipsis_set(Evas_Object *obj, const char *part, const char
 }
 
 EAPI Eina_Bool
-edje_edit_state_text_fit_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_text_fit_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("GET TEXT_FIT_VERT of state: %s \n", state);
@@ -3972,7 +3943,7 @@ edje_edit_state_text_fit_x_get(Evas_Object *obj, const char *part, const char *s
 }
 
 EAPI void
-edje_edit_state_text_fit_x_set(Evas_Object *obj, const char *part, const char *state, Eina_Bool fit)
+edje_edit_state_text_fit_x_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool fit)
 {
    GET_PD_OR_RETURN();
 
@@ -3983,7 +3954,7 @@ edje_edit_state_text_fit_x_set(Evas_Object *obj, const char *part, const char *s
 }
 
 EAPI Eina_Bool
-edje_edit_state_text_fit_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_text_fit_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("GET TEXT_FIT_VERT of state: %s \n", state);
@@ -3991,7 +3962,7 @@ edje_edit_state_text_fit_y_get(Evas_Object *obj, const char *part, const char *s
 }
 
 EAPI void
-edje_edit_state_text_fit_y_set(Evas_Object *obj, const char *part, const char *state, Eina_Bool fit)
+edje_edit_state_text_fit_y_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool fit)
 {
    GET_PD_OR_RETURN();
 
@@ -4123,7 +4094,7 @@ edje_edit_font_add(Evas_Object *obj, const char* path)
 }
 
 EAPI const char *
-edje_edit_state_font_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_font_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(NULL);
 
@@ -4133,7 +4104,7 @@ edje_edit_state_font_get(Evas_Object *obj, const char *part, const char *state)
 }
 
 EAPI void
-edje_edit_state_font_set(Evas_Object *obj, const char *part, const char *state, const char *font)
+edje_edit_state_font_set(Evas_Object *obj, const char *part, const char *state, double value, const char *font)
 {
    GET_PD_OR_RETURN();
 
@@ -4366,7 +4337,7 @@ edje_edit_image_compression_rate_get(Evas_Object *obj, const char *image)
 }
 
 EAPI const char *
-edje_edit_state_image_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_image_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    char *image;
 
@@ -4380,7 +4351,7 @@ edje_edit_state_image_get(Evas_Object *obj, const char *part, const char *state)
 }
 
 EAPI void
-edje_edit_state_image_set(Evas_Object *obj, const char *part, const char *state, const char *image)
+edje_edit_state_image_set(Evas_Object *obj, const char *part, const char *state, double value, const char *image)
 {
    int id;
 
@@ -4397,7 +4368,7 @@ edje_edit_state_image_set(Evas_Object *obj, const char *part, const char *state,
 }
 
 EAPI Eina_List *
-edje_edit_state_tweens_list_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_tweens_list_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    Edje_Part_Image_Id *i;
    Eina_List *tweens = NULL, *l;
@@ -4418,7 +4389,7 @@ edje_edit_state_tweens_list_get(Evas_Object *obj, const char *part, const char *
 }
 
 EAPI Eina_Bool
-edje_edit_state_tween_add(Evas_Object *obj, const char *part, const char *state, const char *tween)
+edje_edit_state_tween_add(Evas_Object *obj, const char *part, const char *state, double value, const char *tween)
 {
    Edje_Part_Image_Id *i;
    int id;
@@ -4440,7 +4411,7 @@ edje_edit_state_tween_add(Evas_Object *obj, const char *part, const char *state,
 }
 
 EAPI Eina_Bool
-edje_edit_state_tween_del(Evas_Object *obj, const char *part, const char *state, const char *tween)
+edje_edit_state_tween_del(Evas_Object *obj, const char *part, const char *state, double value, const char *tween)
 {
    Eina_List *l;
    Edje_Part_Image_Id *i;
@@ -4465,7 +4436,7 @@ edje_edit_state_tween_del(Evas_Object *obj, const char *part, const char *state,
 }
 
 EAPI void
-edje_edit_state_image_border_get(Evas_Object *obj, const char *part, const char *state, int *l, int *r, int *t, int *b)
+edje_edit_state_image_border_get(Evas_Object *obj, const char *part, const char *state, double value, int *l, int *r, int *t, int *b)
 {
    GET_PD_OR_RETURN();
 
@@ -4478,7 +4449,7 @@ edje_edit_state_image_border_get(Evas_Object *obj, const char *part, const char
 }
 
 EAPI void
-edje_edit_state_image_border_set(Evas_Object *obj, const char *part, const char *state, int l, int r, int t, int b)
+edje_edit_state_image_border_set(Evas_Object *obj, const char *part, const char *state, double value, int l, int r, int t, int b)
 {
    GET_PD_OR_RETURN();
 
@@ -4493,7 +4464,7 @@ edje_edit_state_image_border_set(Evas_Object *obj, const char *part, const char
 }
 
 EAPI unsigned char
-edje_edit_state_image_border_fill_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_image_border_fill_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    if (pd->border.no_fill == 0) return 1;
@@ -4503,7 +4474,7 @@ edje_edit_state_image_border_fill_get(Evas_Object *obj, const char *part, const
 }
 
 EAPI void
-edje_edit_state_image_border_fill_set(Evas_Object *obj, const char *part, const char *state, unsigned char fill)
+edje_edit_state_image_border_fill_set(Evas_Object *obj, const char *part, const char *state, double value, unsigned char fill)
 {
    GET_PD_OR_RETURN();
    if (fill == 0) pd->border.no_fill = 1;
@@ -4721,7 +4692,7 @@ edje_edit_spectra_stop_color_set(Evas_Object *obj, const char* spectra, int stop
 /******************/
 
 EAPI const char *
-edje_edit_state_gradient_type_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_gradient_type_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(NULL);
 
@@ -4734,7 +4705,7 @@ edje_edit_state_gradient_type_get(Evas_Object *obj, const char *part, const char
 }
 
 EAPI Eina_Bool
-edje_edit_state_gradient_type_set(Evas_Object *obj, const char *part, const char *state, const char *type)
+edje_edit_state_gradient_type_set(Evas_Object *obj, const char *part, const char *state, double value, const char *type)
 {
    GET_PD_OR_RETURN(0);
    if (!type) return 0;
@@ -4749,7 +4720,7 @@ edje_edit_state_gradient_type_set(Evas_Object *obj, const char *part, const char
 
 
 EAPI Eina_Bool
-edje_edit_state_gradient_use_fill_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_gradient_use_fill_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(-1);
 
@@ -4762,7 +4733,7 @@ edje_edit_state_gradient_use_fill_get(Evas_Object *obj, const char *part, const
 }
 
 EAPI const char *
-edje_edit_state_gradient_spectra_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_gradient_spectra_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    Edje_Spectrum_Directory_Entry *s;
 
@@ -4776,7 +4747,7 @@ edje_edit_state_gradient_spectra_get(Evas_Object *obj, const char *part, const c
 }
 
 EAPI Eina_Bool
-edje_edit_state_gradient_spectra_set(Evas_Object *obj, const char *part, const char *state, const char* spectra)
+edje_edit_state_gradient_spectra_set(Evas_Object *obj, const char *part, const char *state, double value, const char* spectra)
 {
    Edje_Spectrum_Directory_Entry *s;
 
@@ -4794,14 +4765,14 @@ edje_edit_state_gradient_spectra_set(Evas_Object *obj, const char *part, const c
 }
 
 EAPI int
-edje_edit_state_gradient_angle_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_gradient_angle_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    return pd->fill.angle;
 }
 
 EAPI void
-edje_edit_state_gradient_angle_set(Evas_Object *obj, const char *part, const char *state, int angle)
+edje_edit_state_gradient_angle_set(Evas_Object *obj, const char *part, const char *state, double value, int angle)
 {
    GET_PD_OR_RETURN();
    pd->fill.angle = angle;
@@ -4809,7 +4780,7 @@ edje_edit_state_gradient_angle_set(Evas_Object *obj, const char *part, const cha
 }
 
 EAPI double
-edje_edit_state_gradient_rel1_relative_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_gradient_rel1_relative_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("GET GRADIENT REL1 RELX for part: %s state: %s [%f]\n", part, state, pd->gradient.rel1.relative_x);
@@ -4818,7 +4789,7 @@ edje_edit_state_gradient_rel1_relative_x_get(Evas_Object *obj, const char *part,
 }
 
 EAPI double
-edje_edit_state_gradient_rel1_relative_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_gradient_rel1_relative_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("GET GRADIENT REL1 RELY for part: %s state: %s [%f]\n", part, state, pd->gradient.rel1.relative_y);
@@ -4827,7 +4798,7 @@ edje_edit_state_gradient_rel1_relative_y_get(Evas_Object *obj, const char *part,
 }
 
 EAPI double
-edje_edit_state_gradient_rel2_relative_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_gradient_rel2_relative_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("GET GRADIENT REL2 RELX for part: %s state: %s [%f]\n", part, state, pd->gradient.rel2.relative_x);
@@ -4836,7 +4807,7 @@ edje_edit_state_gradient_rel2_relative_x_get(Evas_Object *obj, const char *part,
 }
 
 EAPI double
-edje_edit_state_gradient_rel2_relative_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_gradient_rel2_relative_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("GET GRADIENT REL2 RELY for part: %s state: %s [%f]\n", part, state, pd->gradient.rel2.relative_y);
@@ -4845,7 +4816,7 @@ edje_edit_state_gradient_rel2_relative_y_get(Evas_Object *obj, const char *part,
 }
 
 EAPI Eina_Bool
-edje_edit_state_gradient_rel1_relative_x_set(Evas_Object *obj, const char *part, const char *state, double val)
+edje_edit_state_gradient_rel1_relative_x_set(Evas_Object *obj, const char *part, const char *state, double value, double val)
 {
    GET_PD_OR_RETURN(0);
    //printf("SET GRADIENT REL1 RELX for part: %s state: %s [TO %f]\n", part, state, val);
@@ -4856,7 +4827,7 @@ edje_edit_state_gradient_rel1_relative_x_set(Evas_Object *obj, const char *part,
 }
 
 EAPI Eina_Bool
-edje_edit_state_gradient_rel1_relative_y_set(Evas_Object *obj, const char *part, const char *state, double val)
+edje_edit_state_gradient_rel1_relative_y_set(Evas_Object *obj, const char *part, const char *state, double value, double val)
 {
    GET_PD_OR_RETURN(0);
    //printf("SET GRADIENT REL1 RELY for part: %s state: %s [TO %f]\n", part, state, val);
@@ -4867,7 +4838,7 @@ edje_edit_state_gradient_rel1_relative_y_set(Evas_Object *obj, const char *part,
 }
 
 EAPI Eina_Bool
-edje_edit_state_gradient_rel2_relative_x_set(Evas_Object *obj, const char *part, const char *state, double val)
+edje_edit_state_gradient_rel2_relative_x_set(Evas_Object *obj, const char *part, const char *state, double value, double val)
 {
    GET_PD_OR_RETURN(0);
    //printf("SET GRADIENT REL2 RELX for part: %s state: %s [TO %f]\n", part, state, val);
@@ -4878,7 +4849,7 @@ edje_edit_state_gradient_rel2_relative_x_set(Evas_Object *obj, const char *part,
 }
 
 EAPI Eina_Bool
-edje_edit_state_gradient_rel2_relative_y_set(Evas_Object *obj, const char *part, const char *state, double val)
+edje_edit_state_gradient_rel2_relative_y_set(Evas_Object *obj, const char *part, const char *state, double value, double val)
 {
    GET_PD_OR_RETURN(0);
    //printf("SET GRADIENT REL2 RELY for part: %s state: %s [TO %f]\n", part, state, val);
@@ -4889,7 +4860,7 @@ edje_edit_state_gradient_rel2_relative_y_set(Evas_Object *obj, const char *part,
 }
 
 EAPI int
-edje_edit_state_gradient_rel1_offset_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_gradient_rel1_offset_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("GET GRADIENT REL1 OFFSETX for part: %s state: %s [%f]\n", part, state, pd->gradient.rel1.offset_x);
@@ -4897,7 +4868,7 @@ edje_edit_state_gradient_rel1_offset_x_get(Evas_Object *obj, const char *part, c
 }
 
 EAPI int
-edje_edit_state_gradient_rel1_offset_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_gradient_rel1_offset_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("GET GRADIENT REL1 OFFSETY for part: %s state: %s [%f]\n", part, state, pd->gradient.rel1.offset_y);
@@ -4905,7 +4876,7 @@ edje_edit_state_gradient_rel1_offset_y_get(Evas_Object *obj, const char *part, c
 }
 
 EAPI int
-edje_edit_state_gradient_rel2_offset_x_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_gradient_rel2_offset_x_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("GET GRADIENT REL2 OFFSETX for part: %s state: %s [%f]\n", part, state, pd->gradient.rel2.offset_x);
@@ -4913,7 +4884,7 @@ edje_edit_state_gradient_rel2_offset_x_get(Evas_Object *obj, const char *part, c
 }
 
 EAPI int
-edje_edit_state_gradient_rel2_offset_y_get(Evas_Object *obj, const char *part, const char *state)
+edje_edit_state_gradient_rel2_offset_y_get(Evas_Object *obj, const char *part, const char *state, double value)
 {
    GET_PD_OR_RETURN(0);
    //printf("GET GRADIENT REL2 OFFSETY for part: %s state: %s [%f]\n", part, state, pd->gradient.rel2.offset_y);
@@ -4921,7 +4892,7 @@ edje_edit_state_gradient_rel2_offset_y_get(Evas_Object *obj, const char *part, c
 }
 
 EAPI Eina_Bool
-edje_edit_state_gradient_rel1_offset_x_set(Evas_Object *obj, const char *part, const char *state, int val)
+edje_edit_state_gradient_rel1_offset_x_set(Evas_Object *obj, const char *part, const char *state, double value, int val)
 {
    GET_PD_OR_RETURN(0);
    //printf("SET GRADIENT REL1 OFFSETX for part: %s state: %s [TO %d]\n", part, state, val);
@@ -4932,7 +4903,7 @@ edje_edit_state_gradient_rel1_offset_x_set(Evas_Object *obj, const char *part, c
 }
 
 EAPI Eina_Bool
-edje_edit_state_gradient_rel1_offset_y_set(Evas_Object *obj, const char *part, const char *state, int val)
+edje_edit_state_gradient_rel1_offset_y_set(Evas_Object *obj, const char *part, const char *state, double value, int val)
 {
    GET_PD_OR_RETURN(0);
    //printf("SET GRADIENT REL1 OFFSETY for part: %s state: %s [TO %d]\n", part, state, val);
@@ -4943,7 +4914,7 @@ edje_edit_state_gradient_rel1_offset_y_set(Evas_Object *obj, const char *part, c
 }
 
 EAPI Eina_Bool
-edje_edit_state_gradient_rel2_offset_x_set(Evas_Object *obj, const char *part, const char *state, int val)
+edje_edit_state_gradient_rel2_offset_x_set(Evas_Object *obj, const char *part, const char *state, double value, int val)
 {
    GET_PD_OR_RETURN(0);
    //printf("SET GRADIENT REL2 OFFSETX for part: %s state: %s [TO %d]\n", part, state, val);
@@ -4954,7 +4925,7 @@ edje_edit_state_gradient_rel2_offset_x_set(Evas_Object *obj, const char *part, c
 }
 
 EAPI Eina_Bool
-edje_edit_state_gradient_rel2_offset_y_set(Evas_Object *obj, const char *part, const char *state, int val)
+edje_edit_state_gradient_rel2_offset_y_set(Evas_Object *obj, const char *part, const char *state, double value, int val)
 {
    GET_PD_OR_RETURN(0);
    //printf("SET GRADIENT REL2 OFFSETY for part: %s state: %s [TO %d]\n", part, state, val);
@@ -5907,7 +5878,7 @@ _edje_generate_source_of_program(Evas_Object *obj, const char *program, FILE *f)
 }
 
 static void
-_edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *state, FILE *f)
+_edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *state, double value, FILE *f)
 {
    Eina_List *l, *ll;
    Edje_Real_Part *rp;
@@ -6008,7 +5979,7 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
 	fprintf(f, I5"image {\n");
 	fprintf(f, I6"normal: \"%s\";\n", _edje_image_name_find(obj, pd->image.id));
 
-	ll = edje_edit_state_tweens_list_get(obj, part, state);
+	ll = edje_edit_state_tweens_list_get(obj, part, state, value);
 	EINA_LIST_FOREACH(ll, l, data)
 	  fprintf(f, I6"tween: \"%s\";\n", data);
 	edje_edit_string_list_free(ll);
@@ -6089,7 +6060,7 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
      {
 	fprintf(f, I5"gradient {\n");
 	fprintf(f, I6"type: \"%s\";\n", pd->gradient.type);
-	str = edje_edit_state_gradient_spectra_get(obj, part, state);
+	str = edje_edit_state_gradient_spectra_get(obj, part, state, value);
 	if (str)
 	  {
 		fprintf(f, I6"spectrum: \"%s\";\n", str);
@@ -6102,7 +6073,7 @@ _edje_generate_source_of_state(Evas_Object *obj, const char *part, const char *s
    //External
    if (rp->part->type == EDJE_PART_TYPE_EXTERNAL)
      {
-	if ((ll = (Eina_List *)edje_edit_state_external_params_list_get(obj, part, state)))
+	if ((ll = (Eina_List *)edje_edit_state_external_params_list_get(obj, part, state, value)))
 	  {
 	     Edje_External_Param *p;
 
@@ -6199,7 +6170,16 @@ _edje_generate_source_of_part(Evas_Object *obj, const char *part, FILE *f)
    //Descriptions
    ll = edje_edit_part_states_list_get(obj, part);
    EINA_LIST_FOREACH(ll, l, data)
-     _edje_generate_source_of_state(obj, part, data, f);
+     {
+	char state[512], *delim;
+	double value;
+	strncpy(state, data, sizeof(state) - 1); /* if we go over it, too bad.. the list of states may need to change to provide name and value separated */
+	delim = strchr(state, ' ');
+	*delim = '\0';
+	delim++;
+	value = strtod(delim, NULL);
+	_edje_generate_source_of_state(obj, part, state, value, f);
+     }
    edje_edit_string_list_free(ll);
 
    fprintf(f, I3"}\n");//part