diff --git a/data/themes/default.edc b/data/themes/default.edc
index 8f4cba6c..8d41774d 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -471,7 +471,7 @@ collections {
             mouse_events: 0;
             description { state: "default" 0.0;
                image.normal: "bg_bevel.png";
-               image.border: 3 3 5 3;
+               image.border: 3 3 3 3;
                image.middle: 0;
                fill.smooth: 0;
             }
@@ -786,7 +786,7 @@ collections {
                rel1.to: "terminology.popmedia";
                rel2.to: "terminology.popmedia";
                image.normal: "bg_bevel.png";
-               image.border: 3 3 5 3;
+               image.border: 3 3 3 3;
                image.middle: 0;
                fill.smooth: 0;
                visible: 0;
@@ -981,6 +981,9 @@ collections {
    }
 
    group { name: "terminology/base";
+      images.image: "pm_shadow.png" COMP;
+      images.image: "bg_bevel.png" COMP;
+      images.image: "bg_glint.png" COMP;
       parts {
          part { name: "terminology.content"; type: SWALLOW;
             description { state: "default" 0.0;
@@ -1003,10 +1006,23 @@ collections {
                visible: 1;
             }
          }
+         part { name: "cmdshadow"; mouse_events: 0;
+            clip_to: "cmdclip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "cmdback";
+               rel1.offset: -32 -32;
+               rel2.to: "cmdback";
+               rel2.offset: 31 31;
+               image.normal: "pm_shadow.png";
+               image.border: 64 64 64 64;
+               fill.smooth: 0;
+            }
+         }
          part { name: "cmdback"; type: RECT;
             clip_to: "cmdclip";
             description { state: "default" 0.0;
-               color: 255 255 255 255;
+               color: 48 48 48 255;
                rel1.to: "terminology.cmdbox";
                rel1.offset: -2 -2;
                rel2.to: "terminology.cmdbox";
@@ -1030,6 +1046,37 @@ collections {
                align: 0.5 1.0;
             }
          }
+         part { name: "cmdbevel"; mouse_events: 0;
+            clip_to: "cmdclip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               rel1.to: "cmdback";
+               rel2.to: "cmdback";
+               image.normal: "bg_bevel.png";
+               image.border: 3 3 3 3;
+               image.middle: 0;
+               fill.smooth: 0;
+            }
+         }
+         part { name: "cmdglint"; mouse_events: 0;
+            clip_to: "cmdclip";
+            description { state: "default" 0.0;
+               fixed: 1 1;
+               min: 79 5;
+               max: 79 5;
+               rel1 {
+                  to: "cmdback";
+                  relative: 0.0 0.0;
+                  offset: 0 0;
+               }
+               rel2 {
+                  to: "cmdback";
+                  relative: 1.0 0.0;
+                  offset: -1 0;
+               }
+               image.normal: "bg_glint.png";
+            }
+         }
          program {
             signal: "cmdbox,show"; source: "terminology";
             action: STATE_SET "visible" 0.0;
@@ -2639,7 +2686,7 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
                rel1.to: "terminology.content";
                rel2.to: "terminology.content";
                image.normal: "bg_bevel.png";
-               image.border: 3 3 5 3;
+               image.border: 3 3 3 3;
                image.middle: 0;
                fill.smooth: 0;
             }