TH - ransitions - mark lots of them to be affected by transition multi

18 files changed, 863 insertions, 104 deletions

diff --git a/data/elementary/themes/edc/border.edc b/data/elementary/themes/edc/border.edc
index beba2a99fc..2aa1349a4d 100644
--- a/data/elementary/themes/edc/border.edc
+++ b/data/elementary/themes/edc/border.edc
@@ -98,7 +98,7 @@ group { name: "e/widgets/border/volume";
          }
          program { name: "show_volume2";
             action: STATE_SET "show" 0.0;
-            transition: SINUSOIDAL 0.3;
+            transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
             target: "clip";
          }
 
@@ -110,7 +110,7 @@ group { name: "e/widgets/border/volume";
          }
          program { name: "hide_volume1";
             action: STATE_SET "default" 0.0;
-            transition: SINUSOIDAL 0.5;
+            transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
             target: "clip";
             after: "hide_volume2";
          }
@@ -612,13 +612,13 @@ group { name: "e/widgets/border/default/border";
       }
       program { name: "urg1";
          action: STATE_SET "bounce2" 0.0;
-         transition: DECELERATE 0.4;
+         transition: DECELERATE 0.4 USE_DURATION_FACTOR 1;
          target: "icon";
          after: "urg2";
       }
       program { name: "urg2";
          action: STATE_SET "bounce1" 0.0;
-         transition: ACCELERATE 0.3;
+         transition: ACCELERATE 0.3 USE_DURATION_FACTOR 1;
          target: "icon";
          after: "urg1";
       }
diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc
index f7e3e0be99..ea1db457b3 100644
--- a/data/elementary/themes/edc/comp.edc
+++ b/data/elementary/themes/edc/comp.edc
@@ -311,11 +311,11 @@ group { name: "e/comp/frame/default";
          name: "focus_on";
          signal: "e,state,focused"; source: "e";
          action: STATE_SET "focused" 0.0;
-         transition: SINUSOIDAL 0.1;
+         transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
          targets: "glow" "focus-clipper";
          sequence {
              action: STATE_SET "default" 0.0;
-             transition: SINUSOIDAL 0.4;
+             transition: SINUSOIDAL 0.4 USE_DURATION_FACTOR 1;
              target: "glow";
          }
       }
