diff --git a/data/themes/default.edc b/data/themes/default.edc
index f1865c528..76f0f3800 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -37075,7 +37075,176 @@ collections {
          }
       }
    }
-//----
+   group { name: "e/comp/everything";
+      images {
+         image: "comp-sh1.png" COMP;
+      }
+      parts {
+	part { name: "clipper";
+	type: RECT;
+	mouse_events: 0;
+	clip_to: "clipper2";
+	  description { state: "default" 0.0;
+	  visible: 0;
+	  color: 255 255 255 0;
+	    rel1 {
+	    relative: -1.0  -1.0;
+	    offset: -9999 -9999;
+	    }
+	    rel2 {
+	    relative: 2.0   2.0;
+	    offset: 9999  9999;
+	    }
+	  }
+	  description { state: "visible" 0.0;
+	  inherit: "default" 0.0;
+	  visible: 1;
+	  color: 255 255 255 255;
+	  }
+	  description { state: "big" 0.0;
+	  inherit: "default" 0.0;
+	  color: 255 255 255 0;
+	  }
+	}
+	part { name: "clipper2";
+	type: RECT;
+	mouse_events: 0;
+	  description { state: "default" 0.0;
+	  color: 255 255 255 255;
+	  rel1.to: "clipper";
+	  rel2.to: "clipper";
+	  }
+	  description { state: "visible" 0.0;
+	  inherit: "default" 0.0;
+	  }
+	  description { state: "big" 0.0;
+	  inherit: "default" 0.0;
+	  color: 255 255 255 0;
+	  }
+	}
+	part { name: "shadow";
+	mouse_events: 0;
+	clip_to: "clipper";
+	  description { state: "default" 0.0;
+	    image {
+	    normal: "comp-sh1.png";
+	    border: 18 18 18 18;
+	    middle: 0;
+	    }
+	  fill.smooth: 0;
+	    rel1 {
+	    to: "e.swallow.content";
+	    relative: 0.0  0.0;
+	    offset: -16  -14;
+	    }
+	    rel2 {
+	    to: "e.swallow.content";
+	    relative: 1.0  1.0;
+	    offset: 15   17;
+	    }
+	  }
+	  description { state: "hidden" 0.0;
+	  inherit: "default" 0.0;
+	  visible: 0;
+	  }
+	}
+	part { name: "shower";
+	type: RECT;
+	mouse_events: 0;
+	  description { state: "default" 0.0;
+	  visible: 0;
+	    rel1 {
+	    relative: 0.05  0.05;
+	    offset: 0    0;
+	    }
+	    rel2 {
+	    relative: 0.95  0.95;
+	    offset: -1   -1;
+	    }
+	  }
+	  description { state: "visible" 0.0;
+	  inherit: "default" 0.0;
+	    rel1 {
+	    relative: 0.0  0.0;
+	    }
+	    rel2 {
+	    relative: 1.0  1.0;
+	    }
+	  }
+	  description { state: "big" 0.0;
+	  inherit: "default" 0.0;
+	    rel1 {
+	    relative: -0.3  -0.3;
+	    }
+	    rel2 {
+	    relative: 1.3  1.3;
+	    }
+	  }
+	}
+	part { name: "e.swallow.content";
+	type: SWALLOW;
+	clip_to: "clipper";
+	mouse_events: 0;
+	  description { state: "default" 0.0;
+	    rel1 {
+	    to: "shower";
+	    }
+	    rel2 {
+	    to: "shower";
+	    }
+	  }
+	}
+      }
+     programs {
+       program { name: "shadow-on";
+       signal: "e,state,shadow,on";
+       source: "e";
+       action: STATE_SET "default" 0.0;
+       target: "shadow";
+       }
+       program { name: "shadow-off";
+       signal: "e,state,shadow,off";
+       source: "e";
+       action: STATE_SET "hidden" 0.0;
+       target: "shadow";
+       }
+       program { name: "show1";
+       signal: "e,state,visible,on";
+       source: "e";
+       action: STATE_SET "visible" 0.0;
+       transition: DECELERATE 0.05;
+       target: "clipper";
+       target: "clipper2";
+       target: "shower";
+       after: "show2";
+       }
+       program { name: "show2";
+       action: SIGNAL_EMIT "e,action,show,done" "e";
+       }
+       program { name: "hide1";
+       signal: "e,state,visible,off";
+       source: "e";
+       action: STATE_SET "big" 0.0;
+       transition: ACCELERATE 0.25;
+       target: "clipper";
+       target: "clipper2";
+       target: "shower";
+       after: "hide2";
+       }
+       program { name: "hide2";
+       action: STATE_SET "default" 0.0;
+       target: "clipper";
+       target: "clipper2";
+       target: "shower";
+       after: "hide3";         
+       }
+       program { name: "hide3";
+       action: SIGNAL_EMIT "e,action,hide,done" "e";
+       }
+     }
+   }
+
+   //----
 /*
    group { name: "e/comp/slow";
       images {
diff --git a/src/modules/comp/e_mod_main.c b/src/modules/comp/e_mod_main.c
index 67a460ece..6e1027a5d 100644
--- a/src/modules/comp/e_mod_main.c
+++ b/src/modules/comp/e_mod_main.c
@@ -184,7 +184,7 @@ _e_mod_config_new(E_Module *m)
    mod->conf->match.overrides = eina_list_append(mod->conf->match.overrides, mat);
    mat->name = eina_stringshare_add("E");
    mat->clas = eina_stringshare_add("everything");
-   mat->shadow_style = eina_stringshare_add("popup");
+   mat->shadow_style = eina_stringshare_add("everything");
    mat = E_NEW(Match, 1);
    mod->conf->match.overrides = eina_list_append(mod->conf->match.overrides, mat);
    mat->primary_type = ECORE_X_WINDOW_TYPE_DROPDOWN_MENU;