diff --git a/data/themes/elm.edc b/data/themes/elm.edc
index fe54aea..57d66ef 100644
--- a/data/themes/elm.edc
+++ b/data/themes/elm.edc
@@ -909,20 +909,22 @@
                hid;
             }
             desc { "visible";
-               color: 255 255 255 200;
+               color: 255 255 255 180;
                vis;
             }
          }
          part { "glow_top"; clip: "top_clip";
-            desc {
+            desc { "default";
                fixed: 0 1;
                min: 16 2;
                image.normal: "glow_top.png";
                aspect: 330 32;
                rel2.relative: 1 0;
                rel2.to_y: "elm.swallow.content";
-               rel2.offset: -3 -1;
-               rel1.offset: 2 4;
+               rel1.offset: 0 4;
+            }
+            desc { "glow"; inherit: "default";
+               color: 255 255 255 100;
             }
          }
          program { name: "scr_eval";
@@ -943,14 +945,32 @@
                }
             }
          }
-         program { name: "top_visible";
+         program { "top_visible";
+            filter: "top_clip" "default";
+            script {
+               run_program(get_program_id("tp_vis"));
+               run_program(get_program_id("tp_glow"));
+            }
+         }
+         program { "tp_vis";
             action: STATE_SET "visible";
             target: "top_clip";
             transition: LINEAR 0.2;
          }
+         program { "tp_glow";
+            action: STATE_SET "glow";
+            target: "glow_top";
+            transition: SINUSOIDAL 0.7;
+            sequence {
+               action: STATE_SET "default";
+               target: "glow_top";
+               transition: SINUSOIDAL 0.7;
+               after: "tp_glow";
+            }
+         }
          program { name: "top_hidden";
             action: STATE_SET "default";
-            target: "top_clip";
+            targets: "top_clip" "glow_top";
             transition: LINEAR 0.2;
          }
          program { signal: "elm,action,show,vbar"; source: "elm";
@@ -975,7 +995,7 @@
                hid;
             }
             desc { "visible";
-               color: 255 255 255 200;
+               color: 255 255 255 180;
                vis;
             }
          }
@@ -987,18 +1007,37 @@
                aspect: 330 32;
                rel1.relative: 0 1;
                rel1.to_y: "elm.swallow.content";
-               rel1.offset: 2 0;
-               rel2.offset: -3 -1;
+            }
+            desc { "glow"; inherit: "default";
+               color: 255 255 255 100;
             }
          }
-         program { name: "bottom_visible";
+         program { "bottom_visible";
+            filter: "bottom_clip" "default";
+            script {
+               run_program(get_program_id("btm_vis"));
+               run_program(get_program_id("btm_glow"));
+            }
+         }
+         program { "btm_vis";
             action: STATE_SET "visible";
             target: "bottom_clip";
             transition: LINEAR 0.2;
          }
+         program { "btm_glow";
+            action: STATE_SET "glow";
+            target: "glow_bottom";
+            transition: SINUSOIDAL 0.7;
+            sequence {
+               action: STATE_SET "default";
+               target: "glow_bottom";
+               transition: SINUSOIDAL 0.7;
+               after: "btm_glow";
+            }
+         }
          program { name: "bottom_hidden";
             action: STATE_SET "default";
-            target: "bottom_clip";
+            targets: "bottom_clip" "glow_bottom";
             transition: LINEAR 0.2;
          }
          swallow { "elm.swallow.content"; mouse;