@@ -323,7 +323,7 @@ group { name: "e/comp/frame/default";
          name: "focus_off";
          signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.1;
+         transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
          target: "focus-clipper";
          sequence {
              action: STATE_SET "default" 0.0;
@@ -333,11 +333,11 @@ group { name: "e/comp/frame/default";
       program { name: "urgent1";
          signal: "e,state,urgent"; source: "e";
          action: STATE_SET "focused" 0.0;
-         transition: SINUSOIDAL 0.3;
+         transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
          target: "glow";
          sequence {
              action: STATE_SET "default" 0.0;
-             transition: SINUSOIDAL 0.3;
+             transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
              target: "glow";
              after: "urgent1";
          }
@@ -345,7 +345,7 @@ group { name: "e/comp/frame/default";
       program {
          signal: "e,state,not_urgent"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.6 CURRENT;
+         transition: SINUSOIDAL 0.6 CURRENT USE_DURATION_FACTOR 1;
          target: "glow";
       }
       program { signal: "e,state,focus,disabled"; source: "e";
diff --git a/data/elementary/themes/edc/comp_compat.edc b/data/elementary/themes/edc/comp_compat.edc
index ffc9990b37..ca6ce18715 100644
--- a/data/elementary/themes/edc/comp_compat.edc
+++ b/data/elementary/themes/edc/comp_compat.edc
@@ -84,7 +84,7 @@ group { name: "e/comp/border/default";
          name: "visible_on";
          signal: "e,state,visible,on"; source: "e";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.15;
+         transition: DECELERATE 0.15 USE_DURATION_FACTOR 1;
          target: "clipper";
          target: "shower";
          after: "show2";
@@ -96,7 +96,7 @@ group { name: "e/comp/border/default";
          name: "visible_off";
          signal: "e,state,visible,off"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.30;
+         transition: DECELERATE 0.30 USE_DURATION_FACTOR 1;
          target: "clipper";
          target: "shower";
          after: "hide2";
@@ -109,47 +109,47 @@ group { name: "e/comp/border/default";
          name: "focus_on";
          signal: "e,state,focus,on"; source: "e";
          action: STATE_SET "focused" 0.0;
-         transition: SINUSOIDAL 0.1;
+         transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
          target: "glow";
          target: "focus-clipper";
          after: "focus2";
       }
       program { name: "focus2";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.4;
+         transition: SINUSOIDAL 0.4 USE_DURATION_FACTOR 1;
          target: "glow";
       }
       program {
          name: "focus_off";
          signal: "e,state,focus,off"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.1;
+         transition: SINUSOIDAL 0.1 USE_DURATION_FACTOR 1;
          target: "focus-clipper";
          after: "focus_off2";
       }
       program {
          name: "focus_off2";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.4;
+         transition: SINUSOIDAL 0.4 USE_DURATION_FACTOR 1;
          target: "glow";
       }
       program { name: "urgent1";
          signal: "e,state,urgent,on"; source: "e";
          action: STATE_SET "focused" 0.0;
-         transition: SINUSOIDAL 0.3;
+         transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
          target: "glow";
          after: "urgent2";
       }
       program { name: "urgent2";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.3;
+         transition: SINUSOIDAL 0.3 USE_DURATION_FACTOR 1;
          target: "glow";
          after: "urgent1";
       }
       program {
          signal: "e,state,urgent,off"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.6 CURRENT;
+         transition: SINUSOIDAL 0.6 CURRENT USE_DURATION_FACTOR 1;
          target: "glow";
       }
  */
@@ -187,13 +187,13 @@ group { name: "e/comp/border/rotate";
          signal: "e,state,focus,on"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.swallow.content";
-         transition: LINEAR 0.3;
+         transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
       }
       program { name: "focus_off3";
          signal: "e,state,focus,off"; source: "e";
          action: STATE_SET "focus-out" 0.0;
          target: "e.swallow.content";
-         transition: LINEAR 0.3;
+         transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
       }
    }
 }
@@ -401,7 +401,7 @@ group { name: "e/comp/border/fullscreen";
          name: "visible_on";
          signal: "e,state,visible,on"; source: "e";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.25;
+         transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
          target: "scr_shadow";
          target: "scr_shade";
       }
@@ -409,7 +409,7 @@ group { name: "e/comp/border/fullscreen";
          name: "visible_on2";
          signal: "e,state,visible,on"; source: "e";
          action: STATE_SET "visible1" 0.0;
-         transition: DECELERATE 0.05;
+         transition: DECELERATE 0.05 USE_DURATION_FACTOR 1;
          target: "clipper";
          target: "shower";
          target: "fader";
@@ -417,7 +417,7 @@ group { name: "e/comp/border/fullscreen";
       }
       program { name: "show2";
          action: STATE_SET "visible2" 0.0;
-         transition: DECELERATE 0.20;
+         transition: DECELERATE 0.20 USE_DURATION_FACTOR 1;
          target: "clipper";
          target: "shower";
          target: "fader";
@@ -430,7 +430,7 @@ group { name: "e/comp/border/fullscreen";
          name: "visible_off";
          signal: "e,state,visible,off"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.25;
+         transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
          target: "scr_shadow";
          target: "scr_shade";
       }
@@ -438,7 +438,7 @@ group { name: "e/comp/border/fullscreen";
          name: "visible_off2";
          signal: "e,state,visible,off"; source: "e";
          action: STATE_SET "visible1" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "clipper";
          target: "shower";
          target: "fader";
@@ -446,7 +446,7 @@ group { name: "e/comp/border/fullscreen";
       }
       program { name: "hide2";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.05;
+         transition: DECELERATE 0.05 USE_DURATION_FACTOR 1;
          target: "clipper";
          target: "shower";
          target: "fader";
diff --git a/data/elementary/themes/edc/deskmirror.edc b/data/elementary/themes/edc/deskmirror.edc
index 2e5fab45db..c4f8f5d5ed 100644
--- a/data/elementary/themes/edc/deskmirror.edc
+++ b/data/elementary/themes/edc/deskmirror.edc
@@ -175,7 +175,7 @@ group { name: "e/deskmirror/frame/default";
       }
       program { name: "go_big2";
          action: STATE_SET "urgent2" 0.0;
-         transition: LINEAR 0.5;
+         transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
          target: "clone";
          after: "go_big";
       }
@@ -188,7 +188,7 @@ group { name: "e/deskmirror/frame/default";
       }
       program { name: "go_hid";
          action: STATE_SET "default" 0.0;
-         transition: LINEAR 0.5;
+         transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
          target: "clone";
       }
       program { name: "shon";
@@ -242,12 +242,12 @@ group { name: "e/deskmirror/frame/default";
       }
       program { name: "iconify";
          action: STATE_SET "iconic" 0.0;
-         transition: ACCELERATE 0.2 CURRENT;
+         transition: ACCELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
          target: "spacer";
       }
       program { name: "uniconify";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.2 CURRENT;
+         transition: DECELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
          target: "spacer";
       }
       program {
@@ -426,12 +426,12 @@ group { "e/deskmirror/frame/borderless";
       }
       program { name: "iconify";
          action: STATE_SET "iconic" 0.0;
-         transition: ACCELERATE 0.2 CURRENT;
+         transition: ACCELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
          target: "spacer";
       }
       program { name: "uniconify";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.2 CURRENT;
+         transition: DECELERATE 0.2 CURRENT USE_DURATION_FACTOR 1;
          target: "spacer";
       }
       program {
@@ -460,7 +460,7 @@ group { "e/deskmirror/frame/borderless";
       }
       program { name: "go_big2";
          action: STATE_SET "urgent2" 0.0;
-         transition: LINEAR 0.5;
+         transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
          target: "clone";
          after: "go_big";
       }
@@ -473,7 +473,7 @@ group { "e/deskmirror/frame/borderless";
       }
       program { name: "go_hid";
          action: STATE_SET "default" 0.0;
-         transition: LINEAR 0.5;
+         transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
          target: "clone";
       }
    }
diff --git a/data/elementary/themes/edc/efl/panel.edc b/data/elementary/themes/edc/efl/panel.edc
index 6ad3afc727..afe22f3440 100644
--- a/data/elementary/themes/edc/efl/panel.edc
+++ b/data/elementary/themes/edc/efl/panel.edc
@@ -1,15 +1,14 @@
-group { name: "efl/panel"; data.item: "version" "123";
-   data {
-      item: "handler_size" "30";
-   }
+group { name: "efl/panel";
+   data.item: "version" "123";
+   data.item: "handler_size" "30";
    parts {
-      part { name: "efl.content";
-         type: SWALLOW;
+      part { name: "efl.content"; type: SWALLOW;
          description { state: "default" 0.0;
          }
       }
    }
 }
+
 group { name: "efl/panel/scrollable/left"; data.item: "version" "123";
    parts {
       part { name: "efl.panel_area";
@@ -832,3 +831,766 @@ group { name: "efl/panel/bottom";
       }
    }
 }
+
+#if 0
+group { name: "elm/scroller/panel/left/default";
+   parts {
+      part { name: "elm.panel_area";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            rel2.relative: 0.0 1.0;
+            align: 0.0 0.5;
+            fixed: 1 1;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "elm.event_area";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            rel1 {
+               relative: 1.0 0.0;
+               to: "elm.panel_area";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               to: "elm.panel_area";
+            }
+            align: 0.0 0.5;
+            fixed: 1 1;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "access.outline";
+         type: RECT;
+         repeat_events: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.panel_area";
+            rel2.to: "elm.panel_area";
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "bg";
+         type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "elm.panel_area";
+            rel2.to: "elm.panel_area";
+            color: 64 64 64 255;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "elm.swallow.content";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            rel1.to: "elm.panel_area";
+            rel2.to: "elm.panel_area";
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
+   programs {
+      program { name: "active";
+         signal: "elm,state,content,visible";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "elm.panel_area";
+         target: "elm.event_area";
+         target: "bg";
+         target: "elm.swallow.content";
+      }
+      program { name: "inactive";
+         signal: "elm,state,content,hidden";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.panel_area";
+         target: "elm.event_area";
+         target: "bg";
+         target: "elm.swallow.content";
+      }
+   }
+}
+
+group { name: "elm/scroller/panel/right/default";
+   parts {
+      part { name: "elm.event_area";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            rel2.relative: 0.0 1.0;
+            align: 0.0 0.5;
+            fixed: 1 1;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "elm.panel_area";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            rel1 {
+               relative: 1.0 0.0;
+               to: "elm.event_area";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               to: "elm.event_area";
+            }
+            align: 0.0 0.5;
+            fixed: 1 1;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "access.outline";
+         type: RECT;
+         repeat_events: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.panel_area";
+            rel2.to: "elm.panel_area";
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "bg";
+         type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "elm.panel_area";
+            rel2.to: "elm.panel_area";
+            color: 64 64 64 255;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "elm.swallow.content";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            rel1.to: "elm.panel_area";
+            rel2.to: "elm.panel_area";
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
+   programs {
+      program { name: "active";
+         signal: "elm,state,content,visible";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "elm.panel_area";
+         target: "elm.event_area";
+         target: "bg";
+         target: "elm.swallow.content";
+      }
+      program { name: "inactive";
+         signal: "elm,state,content,hidden";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.panel_area";
+         target: "elm.event_area";
+         target: "bg";
+         target: "elm.swallow.content";
+      }
+   }
+}
+
+group { name: "elm/scroller/panel/top/default";
+   parts {
+      part { name: "elm.panel_area";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            rel2.relative: 1.0 0.0;
+            align: 0.5 0.0;
+            fixed: 1 1;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "elm.event_area";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            rel1 {
+               relative: 0.0 1.0;
+               to: "elm.panel_area";
+            }
+            rel2 {
+               relative: 1.0 1.0;
+               to: "elm.panel_area";
+            }
+            align: 0.5 0.0;
+            fixed: 1 1;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "access.outline";
+         type: RECT;
+         repeat_events: 1;
+         description { state: "default" 0.0;
+            rel1.to: "elm.panel_area";
+            rel2.to: "elm.panel_area";
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "bg";
+         type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "elm.panel_area";
+            rel2.to: "elm.panel_area";
+            color: 64 64 64 255;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "elm.swallow.content";
+         type: SWALLOW;
+         description { state: "default" 0.0;
+            rel1.to: "elm.panel_area";
+            rel2.to: "elm.panel_area";
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
+   programs {
+      program { name: "active";
+         signal: "elm,state,content,visible";
+         source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "elm.panel_area";
+         target: "elm.event_area";
+         target: "bg";
+         target: "elm.swallow.content";
+      }
+      program { name: "inactive";
+         signal: "elm,state,content,hidden";
+         source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.panel_area";
+         target: "elm.event_area";
+         target: "bg";
+         target: "elm.swallow.content";
+      }
+   }
+}
+
+group { name: "elm/scroller/panel/bottom/default";
+   parts {
+      part { name: "elm.event_area"; type: SWALLOW;
+         description { state: "default" 0.0;
+            rel2.relative: 1.0 0.0;
+            align: 0.5 0.0;
+            fixed: 1 1;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "elm.panel_area"; type: SWALLOW;
+         description { state: "default" 0.0;
+            rel.to: "elm.event_area";
+            rel1.relative: 0.0 1.0;
+            rel2.relative: 1.0 1.0;
+            align: 0.5 0.0;
+            fixed: 1 1;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "access.outline"; type: RECT; repeat_events: 1;
+         description { state: "default" 0.0;
+            rel.to: "elm.panel_area";
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "bg"; type: RECT;
+         description { state: "default" 0.0;
+            rel.to: "elm.panel_area";
+            color: 64 64 64 255;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "elm.swallow.content"; type: SWALLOW;
+         description { state: "default" 0.0;
+            rel.to: "elm.panel_area";
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+   }
+   programs {
+      program { signal: "elm,state,content,visible"; source: "elm";
+         action: STATE_SET "visible" 0.0;
+         target: "elm.panel_area";
+         target: "elm.event_area";
+         target: "bg";
+         target: "elm.swallow.content";
+      }
+      program { signal: "elm,state,content,hidden"; source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.panel_area";
+         target: "elm.event_area";
+         target: "bg";
+         target: "elm.swallow.content";
+      }
+   }
+}
+
+group { name: "elm/panel/left/default";
+   data.item: "focus_highlight" "on";
+   script {
+      public is_rtl = 0;
+   }
+   parts {
+      part { name: "shadow"; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel.to: "base";
+            WIN_SHADOW_SMALL;
+         }
+      }
+      part { name: "glow"; type: RECT; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel.to: "base";
+            color: 51 153 255 255;
+            visible: 0;
+            offscale;
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: -5 -5;
+            rel2.offset: 4 4;
+            visible: 1;
+         }
+      }
+      part { name: "all"; type: SPACER;
+         description { state: "default" 0.0;
+         }
+      }
+      part { name: "base"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.to_x: "all";
+            rel2.to_x: "elm.swallow.event";
+            rel2.relative: 0.0 1.0;
+            color: 64 64 64 255;
+         }
+      }
+      part { name: "elm.swallow.content"; type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel.to: "base";
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            offscale;
+         }
+      }
+      part { name: "elm.swallow.event"; type: SWALLOW;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: 30 30; max: 30 999999;
+            align: 1.0 0.5;
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 1.0 1.0;
+            color: 0 0 0 0;
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            align: 0.0 0.5;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 0.0 1.0;
+         }
+      }
+      part { name: "btn"; type: RECT;
+         description { state: "default" 0.0;
+            rel.to: "elm.swallow.event";
+            color: 0 0 0 0;
+         }
+         description { state: "hidden" 0.0;
+            rel.to: "elm.swallow.event";
+         }
+      }
+      part { name: "icn"; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: 30 30; max: 30 30;
+            rel.to: "btn";
+            image.normal: "i-arrow-l";
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            image.normal: "i-arrow-r";
+         }
+      }
+   }
+   programs {
+      program { signal: "mouse,clicked,1"; source: "btn";
+         action: SIGNAL_EMIT "elm,action,panel,toggle" "elm";
+      }
+      program { signal: "elm,action,show"; source: "elm";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.2;
+         target: "elm.swallow.event";
+         target: "base";
+      }
+      program { signal: "elm,action,show"; source: "elm";
+         script {
+            if (get_int(is_rtl) == 0)
+              set_state(PART:"icn", "default", 0.0);
+            else
+              set_state(PART:"icn", "hidden", 0.0);
+         }
+      }
+      program { signal: "elm,action,show,no_animate"; source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "elm.swallow.event";
+         target: "base";
+      }
+      program { signal: "elm,action,show,no_animate"; source: "elm";
+         script {
+            if (get_int(is_rtl) == 0)
+              set_state(PART:"icn", "default", 0.0);
+            else
+              set_state(PART:"icn", "hidden", 0.0);
+         }
+      }
+      program { signal: "edje,state,rtl"; source: "edje";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.swallow.event", st, 30, vl);
+            if (!strcmp(st, "default"))
+              set_state(PART:"icn", "hidden", 0.0);
+            else
+              set_state(PART:"icn", "default", 0.0);
+            set_int(is_rtl, 1);
+         }
+      }
+      program { signal: "edje,state,ltr"; source: "edje";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.swallow.event", st, 30, vl);
+            if (!strcmp(st, "default"))
+              set_state(PART:"icn", "default", 0.0);
+            else
+              set_state(PART:"icn", "hidden", 0.0);
+            set_int(is_rtl, 0);
+         }
+      }
+      program { signal: "elm,action,hide"; source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         transition: ACCELERATE 0.2;
+         target: "elm.swallow.event";
+      }
+      program { signal: "elm,action,hide"; source: "elm";
+         script {
+            if (get_int(is_rtl) == 0)
+              set_state(PART:"icn", "hidden", 0.0);
+            else
+              set_state(PART:"icn", "default", 0.0);
+         }
+      }
+      program { name: "hide1";
+         signal: "elm,action,hide"; source: "elm";
+         script {
+            new x, y, w, h;
+            if (get_int(is_rtl) == 0) {
+               custom_state(PART:"base", "default", 0.0);
+               set_state_val(PART:"base", STATE_REL1, -1.0, 0.0);
+               get_geometry(PART:"elm.swallow.event", x, y, w, h);
+               set_state_val(PART:"base", STATE_REL1_OFFSET, w, 0);
+            } else {
+               custom_state(PART:"base", "default", 0.0);
+               set_state_val(PART:"base", STATE_REL1, -1.0, 0.0);
+               set_state_val(PART:"base", STATE_REL2, -2.0, 1.0);
+               get_geometry(PART:"elm.swallow.event", x, y, w, h);
+               set_state_val(PART:"base", STATE_REL2_OFFSET, -w, 0);
+            }
+         }
+         after: "hide2";
+      }
+      program { name: "hide2";
+         action: STATE_SET "custom" 0.0;
+         transition: ACCELERATE 0.3;
+         target: "base";
+      }
+      program { signal: "elm,action,hide,no_animate"; source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "elm.swallow.event";
+      }
+      program { signal: "elm,action,hide,no_animate"; source: "elm";
+         script {
+            if (get_int(is_rtl) == 0)
+              set_state(PART:"icn", "hidden", 0.0);
+            else
+              set_state(PART:"icn", "default", 0.0);
+         }
+      }
+      program { name: "hide1_no_animate";
+         signal: "elm,action,hide,no_animate"; source: "elm";
+         script {
+            new x, y, w, h;
+            if (get_int(is_rtl) == 0) {
+               custom_state(PART:"base", "default", 0.0);
+               set_state_val(PART:"base", STATE_REL1, -1.0, 0.0);
+               get_geometry(PART:"elm.swallow.event", x, y, w, h);
+               set_state_val(PART:"base", STATE_REL1_OFFSET, w, 0);
+            } else {
+               custom_state(PART:"base", "default", 0.0);
+               set_state_val(PART:"base", STATE_REL1, -1.0, 0.0);
+               set_state_val(PART:"base", STATE_REL2, -2.0, 1.0);
+               get_geometry(PART:"elm.swallow.event", x, y, w, h);
+               set_state_val(PART:"base", STATE_REL2_OFFSET, -w, 0);
+            }
+         }
+         after: "hide2_no_animate";
+      }
+      program { name: "hide2_no_animate";
+         action: STATE_SET "custom" 0.0;
+         target: "base";
+      }
+      program { signal: "elm,action,focus_highlight,show"; source: "elm";
+         action: STATE_SET "focused" 0.0;
+         transition: ACCELERATE 0.2;
+         target: "glow";
+      }
+      program { signal: "elm,action,focus_highlight,hide"; source: "elm";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.5;
+         target: "glow";
+      }
+   }
+}
+
+group { name: "elm/panel/right/default";
+   inherit: "elm/panel/left/default";
+   parts {
+      part { name: "base";
+         description { state: "default" 0.0;
+            rel1.relative: 1.0 0.0;
+            rel1.to_x: "elm.swallow.event";
+            rel1.offset: 3 0;
+            rel2.relative: 1.0 1.0;
+            rel2.to_x: "all";
+            rel2.offset: -1 -1;
+         }
+      }
+      part { name: "elm.swallow.event";
+         description { state: "default" 0.0;
+            align: 0.0 0.5;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 0.0 1.0;
+         }
+         description { state: "hidden" 0.0;
+            align: 1.0 0.5;
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 1.0 1.0;
+         }
+      }
+      part { name: "icn";
+         description { state: "default" 0.0;
+            image.normal: "i-arrow-r";
+         }
+         description { state: "hidden" 0.0;
+            image.normal: "i-arrow-l";
+         }
+      }
+   }
+   programs {
+      program { name: "hide1";
+         script {
+            new x, y, w, h;
+
+            custom_state(PART:"base", "default", 0.0);
+            set_state_val(PART:"base", STATE_REL1, 1.0, 0.0);
+            set_state_val(PART:"base", STATE_REL2, 2.0, 1.0);
+            get_geometry(PART:"elm.swallow.event", x, y, w, h);
+            set_state_val(PART:"base", STATE_REL2_OFFSET, -w, 0);
+         }
+      }
+   }
+}
+
+group { name: "elm/panel/top/default";
+   inherit: "elm/panel/left/default";
+   parts {
+      part { name: "base";
+         description { state: "default" 0.0;
+            rel1.relative: 0.0 0.0;
+            rel1.to_x: "all";
+            rel1.to_y: "all";
+            rel2.relative: 1.0 0.0;
+            rel2.to_x: "all";
+            rel2.to_y: "elm.swallow.event";
+         }
+      }
+      part { name: "elm.swallow.event";
+         description { state: "default" 0.0;
+            min: 30 30; max: 999999 30;
+            align: 0.5 1.0;
+            rel1.relative: 0.0 1.0;
+            rel2.relative: 1.0 1.0;
+         }
+         description { state: "hidden" 0.0;
+            align: 0.5 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 0.0;
+         }
+      }
+      part { name: "icn";
+         description { state: "default" 0.0;
+            image.normal: "i-arrow-u";
+         }
+         description { state: "hidden" 0.0;
+            image.normal: "i-arrow-d";
+         }
+      }
+   }
+   programs {
+      program { name: "hide1";
+         script {
+            new x, y, w, h;
+            custom_state(PART:"base", "default", 0.0);
+            set_state_val(PART:"base", STATE_REL1, 0.0, -1.0);
+            set_state_val(PART:"base", STATE_REL2, 1.0, 0.0);
+            get_geometry(PART:"elm.swallow.event", x, y, w, h);
+            set_state_val(PART:"base", STATE_REL1_OFFSET, 0, h);
+         }
+      }
+      program {
+         signal: "elm,action,show"; source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "icn";
+      }
+      program {
+         signal: "edje,state,rtl"; 
+         source: "edje";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.swallow.event", st, 30, vl);
+            if (!strcmp(st, "default"))
+              set_state(PART:"icn", "default", 0.0);
+            else
+              set_state(PART:"icn", "hidden", 0.0);
+         }
+      }
+      program {
+         signal: "edje,state,ltr"; 
+         source: "edje";
+         script {
+            new st[31];
+            new Float:vl;
+            get_state(PART:"elm.swallow.event", st, 30, vl);
+            if (!strcmp(st, "default"))
+              set_state(PART:"icn", "default", 0.0);
+            else
+              set_state(PART:"icn", "hidden", 0.0);
+         }
+      }
+      program {
+         signal: "elm,action,hide"; source: "elm";
+         action: STATE_SET "hidden" 0.0;
+         target: "icn";
+      }
+   }
+}
+
+group { name: "elm/panel/bottom/default";
+   inherit: "elm/panel/top/default";
+   parts {
+      part { name: "base";
+         description { state: "default" 0.0;
+            rel1.relative: 0.0 1.0;
+            rel1.to_x: "all";
+            rel1.to_y: "elm.swallow.event";
+            rel2.relative: 1.0 1.0;
+            rel2.to_x: "all";
+            rel2.to_y: "all";
+         }
+      }
+      part { name: "elm.swallow.event";
+         description { state: "default" 0.0;
+            align: 0.5 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 0.0;
+         }
+         description { state: "hidden" 0.0;
+            align: 0.5 1.0;
+            rel1.relative: 0.0 1.0;
+            rel2.relative: 1.0 1.0;
+         }
+      }
+      part { name: "icn";
+         description { state: "default" 0.0;
+            image.normal: "i-arrow-d";
+         }
+         description { state: "hidden" 0.0;
+            image.normal: "i-arrow-u";
+         }
+      }
+   }
+   programs {
+      program { name: "hide1";
+         script {
+            new x, y, w, h;
+            custom_state(PART:"base", "default", 0.0);
+            set_state_val(PART:"base", STATE_REL1, 0.0, 1.0);
+            set_state_val(PART:"base", STATE_REL2, 1.0, 2.0);
+            get_geometry(PART:"elm.swallow.event", x, y, w, h);
+            set_state_val(PART:"base", STATE_REL2_OFFSET, 0, -h);
+         }
+      }
+   }
+}
+#endif
diff --git a/data/elementary/themes/edc/elm/panel.edc b/data/elementary/themes/edc/elm/panel.edc
index cf153ffc21..926b45da8e 100644
--- a/data/elementary/themes/edc/elm/panel.edc
+++ b/data/elementary/themes/edc/elm/panel.edc
@@ -1,10 +1,7 @@
 group { name: "elm/scroller/panel/default";
-   data {
-      item: "handler_size" "30";
-   }
+   data.item: "handler_size" "30";
    parts {
-      part { name: "elm.swallow.content";
-         type: SWALLOW;
+      part { name: "elm.swallow.content"; type: SWALLOW;
          description { state: "default" 0.0;
          }
       }
diff --git a/data/elementary/themes/edc/gadman.edc b/data/elementary/themes/edc/gadman.edc
index 55ed610e2f..251c9d66db 100644
--- a/data/elementary/themes/edc/gadman.edc
+++ b/data/elementary/themes/edc/gadman.edc
@@ -55,7 +55,7 @@ group { name: "e/gadman/full_bg";
       program {
          signal: "e,state,visibility,show"; source: "e";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.4;
+         transition: DECELERATE 0.4 USE_DURATION_FACTOR 1;
          target: "bg";
       }
       program {
@@ -66,7 +66,7 @@ group { name: "e/gadman/full_bg";
       program {
          signal: "e,state,visibility,hide"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.4;
+         transition: DECELERATE 0.4 USE_DURATION_FACTOR 1;
          target: "bg";
          after: "hide_stop";
       }
@@ -79,7 +79,7 @@ group { name: "e/gadman/full_bg";
       program {
          signal: "e,state,visibility,show,custom"; source: "e";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.4;
+         transition: DECELERATE 0.4 USE_DURATION_FACTOR 1;
          target: "custom_bg";
       }
       program {
@@ -90,7 +90,7 @@ group { name: "e/gadman/full_bg";
       program {
          signal: "e,state,visibility,hide,custom"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.4;
+         transition: DECELERATE 0.4 USE_DURATION_FACTOR 1;
          target: "custom_bg";
          after: "hide_stop";
       }
diff --git a/data/elementary/themes/edc/ibar-ibox.edc b/data/elementary/themes/edc/ibar-ibox.edc
index 1475d16d3a..507cce76a3 100644
--- a/data/elementary/themes/edc/ibar-ibox.edc
+++ b/data/elementary/themes/edc/ibar-ibox.edc
@@ -250,12 +250,12 @@ group { name: "e/modules/ibox/icon";
 //      }
       program { signal: "e,state,starting"; source: "e";
          action: STATE_SET "starting" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "content";
       }
       program { signal: "e,state,started"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: ACCELERATE 0.2;
+         transition: ACCELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "content";
       }
       /////////////////////////////////////////////////////////////
@@ -264,14 +264,14 @@ group { name: "e/modules/ibox/icon";
          target: "indicator1";
          target: "indicator2";
          target: "indicator3";
-         transition: ACCELERATE 0.2;
+         transition: ACCELERATE 0.2 USE_DURATION_FACTOR 1;
       }
       program { signal: "e,state,off"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "indicator1";
          target: "indicator2";
          target: "indicator3";
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
       }
       /////////////////////////////////////////////////////////////
       program { signal: "e,state,urgent"; source: "e";
@@ -405,17 +405,17 @@ group { name: "e/modules/ibox/icon_overlay";
                text_source: "e.text.label";
             }
             link.base: "e,origin,center" "e";
-            link.transition: SINUSOIDAL 0.1 CURRENT;
+            link.transition: SINUSOIDAL 0.1 CURRENT USE_DURATION_FACTOR 1;
          }
          desc { "left"; inherit: "default";
             align: 0.0 0.5;
             link.base: "e,origin,left" "e";
-            link.transition: SINUSOIDAL 0.1 CURRENT;
+            link.transition: SINUSOIDAL 0.1 CURRENT USE_DURATION_FACTOR 1;
          }
          desc { "right"; inherit: "default";
             align: 1.0 0.5;
             link.base: "e,origin,right" "e";
-            link.transition: SINUSOIDAL 0.1 CURRENT;
+            link.transition: SINUSOIDAL 0.1 CURRENT USE_DURATION_FACTOR 1;
          }
       }
       part { name: "bg"; type: RECT; mouse_events: 0;
@@ -467,12 +467,12 @@ group { name: "e/modules/ibox/icon_overlay";
 //      }
       program { signal: "e,state,starting"; source: "e";
          action: STATE_SET "starting" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "content";
       }
       program { signal: "e,state,started"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: ACCELERATE 0.2;
+         transition: ACCELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "content";
       }
       ///////////////////////////////////////////////////////////
@@ -510,24 +510,24 @@ group { name: "e/modules/ibox/icon_overlay";
       }
       program { signal: "e,action,show,label"; source: "e";
          action: STATE_SET "visible" 0.0;
-         transition: SINUSOIDAL 0.5;
+         transition: SINUSOIDAL 0.5 USE_DURATION_FACTOR 1;
          target: "e.text.label";
          target: "bg";
       }
       program { signal: "e,action,hide,label"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 1.0;
+         transition: SINUSOIDAL 1.0 USE_DURATION_FACTOR 1;
          target: "e.text.label";
          target: "bg";
       }
       program {
          action: STATE_SET visible 0.0;
-         transition: SINUSOIDAL 1.0;
+         transition: SINUSOIDAL 1.0 USE_DURATION_FACTOR 1;
          target: "bg";
       }
       program {
          action: STATE_SET default 0.0;
-         transition: SINUSOIDAL 1.0;
+         transition: SINUSOIDAL 1.0 USE_DURATION_FACTOR 1;
          target: "bg";
       }
       program { name: "go_passive2";
@@ -583,7 +583,7 @@ group { name: "e/modules/ibox/icon_overlay";
       }
       program { name: "go_big2";
          action: STATE_SET "huge" 0.0;
-         transition: LINEAR 0.5;
+         transition: LINEAR 0.5 USE_DURATION_FACTOR 1;
          target: "background";
       }
    }
diff --git a/data/elementary/themes/edc/init.edc b/data/elementary/themes/edc/init.edc
index e39d2c802e..d1b2936f49 100644
--- a/data/elementary/themes/edc/init.edc
+++ b/data/elementary/themes/edc/init.edc
@@ -121,7 +121,7 @@ group { name: "e/init/splash";
       }
       program { signal: "show"; source: "";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 1.0;
+         transition: DECELERATE 1.0 USE_DURATION_FACTOR 1;
          in: 1.0 0.0;
          target: "blanker";
       }
@@ -129,7 +129,7 @@ group { name: "e/init/splash";
          action: STATE_SET "active" 0.0;
          target: "logo";
          in: 1.5 0.0;
-         transition: SINUSOIDAL 0.8;
+         transition: SINUSOIDAL 0.8 USE_DURATION_FACTOR 1;
          after: "ready";
       }
       program { signal: "show"; source: "";
@@ -156,7 +156,7 @@ group { name: "e/init/splash";
       }
       program { name: "exit1";
          action: STATE_SET "faded" 0.0;
-         transition: SINUSOIDAL 1.0 CURRENT;
+         transition: SINUSOIDAL 1.0 CURRENT USE_DURATION_FACTOR 1;
          target: "fader";
          after: "exit2";
       }
@@ -207,7 +207,7 @@ group { name: "e/init/extra_screen";
       }
       program { signal: "show"; source: "";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 1.0;
+         transition: DECELERATE 1.0 USE_DURATION_FACTOR 1;
          in: 1.0 0.0;
          target: "blanker";
          after: "ready";
@@ -234,7 +234,7 @@ group { name: "e/init/extra_screen";
       }
       program { name: "exit1";
          action: STATE_SET "faded" 0.0;
-         transition: SINUSOIDAL 1.0 CURRENT;
+         transition: SINUSOIDAL 1.0 CURRENT USE_DURATION_FACTOR 1;
          target: "fader";
          after: "exit2";
       }
diff --git a/data/elementary/themes/edc/mixer.edc b/data/elementary/themes/edc/mixer.edc
index a1724424c8..c950907dd6 100644
--- a/data/elementary/themes/edc/mixer.edc
+++ b/data/elementary/themes/edc/mixer.edc
@@ -115,12 +115,12 @@ group { name: "e/modules/mixer/main";
    programs {
       program { name: "mute";
          action: STATE_SET "mute" 0.0;
-         transition: LINEAR 0.3;
+         transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
          target: "state";
       }
       program { name: "unmute";
          action: STATE_SET "default" 0.0;
-         transition: LINEAR 0.2;
+         transition: LINEAR 0.2 USE_DURATION_FACTOR 1;
          target: "state";
       }
    }
diff --git a/data/elementary/themes/edc/music_control.edc b/data/elementary/themes/edc/music_control.edc
index 4fa16bcd6f..8f782dea4c 100644
--- a/data/elementary/themes/edc/music_control.edc
+++ b/data/elementary/themes/edc/music_control.edc
@@ -305,7 +305,7 @@ group { name: "e/modules/music-control/popup";
       }
       program { signal: "mouse,up,1"; source: "*_btn";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 1.0;
+         transition: DECELERATE 1.0 USE_DURATION_FACTOR 1;
          target: "btn_back";
       }
       program { signal: "mouse,clicked,*"; source: "previous_btn";
diff --git a/data/elementary/themes/edc/pager.edc b/data/elementary/themes/edc/pager.edc
index b4a46b57ca..f9e89dee88 100644
--- a/data/elementary/themes/edc/pager.edc
+++ b/data/elementary/themes/edc/pager.edc
@@ -213,7 +213,7 @@ group { name: "e/modules/pager/desk";
       program { name: "sel";
          signal: "e,state,selected"; source: "e";
          action: STATE_SET "active" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "sel";
       }
       program { signal: "e,state,unselected"; source: "e";
@@ -222,7 +222,7 @@ group { name: "e/modules/pager/desk";
       }
       program { signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "sel";
       }
       program { signal: "e,preview,on"; source: "e";
@@ -518,22 +518,22 @@ group { name: "e/gadget/pager/plain/desk";
       }
       program { name: "on_left";
          action: STATE_SET "on_left" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "sel";
       }
       program { name: "on_top";
          action: STATE_SET "on_top" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "sel";
       }
       program { name: "on_right";
          action: STATE_SET "on_right" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "sel";
       }
       program { name: "on_bottom";
          action: STATE_SET "on_bottom" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "sel";
       }
       program { signal: "e,state,unselected"; source: "e";
@@ -831,22 +831,22 @@ group { name: "e/gadget/pager/default/desk";
       }
       program { name: "on_left";
          action: STATE_SET "on_left" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "sel";
       }
       program { name: "on_top";
          action: STATE_SET "on_top" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "sel";
       }
       program { name: "on_right";
          action: STATE_SET "on_right" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "sel";
       }
       program { name: "on_bottom";
          action: STATE_SET "on_bottom" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "sel";
       }
       program { signal: "e,state,unselected"; source: "e";
diff --git a/data/elementary/themes/edc/pager16.edc b/data/elementary/themes/edc/pager16.edc
index c4c15e348d..7af2cbfbe2 100644
--- a/data/elementary/themes/edc/pager16.edc
+++ b/data/elementary/themes/edc/pager16.edc
@@ -290,7 +290,7 @@ group { name: "e/modules/pager16/desk";
       program { name: "sel";
          signal: "e,state,selected"; source: "e";
          action: STATE_SET "active" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "sel";
       }
       program { signal: "e,state,unselected"; source: "e";
@@ -299,7 +299,7 @@ group { name: "e/modules/pager16/desk";
       }
       program { signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "sel";
       }
       program { name: "drop1";
diff --git a/data/elementary/themes/edc/scrollframe.edc b/data/elementary/themes/edc/scrollframe.edc
index 4c0ccc2565..edb4773234 100644
--- a/data/elementary/themes/edc/scrollframe.edc
+++ b/data/elementary/themes/edc/scrollframe.edc
@@ -166,12 +166,12 @@ group { name: "e/widgets/scrollframe";
       }
       program { signal: "mouse,in"; source: "sb_vbar_over";
          action: STATE_SET "over" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "base_vbar";
       }
       program { signal: "mouse,out"; source: "sb_vbar_over";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "base_vbar";
       }
       part { name: "y_vbar_up_mapper"; type: SPACER;
@@ -364,12 +364,12 @@ group { name: "e/widgets/scrollframe";
       }
       program { signal: "mouse,in"; source: "sb_hbar_over";
          action: STATE_SET "over" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "base_hbar";
       }
       program { signal: "mouse,out"; source: "sb_hbar_over";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "base_hbar";
       }
       part { name: "x_hbar_left_mapper"; type: SPACER;
diff --git a/data/elementary/themes/edc/shelf.edc b/data/elementary/themes/edc/shelf.edc
index 2dbefd5f6d..c97f83d068 100644
--- a/data/elementary/themes/edc/shelf.edc
+++ b/data/elementary/themes/edc/shelf.edc
@@ -239,49 +239,49 @@ target: "sh_vert_clip"; \
 #undef ORIENT_SATE
       program { signal: "e,state,scroll,begin"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.5 CURRENT;
+         transition: SINUSOIDAL 0.5 CURRENT USE_DURATION_FACTOR 1;
          target: "sh_l";
          target: "sh_t";
       }
       program { signal: "e,state,scroll,begin"; source: "e";
          action: STATE_SET "active" 0.0;
-         transition: SINUSOIDAL 0.5 CURRENT;
+         transition: SINUSOIDAL 0.5 CURRENT USE_DURATION_FACTOR 1;
          target: "sh_r";
          target: "sh_b";
       }
       program { signal: "e,state,scroll,middle"; source: "e";
          action: STATE_SET "active" 0.0;
-         transition: SINUSOIDAL 0.5 CURRENT;
+         transition: SINUSOIDAL 0.5 CURRENT USE_DURATION_FACTOR 1;
          target: "sh_l";
          target: "sh_t";
       }
       program { signal: "e,state,scroll,middle"; source: "e";
          action: STATE_SET "active" 0.0;
-         transition: SINUSOIDAL 0.5 CURRENT;
+         transition: SINUSOIDAL 0.5 CURRENT USE_DURATION_FACTOR 1;
          target: "sh_r";
          target: "sh_b";
       }
       program { signal: "e,state,scroll,end"; source: "e";
          action: STATE_SET "active" 0.0;
-         transition: SINUSOIDAL 0.5 CURRENT;
+         transition: SINUSOIDAL 0.5 CURRENT USE_DURATION_FACTOR 1;
          target: "sh_l";
          target: "sh_t";
       }
       program { signal: "e,state,scroll,end"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.5 CURRENT;
+         transition: SINUSOIDAL 0.5 CURRENT USE_DURATION_FACTOR 1;
          target: "sh_r";
          target: "sh_b";
       }
       program { signal: "e,state,scroll,none"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.5 CURRENT;
+         transition: SINUSOIDAL 0.5 CURRENT USE_DURATION_FACTOR 1;
          target: "sh_l";
          target: "sh_t";
       }
       program { signal: "e,state,scroll,none"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.5 CURRENT;
+         transition: SINUSOIDAL 0.5 CURRENT USE_DURATION_FACTOR 1;
          target: "sh_r";
          target: "sh_b";
       }
diff --git a/data/elementary/themes/edc/syscon.edc b/data/elementary/themes/edc/syscon.edc
index a28691623c..2374c0fdd0 100644
--- a/data/elementary/themes/edc/syscon.edc
+++ b/data/elementary/themes/edc/syscon.edc
@@ -196,13 +196,13 @@ group { name: "e/widgets/syscon/item/button";
       }
       program { signal: "e,state,focused"; source: "e";
          action: STATE_SET "focused" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "e.text.label";
          target: "sel";
       }
       program { signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "e.text.label";
          target: "sel";
       }
diff --git a/data/elementary/themes/edc/tasks.edc b/data/elementary/themes/edc/tasks.edc
index f977e62612..efa0a2ccbc 100644
--- a/data/elementary/themes/edc/tasks.edc
+++ b/data/elementary/themes/edc/tasks.edc
@@ -320,12 +320,12 @@ group { name:"e/modules/tasks/item";
 
       program { signal: "e,state,focused"; source: "e";
          action: STATE_SET "focused" 0.0;
-         transition: ACCELERATE 0.2;
+         transition: ACCELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "bar";
       }
       program { signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.2;
+         transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
          target: "bar";
       }
 
@@ -338,7 +338,7 @@ group { name:"e/modules/tasks/item";
       }
       program { signal: "state,default"; source: "int";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.2;
+         transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
          target: "icon2";
       }
       program { signal: "state,focused"; source: "int";
@@ -350,7 +350,7 @@ group { name:"e/modules/tasks/item";
       }
       program { signal: "state,focused"; source: "int";
          action: STATE_SET "focused" 0.0;
-         transition: SINUSOIDAL 0.2;
+         transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
          target: "icon2";
       }
       program { signal: "state,iconic"; source: "int";
@@ -362,7 +362,7 @@ group { name:"e/modules/tasks/item";
       }
       program { signal: "state,iconic"; source: "int";
          action: STATE_SET "iconic" 0.0;
-         transition: SINUSOIDAL 0.2;
+         transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
          target: "icon2";
       }
 
diff --git a/data/elementary/themes/edc/wizard.edc b/data/elementary/themes/edc/wizard.edc
index 324b1da616..f6fca2760b 100644
--- a/data/elementary/themes/edc/wizard.edc
+++ b/data/elementary/themes/edc/wizard.edc
@@ -131,7 +131,7 @@ group { name: "e/wizard/main";
    programs {
       program { signal: "show"; source: "";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 1.0;
+         transition: DECELERATE 1.0 USE_DURATION_FACTOR 1;
          target: "blanker";
       }
       program { signal: "mouse,down,1"; source: "base";