diff --git a/data/themes/edc/randr.edc b/data/themes/edc/randr.edc
index 14dfe5419..db5b6b6f2 100644
--- a/data/themes/edc/randr.edc
+++ b/data/themes/edc/randr.edc
@@ -22,6 +22,11 @@ group { name: "e/conf/randr/main/monitor";
          action: STATE_SET "cloned" 0.0;
          target: "e.swallow.stand";
       }
+      program {
+         signal: "e,state,uncloned"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "e.swallow.stand";
+      }
    }
 }
 
@@ -73,17 +78,6 @@ group { name: "e/conf/randr/main/frame";
             rel2.to: "e.swallow.preview";
          }
       }
-      part { name: "clone_bg"; type: RECT; mouse_events: 0;
-         description { state: "default" 0.0;
-            color: 0 0 0 64;
-            rel1.to: "e.box.clone";
-            rel2.to: "e.box.clone";
-         }
-         description { state: "cloned" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
       part { name: "e.box.clone"; type: BOX;
          clip_to: "clone_clip";
          description { state: "default" 0.0;
@@ -204,6 +198,10 @@ group { name: "e/conf/randr/main/frame";
             rel2.to: "base";
             FIXED_SIZE(69, 5)
          }
+         description { state: "cloned" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
       }
       part { name: "rsz1"; mouse_events: 0;
          description { state: "default" 0.0;
@@ -510,8 +508,8 @@ group { name: "e/conf/randr/main/frame";
       program {
          signal: "e,state,cloned"; source: "e";
          action: STATE_SET "cloned" 0.0;
-         target: "clone_bg";
          target: "clone_clip";
+         target: "scr_shine";
          target: "e.text.name";
          target: "e.text.resolution";
          target: "rsz1";
@@ -525,6 +523,25 @@ group { name: "e/conf/randr/main/frame";
          target: "e.event.resize";
          target: "e.event.indicator";
       }
+      program {
+         signal: "e,state,uncloned"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "clone_clip";
+         target: "scr_shine";
+         target: "e.text.name";
+         target: "e.text.resolution";
+         target: "rsz1";
+         target: "rsz2";
+         target: "rot1";
+         target: "rot2";
+         target: "arrow1";
+         target: "arrow2";
+         target: "e.event.arrow.show";
+         target: "e.event.rotate";
+         target: "e.event.resize";
+         target: "e.event.indicator";
+         after: "rrpulse1";
+      }
       program {
          signal: "e,state,drop,on"; source: "e";
          action: STATE_SET "active" 0.0;