Fix vg_cache

If cached file have a vp_list it should disable file caching.

data/elementary/themes/default.edc

@@ -24,7 +24,6 @@ collections {
 #include "edc/elm/label.edc"
 #include "edc/elm/separator.edc"
 #include "edc/elm/check.edc"
-#include "edc/elm/slider.edc"
 #include "edc/elm/radio.edc"
 #include "edc/elm/bubble.edc"
 #include "edc/elm/panes.edc"
@@ -77,33 +76,9 @@ collections {
 #include "edc/elm/code.edc"
 #include "edc/elm/ews.edc"
 #include "edc/elm/textpath.edc"
+#include "edc/elm/slider.edc"
 
 
-// desktop in general
-#include "edc/wallpaper.edc"
-#include "edc/comp.edc"
-#include "edc/comp_compat.edc"
-#include "edc/comp_effects.edc"
-#include "edc/background.edc"
-#include "edc/bryce.edc"
-#include "edc/bryce_editor.edc"
-#include "edc/shelf.edc"
-#include "edc/border.edc"
-#include "edc/dialog.edc"
-#include "edc/conf.edc"
-#include "edc/gadman.edc"
-#include "edc/syscon.edc"
-#include "edc/pointer.edc"
-#include "edc/sys.edc"
-#include "edc/winlist.edc"
-#include "edc/desklock.edc"
-#include "edc/deskmirror.edc"
-#include "edc/wizard.edc"
-#include "edc/init.edc"
-#include "edc/about-e.edc"
-#include "edc/about-theme.edc"
-#include "edc/transitions.edc"
-
 // widgets
 #include "edc/menu.edc"
 #include "edc/button.edc"
@@ -125,6 +100,30 @@ collections {
 #include "edc/cslider.edc"
 #include "edc/spectrum.edc"
 
+// desktop in general
+#include "edc/wallpaper.edc"
+#include "edc/comp.edc"
+#include "edc/comp_compat.edc"
+#include "edc/comp_effects.edc"
+#include "edc/background.edc"
+#include "edc/bryce.edc"
+#include "edc/bryce_editor.edc"
+#include "edc/shelf.edc"
+#include "edc/border.edc"
+#include "edc/dialog.edc"
+#include "edc/conf.edc"
+#include "edc/gadman.edc"
+#include "edc/syscon.edc"
+#include "edc/pointer.edc"
+#include "edc/winlist.edc"
+#include "edc/desklock.edc"
+#include "edc/deskmirror.edc"
+#include "edc/wizard.edc"
+#include "edc/init.edc"
+#include "edc/about-e.edc"
+#include "edc/about-theme.edc"
+#include "edc/transitions.edc"
+
 // modules
 #include "edc/start.edc"
 #include "edc/pager.edc"
@@ -142,7 +141,9 @@ collections {
 #include "edc/randr.edc"
 #include "edc/notification.edc"
 #include "edc/cpufreq.edc"
+#include "edc/cpuclock.edc"
 #include "edc/temperature.edc"
+#include "edc/thermal.edc"
 #include "edc/backlight.edc"
 #include "edc/mixer.edc"
 #include "edc/battery.edc"
@@ -150,6 +151,7 @@ collections {
 #include "edc/evrything.edc"
 #include "edc/illume.edc"
 #include "edc/bluez4.edc"
+#include "edc/bluez5.edc"
 #include "edc/packagekit.edc"
 #include "edc/wireless.edc"
 #include "edc/time.edc"
@@ -157,6 +159,7 @@ collections {
 #include "edc/memusage.edc"
 #include "edc/cpumonitor.edc"
 #include "edc/netstatus.edc"
+#include "edc/tiling.edc"
 
 // icons
 #include "edc/icons.edc"

data/elementary/themes/edc/O/efm_icons.edc

@@ -452,7 +452,7 @@
       }                                               \
    }
 
-   MIMEICON("inode/directory","icon_efm_folder.png", 128);
+//   MIMEICON("inode/directory","icon_efm_folder.png", 128);
 
    MIMEICON("application/x-deb","icon_mime_deb.png", 128);
    MIMEICON("application/x-bzip","icon_mime_package.png", 128);

data/elementary/themes/edc/O/icons.edc

@@ -68,8 +68,8 @@
    //Standard Status Icons
    ICON("dialog-warning","icon_warning.png",128)                   // "enlightenment/warning"
    ICON("dialog-error","icon_warning.png",128)                     // "enlightenment/error"
-   ICON("dialog-ask","icon_dummy.png",64)                          // "enlightenment/unknown"
-   ICON("unknown","icon_dummy.png",64)                      // *** // "enlightenment/unknown"
+//   ICON("dialog-ask","icon_dummy.png",64)                          // "enlightenment/unknown"
+//   ICON("unknown","icon_dummy.png",64)                      // *** // "enlightenment/unknown"
    //Standard Application Icons
    ICON("preferences-desktop","icon_desktops.png",64)                         // "enlightenment/desktops"
    ICON("preferences-desktop-theme","icon_theme.png",64)                      // "enlightenment/themes"
@@ -159,33 +159,33 @@
    ICON("preferences-system-power-management","icon_power_management.png",64)         // "enlightenment/power_management"
    ICON("preferences-system-screen-resolution","icon_screen_resolution.png",64)// *** // "enlightenment/screen_resolution"
    ICON("preferences-illume","icon_illume.png",64)
-   ICON("system-file-manager","icon_efm_folder.png",64)                               // "enlightenment/fileman"
+//   ICON("system-file-manager","icon_efm_folder.png",64)                               // "enlightenment/fileman"
    //Standard Module Category Icons 
    ICON("modules-utils","icon_gadget.png",64)
    ICON("modules-system","icon_gadget.png",64)
    ICON("modules-look","icon_look.png",64)
-   ICON("modules-files","icon_efm_folder.png",64)
+//   ICON("modules-files","icon_efm_folder.png",64)
    ICON("modules-launcher","icon_run.png",64)
    ICON("modules-core","logo_white_128.png",64)
    ICON("modules-mobile","icon_globe.png",64)
    ICON("modules-settings","icon_config.png",64)
    //Standard Emblem Icons
-   ICON("emblem-symbolic-link","icon_dummy.png",64)                // EFMBUTTON("symlink")
+//   ICON("emblem-symbolic-link","icon_dummy.png",64)                // EFMBUTTON("symlink")
    //Standard Place Icons
    ICON("start-here","logo_white_128.png",128)                     // "enlightenment/e"
-   ICON("folder","icon_efm_folder.png",64)                         // "fileman/folder"
-   ICON("user-home","icon_efm_home.png",64)                        // "fileman/home"
-   ICON("user-temp","icon_efm_tmp.png",64)                  // *** // "fileman/tmp"
-   ICON("user-desktop","icon_efm_desktop.png",64)                  // "fileman/desktop"
-   ICON("user-bookmarks","icon_favorites.png",64)                  // "enlightenment/favorites"
-   ICON("folder-image","icon_wallpaper.png",64)                    // "enlightenment/picture"
+//   ICON("folder","icon_efm_folder.png",64)                         // "fileman/folder"
+//   ICON("user-home","icon_efm_home.png",64)                        // "fileman/home"
+//   ICON("user-temp","icon_efm_tmp.png",64)                  // *** // "fileman/tmp"
+//   ICON("user-desktop","icon_efm_desktop.png",64)                  // "fileman/desktop"
+//   ICON("user-bookmarks","icon_favorites.png",64)                  // "enlightenment/favorites"
+//   ICON("folder-image","icon_wallpaper.png",64)                    // "enlightenment/picture"
    ICON("network-website","icon_globe.png",64)                     // "enlightenment/website"
    //Standard Device Icons
-   ICON("computer","icon_efm_root.png", 64)                        // "fileman/root"
-   ICON("drive-harddisk","icon_efm_hdd.png", 128)                  // "fileman/hd" "fileman/hdd"
-   ICON("drive-optical","icon_efm_cd.png", 128)                    // "fileman/??"
-   ICON("media-flash","icon_efm_flash.png", 128)                   // "fileman/??"
-   ICON("drive-removable-media","icon_efm_usbmedia.png", 128);
+//   ICON("computer","icon_efm_root.png", 64)                        // "fileman/root"
+//   ICON("drive-harddisk","icon_efm_hdd.png", 128)                  // "fileman/hd" "fileman/hdd"
+//   ICON("drive-optical","icon_efm_cd.png", 128)                    // "fileman/??"
+//   ICON("media-flash","icon_efm_flash.png", 128)                   // "fileman/??"
+//   ICON("drive-removable-media","icon_efm_usbmedia.png", 128);
    ICON("media-eject","icon_efm_eject.png", 64)
    /* End of FreeDesktop.Org icons */
    //E Specific icons
@@ -195,6 +195,6 @@
    ICONMIME("inode/chardevice","icon_efm_file.png",128)
    ICONMIME("inode/blockdevice","icon_efm_file.png",128)
    ICONMIME("inode/directory-locked","icon_efm_file.png",128)
-   ICONMIME("inode/directory","icon_efm_folder.png",128)
+//   ICONMIME("inode/directory","icon_efm_folder.png",128)
    ICONMIME("inode/fifo","icon_efm_file.png",128)
    ICONMIME("inode/socket","icon_efm_file.png",128)

data/elementary/themes/edc/about-e.edc

@@ -1,56 +1,57 @@
 group { name: "e/widgets/about/main";
    // data.item: "borderless" "1";
    // data.item: "shaped" "1";
-   images.image: "bg_radgrad.png" COMP;
-   images.image: "dot_pattern.png" COMP;
-   images.image: "bevel_dark_out.png" COMP;
-   images.image: "vgrad_med_lighter.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "shine.png" COMP;
-   images.image: "shadow_square_tiny.png" COMP;
-   images.image: "screen_circular_shadow.png" COMP;
-   images.image: "logo_blue_bottom.png" COMP;
-   images.image: "button_normal.png" COMP;
-   images.image: "button_clicked.png" COMP;
+   images.image: "about-lines.png" COMP;
+   images.image: "about-triangles.png" COMP;
+   images.image: "win_shadow.png" COMP;
+//   images.image: "snow.jpg" LOSSY 90;
+   set { name: "logo_mono";
+      image { image: "logo.png" COMP;  size: 601 601 99999 99999; }
+      image { image: "logo2.png" COMP; size: 301 301   600   600; }
+      image { image: "logo3.png" COMP; size: 151 151   300   300; }
+      image { image: "logo4.png" COMP; size:  76  76   150   150; }
+      image { image: "logo5.png" COMP; size:  0    0    75    75; }
+   }
    styles {
       style { name: "about_style";
-         base: "font="FN" font_size=10 align=center text_class=tb_plain color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word";
-         tag: "hilight" "+ font="FNBD" text_class=tb_light style=glow color=#3399ffff glow_color=#3399ff18 align=center glow2_color=#3399ff12";
+         base: "font="FN" font_size=10 align=center text_class=tb_plain color=#fff wrap=word";
+         tag: "hilight" "+ font="FNBD" text_class=tb_light color=#fff align=center";
          tag: "title" "+ font_size=16 font="FNBD" text_class=tb_big";
          tag: "/title" "- \n \n";
          tag: "br" "\n";
       }
       style { name: "authors_style";
-         base: "font="FNBD" font_size=16 align=left text_class=tb_plain color=#00000044 wrap=none";
-         tag: "hilight" "+ font="FNBD" text_class=tb_light color=#3399ff44";
-         tag: "title" "+ font_size=24 font="FNBD" text_class=tb_big";
+         base: "font="FNBD" font_size=10 align=left text_class=tb_plain color=#0004 wrap=none";
+         tag: "hilight" "+ font="FNBD" text_class=tb_light color=#fff";
+         tag: "title" "+ font_size=16 font="FNBD" text_class=tb_big";
          tag: "/title" "- \n \n";
          tag: "br" "\n";
       }
    }
-   min: 220 260;
-   max: 800 600;
+   min: 320 420;
    parts {
       part { name: "sizer"; type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: 220 260;
+            min: 320 420;
          }
       }
-      part { name: "bg";
+/*
+      part { name: "image";
          description { state: "default" 0.0;
-            image.normal: "bg_radgrad.png";
-            image.scale_hint: STATIC;
-            fill.smooth: 0;
-            ASPECT_FILL((1024/653))
+            fixed: 1 1;
+            image.normal: "snow.jpg";
+            aspect: 1.0 1.0; aspect_preference: NONE;
          }
       }
-      part { name: "pat";
+ */
+      part { name: "image"; type: RECT;
          description { state: "default" 0.0;
-            image.normal: "dot_pattern.png";
-            TILED_PATTERN(256, 256)
+            fixed: 1 1;
+            color: 48 48 48 255;
          }
       }
+      ////////////////////////////////////////////////////////////////
       part { name: "e.textblock.authors"; type: TEXTBLOCK; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
@@ -58,9 +59,9 @@ group { name: "e/widgets/about/main";
             max: 20000 20000;
             min: 160 0;
             rel1.relative: 0.0 1.0;
-            rel1.offset: 4 4;
+            rel1.offset: 13 13;
             rel2.relative: 1.0 1.0;
-            rel2.offset: -5 4;
+            rel2.offset: -14 13;
             align: 0.5 0.0;
             text { style: "authors_style";
                min: 0 1;
@@ -70,12 +71,25 @@ group { name: "e/widgets/about/main";
          description { state: "up" 0.0;
             inherit: "default" 0.0;
             rel1.relative: 0.0 0.0;
-            rel1.offset: 4 -5;
+            rel1.offset: 13 -14;
             rel2.relative: 1.0 0.0;
-            rel2.offset: -5 -5;
+            rel2.offset: -14 -14;
             align: 0.5 1.0;
          }
       }
+      program { name: "show1";
+         signal: "show"; source: "";
+         action: STATE_SET "up" 0.0;
+         transition: LINEAR 60.0;
+         target: "e.textblock.authors";
+         after: "show2";
+      }
+      program { name: "show2";
+         action: STATE_SET "default" 0.0;
+         target: "e.textblock.authors";
+         after: "show1";
+      }
+      ////////////////////////////////////////////////////////////////
       part { name: "e.textblock.about"; type: TEXTBLOCK; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
@@ -83,9 +97,9 @@ group { name: "e/widgets/about/main";
             max: 20000 20000;
             min: 160 0;
             rel1.relative: 0.0 1.0;
-            rel1.offset: 4 4;
+            rel1.offset: 13 13;
             rel2.relative: 1.0 1.0;
-            rel2.offset: -5 4;
+            rel2.offset: -14 13;
             align: 0.5 0.0;
             text { style: "about_style";
                min: 0 1;
@@ -95,190 +109,187 @@ group { name: "e/widgets/about/main";
          description { state: "up" 0.0;
             inherit: "default" 0.0;
             rel1.relative: 0.0 0.0;
-            rel1.offset: 4 -5;
+            rel1.offset: 13 -14;
             rel2.relative: 1.0 0.0;
-            rel2.offset: -5 -5;
+            rel2.offset: -14 -14;
             align: 0.5 1.0;
          }
       }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 1.0;
-            image.normal: "screen_circular_shadow.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "bevel";
-         description { state: "default" 0.0;
-            image.normal: "bevel_dark_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "top_shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.offset: -3 -2;
-            rel1.to: "top_base";
-            rel2.offset: 3 4;
-            rel2.to: "top_base";
-            image.normal: "shadow_square_tiny.png";
-            image.border: 6 6 6 6;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "logo";
-         description { state: "default" 0.0;
-            image.normal: "logo_blue_bottom.png";
-            image.scale_hint: STATIC;
-            FIXED_SIZE(263,100);
-            rel1.to: "top_base";
-            rel2.to: "top_base";
-            align: 0.5 0.25;
-         }
-      }
-      part { name: "top_base";
-         description { state: "default" 0.0;
-            image.normal: "vgrad_med_lighter.png";
-            rel2.to_y: "e.text.title";
-            rel2.offset: -1 3;
-            fill.smooth: 0;
-            TILED_HORIZ(120)
-         }
-      }
-      part { name: "top_bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "top_base";
-            rel2.to: "top_base";
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "e.text.title"; type: TEXT;
-         scale: 1;
-         effect: SHADOW BOTTOM;
-         description { state: "default" 0.0;
-            align: 0.0 0.0;
-            rel1.offset: 3 3;
-            rel2.relative: 0.0 0.0;
-            rel2.offset: 3 3;
-            text { font: FN; size: 10;
-               min: 1 1;
-               ellipsis: -1;
-               align: 0.0 0.0;
-               text_class: "about_title";
-            }
-            fixed: 1 1;
-         }
-      }
-      part { name: "e.text.version"; type: TEXT;
-         scale: 1;
-         effect: SHADOW BOTTOM;
-         description { state: "default" 0.0;
-            align: 1.0 0.0;
-            rel1.relative: 0.0 0.0;
-            rel1.offset: -4 3;
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -4 3;
-            text { font: FN; size: 10;
-               min: 1 1;
-               ellipsis: -1;
-               align: 1.0 0.0;
-               text_class: "about_version";
-            }
-            fixed: 1 1;
-         }
-      }
-      part { name: "base";
-         description { state: "default" 0.0;
-            image.normal: "button_normal.png";
-            image.border: 4 4 3 5;
-            image.middle: SOLID;
-            rel1.offset: -6 -6;
-            rel1.to: "e.text.label";
-            rel2.offset: 5 5;
-            rel2.to: "e.text.label";
-            fill.smooth: 0;
-                     }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            image.normal: "button_clicked.png";
-            image.border: 5 5 4 6;
-         }
-      }
-      part { name: "e.text.label"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.offset: 0 -14;
-            rel1.relative: 0.5 1.0;
-            rel2.offset: -1 -14;
-            rel2.relative: 0.5 1.0;
-            color: FN_COL_DEFAULT;
-            color_class: "button_text";
-            align: 0.5 1.0;
-            text { font: FN; size: 10;
-               min: 1 1;
-               ellipsis: -1;
-               align: 0.5 0.5;
-               text_class: "button";
-            }
-            fixed: 1 1;
-         }
-      }
-      part { name: "shine"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel1.to: "top_base";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "top_base";
-            FIXED_SIZE(69, 5)
-         }
-      }
-   }
-   programs {
-      program { name: "show1";
-         signal: "show"; source: "";
-         action: STATE_SET "up" 0.0;
-         transition: LINEAR 45.0;
-         target: "e.textblock.about";
-         after: "show2";
-      }
-      program { name: "show2";
-         action: STATE_SET "default" 0.0;
-         target: "e.textblock.about";
-         after: "show1";
-      }
       program { name: "show3";
          signal: "show"; source: "";
          action: STATE_SET "up" 0.0;
-         transition: LINEAR 120.0;
-         target: "e.textblock.authors";
+         transition: LINEAR 25.0;
+         target: "e.textblock.about";
          after: "show4";
       }
       program { name: "show4";
          action: STATE_SET "default" 0.0;
-         target: "e.textblock.authors";
+         target: "e.textblock.about";
          after: "show3";
       }
+      ////////////////////////////////////////////////////////////////
+      part { name: "lines";
+         scale: 1;
+         description { state: "default" 0.0;
+            image.normal: "about-lines.png";
+            min: 0 128;
+            align: 0.5 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 0.0;
+            fill.smooth: 1;
+            color: 64 64 64 255;
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            color: 32 32 32 255;
+         }
+      }
+      ////////////////////////////////////////////////////////////////
+      part { name: "logo";
+         scale: 1;
+         description { state: "default" 0.0;
+            image.normal: "logo_mono";
+            align: 0.5 0.0;
+            rel1.offset: 0 13;
+            rel2.offset: -1 13;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 0.0;
+            FIXED_SIZE(75, 75)
+         }
+      }
+      ////////////////////////////////////////////////////////////////
+      part { name: "e.text.title"; type: TEXT;
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 0.5 0.0;
+            rel1.offset: 0 13;
+            rel2.offset: -1 13;
+            rel1.relative: 0.0 1.0;
+            rel2.relative: 1.0 1.0;
+            rel1.to: "logo";
+            rel2.to: "logo";
+            color: 255 255 255 255;
+            text { font: FNBD; size: 16;
+               min: 1 1;
+               ellipsis: -1;
+               text_class: "about_title";
+            }
+         }
+      }
+      ////////////////////////////////////////////////////////////////
+      part { name: "e.text.version"; type: TEXT;
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 0.5 0.0;
+            rel1.offset: 0 13;
+            rel2.offset: -1 13;
+            rel1.relative: 0.0 1.0;
+            rel2.relative: 1.0 1.0;
+            rel1.to: "e.text.title";
+            rel2.to: "e.text.title";
+            color: 255 255 255 255;
+            text { font: FN; size: 10;
+               min: 1 1;
+               ellipsis: -1;
+               text_class: "about_version";
+            }
+         }
+      }
+      ////////////////////////////////////////////////////////////////
+#define TRI(_name, _size, _align) \
+      part { name: _name; \
+         scale: 1; \
+         description { state: "default" 0.0; \
+            max: _size (_size*180/255); \
+            align: _align 1.0; \
+            image.normal: "about-triangles.png"; \
+            aspect: (255/180) (255/180); aspect_preference: HORIZONTAL; \
+            rel1.relative: 0.0 1.0; \
+            color: 64 64 64 255; \
+         } \
+      }
+      TRI("t1", 127, 0.5)
+      TRI("t2", 83,  0.2)
+      TRI("t3", 163, 0.9)
+      TRI("t4", 47,  1.0)
+      TRI("t5", 63,  0.0)
+      TRI("t6", 99,  0.3)
+      TRI("t7", 199, 0.7)
+      TRI("t8", 141, 0.1)
+      TRI("t9", 75,  0.6)
+      ////////////////////////////////////////////////////////////////
+      part { name: "shadow"; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel.to: "base";
+            WIN_SHADOW_SMALL;
+         }
+         description { state: "clicked" 0.0;
+            inherit;
+            image.border_scale_by: 0.25;
+            rel1.offset: -5 -3;
+            rel2.offset: 4 6;
+         }
+      }
+      part { name: "base"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.offset: -6 -6;
+            rel1.to: "e.text.label";
+            rel2.offset: 5 5;
+            rel2.to: "e.text.label";
+            color: 51 153 255 255;
+         }
+         description { state: "clicked" 0.0;
+            inherit: "default" 0.0;
+            color: 255 153 51 255;
+         }
+      }
+      part { name: "e.text.label"; type: TEXT; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.offset: 0 -19;
+            rel1.relative: 0.5 1.0;
+            rel2.offset: -1 -19;
+            rel2.relative: 0.5 1.0;
+            color: 255 255 255 255;
+            align: 0.5 1.0;
+            min: 80 10;
+            text { font: FN; size: 10;
+               min: 1 1;
+               ellipsis: -1;
+               text_class: "button";
+            }
+         }
+         description { state: "clicked" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+         }
+      }
       program {
          signal: "mouse,down,1*"; source: "base";
          action: STATE_SET "clicked" 0.0;
          target: "base";
+         target: "shadow";
       }
       program {
          signal: "mouse,up,1"; source: "base";
          action: STATE_SET "default" 0.0;
          target: "base";
+         target: "shadow";
       }
       program {
          signal: "mouse,clicked,1*"; source: "base";
          action: SIGNAL_EMIT "e,action,close" "";
       }
+      program {
+         signal: "e,state,focused"; source: "e";
+         action: STATE_SET "focused" 0.0;
+         target: "lines";
+      }
+      program {
+         signal: "e,state,unfocused"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "lines";
+      }
    }
 }

data/elementary/themes/edc/about-theme.edc

@@ -1,37 +1,53 @@
 group { name: "e/theme/about";
    // data.item: "borderless" "1";
    // data.item: "shaped" "1";
-   images.image: "bevel_dark_out.png" COMP;
-   images.image: "screen_circular_shadow.png" COMP;
-   images.image: "button_normal.png" COMP;
-   images.image: "button_clicked.png" COMP;
-   min: 220 220;
-   max: 220 220;
+//   images.image: "check_fill.png" COMP;
+   images.image: "clouds.jpg" LOSSY 99;
+   min: 220 320;
    parts {
       part { name: "sizer"; type: SPACER;
          scale: 1;
          description { state: "default" 0.0;
-            min: 220 220;
+            min: 220 320;
          }
       }
-      part { name: "bg";
+/*
+      part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
-            image.normal: "bg_radgrad.png";
-            image.scale_hint: STATIC;
-            fill.smooth: 0;
-            ASPECT_FILL((1024/653))
+            color: 64 64 64 255;
          }
       }
-      part { name: "name"; type: TEXT; mouse_events: 0;
-         effect: GLOW;
+      part { name: "check";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            color: FN_COL_HIGHLIGHT;
+            color: 56 56 56 255;
+            image.normal: "check_fill.png";
+            min: 5120 5120;
+            align: 0.0 0.0;
+            fill {
+              size.relative: 0.05 0.05;
+              smooth: 0;
+            }
+         }
+      }
+ */
+      part { name: "image";
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            image.normal: "clouds.jpg";
+            aspect: 1.0 1.0; aspect_preference: NONE;
+         }
+      }
+      part { name: "name"; type: TEXT; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            color: 255 255 255 255;
             rel1.relative: 0.5 0.5;
             rel2.relative: 0.5 0.5;
-            text { font: FNBD; size: 64;
-               text: "Dark";
+            text { font: FNBD; size: 48;
+               text: "FLAT";
                min: 1 1;
                ellipsis: -1;
                align: 0.5 0.5;
@@ -39,67 +55,47 @@ group { name: "e/theme/about";
          }
       }
       part { name: "name2"; type: TEXT; mouse_events: 0;
-         effect: GLOW;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            color: FN_COL_HIGHLIGHT;
-            rel1.relative: 0.5 0.9;
+            color: 255 255 255 192;
+            rel1.relative: 0.0 1.0;
             rel1.to: "name";
-            rel2.relative: 0.5 0.9;
+            rel1.offset: 0 16;
+            rel2.relative: 1.0 1.0;
             rel2.to: "name";
-            align: 0.5 1.0;
+            rel2.offset: -1 16;
+            align: 0.5 0.0;
             text { font: FN; size: 10;
                text: "The default theme for Enlightenment";
                min: 1 1;
                ellipsis: -1;
-               align: 0.5 1.0;
+               align: 0.5 0.0;
             }
          }
       }
-      part { name: "shadow"; mouse_events: 0;
+      ////////////////////////////////////////////////////////////////
+      part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 1.0;
-            image.normal: "screen_circular_shadow.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "bevel";
-         description { state: "default" 0.0;
-            image.normal: "bevel_dark_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "base";
-         description { state: "default" 0.0;
-            image.normal: "button_normal.png";
-            image.border: 4 4 3 5;
-            image.middle: SOLID;
             rel1.offset: -6 -6;
             rel1.to: "e.text.label";
             rel2.offset: 5 5;
             rel2.to: "e.text.label";
-            fill.smooth: 0;
-                     }
+            color: 48 48 48 255;
+         }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            image.normal: "button_clicked.png";
-            image.border: 5 5 4 6;
+            color: 32 32 32 255;
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.offset: -14 -14;
             rel1.relative: 1.0 1.0;
             rel2.offset: -14 -14;
             rel2.relative: 1.0 1.0;
-            color: FN_COL_DEFAULT;
-            color_class: "button_text";
+            color: 160 160 160 255;
             align: 1.0 1.0;
             min: 85 0;
             text { font: FN; size: 10;
@@ -110,34 +106,49 @@ group { name: "e/theme/about";
             }
             fixed: 1 1;
          }
+         description { state: "clicked" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+         }
       }
-      part { name: "base2";
+      program {
+         signal: "mouse,down,1*"; source: "base";
+         action: STATE_SET "clicked" 0.0;
+         target: "base";
+         target: "e.text.label";
+      }
+      program {
+         signal: "mouse,up,1"; source: "base";
+         action: STATE_SET "default" 0.0;
+         target: "base";
+         target: "e.text.label";
+      }
+      program {
+         signal: "mouse,clicked,1*"; source: "base";
+         action: SIGNAL_EMIT "e,action,close" "";
+      }
+      ////////////////////////////////////////////////////////////////
+      part { name: "base2"; type: RECT;
          description { state: "default" 0.0;
-            image.normal: "button_normal.png";
-            image.border: 4 4 3 5;
-            image.middle: SOLID;
             rel1.offset: -6 -6;
             rel1.to: "e.text.theme";
             rel2.offset: 5 5;
             rel2.to: "e.text.theme";
-            fill.smooth: 0;
-                     }
+            color: 48 48 48 255;
+         }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            image.normal: "button_clicked.png";
-            image.border: 5 5 4 6;
+            color: 32 32 32 255;
          }
       }
       part { name: "e.text.theme"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.offset: 13 -14;
             rel1.relative: 0.0 1.0;
             rel2.offset: 13 -14;
             rel2.relative: 0.0 1.0;
-            color: FN_COL_DEFAULT;
-            color_class: "button_text";
+            color: 160 160 160 255;
             align: 0.0 1.0;
             min: 85 0;
             text { font: FN; size: 10;
@@ -148,32 +159,22 @@ group { name: "e/theme/about";
             }
             fixed: 1 1;
          }
-      }
-   }
-   programs {
-      program {
-         signal: "mouse,down,1*"; source: "base";
-         action: STATE_SET "clicked" 0.0;
-         target: "base";
-      }
-      program {
-         signal: "mouse,up,1"; source: "base";
-         action: STATE_SET "default" 0.0;
-         target: "base";
-      }
-      program {
-         signal: "mouse,clicked,1*"; source: "base";
-         action: SIGNAL_EMIT "e,action,close" "";
+         description { state: "clicked" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+         }
       }
       program {
          signal: "mouse,down,1*"; source: "base2";
          action: STATE_SET "clicked" 0.0;
          target: "base2";
+         target: "e.text.theme";
       }
       program {
          signal: "mouse,up,1"; source: "base2";
          action: STATE_SET "default" 0.0;
          target: "base2";
+         target: "e.text.theme";
       }
       program {
          signal: "mouse,clicked,1*"; source: "base2";

data/elementary/themes/edc/appmenu.edc

@@ -1,72 +1,48 @@
 group { name: "e/modules/appmenu/item";
-   images.image: "vgrad_med_dark.png" COMP;
    data.item: "padding_horizontal" "5";
-   data.item: "padding_vertical" "5";
+   data.item: "padding_vertical"   "5";
    parts {
-      part {
-         name: "event_area";
-         type: RECT;
-         mouse_events: 1;
-         description {
-            state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-      }
-      part {
-         name: "background";
-         type: IMAGE;
-         mouse_events: 0;
-         description {
-            state: "default" 0.0;
-            image.normal: "vgrad_med_dark.png";
-            fill.smooth: 0;
-            TILED_HORIZ(120)
+      part { name: "background"; type: RECT; mouse_events: 0;
+         description { state: "default" 0.0;
+            color: 32 32 32 255;
             visible: 0;
          }
-         description {
-            state: "selected" 0.0;
+         description { state: "selected" 0.0;
             inherit: "default" 0.0;
             visible: 1;
          }
       }
-      part {
-         name: "text";
-         type: TEXT;
-         mouse_events: 0;
-         effect: SHADOW BOTTOM;
+      part { name: "text"; type: TEXT; mouse_events: 0;
          scale: 1;
-         description {
-            state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
-            color: FN_COL_DEFAULT;
-            text {
-               font: FN;
-               size: 10;
+         description { state: "default" 0.0;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            color: 160 160 160 255;
+            text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
-               align: 0.5 0.5;
                text_class: "label";
             }
+            offscale;
          }
-         description {
-            state: "selected" 0.0;
+         description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_HIGHLIGHT;
+            color: 255 255 255 255;
+         }
+      }
+      part { name: "event_area"; type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
          }
       }
    }
    programs {
-      program {
-         signal: "mouse,in";
-         source: "event_area";
+      program { signal: "mouse,in"; source: "event_area";
          action: STATE_SET "selected" 0.0;
          target: "background";
          target: "text";
       }
-      program {
-         signal: "mouse,out";
-         source: "event_area";
+      program { signal: "mouse,out"; source: "event_area";
          action: STATE_SET "default" 0.0;
          target: "background";
          target: "text";

data/elementary/themes/edc/background.edc

@@ -1,19 +1,17 @@
 group { name: "e/desktop/background";
-   images.image: "bg_radgrad.png" COMP;
-   images.image: "dot_pattern.png" COMP;
+   alias: "elm/ews/background/default";
+   BACKGROUND_IMG
    parts {
-      part { name: "bg";
+      part { name: "clip"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "bg_radgrad.png";
-            image.scale_hint: STATIC;
-            fill.smooth: 0;
-            ASPECT_FILL((1024/653))
          }
       }
-      part { name: "pat";
+      part { name: "bg";
+         clip_to: "clip";
          description { state: "default" 0.0;
-            image.normal: "dot_pattern.png";
-            TILED_PATTERN(256, 256)
+            image.normal: "background";
+            image.scale_hint: STATIC;
+            ASPECT_FILL((7680/4320))
          }
       }
    }

data/elementary/themes/edc/backlight.edc

@@ -1,9 +1,8 @@
 group { name: "e/modules/backlight/main";
    alias: "e/gadget/backlight/main";
    alias: "e/gadget/backlight/main_vert";
-   images.image: "bulb_glow.png" COMP;
-   images.image: "bulb_off.png" COMP;
-   images.image: "bulb_on.png" COMP;
+   alias: "e/modules/backlight/main_vert";
+   images.image: "bulb_middle.png" COMP;
    images.image: "bulb_over.png" COMP;
    min: 16 16;
    max: 160 160;
@@ -13,46 +12,30 @@ group { name: "e/modules/backlight/main";
             new Float:val;
             val = getfarg(2);
             set_tween_state(PART:"glow", val, "default", 0.0, "full", 0.0);
-            set_tween_state(PART:"glow2", val, "default", 0.0, "full", 0.0);
          }
       }
    }
    parts {
+      part { name: "base";
+         description { state: "default" 0.0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "bulb_middle.png";
+            color: 32 32 32 255;
+         }
+      }
       part { name: "glow";
          description { state: "default" 0.0;
             rel1.to: "base";
-            rel1.relative: (76/152) (69/152);
+            rel1.relative: 0.5 0.5;
             rel2.to: "base";
-            rel2.relative: (76/152) (69/152);
-            image.normal: "bulb_glow.png";
-            color: 255 255 255 0;
-            max: 138 138;
-         }
-         description { state: "full" 0.0;
-            inherit: "default" 0.0;
-            rel1.relative: (7/152) (0/152);
-            rel2.relative: (145/152) (138/152);
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "base";
-         description { state: "default" 0.0;
-            rel1.relative: (4/160) (4/160);
-            rel2.relative: (156/160) (156/160);
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "bulb_off.png";
-            max: 152 152;
-         }
-      }
-      part { name: "glow2";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "bulb_on.png";
+            rel2.relative: 0.5 0.5;
+            image.normal: "bulb_middle.png";
             color: 255 255 255 0;
          }
          description { state: "full" 0.0;
             inherit: "default" 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 1.0;
             color: 255 255 255 255;
          }
       }

data/elementary/themes/edc/batman.edc

@@ -1,186 +1,65 @@
 group { name: "e/gadget/batman/main";
    alias: "e/gadget/batman/main_vert";
-   images.image: "bat_shadow.png" COMP;
    images.image: "bat_base.png" COMP;
-   images.image: "bat_bottom0.png" COMP;
-   images.image: "bat_top0.png" COMP;
-   images.image: "batman_overlay.png" COMP;
-   images.image: "glow_med_white.png" COMP;
    script {
       public message(Msg_Type:type, id, ...) {
          if ((type == MSG_FLOAT) && (id == 1)) {
-            new Float:val;
-            new r = 51, g = 153, b = 255;
-            new lr = 255, lg = 0, lb = 0;
-            
-            val = getfarg(2);
-            if (val < 0.35) {
-               new Float:val1, Float:val2;
-               
-               val1 = (val - 0.10) / 0.25;
-               val2 = 1.0 - val1;
-               r = round((r * val1) + (lr * val2), ROUND);
-               g = round((g * val1) + (lg * val2), ROUND);
-               b = round((b * val1) + (lb * val2), ROUND);
-            } 
-            custom_state(PART:"fill", "default", 0.0);
-            set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
-            set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
-            set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
-            set_state_val(PART:"fill", STATE_REL1, 0.0, 1.0 - val);
-            set_state(PART:"fill", "custom", 0.0);
+            new Float:val = getfarg(2);
+            val = 0.05 + (0.9 * (1.0 - val));
+            custom_state(PART:"fill_clip", "default", 0.0);
+            set_state_val(PART:"fill_clip", STATE_REL1, 0.0, val);
+            set_state(PART:"fill_clip", "custom", 0.0);
          }
       }
    }
    parts {
-      part { name: "fade_clip"; type: RECT;
+      part { name: "pulse_clip"; type: RECT;
          description { state: "default" 0.0;
-            color: 255 255 255 255;
+            rel1.to: "bg";
+            rel2.to: "bg";
          }
          description { state: "faded" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+         }
+      }
+      part { name: "fill_clip_dim"; type: RECT;
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
             color: 128 128 128 255;
          }
       }
-      part { name: "pulse_clip"; type: RECT;
-         clip_to: "fade_clip";
-         description { state: "default" 0.0;
-            color: 255 255 255 255;
-         }
-         description { state: "faded" 1.0;
-            color: 255 255 255 255;
-         }
-         description { state: "faded" 0.0;
-            color: 255 255 255 64;
-         }
-      }
-      part { name: "fill_region"; type: SPACER;
+      part { name: "fill_clip"; type: RECT;
+         clip_to: "fill_clip_dim";
          description { state: "default" 0.0;
             rel1.to: "bg";
-            rel1.offset: 1 0;
             rel2.to: "bg";
-            rel2.offset: -2 -1;
-         }
-      }
-      part { name: "pwr"; type: SPACER;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel1.relative: 0.40 0.40;
-            rel2.to: "bg";
-            rel2.relative: 0.60 0.60;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            step: 5 5;
-         }
-      }
-      part { name: "base"; type: SPACER;
-         description { state: "default" 0.0;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-         }
-      }
-      part { name: "shadow";
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel1.to: "top";
-            rel1.offset: -4 0;
-            rel2.to: "bottom";
-            rel2.offset: 3 3;
-            image.normal: "bat_shadow.png";
          }
       }
       part { name: "bg";
          clip_to: "pulse_clip";
          description { state: "default" 0.0;
-            rel1.to: "top";
-            rel1.relative: 0.0 1.0;
-            rel2.to: "bottom";
-            rel2.relative: 1.0 0.0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
             image.normal: "bat_base.png";
-            fill.smooth: 0;
+            color: 0 0 0 64;
          }
       }
-      part { name: "top";
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel1.offset: 6 4;
-            rel2.to: "base";
-            rel2.offset: -7 4;
-            rel2.relative: 1.0 0.0;
-            aspect: (112/24) (112/24); aspect_preference: HORIZONTAL;
-            align: 0.5 0.0;
-            image.normal: "bat_top0.png";
-         }
-      }
-      part { name: "bottom";
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel1.offset: 6 -5;
-            rel2.to: "base";
-            rel2.offset: -7 -5;
-            aspect: (112/12) (112/12); aspect_preference: HORIZONTAL;
-            align: 0.5 1.0;
-            image.normal: "bat_bottom0.png";
-         }
-      }
-      part { name: "fill"; mouse_events: 0;
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel1.to: "fill_region";
-            rel1.offset: -5 -5;
-            rel2.to: "fill_region";
-            rel2.offset: 4 4;
-            image.normal: "glow_med_white.png";
-            image.border: 10 10 10 10;
-            color: 51 153 255 255;
-         }
-      }
-      part { name: "overlay";
-         clip_to: "pulse_clip";
+      part { name: "fill";
+         clip_to: "fill_clip";
          description { state: "default" 0.0;
             rel1.to: "bg";
-            rel1.offset: 0 0;
             rel2.to: "bg";
-            rel2.offset: -1 -1;
-            image.normal: "batman_overlay.png";
-            image.border: 0 0 7 7;
+            image.normal: "bat_base.png";
+            color: 160 160 160 255;
          }
-      }
-      part { name: "pwr1";
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel1.to: "pwr";
-            rel1.relative: (2/5) 0.0;
-            rel1.offset: -5 -5;
-            rel2.to: "pwr";
-            rel2.relative: (3/5) 1.0;
-            rel2.offset: 4 4;
-            image.normal: "glow_med_white.png";
-            image.border: 5 5 5 5;
-            fill.smooth: 0;
-            visible: 0;
-         }
-         description { state: "visible" 0.0;
+         description { state: "charging" 0.0;
             inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "pwr2";
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel1.to: "pwr";
-            rel1.relative: 0.0 (2/5);
-            rel1.offset: -5 -5;
-            rel2.to: "pwr";
-            rel2.relative: 1.0 (3/5);
-            rel2.offset: 4 4;
-            image.normal: "glow_med_white.png";
-            image.border: 5 5 5 5;
-            fill.smooth: 0;
-            visible: 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+            color: 51 153 255 255;
          }
       }
       part { name: "over"; type: RECT;
@@ -192,20 +71,13 @@ group { name: "e/gadget/batman/main";
    programs {
       program {
          signal: "e,state,charging"; source: "e";
-         action: STATE_SET "visible" 0.0;
-         target: "pwr1";
-         target: "pwr2";
+         action: STATE_SET "charging" 0.0;
+         target: "fill";
       }
       program {
          signal: "e,state,discharging"; source: "e";
          action: STATE_SET "default" 0.0;
-         target: "pwr1";
-         target: "pwr2";
-      }
-      program {
-         signal: "e,state,unknown"; source: "e";
-         action: STATE_SET "faded" 0.0;
-         target: "fade_clip";
+         target: "fill";
       }
       program { name: "pulse";
          signal: "e,action,pulse,start"; source: "e";
@@ -215,36 +87,56 @@ group { name: "e/gadget/batman/main";
          target: "pulse_clip";
       }
       program { name: "pulse2";
-         action: STATE_SET "faded" 1.0; transition: ACCELERATE 0.1;
+         action: STATE_SET "default" 0.0;
+         transition: ACCELERATE 0.1;
          target: "pulse_clip";
+         after: "pulse";
       }
       program {
+         signal: "e,action,pulse,stop"; source: "e";
+         action: ACTION_STOP;
+         target: "pulse";
+         target: "pulse2";
+         after: "pulse3";
+      }
+      program { name: "pulse3";
          signal: "e,action,pulse,stop"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "pulse_clip";
       }
+      program {
+         signal: "mouse,in"; source: "over";
+         action: STATE_SET "visible" 0.0;
+         transition: SINUSOIDAL 0.3;
+         target: "fill_clip_dim";
+      }
+      program {
+         signal: "mouse,out"; source: "over";
+         action: STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 0.3;
+         target: "fill_clip_dim";
+      }
    }
 }
 
 group { name: "e/gadget/batman/popup";
-   min: 240 60;
+   min: 320 60;
    parts {
       part { name: "e.swallow.batman"; type: SWALLOW;
          description { state: "default" 0.0;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
             min: 1 1;
-            max: 160 160;
+            max: 240 160;
             align: 0.0 0.5;
          }
       }
       part { name: "e.text.title"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 1.0 0.0;
             rel1.to_x: "e.swallow.batman";
             rel2.relative: 1.0 0.5;
-            color: FN_COL_DEFAULT;
+            color: 160 160 160 255;
             text { font: "Sans:style=Bold"; size: 10;
                text: "Your battery is low!";
                min: 1 1;
@@ -254,12 +146,11 @@ group { name: "e/gadget/batman/popup";
          }
       }
       part { name: "e.text.label"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 1.0 0.5;
             rel1.to_x: "e.swallow.batman";
-            color: FN_COL_DEFAULT;
+            color: 160 160 160 255;
             text { font: "Sans"; size: 10;
                text: "AC power is recommended.";
                min: 1 1;

data/elementary/themes/edc/battery.edc

@@ -1,226 +1,85 @@
 group { name: "e/modules/battery/main";
-   images.image: "bat_shadow.png" COMP;
    images.image: "bat_base.png" COMP;
-   images.image: "bat_shine.png" COMP;
-   images.image: "bat_bottom0.png" COMP;
-   images.image: "bat_bottom1.png" COMP;
-   images.image: "bat_top0.png" COMP;
-   images.image: "bat_top1.png" COMP;
-   images.image: "glow_med_white.png" COMP;
+   min: 16 16;
+   max: 160 160;
    script {
       public message(Msg_Type:type, id, ...) {
          if ((type == MSG_FLOAT) && (id == 1)) {
-            new Float:val;
-            new r = 51, g = 153, b = 255;
-            new lr = 255, lg = 0, lb = 0;
-            
-            val = getfarg(2);
-            if (val < 0.35) {
-               new Float:val1, Float:val2;
-               
-               val1 = (val - 0.10) / 0.25;
-               val2 = 1.0 - val1;
-               r = round((r * val1) + (lr * val2), ROUND);
-               g = round((g * val1) + (lg * val2), ROUND);
-               b = round((b * val1) + (lb * val2), ROUND);
-            } 
-            custom_state(PART:"fill", "default", 0.0);
-            set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
-            set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
-            set_state_val(PART:"fill", STATE_COLOR, r, g, b, 255);
-            set_state_val(PART:"fill", STATE_REL1, 0.0, 1.0 - val);
-            set_state(PART:"fill", "custom", 0.0);
+            new Float:val = getfarg(2);
+            val = 0.05 + (0.9 * (1.0 - val));
+            custom_state(PART:"fill_clip", "default", 0.0);
+            set_state_val(PART:"fill_clip", STATE_REL1, 0.0, val);
+            set_state(PART:"fill_clip", "custom", 0.0);
          }
       }
    }
    parts {
-      part { name: "fade_clip"; type: RECT;
+      part { name: "pulse_clip"; type: RECT;
          description { state: "default" 0.0;
-            color: 255 255 255 255;
+            rel.to: "bg";
          }
          description { state: "faded" 0.0;
-            color: 128 128 128 255;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+         }
+      }
+      part { name: "fill_clip_dim"; type: RECT;
+         clip_to: "pulse_clip";
+         description { state: "default" 0.0;
+            rel.to: "bg";
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            color: 160 160 160 255;
+         }
+      }
+      part { name: "fill_clip"; type: RECT;
+         clip_to: "fill_clip_dim";
+         description { state: "default" 0.0;
+            rel.to: "bg";
          }
       }
       part { name: "info_clip"; type: RECT;
-         clip_to: "fade_clip";
          description { state: "default" 0.0;
+            rel.to: "bg";
             color: 255 255 255 0;
          }
          description { state: "visible" 0.0;
+            inherit: "default" 0.0;
             color: 255 255 255 255;
          }
       }
-      part { name: "pulse_clip"; type: RECT;
-         clip_to: "fade_clip";
-         description { state: "default" 0.0;
-            color: 255 255 255 255;
-         }
-         description { state: "faded" 1.0;
-            color: 255 255 255 255;
-         }
-         description { state: "faded" 0.0;
-            color: 255 255 255 64;
-         }
-      }
-      part { name: "fill_region"; type: SPACER;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-         }
-      }
-      part { name: "pwr"; type: SPACER;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel1.relative: 0.40 0.40;
-            rel2.to: "bg";
-            rel2.relative: 0.60 0.60;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            step: 5 5;
-         }
-      }
-      part { name: "base"; type: SPACER;
-         description { state: "default" 0.0;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-         }
-      }
-      part { name: "shadow";
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel1.to: "top";
-            rel1.offset: -4 0;
-            rel2.to: "bottom";
-            rel2.offset: 3 3;
-            image.normal: "bat_shadow.png";
-         }
-      }
       part { name: "bg";
          clip_to: "pulse_clip";
          description { state: "default" 0.0;
-            rel1.to: "top";
-            rel1.relative: 0.0 1.0;
-            rel2.to: "bottom";
-            rel2.relative: 1.0 0.0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
             image.normal: "bat_base.png";
-            fill.smooth: 0;
+            color: 32 32 32 255;
          }
       }
-      part { name: "top";
-         clip_to: "pulse_clip";
+      part { name: "fill";
+         clip_to: "fill_clip";
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel1.offset: 6 4;
-            rel2.to: "base";
-            rel2.offset: -7 4;
-            rel2.relative: 1.0 0.0;
-            aspect: (112/24) (112/24); aspect_preference: HORIZONTAL;
-            align: 0.5 0.0;
-            image.normal: "bat_top0.png";
+            rel.to: "bg";
+            image.normal: "bat_base.png";
+            color: 160 160 160 255;
          }
-      }
-      part { name: "bottom";
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel1.offset: 6 -5;
-            rel2.to: "base";
-            rel2.offset: -7 -5;
-            aspect: (112/12) (112/12); aspect_preference: HORIZONTAL;
-            align: 0.5 1.0;
-            image.normal: "bat_bottom0.png";
-         }
-      }
-      part { name: "fill"; mouse_events: 0;
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel1.to: "fill_region";
-            rel1.offset: -5 -5;
-            rel2.to: "fill_region";
-            rel2.offset: 4 4;
-            image.normal: "glow_med_white.png";
-            image.border: 10 10 10 10;
+         description { state: "charging" 0.0;
+            inherit: "default" 0.0;
             color: 51 153 255 255;
          }
       }
-      part { name: "top-shine";
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel1.to: "top";
-            rel2.to: "top";
-            image.normal: "bat_top1.png";
-         }
-      }
-      part { name: "bottom-shine";
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel1.to: "bottom";
-            rel2.to: "bottom";
-            image.normal: "bat_bottom1.png";
-         }
-      }
-      part { name: "shine";
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel1.offset: 0 -6;
-            rel2.to: "bg";
-            rel2.offset: -1 5;
-            image.normal: "bat_shine.png";
-            image.border: 0 0 7 7;
-         }
-      }
-      part { name: "pwr1";
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel1.to: "pwr";
-            rel1.relative: (2/5) 0.0;
-            rel1.offset: -5 -5;
-            rel2.to: "pwr";
-            rel2.relative: (3/5) 1.0;
-            rel2.offset: 4 4;
-            image.normal: "glow_med_white.png";
-            image.border: 5 5 5 5;
-            fill.smooth: 0;
-            visible: 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "pwr2";
-         clip_to: "pulse_clip";
-         description { state: "default" 0.0;
-            rel1.to: "pwr";
-            rel1.relative: 0.0 (2/5);
-            rel1.offset: -5 -5;
-            rel2.to: "pwr";
-            rel2.relative: 1.0 (3/5);
-            rel2.offset: 4 4;
-            image.normal: "glow_med_white.png";
-            image.border: 5 5 5 5;
-            fill.smooth: 0;
-            visible: 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
       part { name: "e.text.reading"; type: TEXT; mouse_events: 0;
          scale: 1;
          clip_to: "info_clip";
          description { state: "default" 0.0;
             align: 0.5 0.0;
-            rel1.to: "bg";
-            rel1.offset: 0 -2;
-            rel2.relative: 1.0 0.0;
-            rel2.to_x: "bg";
-            rel2.to_y: "pwr";
-            rel2.offset: -1 2;
-            color_class: "module_label_plain";
-            color3: 255 255 255 255;
-            text { font: "Sans";
+            rel.to: "bg";
+            rel1.relative: 0.25 0.15;
+            rel2.relative: 0.75 0.53;
+            color: 255 255 255 255;
+            text { font: "Sans"; size: 8;
+               min: 0 1;
                fit: 1 1;
                ellipsis: -1;
                align: 0.5 0.5;
@@ -233,15 +92,12 @@ group { name: "e/modules/battery/main";
          clip_to: "info_clip";
          description { state: "default" 0.0;
             align: 0.5 1.0;
-            rel1.relative: 0.0 1.0;
-            rel1.offset: 0 -2;
-            rel1.to_x: "bg";
-            rel1.to_y: "pwr";
-            rel2.offset: -1 1;
-            rel2.to: "bg";
-            color_class: "module_label_plain";
-            color3: 255 255 255 255;
-            text { font: "Sans";
+            rel.to: "bg";
+            rel1.relative: 0.25 0.47;
+            rel2.relative: 0.75 0.85;
+            color: 255 255 255 255;
+            text { font: "Sans"; size: 8;
+               min: 0 1;
                fit: 1 1;
                ellipsis: -1;
                align: 0.5 0.5;
@@ -256,34 +112,13 @@ group { name: "e/modules/battery/main";
       }
    }
    programs {
-      program {
-         signal: "mouse,in"; source: "over";
-         action: STATE_SET "visible" 0.0;
-         transition: LINEAR 0.3;
-         target: "info_clip";
+      program { signal: "e,state,charging"; source: "e";
+         action: STATE_SET "charging" 0.0;
+         target: "fill";
       }
-      program {
-         signal: "mouse,out"; source: "over";
+      program { signal: "e,state,discharging"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: LINEAR 0.3;
-         target: "info_clip";
-      }
-      program {
-         signal: "e,state,charging"; source: "e";
-         action: STATE_SET "visible" 0.0;
-         target: "pwr1";
-         target: "pwr2";
-      }
-      program {
-         signal: "e,state,discharging"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "pwr1";
-         target: "pwr2";
-      }
-      program {
-         signal: "e,state,unknown"; source: "e";
-         action: STATE_SET "faded" 0.0;
-         target: "fade_clip";
+         target: "fill";
       }
       program { name: "pulse";
          signal: "e,action,pulse,start"; source: "e";
@@ -293,36 +128,55 @@ group { name: "e/modules/battery/main";
          target: "pulse_clip";
       }
       program { name: "pulse2";
-         action: STATE_SET "faded" 1.0; transition: ACCELERATE 0.1;
+         action: STATE_SET "default" 0.0;
+         transition: ACCELERATE 0.1;
          target: "pulse_clip";
+         after: "pulse";
       }
-      program {
+      program { signal: "e,action,pulse,stop"; source: "e";
+         action: ACTION_STOP;
+         target: "pulse";
+         target: "pulse2";
+         after: "pulse3";
+      }
+      program { name: "pulse3";
          signal: "e,action,pulse,stop"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "pulse_clip";
       }
+      program { signal: "mouse,in"; source: "over";
+         action: STATE_SET "visible" 0.0;
+         transition: SINUSOIDAL 0.3;
+         target: "info_clip";
+         target: "fill_clip_dim";
+      }
+      program { signal: "mouse,out"; source: "over";
+         action: STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 0.3;
+         target: "info_clip";
+         target: "fill_clip_dim";
+      }
    }
 }
 
 group { name: "e/modules/battery/popup";
-   min: 240 60;
+   min: 320 60;
    parts {
       part { name: "e.swallow.battery"; type: SWALLOW;
          description { state: "default" 0.0;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
             min: 1 1;
-            max: 160 160;
+            max: 240 160;
             align: 0.0 0.5;
          }
       }
       part { name: "e.text.title"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 1.0 0.0;
             rel1.to_x: "e.swallow.battery";
             rel2.relative: 1.0 0.5;
-            color: FN_COL_DEFAULT;
+            color: 160 160 160 255;
             text { font: "Sans:style=Bold"; size: 10;
                text: "Your battery is low!";
                min: 1 1;
@@ -332,12 +186,11 @@ group { name: "e/modules/battery/popup";
          }
       }
       part { name: "e.text.label"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 1.0 0.5;
             rel1.to_x: "e.swallow.battery";
-            color: FN_COL_DEFAULT;
+            color: 160 160 160 255;
             text { font: "Sans"; size: 10;
                text: "AC power is recommended.";
                min: 1 1;

data/elementary/themes/edc/bluez4.edc

@@ -1,25 +1,30 @@
 group { name: "e/modules/bluez4/main";
-   images.image: "bt_base.png" COMP;
+   images.image: "bz5_logo.png" COMP;
    max: 160 160;
    parts {
       part { name: "base";
          description { state: "default" 0.0;
-            aspect: (160/144) (160/144); aspect_preference: BOTH;
-            image.normal: "bt_base.png";
+            rel1.relative: (25/380) (25/380);
+            rel2.relative: (365/380) (365/380);
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "bz5_logo.png";
+            color: 160 160 160 255;
          }
       }
    }
 }
 
 group { name: "e/modules/bluez4/inactive";
-   images.image: "bt_base.png" COMP;
+   images.image: "bz5_logo.png" COMP;
    max: 160 160;
    parts {
       part { name: "base";
          description { state: "default" 0.0;
-            aspect: (160/144) (160/144); aspect_preference: BOTH;
-            image.normal: "bt_base.png";
-            color: 255 255 255 128;
+            rel1.relative: (25/380) (25/380);
+            rel2.relative: (365/380) (365/380);
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "bz5_logo.png";
+            color: 160 160 160 128;
          }
       }
    }

data/elementary/themes/edc/bluez5.edc

@@ -0,0 +1,164 @@
+#define BZ5_EXIST   1
+#define BZ5_ON      2
+#define BZ5_VISIBLE 4
+#define BZ5_SCAN    8
+
+group { name: "e/modules/bluez5/main";
+   images.image: "bz5_none.png" COMP;
+   images.image: "bz5_logo.png" COMP;
+   images.image: "radio.png" COMP;
+   max: 160 160;
+   script {
+      public bzmode;
+      eval_mode(m) {
+         new prev = get_int(bzmode);
+         if (m & BZ5_ON)
+            set_state(PART:"base", "on", 0.0);
+         else if (m & BZ5_EXIST)
+            set_state(PART:"base", "exist", 0.0);
+         else
+            set_state(PART:"base", "default", 0.0);
+
+         if      ((!(prev & BZ5_VISIBLE)) && ( (m & BZ5_VISIBLE))) {
+            run_program(PROGRAM:"visible0");
+         }
+         else if (( (prev & BZ5_VISIBLE)) && (!(m & BZ5_VISIBLE))) {
+            stop_program(PROGRAM:"visible0");
+            stop_program(PROGRAM:"visible1");
+            run_program(PROGRAM:"visiblereset");
+         }
+
+         if      ((!(prev & BZ5_SCAN)) && ( (m & BZ5_SCAN))) {
+            run_program(PROGRAM:"scan0");
+         }
+         else if (( (prev & BZ5_SCAN)) && (!(m & BZ5_SCAN))) {
+            stop_program(PROGRAM:"scan0");
+            stop_program(PROGRAM:"scan1");
+            run_program(PROGRAM:"scanreset");
+         }
+      }
+      flag_set(flag) {
+         new m = get_int(bzmode) | flag;
+         eval_mode(m); set_int(bzmode, m);
+      }
+      flag_unset(flag) {
+         new m = get_int(bzmode) & ~flag;
+         eval_mode(m); set_int(bzmode, m);
+      }
+   }
+   parts {
+      part { name: "base";
+         description { state: "default" 0.0;
+            rel1.relative: (25/380) (25/380);
+            rel2.relative: (365/380) (365/380);
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "bz5_none.png";
+            color: 160 160 160 255;
+         }
+         description { state: "exist" 0.0;
+            inherit;
+            image.normal: "bz5_logo.png";
+            color: 160 160 160 128;
+         }
+         description { state: "on" 0.0;
+            inherit;
+            image.normal: "bz5_logo.png";
+            color: 160 160 160 255;
+         }
+      }
+      part { name: "visible";
+         description { state: "default" 0.0;
+            rel.to: "base";
+            rel1.relative: 0.0 0.8;
+            rel2.relative: 0.2 1.0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "radio.png";
+            color: 51 153 255 255;
+            visible: 0;
+            min: 1 1;
+         }
+         description { state: "on" 0.0;
+            inherit;
+            visible: 1;
+         }
+      }
+      part { name: "scan";
+         description { state: "default" 0.0;
+            rel.to: "base";
+            rel1.relative: 0.8 0.8;
+            rel2.relative: 1.0 1.0;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "radio.png";
+            color: 255 153 51 255;
+            visible: 0;
+            min: 1 1;
+         }
+         description { state: "on" 0.0;
+            inherit;
+            visible: 1;
+         }
+      }
+   }
+   programs {
+      program { signal: "e,state,exist"; source: "e";
+         script { flag_set(BZ5_EXIST); }
+      }
+      program { signal: "e,state,noexist"; source: "e";
+         script { flag_unset(BZ5_EXIST); }
+      }
+      program { signal: "e,state,on"; source: "e";
+         script { flag_set(BZ5_ON); }
+      }
+      program { signal: "e,state,off"; source: "e";
+         script { flag_unset(BZ5_ON); }
+      }
+      program { signal: "e,state,visible"; source: "e";
+         script { flag_set(BZ5_VISIBLE); }
+      }
+      program { signal: "e,state,invisible"; source: "e";
+         script { flag_unset(BZ5_VISIBLE); }
+      }
+      program { signal: "e,state,scanning"; source: "e";
+//         action: STATE_SET "on" 0.0;
+//         target: "scan";
+         script { flag_set(BZ5_SCAN); }
+      }
+      program { signal: "e,state,unscanning"; source: "e";
+//         action: STATE_SET "default" 0.0;
+//         target: "scan";
+         script { flag_unset(BZ5_SCAN); }
+      }
+      program { name: "visible0";
+         action: STATE_SET "on" 0.0;
+         target: "visible";
+         in: 0.5 0.0;
+         after: "visible1";
+      }
+      program { name: "visible1";
+         action: STATE_SET "default" 0.0;
+         target: "visible";
+         in: 0.5 0.0;
+         after: "visible0";
+      }
+      program { name: "visiblereset";
+         action: STATE_SET "default" 0.0;
+         target: "visible";
+      }
+      program { name: "scan0";
+         action: STATE_SET "on" 0.0;
+         target: "scan";
+         in: 0.5 0.0;
+         after: "scan1";
+      }
+      program { name: "scan1";
+         action: STATE_SET "default" 0.0;
+         target: "scan";
+         in: 0.5 0.0;
+         after: "scan0";
+      }
+      program { name: "scanreset";
+         action: STATE_SET "default" 0.0;
+         target: "scan";
+      }
+   }
+}

data/elementary/themes/edc/bryce.edc

@@ -4,86 +4,26 @@ group { name: "e/bryce/default/base"; nomouse;
        * when auto-hiding the bryce */
       item: "hidden_state_size" "2";
    }
-   images.image: "vgrad_med.png" COMP;
-   images.image: "vgrad_tall.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "holes_vert.png" COMP;
-   images.image: "holes_horiz.png" COMP;
-   images.image: "shine.png" COMP;
    parts {
       rect { "mouse"; mouse;
          desc { color: 0 0 0 0; }
       }
-      part { name: "bg";
+      part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
-            image.normal: "vgrad_med.png";
-            fill.smooth: 0;
-            TILED_HORIZ(120)
-            color_class: "bryce_base";
+            color: 64 64 64 255;
          }
          description { state: "vert" 0.0;
-            image.normal: "vgrad_tall.png";
-            fill.smooth: 0;
-            TILED_HORIZ(40)
-            color_class: "bryce_base";
-         }
-      }
-      part { name: "bevel";
-         description { state: "default" 0.0;
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "dots_start";
-         description { state: "default" 0.0;
-            image.normal: "holes_vert.png";
-            rel1.offset: 2 2;
-            rel2.relative: 0.0 1.0;
-            rel2.offset: 5 -3;
-            FIXED_SIZE(4, 14)
-         }
-         description { state: "vert" 0.0;
-            image.normal: "holes_horiz.png";
-            rel1.offset: 2 2;
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -3 5;
-            FIXED_SIZE(14, 4)
-         }
-      }
-      part { name: "dots_end";
-         description { state: "default" 0.0;
-            image.normal: "holes_vert.png";
-            rel1.relative: 1.0 0.0;
-            rel1.offset: -6 2;
-            rel2.offset: -3 -3;
-            FIXED_SIZE(4, 14)
-         }
-         description { state: "vert" 0.0;
-            image.normal: "holes_horiz.png";
-            rel1.relative: 0.0 1.0;
-            rel1.offset: 2 -6;
-            rel2.offset: -3 -3;
-            FIXED_SIZE(14, 4)
+            color: 64 64 64 255;
          }
       }
       spacer { "sizer";
          description { state: "default" 0.0;
-            rel1.offset: 1 0;
-            rel1.relative: 1.0 0.0;
-            rel1.to_x: "dots_start";
-            rel2.offset: -2 -1;
-            rel2.to_x: "dots_end";
-            rel2.relative: 0.0 1.0;
+            rel1.offset: 4 0;
+            rel2.offset: -5 -1;
          }
          description { state: "vert" 0.0;
-            rel1.offset: 0 1;
-            rel1.relative: 0.0 1.0;
-            rel1.to_y: "dots_start";
-            rel2.offset: -1 -2;
-            rel2.to_y: "dots_end";
-            rel2.relative: 1.0 0.0;
+            rel1.offset: 0 4;
+            rel2.offset: -1 -5;
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW; mouse;
@@ -96,15 +36,6 @@ group { name: "e/bryce/default/base"; nomouse;
             link.base: "e,state,hidden" "e";
          }
       }
-      part { name: "shine";
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            FIXED_SIZE(69, 5)
-         }
-      }
       rect { "text_fader"; mouse;
          desc { hid;
             color: 0 0 0 0;
@@ -146,8 +77,6 @@ group { name: "e/bryce/default/base"; nomouse;
             action: STATE_SET _STATE 0.0; \
             target: "bg"; \
             target: "sizer"; \
-            target: "dots_start"; \
-            target: "dots_end"; \
          }
       }
       ORIENT_SATE("horizontal", "default")
@@ -156,6 +85,20 @@ group { name: "e/bryce/default/base"; nomouse;
    }
 }
 
+group { name: "e/bryce/alternate/base"; nomouse;
+   inherit: "e/bryce/default/base";
+   parts {
+      part { name: "bg"; type: RECT;
+         description { state: "default" 0.0;
+            color: 32 32 32 255;
+         }
+         description { state: "vert" 0.0;
+            color: 32 32 32 255;
+         }
+      }
+   }
+}
+
 group { name: "e/bryce/invisible/base"; nomouse;
    inherit: "e/bryce/default/base";
    data.item: "noshadow" "1";
@@ -168,48 +111,6 @@ group { name: "e/bryce/invisible/base"; nomouse;
             visible: 0;
          }
       }
-      part { name: "bevel";
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "shine";
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "dots_start";
-         description { state: "default" 0.0;
-            rel1.offset: 0 0;
-            rel2.offset: -1 -1;
-            min: 0 0;
-            max: 0 0;
-            visible: 0;
-         }
-         description { state: "vert" 0.0;
-            rel1.offset: 0 0;
-            rel2.offset: -1 -1;
-            min: 0 0;
-            max: 0 0;
-            visible: 0;
-         }
-      }
-      part { name: "dots_end";
-         description { state: "default" 0.0;
-            rel1.offset: 0 0;
-            rel2.offset: -1 -1;
-            min: 0 0;
-            max: 0 0;
-            visible: 0;
-         }
-         description { state: "vert" 0.0;
-            rel1.offset: 0 0;
-            rel2.offset: -1 -1;
-            min: 0 0;
-            max: 0 0;
-            visible: 0;
-         }
-      }
    }
 }
 
@@ -219,20 +120,10 @@ group { name: "e/bryce/translucent/base"; nomouse;
    parts {
       part { name: "bg";
          description { state: "default" 0.0;
-            color: 127 127 127 135;
+            color: 32 32 32 128;
          }
          description { state: "vert" 0.0;
-            color: 127 127 127 135;
-         }
-      }
-      part { name: "bevel";
-         description { state: "default" 0.0;
-            color: 127 127 127 135;
-         }
-      }
-      part { name: "shine";
-         description { state: "default" 0.0;
-            color: 127 127 127 135;
+            color: 32 32 32 128;
          }
       }
    }
@@ -254,12 +145,12 @@ group { name: "e/bryce/default/inset"; nomouse;
       }
       spacer { "sizer";
          description { state: "default" 0.0;
-            rel1.offset: 4 1;
-            rel2.offset: -5 -2;
+            rel1.offset: 3 0;
+            rel2.offset: -4 -1;
          }
          description { state: "vert" 0.0;
-            rel1.offset: 1 4;
-            rel2.offset: -2 -5;
+            rel1.offset: 0 3;
+            rel2.offset: -1 -4;
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW; mouse;
@@ -321,9 +212,13 @@ group { name: "e/bryce/default/plain"; nomouse;
          }
       }
       spacer { "sizer";
-         desc {
-            rel1.offset: 1 1;
-            rel2.offset: -2 -2;
+         description { state: "default" 0.0;
+            rel1.offset: 3 1;
+            rel2.offset: -4 -2;
+         }
+         description { state: "vert" 0.0;
+            rel1.offset: 1 3;
+            rel2.offset: -2 -4;
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW; mouse;
@@ -340,6 +235,17 @@ group { name: "e/bryce/default/plain"; nomouse;
          desc { color: 0 0 0 0; }
       }
    }
+   programs {
+#define ORIENT_SATE(_ORIENT, _STATE) \
+   program { \
+signal: "e,state,orient,"_ORIENT; source: "e"; \
+action: STATE_SET _STATE 0.0; \
+target: "sizer"; \
+   }
+      ORIENT_SATE("horiontal", "default")
+      ORIENT_SATE("vertical", "vert")
+#undef ORIENT_SATE
+   }
 }
 
 group { "elm/scroller/base/bryce";
@@ -356,6 +262,6 @@ group { "elm/scroller/base/bryce";
             link.base: "e,state,orient,vertical" "e";
          }
       }
-      swallow { "elm.swallow.content" clip: "clip"; }
+      swallow { "elm.swallow.content" clip: "clip"; description {rel1.offset: -1 -1; rel2.offset: 0 0; }}
    }
 }

data/elementary/themes/edc/button.edc

@@ -1,21 +1,32 @@
- group { name: "e/widgets/button";
-   images.image: "button_normal.png" COMP;
-   images.image: "button_clicked.png" COMP;
-   images.image: "win_glow.png" COMP;
+group { name: "e/widgets/button";
+   images.image: "win_shadow.png" COMP;
    parts {
-      part { name: "base";
+      part { name: "shadow"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "button_normal.png";
-            image.border: 4 4 3 5;
-            image.middle: SOLID;
-            rel1.offset: -1 0;
-            rel2.offset: 0 1;
-            fill.smooth: 0;
+            rel.to: "base";
+            WIN_SHADOW_SMALL;
          }
          description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            image.normal: "button_clicked.png";
-            image.border: 5 5 4 6;
+            inherit;
+            image.border_scale_by: 0.25;
+            rel1.offset: -5 -3;
+            rel2.offset: 4 6;
+         }
+      }
+      rect { "base";
+         scale: 1;
+         desc { "default";
+            color: 51 153 255 255;
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            offscale;
+         }
+         desc { "clicked"; inherit;
+            color: 255 153 51 255;
+         }
+         desc { "disabled"; inherit;
+            color: 64 64 64 255;
          }
       }
       part { name: "icon_clip"; type: RECT;
@@ -28,25 +39,35 @@
       }
       part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
          clip_to: "icon_clip";
-         description { state: "default" 0.0;
+         scale: 1;
+         desc { "default";
+            fixed: 1 0;
             align: 0.0 0.5;
-            rel1.offset: 6 5;
-            rel1.to: "base";
+            rel.to: "base";
+            rel1.offset: 0 4;
             rel2.relative: 0.0 1.0;
-            rel2.offset: 6 -8;
-            rel2.to: "base";
+            rel2.offset: -1 -5;
+            visible: 0;
+            max: 0 999999;
+            offscale;
          }
-         description { state: "combo" 0.0;
-            inherit: "default" 0.0;
+         desc { "combo"; inherit;
+            fixed: 1 0;
+            rel1.offset: 4 4;
+            rel2.relative: 0.0 1.0;
+            rel2.offset: 4 -5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
+            visible: 1;
+            min: 16 16;
          }
          description { state: "icon" 0.0;
-            inherit: "default" 0.0;
-            min: 17 17;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
+            fixed: 0 0;
             align: 0.5 0.5;
+            rel1.offset: 4 4;
             rel2.relative: 1.0 1.0;
-            rel2.offset: -7 -8;
+            rel2.offset: -5 -5;
+            visible: 1;
+            min: 16 16;
          }
       }
       part { name: "label_clip"; type: RECT;
@@ -58,93 +79,58 @@
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          clip_to: "label_clip";
          description { state: "default" 0.0;
-            rel1.offset: 6 5;
-            rel1.to_x: "base";
+            fixed: 0 0;
+            color: 255 255 255 255;
+            rel1.offset: 4 4;
+            rel1.relative: 1.0 0.0;
+            rel1.to_x: "e.swallow.icon";
             rel1.to_y: "base";
-            rel2.offset: -7 -7;
             rel2.to: "base";
-            color_class: "button_text";
-            color3: 255 255 255 255;
+            rel2.offset: -5 -5;
             text { font: FN; size: 10;
+               align: 0.5 0.5;
                min: 1 1;
                ellipsis: -1;
-               align: 0.5 0.5;
-               text_class: "button";
             }
+            offscale;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color_class: "button_text_disabled";
-            color3: 255 255 255 255;
+            color: 96 96 96 255;
          }
          description { state: "combo" 0.0;
             inherit: "default" 0.0;
-            rel1.relative: 1.0 0.0;
-            rel1.offset: 2 5;
-            rel1.to_x: "e.swallow.icon";
          }
          description { state: "icon" 0.0;
             inherit: "default" 0.0;
             visible: 0;
          }
-      }
-      part { name: "label2"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "e.text.label";
-            rel2.to: "e.text.label";
-            color_class: "button_text_disabled";
-            color3: 255 255 255 255;
-            text { font: FN; size: 10;
-               text_source: "e.text.label";
-               align: 0.5 0.5;
-               text_class: "button";
-            }
-            visible: 0;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "base2"; type: SPACER;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-         }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            rel1.offset: 1 1;
-            rel2.offset: -2 -2;
+            color: 255 255 255 255;
          }
       }
-      part { name: "glow"; mouse_events: 0;
+      part { name: "glow"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "win_glow.png";
-            image.border: 9 9 9 9;
-            image.middle: 0;
-            rel1.to: "base2";
-            rel1.offset: -2 -3;
-            rel2.to: "base2";
-            rel2.offset: 1 0;
-            fill.smooth: 0;
-            color: 255 255 255 0;
+            rel.to: "base";
+            rel1.relative: 0.0 1.0;
+            color: 255 255 255 255;
+            align: 0.5 1.0;
             visible: 0;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 150;
+            min: 0 5;
             visible: 1;
          }
       }
       part { name: "event"; type: RECT;
          ignore_flags: ON_HOLD;
          description { state: "default" 0.0;
+            rel.to: "base";
             color: 0 0 0 0;
          }
          description { state: "disabled" 0.0;
@@ -157,14 +143,16 @@
       program {
          signal: "mouse,down,1"; source: "event";
          action: STATE_SET "clicked" 0.0;
+         target: "shadow";
          target: "base";
-         target: "base2";
+         target: "e.text.label";
       }
       program {
          signal: "mouse,up,1"; source: "event";
          action: STATE_SET "default" 0.0;
+         target: "shadow";
          target: "base";
-         target: "base2";
+         target: "e.text.label";
       }
       program {
          signal: "mouse,clicked,1*"; source: "event";
@@ -192,17 +180,17 @@
          signal: "e,state,disabled"; source: "e";
          action: STATE_SET "disabled" 0.0;
          target: "event";
+         target: "base";
          target: "icon_clip";
-         target: "label_clip";
-         target: "label2";
+         target: "e.text.label";
       }
       program {
          signal: "e,state,enabled"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "event";
+         target: "base";
          target: "icon_clip";
-         target: "label_clip";
-         target: "label2";
+         target: "e.text.label";
       }
       program { signal: "e,state,focused"; source: "e";
          action: STATE_SET "focused" 0.0;

data/elementary/themes/edc/check.edc

@@ -1,53 +1,30 @@
 group { name: "e/widgets/check";
-   images.image: "inset_shadow_tiny.png" COMP;
-   images.image: "bevel_in.png" COMP;
-   images.image: "sym_check_alum.png" COMP;
+   images.image: "check.png" COMP;
    parts {
       part { name: "base"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 1 1;
-            rel1.to: "inset";
-            rel2.offset: -2 -2;
-            rel2.to: "inset";
-            color: 24 24 24 255;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            color: 64 64 64 255;
-         }
-      }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow_tiny.png";
-            rel1.to: "base";
-            rel2.to: "base";
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "inset"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel2.relative: 0.0 1.0;
-            rel2.offset: 2 -3;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-            align: 0.0 0.5;
             min: 13 13;
             max: 13 13;
+            rel1.offset: 4 4;
+            rel2.offset: 4 -5;
+            rel2.relative: 0.0 1.0;
+            align: 0.0 0.5;
+            color: 0 0 0 64;
+            offscale;
             fixed: 1 1;
          }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 0 0 0 16;
+         }
       }
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 64;
+            color: 153 153 153 255;
          }
       }
       part { name: "indicator"; mouse_events: 0;
@@ -55,37 +32,45 @@ group { name: "e/widgets/check";
          description { state: "default" 0.0;
             rel1.to: "base";
             rel2.to: "base";
-            image.normal: "sym_check_alum.png";
-            min: 11 11;
-            max: 11 11;
+            image.normal: "check.png";
+            min: 13 13;
+            max: 13 13;
             visible: 0;
+            color: 160 160 160 255;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
             visible: 1;
          }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+            visible: 1;
+         }
       }
       part { name: "e.text.label"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel1.to_x: "inset";
+            rel1.offset: 4 4;
+            rel1.to_x: "base";
             rel1.relative: 1.0 0.0;
-            rel2.offset: -3 -3;
-            color_class: "check_text";
-            color3: 255 255 255 255;
+            rel2.offset: -5 -5;
+            color: 160 160 160 255;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
                align: 0.0 0.5;
                text_class: "check_button";
             }
+            offscale;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color_class: "check_text_disabled";
-            color3: 255 255 255 255;
+            color: 96 96 96 255;
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
          }
       }
       part { name: "event"; type: RECT;
@@ -110,15 +95,26 @@ group { name: "e/widgets/check";
          action: STATE_SET "default" 0.0;
          target: "indicator";
       }
+      program {
+         signal: "mouse,down,1"; source: "event";
+         action: STATE_SET "pressed" 0.0;
+//         target: "indicator";
+         target: "e.text.label";
+      }
       program {
          signal: "mouse,up,1"; source: "event";
+         action: STATE_SET "default" 0.0;
+//         target: "indicator";
+         target: "e.text.label";
+      }
+      program {
+         signal: "mouse,clicked,1"; source: "event";
          action: SIGNAL_EMIT "e,action,toggle" "";
       }
       program {
          signal: "e,state,disabled"; source: "e";
          action: STATE_SET "disabled" 0.0;
          target: "base";
-         target: "shadow";
          target: "clip";
          target: "e.text.label";
          target: "event";
@@ -127,7 +123,6 @@ group { name: "e/widgets/check";
          signal: "e,state,enabled"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "base";
-         target: "shadow";
          target: "clip";
          target: "e.text.label";
          target: "event";
@@ -139,23 +134,29 @@ group { name: "e/widgets/check_icon";
    inherit: "e/widgets/check";
    parts {
       part { name: "e.swallow.icon"; type: SWALLOW;
+         scale: 1;
          insert_before: "event";
          clip_to: "clip";
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel1.relative: 1.0 0.0; 
-            rel1.to_x: "inset";
-            rel2.offset: 2 -3;
+            rel1.offset: 4 4;
+            rel1.relative: 1.0 0.0;
+            rel1.to_x: "base";
+            rel2.offset: 4 -5;
             rel2.relative: 1.0 1.0;
-            rel1.to_x: "inset";
+            rel2.to_x: "base";
             align: 0.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
+            offscale;
          }
       }
       part { name: "e.text.label";
          description { state: "default" 0.0;
             rel1.to_x: "e.swallow.icon";
          }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 96 96 96 255;
+         }
       }
    }
 }

data/elementary/themes/edc/clock.edc

@@ -1,21 +1,20 @@
 group { name: "e/modules/clock/digital";
+   alias: "e/gadget/clock/digital";
    min: 64 16;
    max: 512 128;
-   images.image: "O/digit_na.png" COMP;
-   images.image: "O/digit_nm.png" COMP;
-   images.image: "O/digit_0.png" COMP;
-   images.image: "O/digit_1.png" COMP;
-   images.image: "O/digit_2.png" COMP;
-   images.image: "O/digit_3.png" COMP;
-   images.image: "O/digit_4.png" COMP;
-   images.image: "O/digit_5.png" COMP;
-   images.image: "O/digit_6.png" COMP;
-   images.image: "O/digit_7.png" COMP;
-   images.image: "O/digit_8.png" COMP;
-   images.image: "O/digit_9.png" COMP;
-   images.image: "O/digit_am.png" COMP;
-   images.image: "O/digit_pm.png" COMP;
-   images.image: "hole_tiny.png" COMP;
+   images.image: "digit_0.png" COMP;
+   images.image: "digit_1.png" COMP;
+   images.image: "digit_2.png" COMP;
+   images.image: "digit_3.png" COMP;
+   images.image: "digit_4.png" COMP;
+   images.image: "digit_5.png" COMP;
+   images.image: "digit_6.png" COMP;
+   images.image: "digit_7.png" COMP;
+   images.image: "digit_8.png" COMP;
+   images.image: "digit_9.png" COMP;
+   images.image: "digit_am.png" COMP;
+   images.image: "digit_pm.png" COMP;
+   images.image: "digit_sep.png" COMP;
    script {
       public do_seconds, do_24h, do_date, tick_timer;
 
@@ -186,8 +185,8 @@ group { name: "e/modules/clock/digital";
       }
       part { name: "hours1"; type: RECT;
          description { state: "default" 0.0;
-            rel1.relative: (0/16) 0.0;
-            rel2.relative: (2/16) 1.0;
+            rel1.relative: (0/30) 0.0;
+            rel2.relative: (4/30) 1.0;
             rel1.to: "timearea";
             rel2.to: "timearea";
             visible: 0;
@@ -195,8 +194,8 @@ group { name: "e/modules/clock/digital";
       }
       part { name: "hours2"; type: RECT;
          description { state: "default" 0.0;
-            rel1.relative: (2/16) 0.0;
-            rel2.relative: (4/16) 1.0;
+            rel1.relative: (4/30) 0.0;
+            rel2.relative: (8/30) 1.0;
             rel1.to: "timearea";
             rel2.to: "timearea";
             visible: 0;
@@ -204,8 +203,8 @@ group { name: "e/modules/clock/digital";
       }
       part { name: "mins1"; type: RECT;
          description { state: "default" 0.0;
-            rel1.relative: (5/16) 0.0;
-            rel2.relative: (7/16) 1.0;
+            rel1.relative: (9/30) 0.0;
+            rel2.relative: (13/30) 1.0;
             rel1.to: "timearea";
             rel2.to: "timearea";
             visible: 0;
@@ -213,8 +212,8 @@ group { name: "e/modules/clock/digital";
       }
       part { name: "mins2"; type: RECT;
          description { state: "default" 0.0;
-            rel1.relative: (7/16) 0.0;
-            rel2.relative: (9/16) 1.0;
+            rel1.relative: (13/30) 0.0;
+            rel2.relative: (17/30) 1.0;
             rel1.to: "timearea";
             rel2.to: "timearea";
             visible: 0;
@@ -222,8 +221,8 @@ group { name: "e/modules/clock/digital";
       }
       part { name: "secs1"; type: RECT;
          description { state: "default" 0.0;
-            rel1.relative: (10/16) 0.0;
-            rel2.relative: (12/16) 1.0;
+            rel1.relative: (18/30) 0.0;
+            rel2.relative: (22/30) 1.0;
             rel1.to: "timearea";
             rel2.to: "timearea";
             visible: 0;
@@ -231,8 +230,8 @@ group { name: "e/modules/clock/digital";
       }
       part { name: "secs2"; type: RECT;
          description { state: "default" 0.0;
-            rel1.relative: (12/16) 0.0;
-            rel2.relative: (14/16) 1.0;
+            rel1.relative: (22/30) 0.0;
+            rel2.relative: (26/30) 1.0;
             rel1.to: "timearea";
             rel2.to: "timearea";
             visible: 0;
@@ -240,8 +239,8 @@ group { name: "e/modules/clock/digital";
       }
       part { name: "ampm"; type: RECT;
          description { state: "default" 0.0;
-            rel1.relative: (14/16) 0.0;
-            rel2.relative: (16/16) 1.0;
+            rel1.relative: (26/30) 0.0;
+            rel2.relative: (30/30) 1.0;
             rel1.to: "timearea";
             rel2.to: "timearea";
             visible: 0;
@@ -250,55 +249,47 @@ group { name: "e/modules/clock/digital";
       part { name: "c00";
          description { state: "default" 0.0;
             rel1.to: "hours2";
-            rel1.relative: 1.0 0.5;
-            rel1.offset: 0 -2;
+            rel1.relative: 1.0 0.39;
             rel2.to: "mins1";
-            rel2.relative: 0.0 0.5;
-            rel2.offset: 0 -2;
-            align: 0.5 1.0;
-            FIXED_SIZE(4, 4)
-            image.normal: "hole_tiny.png";
+            rel2.relative: 0.0 0.45;
+            image.normal: "digit_sep.png";
+            color: 160 160 160 255;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
          }
       }
       part { name: "c01";
          description { state: "default" 0.0;
             rel1.to: "hours2";
-            rel1.relative: 1.0 0.5;
-            rel1.offset: 0 1;
+            rel1.relative: 1.0 0.55;
             rel2.to: "mins1";
-            rel2.relative: 0.0 0.5;
-            rel2.offset: 0 1;
-            align: 0.5 0.0;
-            FIXED_SIZE(4, 4)
-            image.normal: "hole_tiny.png";
+            rel2.relative: 0.0 0.61;
+            image.normal: "digit_sep.png";
+            color: 160 160 160 255;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
          }
       }
       part { name: "c10";
          clip_to: "secclip";
          description { state: "default" 0.0;
             rel1.to: "mins2";
-            rel1.relative: 1.0 0.5;
-            rel1.offset: 0 -2;
+            rel1.relative: 1.0 0.39;
             rel2.to: "secs1";
-            rel2.relative: 0.0 0.5;
-            rel2.offset: 0 -2;
-            align: 0.5 1.0;
-            FIXED_SIZE(4, 4)
-            image.normal: "hole_tiny.png";
+            rel2.relative: 0.0 0.45;
+            image.normal: "digit_sep.png";
+            color: 160 160 160 255;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
          }
       }
       part { name: "c11";
          clip_to: "secclip";
          description { state: "default" 0.0;
             rel1.to: "mins2";
-            rel1.relative: 1.0 0.5;
-            rel1.offset: 0 1;
+            rel1.relative: 1.0 0.55;
             rel2.to: "secs1";
-            rel2.relative: 0.0 0.5;
-            rel2.offset: 0 1;
-            align: 0.5 0.0;
-            FIXED_SIZE(4, 4)
-            image.normal: "hole_tiny.png";
+            rel2.relative: 0.0 0.61;
+            image.normal: "digit_sep.png";
+            color: 160 160 160 255;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
          }
       }
 #define ELEM(_NAME, _TO, _DIGIT) \
@@ -306,14 +297,14 @@ group { name: "e/modules/clock/digital";
       description { state: "default" 0.0; \
          rel1.to: _TO; rel2.to: _TO; \
          aspect: (52/72) (52/72); aspect_preference: BOTH; \
-         image.normal: "O/digit_"_DIGIT".png"; \
+         image.normal: "digit_"_DIGIT".png"; \
          visible: 0; \
-         color: 255 255 255 0; \
+         color: 160 160 160 0; \
       } \
       description { state: "active" 0.0; \
          inherit: "default" 0.0; \
          visible: 1; \
-         color: 255 255 255 255; \
+         color: 160 160 160 255; \
       } \
    }
 #define DIGIT(_NAME, _TO) \
@@ -333,14 +324,14 @@ group { name: "e/modules/clock/digital";
       description { state: "default" 0.0; \
          rel1.to: _TO; rel2.to: _TO; \
          aspect: (52/72) (52/72); aspect_preference: BOTH; \
-         image.normal: "O/digit_"_DIGIT".png"; \
+         image.normal: "digit_"_DIGIT".png"; \
          visible: 0; \
-         color: 255 255 255 0; \
+         color: 160 160 160 0; \
       } \
       description { state: "active" 0.0; \
          inherit: "default" 0.0; \
          visible: 1; \
-         color: 255 255 255 255; \
+         color: 160 160 160 255; \
       } \
    }
 #define DIGITC(_NAME, _TO, _CLIP) \
@@ -361,42 +352,14 @@ group { name: "e/modules/clock/digital";
       description { state: "default" 0.0; \
          rel1.to: _TO; rel2.to: _TO; \
          aspect: (48/31) (48/31); aspect_preference: BOTH; \
-         image.normal: "O/digit_am.png"; \
+         image.normal: "digit_am.png"; \
+         color: 160 160 160 255; \
       } \
       description { state: "active" 0.0; \
          inherit: "default" 0.0; \
-         image.normal: "O/digit_pm.png"; \
+         image.normal: "digit_pm.png"; \
       } \
    }
-#define BASE(_NAME, _BASE, _IMG) \
-   part { name: _NAME; \
-      description { state: "default" 0.0; \
-         rel1.to: _BASE; \
-         rel2.to: _BASE; \
-         image.normal: _IMG; \
-         color: 255 255 255 128; \
-      } \
-   }
-#define BASEC(_NAME, _CLIP, _BASE, _IMG) \
-   part { name: _NAME; \
-      clip_to: _CLIP; \
-      description { state: "default" 0.0; \
-         rel1.to: _BASE; \
-         rel2.to: _BASE; \
-         image.normal: _IMG; \
-         color: 255 255 255 128; \
-      } \
-   }
-      
-      BASE ("ha", "h0-0", "O/digit_na.png")
-      BASE ("hb", "h1-0", "O/digit_na.png")
-      BASE ("ma", "m0-0", "O/digit_na.png")
-      BASE ("mb", "m1-0", "O/digit_na.png")
-              
-      BASEC("sa", "secclip", "s0-0", "O/digit_na.png")
-      BASEC("sb", "secclip", "s1-0", "O/digit_na.png")
-      BASEC("aa", "ampmclip", "ap", "O/digit_nm.png")
-        
       DIGIT ("h0", "hours1")
       DIGIT ("h1", "hours2")
       DIGIT ("m0", "mins1")
@@ -408,20 +371,17 @@ group { name: "e/modules/clock/digital";
 #undef TAG
 #undef ELEM
 #undef ELEMC
-#undef BASE
-#undef BASEC
 #undef DIGIT
 #undef DIGITC
 
        part { name: "e.text.today"; type: TEXT;
-          effect: GLOW;
           scale: 1;
           description { state: "default" 0.0;
              rel1.relative: 0.0 1.0;
              rel1.offset: 0 1;
-             rel2.offset: -1 1;
+             rel2.offset: -1 -1;
              align: 0.5 1.0;
-             color: FN_COL_HIGHLIGHT;
+             color: 160 160 160 255;
              text { font: FN; size: 8;
                 text_class: "module_small";
                 align: 0.5 0.5;
@@ -438,7 +398,6 @@ group { name: "e/modules/clock/digital";
              text.ellipsis: -1;
           }
        }
-                       
        part { name: "event"; type: RECT;
           description { state: "default" 0.0;
              color: 0 0 0 0;
@@ -506,13 +465,12 @@ group { name: "e/modules/clock/digital";
       program { \
          signal: "show,"_NAME; source: "c"; \
          action: STATE_SET "active" 0.0; \
-         transition: BOUNCE 0.3 0.5 2; \
          target: _NAME; \
       } \
       program { \
          signal: "hide,"_NAME; source: "c"; \
          action: STATE_SET "default" 0.0; \
-         transition: DECELERATE 0.3; \
+         transition: DECELERATE 0.1; \
          target: _NAME; \
       }
 #define DIGPRGS(_NAME) \
@@ -539,107 +497,62 @@ group { name: "e/modules/clock/digital";
 }
 
 group { name: "e/modules/clock/main";
+   alias: "e/gadget/clock/analog";
    images.image: "clock_base.png" COMP;
-   images.image: "inset_round_hilight.png" COMP;
-   images.image: "inset_round_shadow.png" COMP;
-   images.image: "inset_round_shading.png" COMP;
    set { name: "tacho_hand_big";
       image { image: "tacho_hand_big.png" COMP; size: 73 73 99999 99999; }
       image { image: "tacho_hand_big2.png" COMP; size: 37 37 72 72; }
       image { image: "tacho_hand_big3.png" COMP; size: 19 19 36 36; }
       image { image: "tacho_hand_big4.png" COMP; size: 0 0 18 18; }
    }
-   images.image: "tacho_hand_big_shadow.png" COMP;
    set { name: "tacho_hand_small_min";
       image { image: "tacho_hand_small_min.png" COMP; size: 73 73 99999 99999; }
       image { image: "tacho_hand_small_min2.png" COMP; size: 37 37 72 72; }
       image { image: "tacho_hand_small_min3.png" COMP; size: 19 19 36 36; }
       image { image: "tacho_hand_small_min4.png" COMP; size: 0 0 18 18; }
    }
-   set { name: "knob";
-      image { image: "knob_sz_24.png"  COMP; size: 31 31 32 32; }
-      image { image: "knob_sz_22.png"  COMP; size: 29 29 30 30; }
-      image { image: "knob_sz_20.png"  COMP; size: 27 27 28 28; }
-      image { image: "knob_sz_18.png"  COMP; size: 25 25 26 26; }
-      image { image: "knob_sz_16.png"  COMP; size: 23 23 24 24; }
-      image { image: "knob_sz_14.png"  COMP; size: 21 21 22 22; }
-      image { image: "knob_sz_12.png"  COMP; size: 19 19 20 20; }
-      image { image: "knob_sz_10.png"  COMP; size: 17 17 18 18; }
-      image { image: "knob_sz_08.png"  COMP; size: 15 15 16 16; }
-      image { image: "knob_sz_06.png"  COMP; size: 13 13 14 14; }
-      image { image: "knob_sz_04.png"  COMP; size:  0  0 12 12; }
+   set { name: "tacho_hand_small_sec";
+      image { image: "tacho_hand_small_sec.png" COMP; size: 73 73 99999 99999; }
+      image { image: "tacho_hand_small_sec2.png" COMP; size: 37 37 72 72; }
+      image { image: "tacho_hand_small_sec3.png" COMP; size: 19 19 36 36; }
+      image { image: "tacho_hand_small_sec4.png" COMP; size: 0 0 18 18; }
    }
    min: 16 16;
    max: 160 160;
    script {
       public do_seconds, tick_timer;
-      
+
          public clock_cb(val) {
             new year, month, day, yearday, weekday, hour, minute;
             new Float:second;
             new v, dosec, tim;
-            
+
             date(year, month, day, yearday, weekday, hour, minute, second);
             dosec = get_int(do_seconds);
             if (dosec) {
                v = round(second, FLOOR);
                tim = timer(1.0 - (second - v), "clock_cb", 1);
-               
+
                custom_state(PART:"seconds", "default", 0.0);
                set_state_val(PART:"seconds", STATE_MAP_ROT_Z, (v * 360.0) / 60.0);
                set_state(PART:"seconds", "custom", 0.0);
-               
-               custom_state(PART:"seconds-sh", "default", 0.0);
-               set_state_val(PART:"seconds-sh", STATE_MAP_ROT_Z, (v * 360.0) / 60.0);
-               set_state(PART:"seconds-sh", "custom", 0.0);
             }
             else {
                tim = timer(60.0 - (second), "clock_cb", 1);
             }
             set_int(tick_timer, tim);
-            
+
             custom_state(PART:"minutes", "default", 0.0);
             set_state_val(PART:"minutes", STATE_MAP_ROT_Z, (float(minute) * 360.0) / 60.0);
             set_state(PART:"minutes", "custom", 0.0);
-            
-            custom_state(PART:"minutes-sh", "default", 0.0);
-            set_state_val(PART:"minutes-sh", STATE_MAP_ROT_Z, (float(minute) * 360.0) / 60.0);
-            set_state(PART:"minutes-sh", "custom", 0.0);
-            
+
             custom_state(PART:"hours", "default", 0.0);
             set_state_val(PART:"hours", STATE_MAP_ROT_Z, ((float(hour) + (float(minute) / 60.0)) * 360.0) / 12.0);
             set_state(PART:"hours", "custom", 0.0);
-            
-            custom_state(PART:"hours-sh", "default", 0.0);
-            set_state_val(PART:"hours-sh", STATE_MAP_ROT_Z, ((float(hour) + (float(minute) / 60.0)) * 360.0) / 12.0);
-            set_state(PART:"hours-sh", "custom", 0.0);
          }
    }
-   parts {   
-      part { name: "event"; type: RECT;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "base-sh";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel1.offset: 0 -1;
-            rel2.to: "base";
-            rel2.offset: -1 -2;
-            image.normal: "inset_round_shadow.png";
-         }
-      }
-      part { name: "base-hi";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel1.offset: 0 1;
-            rel2.to: "base";
-            rel2.offset: -1 0;
-            image.normal: "inset_round_hilight.png";
-         }
-      }
-      part { name: "base";
+   parts {
+      part { name: "base"; mouse_events: 0;
          description { state: "default" 0.0;
             rel1.relative: (25/380) (25/380);
             rel2.relative: (365/380) (365/380);
@@ -647,24 +560,9 @@ group { name: "e/modules/clock/main";
             image.normal: "clock_base.png";
          }
       }
-      part { name: "seconds-sh"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "tacho_hand_big_shadow.png";
-            rel1.to: "hours-sh";
-            rel2.to: "hours-sh";
-            map {
-               on: 1;
-               rotation.center: "seconds-sh";
-            }
-         }
-         description { state: "hidden" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
       part { name: "seconds"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "tacho_hand_big";
+            image.normal: "tacho_hand_small_sec";
             color: 255 0 0 255;
             rel1.to: "base";
             rel2.to: "base";
@@ -678,17 +576,6 @@ group { name: "e/modules/clock/main";
             visible: 0;
          }
       }
-      part { name: "minutes-sh"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "tacho_hand_big_shadow.png";
-            rel1.to: "hours-sh";
-            rel2.to: "hours-sh";
-            map {
-               on: 1;
-               rotation.center: "minutes-sh";
-            }
-         }
-      }
       part { name: "minutes"; mouse_events: 0;
          description { state: "default" 0.0000;
             color: 255 255 255 255;
@@ -701,21 +588,6 @@ group { name: "e/modules/clock/main";
             }
          }
       }
-      part { name: "hours-sh"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "tacho_hand_small_shadow.png";
-            rel1.to: "hours";
-            rel1.relative: 0.0 (15/380);
-            rel1.offset: 0 1;
-            rel2.to: "hours";
-            rel2.relative: 1.0 (395/380);
-            rel2.offset: -1 0;
-            map {
-               on: 1;
-               rotation.center: "hours-sh";
-            }
-         }
-      }
       part { name: "hours"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "tacho_hand_small_min";
@@ -728,33 +600,9 @@ group { name: "e/modules/clock/main";
             }
          }
       }
-      part { name: "over"; mouse_events: 0;
+      part { name: "event"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "inset_round_shading.png";
-         }
-      }
-      part { name: "knob"; type: SPACER;
-         description { state: "default" 0.0;
-            rel1.relative: (140/340) (140/340);
-            rel1.to: "base";
-            rel2.relative: (205/340) (205/340);
-            rel2.to: "base";
-            min: 4 4;
-            step: 2 2;
-            max: 24 24;
-         }
-      }
-      part { name: "knob2";
-         description { state: "default" 0.0;
-            rel1.offset: -4 -4;
-            rel1.to: "knob";
-            rel2.offset: 3 3;
-            rel2.to: "knob";
-            min: 12 12;
-            max: 32 32;
-            image.normal: "knob";
+            color: 0 0 0 0;
          }
       }
    }
@@ -769,13 +617,12 @@ group { name: "e/modules/clock/main";
          signal: "e,state,seconds,on"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "seconds";
-         target: "seconds-sh";
          after: "sec2";
       }
       program { name: "sec2";
          script {
             new tim;
-            
+
             set_int(do_seconds, 1);
             tim = get_int(tick_timer);
             if (tim) {
@@ -789,13 +636,12 @@ group { name: "e/modules/clock/main";
          signal: "e,state,seconds,off"; source: "e";
          action: STATE_SET "hidden" 0.0;
          target: "seconds";
-         target: "seconds-sh";
          after: "sec3";
       }
       program { name: "sec3";
          script {
             new tim;
-            
+
             set_int(do_seconds, 0);
             tim = get_int(tick_timer);
             if (tim) {
@@ -809,12 +655,12 @@ group { name: "e/modules/clock/main";
 }
 
 group { name: "e/modules/clock/calendar/dayname";
+   alias: "e/gadget/clock/calendar/dayname";
    parts {
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            color: FN_COL_DISABLE;
+            color: 160 160 160 255;
             text { font: FN; size: 8;
                text: "WWe";
                min: 1 1;
@@ -825,7 +671,7 @@ group { name: "e/modules/clock/calendar/dayname";
          }
          description { state: "weekend" 0.0;
             inherit: "default" 0.0;
-            color: 48 48 48 255;
+            color: 51 153 255 255;
          }
       }
    }
@@ -844,39 +690,55 @@ group { name: "e/modules/clock/calendar/dayname";
 }
 
 group { name: "e/modules/clock/calendar/day";
+   alias: "e/gadget/clock/calendar/day";
    script {
       public day_state = 0;
       evalstate() {
          new vv = get_int(day_state);
-         
+
          if (vv & 2)
            {
               set_state(PART:"e.text.label", "today", 0.0);
               set_state(PART:"label2", "today", 0.0);
+              set_state(PART:"base", "today", 0.0);
            }
          else if (vv & 4)
            {
               set_state(PART:"e.text.label", "hidden", 0.0);
               set_state(PART:"label2", "default", 0.0);
+              set_state(PART:"base", "default", 0.0);
            }
          else if (vv & 1)
            {
               set_state(PART:"e.text.label", "weekend", 0.0);
-              set_state(PART:"label2", "default", 0.0);
-           }
+              set_state(PART:"label2", "default", 0.0); 
+              set_state(PART:"base", "default", 0.0);
+          }
          else
            {
               set_state(PART:"e.text.label", "default", 0.0);
               set_state(PART:"label2", "default", 0.0);
+              set_state(PART:"base", "default", 0.0);
            }
       }
    }
    parts {
+      part { name: "base"; type: RECT; mouse_events: 0;
+         description { state: "default" 0.0;
+            color: 0 0 0 64;
+            visible: 0;
+         }
+         description { state: "today" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            color: FN_COL_DEFAULT;
+            color: 160 160 160 255;
+            rel1.offset: 3 3;
+            rel2.offset: -4 -4;
             text { font: FN; size: 10;
                text: "00";
                min: 1 1;
@@ -890,22 +752,19 @@ group { name: "e/modules/clock/calendar/day";
          }
          description { state: "weekend" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_MID_GREY;
+            color: 51 153 255 255;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_DISABLE;
+            color: 40 40 40 255;
          }
       }
       part { name: "label2"; type: TEXT; mouse_events: 0;
-         effect: GLOW;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: -3 -3;
+            color: 255 255 255 255;
             rel1.to: "e.text.label";
-            rel2.offset: 2 1;
             rel2.to: "e.text.label";
-            color: FN_COL_HIGHLIGHT;
             text { font: FN; size: 10;
                text_source: "e.text.label";
                min: 1 1;
@@ -937,7 +796,7 @@ group { name: "e/modules/clock/calendar/day";
             evalstate();
          }
       }
-      
+
       program {
          signal: "e,state,today"; source: "e";
          script {
@@ -954,7 +813,7 @@ group { name: "e/modules/clock/calendar/day";
             evalstate();
          }
       }
-      
+
       program {
          signal: "e,state,hidden"; source: "e";
          script {
@@ -975,14 +834,11 @@ group { name: "e/modules/clock/calendar/day";
 }
 
 group { name: "e/modules/clock/calendar";
-   images.image: "separator_horiz.png" COMP;
-   images.image: "sym_left_light_normal.png" COMP;
-   images.image: "sym_right_light_normal.png" COMP;
-   images.image: "sym_left_glow_normal.png" COMP;
-   images.image: "sym_right_glow_normal.png" COMP;
+   alias: "e/gadget/clock/calendar";
+   images.image: "calendar_prev.png" COMP;
+   images.image: "calendar_next.png" COMP;
    parts {
       part { name: "e.text.month"; type: TEXT;
-         effect: SHADOW BOTTOM;
          mouse_events: 1;
          scale: 1;
          description { state: "default" 0.0;
@@ -990,8 +846,9 @@ group { name: "e/modules/clock/calendar";
             align: 0.0 0.0;
             rel1.to_x: "prev";
             rel1.relative: 1.0 0.0;
+            rel1.offset: 4 0;
             rel2.relative: 1.0 0.0;
-            color: FN_COL_DEFAULT;
+            color: 160 160 160 255;
             text { font: FNBD; size: 10;
                text: "000000000000";
                align: 0.0 0.5;
@@ -1001,15 +858,15 @@ group { name: "e/modules/clock/calendar";
          }
       }
       part { name: "e.text.year"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 0 1;
             align: 1.0 0.0;
             rel1.relative: 0.0 0.0;
             rel2.to_x: "next";
+            rel2.offset: -5 -1;
             rel2.relative: 0.0 0.0;
-            color: FN_COL_DEFAULT;
+            color: 160 160 160 255;
             text { font: FNBD; size: 10;
                text: "0000";
                align: 1.0 0.5;
@@ -1020,15 +877,16 @@ group { name: "e/modules/clock/calendar";
       }
       part { name: "previm"; mouse_events: 0;
          description { state: "default" 0.0;
+            fixed: 1 1;
             min: 15 15;
             max: 15 15;
-            rel1.to: "prev";
-            rel2.to: "prev";
-            image.normal: "sym_left_light_normal.png";
+            rel.to: "prev";
+            image.normal: "calendar_prev.png";
+            color: 160 160 160 255;
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            image.normal: "sym_left_glow_normal.png";
+            color: 255 255 255 255;
          }
       }
       part { name: "prev"; type: RECT;
@@ -1058,15 +916,16 @@ group { name: "e/modules/clock/calendar";
       }
       part { name: "nextim"; mouse_events: 0;
          description { state: "default" 0.0;
+            fixed: 1 1;
             min: 15 15;
             max: 15 15;
-            rel1.to: "next";
-            rel2.to: "next";
-            image.normal: "sym_right_light_normal.png";
+            rel.to: "next";
+            image.normal: "calendar_next.png";
+            color: 160 160 160 255;
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            image.normal: "sym_right_glow_normal.png";
+            color: 255 255 255 255;
          }
       }
       part { name: "next"; type: RECT;
@@ -1094,29 +953,30 @@ group { name: "e/modules/clock/calendar";
             action: SIGNAL_EMIT "e,action,next" "";
          }
       }
-      part { name: "sel";
+      part { name: "sep"; type: RECT;
          description { state: "default" 0.0;
-            image.normal: "separator_horiz.png";
+            color: 80 80 80 255;
             rel1.relative: 0.0 1.0;
-            rel1.offset: 0 0;
+            rel1.offset: 8 0;
             rel1.to: "e.table.daynames";
-            rel2.offset: -1 1;
-            rel2.to: "e.table.daynames";
-            min: 0 2;
-            fill.smooth: 0;
+            rel2.relative: 1.0 0.0;
+            rel2.offset: -9 -1;
+            rel2.to_y: "e.table.days";
+            min: 0 1;
+            max: 99999 1;
          }
       }
-      
+
       part { name: "e.table.daynames"; type: TABLE;
          description { state: "default" 0.0;
             fixed: 0 1;
             align: 0.5 0.0;
             rel1.to_y: "e.text.month";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 2 2;
+            rel1.offset: 8 2;
             rel2.to_y: "e.text.month";
             rel2.relative: 1.0 1.0;
-            rel2.offset: -3 2;
+            rel2.offset: -9 2;
             step: 7 1;
             table { homogeneous: TABLE;
                padding: 1 1;
@@ -1143,8 +1003,8 @@ item { \
          description { state: "default" 0.0;
             rel1.to_y: "e.table.daynames";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
+            rel1.offset: 8 16;
+            rel2.offset: -9 -9;
             step: 7 5;
             table { homogeneous: TABLE;
                padding: 1 1;

data/elementary/themes/edc/colors.edc

@@ -1,53 +1,33 @@
 group { name: "e/modules/conf_colors/preview/solid";
-   images.image: "inset_shadow.png" COMP;
-   images.image: "bevel_in.png" COMP;
-   images.image: "dot_pattern.png" COMP;
+   images.image: "diagonal_stripes.png" COMP;
    parts {
       part { name: "bg"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 3 3;
-            rel2.offset: -4 -4;
-            color: 48 48 48 255;
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            color: DARK_GREY_BG_COLOR;
             min: 18 18;
+            offscale;
          }
       }
       part { name: "pat";
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "dot_pattern.png";
-            TILED_PATTERN(256, 256)
+            rel.to: "bg";
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            image.normal: "diagonal_stripes.png";
+            color: 255 255 255 64;
+            TILED_PATTERN(240, 240)
+            offscale;
          }
       }
       part { name: "e.rect"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
             color: 255 255 255 255;
             color_class: "color_preview";
-            rel1.to: "bg";
-            rel2.to: "bg";
-         }
-      }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            fill.smooth: 0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "inset";
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel1.offset: -1 -1;
-            rel2.to: "bg";
-            rel2.offset: 0 0;
-            fill.smooth: 0;
+            rel.to: "pat";
          }
       }
    }
@@ -55,16 +35,6 @@ group { name: "e/modules/conf_colors/preview/solid";
 
 group { name: "e/modules/conf_colors/preview/text";
    parts {
-      part { name: "shadow"; type: TEXT; mouse_events: 0;
-         description { state: "default" 0.0;
-            color: FN_COL_SHADOW;
-            text { font: FN; size: 10;
-               text: "Text";
-               min: 1 1;
-               ellipsis: -1;
-            }
-         }
-      }
       part { name: "e.text"; type: TEXT; mouse_events: 0;
          effect: OUTLINE_SHADOW;
          description { state: "default" 0.0;
@@ -81,32 +51,36 @@ group { name: "e/modules/conf_colors/preview/text";
 }
 
 group { name: "e/modules/conf_colors/preview/unknown";
-   images.image: "inset_shadow.png" COMP;
-   images.image: "bevel_in.png" COMP;
-   images.image: "dot_pattern.png" COMP;
+   images.image: "diagonal_stripes.png" COMP;
    parts {
       part { name: "bg"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 3 3;
-            rel2.offset: -4 -4;
-            color: 48 48 48 255;
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            color: DARK_GREY_BG_COLOR;
             min: 18 18;
+            offscale;
          }
       }
       part { name: "pat";
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "dot_pattern.png";
-            TILED_PATTERN(256, 256)
+            rel.to: "bg";
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            image.normal: "diagonal_stripes.png";
+            color: 255 255 255 64;
+            TILED_PATTERN(240, 240)
+            offscale;
          }
       }
       part { name: "c1"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
             color: 255 0 0 128;
             color_class: "color_preview_c1";
-            rel1.to: "bg";
-            rel2.to: "bg";
+            rel1.to: "pat";
+            rel2.to: "pat";
             rel2.relative: 0.333 1.0;
          }
       }
@@ -116,7 +90,7 @@ group { name: "e/modules/conf_colors/preview/unknown";
             color_class: "color_preview_c2";
             rel1.to: "c1";
             rel1.relative: 1.0 0.0;
-            rel2.to: "bg";
+            rel2.to: "pat";
             rel2.relative: 0.667 1.0;
          }
       }
@@ -126,30 +100,7 @@ group { name: "e/modules/conf_colors/preview/unknown";
             color_class: "color_preview_c3";
             rel1.to: "c2";
             rel1.relative: 1.0 0.0;
-            rel2.to: "bg";
-         }
-      }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            fill.smooth: 0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "inset";
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel1.offset: -1 -1;
-            rel2.to: "bg";
-            rel2.offset: 0 0;
-            fill.smooth: 0;
+            rel2.to: "pat";
          }
       }
    }

data/elementary/themes/edc/colorwell.edc

@@ -1,76 +1,55 @@
 group { name: "e/widgets/color_well";
-   images.image: "inset_shadow.png" COMP;
-   images.image: "bevel_in.png" COMP;
-   images.image: "dot_pattern.png" COMP;
+   images.image: "diagonal_stripes.png" COMP;
    parts {
       part { name: "bg"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
-            color: 48 48 48 255;
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            color: DARK_GREY_BG_COLOR;
+            min: 18 18;
+            offscale;
          }
       }
       part { name: "pat";
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "dot_pattern.png";
-            TILED_PATTERN(256, 256)
-         }
+         scale: 1;
+         description
+           { state: "default" 0.0;
+              rel.to: "bg";
+              rel1.offset: 2 2;
+              rel2.offset: -3 -3;
+              image.normal:
+              "diagonal_stripes.png";
+              color: 255 255 255 64;
+              TILED_PATTERN(240, 240)
+              offscale;
+           }
       }
       part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
+            rel.to: "pat";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             color: 255 255 255 64;
          }
       }
-      part { name: "e.swallow.content"; type: SWALLOW;
+      part { name: "e.swallow.content"; type: SWALLOW; mouse_events: 0;
          clip_to: "clipper";
          description { state: "default" 0.0;
-            rel1.offset: 3 3;
-            rel2.offset: -4 -4;
-         }
-      }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            fill.smooth: 0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "inset";
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel1.offset: -1 -1;
-            rel2.to: "bg";
-            rel2.offset: 0 0;
-            fill.smooth: 0;
+            rel.to: "pat";
          }
       }
    }
    programs {
-      program {
-         signal: "mouse,clicked,1"; source: "inset";
+      program { signal: "mouse,clicked,1"; source: "pat";
          action: SIGNAL_EMIT "e,action,click" "";
       }
-      program {
-         signal: "e,state,disabled"; source: "e";
+      program { signal: "e,state,disabled"; source: "e";
          action: STATE_SET "disabled" 0.0;
          target: "clipper";
       }
-      program {
-         signal: "e,state,enabled"; source: "e";
+      program { signal: "e,state,enabled"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "clipper";
       }

data/elementary/themes/edc/comp.edc

@@ -22,7 +22,7 @@ group { name: "e/comp/preview";
 }
 
 group { name: "e/comp/screen/base/default";
-   alias: "e/comp/screen/base/noeffects";
+   alias: "e/comp/screen/base/noeffects"; // legacy
    parts {
       part { name: "clip"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
@@ -37,6 +37,7 @@ group { name: "e/comp/screen/base/default";
 }
 
 group { name: "e/comp/screen/overlay/default";
+   alias: "e/comp/screen/overlay/noeffects"; // legacy
    images.image: "screen_circular_shadow.png" COMP;
    parts {
       part { name: "clip"; type: RECT; mouse_events: 0;
@@ -99,7 +100,7 @@ group { name: "e/comp/screen/overlay/default";
             name: "screensaver_on2";
             signal: "e,state,screensaver,on"; source: "e";
             action: STATE_SET "visible" 0.0;
-            transition: DECELERATE 1.5 CURRENT;
+            transition: DECELERATE 3.0 CURRENT;
             target: "shadow";
          }
          program {
@@ -113,7 +114,7 @@ group { name: "e/comp/screen/overlay/default";
             name: "screensaver_off2";
             signal: "e,state,screensaver,off"; source: "e";
             action: STATE_SET "default" 0.0;
-            transition: ACCELERATE 0.25 CURRENT;
+            transition: ACCELERATE 0.5 CURRENT;
             target: "shadow";
          }
          program {
@@ -140,7 +141,7 @@ group { name: "e/comp/screen/overlay/default";
             name: "resume";
             signal: "e,state,sys,resume"; source: "e";
             action: STATE_SET "default" 0.0;
-            transition: DECELERATE 1.0 CURRENT;
+            transition: DECELERATE 0.5 CURRENT;
             target: "suspender";
          }
          program {
@@ -176,55 +177,8 @@ group { name: "e/comp/screen/overlay/default";
    }
 }
 
-
-group { name: "e/comp/screen/overlay/noeffects";
-   inherit: "e/comp/screen/overlay/default";
-   programs {
-         program {
-            name: "screensaver_on";
-            transition: ACCELERATE 0 CURRENT;
-         }
-         program {
-            name: "screensaver_on2";
-            transition: DECELERATE 0 CURRENT;
-         }
-         program {
-            name: "screensaver_off";
-            transition: ACCELERATE 0 CURRENT;
-         }
-         program {
-            name: "screensaver_off2";
-            transition: ACCELERATE 0 CURRENT;
-         }
-         program {
-            name: "suspend";
-            transition: ACCELERATE 0 CURRENT;
-         }
-         program {
-            name: "hibernate";
-            transition: ACCELERATE 0 CURRENT;
-         }
-         program {
-            name: "resume";
-            transition: DECELERATE 0 CURRENT;
-         }
-         program {
-            name: "reboot";
-            transition: DECELERATE 0 CURRENT;
-         }
-         program {
-            name: "halt";
-            transition: DECELERATE 0 CURRENT;
-         }
-         program {
-            name: "logout";
-            transition: DECELERATE 0 CURRENT;
-         }
-   }
-}
-
 group { name: "e/comp/frame/default";
-   images.image: "win_glow.png" COMP;
+   alias: "e/comp/frame/default/fast"; // legacy
    images.image: "win_shadow.png" COMP;
    script {
       public message(Msg_Type:type, id, ...) {
@@ -278,30 +232,6 @@ group { name: "e/comp/frame/default";
             visible: 0;
          }
       }
-      rect { "focus_clip"; clip: "clipper";
-         desc {
-            rel1.offset: -9999 -9999;
-            rel2.offset: 9999 9999;
-         }
-         desc { "hid"; hid; }
-      }
-      part { name: "glow"; mouse_events: 0;
-         clip_to: "focus_clip";
-         description { state: "default" 0.0;
-            image.normal: "win_glow.png";
-            image.border: 9 9 9 9;
-            image.middle: 0;
-            rel.to: "gspacer";
-            fill.smooth: 0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-         description { state: "focused" 0.0;
-            inherit;
-            color: 255 255 255 255;
-            visible: 1;
-         }
-      }
       part { name: "shower"; type: SPACER;
          description { state: "default" 0.0;
             rel1.relative: 0.05 0.05;
@@ -381,6 +311,7 @@ group { name: "e/comp/frame/default";
              action: SIGNAL_EMIT "e,action,hide,done" "e";
          }
       }
+/*
       program {
          name: "focus_on";
          signal: "e,state,focused"; source: "e";
@@ -430,10 +361,12 @@ group { name: "e/comp/frame/default";
          action: STATE_SET "default";
          target: "focus_clip";
       }
+ */
    }
 }
 
 group { name: "e/comp/frame/rotate";
+   alias: "e/comp/frame/rotate/fast"; // legacy
    inherit: "e/comp/frame/default";
    parts {
       part { name: "e.swallow.content";
@@ -474,19 +407,8 @@ group { name: "e/comp/frame/rotate";
    }
 }
 
-group { name: "e/comp/frame/rotate/fast";
-   inherit: "e/comp/frame/rotate";
-   programs {
-      program { name: "focus3";
-         transition: LINEAR 0;
-      }
-      program { name: "focus_off3";
-         transition: LINEAR 0;
-      }
-   }
-}
-
 group { name: "e/comp/frame/flip";
+   alias: "e/comp/frame/flip/fast"; // legacy
    inherit: "e/comp/frame/rotate";
    parts {
       part { name: "e.swallow.content";
@@ -511,19 +433,8 @@ group { name: "e/comp/frame/flip";
    }
 }
 
-group { name: "e/comp/frame/flip/fast";
-   inherit: "e/comp/frame/flip";
-   programs {
-      program { name: "focus3";
-         transition: LINEAR 0;
-      }
-      program { name: "focus_off3";
-         transition: LINEAR 0;
-      }
-   }
-}
-
 group { name: "e/comp/frame/popup";
+   alias: "e/comp/frame/popup/fast"; // legacy
    inherit: "e/comp/frame/default";
    images.image: "win_shadow.png" COMP;
    parts {
@@ -535,48 +446,6 @@ group { name: "e/comp/frame/popup";
    }
 }
 
-group { name: "e/comp/frame/default/fast";
-   inherit: "e/comp/frame/default";
-   programs {
-      program {
-         name: "visible_on";
-         transition: DECELERATE 0;
-      }
-      program {
-         name: "visible_off";
-         transition: DECELERATE 0;
-      }
-      program {
-         name: "focus_on";
-         signal: "e,state,focus,on"; source: "e";
-         action: STATE_SET "focused" 0.0;
-         transition: SINUSOIDAL 0.1;
-         targets: "glow" "focus-clipper";
-         sequence {
-             action: STATE_SET "default" 0.0;
-             transition: SINUSOIDAL 0.1;
-             target: "glow";
-         }
-      }
-      program {
-         name: "focus_off";
-         transition: SINUSOIDAL 0;
-      }
-   }
-}
-
-group { name: "e/comp/frame/popup/fast";
-   inherit: "e/comp/frame/default/fast";
-   images.image: "win_shadow.png" COMP;
-   parts {
-      part { name: "focus-clipper";
-         description { state: "default";
-            color_class: "";
-         }
-      }
-   }
-}
-
 group { name: "e/comp/frame/none";
    parts {
       part { name: "e.swallow.content"; type: SWALLOW;
@@ -597,6 +466,7 @@ group { name: "e/comp/frame/none";
 }
 
 group { name: "e/comp/frame/still";
+   alias: "e/comp/frame/still/fast"; // legacy
    inherit: "e/comp/frame/default";
    parts {
       part { name: "shower";
@@ -608,19 +478,8 @@ group { name: "e/comp/frame/still";
    }
 }
 
-group { name: "e/comp/frame/still/fast";
-   inherit: "e/comp/frame/default/fast";
-   parts {
-      part { name: "shower";
-         description { state: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 1.0;
-         }
-      }
-   }
-}
-
 group { name: "e/comp/frame/menu";
+   alias: "e/comp/frame/menu/fast"; // legacy
    inherit: "e/comp/frame/popup";
    images.image: "win_menu_shadow.png" COMP;
    parts {
@@ -635,42 +494,18 @@ group { name: "e/comp/frame/menu";
             rel2.relative: 0.95 0.9;
          }
       }
-      image { "glow";
-         desc { "focused"; hid; }
-      }
-   }
-}
-
-group { name: "e/comp/frame/menu/fast";
-   inherit: "e/comp/frame/popup/fast";
-   parts {
-      part { name: "shower";
-         description { state: "default" 0.0;
-            rel1.relative: 0.05 0.0;
-            rel2.relative: 0.95 0.9;
-         }
-      }
-      image { "glow";
-         desc { "focused"; hid; }
-      }
    }
 }
 
 group { name: "e/comp/frame/everything";
+   alias: "e/comp/frame/everything/fast"; // legacy
    inherit: "e/comp/frame/popup";
    parts {
-      part { name: "shower";
-         description { state: "default" 0.0;
-            rel1.relative: -0.3 -0.3;
-            rel2.relative: 1.3 1.3;
+      part { name: "shadow";
+         description { state: "hidden" 0.0;
+            visible: 1;
          }
       }
-   }
-}
-
-group { name: "e/comp/frame/everything/fast";
-   inherit: "e/comp/frame/popup/fast";
-   parts {
       part { name: "shower";
          description { state: "default" 0.0;
             rel1.relative: -0.3 -0.3;
@@ -681,6 +516,7 @@ group { name: "e/comp/frame/everything/fast";
 }
 
 group { name: "e/comp/frame/fullscreen";
+   alias: "e/comp/frame/fullscreen/fast"; // legacy
    images.image: "screen_circular_shadow.png" COMP;
    data.item: "screen.bg" "fullscreen.bg";
    parts {
@@ -834,31 +670,3 @@ group { name: "e/comp/frame/fullscreen";
       }
    }
 }
-
-group { name: "e/comp/frame/fullscreen/fast";
-   inherit: "e/comp/frame/fullscreen";
-   programs {
-      program {
-         name: "visible_on";
-         transition: DECELERATE 0;
-      }
-      program {
-         name: "visible_on2";
-         transition: DECELERATE 0;
-      }
-      program { name: "show2";
-         transition: DECELERATE 0;
-      }
-      program {
-         name: "visible_off";
-         transition: DECELERATE 0;
-      }
-      program {
-         name: "visible_off2";
-         transition: DECELERATE 0;
-      }
-      program { name: "hide2";
-         transition: DECELERATE 0;
-      }
-   }
-}

data/elementary/themes/edc/comp_compat.edc

@@ -1,6 +1,6 @@
 group { name: "e/comp/border/default";
+   alias: "e/comp/border/default/fast"; // legacy
    images.image: "win_shadow.png" COMP;
-   images.image: "win_glow.png" COMP;
    parts {
       part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;
@@ -29,26 +29,6 @@ group { name: "e/comp/border/default";
             visible: 0;
          }
       }
-      part { name: "glow"; mouse_events: 0;
-         clip_to: "clipper";
-         description { state: "default" 0.0;
-            image.normal: "win_glow.png";
-            image.border: 9 9 9 9;
-            image.middle: 0;
-            rel1.to: "e.swallow.content";
-            rel1.offset: -5  -5;
-            rel2.to: "e.swallow.content";
-            rel2.offset: 4 4;
-            fill.smooth: 0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-            visible: 1;
-         }
-      }
       part { name: "shower"; type: SPACER;
          description { state: "default" 0.0;
             rel1.relative: 0.05 0.05;
@@ -128,6 +108,7 @@ group { name: "e/comp/border/default";
       program { name: "hide2";
          action: SIGNAL_EMIT "e,action,hide,done" "e";
       }
+/*
       program {
          name: "focus_on";
          signal: "e,state,focus,on"; source: "e";
@@ -175,10 +156,12 @@ group { name: "e/comp/border/default";
          transition: SINUSOIDAL 0.6 CURRENT;
          target: "glow";
       }
+ */
    }
 }
 
 group { name: "e/comp/border/rotate";
+   alias: "e/comp/border/rotate/fast"; // legacy
    inherit: "e/comp/border/default";
    parts {
       part { name: "e.swallow.content";
@@ -219,19 +202,8 @@ group { name: "e/comp/border/rotate";
    }
 }
 
-group { name: "e/comp/border/rotate/fast";
-   inherit: "e/comp/border/rotate";
-   programs {
-      program { name: "focus3";
-         transition: LINEAR 0;
-      }
-      program { name: "focus_off3";
-         transition: LINEAR 0;
-      }
-   }
-}
-
 group { name: "e/comp/border/flip";
+   alias: "e/comp/border/flip/fast"; // legacy
    inherit: "e/comp/border/rotate";
    parts {
       part { name: "e.swallow.content";
@@ -256,19 +228,8 @@ group { name: "e/comp/border/flip";
    }
 }
 
-group { name: "e/comp/border/flip/fast";
-   inherit: "e/comp/border/flip";
-   programs {
-      program { name: "focus3";
-         transition: LINEAR 0;
-      }
-      program { name: "focus_off3";
-         transition: LINEAR 0;
-      }
-   }
-}
-
 group { name: "e/comp/border/popup";
+   alias: "e/comp/border/popup/fast"; // legacy
    inherit: "e/comp/border/default";
    parts {
       part { name: "focus-clipper";
@@ -279,49 +240,6 @@ group { name: "e/comp/border/popup";
    }
 }
 
-group { name: "e/comp/border/default/fast";
-   inherit: "e/comp/border/default";
-   programs {
-      program {
-         name: "visible_on";
-         transition: DECELERATE 0;
-      }
-      program {
-         name: "visible_off";
-         transition: DECELERATE 0;
-      }
-      program {
-         name: "focus_on";
-         signal: "e,state,focus,on"; source: "e";
-         action: STATE_SET "focused" 0.0;
-         transition: SINUSOIDAL 0.1;
-         target: "glow";
-         target: "focus-clipper";
-         after: "focus2";
-      }
-      program { name: "focus2";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.1;
-         target: "glow";
-      }
-      program {
-         name: "focus_off";
-         transition: SINUSOIDAL 0;
-      }
-   }
-}
-
-group { name: "e/comp/border/popup/fast";
-   inherit: "e/comp/border/default/fast";
-   parts {
-      part { name: "focus-clipper";
-         description { state: "default";
-            color_class: "";
-         }
-      }
-   }
-}
-
 group { name: "e/comp/border/none";
    parts {
       part { name: "e.swallow.content"; type: SWALLOW;
@@ -342,6 +260,7 @@ group { name: "e/comp/border/none";
 }
 
 group { name: "e/comp/border/still";
+   alias: "e/comp/border/still/fast"; // legacy
    inherit: "e/comp/border/default";
    parts {
       part { name: "shower";
@@ -353,19 +272,8 @@ group { name: "e/comp/border/still";
    }
 }
 
-group { name: "e/comp/border/still/fast";
-   inherit: "e/comp/border/default/fast";
-   parts {
-      part { name: "shower";
-         description { state: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 1.0;
-         }
-      }
-   }
-}
-
 group { name: "e/comp/border/menu";
+   alias: "e/comp/border/menu/fast"; // legacy
    inherit: "e/comp/border/popup";
    parts {
       part { name: "shower";
@@ -377,19 +285,8 @@ group { name: "e/comp/border/menu";
    }
 }
 
-group { name: "e/comp/border/menu/fast";
-   inherit: "e/comp/border/popup/fast";
-   parts {
-      part { name: "shower";
-         description { state: "default" 0.0;
-            rel1.relative: 0.05 0.0;
-            rel2.relative: 0.95 0.9;
-         }
-      }
-   }
-}
-
 group { name: "e/comp/border/everything";
+   alias: "e/comp/border/everything/fast"; // legacy
    inherit: "e/comp/border/popup";
    parts {
       part { name: "shower";
@@ -401,19 +298,8 @@ group { name: "e/comp/border/everything";
    }
 }
 
-group { name: "e/comp/border/everything/fast";
-   inherit: "e/comp/border/popup/fast";
-   parts {
-      part { name: "shower";
-         description { state: "default" 0.0;
-            rel1.relative: -0.3 -0.3;
-            rel2.relative: 1.3 1.3;
-         }
-      }
-   }
-}
-
 group { name: "e/comp/border/fullscreen";
+   alias: "e/comp/border/fullscreen/fast"; // legacy
    images.image: "screen_circular_shadow.png" COMP;
    data.item: "screen.bg" "fullscreen.bg";
    parts {
@@ -575,31 +461,3 @@ group { name: "e/comp/border/fullscreen";
       }
    }
 }
-
-group { name: "e/comp/border/fullscreen/fast";
-   inherit: "e/comp/border/fullscreen";
-   programs {
-      program {
-         name: "visible_on";
-         transition: DECELERATE 0;
-      }
-      program {
-         name: "visible_on2";
-         transition: DECELERATE 0;
-      }
-      program { name: "show2";
-         transition: DECELERATE 0;
-      }
-      program {
-         name: "visible_off";
-         transition: DECELERATE 0;
-      }
-      program {
-         name: "visible_off2";
-         transition: DECELERATE 0;
-      }
-      program { name: "hide2";
-         transition: DECELERATE 0;
-      }
-   }
-}

data/elementary/themes/edc/conf.edc

@@ -1,42 +1,30 @@
 group { name: "e/widgets/configure/main";
-   images.image: "bevel_dark_out.png" COMP;
-   images.image: "separator_horiz.png" COMP;
    parts {
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            color_class: "dialog_base";
             color: 64 64 64 255;
          }
       }
-      part { name: "bevel";
+      part { name: "separator"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "bevel_dark_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "separator"; mouse_events: 0;
-         description { state: "default" 0.0;
-            min: 16 2;
-            max: 99999 2;
+            min: 16 1;
+            max: 99999 1;
             rel1.relative: 0.0 1.0;
             rel1.offset: 0 0;
             rel1.to_y: "e.swallow.content";
             rel2.relative: 1.0 0.0;
             rel2.offset: -1 -1;
             rel2.to_y: "e.swallow.button";
-            image.normal: "separator_horiz.png";
-            fill.smooth: 0;
             fixed: 0 1;
+            color: 72 72 72 255;
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
          description { state: "default" 0.0;
-            rel1.offset: 4 4;
+            rel1.offset: 0 8;
             rel1.to_x: "base";
             rel2.relative: 1.0 0.0;
-            rel2.offset: -5 -8;
+            rel2.offset: -1 -17;
             rel2.to_y: "e.swallow.button";
          }
       }
@@ -44,9 +32,9 @@ group { name: "e/widgets/configure/main";
          description { state: "default" 0.0;
             align: 0.5 1.0;
             rel1.relative: 0.5 1.0;
-            rel1.offset: 0 -5;
+            rel1.offset: 0 -9;
             rel2.relative: 0.5 1.0;
-            rel2.offset: -1 -5;
+            rel2.offset: -1 -9;
             fixed: 1 1;
          }
       }
@@ -54,61 +42,31 @@ group { name: "e/widgets/configure/main";
 }
 
 group { name: "e/modules/conf/main";
-   images.image: "button_normal.png" COMP;
-   images.image: "button_clicked.png" COMP;
-   images.image: "spanner_inset.png" COMP;
-   images.image: "spanner_hilight.png" COMP;
-   images.image: "spanner_glow.png" COMP;
+   images.image: "spanner.png" COMP;
    min: 16 16;
-   max: 80 80;
    parts {
-      part { name: "base";
+      part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            image.normal: "button_normal.png";
-            image.border: 4 4 3 5;
-            image.middle: SOLID;
-            rel1.offset: -1 0;
-            rel2.offset: 0 1;
-            fill.smooth: 0;
+            color: 0 0 0 0;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            image.normal: "button_clicked.png";
-            image.border: 5 5 4 6;
-         }
-      }
-      part { name: "spanner_hilight"; mouse_events: 0;
-         description { state: "default" 0.0;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            max: 80 80;
-            rel1.offset: 0 1;
-            rel1.to: "spanner";
-            rel2.offset: -1 0;
-            rel2.to: "spanner";
-            image.normal: "spanner_hilight.png";
          }
       }
       part { name: "spanner"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
             aspect: 1.0 1.0; aspect_preference: BOTH;
-            max: 80 80;
+            rel.to: "base";
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
-            image.normal: "spanner_inset.png";
-         }
-      }
-      part { name: "spanner_glow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            max: 80 80;
-            rel1.to: "spanner";
-            rel2.to: "spanner";
-            image.normal: "spanner_glow.png";
-            visible: 0;
+            image.normal: "spanner.png";
+            offscale;
+            color: 160 160 160 255;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            visible: 1;
+            color: 255 255 255 255;
          }
       }
    }
@@ -117,26 +75,17 @@ group { name: "e/modules/conf/main";
          signal: "mouse,down,1"; source: "base";
          action: STATE_SET "clicked" 0.0;
          target: "base";
+         target: "spanner";
       }
       program {
          signal: "mouse,up,1"; source: "base";
          action: STATE_SET "default" 0.0;
          target: "base";
-         target: "spanner_glow";
+         target: "spanner";
       }
       program {
          signal: "mouse,clicked,1*"; source: "base";
          action: SIGNAL_EMIT "e,action,conf" "";
       }
-      program {
-         signal: "mouse,in"; source: "base";
-         action: STATE_SET "clicked" 0.0;
-         target: "spanner_glow";
-      }
-      program {
-         signal: "mouse,out"; source: "base";
-         action: STATE_SET "default" 0.0;
-         target: "spanner_glow";
-      }
    }
 }

data/elementary/themes/edc/connman.edc

@@ -1,119 +1,122 @@
 group { name: "e/modules/connman/main";
-   images.image: "slot_horiz_top.png" COMP;
-   images.image: "slot_horiz_bottom.png" COMP;
-   images.image: "wifi_base.png" COMP;
-   images.image: "wifi_sig_1.png" COMP;
-   images.image: "wifi_sig_2.png" COMP;
-   images.image: "wifi_sig_3.png" COMP;
-   images.image: "eth.png" COMP;
-   images.image: "exlclam.png" COMP;
-   images.image: "hole_tiny.png" COMP;
-   images.image: "led_tiny_orange.png" COMP;
-   images.image: "led_tiny_green.png" COMP;
+   images.image: "cloud-conn.png" COMP;
+
+   images.image: "eth-top.png" COMP;
+   images.image: "eth-base.png" COMP;
+
+   images.image: "wifi-1.png" COMP;
+   images.image: "wifi-2.png" COMP;
+   images.image: "wifi-3.png" COMP;
+   images.image: "wifi-4.png" COMP;
+   images.image: "wifi-5.png" COMP;
+
    images.image: "bt_base.png" COMP;
    images.image: "bt_sig_1.png" COMP;
    images.image: "bt_sig_2.png" COMP;
+
    images.image: "cell_base.png" COMP;
    images.image: "cell_sig_1.png" COMP;
    images.image: "cell_sig_2.png" COMP;
    images.image: "cell_sig_3.png" COMP;
    images.image: "cell_sig_4.png" COMP;
    parts {
-      part { name: "slot_bottom"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "slot";
-            rel2.relative: 1.0 0.5;
-            rel2.to: "slot";
-            min: 0 3;
-            image.normal: "slot_horiz_bottom.png";
-            fixed: 0 1;
-         }
-      }
-///////////////////////
       part { name: "exclam_base"; mouse_events: 0;
+         scale: 1;
          clip_to: "clip_exclam";
          description { state: "default" 0.0;
-            aspect: (71/144) (71/144); aspect_preference: BOTH;
-            align: 0.5 1.0;
-            rel2.relative: 1.0 0.5;
-            rel2.to_y: "slot";
-            image.normal: "exlclam.png";
+            min: 11 10;
+            rel1.relative: (20/160) (50/160);
+            rel2.relative: (135/160) (150/160);
+            aspect: (115/105) (115/105); aspect_preference: BOTH;
+            image.normal: "cloud-conn.png";
          }
       }
 ///////////////////////
-      part { name: "eth_base"; mouse_events: 0;
+      part { name: "eth-base"; mouse_events: 0;
+         scale: 1;
          clip_to: "clip_eth";
          description { state: "default" 0.0;
-            aspect: (60/144) (60/144); aspect_preference: BOTH;
-            align: 0.5 1.0;
-            rel2.relative: 1.0 0.5;
-            rel2.to_y: "slot";
-            image.normal: "eth.png";
+            min: 6 13;
+            aspect: (60/130) (60/130); aspect_preference: BOTH;
+            rel1.relative: (50/160) (15/160);
+            rel2.relative: (110/160) (145/160);
+            image.normal: "eth-base.png";
+            color: 160 160 160 128;
+         }
+         description { state: "connected" 0.0;
+            inherit: "default" 0.0;
+            color: 160 160 160 255;
+         }
+         description { state: "online" 0.0;
+            inherit: "default" 0.0;
+            color: 51 153 255 255;
+         }
+      }
+      part { name: "eth"; mouse_events: 0;
+         scale: 1;
+         clip_to: "clip_eth";
+         description { state: "default" 0.0;
+            rel1.to: "eth-base";
+            rel2.to: "eth-base";
+            image.normal: "eth-top.png";
+            color: 160 160 160 128;
+         }
+         description { state: "connected" 0.0;
+            inherit: "default" 0.0;
+            color: 160 160 160 255;
+         }
+         description { state: "online" 0.0;
+            inherit: "default" 0.0;
+            color: 160 160 160 255;
          }
       }
 ///////////////////////
-      part { name: "wifi_base"; mouse_events: 0;
+      part { name: "wifi-base"; mouse_events: 0;
          clip_to: "clip_wifi";
          description { state: "default" 0.0;
-            aspect: (160/144) (160/144); aspect_preference: BOTH;
-            align: 0.5 1.0;
-            rel2.relative: 1.0 0.5;
-            rel2.to_y: "slot";
-            image.normal: "wifi_base.png";
+            min: 14 10;
+            aspect: (140/100) (140/100); aspect_preference: BOTH;
+            rel1.relative: (10/160) (30/160);
+            rel2.relative: (150/160) (130/160);
+            image.normal: "wifi-1.png";
+            color: 160 160 160 255;
+         }
+         description { state: "connected" 0.0;
+            inherit: "default" 0.0;
+            color: 160 160 160 255;
+         }
+         description { state: "online" 0.0;
+            inherit: "default" 0.0;
+            color: 51 153 255 255;
          }
       }
-      part { name: "wifi_1"; mouse_events: 0;
+      part { name: "wifi"; mouse_events: 0;
          clip_to: "clip_wifi";
          description { state: "default" 0.0;
-            rel1.to: "wifi_base";
-            rel2.to: "wifi_base";
-            image.normal: "wifi_sig_1.png";
-            visible: 0;
+            rel1.to: "wifi-base";
+            rel2.to: "wifi-base";
+            image.normal: "wifi-1.png";
+            color: 0 0 0 0;
          }
-         description { state: "partly" 0.0;
+         description { state: "default" 0.25;
             inherit: "default" 0.0;
-            color: 255 255 255 128;
-            visible: 1;
+            image.normal: "wifi-2.png";
+            color: 160 160 160 255;
          }
-         description { state: "visible" 0.0;
+         description { state: "default" 0.5;
             inherit: "default" 0.0;
-            visible: 1;
+            image.normal: "wifi-3.png";
+            color: 160 160 160 255;
          }
-      }
-      part { name: "wifi_2"; mouse_events: 0;
-         clip_to: "clip_wifi";
-         description { state: "default" 0.0;
-            rel1.to: "wifi_base";
-            rel2.to: "wifi_base";
-            image.normal: "wifi_sig_2.png";
-            visible: 0;
-         }
-         description { state: "partly" 0.0;
+         description { state: "default" 0.75;
             inherit: "default" 0.0;
-            color: 255 255 255 128;
-            visible: 1;
+            image.normal: "wifi-4.png";
+            color: 160 160 160 255;
          }
-         description { state: "visible" 0.0;
+         description { state: "default" 1.0;
             inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "wifi_3"; mouse_events: 0;
-         clip_to: "clip_wifi";
-         description { state: "default" 0.0;
-            rel1.to: "wifi_base";
-            rel2.to: "wifi_base";
-            image.normal: "wifi_sig_3.png";
-            visible: 0;
-         }
-         description { state: "partly" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 128;
-            visible: 1;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+            image.normal: "wifi-5.png";
+            color: 160 160 160 255;
          }
       }
 ///////////////////////
@@ -121,9 +124,6 @@ group { name: "e/modules/connman/main";
          clip_to: "clip_bt";
          description { state: "default" 0.0;
             aspect: (160/144) (160/144); aspect_preference: BOTH;
-            align: 0.5 1.0;
-            rel2.relative: 1.0 0.5;
-            rel2.to_y: "slot";
             image.normal: "bt_base.png";
          }
       }
@@ -168,9 +168,6 @@ group { name: "e/modules/connman/main";
          clip_to: "clip_cell";
          description { state: "default" 0.0;
             aspect: (160/144) (160/144); aspect_preference: BOTH;
-            align: 0.5 1.0;
-            rel2.relative: 1.0 0.5;
-            rel2.to_y: "slot";
             image.normal: "cell_base.png";
          }
       }
@@ -247,30 +244,6 @@ group { name: "e/modules/connman/main";
          }
       }
 ///////////////////////
-      part { name: "slot"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.offset: 0 -1;
-            rel1.relative: (21/160) 1.0;
-            rel2.offset: -1 -1;
-            rel2.relative: (140/160) 1.0;
-            align: 0.5 1.0;
-            min: 0 6;
-            image.normal: "slot_horiz_top.png";
-            fixed: 0 1;
-         }
-      }
-      part { name: "hole"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.offset: -4 -4;
-            rel1.relative: 1.0 1.0;
-            rel2.offset: -4 -4;
-            align: 1.0 1.0;
-            min: 4 4;
-            max: 4 4;
-            image.normal: "hole_tiny.png";
-            fixed: 1 1;
-         }
-      }
       part { name: "clip_exclam"; type: RECT;
          description { state: "default" 0.0;
             visible: 1;
@@ -356,27 +329,6 @@ group { name: "e/modules/connman/main";
             visible: 1;
          }
       }
-      part { name: "led"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "hole";
-            rel2.to: "hole";
-            min: 10 10;
-            max: 10 10;
-            image.normal: "led_tiny_orange.png";
-            fixed: 1 1;
-            visible: 0;
-         }
-         description { state: "connected" 0.0;
-            inherit: "default" 0.0;
-            image.normal: "led_tiny_orange.png";
-            visible: 1;
-         }
-         description { state: "online" 0.0;
-            inherit: "default" 0.0;
-            image.normal: "led_tiny_green.png";
-            visible: 1;
-         }
-      }
       part { name: "event"; type: RECT;
          description { state: "default" 0.0;
             color: 0 0 0 0;
@@ -389,41 +341,7 @@ script { \
 public message(Msg_Type:type, id, ...) { \
 if ((type == MSG_INT_SET) && (id == 1)) { \
 new state = getarg(2), signl = getarg(3); \
-if (signl <= 14) { \
-set_state(PART:"wifi_1", "default", 0.0); \
-set_state(PART:"wifi_2", "default", 0.0); \
-set_state(PART:"wifi_3", "default", 0.0); \
-} \
-else if (signl <= 28) { \
-set_state(PART:"wifi_1", "partly", 0.0); \
-set_state(PART:"wifi_2", "default", 0.0); \
-set_state(PART:"wifi_3", "default", 0.0); \
-} \
-else if (signl <= 42) { \
-set_state(PART:"wifi_1", "visible", 0.0); \
-set_state(PART:"wifi_2", "default", 0.0); \
-set_state(PART:"wifi_3", "default", 0.0); \
-} \
-else if (signl <= 57) { \
-set_state(PART:"wifi_1", "visible", 0.0); \
-set_state(PART:"wifi_2", "partly", 0.0); \
-set_state(PART:"wifi_3", "default", 0.0); \
-} \
-else if (signl <= 71) { \
-set_state(PART:"wifi_1", "visible", 0.0); \
-set_state(PART:"wifi_2", "visible", 0.0); \
-set_state(PART:"wifi_3", "default", 0.0); \
-} \
-else if (signl <= 85) { \
-set_state(PART:"wifi_1", "visible", 0.0); \
-set_state(PART:"wifi_2", "visible", 0.0); \
-set_state(PART:"wifi_3", "partly", 0.0); \
-} \
-else { \
-set_state(PART:"wifi_1", "visible", 0.0); \
-set_state(PART:"wifi_2", "visible", 0.0); \
-set_state(PART:"wifi_3", "visible", 0.0); \
-} \
+set_state(PART:"wifi", "default", float(signl) / 100.0); \
 if (signl <= 20) { \
 set_state(PART:"bt_1", "default", 0.0); \
 set_state(PART:"bt_2", "default", 0.0); \
@@ -499,17 +417,31 @@ set_state(PART:"cell_3", "visible", 0.0); \
 set_state(PART:"cell_4", "visible", 0.0); \
 } \
 if ((state == 2)) { \
-set_state(PART:"led", "default", 0.0); \
-run_program(PROGRAM:"connecting"); \
+   set_state(PART:"wifi-base", "default", 0.0); \
+   set_state(PART:"eth-base", "default", 0.0); \
+   set_state(PART:"eth", "default", 0.0); \
+/*run_program(PROGRAM:"connecting");*/ \
 return; } \
 else if ((state == 3)) { return; } \
-else if ((state == 4)) { set_state(PART:"led", "connected", 0.0); } \
-else if ((state == 5)) { set_state(PART:"led", "online", 0.0); } \
-else { set_state(PART:"led", "default", 0.0); \
+else if ((state == 4)) { \
+   set_state(PART:"wifi-base", "connected", 0.0); \
+   set_state(PART:"eth-base", "connected", 0.0); \
+   set_state(PART:"eth", "connected", 0.0); \
+} \
+else if ((state == 5)) { \
+   set_state(PART:"wifi-base", "online", 0.0); \
+   set_state(PART:"eth-base", "online", 0.0); \
+   set_state(PART:"eth", "online", 0.0); \
+} \
+else { \
+   set_state(PART:"wifi-base", "default", 0.0); \
+   set_state(PART:"eth-base", "default", 0.0); \
+   set_state(PART:"eth", "default", 0.0); \
 } } } }
    
    SCRIPT_MESSAGE()
    programs {
+/*
       program { name: "connecting";
          action: STATE_SET "connected" 0.0;
          target: "led";
@@ -522,6 +454,7 @@ else { set_state(PART:"led", "default", 0.0); \
          in: 0.3 0.0;
          after:  "connecting";
       }
+ */
 //      program {
 //         signal: "e,available"; source: "e";
 //      }
@@ -589,8 +522,7 @@ group { name: "e/modules/connman/icon/wifi";
    inherit: "e/modules/connman/main";
    SCRIPT_MESSAGE()
    programs {
-      program {
-         signal: "load"; source: "";
+      program { signal: "load"; source: "";
          action: STATE_SET "wifi" 0.0;
          target: "clip_exclam";
          target: "clip_wifi";
@@ -605,8 +537,7 @@ group { name: "e/modules/connman/icon/ethernet";
    inherit: "e/modules/connman/main";
    SCRIPT_MESSAGE()
    programs {
-      program {
-         signal: "load"; source: "";
+      program { signal: "load"; source: "";
          action: STATE_SET "eth" 0.0;
          target: "clip_exclam";
          target: "clip_wifi";
@@ -621,8 +552,7 @@ group { name: "e/modules/connman/icon/bluetooth";
    inherit: "e/modules/connman/main";
    SCRIPT_MESSAGE()
    programs {
-      program {
-         signal: "load"; source: "";
+      program { signal: "load"; source: "";
          action: STATE_SET "bt" 0.0;
          target: "clip_exclam";
          target: "clip_wifi";
@@ -637,8 +567,7 @@ group { name: "e/modules/connman/icon/cellular";
    inherit: "e/modules/connman/main";
    SCRIPT_MESSAGE()
    programs {
-      program {
-         signal: "load"; source: "";
+      program { signal: "load"; source: "";
          action: STATE_SET "cell" 0.0;
          target: "clip_exclam";
          target: "clip_wifi";

data/elementary/themes/edc/cpuclock.edc

@@ -0,0 +1,241 @@
+group { name: "e/gadget/cpuclock/main";
+   alias: "e/gadget/cpuclock/main_vert";
+   images.image: "cpu_base.png" COMP;
+   images.image: "cpu_clip1.png" COMP;
+   images.image: "cpu_clip2.png" COMP;
+   images.image: "cpu_clip3.png" COMP;
+   set { name: "marker";
+      image { image: "cpu_marker.png"  COMP; size: 72 72 99999 99999; }
+      image { image: "cpu_marker2.png" COMP; size: 36 36 72 72; }
+      image { image: "cpu_marker3.png" COMP; size: 18 18 36 36; }
+      image { image: "cpu_marker4.png" COMP; size: 0 0 4 18; }
+   }
+   script {
+      public available_frequencies;
+      public available_governors;
+
+      public cur_freq_old;
+      public cur_freq_new;
+      public cur_freq_now;
+      public cur_freq_anim;
+
+      public min_freq_old;
+      public min_freq_new;
+      public min_freq_now;
+
+      public max_freq_old;
+      public max_freq_new;
+      public max_freq_now;
+
+      public slide_cur_freq(val, Float:v) {
+         new Float:freq, Float:min_freq, Float:max_freq, Float:tf;
+         new f, f0, f1;
+
+         v = (1.0 - cos(v * 3.141592654)) / 2.0;
+
+         min_freq = fetch_int(available_frequencies, 0);
+         max_freq = fetch_int(available_frequencies,
+                              count(available_frequencies) - 1);
+
+         f0 = get_int(cur_freq_old);
+         f1 = get_int(cur_freq_new);
+         f = f1 - f0;
+         freq = float(f) * v;
+         f = round(freq);
+         f = f + f0;
+         set_int(cur_freq_now, f);
+
+         freq = (float(f) - min_freq) / (max_freq - min_freq);
+         tf = (freq * 225.0) - 135.0;
+         custom_state(PART:"meter", "default", 0.0);
+         set_state_val(PART:"meter", STATE_MAP_ROT_Z, tf);
+         set_state(PART:"meter", "custom", 0.0);
+
+         f0 = get_int(min_freq_old);
+         f1 = get_int(min_freq_new);
+         f = f1 - f0;
+         freq = float(f) * v;
+         f = round(freq);
+         f = f + f0;
+         set_int(min_freq_now, f);
+
+         freq = (float(f) - min_freq) / (max_freq - min_freq);
+         tf = (freq * 225.0) - 135.0;
+         custom_state(PART:"meter_min", "default", 0.0);
+         set_state_val(PART:"meter_min", STATE_MAP_ROT_Z, tf);
+         set_state(PART:"meter_min", "custom", 0.0);
+
+         f0 = get_int(max_freq_old);
+         f1 = get_int(max_freq_new);
+         f = f1 - f0;
+         freq = float(f) * v;
+         f = round(freq);
+         f = f + f0;
+         set_int(max_freq_now, f);
+
+         freq = (float(f) - min_freq) / (max_freq - min_freq);
+         tf = (freq * 225.0) - 135.0;
+         custom_state(PART:"meter_max", "default", 0.0);
+         set_state_val(PART:"meter_max", STATE_MAP_ROT_Z, tf);
+         set_state(PART:"meter_max", "custom", 0.0);
+
+         if (v >= 1.0) {
+            set_int(cur_freq_anim, 0);
+            return 0;
+         }
+         return 1;
+      }
+
+      public message(Msg_Type:type, id, ...) {
+         if ((type == MSG_INT_SET) && (id == 1)) { // add an available freq
+            while (count(available_frequencies) > 0) {
+               remove(available_frequencies, 0);
+            }
+            for (new i = 2; i < numargs(); i++) {
+               append_int(available_frequencies, getarg(i));
+            }
+         }
+         else if ((type == MSG_STRING_SET) && (id == 2)) { // add a governor
+            new text[100];
+            while (count(available_governors) > 0) {
+               remove(available_governors, 0);
+            }
+            for (new i = 2; i < numargs(); i++) {
+               snprintf(text, 100, "%s", getarg(i));
+               append_str(available_governors, text);
+            }
+         } else if ((type == MSG_INT_SET) && (id == 3)) { // avg freq
+            new f;
+            new ani, curf, minf, maxf;
+            new text[100];
+
+            f = getarg(2);
+            if (f < 1000000) {
+               f += 500;
+               snprintf(text, 100, "%i", f / 1000);
+            } else {
+               f += 50000;
+               snprintf(text, 100, "%i.%i", f / 1000000,
+                        (f % 1000000) / 100000);
+            }
+
+            ani = get_int(cur_freq_anim);
+            if (ani > 0) cancel_anim(ani);
+            ani = anim(0.25, "slide_cur_freq", 0);
+            set_int(cur_freq_anim, ani);
+
+            f = getarg(2);
+            curf = get_int(cur_freq_now);
+            set_int(cur_freq_old, curf);
+            set_int(cur_freq_new, f);
+
+            f = getarg(4);
+            minf = get_int(min_freq_now);
+            set_int(min_freq_old, minf);
+            set_int(min_freq_new, f);
+
+            f = getarg(5);
+            maxf = get_int(max_freq_now);
+            set_int(max_freq_old, maxf);
+            set_int(max_freq_new, f);
+         } else if ((type == MSG_STRING) && (id == 4)) {
+            new text[100];
+            snprintf(text, 100, "%s", getarg(2));
+         }
+      }
+   }
+   parts {
+      part { name: "fade_clip"; type: RECT;
+         description { state: "default" 0.0;
+            color: 255 255 255 255;
+         }
+         description { state: "faded" 0.0;
+            color: 255 255 255 128;
+         }
+      }
+      part { name: "clip1";
+         clip_to: "fade_clip";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            image.normal: "cpu_clip1.png";
+         }
+      }
+      part { name: "clip2";
+         clip_to: "fade_clip";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            image.normal: "cpu_clip2.png";
+         }
+      }
+      part { name: "clip3";
+         clip_to: "fade_clip";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            image.normal: "cpu_clip3.png";
+         }
+      }
+      part { name: "base";
+         description { state: "default" 0.0;
+            rel1.relative: (25/380) (25/380);
+            rel2.relative: (365/380) (365/380);
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            image.normal: "cpu_base.png";
+         }
+      }
+      part { name: "meter_min"; mouse_events: 0;
+         clip_to: "clip3";
+         description { state: "default" 0.0;
+            image.normal: "marker";
+            color: 51 153 255 255;
+            rel1.to: "base";
+            rel2.to: "base";
+            map {
+               on: 1;
+               rotation.center: "base";
+            }
+         }
+      }
+      part { name: "meter_max"; mouse_events: 0;
+         clip_to: "clip1";
+         description { state: "default" 0.0;
+            image.normal: "marker";
+            color: 255 0 0 255;
+            rel1.to: "base";
+            rel2.to: "base";
+            map {
+               on: 1;
+               rotation.center: "base";
+            }
+         }
+      }
+      part { name: "meter"; mouse_events: 0;
+         clip_to: "clip2";
+         description { state: "default" 0.0000;
+            color: 255 153 51 255;
+            image.normal: "marker";
+            rel1.to: "base";
+            rel2.to: "base";
+            map {
+               on: 1;
+               rotation.center: "base";
+            }
+         }
+      }
+   }
+   programs {
+      program {
+         signal: "e,state,enabled"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "fade_clip";
+      }
+      program {
+         signal: "e,state,disabled"; source: "e";
+         action: STATE_SET "faded" 0.0;
+         target: "fade_clip";
+      }
+   }
+}
+

data/elementary/themes/edc/cpufreq.edc

@@ -1,64 +1,41 @@
 group { name: "e/modules/cpufreq/main";
-   alias: "e/gadget/cpuclock/main";
-   alias: "e/gadget/cpuclock/main_vert";
-   images.image: "tacho_base.png" COMP;
-   images.image: "inset_round_hilight.png" COMP;
-   images.image: "inset_round_shadow.png" COMP;
-   images.image: "inset_round_shading.png" COMP;
-   set { name: "tacho_hand_big";
-      image { image: "tacho_hand_big.png" COMP; size: 73 73 99999 99999; }
-      image { image: "tacho_hand_big2.png" COMP; size: 37 37 72 72; }
-      image { image: "tacho_hand_big3.png" COMP; size: 19 19 36 36; }
-      image { image: "tacho_hand_big4.png" COMP; size: 0 0 18 18; }
-   }
-   images.image: "tacho_hand_big_shadow.png" COMP;
-   set { name: "tacho_hand_small_min";
-      image { image: "tacho_hand_small_min.png" COMP; size: 73 73 99999 99999; }
-      image { image: "tacho_hand_small_min2.png" COMP; size: 37 37 72 72; }
-      image { image: "tacho_hand_small_min3.png" COMP; size: 19 19 36 36; }
-      image { image: "tacho_hand_small_min4.png" COMP; size: 0 0 18 18; }
-   }
-   images.image: "tacho_hand_small_shadow.png" COMP;
-   set { name: "knob";
-      image { image: "knob_sz_24.png"  COMP; size: 31 31 32 32; }
-      image { image: "knob_sz_22.png"  COMP; size: 29 29 30 30; }
-      image { image: "knob_sz_20.png"  COMP; size: 27 27 28 28; }
-      image { image: "knob_sz_18.png"  COMP; size: 25 25 26 26; }
-      image { image: "knob_sz_16.png"  COMP; size: 23 23 24 24; }
-      image { image: "knob_sz_14.png"  COMP; size: 21 21 22 22; }
-      image { image: "knob_sz_12.png"  COMP; size: 19 19 20 20; }
-      image { image: "knob_sz_10.png"  COMP; size: 17 17 18 18; }
-      image { image: "knob_sz_08.png"  COMP; size: 15 15 16 16; }
-      image { image: "knob_sz_06.png"  COMP; size: 13 13 14 14; }
-      image { image: "knob_sz_04.png"  COMP; size:  0  0 12 12; }
+   images.image: "cpu_base.png" COMP;
+   images.image: "cpu_clip1.png" COMP;
+   images.image: "cpu_clip2.png" COMP;
+   images.image: "cpu_clip3.png" COMP;
+   set { name: "marker";
+      image { image: "cpu_marker.png"  COMP; size: 72 72 99999 99999; }
+      image { image: "cpu_marker2.png" COMP; size: 36 36 72 72; }
+      image { image: "cpu_marker3.png" COMP; size: 18 18 36 36; }
+      image { image: "cpu_marker4.png" COMP; size: 0 0 4 18; }
    }
    script {
       public available_frequencies;
       public available_governors;
-      
+
       public cur_freq_old;
       public cur_freq_new;
       public cur_freq_now;
       public cur_freq_anim;
-      
+
       public min_freq_old;
       public min_freq_new;
       public min_freq_now;
-      
+
       public max_freq_old;
       public max_freq_new;
       public max_freq_now;
-      
+
       public slide_cur_freq(val, Float:v) {
          new Float:freq, Float:min_freq, Float:max_freq, Float:tf;
          new f, f0, f1;
-         
+
          v = (1.0 - cos(v * 3.141592654)) / 2.0;
-         
+
          min_freq = fetch_int(available_frequencies, 0);
          max_freq = fetch_int(available_frequencies,
                               count(available_frequencies) - 1);
-         
+
          f0 = get_int(cur_freq_old);
          f1 = get_int(cur_freq_new);
          f = f1 - f0;
@@ -66,16 +43,13 @@ group { name: "e/modules/cpufreq/main";
          f = round(freq);
          f = f + f0;
          set_int(cur_freq_now, f);
-         
+
          freq = (float(f) - min_freq) / (max_freq - min_freq);
          tf = (freq * 225.0) - 135.0;
          custom_state(PART:"meter", "default", 0.0);
          set_state_val(PART:"meter", STATE_MAP_ROT_Z, tf);
          set_state(PART:"meter", "custom", 0.0);
-         custom_state(PART:"meter_sh", "default", 0.0);
-         set_state_val(PART:"meter_sh", STATE_MAP_ROT_Z, tf);
-         set_state(PART:"meter_sh", "custom", 0.0);
-         
+
          f0 = get_int(min_freq_old);
          f1 = get_int(min_freq_new);
          f = f1 - f0;
@@ -83,16 +57,13 @@ group { name: "e/modules/cpufreq/main";
          f = round(freq);
          f = f + f0;
          set_int(min_freq_now, f);
-         
+
          freq = (float(f) - min_freq) / (max_freq - min_freq);
          tf = (freq * 225.0) - 135.0;
          custom_state(PART:"meter_min", "default", 0.0);
          set_state_val(PART:"meter_min", STATE_MAP_ROT_Z, tf);
          set_state(PART:"meter_min", "custom", 0.0);
-         custom_state(PART:"meter_min_sh", "default", 0.0);
-         set_state_val(PART:"meter_min_sh", STATE_MAP_ROT_Z, tf);
-         set_state(PART:"meter_min_sh", "custom", 0.0);
-         
+
          f0 = get_int(max_freq_old);
          f1 = get_int(max_freq_new);
          f = f1 - f0;
@@ -100,23 +71,20 @@ group { name: "e/modules/cpufreq/main";
          f = round(freq);
          f = f + f0;
          set_int(max_freq_now, f);
-         
+
          freq = (float(f) - min_freq) / (max_freq - min_freq);
          tf = (freq * 225.0) - 135.0;
          custom_state(PART:"meter_max", "default", 0.0);
          set_state_val(PART:"meter_max", STATE_MAP_ROT_Z, tf);
          set_state(PART:"meter_max", "custom", 0.0);
-         custom_state(PART:"meter_max_sh", "default", 0.0);
-         set_state_val(PART:"meter_max_sh", STATE_MAP_ROT_Z, tf);
-         set_state(PART:"meter_max_sh", "custom", 0.0);
-         
+
          if (v >= 1.0) {
             set_int(cur_freq_anim, 0);
             return 0;
          }
          return 1;
       }
-      
+
       public message(Msg_Type:type, id, ...) {
          if ((type == MSG_INT_SET) && (id == 1)) { // add an available freq
             while (count(available_frequencies) > 0) {
@@ -125,7 +93,7 @@ group { name: "e/modules/cpufreq/main";
             for (new i = 2; i < numargs(); i++) {
                append_int(available_frequencies, getarg(i));
             }
-         } 
+         }
          else if ((type == MSG_STRING_SET) && (id == 2)) { // add a governor
             new text[100];
             while (count(available_governors) > 0) {
@@ -139,8 +107,8 @@ group { name: "e/modules/cpufreq/main";
             new f;
             new ani, curf, minf, maxf;
             new text[100];
-            
-            f = getarg(2);              
+
+            f = getarg(2);
             if (f < 1000000) {
                f += 500;
                snprintf(text, 100, "%i", f / 1000);
@@ -150,22 +118,22 @@ group { name: "e/modules/cpufreq/main";
                         (f % 1000000) / 100000);
             }
             set_text(PART:"readout", text);
-            
+
             ani = get_int(cur_freq_anim);
             if (ani > 0) cancel_anim(ani);
             ani = anim(0.25, "slide_cur_freq", 0);
             set_int(cur_freq_anim, ani);
-            
+
             f = getarg(2);
             curf = get_int(cur_freq_now);
             set_int(cur_freq_old, curf);
             set_int(cur_freq_new, f);
-            
+
             f = getarg(4);
             minf = get_int(min_freq_now);
             set_int(min_freq_old, minf);
             set_int(min_freq_new, f);
-            
+
             f = getarg(5);
             maxf = get_int(max_freq_now);
             set_int(max_freq_old, maxf);
@@ -185,22 +153,28 @@ group { name: "e/modules/cpufreq/main";
             color: 255 255 255 128;
          }
       }
-      part { name: "base-sh";
+      part { name: "clip1";
+         clip_to: "fade_clip";
          description { state: "default" 0.0;
             rel1.to: "base";
-            rel1.offset: 0 -1;
             rel2.to: "base";
-            rel2.offset: -1 -2;
-            image.normal: "inset_round_shadow.png";
+            image.normal: "cpu_clip1.png";
          }
       }
-      part { name: "base-hi";
+      part { name: "clip2";
+         clip_to: "fade_clip";
          description { state: "default" 0.0;
             rel1.to: "base";
-            rel1.offset: 0 1;
             rel2.to: "base";
-            rel2.offset: -1 0;
-            image.normal: "inset_round_hilight.png";
+            image.normal: "cpu_clip2.png";
+         }
+      }
+      part { name: "clip3";
+         clip_to: "fade_clip";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            image.normal: "cpu_clip3.png";
          }
       }
       part { name: "base";
@@ -208,43 +182,27 @@ group { name: "e/modules/cpufreq/main";
             rel1.relative: (25/380) (25/380);
             rel2.relative: (365/380) (365/380);
             aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "tacho_base.png";
+            image.normal: "cpu_base.png";
          }
       }
       part { name: "readout"; type: TEXT; mouse_events: 0;
          scale: 1;
-         effect: SHADOW BOTTOM;
          clip_to: "fade_clip";
          description { state: "default" 0.0;
-            rel1.to: "knob2";
-            rel1.relative: 1.0 1.0;
-            rel1.offset: -2 -2;
-            rel2.relative: 0.75 0.75;
-            color_class: "module_label";
-            color3: 255 255 255 255;
-            text { font: FNBOLD; size: 6;
-               align: 0.5 0.5;
+            rel1.relative: (56/144) (56/144);
+            rel2.relative: (88/144) (88/144);
+            color: 255 255 255 255;
+            text { font: FN; size: 6;
+               min: 1 1;
                ellipsis: -1;
                text_class: "module_small";
             }
          }
       }
-      part { name: "meter_min_sh"; mouse_events: 0;
-         clip_to: "fade_clip";
-         description { state: "default" 0.0;
-            image.normal: "tacho_hand_small_shadow.png";
-            rel1.to: "meter_sh";
-            rel2.to: "meter_sh";
-            map {
-               on: 1;
-               rotation.center: "meter_min_sh";
-            }
-         }
-      }
       part { name: "meter_min"; mouse_events: 0;
-         clip_to: "fade_clip";
+         clip_to: "clip3";
          description { state: "default" 0.0;
-            image.normal: "tacho_hand_small_min";
+            image.normal: "marker";
             color: 51 153 255 255;
             rel1.to: "base";
             rel2.to: "base";
@@ -254,23 +212,11 @@ group { name: "e/modules/cpufreq/main";
             }
          }
       }
-      part { name: "meter_max_sh"; mouse_events: 0;
-         clip_to: "fade_clip";
-         description { state: "default" 0.0;
-            image.normal: "tacho_hand_small_shadow.png";
-            rel1.to: "meter_sh";
-            rel2.to: "meter_sh";
-            map {
-               on: 1;
-               rotation.center: "meter_max_sh";
-            }
-         }
-      }
       part { name: "meter_max"; mouse_events: 0;
-         clip_to: "fade_clip";
+         clip_to: "clip1";
          description { state: "default" 0.0;
-            image.normal: "tacho_hand_small_min";
-            color: 255 153 51 255;
+            image.normal: "marker";
+            color: 255 0 0 255;
             rel1.to: "base";
             rel2.to: "base";
             map {
@@ -279,27 +225,11 @@ group { name: "e/modules/cpufreq/main";
             }
          }
       }
-      part { name: "meter_sh"; mouse_events: 0;
-         clip_to: "fade_clip";
-         description { state: "default" 0.0;
-            image.normal: "tacho_hand_big_shadow.png";
-            rel1.to: "meter";
-            rel1.relative: 0.0 (15/380);
-            rel1.offset: 0 1;
-            rel2.to: "meter";
-            rel2.relative: 1.0 (395/380);
-            rel2.offset: -1 0;
-            map {
-               on: 1;
-               rotation.center: "meter_sh";
-            }
-         }
-      }
       part { name: "meter"; mouse_events: 0;
-         clip_to: "fade_clip";
+         clip_to: "clip2";
          description { state: "default" 0.0000;
-            color: 255 0 0 255;
-            image.normal: "tacho_hand_big";
+            color: 255 153 51 255;
+            image.normal: "marker";
             rel1.to: "base";
             rel2.to: "base";
             map {
@@ -308,35 +238,6 @@ group { name: "e/modules/cpufreq/main";
             }
          }
       }
-      part { name: "over"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "inset_round_shading.png";
-         }
-      }
-      part { name: "knob"; type: SPACER;
-         description { state: "default" 0.0;
-            rel1.relative: (140/340) (140/340);
-            rel1.to: "base";
-            rel2.relative: (205/340) (205/340);
-            rel2.to: "base";
-            min: 4 4;
-            step: 2 2;
-            max: 24 24;
-         }
-      }
-      part { name: "knob2";
-         description { state: "default" 0.0;
-            rel1.offset: -4 -4;
-            rel1.to: "knob";
-            rel2.offset: 3 3;
-            rel2.to: "knob";
-            min: 12 12;
-            max: 32 32;
-            image.normal: "knob";
-         }
-      }
    }
    programs {
       program {
@@ -352,18 +253,3 @@ group { name: "e/modules/cpufreq/main";
    }
 }
 
-group { name: "e/gadget/cpuclock/main";
-   alias: "e/gadget/cpuclock/main_vert";
-   inherit: "e/modules/cpufreq/main";
-   parts {
-      part { name: "readout"; type: TEXT; mouse_events: 0;
-         scale: 1;
-         effect: SHADOW BOTTOM;
-         clip_to: "fade_clip";
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-      }
-   }
-}
-

data/elementary/themes/edc/cslider.edc

@@ -1,16 +1,16 @@
 group { name: "e/widgets/cslider";
-   images.image: "inset_shadow.png" COMP;
-   images.image: "bevel_in.png" COMP;
    images.image: "col_sel_end_bottom.png" COMP;
    images.image: "col_sel_end_top.png" COMP;
    images.image: "col_sel_end_left.png" COMP;
    images.image: "col_sel_end_right.png" COMP;
    parts {
       part { name: "bg"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
-            color: 48 48 48 255;
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            color: DARK_GREY_BG_COLOR;
+            offscale;
          }
       }
       part { name: "clipper"; type: RECT;
@@ -25,78 +25,36 @@ group { name: "e/widgets/cslider";
       }
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "clipper";
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 3 3;
-            rel2.offset: -4 -4;
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            offscale;
          }
       }
-      part { name: "e.dragable.cursor"; type: RECT;
-         clip_to: "clipper";
+      part { name: "e.dragable.cursor"; type: RECT; mouse_events: 0;
          dragable.confine: "e.swallow.content";
          dragable.x: 1 1 0;
          dragable.y: -1 1 0;
          description { state: "default" 0.0;
+            fixed: 1 1;
             min: 1 1;
             max: 1 1;
-            fixed: 1 1;
             visible: 0;
             rel1.to: "e.swallow.content";
             rel1.relative: 0.5 0.0;
             rel2.to: "e.swallow.content";
             rel2.relative: 0.5 0.5;
-            color: 255 255 255 150;
-         }
-      }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            fill.smooth: 0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "end1"; mouse_events: 0;
-         clip_to: "clipper";
-         description { state: "default" 0.0;
-            image.normal: "col_sel_end_top.png";
-            FIXED_SIZE(11, 8)
-            align: 0.5 0.0;
-            rel1.to: "cursor";
-            rel2.to: "cursor";
-         }
-         description { state: "vertical" 0.0;
-            inherit: "default" 0.0;
-            image.normal: "col_sel_end_left.png";
-            FIXED_SIZE(8, 11)
-            align: 0.0 0.5;
-         }
-      }
-      part { name: "end2"; mouse_events: 0;
-         clip_to: "clipper";
-         description { state: "default" 0.0;
-            image.normal: "col_sel_end_bottom.png";
-            FIXED_SIZE(11, 8)
-            align: 0.5 1.0;
-            rel1.to: "cursor";
-            rel2.to: "cursor";
-         }
-         description { state: "vertical" 0.0;
-            inherit: "default" 0.0;
-            image.normal: "col_sel_end_right.png";
-            FIXED_SIZE(8, 11)
-            align: 1.0 0.5;
          }
       }
       part { name: "cursor"; type: RECT; mouse_events: 0;
+         clip_to: "clipper";
          description { state: "default" 0.0;
             rel1.to_x: "e.dragable.cursor";
             rel1.to_y: "e.swallow.content";
             rel2.to_x: "e.dragable.cursor";
             rel2.to_y: "e.swallow.content";
-            color: 255 255 255 150;
+            color: 255 255 255 192;
          }
          description { state: "vertical" 0.0;
             inherit: "default" 0.0;
@@ -106,41 +64,22 @@ group { name: "e/widgets/cslider";
             rel2.to_y: "e.dragable.cursor";
          }
       }
-      part { name: "inset"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel1.offset: -1 -1;
-            rel2.to: "bg";
-            rel2.offset: 0 0;
-            fill.smooth: 0;
-         }
-      }
    }
    programs {
-      program {
-         signal: "e,state,direction,v"; source: "e";
+      program { signal: "e,state,direction,v"; source: "e";
          action: STATE_SET "vertical" 0.0;
          target: "cursor";
-         target: "end1";
-         target: "end2";
       }
-      program {
-         signal: "mouse,clicked,1"; source: "inset";
+      program { signal: "mouse,clicked,1"; source: "inset";
          action: SIGNAL_EMIT "e,action,click" "";
       }
-      program {
-         signal: "e,state,disabled"; source: "e";
+      program { signal: "e,state,disabled"; source: "e";
          action: STATE_SET "disabled" 0.0;
          target: "clipper";
       }
-      program {
-         signal: "e,state,enabled"; source: "e";
+      program { signal: "e,state,enabled"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "clipper";
       }
    }
 }
-         

data/elementary/themes/edc/desklock.edc

@@ -1,22 +1,37 @@
 group { name: "e/desklock/background";
-   images.image: "bg_radgrad.png" COMP;
-   images.image: "dot_pattern.png" COMP;
+   data.item: "hide_signal" "1";
    parts {
-      part { name: "bg";
+      part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            image.normal: "bg_radgrad.png";
-            image.scale_hint: STATIC;
-            fill.smooth: 0;
-            ASPECT_FILL((1024/653))
+            color: 255 255 255 0;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            color: 255 255 255 255;
+            visible: 1;
          }
       }
-      part { name: "pat";
+      part { name: "bg"; type: RECT;
+         clip_to: "clip";
          description { state: "default" 0.0;
-            image.normal: "dot_pattern.png";
-            TILED_PATTERN(256, 256)
+            color: 48 48 48 255;
+         }
+      }
+      program { signal: "show"; source: "";
+         action: STATE_SET "visible" 0.0;
+         transition: SINUSOIDAL 0.5;
+         target: "clip";
+      }
+      program { signal: "e,action,hide"; source: "e";
+         action: STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 0.5;
+         target: "clip";
+         sequence {
+            action: SIGNAL_EMIT "e,action,hide,done" "e";
          }
       }
       part { name: "e.swallow.login_box"; type: SWALLOW;
+         clip_to: "clip";
          description { state: "default" 0.0;
          }
       }
@@ -24,13 +39,16 @@ group { name: "e/desklock/background";
 }
 
 group { name: "e/desklock/login_box";
-   images.image: "inset_shadow.png" COMP;
-   images.image: "bevel_in.png" COMP;
-   images.image: "white_bar_vert_glow.png" COMP;
-   images.image: "logo_blue_small.png" COMP;
-   images.image: "logo_blue_small_glow.png" COMP;
-   images.image: "knob_round_busy.png" COMP;
-   images.image: "glow_round_corners.png" COMP;
+   set { name: "logo_mono";
+      image { image: "logo.png" COMP;  size: 601 601 99999 99999; }
+      image { image: "logo2.png" COMP; size: 301 301   600   600; }
+      image { image: "logo3.png" COMP; size: 151 151   300   300; }
+      image { image: "logo4.png" COMP; size:  76  76   150   150; }
+      image { image: "logo5.png" COMP; size:  0    0    75    75; }
+   }
+   IMAGE_RING("ringa", 160)
+   IMAGE_RING("ringb", 160)
+   IMAGE_RING("ringc", 160)
    parts {
       part { name: "logo_clip"; type: RECT;
          description { state: "default";
@@ -41,43 +59,28 @@ group { name: "e/desklock/login_box";
             visible: 0;
          }
       }
-      part { name: "logo"; clip_to: "logo_clip";
-         description { state: "default" 0.0;
-            image.normal: "logo_blue_small.png";
-            rel1.relative: 0.5 0.5;
-            rel2.relative: 0.5 0.5;
-            FIXED_SIZE(100, 127)
-         }
-      }
-      part { name: "logo_glow"; clip_to: "logo_clip";
-         description { state: "default" 0.0;
-            image.normal: "logo_blue_small_glow.png";
-            rel1.to: "logo";
-            rel2.to: "logo";
-            color: 255 255 255 128;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "bg"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "inset";
-            rel1.offset: 1 1;
-            rel2.to: "inset";
-            rel2.offset: -2 -2;
-            color: 48 48 48 255;
-         }
-      }
       part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+            rel1.to_x: "logo";
+            rel1.to_y: "e.text.password";
+            rel1.relative: 0.3 0.0;
+            rel1.offset: -100 -4;
+            rel2.to_x: "logo";
+            rel2.to_y: "e.text.password";
+            rel2.relative: 0.7 1.0;
+            rel2.offset: 99 196;
+         }
+      }
+      part { name: "logo"; clip_to: "logo_clip";
+         scale: 1;
+         description { state: "default" 0.0;
+            image.normal: "logo_mono";
+            rel1.relative: 0.5 0.5;
+            rel2.relative: 0.5 0.5;
+            FIXED_SIZE(150, 150)
          }
       }
       part { name: "e.text.title"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 0.0 1.0;
@@ -98,7 +101,6 @@ group { name: "e/desklock/login_box";
          }
       }
       part { name: "e.text.hint"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 0.0 1.0;
@@ -107,7 +109,7 @@ group { name: "e/desklock/login_box";
             rel2.relative: 1.0 1.0;
             rel2.offset: -4 3;
             rel2.to_y: "e.text.password";
-            color: FN_COL_DEFAULT;
+            color: 160 160 160 255;
             align: 0.5 0.0;
             text { font: FNBD; size: 10;
                min: 1 1;
@@ -131,20 +133,18 @@ group { name: "e/desklock/login_box";
          }
       }
       part { name: "e.text.password"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          clip_to: "clipper";
          description { state: "default" 0.0;
             rel1.relative: 0.0 1.0;
             rel1.offset: 3 10;
-            rel1.to_x: "inset";
+            rel1.to_x: "clipper";
             rel1.to_y: "e.text.title";
             rel2.relative: 0.0 1.0;
             rel2.offset: 3 10;
-            rel2.to_x: "inset";
+            rel2.to_x: "clipper";
             rel2.to_y: "e.text.title";
-            color: FN_COL_DEFAULT;
-            color_class: "desklock_passwd";
+            color: 255 255 255 255;
             align: 0.0 0.0;
             text { font: FN; size: 10;
                min: 1 1;
@@ -155,113 +155,40 @@ group { name: "e/desklock/login_box";
             fixed: 1 1;
          }
       }
-      part { name: "cursor"; mouse_events: 0;
+      part { name: "cursor"; type: RECT; mouse_events: 0;
          clip_to: "clipper";
          description { state: "default" 0.0;
             rel1.to: "e.text.password";
             rel1.relative: 1.0 0.0;
-            rel1.offset: -4 -4;
+            rel1.offset: 0 -4;
             rel2.to: "e.text.password";
-            rel2.offset: 3 3;
-            image.normal: "white_bar_vert_glow.png";
-            image.border: 4 4 4 4;
-            fill.smooth: 0;
-            color: 255 255 255 0;
-            min: 9 10;
+            rel2.offset: -1 3;
+            color: 255 255 255 255;
+            min: 1 10;
             fixed: 1 1;
+            visible: 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "shadow"; mouse_events: 0; repeat_events: 1;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            fill.smooth: 0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "inset"; mouse_events: 0; repeat_events: 1;
-         description { state: "default" 0.0;
-            rel1.relative: 0.5 0.0;
-            rel1.offset: -100 -4;
-            rel1.to_x: "logo";
-            rel1.to_y: "e.text.password";
-            rel2.relative: 0.5 1.0;
-            rel2.offset: 99 3;
-            rel2.to_x: "logo";
-            rel2.to_y: "e.text.password";
-            align: 0.5 0.5;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "busy_clip"; type: RECT;
-         description { state: "default" 0.0;
-            visible: 0;
-            color: 255 255 255 0;
-         }
-         description { state: "active" 0.0;
             visible: 1;
-            color: 255 255 255 255;
          }
       }
-      part { name: "knob"; mouse_events: 0;
-         clip_to: "busy_clip";
+      part { name: "busy_area"; type: SPACER;
          description { state: "default" 0.0;
-            fixed: 1 1;
-            image.normal: "knob_round_busy.png";
-            min: 40 40;
-            max: 40 40;
-            rel1.relative: 0.5 1.0;
-            rel1.offset: 0 3;
-            rel1.to_y: "inset";
-            rel2.relative: 0.5 1.0;
-            rel2.offset: -1 3;
-            rel2.to_y: "inset";
+            min: 20 20;
+            max: 160 160;
+            rel1.to: "clipper";
+            rel1.relative: 0.0 0.5;
+            rel2.to: "clipper";
             align: 0.5 0.0;
-            fixed: 1 1;
          }
       }
-      part { name: "knob_spinner"; mouse_events: 0;
-         clip_to: "busy_clip";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "knob";
-            rel2.to: "knob";
-            image.normal: "glow_round_corners.png";
-            map.on: 1;
-            map.smooth: 1;
-            map.rotation.center: "knob";
-         }
-         description { state: "spin" 0.0;
-            inherit: "default" 0.0;
-            map.rotation.z: 360;
-         }
+      program { signal: "e,action,hide"; source: "e";
+         action: SIGNAL_EMIT "e,state,invalid" "e";
       }
+      BUSY("busy_area", "e,state,checking", "e", "e,state,invalid", "e")
    }
    programs {
-      program { name: "logo_pulse";
-         signal: "show"; source: "";
-         in: 3.0 5.0;
-         action: STATE_SET "active" 0.0;
-         target: "logo_glow";
-         transition: BOUNCE 0.8 0.5 6;
-         after: "logo_pulse2";
-      }
-      program { name: "logo_pulse2";
-         action: STATE_SET "default" 0.0;
-         target: "logo_glow";
-         transition: SINUSOIDAL 2.4;
-         after: "logo_pulse";
-      }
       program { name: "cursor_show";
          signal: "show"; source: "";
          action: STATE_SET "visible" 0.0;
@@ -271,52 +198,16 @@ group { name: "e/desklock/login_box";
       program { name: "cursor_hide";
          action: STATE_SET "default" 0.0;
          target: "cursor";
-         transition: SINUSOIDAL 0.2;
          after: "cursor_hide_timer";
       }
       program { name: "cursor_show_timer";
-         in: 0.5 0.0;
+         in: 0.4 0.0;
          after: "cursor_hide";
       }
       program { name: "cursor_hide_timer";
-         in: 0.2 0.0;
+         in: 0.4 0.0;
          after: "cursor_show";
       }
-      program { name: "spin";
-         signal: "e,state,checking"; source: "e";
-         action: STATE_SET "spin" 0.0;
-         transition: LINEAR 1.0;
-         target: "knob_spinner";
-         after: "spin2";
-      }
-      program { name: "spin2";
-         action: STATE_SET "default" 0.0;
-         target: "knob_spinner";
-         after: "spin";
-      }
-      program {
-         signal: "e,state,checking"; source: "e";
-         action: STATE_SET "active" 0.0;
-         transition: SINUSOIDAL 0.25;
-         target: "busy_clip";
-      }
-      program {
-         signal: "e,state,invalid"; source: "e";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 1.0;
-         target: "busy_clip";
-         after: "spin3";
-      }
-      program { name: "spin3";
-         action: ACTION_STOP;
-         target: "spin";
-         target: "spin2";
-         after: "spin4";
-      }
-      program { name: "spin4";
-         action: STATE_SET "default" 0.0;
-         target: "knob_spinner";
-      }
       program {
          signal: "e,state,selected"; source: "e";
          action: STATE_SET "active" 0.0;
@@ -341,14 +232,13 @@ group { name: "e/desklock/login_box";
 group { name: "e/desklock/pin_box";
    parts {
       part { name: "e.text.title"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.offset: 3 3;
             rel1.relative: 0.0 1.0;
             rel1.to_y: "e.swallow.buttons";
             rel2.offset: -4 -3;
-            color: FN_COL_DEFAULT;
+            color: 160 160 160 255;
             align: 0.5 0.0;
             text { font: "Sans:style=Bold"; size: 10;
                min: 0 1;
@@ -372,15 +262,13 @@ group { name: "e/desklock/pin_box";
          }
       }
       part { name: "e.text.password"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 0.5 0.0;
             rel1.offset: 3 2;
             rel2.relative: 0.5 0.0;
             rel2.offset: 3 -2;
-            color: FN_COL_DEFAULT;
-            color_class: "desklock_passwd";
+            color: 255 255 255 255;
             text { font: "Sans"; size: 10;
                min: 1 1;
                ellipsis: -1;
@@ -390,18 +278,15 @@ group { name: "e/desklock/pin_box";
             fixed: 1 1;
          }
       }
-      part { name: "cursor"; mouse_events: 0;
+      part { name: "cursor"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
             rel1.to: "e.text.password";
             rel1.relative: 1.0 0.0;
-            rel1.offset: -4 -4;
+            rel1.offset: 0 0;
             rel2.to: "e.text.password";
-            rel2.offset: 3 3;
-            image.normal: "white_bar_vert_glow.png";
-            image.border: 4 4 4 4;
-            fill.smooth: 0;
+            rel2.offset: 1 -1;
             color: 255 255 255 0;
-            min: 9 10;
+            min: 1 3;
             fixed: 1 1;
          }
          description { state: "visible" 0.0;

data/elementary/themes/edc/deskmirror.edc

@@ -2,24 +2,15 @@ group { name: "e/deskmirror/frame/default";
    alias: "e/deskmirror/frame/dialog";
    alias: "e/deskmirror/frame/urgent";
    alias: "e/deskmirror/frame/sparkle";
-   images.image: "mini_box_bevel_shadow.png" COMP;
-   images.image: "shine.png" COMP;
-   images.image: "vgrad_med_lighter.png" COMP;
-   images.image: "vgrad_med_dark.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "bevel_dark_out.png" COMP;
+   images.image: "pager_mini_win_shadow.png" COMP;
    script {
       public message(Msg_Type:type, id, ...) {
          if ((type == MSG_FLOAT) && (id == 0)) {
             new Float:sc = getfarg(2);
-            
+
             custom_state(PART:"top_spacer", "default", 0.0);
             set_state_val(PART:"top_spacer", STATE_REL2, 1.0, sc);
             set_state(PART:"top_spacer", "custom", 0.0);
-            
-            custom_state(PART:"bottom_spacer", "default", 0.0);
-            set_state_val(PART:"bottom_spacer", STATE_REL1, 0.0, 1.0 - sc);
-            set_state(PART:"bottom_spacer", "custom", 0.0);
          }
       }
    }
@@ -28,6 +19,7 @@ group { name: "e/deskmirror/frame/default";
          description { state: "default";
          }
          description { state: "iconic";
+            inherit: "default" 0.0;
             rel1.relative: 0.0 1.0;
             rel2.relative: 0.0 1.0;
          }
@@ -36,32 +28,30 @@ group { name: "e/deskmirror/frame/default";
          description { state: "default" 0.0;
             rel1.to: "spacer";
             rel2.to_x: "spacer";
-            rel2.to_y: "title2";
+            rel2.to_y: "e.text.title";
             rel2.offset: -1 -4;
             align: 0.5 0.0;
          }
       }
-      part { name: "bottom_spacer"; type: SPACER;
-         description { state: "default" 0.0;
-            rel1.to: "bottom_size";
-            rel2.to: "bottom_size";
-            align: 0.5 1.0;
-         }
-      }
       part { name: "bottom_size"; type: SPACER;
          description { state: "default" 0.0;
             rel1.to_x: "spacer";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 0 -3;
+            rel1.offset: 0 -1;
             rel2.to: "spacer";
             min: 0 1;
             fixed: 0 1;
          }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            min: 0 0;
+            max: 0 0;
+         }
       }
       part { name: "shadow";
          mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "mini_box_bevel_shadow.png";
+            image.normal: "pager_mini_win_shadow.png";
             image.border: 7 7 7 7;
             image.middle: 0;
             rel1.to: "top";
@@ -69,14 +59,14 @@ group { name: "e/deskmirror/frame/default";
             rel2.to: "bottom";
             rel2.offset: 4 4;
             fill.smooth: 0;
+            color: 255 255 255 128;
          }
          description { state: "off";
             inherit: "default" 0.0;
             visible: 0;
          }
       }
-      
-      
+
       part { name: "client_clip"; type: RECT;
          description { state: "default" 0.0;
             rel1.to_y: "top";
@@ -94,19 +84,30 @@ group { name: "e/deskmirror/frame/default";
             rel2.relative: 1.0 0.0;
          }
       }
-      
+
+      part { name: "top"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "top_spacer";
+            rel2.to: "top_spacer";
+            color: 64 64 64 255;
+            min: 0 1;
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            color: 32 32 32 255;
+         }
+      }
+
       part { name: "e.text.title"; type: TEXT; mouse_events: 0;
          scale: 1;
-         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            color_class: "border_title";
             rel1.offset: 1 3;
             rel1.to: "spacer";
             rel2.relative: 1.0 0.0;
             rel2.offset: -2 3;
             rel2.to: "spacer";
             align: 0.5 0.0;
-            color: FN_COL_DISABLE;
+            color: 160 160 160 255;
             text { font: FNBD; size: 10;
                text_class: "title_bar";
                align: 0.5 0.0;
@@ -115,71 +116,25 @@ group { name: "e/deskmirror/frame/default";
             visible: 0;
             fixed: 0 1;
          }
-      }
-      part { name: "title2"; type: TEXT; mouse_events: 0;
-         scale: 1;
-         effect: SOFT_SHADOW BOTTOM;
-         description { state: "default" 0.0;
-            color_class: "border_title_active";
-            rel1.offset: 1 2;
-            rel1.to: "spacer";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "spacer";
-            align: 0.5 0.0;
-            color: FN_COL_DEFAULT_SOFT_SHADOW;
-            text { font: FNBD; size: 10;
-               text_source: "e.text.title";
-               text_class: "title_bar";
-               align: 0.5 0.0;
-               min: 0 1;
-            }
-            visible: 0;
-            fixed: 0 1;
-         }
-      }
-      
-      part { name: "top";
-         description { state: "default" 0.0;
-            color_class: "border_top";
-            image.normal: "vgrad_med_lighter.png";
-            fill.smooth: 0;
-            TILED_HORIZ(120)
-            rel1.to: "top_spacer";
-            rel2.to: "top_spacer";
-            min: 0 1;
-         }
-      }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "top";
-            rel2.to: "top";
-            fill.smooth: 0;
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
          }
       }
 
       part { name: "bottom"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color_class: "border_bottom";
-            rel1.to: "bottom_spacer";
-            rel2.to: "bottom_spacer";
+            rel1.to: "bottom_size";
+            rel2.to: "bottom_size";
             color: 64 64 64 255;
          }
-      }
-      part { name: "bevel2"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_dark_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "bottom";
-            rel2.to: "bottom";
-            fill.smooth: 0;
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            max: 0 0;
+            visible: 0;
          }
       }
-      
+
       part { name: "clone"; type: PROXY; mouse_events: 0;
          description { state: "default";
             source: "e.swallow.client";
@@ -204,18 +159,6 @@ group { name: "e/deskmirror/frame/default";
             proxy.source_clip: 0;
          }
       }
-      part { name: "shine"; mouse_events: 0;
-         description { state: "default" 0.0;
-            fixed: 0 1;
-            image.normal: "shine.png";
-            rel1.offset: 0 -1;
-            rel1.to: "top";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 1;
-            rel2.to: "top";
-            max: 69 3;
-         }
-      }
    }
    programs {
       program { name: "urgent";
@@ -261,44 +204,27 @@ group { name: "e/deskmirror/frame/default";
       program {
          name: "focus";
          signal: "e,state,focused"; source: "e";
-         script {
-            custom_state(PART:"top", "default", 0.0);
-            set_state_val(PART:"top", STATE_IMAGE, get_image_id("vgrad_med_dark.png"));
-            set_state(PART:"top", "custom", 0.0);
-         }
+         action: STATE_SET "focused" 0.0;
+         target: "e.text.title";
+         target: "top";
       }
       program {
          name: "unfocus";
          signal: "e,state,unfocused"; source: "e";
-         script {
-            custom_state(PART:"top", "default", 0.0);
-            set_state_val(PART:"top", STATE_IMAGE, get_image_id("vgrad_med_lighter.png"));
-            set_state(PART:"top", "custom", 0.0);
-         }
+         action: STATE_SET "default" 0.0;
+         target: "e.text.title";
+         target: "top";
       }
       program {
          name: "shade";
          signal: "e,state,shaded"; source: "e";
-         script {
-            custom_state(PART:"bottom", "default", 0.0);
-            set_state_val(PART:"bottom", STATE_VISIBLE, 0);
-            set_state(PART:"bottom", "custom", 0.0);
-            custom_state(PART:"bevel2", "default", 0.0);
-            set_state_val(PART:"bevel2", STATE_VISIBLE, 0);
-            set_state(PART:"bevel2", "custom", 0.0);
-         }
+         action: STATE_SET "hidden" 0.0;
+         target: "bottom";
       }
       program {
          signal: "e,state,maximize*"; source: "e";
-         script {
-            custom_state(PART:"bottom", "default", 0.0);
-            set_state_val(PART:"bottom", STATE_VISIBLE, 0);
-            set_state_val(PART:"bottom", STATE_MAX, 0, 0);
-            set_state(PART:"bottom", "custom", 0.0);
-            custom_state(PART:"bevel2", "default", 0.0);
-            set_state_val(PART:"bevel2", STATE_VISIBLE, 0);
-            set_state(PART:"bevel2", "custom", 0.0);
-         }
+         action: STATE_SET "hidden" 0.0;
+         target: "bottom";
       }
       program {
          signal: "e,state,unmaximize*"; source: "e";
@@ -311,15 +237,8 @@ group { name: "e/deskmirror/frame/default";
       program {
          name: "unshade";
          signal: "e,state,unshading"; source: "e";
-         script {
-            custom_state(PART:"bottom", "default", 0.0);
-            set_state_val(PART:"bottom", STATE_VISIBLE, 1);
-            set_state_val(PART:"bottom", STATE_MAX, 99999, 99999);
-            set_state(PART:"bottom", "custom", 0.0);
-            custom_state(PART:"bevel2", "default", 0.0);
-            set_state_val(PART:"bevel2", STATE_VISIBLE, 1);
-            set_state(PART:"bevel2", "custom", 0.0);
-         }
+         action: STATE_SET "default" 0.0;
+         target: "bottom";
       }
       program { name: "iconify";
          action: STATE_SET "iconic" 0.0;
@@ -366,11 +285,6 @@ group { name: "e/deskmirror/frame/noresize";
             visible: 0;
          }
       }
-      part { name: "bevel2";
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-      }
    }
 }
 
@@ -394,11 +308,6 @@ group { name: "e/deskmirror/frame/noresize_dialog";
             visible: 0;
          }
       }
-      part { name: "bevel2";
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-      }
    }
 }
 
@@ -413,7 +322,6 @@ group { name: "e/deskmirror/frame/pixel";
       part { name: "frame"; type: RECT;
          description { state: "default" 0.0;
             color: 0 0 0 255;
-            rel2.offset: 0 0;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
@@ -424,6 +332,48 @@ group { name: "e/deskmirror/frame/pixel";
          clip_to: "client_clip";
          description { state: "default" 0.0;
             rel1.offset: 1 1;
+            rel2.offset: -2 -2;
+         }
+      }
+   }
+   programs {
+      program {
+         name: "focus";
+         signal: "e,state,focused"; source: "e";
+         action: STATE_SET "focused" 0.0;
+         target: "frame";
+      }
+      program {
+         name: "unfocus";
+         signal: "e,state,unfocused"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "frame";
+      }
+   }
+}
+
+group { name: "e/deskmirror/frame/tiling";
+   parts {
+      part { name: "client_clip"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "e.swallow.client";
+            rel2.to: "e.swallow.client";
+         }
+      }
+      part { name: "frame"; type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+            rel1.offset: -1 -1;
+            rel2.offset: 0 0;
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            color: 51 153 255 255;
+         }
+      }
+      part { name: "e.swallow.client"; type: SWALLOW;
+         clip_to: "client_clip";
+         description { state: "default" 0.0;
          }
       }
    }

data/elementary/themes/edc/deskpreview.edc

@@ -1,14 +1,8 @@
 group { name: "e/widgets/deskpreview/desk";
    inherit: "e/widgets/preview";
    parts {
-      part { name: "e.swallow.content";
-         description { state: "default" 0.0;
-            rel1.offset: 3 3;
-            rel2.offset: -4 -4;
-         }
-      }
       part { name: "e.event.menu"; type: RECT;
-         insert_after: "inset";
+         insert_after: "e.swallow.content";
          description { state: "default" 0.0;
             color: 0 0 0 0;
          }

data/elementary/themes/edc/dialog.edc

@@ -1,51 +1,42 @@
 group { name: "e/widgets/dialog/main";
-   images.image: "bevel_dark_out.png" COMP;
-   images.image: "separator_horiz.png" COMP;
    parts {
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            color_class: "dialog_base";
             color: 64 64 64 255;
          }
       }
-      part { name: "bevel";
+      part { name: "separator"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "bevel_dark_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "separator"; mouse_events: 0;
-         description { state: "default" 0.0;
-            min: 16 2;
-            max: 99999 2;
+            min: 16 1;
+            max: 99999 1;
             rel1.relative: 0.0 1.0;
             rel1.offset: 0 0;
             rel1.to_y: "e.swallow.content";
             rel2.relative: 1.0 0.0;
             rel2.offset: -1 -1;
             rel2.to_y: "e.swallow.buttons";
-            image.normal: "separator_horiz.png";
-            fill.smooth: 0;
+            color: 72 72 72 255;
             fixed: 0 1;
             link.base: "e,state,buttons,on" "e";
+            visible: 1;
          }
          desc { "hid"; hid;
-            image.normal: "separator_horiz.png";
+            visible: 0;
             link.base: "e,state,buttons,off" "e";
          }
       }
       part { name: "e.swallow.icon"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
             align: 0.0 0.5;
             rel1.relative: 0.0 0.0;
-            rel1.offset: 4 4;
+            rel1.offset: 8 8;
             rel2.relative: 0.0 1.0;
             rel2.offset: -1 0;
             rel2.to_y: "button_spacer";
             fixed: 1 0;
             visible: 0;
+            offscale;
          }
          description { state: "icon" 0.0;
             inherit: "default" 0.0;
@@ -53,12 +44,14 @@ group { name: "e/widgets/dialog/main";
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 4 4;
+            rel1.offset: 8 8;
             rel1.to_x: "base";
             rel2.to_x: "base";
-            rel2.offset: -5 -1;
+            rel2.offset: -9 -1;
             rel2.to_y: "button_spacer";
+            offscale;
          }
          description { state: "icon" 0.0;
             inherit: "default" 0.0;
@@ -67,11 +60,13 @@ group { name: "e/widgets/dialog/main";
          }
       }
       spacer { "button_spacer";
+         scale: 1;
          desc {
             rel2.relative: 1.0 0.0;
-            rel2.offset: -5 -8;
+            rel2.offset: -9 -17;
             rel2.to_y: "e.swallow.buttons";
             link.base: "e,state,buttons,on" "e";
+            offscale;
          }
          desc { "hid";
             link.base: "e,state,buttons,off" "e";
@@ -79,13 +74,15 @@ group { name: "e/widgets/dialog/main";
          }
       }
       part { name: "e.swallow.buttons"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
             align: 0.5 1.0;
             rel1.relative: 0.0 1.0;
-            rel1.offset: 4 -5;
+            rel1.offset: 8 -9;
             rel2.relative: 1.0 1.0;
-            rel2.offset: -5 -5;
+            rel2.offset: -9 -9;
             fixed: 0 1;
+            offscale;
          }
          desc { "hid"; hid; }
       }
@@ -109,7 +106,7 @@ group { name: "e/widgets/dialog/main";
 group { name: "e/widgets/dialog/text";
    styles {
       style { name: "dialog_style";
-         base: "font="FN" font_size=10 text_class=tb_plain align=center color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word";
+         base: "font="FN" font_size=10 text_class=tb_plain align=center color=#a0a0a0 wrap=word";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD" text_class=tb_light";
       }

data/elementary/themes/edc/edgebindings.edc

@@ -13,7 +13,7 @@ group { name: "e/modules/conf_edgebindings/selection";
    images.image: "mini_blue_glow_arrow_3.png" COMP;
    styles {
       style { name: "edge_binding_style";
-         base: "font="FN" font_size=10 text_class=tb_plain align=center color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word";
+         base: "font="FN" font_size=10 text_class=tb_plain align=center color=#a0a0a0 wrap=word";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD" text_class=tb_light";
       }
@@ -21,166 +21,113 @@ group { name: "e/modules/conf_edgebindings/selection";
    parts {
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.background";
-            rel2.to: "e.swallow.background";
-            color: 48 48 48 255;
+            rel.to: "e.swallow.background";
+            color: DARK_GREY_BG_COLOR;
          }
       }
-      part { name: "pat";
+      part { name: "e.swallow.background"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "dot_pattern.png";
-            TILED_PATTERN(256, 256)
-         }
-      }
-      part { name: "e.swallow.background";
-         type: SWALLOW;
-         description { state: "default" 0.0;
-            min: 160 120;
+            min: 320 180;
             align: 0 0.5;
-            rel1.offset: 4 4;
+            rel1.offset: 2 2;
             rel2.relative: 0.5 1.0;
-            rel2.offset: -2 -5;
-         }
-      }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.offset: -10 -6;
-            rel1.to: "e.text.selection";
-            rel2.offset: 9 5;
-            rel2.to: "e.text.selection";
-            image.normal: "darken_square.png";
-            image.border: 6 6 6 6;
-            fill.smooth: 0;
-            fixed: 1 1;
+            rel2.offset: -3 -3;
+            offscale;
          }
       }
       part { name: "e.text.selection"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
+            rel.to: "e.swallow.background";
             rel1.relative: 0.5 0.5;
-            rel1.to: "e.swallow.background";
             rel2.relative: 0.5 0.5;
-            rel2.to: "e.swallow.background";
-            color: FN_COL_DEFAULT;
-            color_class: "label_text";
+            color: 255 255 255 255;
             fixed: 1 1;
-            text { font: FN; size: 10;
+            text { font: FNBD; size: 10;
                text_class: "label";
                min: 1 1;
                ellipsis: -1;
             }
          }
       }
-      part { name: "shadow"; mouse_events: 0;
+      part { name: "e.edge.left"; type: RECT;
          description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            fill.smooth: 0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "e.edge.left";
-         description { state: "default" 0.0;
-            rel1.to: "e.swallow.background";
+            rel.to: "e.swallow.background";
             rel1.offset: 0 10;
-            rel2.to: "e.swallow.background";
             rel2.offset: -1 -11;
-            image.normal: "downlight_glow_right.png";
-            image.border: 3 0 0 0;
-            max: 24 99999;
             align: 0.0 0.5;
+            max: 5 99999;
+            color: 51 153 255 255;
          }
       }
-      part { name: "e.edge.right";
+      part { name: "e.edge.right"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.background";
+            rel.to: "e.swallow.background";
             rel1.offset: 0 10;
-            rel2.to: "e.swallow.background";
             rel2.offset: -1 -11;
-            image.normal: "downlight_glow_left.png";
-            image.border: 0 3 0 0;
-            max: 24 99999;
             align: 1.0 0.5;
+            max: 5 99999;
+            color: 51 153 255 255;
          }
       }
-      part { name: "e.edge.top";
+      part { name: "e.edge.top"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.background";
+            rel.to: "e.swallow.background";
             rel1.offset: 10 0;
-            rel2.to: "e.swallow.background";
             rel2.offset: -11 -1;
-            image.normal: "downlight_glow.png";
-            image.border: 0 0 3 0;
-            max: 99999 24;
             align: 0.5 0.0;
+            max: 99999 5;
+            color: 51 153 255 255;
          }
       }
-      part { name: "e.edge.bottom";
+      part { name: "e.edge.bottom"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.background";
+            rel.to: "e.swallow.background";
             rel1.offset: 10 0;
-            rel2.to: "e.swallow.background";
             rel2.offset: -11 -1;
-            image.normal: "downlight_glow_up.png";
-            image.border: 0 0 0 3;
-            max: 99999 24;
             align: 0.5 1.0;
+            max: 99999 5;
+            color: 51 153 255 255;
          }
       }
-      
+
       part { name: "e.edge.top_left";
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.background";
-            rel2.to: "e.swallow.background";
+            rel.to: "e.swallow.background";
             max: 10 10;
             image.normal: "mini_blue_glow_arrow_2.png";
             align: 0.0 0.0;
+            color: 51 153 255 255;
          }
       }
       part { name: "e.edge.top_right";
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.background";
-            rel2.to: "e.swallow.background";
+            rel.to: "e.swallow.background";
             max: 10 10;
             image.normal: "mini_blue_glow_arrow_3.png";
             align: 1.0 0.0;
+            color: 51 153 255 255;
          }
       }
       part { name: "e.edge.bottom_right";
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.background";
-            rel2.to: "e.swallow.background";
+            rel.to: "e.swallow.background";
             max: 10 10;
             image.normal: "mini_blue_glow_arrow_0.png";
             align: 1.0 1.0;
+            color: 51 153 255 255;
          }
       }
       part { name: "e.edge.bottom_left";
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.background";
-            rel2.to: "e.swallow.background";
+            rel.to: "e.swallow.background";
             max: 10 10;
             image.normal: "mini_blue_glow_arrow_1.png";
             align: 0.0 1.0;
+            color: 51 153 255 255;
          }
       }
-      part { name: "inset";
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel1.offset: -1 -1;
-            rel2.to: "bg";
-            rel2.offset: 0 0;
-            fill.smooth: 0;
-         }
-      }
+
       part { name: "e.box"; type: BOX;
          description { state: "default" 0.0;
             rel1 {

data/elementary/themes/edc/efl/calendar.edc

@@ -152,7 +152,7 @@
          rel2.to: "cit_"#_pos"_selected"; \
          rel2.offset: -2 -2; \
          image.normal: "diagonal_stripes.png"; \
-         color: 255 255 255 25; \
+         color: 51 153 255 25; \
          TILED_PATTERN(240, 240) \
          color_class: "calendar_day_selected"; \
          visible: 0; \
@@ -166,9 +166,9 @@
       description { state: "default" 0.0; \
          rel1.to: "cit_"#_pos"_rect"; \
          rel2.to: "cit_"#_pos"_rect"; \
-         image.normal: "outline_glow.png"; \
+         image.normal: "outline.png"; \
          image.border: 4 4 4 4; \
-         color_class: "calendar_day_selected"; \
+         color: 51 153 255 255; \
          visible: 0; \
       } \
       description { state: "selected" 0.0; \
@@ -180,9 +180,9 @@
       description { state: "default" 0.0; \
          rel1.to: "cit_"#_pos"_rect"; \
          rel2.to: "cit_"#_pos"_rect"; \
-         image.normal: "outline_glow.png"; \
+         image.normal: "outline.png"; \
          image.border: 4 4 4 4; \
-         color: 255 255 255 128; \
+         color: 51 153 255 255; \
          color_class: "calendar_day_highlighted"; \
          visible: 0; \
       } \
@@ -426,7 +426,7 @@ group { "efl/calendar"; data.item: "version" "123";
    images.image: "sym_left_glow_normal.png" COMP;
    images.image: "sym_right_glow_normal.png" COMP;
    images.image: "icon_border_remember.png" COMP;
-   images.image: "outline_glow.png" COMP;
+   images.image: "outline.png" COMP;
    images.image: "box_glow.png" COMP;
    images.image: "diagonal_stripes.png" COMP;
    data.item: "focus_highlight" "on";

data/elementary/themes/edc/efl/cursor.edc

@@ -82,6 +82,7 @@ group { name: "efl/cursor/hand1"; data.item: "version" "123";
    images.image: "pointer_hand1.png" COMP;
    parts {
       part { name: "base"; mouse_events: 0; scale: 1;
+         scale: 1;
          description { state: "default" 0.0;
             FIXED_SIZE(32, 32)
             image.normal: "pointer_hand1.png";
@@ -91,10 +92,10 @@ group { name: "efl/cursor/hand1"; data.item: "version" "123";
          description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.relative: (26/32) (9/32);
+            rel1.relative: (21/32) (7/32);
             rel1.to: "base";
             rel2.to: "base";
-            rel2.relative: (26/32) (9/32);
+            rel2.relative: (21/32) (7/32);
             rel2.offset: 0 0;
          }
       }
@@ -116,26 +117,22 @@ group { name: "efl/cursor/blank"; data.item: "version" "123";
    }
 }
 
-group { name: "efl/cursor/xterm"; data.item: "version" "123";
-   images.image: "pointer_entry_bar.png" COMP;
-   images.image: "led_dot_white.png" COMP;
+group { name: "efl/cursor/xterm";
+   data.item: "version" "123";
+   images.image: "pointer_entry.png" COMP;
    parts {
       part { name: "base"; mouse_events: 0; scale: 1;
+         scale: 1;
          description { state: "default" 0.0;
-            min: 15 20;
-            max: 15 99999;
-            image.normal: "pointer_entry_bar.png";
-            image.border: 0 0 10 10;
-            rel1.offset: 0 2;
-            rel2.offset: -1 -3;
+            image.normal: "pointer_entry.png";
+            FIXED_SIZE(16, 32)
          }
       }
       part { name: "efl.hotspot"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
             rel1.relative: 0.5 0.5;
             rel2.relative: 0.5 0.5;
             rel2.offset: 0 0;
@@ -143,15 +140,5 @@ group { name: "efl/cursor/xterm"; data.item: "version" "123";
       }
       /* efl.content.hotspot is the old name for the above part */
       alias: "efl.content.hotspot" "efl.hotspot";
-      part { name: "shine";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "led_dot_white.png";
-            max: 27 27;
-            aspect: 1.0 1.0;
-            aspect_preference: VERTICAL;
-         }
-      }
    }
 }

data/elementary/themes/edc/efl/panes.edc

@@ -962,3 +962,7 @@ group { name: "efl/panes/horizontal:down-fold";
       }
    }
 }
+
+#undef PANEMIN
+#undef PANEMIN2
+#undef PANEWID

data/elementary/themes/edc/efl/text.edc

@@ -1,9 +1,13 @@
-
 group { "efl/text/scroller";
    inherit: "efl/scroller";
    data.item: "version" "123";
    image: "bg_glow_in.png" COMP;
    parts {
+      part { name: "bg";
+         description { state: "default" 0.0;
+            color: DARK_GREY_BG_COLOR;
+         }
+      }
       part { name: "efl.background"; type: SWALLOW;
          clip_to: "clipper";
          description { state: "default" 0.0;
@@ -11,10 +15,8 @@ group { "efl/text/scroller";
             rel2.offset: -2 -2;
          }
       }
-      part { name: "validation_glow";
-         type: RECT;
-         insert_before: "bg";
-         mouse_events: 0;
+      part { name: "validation_glow"; type: RECT; mouse_events: 0;
+         insert_after: "efl.background";
          description { state: "default" 0.0;
             color: 0 0 0 0;
          }
@@ -25,10 +27,54 @@ group { "efl/text/scroller";
             color: 255 0 0 90;
          }
       }
-      part { name: "bg";
+      program { name: "validation_fail";
+         signal: "validation,default,fail";
+         source: "efl";
+         action: STATE_SET "fail" 0.0;
+         target: "validation_glow";
+      }
+      program { name: "validation_pass";
+         signal: "validation,default,pass";
+         source: "efl";
+         action: STATE_SET "pass" 0.0;
+         target: "validation_glow";
+      }
+      program { name: "validation_off";
+         signal: "validation,default";
+         source: "efl";
+         action: STATE_SET "default" 0.0;
+         target: "validation_glow";
+      }
+      part { name: "glow"; type: RECT; mouse_events: 0;
+         insert_before: "efl.content";
+         scale: 1;
          description { state: "default" 0.0;
-            color: DARK_GREY_BG_COLOR;
+            rel1.to: "bg";
+            rel1.relative: 0.0 1.0;
+            rel2.to: "bg";
+            rel1.offset: 0 0;
+            color: 51 153 255 0;
+            visible: 0;
+            offscale;
          }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: 0 -3;
+            color: 51 153 255 255;
+            visible: 1;
+         }
+      }
+      program {
+         signal: "efl,action,focus_highlight,show"; source: "efl";
+         action: STATE_SET "focused" 0.0;
+         transition: DECELERATE 0.3;
+         target: "glow";
+      }
+      program {
+         signal: "efl,action,focus_highlight,hide"; source: "efl";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.3;
+         target: "glow";
       }
       part { name: "efl.content"; type: SWALLOW;
          description { state: "default" 0.0;
@@ -96,64 +142,6 @@ group { "efl/text/scroller";
          action: STATE_SET "default" 0.0;
          target: "efl.extra";
       }
-      part { name: "glow";
-         insert_after: "shadow";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "bg_glow_in.png";
-            image.border: 7 7 7 7;
-            image.middle: 0;
-            fill.smooth: 0;
-            color: 255 255 255 0;
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-         description { state: "focused2" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 64;
-         }
-      }
-   }
-   programs {
-      program {
-         signal: "efl,action,focus_highlight,show"; source: "efl";
-         action: STATE_SET "focused" 0.0;
-         target: "glow";
-         after: "focus_in2";
-      }
-      program { name: "focus_in2";
-         action: STATE_SET "focused2" 0.0;
-         transition: DECELERATE 0.5;
-         target: "glow";
-      }
-      program {
-         signal: "efl,action,focus_highlight,hide"; source: "efl";
-         action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.3;
-         target: "glow";
-      }
-      program { name: "validation_fail";
-         signal: "validation,default,fail";
-         source: "efl";
-         action: STATE_SET "fail" 0.0;
-         target: "validation_glow";
-      }
-      program { name: "validation_pass";
-         signal: "validation,default,pass";
-         source: "efl";
-         action: STATE_SET "pass" 0.0;
-         target: "validation_glow";
-      }
-      program { name: "validation_off";
-         signal: "validation,default";
-         source: "efl";
-         action: STATE_SET "default" 0.0;
-         target: "validation_glow";
-      }
    }
 }
 

data/elementary/themes/edc/elm/actionslider.edc

@@ -6,104 +6,83 @@ group { name: "elm/actionslider/base/default";
    images.image: "inset_shadow.png" COMP;
    parts {
       part { name: "bg"; type: RECT; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 1 1;
-            rel2.offset: -2 -2;
-            min: 48 10;
-            color: DARK_GREY_BG_COLOR;
+            min: 120 20;
+            color: 0 0 0 64;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: DARK_GREY_BG_DISABLED_COLOR;
-         }
-      }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            fill.smooth: 0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "inset"; mouse_events:  0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
+            color: 0 0 0 0;
          }
       }
       part { name: "icon_dragable_area"; type: SPACER;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+            rel.to: "bg";
          }
       }
       part { name: "elm.text.left"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            color: FN_COL_DEFAULT;
-            color_class: "button_text";
+            color: 160 160 160 255;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
             text { font: FN; size: 10;
-               align: 0.05 0.5;
+               align: 0.0 0.5;
                min: 1 1;
                ellipsis: -1;
                text_class: "button";
             }
+            offscale;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_DISABLE;
-            color_class: "button_text_disabled";
+            color: 96 96 96 255;
          }
       }
       part { name: "elm.text.center"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            color: FN_COL_DEFAULT;
-            color_class: "check_off_text";
+            color: 160 160 160 255;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
             text { font: FN; size: 10;
                align: 0.5 0.5;
                min: 1 1;
                ellipsis: -1;
-               text_class: "check_off_text";
+               text_class: "button";
             }
+            offscale;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_DISABLE;
-            color_class: "button_text_disabled";
+            color: 96 96 96 255;
          }
       }
       part { name: "elm.text.right"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            color: FN_COL_DEFAULT;
-            color_class: "check_off_text";
+            color: 160 160 160 255;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
             text { font: FN; size: 10;
-               align: 0.95 0.5;
+               align: 1.0 0.5;
                min: 1 1;
                ellipsis: -1;
-               text_class: "check_off_text";
+               text_class: "button";
             }
+            offscale;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_DISABLE;
-            color_class: "button_text_disabled";
+            color: 96 96 96 255;
          }
       }
       part { name: "elm.drag_button_base"; type: SWALLOW; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            min: 40 10;
+            min: 40 20;
             align: 0.5 0.5;
             rel1.to: "icon_dragable_area";
             rel2 {
@@ -120,7 +99,7 @@ group { name: "elm/actionslider/base/default";
       part { name: "elm.drag_button"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            min: 40 10;
+            min: 40 20;
             color: 0 0 0 0;
             rel1.to_x: "elm.drag_button_base";
             rel1.to_y: "icon_dragable_area";
@@ -131,57 +110,27 @@ group { name: "elm/actionslider/base/default";
             events: "elm.drag_button_base";
          }
       }
-      part { name: "glow_button"; mouse_events: 0;
+      part { name: "drag_button"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.offset: 0 -1;
-            rel1.to: "drag_button";
-            rel2.offset: -1 -2;
-            rel2.to: "drag_button";
-            image {
-               normal: "glow_small.png";
-               border: 7 7 7 7;
-               middle: NONE;
-            }
-            fill.smooth: 0;
-            visible: 0;
+            rel.to: "elm.drag_button";
+            color: 96 96 96 255;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 72 72 72 255;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "drag_button"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "elm.drag_button";
-            rel1.offset: -1 0;
-            rel2.to: "elm.drag_button";
-            rel2.offset: 0 0;
-            image {
-               normal: "button_normal.png";
-               border: 4 4 3 5;
-               middle: SOLID;
-            }
-         }
-         description { state: "clicked" 0.0;
-            inherit: "default" 0.0;
-            image.normal: "button_clicked.png";
-            image.border: 5 5 4 6;
+            color: 51 153 255 255;
          }
       }
       part { name: "elm.text.indicator"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            rel1 {
-               to: "elm.drag_button";
-               offset: 5 2;
-            }
-            rel2 {
-               to: "elm.drag_button";
-               offset: -5 -3;
-            }
-            color: FN_COL_DEFAULT;
-            color_class: "check_off_text";
+            rel.to: "drag_button";
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            color: 192 192 192 255;
             text {
                font: FN; size: 10;
                align: 0.5 0.5;
@@ -191,12 +140,14 @@ group { name: "elm/actionslider/base/default";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_DISABLE;
-            color_class: "button_text_disabled";
+            color: 96 96 96 255;
+         }
+         description { state: "clicked" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
          }
       }
-      part { name: "disabler";
-         type: RECT;
+      part { name: "disabler"; type: RECT;
          description { state: "default" 0.0;
             color: 0 0 0 0;
             visible: 0;
@@ -208,56 +159,50 @@ group { name: "elm/actionslider/base/default";
       }
    }
    programs {
-      program {
-         signal: "mouse,up,1"; source: "elm.drag_button";
+      program { signal: "mouse,up,1"; source: "elm.drag_button";
          action: SIGNAL_EMIT "elm,action,up,drag_button" "elm";
          after: "button_unclick_anim";
       }
       program { name: "button_unclick_anim";
          action: STATE_SET "default" 0.0;
          target: "drag_button";
-         target: "glow_button";
+         target: "elm.text.indicator";
       }
-      program {
-         signal: "mouse,down,1*"; source: "elm.drag_button";
+      program { signal: "mouse,down,1*"; source: "elm.drag_button";
          action: SIGNAL_EMIT "elm,action,down,drag_button" "elm";
          after: "button_click_anim";
       }
       program { name: "button_click_anim";
          action: STATE_SET "clicked" 0.0;
          target: "drag_button";
-         target: "glow_button";
+         target: "elm.text.indicator";
       }
-      program {
-         signal: "mouse,move"; source: "elm.drag_button_base";
+      program { signal: "mouse,move"; source: "elm.drag_button_base";
          action: SIGNAL_EMIT "elm,action,move,drag_button" "elm";
       }
-      program {
-         signal: "mouse,down,1*"; source: "elm.text.right";
+      program { signal: "mouse,down,1*"; source: "elm.text.right";
          action: SIGNAL_EMIT "elm,action,down,right" "elm";
       }
-     program {
-         signal: "mouse,down,1*"; source: "elm.text.left";
+     program { signal: "mouse,down,1*"; source: "elm.text.left";
          action: SIGNAL_EMIT "elm,action,down,left" "elm";
       }
-     program {
-         signal: "mouse,down,1*"; source: "elm.text.center";
+     program { signal: "mouse,down,1*"; source: "elm.text.center";
          action: SIGNAL_EMIT "elm,action,down,center" "elm";
       }
-      program {
-         signal: "elm,state,disabled"; source: "elm";
+      program { signal: "elm,state,disabled"; source: "elm";
          action: STATE_SET "disabled" 0.0;
          target: "bg";
+         target: "drag_button";
          target: "disabler";
          target: "elm.text.left";
          target: "elm.text.center";
          target: "elm.text.right";
          target: "elm.text.indicator";
       }
-      program {
-         signal: "elm,state,enabled"; source: "elm";
+      program { signal: "elm,state,enabled"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "bg";
+         target: "drag_button";
          target: "disabler";
          target: "elm.text.left";
          target: "elm.text.center";
@@ -271,21 +216,16 @@ group { name: "elm/actionslider/base/bar";
    inherit: "elm/actionslider/base/default";
    images.image: "horiz_glow_run_big.png" COMP;
    parts {
-      part { name: "bar"; mouse_events: 0;
+      part { name: "bar"; type: RECT; mouse_events: 0;
          insert_before: "elm.drag_button_base";
          description { state: "default" 0.0;
+            color: 51 153 255 128;
             rel1.to: "bg";
-            rel1.offset: 1 4;
             rel2 {
                relative: 0.0 1.0;
-               offset: 3 -5;
                to_x: "elm.drag_button_base";
                to_y: "bg";
             }
-            image {
-               normal: "horiz_glow_run_big.png";
-               border: 0 4 0 0;
-            }
          }
       }
    }

data/elementary/themes/edc/elm/bg.edc

@@ -8,7 +8,6 @@
 
 group { name: "elm/bg/base/default";
    data.item: "version" "119";
-   images.image: "bevel_dark_out.png" COMP;
    parts {
       part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;
@@ -30,14 +29,6 @@ group { name: "elm/bg/base/default";
             fixed: 1 1;
          }
       }
-      part { name: "bevel";
-         description { state: "default" 0.0;
-            image.normal: "bevel_dark_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
       part { name: "elm.swallow.content"; type: SWALLOW;
          description { state: "default" 0.0;
          }

data/elementary/themes/edc/elm/border.edc

@@ -8,26 +8,13 @@
  */
 
 group { name: "elm/border/base/default";
-   images.image: "vgrad_med_lighter.png" COMP;
-   images.image: "vgrad_med_dark.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "shine.png" COMP;
-   images.image: "bevel_dark_out.png" COMP;
-   images.image: "sym_close_dark_normal.png" COMP;
-   images.image: "sym_close_dark_selected.png" COMP;
-   images.image: "sym_close_light_normal.png" COMP;
-   images.image: "sym_close_light_selected.png" COMP;
-   images.image: "sym_down_dark_normal.png" COMP;
-   images.image: "sym_down_dark_selected.png" COMP;
-   images.image: "sym_down_light_normal.png" COMP;
-   images.image: "sym_down_light_selected.png" COMP;
-   images.image: "sym_up_dark_normal.png" COMP;
-   images.image: "sym_up_dark_selected.png" COMP;
-   images.image: "sym_up_light_normal.png" COMP;
-   images.image: "sym_up_light_selected.png" COMP;
+   images.image: "border_close.png" COMP;
+   images.image: "border_maximize.png" COMP;
+   images.image: "border_minimize.png" COMP;
+
    images.image: "glow_round_corners_small.png" COMP;
    images.image: "knob_round_small_busy.png" COMP;
-   images.image: "screen_circular_shadow.png" COMP;
+
    images.image: "win_shadow.png" COMP;
    data.item: "shadow" "1";
    data.item: "version" "119";
@@ -94,22 +81,6 @@ group { name: "elm/border/base/default";
          required; // @since 1.19
          clip: "client_clip";
       }
-      image { "background_bevel";
-         desc { "default";
-            image {
-               normal: "bevel_dark_out.png";
-               border: 1 1 1 1;
-               middle: 0;
-            }
-            fill.smooth: 0;
-            rel.to: "elm.spacer.content";
-            visible: 0;
-         }
-         desc { "visible";
-            inherit: "default";
-            visible: 1;
-         }
-      }
       spacer { "indicator_spacer";
          desc { "default";
             rel.to: "elm.swallow.indicator";
@@ -133,8 +104,7 @@ group { name: "elm/border/base/default";
       swallow { "elm.swallow.menu";
          required: 1; // since 1.19
          desc { "default";
-            rel.to: "indicator_spacer";
-            rel1.relative: 0.0 1.0;
+            rel.to: "top_clip";
             visible: 0;
             align: 0.5 0.0;
             fixed: 1 1;
@@ -192,16 +162,19 @@ group { name: "elm/border/base/default";
       rect { "top_clip"; //nomouse;
          desc { "default";
             rel1.to: "shadow_spacer";
-            rel2.to_y: "title2";
+            rel2.to_y: "elm.text.title";
             rel2.to_x: "shadow_spacer";
+            rel2.offset: -1 3;
             vis;
          }
          desc { "hidden";
             inherit: "default";
+            rel1.to: "";
+            rel2.to: "";
             rel1.relative: 0.0 0.0;
             rel2.to: "shadow_spacer";
             rel2.relative: 1.0 0.0;
-            rel2.offset: -1 -1;
+            rel2.offset: -1 0;
             max: -1 0;
             min: 0 0;
             fixed: 0 1;
@@ -209,47 +182,32 @@ group { name: "elm/border/base/default";
          }
       }
       /* top title bar */
-      image { "top"; nomouse;
+      part { name: "top"; type: RECT; mouse_events: 0;
          clip: "top_clip";
-         desc { "default";
-            image.normal: "vgrad_med_lighter.png";
+         description { state: "default" 0.0;
             rel.to: "top_clip";
-            fill.smooth: 0;
-            TILED_HORIZ(120)
-            color_class: "border_frame";
+            color: 64 64 64 255;
          }
-         desc { "focused";
-            inherit: "default";
-            image.normal: "vgrad_med_dark.png";
-            color_class: "border_frame_active";
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            color: 32 32 32 255;
          }
       }
-      image { "bevel"; nomouse;
-         clip: "top_clip";
-         desc { "default";
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel.to: "top_clip";
-            fill.smooth: 0;
-         }
-      }
-      text {  "elm.text.title"; nomouse;
+      part { name: "elm.text.title"; type: TEXT; mouse_events: 0;
          scale: 1;
-         effect: SHADOW BOTTOM;
          clip: "top_clip";
-         desc { "default";
+         description { state: "default" 0.0;
             rel1.relative: 1.0 0.0;
             rel1.offset: 1 3;
-            rel1.to_x: "elm.event.icon";
+            rel1.to_x: "icon";
             rel1.to_y: "shadow_spacer";
             rel2.relative: 0.0 0.0;
             rel2.offset: -2 3;
             rel2.to_x: "elm.event.minimize";
             rel2.to_y: "shadow_spacer";
             align: 0.5 0.0;
-            color_class: "border_title";
-            color3: 255 255 255 255;
+            color: 160 160 160 255;
+            min: 0 16;
             text { font: FNBD; size: 10;
                text_class: "title_bar";
                align: 0.5 0.0;
@@ -257,39 +215,9 @@ group { name: "elm/border/base/default";
             }
             fixed: 0 1;
          }
-         desc { "focused";
-            inherit: "default";
-            visible: 0;
-         }
-      }
-      text {  "title2"; nomouse;
-         scale: 1;
-         effect: SOFT_SHADOW BOTTOM;
-         clip: "top_clip";
-         desc { "default";
-            rel1.relative: 1.0 0.0;
-            rel1.offset: 1 2;
-            rel1.to_x: "elm.event.icon";
-            rel1.to_y: "shadow_spacer";
-            rel2.relative: 0.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to_x: "elm.event.minimize";
-            rel2.to_y: "shadow_spacer";
-            align: 0.5 0.0;
-            color_class: "border_title_active";
-            color3: 255 255 255 255;
-            text { font: FNBD; size: 10;
-               text_source: "elm.text.title";
-               text_class: "title_bar";
-               align: 0.5 0.0;
-               min: 0 1;
-            }
-            fixed: 0 1;
-            visible: 0;
-         }
-         desc { "focused";
-            inherit: "default";
-            visible: 1;
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
          }
       }
       spacer {  "icon";
@@ -386,91 +314,97 @@ group { name: "elm/border/base/default";
       image { "close1";  nomouse;
          clip: "clip1";
          desc { "default";
-            image.normal: "sym_close_dark_normal.png";
+            image.normal: "border_close.png";
             rel1.to: "elm.event.close";
             rel2.to: "elm.event.close";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
+            color: 160 160 160 255;
          }
          desc { "selected";
             inherit: "default";
-            image.normal: "sym_close_dark_selected.png";
+            color: 255 255 255 255;
          }
       }
       image { "max1"; nomouse;
          clip: "clip1";
          desc { "default";
-            image.normal: "sym_up_dark_normal.png";
+            image.normal: "border_maximize.png";
             rel1.to: "elm.event.maximize";
             rel2.to: "elm.event.maximize";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
+            color: 160 160 160 255;
          }
          desc { "selected";
             inherit: "default";
-            image.normal: "sym_up_dark_selected.png";
+            color: 255 255 255 255;
          }
       }
       image { "min1"; nomouse;
          clip: "clip1";
          desc { "default";
-            image.normal: "sym_down_dark_normal.png";
+            image.normal: "border_minimize.png";
             rel1.to: "elm.event.minimize";
             rel2.to: "elm.event.minimize";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
+            color: 160 160 160 255;
          }
          desc { "selected";
             inherit: "default";
-            image.normal: "sym_down_dark_selected.png";
+            color: 255 255 255 255;
          }
       }
-      image { "close2"; nomouse;
+      image { "close2";  nomouse;
          clip: "clip2";
          desc { "default";
-            image.normal: "sym_close_light_normal.png";
+            image.normal: "border_close.png";
             rel1.to: "elm.event.close";
             rel2.to: "elm.event.close";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
+            color: 160 160 160 255;
          }
          desc { "selected";
             inherit: "default";
-            image.normal: "sym_close_light_selected.png";
+            color: 255 255 255 255;
          }
       }
       image { "max2"; nomouse;
          clip: "clip2";
          desc { "default";
-            image.normal: "sym_up_light_normal.png";
+            image.normal: "border_maximize.png";
             rel1.to: "elm.event.maximize";
             rel2.to: "elm.event.maximize";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
+            color: 160 160 160 255;
          }
          desc { "selected";
             inherit: "default";
-            image.normal: "sym_up_light_selected.png";
+            color: 255 255 255 255;
          }
       }
       image { "min2"; nomouse;
          clip: "clip2";
          desc { "default";
-            image.normal: "sym_down_light_normal.png";
+            image.normal: "border_minimize.png";
             rel1.to: "elm.event.minimize";
             rel2.to: "elm.event.minimize";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
+            color: 160 160 160 255;
          }
          desc { "selected";
             inherit: "default";
-            image.normal: "sym_down_light_selected.png";
+            color: 255 255 255 255;
          }
       }
       rect {  "elm.event.icon";
@@ -608,22 +542,11 @@ group { name: "elm/border/base/default";
             hid;
          }
       }
-      rect { "bottom";
-         nomouse;
-         desc { "default";
-            color_class: "border_bottom";
-            color: 64 64 64 255; /* FIXME */
-            rel.to: "bottom_clip";
-         }
-      }
-      image { "bevel2"; nomouse;
+      part { name: "bottom"; type: RECT; mouse_events: 0;
          clip: "bottom_clip";
-         desc { "default";
-            image.normal: "bevel_dark_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
+         description { state: "default" 0.0;
+            color: 64 64 64 255;
             rel.to: "bottom_clip";
-            fill.smooth: 0;
          }
       }
       rect {  "elm.event.resize.bl";
@@ -671,18 +594,6 @@ group { name: "elm/border/base/default";
          }
          desc { "hidden"; inherit: "default"; hid; }
       }
-      /* top title bar decoration */
-      image { "shine"; nomouse;
-         clip: "top_clip";
-         desc { "default";
-            image.normal: "shine.png";
-            rel.to: "top_clip";
-            rel1.offset: 0 -2;
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            FIXED_SIZE(69, 5)
-         }
-      }
       rect { "indicator_bg";
          clip: "bg_clip";
          desc { "default";
@@ -781,22 +692,21 @@ group { name: "elm/border/base/default";
          action: STATE_SET "default";
          target: "elm.rect.background";
       }
-      program {
-         signal: "elm,state,background,standard,on"; source: "elm";
-         action: STATE_SET "visible";
-         target: "background_bevel";
-      }
-      program {
-         signal: "elm,state,background,standard,off"; source: "elm";
-         action: STATE_SET "default";
-         target: "background_bevel";
-      }
+//      program {
+//         signal: "elm,state,background,standard,on"; source: "elm";
+//         action: STATE_SET "visible";
+//         target: "background_bevel";
+//      }
+//      program {
+//         signal: "elm,state,background,standard,off"; source: "elm";
+//         action: STATE_SET "default";
+//         target: "background_bevel";
+//      }
       program {
          signal: "elm,action,focus"; source: "elm";
          action: STATE_SET "focused";
          target: "top";
          target: "elm.text.title";
-         target: "title2";
          target: "clip1";
          target: "clip2";
       }
@@ -805,7 +715,6 @@ group { name: "elm/border/base/default";
          action: STATE_SET "default";
          target: "top";
          target: "elm.text.title";
-         target: "title2";
          target: "clip1";
          target: "clip2";
       }

data/elementary/themes/edc/elm/bubble.edc

@@ -2,8 +2,6 @@ group { name: "elm/bubble/top_left/default";
    alias: "elm/bubble/base/default";
    images.image: "bub_base_tl.png" COMP;
    images.image: "bub_base_tr.png" COMP;
-   images.image: "bub_over_top.png" COMP;
-   images.image: "shine.png" COMP;
    parts {
       part { name: "event"; type: RECT;
          description { state: "default" 0.0;
@@ -16,11 +14,11 @@ group { name: "elm/bubble/top_left/default";
             visible: 0;
             align: 0.0 0.0;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            rel1.offset: 2 2;
+            rel1.offset: 4 4;
             rel2 {
                to_y: "elm.text";
                relative: 0.0 1.0;
-               offset: 2 -1;
+               offset: 4 -5;
             }
          }
          description { state: "visible" 0.0;
@@ -45,12 +43,11 @@ group { name: "elm/bubble/top_left/default";
             text {
                min: 1 1;
                ellipsis: -1;
-               text: "M";
+               text: SPACER_TEXT;
             }
          }
       }
       part { name: "elm.text"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 0 1;
@@ -58,15 +55,14 @@ group { name: "elm/bubble/top_left/default";
             rel1 {
                to_x: "elm.swallow.icon";
                relative: 1.0 0.0;
-               offset: 2 2;
+               offset: 4 4;
             }
             rel2 {
                to_x: "elm.info";
                relative: 0.0 0.0;
-               offset: -3 2;
+               offset: -5 4;
             }
-            color: FN_COL_DEFAULT;
-            color_class: "bubble_text";
+            color: 255 255 255 255;
             text { font: FNBD; size: 10;
                min: 0 1;
                max: 0 1;
@@ -76,17 +72,15 @@ group { name: "elm/bubble/top_left/default";
          }
       }
       part { name: "elm.info"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             align: 1.0 0.0;
             fixed: 1 1;
             rel1.relative: 1.0 0.0;
-            rel1.offset: -3 2;
+            rel1.offset: -5 4;
             rel2.relative: 1.0 0.0;
-            rel2.offset: -3 2;
-            color: FN_COL_DISABLE;
-            color_class: "bubble_info";
+            rel2.offset: -5 4;
+            color: 160 160 160 255;
             text { font: FNBD; size: 10;
                min: 1 1;
                ellipsis: -1;
@@ -98,20 +92,23 @@ group { name: "elm/bubble/top_left/default";
       }
       part { name: "base"; mouse_events:  0;
          description { state: "default" 0.0;
+            color: 48 48 48 255;
             rel1 {
                to_y: "elm.swallow.icon";
                relative: 0.0 1.0;
-               offset: 0 0;
+               offset: 4 4;
             }
+            rel2.offset: -5 -5;
             image.normal: "bub_base_tl.png";
-            image.border: 24 8 12 9;
+            image.border: 24 0 12 0;
             image.middle: SOLID;
             fill.smooth: 0;
+            offscale;
          }
          description { state: "rtl" 0.0;
             inherit: "default" 0.0;
             image.normal: "bub_base_tr.png";
-            image.border: 8 24 12 9;
+            image.border: 0 24 12 0;
          }
       }
       part { name: "elm.swallow.content";
@@ -123,41 +120,6 @@ group { name: "elm/bubble/top_left/default";
             rel2.offset: -6 -7;
          }
       }
-      part { name: "over"; mouse_events:  0;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel1.offset: 20 6;
-            rel2.to: "base";
-            rel2.offset: -6 6;
-            rel2.relative: 1.0 0.4;
-            image.normal: "bub_over_top.png";
-            fill.smooth: 0;
-         }
-         description { state: "rtl" 0.0;
-            inherit: "default" 0.0;
-            rel1.offset: 5 6;
-            rel2.offset: -21 6;
-         }
-      }
-      part { name: "shine_clip"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "over";
-            rel1.offset: 0 -10;
-            rel2.to: "over";
-         }
-      }
-      part { name: "shine"; mouse_events: 0;
-         clip_to: "shine_clip";
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel1.to: "over";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "over";
-            FIXED_SIZE(69, 5)
-         }
-      }
    }
    programs {
       program {
@@ -176,13 +138,11 @@ group { name: "elm/bubble/top_left/default";
          signal: "edje,state,rtl"; source: "edje";
          action: STATE_SET "rtl" 0.0;
          target: "base";
-         target: "over";
       }
       program {
          signal: "edje,state,ltr"; source: "edje";
          action: STATE_SET "default" 0.0;
          target: "base";
-         target: "over";
       }
    }
 }
@@ -190,8 +150,6 @@ group { name: "elm/bubble/top_left/default";
 group { name: "elm/bubble/top_right/default";
    images.image: "bub_base_tr.png" COMP;
    images.image: "bub_base_tl.png" COMP;
-   images.image: "bub_over_top.png" COMP;
-   images.image: "shine.png" COMP;
    parts {
       part { name: "event"; type: RECT;
          description { state: "default" 0.0;
@@ -204,12 +162,12 @@ group { name: "elm/bubble/top_right/default";
             visible: 0;
             align: 1.0 0.0;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            rel1.offset: -3 2;
+            rel1.offset: -5 4;
             rel1.relative: 1.0 0.0;
             rel2 {
                to_y: "elm.text";
                relative: 1.0 1.0;
-               offset: -3 -1;
+               offset: -5 -1;
             }
          }
          description { state: "visible" 0.0;
@@ -234,24 +192,22 @@ group { name: "elm/bubble/top_right/default";
             text {
                min: 1 1;
                ellipsis: -1;
-               text: "M";
+               text: SPACER_TEXT;
             }
          }
       }
       part { name: "elm.text"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 0 1;
             align: 0.0 0.0;
-            rel1.offset: 2 2;
+            rel1.offset: 4 4;
             rel2 {
                to_x: "elm.info";
                relative: 0.0 0.0;
-               offset: -3 2;
+               offset: -5 4;
             }
-            color: FN_COL_DEFAULT;
-            color_class: "bubble_text";
+            color: 255 255 255 255;
             text { font: FNBD; size: 10;
                min: 0 1;
                max: 0 1;
@@ -261,18 +217,16 @@ group { name: "elm/bubble/top_right/default";
          }
       }
       part { name: "elm.info"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             align: 1.0 0.0;
             fixed: 1 1;
             rel1.relative: 1.0 0.0;
-            rel1.offset: -3 2;
+            rel1.offset: -5 4;
             rel2.to_x: "elm.swallow.icon";
             rel2.relative: 0.0 0.0;
-            rel2.offset: -3 2;
-            color: FN_COL_DISABLE;
-            color_class: "bubble_info";
+            rel2.offset: -5 4;
+            color: 160 160 160 255;
             text { font: FNBD; size: 10;
                min: 1 1;
                ellipsis: -1;
@@ -284,20 +238,23 @@ group { name: "elm/bubble/top_right/default";
       }
       part { name: "base"; mouse_events:  0;
          description { state: "default" 0.0;
+            color: 48 48 48 255;
             rel1 {
                to_y: "elm.swallow.icon";
                relative: 0.0 1.0;
-               offset: 0 0;
+               offset: 4 4;
             }
+            rel2.offset: -5 -5;
             image.normal: "bub_base_tr.png";
-            image.border: 8 24 12 9;
+            image.border: 0 24 12 0;
             image.middle: SOLID;
             fill.smooth: 0;
+            offscale;
          }
          description { state: "rtl" 0.0;
             inherit: "default" 0.0;
             image.normal: "bub_base_tl.png";
-            image.border: 24 8 12 9;
+            image.border: 24 0 12 0;
          }
       }
       part { name: "elm.swallow.content";
@@ -309,41 +266,6 @@ group { name: "elm/bubble/top_right/default";
             rel2.offset: -6 -7;
          }
       }
-      part { name: "over"; mouse_events:  0;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel1.offset: 5 6;
-            rel2.to: "base";
-            rel2.offset: -21 6;
-            rel2.relative: 1.0 0.4;
-            image.normal: "bub_over_top.png";
-            fill.smooth: 0;
-         }
-         description { state: "rtl" 0.0;
-            inherit: "default" 0.0;
-            rel1.offset: 20 6;
-            rel2.offset: -6 6;
-         }
-      }
-      part { name: "shine_clip"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "over";
-            rel1.offset: 0 -10;
-            rel2.to: "over";
-         }
-      }
-      part { name: "shine"; mouse_events: 0;
-         clip_to: "shine_clip";
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel1.to: "over";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "over";
-            FIXED_SIZE(69, 5)
-         }
-      }
    }
    programs {
       program {
@@ -362,13 +284,11 @@ group { name: "elm/bubble/top_right/default";
          signal: "edje,state,rtl"; source: "edje";
          action: STATE_SET "rtl" 0.0;
          target: "base";
-         target: "over";
       }
       program {
          signal: "edje,state,ltr"; source: "edje";
          action: STATE_SET "default" 0.0;
          target: "base";
-         target: "over";
       }
    }
 }
@@ -376,8 +296,6 @@ group { name: "elm/bubble/top_right/default";
 group { name: "elm/bubble/bottom_left/default";
    images.image: "bub_base_bl.png" COMP;
    images.image: "bub_base_br.png" COMP;
-   images.image: "bub_over_bot.png" COMP;
-   images.image: "shine.png" COMP;
    parts {
       part { name: "event"; type: RECT;
          description { state: "default" 0.0;
@@ -392,11 +310,11 @@ group { name: "elm/bubble/bottom_left/default";
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
             rel1 {
                to_y: "elm.text";
-               offset: 2 0;
+               offset: 4 0;
             }
             rel2 {
                relative: 0.0 1.0;
-               offset: 2 -3;
+               offset: 4 -5;
             }
          }
          description { state: "visible" 0.0;
@@ -421,12 +339,11 @@ group { name: "elm/bubble/bottom_left/default";
             text {
                min: 1 1;
                ellipsis: -1;
-               text: "M";
+               text: SPACER_TEXT;
             }
          }
       }
       part { name: "elm.text"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 0 1;
@@ -434,15 +351,14 @@ group { name: "elm/bubble/bottom_left/default";
             rel1 {
                to_x: "elm.swallow.icon";
                relative: 1.0 1.0;
-               offset: 2 -3;
+               offset: 4 -5;
             }
             rel2 {
                to_x: "elm.info";
                relative: 0.0 1.0;
-               offset: -3 -3;
+               offset: -5 -5;
             }
-            color: FN_COL_DEFAULT;
-            color_class: "bubble_text";
+            color: 255 255 255 255;
             text { font: FNBD; size: 10;
                min: 0 1;
                max: 0 1;
@@ -452,17 +368,15 @@ group { name: "elm/bubble/bottom_left/default";
          }
       }
       part { name: "elm.info"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             align: 1.0 1.0;
             fixed: 1 1;
             rel1.relative: 1.0 1.0;
-            rel1.offset: -3 -3;
+            rel1.offset: -5 -5;
             rel2.relative: 1.0 1.0;
-            rel2.offset: -3 -3;
-            color: FN_COL_DISABLE;
-            color_class: "bubble_info";
+            rel2.offset: -5 -5;
+            color: 160 160 160 255;
             text { font: FNBD; size: 10;
                min: 1 1;
                ellipsis: -1;
@@ -474,19 +388,22 @@ group { name: "elm/bubble/bottom_left/default";
       }
       part { name: "base"; mouse_events:  0;
          description { state: "default" 0.0;
+            color: 48 48 48 255;
+            rel1.offset: 4 4;
             rel2 {
                to_y: "elm.swallow.icon";
                relative: 1.0 0.0;
+               offset: -5 -5;
             }
             image.normal: "bub_base_bl.png";
-            image.border: 24 8 8 13;
+            image.border: 24 0 0 13;
             image.middle: SOLID;
             fill.smooth: 0;
          }
          description { state: "rtl" 0.0;
             inherit: "default" 0.0;
             image.normal: "bub_base_br.png";
-            image.border: 8 24 8 13;
+            image.border: 0 24 0 13;
          }
       }
       part { name: "elm.swallow.content";
@@ -498,36 +415,6 @@ group { name: "elm/bubble/bottom_left/default";
             rel2.offset: -6 -12;
          }
       }
-      part { name: "over"; mouse_events:  0;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel1.offset: 2 1;
-            rel2.to: "base";
-            rel2.offset: -3 1;
-            rel2.relative: 1.0 0.4;
-            image.normal: "bub_over_bot.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "shine_clip"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "over";
-            rel1.offset: 0 -10;
-            rel2.to: "over";
-         }
-      }
-      part { name: "shine"; mouse_events: 0;
-         clip_to: "shine_clip";
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel1.to: "over";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "over";
-            FIXED_SIZE(69, 5)
-         }
-      }
    }
    programs {
       program {
@@ -558,8 +445,6 @@ group { name: "elm/bubble/bottom_left/default";
 group { name: "elm/bubble/bottom_right/default";
    images.image: "bub_base_br.png" COMP;
    images.image: "bub_base_bl.png" COMP;
-   images.image: "bub_over_bot.png" COMP;
-   images.image: "shine.png" COMP;
    parts {
       part { name: "event"; type: RECT;
          description { state: "default" 0.0;
@@ -574,11 +459,11 @@ group { name: "elm/bubble/bottom_right/default";
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
             rel1 {
                to_y: "elm.text";
-               offset: -3 0;
+               offset: -5 0;
             }
             rel2 {
                relative: 1.0 1.0;
-               offset: -3 -3;
+               offset: -5 -5;
             }
          }
          description { state: "visible" 0.0;
@@ -603,27 +488,25 @@ group { name: "elm/bubble/bottom_right/default";
             text {
                min: 1 1;
                ellipsis: -1;
-               text: "M";
+               text: SPACER_TEXT;
             }
          }
       }
       part { name: "elm.text"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 0 1;
             align: 0.0 1.0;
             rel1 {
                relative: 0.0 1.0;
-               offset: 2 -3;
+               offset: 4 -5;
             }
             rel2 {
                to_x: "elm.info";
                relative: 0.0 1.0;
-               offset: -3 -3;
+               offset: -5 -5;
             }
-            color: FN_COL_DEFAULT;
-            color_class: "bubble_text";
+            color: 255 255 255 255;
             text { font: FNBD; size: 10;
                min: 0 1;
                max: 0 1;
@@ -633,18 +516,16 @@ group { name: "elm/bubble/bottom_right/default";
          }
       }
       part { name: "elm.info"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             align: 1.0 1.0;
             fixed: 1 1;
             rel1.relative: 1.0 1.0;
-            rel1.offset: -3 -3;
+            rel1.offset: -5 -5;
             rel2.to_x: "elm.swallow.icon";
             rel2.relative: 0.0 1.0;
-            rel2.offset: -3 -3;
-            color: FN_COL_DISABLE;
-            color_class: "bubble_info";
+            rel2.offset: -5 -5;
+            color: 160 160 160 255;
             text { font: FNBD; size: 10;
                min: 1 1;
                ellipsis: -1;
@@ -656,19 +537,22 @@ group { name: "elm/bubble/bottom_right/default";
       }
       part { name: "base"; mouse_events:  0;
          description { state: "default" 0.0;
+            color: 48 48 48 255;
+            rel1.offset: 4 4;
             rel2 {
                to_y: "elm.swallow.icon";
                relative: 1.0 0.0;
+               offset: -5 -5;
             }
             image.normal: "bub_base_br.png";
-            image.border: 8 24 8 13;
+            image.border: 0 24 0 13;
             image.middle: SOLID;
             fill.smooth: 0;
          }
          description { state: "rtl" 0.0;
             inherit: "default" 0.0;
             image.normal: "bub_base_bl.png";
-            image.border: 24 8 8 13;
+            image.border: 24 0 0 13;
          }
       }
       part { name: "elm.swallow.content";
@@ -680,36 +564,6 @@ group { name: "elm/bubble/bottom_right/default";
             rel2.offset: -6 -12;
          }
       }
-      part { name: "over"; mouse_events:  0;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel1.offset: 2 1;
-            rel2.to: "base";
-            rel2.offset: -3 1;
-            rel2.relative: 1.0 0.4;
-            image.normal: "bub_over_bot.png";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "shine_clip"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "over";
-            rel1.offset: 0 -10;
-            rel2.to: "over";
-         }
-      }
-      part { name: "shine"; mouse_events: 0;
-         clip_to: "shine_clip";
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel1.to: "over";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "over";
-            FIXED_SIZE(69, 5)
-         }
-      }
    }
    programs {
       program {

data/elementary/themes/edc/elm/calendar.edc

@@ -161,9 +161,8 @@
          rel2.to: "cit_"#_pos"_selected"; \
          rel2.offset: -2 -2; \
          image.normal: "diagonal_stripes.png"; \
-         color: 255 255 255 25; \
+         color: 51 153 255 25; \
          TILED_PATTERN(240, 240) \
-         color_class: "calendar_day_selected"; \
          visible: 0; \
       } \
       description { state: "selected" 0.0; \
@@ -175,9 +174,9 @@
       description { state: "default" 0.0; \
          rel1.to: "cit_"#_pos"_rect"; \
          rel2.to: "cit_"#_pos"_rect"; \
-         image.normal: "outline_glow.png"; \
+         image.normal: "outline.png"; \
          image.border: 4 4 4 4; \
-         color_class: "calendar_day_selected"; \
+         color: 51 153 255 255; \
          visible: 0; \
       } \
       description { state: "selected" 0.0; \
@@ -189,10 +188,9 @@
       description { state: "default" 0.0; \
          rel1.to: "cit_"#_pos"_rect"; \
          rel2.to: "cit_"#_pos"_rect"; \
-         image.normal: "outline_glow.png"; \
+         image.normal: "outline.png"; \
          image.border: 4 4 4 4; \
-         color: 255 255 255 128; \
-         color_class: "calendar_day_highlighted"; \
+         color: 51 153 255 255; \
          visible: 0; \
       } \
       description { state: "highlighted" 0.0; \
@@ -447,7 +445,7 @@ group { name: "elm/calendar/base/default";
    images.image: "sym_left_glow_normal.png" COMP;
    images.image: "sym_right_glow_normal.png" COMP;
    images.image: "icon_border_remember.png" COMP;
-   images.image: "outline_glow.png" COMP;
+   images.image: "outline.png" COMP;
    images.image: "box_glow.png" COMP;
    images.image: "diagonal_stripes.png" COMP;
    data.item: "focus_highlight" "on";

data/elementary/themes/edc/elm/colorsel.edc

@@ -1,124 +1,120 @@
 group { name: "elm/colorselector/palette/default";
    data.item: "horizontal_pad" 0;
    data.item: "vertical_pad" 0;
-   images.image: "bevel_dark_in.png" COMP;
    parts {
       part { name: "elm.picker"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 0 1;
             align: 0.5 0.0;
             rel2.relative: 1.0 0.0;
+            offscale;
          }
       }
-      part { name: "sep1";
+      part { name: "sep1"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
             rel1.to_y: "elm.picker";
-            rel1.offset: 4 4;
+            rel1.offset: 5 2;
             rel1.relative: 0.0 1.0;
             rel2.to_y: "elm.picker";
-            rel2.offset: -5 5;
-            min: 2 2;
-            max: 99999 2;
-            image.normal: "bevel_dark_in.png";
-            image.border: 2 2 2 2;
-            fill.smooth: 0;
+            rel2.offset: -6 2;
+            min: 64 1;
+            max: 99999 1;
+            color: 72 72 72 255;
+            offscale;
          }
          description { state: "off" 0.0;
             inherit: "default" 0.0;
-            rel1.offset: 4 -2;
-            rel2.offset: -5 -1;
+            rel1.offset: 5 -1;
+            rel2.offset: -6 -1;
+            min: 0 0;
             visible: 0;
          }
       }
       part { name: "elm.palette"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
             align: 0.5 0.0;
             rel1.to_y: "sep1";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 0 4;
+            rel1.offset: 0 2;
             rel2.to_y: "sep2";
             rel2.relative: 1.0 0.0;
-            rel2.offset: -1 -5;
+            rel2.offset: -1 -3;
+            offscale;
          }
          description { state: "off" 0.0;
             inherit: "default" 0.0;
-            rel1.offset: 0 0;
-            rel2.offset: -1 -1;
+            rel1.offset: 0 -1;
+            rel2.offset: -1 0;
          }
       }
-      part { name: "sep2";
+      part { name: "sep2"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
             rel1.to_y: "elm.selector";
-            rel1.offset: 4 -6;
+            rel1.offset: 5 -3;
             rel2.to_y: "elm.selector";
-            rel2.offset: -5 -5;
+            rel2.offset: -6 -3;
             rel2.relative: 1.0 0.0;
-            min: 2 2;
-            max: 99999 2;
-            image.normal: "bevel_dark_in.png";
-            image.border: 2 2 2 2;
-            fill.smooth: 0;
+            min: 64 1;
+            max: 99999 1;
+            color: 72 72 72 255;
+            offscale;
          }
          description { state: "off" 0.0;
             inherit: "default" 0.0;
-            rel1.offset: 4 0;
-            rel2.offset: -5 1;
+            rel1.offset: 5 0;
+            rel2.offset: -6 0;
+            min: 0 0;
             visible: 0;
          }
       }
       part { name: "elm.selector"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 0 1;
             align: 0.0 1.0;
             rel1.relative: 0.0 1.0;
+            offscale;
          }
       }
    }
    programs {
-      program {
-         source: "elm"; signal: "elm,state,palette";
+      program { signal: "elm,state,palette"; source: "elm";
          action: STATE_SET "off" 0.0;
          target: "sep1";
          target: "sep2";
       }
-      program {
-         source: "elm"; signal: "elm,state,palette";
+      program { signal: "elm,state,palette"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.palette";
       }
-      
-      program {
-         source: "elm"; signal: "elm,state,components";
+      program { signal: "elm,state,components"; source: "elm";
          action: STATE_SET "off" 0.0;
          target: "sep1";
          target: "sep2";
          target: "elm.palette";
       }
-      
-      program {
-         source: "elm"; signal: "elm,state,both";
+      program { signal: "elm,state,both"; source: "elm";
          action: STATE_SET "off" 0.0;
          target: "sep1";
       }
-      program {
-         source: "elm"; signal: "elm,state,both";
+      program { signal: "elm,state,both"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.palette";
          target: "sep2";
       }
-      
-      program {
-         source: "elm"; signal: "elm,state,picker";
+      program { signal: "elm,state,picker"; source: "elm";
          action: STATE_SET "off" 0.0;
          target: "sep1";
          target: "sep2";
          target: "elm.palette";
       }
-      
-      program {
-         source: "elm"; signal: "elm,state,all";
+      program { signal: "elm,state,all"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "sep1";
          target: "sep2";
@@ -131,14 +127,39 @@ group { name: "elm/colorselector/picker/base/default";
    parts {
       part { name: "elm.swallow.picker"; type: SWALLOW;
          description { state: "default" 0.0;
-            min: 90 90;
+            min: 80 80;
             rel2 {
                relative: 0.0 1.0;
-               to_x: "elm.label.red";
+               to_x: "sp1";
             }
          }
       }
+      part { name: "sp1"; type: SPACER;
+         description { state: "default" 0.0;
+            rel1.to: "elm.label.red";
+            rel2.to: "elm.label.green";
+            rel1.relative: 0.0 1.0;
+            align: 0.0 0.5;
+         }
+      }
+      part { name: "sp2"; type: SPACER;
+         description { state: "default" 0.0;
+            rel1.to: "elm.label.blue";
+            rel2.to: "elm.label.alpha";
+            rel1.relative: 0.0 1.0;
+            align: 0.0 0.5;
+         }
+      }
+      part { name: "sp3"; type: SPACER;
+         description { state: "default" 0.0;
+            rel1.to: "sp1";
+            rel2.to: "sp2";
+            rel1.relative: 0.0 1.0;
+            align: 0.0 0.5;
+         }
+      }
       part { name: "elm.label.red"; type: TEXT;
+         scale: 1;
          description { state: "default" 0.0;
             align: 1.0 0.0;
             min: 15 0;
@@ -146,45 +167,52 @@ group { name: "elm/colorselector/picker/base/default";
             rel2 {
                relative: 0.0 1.0;
                to: "elm.swallow.red";
+               offset: -3 -1;
             }
             text {
-               font: "Sans";
-               size: 10;
+               font: FN; size: 10;
                ellipsis: -1;
             }
+            color: 160 160 160 255;
+            offscale;
          }
       }
       part { name: "elm.swallow.red"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
             align: 1.0 0.0;
-            min: 60 20;
-            max: 60 20;
+            min: 80 20;
+            max: 80 20;
          }
       }
       part { name: "elm.label.green"; type: TEXT;
+         scale: 1;
          description { state: "default" 0.0;
             min: 15 0;
             max: 15 -1;
             rel1 {
                relative: 0.0 1.0;
                to: "elm.label.red";
+               offset: -3 -1;
             }
             rel2 {
                relative: 0.0 1.0;
                to: "elm.swallow.green";
             }
             text {
-               font: "Sans";
-               size: 10;
+               font: FN; size: 10;
                ellipsis: -1;
             }
+            color: 160 160 160 255;
+            offscale;
          }
       }
       part { name: "elm.swallow.green"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
             align: 1.0 0.0;
-            min: 60 20;
-            max: 60 20;
+            min: 80 20;
+            max: 80 20;
             rel1 {
                relative: 0.0 1.0;
                to: "elm.swallow.red";
@@ -192,29 +220,33 @@ group { name: "elm/colorselector/picker/base/default";
          }
       }
       part { name: "elm.label.blue"; type: TEXT;
+         scale: 1;
          description { state: "default" 0.0;
             min: 15 0;
             max: 15 -1;
             rel1 {
                relative: 0.0 1.0;
                to: "elm.label.green";
+               offset: -3 -1;
             }
             rel2 {
                relative: 0.0 1.0;
                to: "elm.swallow.blue";
             }
             text {
-               font: "Sans";
-               size: 10;
+               font: FN; size: 10;
                ellipsis: -1;
             }
+            color: 160 160 160 255;
+            offscale;
          }
       }
       part { name: "elm.swallow.blue"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
             align: 1.0 0.0;
-            min: 60 20;
-            max: 60 20;
+            min: 80 20;
+            max: 80 20;
             rel1 {
                relative: 0.0 1.0;
                to: "elm.swallow.green";
@@ -222,29 +254,33 @@ group { name: "elm/colorselector/picker/base/default";
          }
       }
       part { name: "elm.label.alpha"; type: TEXT;
+         scale: 1;
          description { state: "default" 0.0;
             min: 15 0;
             max: 15 -1;
             rel1 {
                relative: 0.0 1.0;
                to: "elm.label.blue";
+               offset: -3 -1;
             }
             rel2 {
                relative: 0.0 1.0;
                to: "elm.swallow.alpha";
             }
             text {
-               font: "Sans";
-               size: 10;
+               font: FN; size: 10;
                ellipsis: -1;
             }
+            color: 160 160 160 255;
+            offscale;
          }
       }
       part { name: "elm.swallow.alpha"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
             align: 1.0 0.0;
-            min: 60 20;
-            max: 60 20;
+            min: 80 20;
+            max: 80 20;
             rel1 {
                relative: 0.0 1.0;
                to: "elm.swallow.blue";
@@ -255,61 +291,37 @@ group { name: "elm/colorselector/picker/base/default";
 }
 
 group { name: "elm/colorselector/picker/default";
-   images.image: "inset_shadow.png" COMP;
-   images.image: "bevel_in.png" COMP;
-   images.image: "dot_pattern.png" COMP;
+   images.image: "diagonal_stripes.png" COMP;
    parts {
       part { name: "bg"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            min: 20 20;
-            rel1.to: "elm.picker";
-            rel2.to: "elm.picker";
-            color: 48 48 48 255;
+            min: 16 16;
+            rel.to: "elm.picker";
+            color: 32 32 32 255;
          }
       }
       part { name: "pat";
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "dot_pattern.png";
-            TILED_PATTERN(256, 256)
+            rel.to: "bg";
+            image.normal: "diagonal_stripes.png";
+            color: 255 255 255 16;
+            TILED_PATTERN(240, 240)
          }
       }
       part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "elm.picker";
-            rel2.to: "elm.picker";
+            rel.to: "elm.picker";
          }
       }
       part { name: "elm.picker"; type: SWALLOW;
          clip_to: "clipper";
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 3 3;
-            rel2.offset: -4 -4;
-         }
-      }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            fill.smooth: 0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "inset"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel1.offset: -1 -1;
-            rel2.to: "bg";
-            rel2.offset: 0 0;
-            fill.smooth: 0;
+            min: 16 16;
+            rel1.offset: 5 5;
+            rel2.offset: -6 -6;
+            offscale;
          }
       }
    }
@@ -355,85 +367,49 @@ group { name: "elm/colorselector/bg/default";
 }
 
 group { name: "elm/colorselector/base/default";
-   images.image: "inset_shadow.png" COMP;
-   images.image: "bevel_in.png" COMP;
-   images.image: "ring_shadow.png" COMP;
-   images.image: "ring_white_blue_glow.png" COMP;
-   images.image: "col_sel_end_bottom.png" COMP;
-   images.image: "col_sel_end_top.png" COMP;
    parts {
       part { name: "elm.bar_bg"; type: SWALLOW; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            min: 32 15;
-            rel1.offset: 0 10;
+            min: 80 20;
+            rel1.offset: 5 25;
             rel1.to_x: "elm.arrow_bg";
-            rel2.offset: -1 -11;
+            rel2.offset: -6 -6;
             rel2.to_x: "elm.arrow_bg";
+            offscale;
          }
       }
       part { name: "elm.bar"; type: SWALLOW; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "elm.bar_bg";
-            rel2.to: "elm.bar_bg";
-         }
-      }
-      part { name: "clipper"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "shadow";
-            rel2.to: "shadow";
-         }
-      }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "elm.bar_bg";
-            rel2.to: "elm.bar_bg";
-            fill.smooth: 0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "inset"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "shadow";
-            rel1.offset: -1 -1;
-            rel2.to: "shadow";
-            rel2.offset: 0 0;
-            fill.smooth: 0;
+            rel.to: "elm.bar_bg";
          }
       }
+
       part { name: "elm.arrow_bg"; type: SWALLOW;
          description { state: "default" 0.0;
             rel1 {
                relative: 1.0 0.0;
-               offset: 3 0;
                to_x: "elm.l_button";
             }
             rel2 {
                relative: 0.0 1.0;
-               offset: -4 0;
                to_x: "elm.r_button";
             }
          }
       }
       part { name: "elm.arrow"; type: RECT;
+         dragable {
+            confine: "elm.bar_bg";
+            x: 1 1 0;
+            y: 0 0 0;
+         }
          description { state: "default" 0.0;
             fixed: 1 1;
             min: 1 1;
-            rel1.to_x: "elm.arrow_bg";
-            rel2.to_x: "elm.arrow_bg";
+            rel1.to_x: "elm.bar_bg";
+            rel2.to_x: "elm.bar_bg";
             visible: 0;
          }
-         dragable {
-            confine: "elm.arrow_bg";
-            x: 1 1 0;
-            y: 0 0 0;
-         }
       }
       part { name: "event"; type: RECT;
          description { state: "default" 0.0;
@@ -444,58 +420,18 @@ group { name: "elm/colorselector/base/default";
          }
          dragable.events: "elm.arrow";
       }
-      part { name: "arrow_under"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "ring_shadow.png";
-            rel1.to: "elm.arrow_icon";
-            rel2.to: "elm.arrow_icon";
-         }
-      }
       part { name: "elm.arrow_icon"; type: SWALLOW; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            min: 16 16;
-            max: 16 16;
-            align: 0.5 (28/32);
+            min: 24 24;
+            max: 24 24;
+            align: 0.5 1.0;
             rel1.to_x: "elm.arrow";
-            rel1.to_y: "shadow";
+            rel1.to_y: "elm.bar";
             rel2.relative: 1.0 0.0;
             rel2.to_x: "elm.arrow";
-            rel2.to_y: "shadow";
-         }
-      }
-      part { name: "end1"; mouse_events: 0;
-         clip_to: "clipper";
-         scale: 1;
-         description { state: "default" 0.0;
-            image.normal: "col_sel_end_top.png";
-            FIXED_SIZE(11, 8)
-            align: 0.5 0.0;
-            rel1.to_x: "cursor";
-            rel2.to_x: "cursor";
-            rel1.to_y: "shadow";
-            rel2.to_y: "shadow";
-         }
-      }
-      part { name: "end2"; mouse_events: 0;
-         clip_to: "clipper";
-         scale: 1;
-         description { state: "default" 0.0;
-            image.normal: "col_sel_end_bottom.png";
-            FIXED_SIZE(11, 8)
-            align: 0.5 1.0;
-            rel1.to_x: "cursor";
-            rel2.to_x: "cursor";
-            rel1.to_y: "shadow";
-            rel2.to_y: "shadow";
-         }
-      }
-      part { name: "arrow_over"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "ring_white_blue_glow.png";
-            rel1.to: "elm.arrow_icon";
-            rel2.to: "elm.arrow_icon";
+            rel2.to_y: "elm.bar";
          }
       }
       part { name: "cursor"; type: RECT;
@@ -503,10 +439,10 @@ group { name: "elm/colorselector/base/default";
             fixed: 1 1;
             min: 1 1;
             rel1.to_x: "elm.arrow_icon";
-            rel1.to_y: "shadow";
+            rel1.to_y: "elm.bar";
             rel1.relative: 0.5 0.0;
             rel2.to_x: "elm.arrow_icon";
-            rel2.to_y: "shadow";
+            rel2.to_y: "elm.bar";
             rel2.relative: 0.5 1.0;
             rel2.offset: 0 -1;
             color: 255 255 255 255;
@@ -516,8 +452,7 @@ group { name: "elm/colorselector/base/default";
       part { name: "elm.arrow_bg_access"; type: RECT;
          repeat_events: 1;
          description { state: "default" 0.0;
-            rel1.to: "elm.arrow_bg";
-            rel2.to: "elm.arrow_bg";
+            rel.to: "elm.arrow_bg";
             color: 0 0 0 0;
          }
       }
@@ -525,7 +460,7 @@ group { name: "elm/colorselector/base/default";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            min: 17 17;
+            min: 24 24;
             rel1.relative: 0.0 0.0;
             rel1.to_y: "elm.bar_bg";
             rel2.relative: 0.0 1.0;
@@ -537,7 +472,7 @@ group { name: "elm/colorselector/base/default";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            min: 17 17;
+            min: 24 24;
             rel1.relative: 1.0 0.0;
             rel1.to_y: "elm.bar_bg";
             rel2.relative: 1.0 1.0;
@@ -549,26 +484,21 @@ group { name: "elm/colorselector/base/default";
 }
 
 group { name: "elm/colorselector/arrow/default";
-   images.image: "ring_white_middle.png" COMP;
    parts {
-      part { name: "base";
+      part { name: "base"; type: RECT;
          description { state: "default" 0.0;
             aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "ring_white_middle.png";
+            color: 255 255 255 255;
          }
       }
    }
 }
 
 group{ name: "elm/colorselector/image/colorbar_0/default";
-   images {
-      image: "color_picker_color.png" COMP;
-   }
+   images.image: "color_picker_color.png" COMP;
    parts {
       part { name: "colorbar_0_image";
-         type: IMAGE;
          description { state: "default" 0.0;
-            rel2.offset: -1 -1;
             image.normal: "color_picker_color.png";
          }
       }
@@ -609,50 +539,54 @@ group { name: "elm/colorselector/image/colorbar_3/default";
 }
 
 group { name: "elm/colorselector/bg_image/colorbar_3/default";
-   images.image: "dot_pattern.png" COMP;
+   images.image: "diagonal_stripes.png" COMP;
    parts {
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
-            color: 48 48 48 255;
+            color: 32 32 32 255;
          }
       }
       part { name: "pat";
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "dot_pattern.png";
-            TILED_PATTERN(256, 256)
+            rel.to: "bg";
+            image.normal: "diagonal_stripes.png";
+            color: 255 255 255 16;
+            TILED_PATTERN(240, 240)
          }
       }
    }
 }
 
 group { name: "elm/colorselector/item/default";
-   images.image: "inset_shadow.png" COMP;
-   images.image: "bevel_in.png" COMP;
-   images.image: "dot_pattern.png" COMP;
-   images.image: "bg_glow_in.png" COMP;
+   images.image: "diagonal_stripes.png" COMP;
    parts {
+      part { name: "sel"; type: RECT;
+         description { state: "default" 0.0;
+            color: 51 153 255 0;
+         }
+         description { state: "focused" 0.0;
+            inherit: "default" 0.0;
+            color: 51 153 255 255;
+         }
+      }
       part { name: "bg"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            min: 20 20;
-            rel1.to: "color_obj";
-            rel2.to: "color_obj";
-            color: 48 48 48 255;
+            min: 16 16;
+            rel.to: "color_obj";
+            color: 32 32 32 255;
          }
       }
       part { name: "pat";
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "dot_pattern.png";
-            TILED_PATTERN(256, 256)
+            rel.to: "bg";
+            image.normal: "diagonal_stripes.png";
+            color: 255 255 255 16;
+            TILED_PATTERN(240, 240)
          }
       }
       part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "color_obj";
             rel2.to: "color_obj";
          }
          description { state: "disabled" 0.0;
@@ -662,90 +596,35 @@ group { name: "elm/colorselector/item/default";
       }
       alias: "color_obj" "elm.swallow.color_obj";
       part { name: "elm.swallow.color_obj"; type: SWALLOW;
+         scale: 1;
          clip_to: "clipper";
          description { state: "default" 0.0;
-            rel1.offset: 3 3;
-            rel2.offset: -4 -4;
-         }
-      }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            fill.smooth: 0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "dim"; type: RECT; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            color: 0 0 0 0;
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            color: 0 0 0 128;
-         }
-      }
-      part { name: "glow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "bg_glow_in.png";
-            image.border: 7 7 7 7;
-            image.middle: 0;
-            fill.smooth: 0;
-            color: 255 255 255 0;
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "inset"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel1.offset: -1 -1;
-            rel2.to: "bg";
-            rel2.offset: 0 0;
-            fill.smooth: 0;
+            min: 16 16;
+            rel1.offset: 5 5;
+            rel2.offset: -6 -6;
+            offscale;
          }
       }
    }
    programs {
-      program {
-         source: "elm"; signal: "elm,state,selected";
+      program { signal: "elm,state,selected"; source: "elm";
          action: STATE_SET "focused" 0.0;
-         transition: DECELERATE 0.1;
-         target: "glow";
-         target: "dim";
+         target: "sel";
       }
-      program {
-         source: "elm"; signal: "elm,state,unselected";
+      program { signal: "elm,state,unselected"; source: "elm";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
-         target: "glow";
-         target: "dim";
+         transition: DECELERATE 0.2;
+         target: "sel";
       }
-      program {
-         signal: "elm,anim,activate"; source: "elm";
+      program { signal: "elm,anim,activate"; source: "elm";
          action: STATE_SET "focused" 0.0;
-         transition: DECELERATE 0.1;
-         target: "glow";
-         target: "dim";
+         target: "sel";
          after: "active2";
       }
       program { name: "active2";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.8;
-         target: "glow";
-         target: "dim";
+         transition: DECELERATE 0.2;
+         target: "sel";
       }
    }
 }

data/elementary/themes/edc/elm/cursor.edc

@@ -82,6 +82,7 @@ group { name: "elm/cursor/hand1/default";
    images.image: "pointer_hand1.png" COMP;
    parts {
       part { name: "base"; mouse_events: 0; scale: 1;
+         scale: 1;
          description { state: "default" 0.0;
             FIXED_SIZE(32, 32)
             image.normal: "pointer_hand1.png";
@@ -89,12 +90,12 @@ group { name: "elm/cursor/hand1/default";
       }
       part { name: "elm.swallow.hotspot"; type: SWALLOW;
          description { state: "default" 0.0;
-            visible: 0;
             fixed: 1 1;
-            rel1.relative: (26/32) (9/32);
+            visible: 0;
+            rel1.relative: (21/32) (7/32);
             rel1.to: "base";
             rel2.to: "base";
-            rel2.relative: (26/32) (9/32);
+            rel2.relative: (21/32) (7/32);
             rel2.offset: 0 0;
          }
       }
@@ -117,25 +118,20 @@ group { name: "elm/cursor/blank/default";
 }
 
 group { name: "elm/cursor/xterm/default";
-   images.image: "pointer_entry_bar.png" COMP;
-   images.image: "led_dot_white.png" COMP;
+   images.image: "pointer_entry.png" COMP;
    parts {
       part { name: "base"; mouse_events: 0; scale: 1;
+         scale: 1;
          description { state: "default" 0.0;
-            min: 15 20;
-            max: 15 99999;
-            image.normal: "pointer_entry_bar.png";
-            image.border: 0 0 10 10;
-            rel1.offset: 0 2;
-            rel2.offset: -1 -3;
+            image.normal: "pointer_entry.png";
+            FIXED_SIZE(16, 32)
          }
       }
       part { name: "elm.swallow.hotspot"; type: SWALLOW;
          description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
             rel1.relative: 0.5 0.5;
             rel2.relative: 0.5 0.5;
             rel2.offset: 0 0;
@@ -143,15 +139,5 @@ group { name: "elm/cursor/xterm/default";
       }
       /* elm.content.hotspot is the old name for the above part */
       alias: "elm.content.hotspot" "elm.swallow.hotspot";
-      part { name: "shine";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "led_dot_white.png";
-            max: 27 27;
-            aspect: 1.0 1.0;
-            aspect_preference: VERTICAL;
-         }
-      }
    }
 }

data/elementary/themes/edc/elm/dayselector.edc

@@ -10,9 +10,7 @@
 
 #define DAYSELECTOR_DAY(_pos, _after)\
    alias: "day"#_pos "elm.swallow.day"#_pos; \
-   part {\
-      name: "elm.swallow.day"#_pos;\
-      type: SWALLOW;\
+   part { name: "elm.swallow.day"#_pos; type: SWALLOW;\
       scale: 1;\
       clip_to: "clipper";\
       description { state: "default" 0.0;\
@@ -37,17 +35,11 @@
       }\
    }\
    programs{\
-      program {\
-         name: "day"#_pos"visible";\
-         signal: "elm,day"#_pos",visible";\
-         source: "elm";\
+      program { signal: "elm,day"#_pos",visible"; source: "elm";\
          action: STATE_SET "visible" 0.0;\
          target: "elm.swallow.day"#_pos;\
       }\
-      program {\
-         name: "day"#_pos"notvisible";\
-         signal: "elm,day"#_pos",default";\
-         source: "elm";\
+      program { signal: "elm,day"#_pos",default"; source: "elm";\
          action: STATE_SET "default" 0.0;\
          target: "elm.swallow.day"#_pos;\
       }\
@@ -55,9 +47,7 @@
 
 group { name: "elm/dayselector/base/default";
    parts {
-      part {
-         name: "elm.swallow.day0";
-         type: SWALLOW;
+      part { name: "elm.swallow.day0"; type: SWALLOW;
          scale: 1;
          clip_to: "clipper";
          description { state: "default" 0.0;
@@ -78,63 +68,43 @@ group { name: "elm/dayselector/base/default";
       DAYSELECTOR_DAY(4, 3)
       DAYSELECTOR_DAY(5, 4)
       DAYSELECTOR_DAY(6, 5)
-      part {
-         name: "clipper";
-         type: RECT;
-         description {
-            state: "default" 0.0;
+      part { name: "clipper"; type: RECT;
+         description { state: "default" 0.0;
             rel1.to: "elm.swallow.day0";
             rel2.to: "elm.swallow.day6";
          }
-         description {
-            state: "visible" 0.0;
+         description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 185 185 185 185;
+            color: 255 255 255 128;
          }
       }
-      part {
-         name: "disabler";
-         type: RECT;
-         description {
-            state: "default" 0.0;
+      part { name: "disabler"; type: RECT;
+         description { state: "default" 0.0;
             color: 0 0 0 0;
             visible: 0;
          }
-         description {
-            state: "visible" 0.0;
+         description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
          }
       }
    }
    programs {
-      program {
-         name: "disble_dayselector";
-         signal: "elm,state,disabled";
-         source: "elm";
+      program { signal: "elm,state,disabled"; source: "elm";
          action: STATE_SET "visible" 0.0;
          target: "disabler";
          target: "clipper";
       }
-      program {
-         name: "enable_dayselector";
-         signal: "elm,state,enabled";
-         source: "elm";
+      program { signal: "elm,state,enabled"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "disabler";
          target: "clipper";
       }
-      program {
-         name: "day0_visible";
-         signal: "elm,day0,visible";
-         source: "elm";
+      program { signal: "elm,day0,visible"; source: "elm";
          action: STATE_SET "visible" 0.0;
          target: "elm.swallow.day0";
       }
-      program {
-         name: "day0_default";
-         signal: "elm,day0,default";
-         source: "elm";
+      program { signal: "elm,day0,default"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.swallow.day0";
       }
@@ -142,188 +112,105 @@ group { name: "elm/dayselector/base/default";
 }
 
 group { name: "elm/check/base/dayselector/default";
-   images {
-      image: "day_middle_normal.png" COMP;
-      image: "day_left_normal.png" COMP;
-      image: "day_right_normal.png" COMP;
-      image: "day_middle_press.png" COMP;
-      image: "day_middle_selected.png" COMP;
-      image: "day_left_press.png" COMP;
-      image: "day_left_selected.png" COMP;
-      image: "day_right_press.png" COMP;
-      image: "day_right_selected.png" COMP;
-   }
    script {
       public check_pos; // Left, Right, Middle.
       public check_type; // Weekday, Weekend.
       public check_state = DAYSELECOR_DAY_STATE_DEFAULT; // Default, Pressed, Selected.
 
       public check_bg_show() {
-         if(get_int(check_pos) == DAYSELECOR_DAY_POS_LEFT) {
-           if(get_int(check_state) == DAYSELECOR_DAY_STATE_DEFAULT)
+         if (get_int(check_pos) == DAYSELECOR_DAY_POS_LEFT) {
+           if (get_int(check_state) == DAYSELECOR_DAY_STATE_DEFAULT)
              set_state(PART:"bg", "default_left", 0.0);
-           else if(get_int(check_state) == DAYSELECOR_DAY_STATE_PRESSED)
+           else if (get_int(check_state) == DAYSELECOR_DAY_STATE_PRESSED)
              set_state(PART:"bg", "pressed_left", 0.0);
-           else if(get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
+           else if (get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
              set_state(PART:"bg", "selected_left", 0.0);
-         }
-         else if(get_int(check_pos) == DAYSELECOR_DAY_POS_RIGHT) {
-           if(get_int(check_state) == DAYSELECOR_DAY_STATE_DEFAULT)
+         } else if (get_int(check_pos) == DAYSELECOR_DAY_POS_RIGHT) {
+           if (get_int(check_state) == DAYSELECOR_DAY_STATE_DEFAULT)
              set_state(PART:"bg", "default_right", 0.0);
-           else if(get_int(check_state) == DAYSELECOR_DAY_STATE_PRESSED)
+           else if (get_int(check_state) == DAYSELECOR_DAY_STATE_PRESSED)
              set_state(PART:"bg", "pressed_right", 0.0);
-           else if(get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
+           else if (get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
              set_state(PART:"bg", "selected_right", 0.0);
-         }
-         else if(get_int(check_pos) == DAYSELECOR_DAY_POS_MIDDLE) {
-           if(get_int(check_state) == DAYSELECOR_DAY_STATE_DEFAULT)
+         } else if (get_int(check_pos) == DAYSELECOR_DAY_POS_MIDDLE) {
+           if (get_int(check_state) == DAYSELECOR_DAY_STATE_DEFAULT)
              set_state(PART:"bg", "default_middle", 0.0);
-           else if(get_int(check_state) == DAYSELECOR_DAY_STATE_PRESSED)
+           else if (get_int(check_state) == DAYSELECOR_DAY_STATE_PRESSED)
              set_state(PART:"bg", "pressed_middle", 0.0);
-           else if(get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
+           else if (get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED)
              set_state(PART:"bg", "selected_middle", 0.0);
          }
       }
       public check_text_show() {
-        if(get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED) {
+        if (get_int(check_state) == DAYSELECOR_DAY_STATE_SELECTED) {
           set_state(PART:"elm.text", "selected", 0.0);
-          set_state(PART:"text2", "selected", 0.0);
         } else {
-          if(get_int(check_type) == DAYSELECOR_DAY_TYPE_WEEKDAY) {
+          if (get_int(check_type) == DAYSELECOR_DAY_TYPE_WEEKDAY) {
             set_state(PART:"elm.text", "default", 0.0);
-            set_state(PART:"text2", "default", 0.0);
           } else if (get_int(check_type) ==
                      DAYSELECOR_DAY_TYPE_WEEKEND_DEFAULT) {
             set_state(PART:"elm.text", "weekend_default", 0.0);
-            set_state(PART:"text2", "weekend_default", 0.0);
           }
           else if (get_int(check_type) == DAYSELECOR_DAY_TYPE_WEEKEND_STYLE1) {
             set_state(PART:"elm.text", "weekend_style1", 0.0);
-            set_state(PART:"text2", "weekend_style1", 0.0);
           }
         }
       }
       public check_text_pressed() {
         set_state(PART:"elm.text", "pressed", 0.0);
-        set_state(PART:"text2", "default", 0.0);
       }
    }
    parts {
-      part {
-         name: "bg";
+      part { name: "bg"; type: RECT;
          mouse_events: 0;
-         scale: 1;
-         description {
-            state: "default" 0.0;
-            image {
-               normal: "day_middle_normal.png";
-               border: 1 1 3 4;
-            }
+         description { state: "default" 0.0;
+            color: 80 80 80 255;
          }
          /* default */
          description { state: "default_left" 0.0;
             inherit: "default" 0.0;
-            image {
-               normal: "day_left_normal.png";
-               border: 4 1 3 4;
-            }
          }
          description { state: "default_right" 0.0;
             inherit: "default" 0.0;
-            image {
-               normal: "day_right_normal.png";
-               border: 1 4 3 5;
-            }
          }
          description { state: "default_middle" 0.0;
             inherit: "default" 0.0;
-            image {
-               normal: "day_middle_normal.png";
-               border: 1 1 3 4;
-            }
          }
          /* pressed */
          description { state: "pressed_left" 0.0;
             inherit: "default" 0.0;
-            image {
-               normal: "day_left_press.png";
-               border:  5 1 4 5;
-            }
+            color: 51 153 255 255;
          }
          description { state: "pressed_right" 0.0;
             inherit: "default" 0.0;
-            image {
-               normal: "day_right_press.png";
-               border:  1 5 4 5;
-            }
+            color: 51 153 255 255;
          }
          description { state: "pressed_middle" 0.0;
             inherit: "default" 0.0;
-            image {
-               normal: "day_middle_press.png";
-               border: 2 1 4 7;
-            }
+            color: 51 153 255 255;
          }
          /* selected */
          description { state: "selected_left" 0.0;
             inherit: "default" 0.0;
-            image {
-               normal: "day_left_selected.png";
-               border:  5 1 4 5;
-            }
+            color: 51 153 255 255;
          }
          description { state: "selected_right" 0.0;
             inherit: "default" 0.0;
-            image {
-               normal: "day_right_selected.png";
-               border:  1 5 4 5;
-            }
+            color: 51 153 255 255;
          }
          description { state: "selected_middle" 0.0;
             inherit: "default" 0.0;
-            image {
-               normal: "day_middle_selected.png";
-               border: 2 1 4 7;
-            }
+            color: 51 153 255 255;
          }
       }
-      part {
-         name: "left_padding";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 5 0;
-            fixed: 1 0;
-            align: 0.0 0.5;
-            rel2.relative: 0.0 1.0;
-         }
-      }
-      part {
-         name: "right_padding";
-         type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            min: 5 0;
-            fixed: 1 0;
-            align: 1.0 0.5;
-            rel1.relative: 1.0 0.0;
-         }
-      }
-      part {
-         name: "elm.text";
-         type: TEXT;
+      part { name: "elm.text"; type: TEXT;
          mouse_events: 0;
          scale: 1;
-         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            rel1 {
-               to: "left_padding";
-               relative: 1.0 0.0;
-            }
-            rel2 {
-               to: "right_padding";
-               relative: 0.0 1.0;
-            }
+            color: 160 160 160 255;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            offscale;
             text {
                font: FN;
                size: 10;
@@ -331,145 +218,94 @@ group { name: "elm/check/base/dayselector/default";
                ellipsis: -1;
                text_class: "button";
             }
-            color: FN_COL_DEFAULT;
          }
          description { state: "weekend_default" 0.0;
             inherit: "default" 0.0;
-            color: 175 175 175 255;
-            color3: 0 0 0 128;
-            visible: 1;
+            color: 128 128 128 255;
          }
          description { state: "weekend_style1" 0.0;
             inherit: "default" 0.0;
-            visible: 0;
+            color: 128 128 128 255;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            visible: 0;
+            color: 255 255 255 255;
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
             color: 255 255 255 255;
-            color3: 255 255 255 0;
-            visible: 1;
          }
       }
-      part {
-         name: "text2";
-         type: TEXT;
-         mouse_events: 0;
-         scale: 1;
-         effect: GLOW;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel1.offset: 0 -1;
-            rel2.to: "elm.text";
-            rel2.offset: -1 -2;
-            text {
-               font: FN;
-               size: 10;
-               min: 1 1;
-               ellipsis: -1;
-               text_source: "elm.text";
-               text_class: "button";
-            }
-            color: FN_COL_HIGHLIGHT;
-            visible: 0;
-         }
-         description { state: "weekend_default" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-         description { state: "weekend_style1" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-            color2: 255 255 255 24;
-            color3: 255 255 255 18;
-            visible: 1;
-         }
-      }
-      part {
-         name: "events";
-         type: RECT;
+      part { name: "events"; type: RECT;
          ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+         description { state: "default" 0.0;
             color: 0 0 0 0;
          }
       }
    }
    programs {
-      program { name: "check,pressed";
-         signal: "mouse,down,1"; source: "events";
+      program { signal: "mouse,down,1"; source: "events";
          script {
             set_int(check_state, DAYSELECOR_DAY_STATE_PRESSED);
             check_bg_show();
             check_text_pressed();
          }
       }
-      program { name: "check,toggle";
-         signal: "mouse,up,1"; source: "events";
-         action: SIGNAL_EMIT "elm,action,check,toggle" "elm";
-      }
-      program { name: "check,on";
-         signal: "elm,state,check,on"; source: "elm";
-         script {
-            set_int(check_state, DAYSELECOR_DAY_STATE_SELECTED);
-            check_bg_show();
-            check_text_show();
-         }
-      }
-      program { name: "check,off";
-         signal: "elm,state,check,off"; source: "elm";
+      program { signal: "mouse,up,1"; source: "events";
          script {
             set_int(check_state, DAYSELECOR_DAY_STATE_DEFAULT);
             check_bg_show();
             check_text_show();
          }
       }
-      program { name: "check,left";
-         signal: "elm,pos,check,left"; source: "elm";
+      program { signal: "mouse,clicked,1"; source: "events";
+         action: SIGNAL_EMIT "elm,action,check,toggle" "elm";
+      }
+      program { signal: "elm,state,check,on"; source: "elm";
+         script {
+            set_int(check_state, DAYSELECOR_DAY_STATE_SELECTED);
+            check_bg_show();
+            check_text_show();
+         }
+      }
+      program { signal: "elm,state,check,off"; source: "elm";
+         script {
+            set_int(check_state, DAYSELECOR_DAY_STATE_DEFAULT);
+            check_bg_show();
+            check_text_show();
+         }
+      }
+      program { signal: "elm,pos,check,left"; source: "elm";
          script {
             set_int(check_pos, DAYSELECOR_DAY_POS_LEFT);
             check_bg_show();
          }
       }
-      program { name: "check,right";
-         signal: "elm,pos,check,right"; source: "elm";
+      program { signal: "elm,pos,check,right"; source: "elm";
          script {
             set_int(check_pos, DAYSELECOR_DAY_POS_RIGHT);
             check_bg_show();
          }
       }
-      program { name: "check,middle";
-         signal: "elm,pos,check,middle"; source: "elm";
+      program { signal: "elm,pos,check,middle"; source: "elm";
          script {
             set_int(check_pos, DAYSELECOR_DAY_POS_MIDDLE);
             check_bg_show();
          }
       }
-      program { name: "check,weekday";
-         signal: "elm,type,weekday,default"; source: "elm";
+      program { signal: "elm,type,weekday,default"; source: "elm";
          script {
             set_int(check_type, DAYSELECOR_DAY_TYPE_WEEKDAY);
             check_text_show();
          }
       }
-      program { name: "check,weekend,default";
-         signal: "elm,type,weekend,default"; source: "elm";
+      program { signal: "elm,type,weekend,default"; source: "elm";
          script {
             set_int(check_type, DAYSELECOR_DAY_TYPE_WEEKEND_DEFAULT);
             check_text_show();
          }
       }
-      program { name: "check,weekend,style1";
-         signal: "elm,type,weekend,style1"; source: "elm";
+      program { signal: "elm,type,weekend,style1"; source: "elm";
          script {
             set_int(check_type, DAYSELECOR_DAY_TYPE_WEEKEND_STYLE1);
             check_text_show();

data/elementary/themes/edc/elm/diskselector.edc

@@ -1,57 +1,34 @@
 group { name: "elm/diskselector/base/default";
-   images {
-      image: "bar_shine.png" COMP;
-   }
-
    parts {
-      part { name: "bg";
-         type: RECT;
+      part { name: "bg"; type: RECT;
          mouse_events: 0;
          description { state: "default" 0.0;
-            color: 25 25 25 255;
+            color: 48 48 48 255;
          }
       }
-      part { name: "shine_center";
-         mouse_events:  0;
+      part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            image.normal: "bar_shine.png";
-            color: 255 255 255 127;
+            rel.to: "bg";
          }
       }
-      part { name: "clipper";
-         type: RECT;
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
-         }
-      }
-      part { name: "elm.swallow.content";
+      part { name: "elm.swallow.content"; type: SWALLOW;
          clip_to: "clipper";
-         type: SWALLOW;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+            rel.to: "bg";
          }
       }
    }
 }
 
 group { name: "elm/diskselector/item/default";
-
    data {
       item: "len_threshold" "14";
       item: "display_item_num" "3";
       item: "min_height" "-1";
       item: "min_width" "-1";
    }
-
    parts {
-      part { name: "elm.swallow.icon";
-         type: SWALLOW;
+      part { name: "elm.swallow.icon"; type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 0;
@@ -102,16 +79,16 @@ group { name: "elm/diskselector/item/default";
             aspect: 1.0 1.0;
          }
       }
-      part { name: "elm.text";
-         type: TEXT;
+      part { name: "elm.text"; type: TEXT;
          scale: 1;
          description { state: "default" 0.0;
+            color: 160 160 160 255;
             rel1.relative: 1 0.0;
             rel1.to_x: "elm.swallow.icon";
             rel2.relative: 1.0 1.0;
             visible: 0;
             text {
-               font: "Sans,Edje-Vera";
+               font: "Sans";
                size: 10;
                align: 0.5 0.5;
                min: 0 1;
@@ -128,14 +105,14 @@ group { name: "elm/diskselector/item/default";
          }
          description { state: "left_side" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_GREY_152;
+            color: 80 80 80 255;
             text.size: 8;
             visible: 1;
             text.align: 0.2 0.5;
          }
          description { state: "right_side" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_GREY_152;
+            color: 80 80 80 255;
             visible: 1;
             text.size: 8;
             text.align: 0.8 0.5;
@@ -158,13 +135,11 @@ group { name: "elm/diskselector/item/default";
             rel2.relative: 1 1;
          }
       }
-      part { name: "over1";
-         type: RECT;
+      part { name: "over1"; type: RECT;
          mouse_events: 1;
          repeat_events: 1;
          ignore_flags: ON_HOLD;
-         description {
-            state: "default" 0.0;
+         description { state: "default" 0.0;
             color: 0 0 0 0;
          }
       }
@@ -299,8 +274,7 @@ group { name: "elm/diskselector/item/datetime/default";
            text.align: 0.8 0.5;
         }
      }
-     part { name: "over1";
-        type: RECT;
+     part { name: "over1"; type: RECT;
         mouse_events: 1;
         repeat_events: 1;
         ignore_flags: ON_HOLD;
@@ -319,70 +293,60 @@ group { name: "elm/diskselector/item/datetime/default";
             new pos, is_sel;
             pos = get_int(field_pos)
             is_sel = get_int(field_selected);
-            if (is_sel == 1)
-              {
-                 if (pos == 0)
-                   set_state(PART:"elm.text", "center_sel", 0.0);
-                 else if (pos == 1)
-                   set_state(PART:"elm.text", "left_side_sel", 0.0);
-                 else if (pos == 2)
-                   set_state(PART:"elm.text", "right_side_sel", 0.0);
-              }
-            else if (is_sel == 0)
-              {
-                 if (pos == 0)
-                   set_state(PART:"elm.text", "default", 0.0);
-                 else if (pos == 1)
-                   set_state(PART:"elm.text", "left_side", 0.0);
-                 else if (pos == 2)
-                   set_state(PART:"elm.text", "right_side", 0.0);
-              }
+            if (is_sel == 1) {
+               if (pos == 0)
+                 set_state(PART:"elm.text", "center_sel", 0.0);
+               else if (pos == 1)
+                 set_state(PART:"elm.text", "left_side_sel", 0.0);
+               else if (pos == 2)
+                 set_state(PART:"elm.text", "right_side_sel", 0.0);
+            } else if (is_sel == 0) {
+               if (pos == 0)
+                 set_state(PART:"elm.text", "default", 0.0);
+               else if (pos == 1)
+                 set_state(PART:"elm.text", "left_side", 0.0);
+               else if (pos == 2)
+                 set_state(PART:"elm.text", "right_side", 0.0);
+            }
          }
       }
-      program { name: "selected_text";
-         signal: "elm,state,selected"; source: "elm";
+      program { signal: "elm,state,selected"; source: "elm";
          script {
             set_int(field_selected, 1);
             update_state();
          }
       }
-      program { name: "default_text";
-         signal: "elm,state,default"; source: "elm";
+      program { signal: "elm,state,default"; source: "elm";
          script {
             set_int(field_selected, 0);
             update_state();
          }
       }
-      program { name: "center_text";
-         signal: "elm,state,center"; source: "elm";
+      program { signal: "elm,state,center"; source: "elm";
          script {
             set_int(field_pos, 0);
             update_state();
          }
       }
-      program { name: "center_small_text";
-         signal: "elm,state,center_small"; source: "elm";
+      program { signal: "elm,state,center_small"; source: "elm";
          script {
             set_int(field_pos, 0);
             update_state();
          }
       }
-      program { name: "l_side_text";
-         signal: "elm,state,left_side"; source: "elm";
+      program { signal: "elm,state,left_side"; source: "elm";
          script {
             set_int(field_pos, 1);
             update_state();
          }
       }
-      program { name: "r_side_text";
-         signal: "elm,state,right_side"; source: "elm";
+      program { signal: "elm,state,right_side"; source: "elm";
          script {
             set_int(field_pos, 2);
             update_state();
          }
       }
-      program { name: "field_click";
-         signal: "mouse,clicked,1"; source: "over1";
+      program { signal: "mouse,clicked,1"; source: "over1";
          action: SIGNAL_EMIT "elm,action,click" "elm";
       }
    }

data/elementary/themes/edc/elm/ews.edc

@@ -1,27 +1,5 @@
-group { name: "elm/ews/background/default";
-   images.image: "bg_radgrad.png" COMP;
-   images.image: "dot_pattern.png" COMP;
-   parts {
-      part { name: "bg";
-         description { state: "default" 0.0;
-            image.normal: "bg_radgrad.png";
-            image.scale_hint: STATIC;
-            fill.smooth: 0;
-            ASPECT_FILL((1024/653))
-         }
-      }
-      part { name: "pat";
-         description { state: "default" 0.0;
-            image.normal: "dot_pattern.png";
-            TILED_PATTERN(256, 256)
-         }
-      }
-   }
-}
-
 group { name: "elm/ews/decoration/default";
    images.image: "win_shadow.png" COMP;
-   images.image: "win_glow.png" COMP;
    images.image: "vgrad_med_lighter.png" COMP;
    images.image: "vgrad_med_dark.png" COMP;
    images.image: "bevel_out.png" COMP;
@@ -53,25 +31,6 @@ group { name: "elm/ews/decoration/default";
             visible: 0;
          }
       }
-      part { name: "glow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "win_glow.png";
-            image.border: 9 9 9 9;
-            image.middle: 0;
-            rel1.offset: -5  -5;
-            rel1.to: "top";
-            rel2.offset: 4 4;
-            rel2.to: "bottom";
-            fill.smooth: 0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-            visible: 1;
-         }
-      }
       part { name: "top";
          description { state: "default" 0.0;
             color_class: "border_top";
@@ -558,21 +517,13 @@ group { name: "elm/ews/decoration/default";
          signal: "elm,state,focus,on"; source: "elm";
          action: STATE_SET "focused" 0.0;
          transition: SINUSOIDAL 0.1;
-         target: "glow";
          target: "focus";
-         after: "focus2";
-      }
-      program { name: "focus2";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.4;
-         target: "glow";
       }
       program {
          signal: "elm,state,focus,off"; source: "elm";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.1;
          target: "focus";
-         target: "glow";
       }
       program {
          signal: "elm,state,focus,on"; source: "elm";
@@ -656,7 +607,6 @@ group { name: "elm/ews/decoration/default";
 
 group { name: "elm/ews/decoration/borderless";
    images.image: "win_shadow.png" COMP;
-   images.image: "win_glow.png" COMP;
    parts {
       part { name: "shadow"; mouse_events: 0;
          description { state: "default" 0.0;
@@ -667,23 +617,6 @@ group { name: "elm/ews/decoration/borderless";
             visible: 0;
          }
       }
-      part { name: "glow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "win_glow.png";
-            image.border: 9 9 9 9;
-            image.middle: 0;
-            rel1.offset: -5  -5;
-            rel2.offset: 4 4;
-            fill.smooth: 0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-         description { state: "focused" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-            visible: 1;
-         }
-      }
       part { name: "focus"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             color: 0 0 0 0;
@@ -701,21 +634,13 @@ group { name: "elm/ews/decoration/borderless";
          signal: "elm,state,focus,on"; source: "elm";
          action: STATE_SET "focused" 0.0;
          transition: SINUSOIDAL 0.1;
-         target: "glow";
          target: "focus";
-         after: "focus2";
-      }
-      program { name: "focus2";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.4;
-         target: "glow";
       }
       program {
          signal: "elm,state,focus,off"; source: "elm";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.1;
          target: "focus";
-         target: "glow";
       }
    }
 }

data/elementary/themes/edc/elm/flipselector.edc

@@ -2,14 +2,10 @@
 #define FLIP_PICKER_MAX_LEN_STR "50"
 
 group { name: "elm/flipselector/base/default";
+   images.image: "big_arrow_up.png" COMP;
+   images.image: "big_arrow_down.png" COMP;
    images.image: "flip_shad.png" COMP;
-   images.image: "sym_up_light_normal.png" COMP;
-   images.image: "sym_down_light_normal.png" COMP;
-   images.image: "sym_up_dark_normal.png" COMP;
-   images.image: "sym_down_dark_normal.png" COMP;
-   images.image: "shine.png" COMP;
    images.image: "win_shadow.png" COMP;
-   images.image: "bevel_out.png" COMP;
 
    data.item: "max_len" FLIP_PICKER_MAX_LEN_STR;
 
@@ -86,11 +82,9 @@ group { name: "elm/flipselector/base/default";
          set_tween_state(PART:"elm.bottom", pos, "shrink", 0.0, "default", 0.0);
          set_tween_state(PART:"bottom_cur", pos, "shrink", 0.0, "default", 0.0);
          set_tween_state(PART:"bottom_shadow", pos, "half", 0.0, "full", 0.0);
-         set_state(PART:"bottom_shine_cur", "visible", 0.0);
 
          if (pos >= 1.0) {
             set_state(PART:"bottom_shadow", "default", 0.0);
-            set_state(PART:"bottom_shine_cur", "default", 0.0);
             set_int(lock, 0);
             fetch_str(next, 0, tmp, FLIP_PICKER_MAX_LEN);
             if (strncmp(tmp, "", FLIP_PICKER_MAX_LEN) != 0) {
@@ -106,7 +100,6 @@ group { name: "elm/flipselector/base/default";
                          0.0);
          if (pos >= 1.0)
            {
-              set_state(PART:"top_shine_cur", "default", 0.0);
               anim(0.2, "animator_bottom_down", val);
            }
       }
@@ -122,9 +115,7 @@ group { name: "elm/flipselector/base/default";
 
          set_tween_state(PART:"elm.top", pos, "shrink", 0.0, "default", 0.0);
          set_tween_state(PART:"top_cur", pos, "shrink", 0.0, "default", 0.0);
-         set_tween_state(PART:"bottom_shadow", pos, "half", 0.0, "default",
-                         0.0);
-         set_state(PART:"top_shine_cur", "visible", 0.0);
+         set_tween_state(PART:"bottom_shadow", pos, "half", 0.0, "default", 0.0);
 
          if (pos >= 1.0) {
             set_state(PART:"bottom_shadow", "default", 0.0);
@@ -153,17 +144,18 @@ group { name: "elm/flipselector/base/default";
    }
    parts {
       part { name: "base_shadow"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            WIN_SHADOW;
+            rel.to: "base";
+            WIN_SHADOW_SMALL;
          }
       }
       part { name: "base"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 6 6;
-            rel2.offset: -7 -7;
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            offscale;
          }
       }
       part { name: "bottom"; type: RECT;
@@ -187,38 +179,36 @@ group { name: "elm/flipselector/base/default";
             visible: 0;
          }
       }
-      part { name: "bottom_prev";
-         type: RECT;
+      part { name: "bottom_prev"; type: RECT;
          mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "bottom";
-            rel2.to: "bottom";
-            color: 72 72 72 255;
+            rel.to: "bottom";
+            color: 96 96 96 255;
          }
       }
       part { name: "bottom_text_prev"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          clip_to: "bottom_clipper";
          scale: 1;
          description { state: "default" 0.0;
             rel1.to_x: "base";
             rel1.to_y: "arrow_top";
             rel1.relative: 0.0 0.7;
-            rel1.offset: 2 0;
+            rel1.offset: 2 2;
             rel2.to: "base";
             rel2.to_y: "arrow_bottom";
             rel2.relative: 1.0 0.3;
-            rel2.offset: -3 -1;
+            rel2.offset: -3 -3;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
                align: 0.5 0.5;
             }
-            color: FN_COL_DEFAULT;
+            color: 160 160 160 255;
+            offscale;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_DISABLE;
+            color: 112 112 112 255;
          }
       }
       part { name: "bottom_shadow"; mouse_events: 0;
@@ -243,9 +233,8 @@ group { name: "elm/flipselector/base/default";
       }
       part { name: "bottom_cur"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "bottom";
-            rel2.to: "bottom";
-            color: 72 72 72 255;
+            rel.to: "bottom";
+            color: 96 96 96 255;
          }
          description { state: "shrink" 0.0;
             inherit: "default" 0.0;
@@ -253,40 +242,25 @@ group { name: "elm/flipselector/base/default";
             rel2.relative: 1.0 0.0;
          }
       }
-      part { name: "bottom_shine_cur"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1 { to: "bottom_cur"; relative: 0 1; }
-            rel2.to: "bottom_cur";
-            image.normal: "shine.png";
-            min: 0 1;
-            fixed: 0 1;
-            align: 0.5 1;
-            visible: 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
       part { name: "elm.bottom"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          clip_to: "bottom_clipper";
          scale: 1;
          description { state: "default" 0.0;
             rel1.to_x: "base";
             rel1.to_y: "arrow_top";
             rel1.relative: 0.0 0.7;
-            rel1.offset: 2 0;
+            rel1.offset: 2 2;
             rel2.to: "base";
             rel2.to_y: "arrow_bottom";
             rel2.relative: 1.0 0.3;
-            rel2.offset: -3 -1;
+            rel2.offset: -3 -3;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
                align: 0.5 0.5;
             }
-            color: FN_COL_DEFAULT;
+            color: 160 160 160 255;
+            offscale;
          }
          description { state: "shrink" 0.0;
             inherit: "default" 0.0;
@@ -296,126 +270,95 @@ group { name: "elm/flipselector/base/default";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_DISABLE;
+            color: 112 112 112 255;
          }
       }
       part { name: "top_prev"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "top";
-            rel2.to: "top";
-            color: 56 56 56 255;
+            rel.to: "top";
+            color: 72 72 72 255;
          }
       }
       part { name: "top_text_prev"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          clip_to: "top_clipper";
          scale: 1;
          description { state: "default" 0.0;
             rel1.to_x: "base";
             rel1.to_y: "arrow_top";
             rel1.relative: 0.0 0.7;
-            rel1.offset: 2 0;
+            rel1.offset: 2 2;
             rel2.to: "base";
             rel2.to_y: "arrow_bottom";
             rel2.relative: 1.0 0.3;
-            rel2.offset: -3 -1;
+            rel2.offset: -3 -3;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
                align: 0.5 0.5;
                source: "elm.top";
             }
-            color: FN_COL_GREY_192;
+            color: 144 144 144 255;
+            offscale;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_GREY_16;
-         }
-      }
-      part { name: "top_shine_prev"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "top_prev";
-            rel2 { to: "top_prev"; relative: 1 0; }
-            image.normal: "shine.png";
-            min: 0 1;
-            fixed: 0 1;
-            align: 0.5 0;
+            color: 96 96 96 255;
          }
       }
       part { name: "top_cur"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "top";
-            rel2.to: "top";
-            color: 56 56 56 255;
+            rel.to: "top";
+            color: 72 72 72 255;
          }
          description { state: "shrink" 0.0;
             inherit: "default" 0.0;
             fixed: 0 1;
             rel1.relative: 0.0 1.0;
-            color: 40 40 40 255;
+            color: 32 32 32 255;
          }
       }
       part { name: "elm.top"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          clip_to: "top_clipper";
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "base";
+            rel1.to_x: "base";
+            rel1.to_y: "arrow_top";
+            rel1.relative: 0.0 0.7;
             rel1.offset: 2 2;
-            rel2.to: "base";
+            rel2.to_x: "base";
+            rel2.to_y: "arrow_bottom";
+            rel2.relative: 1.0 0.3;
             rel2.offset: -3 -3;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
                align: 0.5 0.5;
             }
-            color: FN_COL_GREY_192;
+            color: 144 144 144 255;
+            offscale;
          }
          description { state: "shrink" 0.0;
             inherit: "default" 0.0;
             visible: 0;
             rel1.relative: 0.0 0.5;
-         }
+            color: 48 48 48 255;
+        }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_GREY_16;
-         }
-      }
-      part { name: "top_shine_cur"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "top_cur";
-            rel2 { to: "top_cur"; relative: 1 0; }
-            image.normal: "shine.png";
-            min: 0 1;
-            fixed: 0 1;
-            align: 0.5 0;
-            visible: 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "base";
-            rel2.to: "base";
-            fill.smooth: 0;
+            color: 96 96 96 255;
          }
       }
       part { name: "arrow_top"; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            min: 15 15;
-            max: 15 15;
+            min: 17 14;
+            max: 17 14;
             align: 0.5 0.0;
-            rel1.to: "top";
-            rel2.to: "top";
-            image.normal: "sym_up_light_normal.png";
-            color: 192 192 192 255;
+            rel.to: "top";
+            rel1.offset: 0 2;
+            image.normal: "big_arrow_up.png";
+            color: 144 144 144 255;
+            offscale;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -423,18 +366,24 @@ group { name: "elm/flipselector/base/default";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            image.normal: "sym_up_dark_normal.png";
+             color: 96 96 96 255;
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+             color: 255 255 255 255;
          }
       }
       part { name: "arrow_bottom"; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            min: 15 15;
-            max: 15 15;
+            min: 17 14;
+            max: 17 14;
             align: 0.5 1.0;
-            rel1.to: "bottom";
-            rel2.to: "bottom";
-            image.normal: "sym_down_light_normal.png";
+            rel.to: "bottom";
+            rel2.offset: -1 -3;
+            image.normal: "big_arrow_down.png";
+            color: 160 160 160 255;
+            offscale;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -442,19 +391,21 @@ group { name: "elm/flipselector/base/default";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            image.normal: "sym_down_dark_normal.png";
+            color: 112 112 112 255;
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+             color: 255 255 255 255;
          }
       }
       part { name: "top_clipper"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "top";
-            rel2.to: "top";
+            rel.to: "top";
          }
       }
       part { name: "bottom_clipper"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "bottom";
-            rel2.to: "bottom";
+            rel.to: "bottom";
          }
       }
       part { name: "event_blocker"; type: RECT;
@@ -469,8 +420,7 @@ group { name: "elm/flipselector/base/default";
       }
    }
    programs {
-      program {
-         signal: "load"; source: "";
+      program { signal: "load"; source: "";
          script {
             append_str(cur, "");
             append_str(prev, "");
@@ -478,40 +428,49 @@ group { name: "elm/flipselector/base/default";
             set_int(lock, 0);
          }
       }
-      program {
-         signal: "elm,state,button,hidden"; source: "elm";
+      program { signal: "elm,state,button,hidden"; source: "elm";
          action: STATE_SET "hidden" 0.0;
          target: "arrow_top";
          target: "arrow_bottom";
          target: "top";
          target: "bottom";
       }
-      program {
-         signal: "elm,state,button,visible"; source: "elm";
+      program { signal: "elm,state,button,visible"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "arrow_top";
          target: "arrow_bottom";
          target: "top";
          target: "bottom";
       }
-      program { name: "up";
-         signal: "mouse,down,1"; source: "top";
+      program { signal: "mouse,down,1"; source: "top";
          action: SIGNAL_EMIT "elm,action,up,start" "elm";
       }
-      program { name: "up,stop";
-         signal: "mouse,up,1"; source: "top";
+      program { signal: "mouse,down,1"; source: "top";
+         action: STATE_SET "pressed" 0.0;
+         target: "arrow_top";
+      }
+      program { signal: "mouse,up,1"; source: "top";
          action: SIGNAL_EMIT "elm,action,up,stop" "elm";
       }
-      program { name: "down";
-         signal: "mouse,down,1"; source: "bottom";
+      program { signal: "mouse,up,1"; source: "top";
+         action: STATE_SET "default" 0.0;
+         target: "arrow_top";
+      }
+      program { signal: "mouse,down,1"; source: "bottom";
          action: SIGNAL_EMIT "elm,action,down,start" "elm";
       }
-      program { name: "down,stop";
-         signal: "mouse,up,1"; source: "bottom";
+      program { signal: "mouse,down,1"; source: "bottom";
+         action: STATE_SET "pressed" 0.0;
+         target: "arrow_bottom";
+      }
+      program { signal: "mouse,up,1"; source: "bottom";
          action: SIGNAL_EMIT "elm,action,down,stop" "elm";
       }
-      program { name: "disable";
-         signal: "elm,state,disabled"; source: "elm";
+      program { signal: "mouse,up,1"; source: "bottom";
+         action: STATE_SET "default" 0.0;
+         target: "arrow_bottom";
+      }
+      program { signal: "elm,state,disabled"; source: "elm";
          script {
             new st[31];
             new Float:vl;
@@ -530,12 +489,9 @@ group { name: "elm/flipselector/base/default";
               set_state(PART:"arrow_top", "disabled", 0.0);
 
             get_state(PART:"top_cur", st, 30, vl);
-            if (strcmp(st, "shrink"))
-              set_state(PART:"top_shine_cur", "visible", 0.0);
          }
       }
-      program { name: "enable";
-         signal: "elm,state,enabled"; source: "elm";
+      program { signal: "elm,state,enabled"; source: "elm";
          script {
             new st[31];
             new Float:vl;

data/elementary/themes/edc/elm/focus.edc

@@ -1,12 +1,10 @@
 group { name: "elm/focus_highlight/top/default";
-   images.image: "box_glow.png" COMP;
-   images.image: "box_outline.png" COMP;
    data.item: "animate" "on";
    script {
       public s_x, s_y, s_w, s_h; /* source */
       public difx, dify, difw, difh;
       public g_anim_id;
-      
+
       public animator1(val, Float:pos) {
          new x, y, w, h, dx, dy, dw, dh, Float:p;
          p = 1.0 - ((1.0 - pos) * (1.0 - pos) * (1.0 - pos));
@@ -27,14 +25,14 @@ group { name: "elm/focus_highlight/top/default";
 
       public update_offset(x, y, w, h) {
          set_state_val(PART:"base", STATE_REL1_OFFSET, x, y);
-         set_state_val(PART:"base", STATE_REL2_OFFSET, x + w, y + h);
+         set_state_val(PART:"base", STATE_REL2_OFFSET, x + w - 1, y + h - 1);
       }
 
       public message(Msg_Type:type, id, ...) {
          if ((type == MSG_INT_SET) && (id == 1)) {
             new x1, y1, w1, h1, x2, y2, w2, h2;
             new anim_id;
-            
+
             anim_id = get_int(g_anim_id);
             if (anim_id != 0) {
                cancel_anim(anim_id);
@@ -63,7 +61,7 @@ group { name: "elm/focus_highlight/top/default";
             set_state_val(PART:"base", STATE_REL2, 0.0, 0.0);
             update_offset(x1, y1, w1, h1);
             set_state(PART:"base", "custom", 0.0);
-            
+
             anim_id = anim(0.2, "animator1", 1);
             set_int(g_anim_id, anim_id);
          }
@@ -77,38 +75,106 @@ group { name: "elm/focus_highlight/top/default";
       }
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "glow";
-            rel2.to: "glow";
+            rel.to: "base";
+            rel1.relative: -1.0 -1.0;
+            rel1.offset: -999 -999;
+            rel2.relative: 2.0 2.0;
+            rel2.offset: 999 999;
             color: 255 255 255 0;
+            visible: 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             color: 255 255 255 255;
+            visible: 1;
          }
       }
-      part { name: "glow"; mouse_events: 0;
+      part { name: "top"; type: RECT;
          clip_to: "clip";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "box_glow.png";
-            image.border: 12 12 12 12;
-            image.middle: 0;
-            fill.smooth: 0;
-            rel1.to: "base";
-            rel1.offset: -7 -7;
-            rel2.to: "base";
-            rel2.offset: 5 5;
+            rel.to: "base";
+            color: 51 153 255 255;
+            rel2.relative: 1.0 0.0;
+            min: 4 4;
+         }
+         description { state: "hi" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
          }
       }
-      part { name: "sel"; mouse_events: 0;
+      part { name: "topl"; type: RECT;
          clip_to: "clip";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "box_outline.png";
-            image.border: 12 12 12 12;
-            image.middle: 0;
-            fill.smooth: 0;
-            rel1.to: "glow";
-            rel2.to: "glow";
-            color: 255 255 255 0;
+            rel.to: "top";
+            color: 51 153 255 255;
+            rel1.relative: 0.0 1.0;
+            rel2.relative: 0.0 1.0;
+            align: 0.0 0.0;
+            min: 4 4;
+         }
+         description { state: "hi" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+         }
+      }
+      part { name: "topr"; type: RECT;
+         clip_to: "clip";
+         scale: 1;
+         description { state: "default" 0.0;
+            rel.to: "top";
+            color: 51 153 255 255;
+            rel1.relative: 1.0 1.0;
+            rel2.relative: 1.0 1.0;
+            align: 1.0 0.0;
+            min: 4 4;
+         }
+         description { state: "hi" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+         }
+      }
+      part { name: "bot"; type: RECT;
+         clip_to: "clip";
+         scale: 1;
+         description { state: "default" 0.0;
+            rel.to: "base";
+            color: 51 153 255 255;
+            rel1.relative: 0.0 1.0;
+            min: 4 4;
+         }
+         description { state: "hi" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+         }
+      }
+      part { name: "botl"; type: RECT;
+         clip_to: "clip";
+         scale: 1;
+         description { state: "default" 0.0;
+            rel.to: "bot";
+            color: 51 153 255 255;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 0.0 0.0;
+            align: 0.0 1.0;
+            min: 4 4;
+         }
+         description { state: "hi" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+         }
+      }
+      part { name: "botr"; type: RECT;
+         clip_to: "clip";
+         scale: 1;
+         description { state: "default" 0.0;
+            rel.to: "bot";
+            color: 51 153 255 255;
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 1.0 0.0;
+            align: 1.0 1.0;
+            min: 4 4;
          }
          description { state: "hi" 0.0;
             inherit: "default" 0.0;
@@ -117,8 +183,7 @@ group { name: "elm/focus_highlight/top/default";
       }
    }
    programs {
-      program {
-         signal: "elm,action,focus,show"; source: "elm";
+      program { signal: "elm,action,focus,show"; source: "elm";
          action: ACTION_STOP;
          target: "pulse";
          target: "pulse2";
@@ -134,8 +199,7 @@ group { name: "elm/focus_highlight/top/default";
       program { name: "go3";
          action: SIGNAL_EMIT "elm,action,focus,show,end" "elm";
       }
-      program {
-         signal: "elm,action,focus,hide"; source: "elm";
+      program { signal: "elm,action,focus,hide"; source: "elm";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.4;
          target: "clip";
@@ -154,17 +218,26 @@ group { name: "elm/focus_highlight/top/default";
          action: STATE_SET "hi" 0.0;
          transition: SINUSOIDAL 0.2;
          in: 3.0 0.0;
-         target: "sel";
+         target: "top";
+         target: "topl";
+         target: "topr";
+         target: "bot";
+         target: "botl";
+         target: "botr";
          after: "pulse2";
       }
       program { name: "pulse2";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.4;
-         target: "sel";
+         target: "top";
+         target: "topl";
+         target: "topr";
+         target: "bot";
+         target: "botl";
+         target: "botr";
          after: "pulse";
       }
-      program {
-         signal: "elm,state,anim,stop"; source: "elm";
+      program { signal: "elm,state,anim,stop"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "base";
       }

data/elementary/themes/edc/elm/frame.edc

@@ -1,113 +1,86 @@
 group { name: "elm/frame/base/default";
-   images.image: "shadow_square_tiny.png" COMP;
-   images.image: "vgrad_med_curved.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "holes_tiny_vert.png" COMP;
+   images.image: "win_shadow.png" COMP;
    parts {
       part { name: "shadow"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: -1 0;
-            rel2.offset: 0 1;
-            image.normal: "shadow_square_tiny.png";
-            image.border: 6 6 6 6;
-            fill.smooth: 0;
+            rel.to: "base";
+            WIN_SHADOW_SMALL;
+         }
+         description { state: "hidden" 0.0;
+            inherit;
+            visible: 0;
          }
       }
       part { name: "base"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.relative: 0.0 1.0;
-            rel1.offset: 2 0;
-            rel1.to_y: "top";
-            rel2.offset: -3 -3;
-            color: 64 64 64 255;
+            rel1.offset: 6 6;
+            rel2.offset: -7 -7;
+            color: 80 80 80 255;
+            offscale;
          }
       }
-      part { name: "top";
+      part { name: "top"; type: SPACER;
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "vgrad_med_curved.png";
-            rel1.offset: 2 2;
+            rel1.to: "base";
+            rel2.to_x: "base";
             rel2.to_y: "elm.text";
-            rel2.offset: -3 -1;
-            fill.smooth: 0;
-            TILED_HORIZ(120)
-         }
-      }
-      part { name: "edge1";
-         description { state: "default" 0.0;
-            image.normal: "holes_tiny_vert.png";
-            rel1.offset: 4 0;
-            rel1.to_y: "elm.text";
-            rel2.offset: 4 -1;
-            rel2.relative: 0.0 1.0;
-            rel2.to_y: "elm.text";
-            align: 0.0 0.5;
-            FIXED_SIZE(3, 11)
-         }
-      }
-      part { name: "edge2";
-         description { state: "default" 0.0;
-            image.normal: "holes_tiny_vert.png";
-            rel1.offset: -5 0;
-            rel1.to_y: "elm.text";
-            rel1.relative: 1.0 0.0;
-            rel2.offset: -5 -1;
-            rel2.relative: 1.0 1.0;
-            rel2.to_y: "elm.text";
-            align: 1.0 0.5;
-            FIXED_SIZE(3, 11)
+            rel2.offset: -1 3;
+            offscale;
          }
       }
       part { name: "elm.text"; type: TEXT;
          scale: 1;
-         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            color_class: "frame";
-            rel1.relative: 1.0 0.0;
-            rel1.offset: 1 2;
-            rel1.to_x: "edge1";
-            rel2.relative: 0.0 0.0;
-            rel2.offset: -3 1;
-            rel2.to_x: "edge2";
+            rel1.offset: 4 4;
+            rel1.to: "base";
+            rel2.relative: 1.0 0.0;
+            rel2.offset: -5 4;
+            rel2.to: "base";
             align: 0.0 0.0;
-            color: FN_COL_DISABLE;
+            color: 255 255 255 255;
             text { font: FNBD; size: 10;
-               text_class: "frame";
                align: 0.0 0.0;
                min: 0 1;
             }
             fixed: 0 1;
+            offscale;
+         }
+      }
+      part { name: "bg"; type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to_x: "base";
+            rel1.to_y: "top";
+            rel1.relative: 0.0 1.0;
+            rel2.to: "base";
+            color: 64 64 64 255;
          }
       }
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.relative: 0.0 1.0;
-            rel1.offset: 5 0;
-            rel1.to_y: "elm.text";
-            rel2.offset: -7 -7;
+            rel1.to: "bg";
+            rel2.to: "bg";
          }
       }
       part { name: "elm.swallow.content"; type: SWALLOW;
          clip_to: "clip";
+         scale: 1;
          description { state: "default" 0.0;
             align: 0.0 1.0;
-            rel1.relative: 0.0 1.0;
-            rel1.offset: 5 0;
-            rel1.to_y: "elm.text";
-            rel2.offset: -7 -7;
+            rel1.to: "bg";
+            rel1.offset: 4 4;
+            rel2.to: "bg";
+            rel2.offset: -5 -5;
+            offscale;
          }
          description { state: "collapsed" 0.0;
             inherit: "default" 0.0;
             minmul: 1.0 0.0;
-         }
-      }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
+            rel1.offset: 4 0;
+            rel2.offset: -5 -1;
          }
       }
       part { name: "event"; type: RECT; ignore_flags: ON_HOLD;
@@ -245,18 +218,19 @@ group { name: "elm/frame/base/outdent_top";
    parts {
       part { name: "elm.swallow.content"; type: SWALLOW;
          description { state: "default" 0.0;
-            rel1.offset: 3 3;
-            rel2.offset: -4 -4;
+            rel1.to_y: "base";
+            rel1.relative: 0.0 1.0;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
          }
       }
-      part { name: "base";
+      part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            image.normal: "separator_horiz.png";
-            rel1.offset: 0 2;
-            rel2.offset: -1 3; 
+            fixed: 0 1;
+            rel1.offset: 4 2;
+            rel2.offset: -5 2;
             rel2.relative: 1.0 0.0;
-            min: 0 2;
-            fill.smooth: 0;
+            min: 0 1;
          }
       }
    }
@@ -267,18 +241,19 @@ group { name: "elm/frame/base/outdent_bottom";
    parts {
       part { name: "elm.swallow.content"; type: SWALLOW;
          description { state: "default" 0.0;
-            rel1.offset: 3 3;
-            rel2.offset: -4 -4;
+            rel1.offset: 4 4;
+            rel2.to_y: "base";
+            rel2.relative: 1.0 0.0;
+            rel2.offset: -5 -5;
          }
       }
-      part { name: "base";
+      part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            image.normal: "separator_horiz.png";
-            rel1.offset: 0 -4;
+            fixed: 0 1;
+            rel1.offset: 4 -3;
             rel1.relative: 0.0 1.0;
-            rel2.offset: -1 -3;
-            min: 0 2;
-            fill.smooth: 0;
+            rel2.offset: -5 -3;
+            min: 0 1;
          }
       }
    }

data/elementary/themes/edc/elm/hover.edc

@@ -135,8 +135,7 @@ group { name: "elm/hover/base/default";
       }
       part { name: "elm.swallow.slot.middle"; type: SWALLOW;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.size";
-            rel2.to: "elm.swallow.size";
+            rel.to: "elm.swallow.size";
          }
       }
    }
@@ -165,30 +164,30 @@ group { name: "elm/hover/base/default";
 
 group { name: "elm/hover/base/popout";
    data.item: "dismiss" "on";
-   images.image: "button_normal.png" COMP;
+   images.image: "shad_angle_l.png" COMP;
+   images.image: "shad_angle_r.png" COMP;
+   images.image: "shad_angle_t.png" COMP;
+   images.image: "shad_angle_b.png" COMP;
    script {
       public on_dismiss = 0;
    }
    parts {
       part { name: "elm.swallow.offset"; type: SWALLOW;
          description { state: "default" 0.0;
-            align: 0.0 0.0;
             fixed: 1 1;
-            rel1.relative: 0.0 0.0;
+            align: 0.0 0.0;
             rel2.relative: 0.0 0.0;
          }
       }
       part { name: "elm.swallow.size"; type: SWALLOW;
          description { state: "default" 0.0;
-            align: 0.0 0.0;
             fixed: 1 1;
-            rel1.to: "elm.swallow.offset";
+            align: 0.0 0.0;
+            rel.to: "elm.swallow.offset";
             rel1.relative: 1.0 1.0;
-            rel2.to: "elm.swallow.offset";
-            rel2.relative: 1.0 1.0;
          }
       }
-      part { name: "base"; type: RECT; mouse_events: 1;
+      part { name: "base"; type: RECT;
          description { state: "default" 0.0;
             color: 0 0 0 0;
          }
@@ -204,17 +203,66 @@ group { name: "elm/hover/base/popout";
             rel2.offset: 1 -1;
          }
       }
-      part { name: "left";
+      part { name: "shad_left"; nomouse;
+         scale: 1;
          clip_to: "leftclip";
          description { state: "default" 0.0;
             visible: 0;
-            rel1.to: "elm.swallow.slot.left";
-            rel1.offset: -5 -5;
-            rel2.to: "elm.swallow.slot.left";
-            rel2.offset: 4 4;
-            image.normal: "button_normal.png";
-            image.border: 4 4 3 5;
-            image.middle: SOLID;
+            rel.to: "left";
+            WIN_SHADOW_ANGLE_SMALL("shad_angle_l.png");
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "shad_right"; nomouse;
+         scale: 1;
+         clip_to: "rightclip";
+         description { state: "default" 0.0;
+            visible: 0;
+            rel.to: "right";
+            WIN_SHADOW_ANGLE_SMALL("shad_angle_r.png");
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "shad_top"; nomouse;
+         scale: 1;
+         clip_to: "topclip";
+         description { state: "default" 0.0;
+            visible: 0;
+            rel.to: "top";
+            WIN_SHADOW_ANGLE_SMALL("shad_angle_t.png");
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "shad_bottom"; nomouse;
+         scale: 1;
+         clip_to: "bottomclip";
+         description { state: "default" 0.0;
+            visible: 0;
+            rel.to: "bottom";
+            WIN_SHADOW_ANGLE_SMALL("shad_angle_b.png");
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "left"; type: RECT;
+         clip_to: "leftclip";
+         description { state: "default" 0.0;
+            visible: 0;
+            rel.to: "elm.swallow.slot.left";
+            rel1.offset: -6 -6;
+            rel2.offset: -1 5;
+            color: 64 64 64 255;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -224,14 +272,11 @@ group { name: "elm/hover/base/popout";
       part { name: "elm.swallow.slot.left"; type: SWALLOW;
          clip_to: "leftclip";
          description { state: "default" 0.0;
-            align: 0.0 0.5;
             fixed: 1 0;
-            rel1.to: "elm.swallow.slot.middle";
-            rel1.relative: 0.0 0.0;
+            align: 0.0 0.5;
+            rel.to: "elm.swallow.slot.middle";
             rel1.offset: -1 0;
-            rel2.to: "elm.swallow.slot.middle";
             rel2.relative: 0.0 1.0;
-            rel2.offset: -1 -1;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -247,17 +292,14 @@ group { name: "elm/hover/base/popout";
             rel1.offset: -2 0;
          }
       }
-      part { name: "right";
+      part { name: "right"; type: RECT;
          clip_to: "rightclip";
          description { state: "default" 0.0;
             visible: 0;
-            rel1.to: "elm.swallow.slot.right";
-            rel1.offset: -5 -5;
-            rel2.to: "elm.swallow.slot.right";
-            rel2.offset: 4 4;
-            image.normal: "button_normal.png";
-            image.border: 4 4 3 5;
-            image.middle: SOLID;
+            rel.to: "elm.swallow.slot.right";
+            rel1.offset: 0 -6;
+            rel2.offset: 5 5;
+            color: 64 64 64 255;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -267,13 +309,10 @@ group { name: "elm/hover/base/popout";
       part { name: "elm.swallow.slot.right"; type: SWALLOW;
          clip_to: "rightclip";
          description { state: "default" 0.0;
-            align: 1.0 0.5;
             fixed: 1 0;
-            rel1.to: "elm.swallow.slot.middle";
+            align: 1.0 0.5;
+            rel.to: "elm.swallow.slot.middle";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 0 0;
-            rel2.to: "elm.swallow.slot.middle";
-            rel2.relative: 1.0 1.0;
             rel2.offset: 0 -1;
          }
          description { state: "visible" 0.0;
@@ -290,17 +329,14 @@ group { name: "elm/hover/base/popout";
             rel2.offset: -1 1;
          }
       }
-      part { name: "top";
+      part { name: "top"; type: RECT;
          clip_to: "topclip";
          description { state: "default" 0.0;
             visible: 0;
-            rel1.to: "elm.swallow.slot.top";
-            rel1.offset: -5 -5;
-            rel2.to: "elm.swallow.slot.top";
-            rel2.offset: 4 4;
-            image.normal: "button_normal.png";
-            image.border: 4 4 3 5;
-            image.middle: SOLID;
+            rel.to: "elm.swallow.slot.top";
+            rel1.offset: -6 -6;
+            rel2.offset: 5 -1;
+            color: 64 64 64 255;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -310,15 +346,11 @@ group { name: "elm/hover/base/popout";
       part { name: "elm.swallow.slot.top"; type: SWALLOW;
          clip_to: "topclip";
          description { state: "default" 0.0;
-            visible: 1;
-            align: 0.5 0.0;
             fixed: 0 1;
-            rel1.to: "elm.swallow.slot.middle";
-            rel1.relative: 0.0 0.0;
+            align: 0.5 0.0;
+            rel.to: "elm.swallow.slot.middle";
             rel1.offset: 0 -1;
-            rel2.to: "elm.swallow.slot.middle";
             rel2.relative: 1.0 0.0;
-            rel2.offset: -1 -1;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -334,17 +366,14 @@ group { name: "elm/hover/base/popout";
             rel1.offset: -1 -2;
          }
       }
-      part { name: "bottom";
+      part { name: "bottom"; type: RECT;
          clip_to: "bottomclip";
          description { state: "default" 0.0;
             visible: 0;
-            rel1.to: "elm.swallow.slot.bottom";
-            rel1.offset: -5 -5;
-            rel2.to: "elm.swallow.slot.bottom";
-            rel2.offset: 4 4;
-            image.normal: "button_normal.png";
-            image.border: 4 4 3 5;
-            image.middle: SOLID;
+            rel.to: "elm.swallow.slot.bottom";
+            rel1.offset: -6 0;
+            rel2.offset: 5 5;
+            color: 64 64 64 255;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -354,13 +383,10 @@ group { name: "elm/hover/base/popout";
       part { name: "elm.swallow.slot.bottom"; type: SWALLOW;
          clip_to: "bottomclip";
          description { state: "default" 0.0;
-            align: 0.5 1.0;
             fixed: 0 1;
-            rel1.to: "elm.swallow.slot.middle";
+            align: 0.5 1.0;
+            rel.to: "elm.swallow.slot.middle";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 0 0;
-            rel2.to: "elm.swallow.slot.middle";
-            rel2.relative: 1.0 1.0;
             rel2.offset: -1 0;
          }
          description { state: "visible" 0.0;
@@ -370,21 +396,17 @@ group { name: "elm/hover/base/popout";
             align: 0.5 0.0;
          }
       }
-      part { name: "pop"; mouse_events: 1;
+      part { name: "pop"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.slot.middle";
+            rel.to: "elm.swallow.slot.middle";
             rel1.offset: -6 -6;
-            rel2.to: "elm.swallow.slot.middle";
             rel2.offset: 5 5;
-            image.normal: "button_normal.png";
-            image.border: 4 4 3 5;
-            image.middle: SOLID;
+            color: 64 64 64 255;
          }
       }
       part { name: "elm.swallow.slot.middle"; type: SWALLOW;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.size";
-            rel2.to: "elm.swallow.size";
+            rel.to: "elm.swallow.size";
          }
       }
    }
@@ -419,57 +441,65 @@ group { name: "elm/hover/base/popout";
       program { name: "leftshow";
          signal: "elm,action,slot,left,show"; source: "elm";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "left";
+         target: "shad_left";
          target: "elm.swallow.slot.left";
       }
       program { name: "lefthide";
          signal: "elm,action,slot,left,hide"; source: "elm";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "left";
+         target: "shad_left";
          target: "elm.swallow.slot.left";
       }
       program { name: "rightshow";
          signal: "elm,action,slot,right,show"; source: "elm";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "right";
+         target: "shad_right";
          target: "elm.swallow.slot.right";
       }
       program { name: "righthide";
          signal: "elm,action,slot,right,hide"; source: "elm";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "right";
+         target: "shad_right";
          target: "elm.swallow.slot.right";
       }
       program { name: "topshow";
          signal: "elm,action,slot,top,show"; source: "elm";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "top";
+         target: "shad_top";
          target: "elm.swallow.slot.top";
       }
       program { name: "tophide";
          signal: "elm,action,slot,top,hide"; source: "elm";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "top";
+         target: "shad_top";
          target: "elm.swallow.slot.top";
       }
       program { name: "bottomshow";
          signal: "elm,action,slot,bottom,show"; source: "elm";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "bottom";
+         target: "shad_bottom";
          target: "elm.swallow.slot.bottom";
       }
       program { name: "bottomhide";
          signal: "elm,action,slot,bottom,hide"; source: "elm";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "bottom";
+         target: "shad_bottom";
          target: "elm.swallow.slot.bottom";
       }
    }
@@ -479,8 +509,8 @@ group { name: "elm/hover/base/hoversel_vertical/default";
    alias: "elm/hover/base/hoversel_vertical/entry";
    alias: "elm/hover/base/combobox_vertical/entry";
    alias: "elm/hover/base/combobox_vertical/default";
-   images.image: "button_normal.png" COMP;
-   images.image: "vertical_separated_bar_glow.png" COMP;
+   images.image: "shad_angle_t.png" COMP;
+   images.image: "shad_angle_b.png" COMP;
    data.item: "dismiss" "on";
    // max_size limits the maximum size of expanded hoversel
    // when it's scrollable.
@@ -509,50 +539,58 @@ group { name: "elm/hover/base/hoversel_vertical/default";
    parts {
       part { name: "elm.swallow.offset"; type: SWALLOW;
          description { state: "default" 0.0;
-            align: 0.0 0.0;
             fixed: 1 1;
-            rel1.relative: 0.0 0.0;
+            align: 0.0 0.0;
             rel2.relative: 0.0 0.0;
          }
       }
       part { name: "elm.swallow.size"; type: SWALLOW;
          description { state: "default" 0.0;
-            align: 0.0 0.0;
             fixed: 1 1;
-            rel1.to: "elm.swallow.offset";
+            align: 0.0 0.0;
+            rel.to: "elm.swallow.offset";
             rel1.relative: 1.0 1.0;
-            rel2.to: "elm.swallow.offset";
-            rel2.relative: 1.0 1.0;
          }
       }
-      part { name: "button_image"; mouse_events: 1;
+      part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to_x: "limit0";
-            rel1.to_y: "elm.swallow.slot.top";
-            rel1.offset: -2 -4;
-            rel2.to_x: "limit1";
-            rel2.to_y: "elm.swallow.slot.middle";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: 9 4;
-            image {
-               normal: "button_normal.png";
-               border: 7 7 7 7;
-            }
-            image.middle: SOLID;
+            color: 0 0 0 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "shad"; nomouse;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel.to: "button_image";
+            WIN_SHADOW_ANGLE_SMALL("shad_angle_t.png");
          }
          description { state: "bottom" 0.0;
+            rel.to: "button_image";
+            WIN_SHADOW_ANGLE_SMALL("shad_angle_b.png");
+         }
+      }
+      part { name: "button_image"; type: RECT;
+         description { state: "default" 0.0;
             rel1.to_x: "limit0";
+            rel2.to_x: "limit1";
+            rel1.to_y: "elm.swallow.slot.top";
+            rel2.to_y: "elm.swallow.slot.middle";
+            rel2.relative: 1.0 0.0;
+            rel1.offset: 1 0;
+            rel2.offset: -2 1;
+            color: 80 80 80 255;
+         }
+         description { state: "bottom" 0.0;
+            inherit: "default"  0.0;
             rel1.to_y: "elm.swallow.slot.middle";
             rel1.relative: 0.0 1.0;
-            rel1.offset: -2 -4;
-            rel2.to_x: "limit1";
             rel2.to_y: "elm.swallow.slot.bottom";
-            rel2.offset: 9 4;
-            image {
-               normal: "button_normal.png";
-               border: 7 7 7 7;
-            }
-            image.middle: SOLID;
+            rel2.relative: 1.0 1.0;
+            rel1.offset: 1 -2;
+            rel2.offset: -2 -1;
          }
       }
       part { name: "limit0"; type: SPACER;
@@ -587,28 +625,14 @@ group { name: "elm/hover/base/hoversel_vertical/default";
             rel2.to_x: "elm.swallow.slot.bottom";
          }
       }
-      part { name: "select_line"; mouse_events: 0;
+      part { name: "select_line"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
             fixed: 1 1;
             align: 1.0 0.5;
-            min: 15 10;
-            rel1.to: "button_image";
+            min: 5 0;
+            rel.to: "button_image";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 1 -3;
-            rel2.to: "button_image";
-            rel2.offset: 1 0;
-            image.normal: "vertical_separated_bar_glow.png";
-            image.border: 7 7 7 7;
-            fill.smooth : 0;
-         }
-      }
-      part { name: "base"; type: RECT;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            color: 0 0 0 0;
+            color: 51 153 255 255;
          }
       }
       part { name: "topclip"; type: RECT;
@@ -639,12 +663,12 @@ group { name: "elm/hover/base/hoversel_vertical/default";
          description { state: "right" 0.0;
             inherit: "default" 0.0;
             align: 1.0 0.0;
-            rel2.offset: -9 0;
+            rel2.offset: -9 -1;
          }
          description { state: "right_visible" 0.0;
             inherit: "default" 0.0;
             align: 1.0 1.0;
-            rel2.offset: -9 0;
+            rel2.offset: -9 -1;
          }
       }
       part { name: "bottomclip"; type: RECT;
@@ -660,12 +684,12 @@ group { name: "elm/hover/base/hoversel_vertical/default";
             fixed: 0 1;
             rel1.to: "elm.swallow.slot.middle";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 0 0;
+            rel1.offset: 1 0;
             rel2.to: "elm.swallow.slot.middle";
             rel2.relative: 1.0 1.0;
             /* set negative offset along x axis not to make
                "select_line" part exceed parent's width */
-            rel2.offset: -9 2;
+            rel2.offset: -9 -1;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -674,19 +698,17 @@ group { name: "elm/hover/base/hoversel_vertical/default";
          description { state: "right" 0.0;
             inherit: "default" 0.0;
             align: 1.0 1.0;
-            rel2.offset: -9 0;
+            rel2.offset: -9 -1;
          }
          description { state: "right_visible" 0.0;
             inherit: "default" 0.0;
             align: 1.0 0.0;
-            rel2.offset: -9 0;
+            rel2.offset: -9 -1;
          }
       }
-      part { name: "elm.swallow.slot.middle";
-         type: SWALLOW;
+      part { name: "elm.swallow.slot.middle"; type: SWALLOW;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.size";
-            rel2.to: "elm.swallow.size";
+            rel.to: "elm.swallow.size";
          }
       }
    }
@@ -708,7 +730,7 @@ group { name: "elm/hover/base/hoversel_vertical/default";
       program { name: "hide";
          signal: "elm,action,hide"; source: "elm";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.3;
          target: "base";
          after: "hidefinished";
       }
@@ -730,18 +752,19 @@ group { name: "elm/hover/base/hoversel_vertical/default";
             set_state(PART:"limit0", "default", 0.0);
             set_state(PART:"limit1", "default", 0.0);
             set_state(PART:"button_image", "default", 0.0);
+            set_state(PART:"shad", "default", 0.0);
             topshow2();
          }
       }
       program { name: "topshow_default";
          action: STATE_SET "visible" 0.0;
          target: "elm.swallow.slot.top";
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
       }
       program { name: "topshow_right";
          action: STATE_SET "right_visible" 0.0;
          target: "elm.swallow.slot.top";
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
       }
       program { name: "tophide";
          signal: "elm,action,slot,top,hide";
@@ -757,12 +780,12 @@ group { name: "elm/hover/base/hoversel_vertical/default";
       program { name: "tophide_default";
          action: STATE_SET "default" 0.0;
          target: "elm.swallow.slot.top";
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
       }
       program { name: "tophide_right";
          action: STATE_SET "right" 0.0;
          target: "elm.swallow.slot.top";
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
       }
       program { name: "bottomshow";
          signal: "elm,action,slot,bottom,show"; source: "elm";
@@ -770,18 +793,19 @@ group { name: "elm/hover/base/hoversel_vertical/default";
             set_state(PART:"limit0", "bottom", 0.0);
             set_state(PART:"limit1", "bottom", 0.0);
             set_state(PART:"button_image", "bottom", 0.0);
+            set_state(PART:"shad", "bottom", 0.0);
             bottomshow2();
          }
       }
       program { name: "bottomshow_default";
          action: STATE_SET "visible" 0.0;
          target: "elm.swallow.slot.bottom";
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
       }
       program { name: "bottomshow_right";
          action: STATE_SET "right_visible" 0.0;
          target: "elm.swallow.slot.bottom";
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
       }
       program { name: "bottomhide";
          signal: "elm,action,slot,bottom,hide"; source: "elm";
@@ -798,12 +822,12 @@ group { name: "elm/hover/base/hoversel_vertical/default";
       program { name: "bottomhide_default";
          action: STATE_SET "default" 0.0;
          target: "elm.swallow.slot.bottom";
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
       }
       program { name: "bottomhide_right";
          action: STATE_SET "right" 0.0;
          target: "elm.swallow.slot.bottom";
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
       }
       program { name: "align_right";
          signal: "elm,state,align,right"; source: "elm";
@@ -838,8 +862,9 @@ group { name: "elm/hover/base/hoversel_vertical/default";
 
 group { name: "elm/hover/base/hoversel_horizontal/default";
    alias: "elm/hover/base/hoversel_horizontal/entry";
-   images.image: "button_normal.png" COMP;
    data.item: "dismiss" "on";
+   images.image: "shad_angle_l.png" COMP;
+   images.image: "shad_angle_r.png" COMP;
    script {
       public on_dismiss = 0;
    }
@@ -874,37 +899,41 @@ group { name: "elm/hover/base/hoversel_horizontal/default";
             color: 0 0 0 0;
          }
       }
-      part { name: "button_image"; mouse_events: 0;
+      part { name: "shad"; nomouse;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel.to: "button_image";
+            WIN_SHADOW_ANGLE_SMALL("shad_angle_l.png");
+         }
+         description { state: "right" 0.0;
+            rel.to: "button_image";
+            WIN_SHADOW_ANGLE_SMALL("shad_angle_r.png");
+         }
+      }
+      part { name: "button_image"; type: RECT; nomouse;
          description { state: "default" 0.0;
             rel1.to_x: "elm.swallow.slot.left";
             rel1.to_y: "elm.swallow.slot.left";
-            rel1.offset: -10 0;
             rel2.to_x: "elm.swallow.slot.middle";
             rel2.to_y: "elm.swallow.slot.left";
             rel2.relative: 0.0 1.0;
-            rel2.offset: 4 9;
-            image {
-               normal: "button_normal.png";
-               border: 7 7 7 7;
-            }
-            image.middle: SOLID;
+            rel1.offset: -4 0;
+            rel2.offset: 1 -1;
+            color: 80 80 80 255;
          }
          description { state: "right" 0.0;
+            inherit: "default"  0.0;
             rel1.to_x: "elm.swallow.slot.middle";
             rel1.to_y: "elm.swallow.slot.right";
-            rel1.relative: 1.0 0.0;
-            rel1.offset: -5 0;
             rel2.to_x: "elm.swallow.slot.right";
             rel2.to_y: "elm.swallow.slot.right";
-            rel2.offset: 10 9;
-            image {
-               normal: "button_normal.png";
-               border: 7 7 7 7;
-            }
-            image.middle: SOLID;
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 1.0 1.0;
+            rel1.offset: -2 0;
+            rel2.offset: 3 -1;
          }
       }
-      
+
       part { name: "leftclip"; type: RECT;
          description { state: "default" 0.0;
             rel2.to_x: "elm.swallow.slot.middle";
@@ -918,15 +947,13 @@ group { name: "elm/hover/base/hoversel_horizontal/default";
             fixed: 1 0;
             rel1.to: "elm.swallow.slot.middle";
             rel1.relative: 0.0 0.0;
-            rel1.offset: -1 0;
+            rel1.offset: -1 2;
             rel2.to: "elm.swallow.slot.middle";
             rel2.relative: 0.0 1.0;
-            rel2.offset: -1 -1;
+            rel2.offset: -1 -3;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            rel1.offset: -7 0;
-            rel2.offset: -7 -1;
             align: 1.0 0.0;
          }
       }
@@ -943,22 +970,18 @@ group { name: "elm/hover/base/hoversel_horizontal/default";
             fixed: 1 0;
             rel1.to: "elm.swallow.slot.middle";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 0 0;
+            rel1.offset: -2 2;
             rel2.to: "elm.swallow.slot.middle";
-            rel2.relative: 1.0 1.0;
-            rel2.offset: 0 -1;
+            rel2.offset: -1 -3;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            rel1.offset: 6 0;
-            rel2.offset: -6 -1;
             align: 0.0 0.0;
          }
       }
       part { name: "elm.swallow.slot.middle"; type: SWALLOW;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.size";
-            rel2.to: "elm.swallow.size";
+            rel.to: "elm.swallow.size";
          }
       }
    }
@@ -975,13 +998,13 @@ group { name: "elm/hover/base/hoversel_horizontal/default";
       program { name: "show";
          signal: "elm,action,show"; source: "elm";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "base";
       }
       program { name: "hide";
          signal: "elm,action,hide"; source: "elm";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "base";
          after: "hidefinished";
       }
@@ -995,38 +1018,40 @@ group { name: "elm/hover/base/hoversel_horizontal/default";
       program { name: "leftshow";
          signal: "elm,action,slot,left,show"; source: "elm";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "elm.swallow.slot.left";
       }
       program { name: "leftshow3";
          signal: "elm,action,slot,left,show"; source: "elm";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "button_image";
+         target: "shad";
       }
       program { name: "lefthide";
          signal: "elm,action,slot,left,hide"; source: "elm";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "elm.swallow.slot.left";
       }
-      
+
       program { name: "rightshow";
          signal: "elm,action,slot,right,show"; source: "elm";
          action: STATE_SET "visible" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "elm.swallow.slot.right";
       }
       program { name: "rightshow3";
          signal: "elm,action,slot,right,show"; source: "elm";
          action: STATE_SET "right" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "button_image";
+         target: "shad";
       }
       program { name: "righthide";
          signal: "elm,action,slot,right,hide"; source: "elm";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "elm.swallow.slot.right";
       }
    }

data/elementary/themes/edc/elm/inwin.edc

@@ -1,9 +1,7 @@
 group { name: "elm/win/inwin/default";
-   images {
-      image: "button_normal.png" COMP;
-   }
+   images.image: "win_shadow.png" COMP;
    parts {
-      part { name: "base"; type: RECT; mouse_events: 1;
+      part { name: "bg"; type: RECT; mouse_events: 1;
          description { state: "default" 0.0;
             color: 0 0 0 0;
          }
@@ -12,23 +10,30 @@ group { name: "elm/win/inwin/default";
             color: 0 0 0 128;
          }
       }
-      part { name: "pop"; mouse_events: 1;
+      part { name: "shadow"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
+            rel.to: "base";
+            WIN_SHADOW_SMALL;
+         }
+      }
+      part { name: "base"; type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 64 64 64 255;
+            offscale;
             rel1.to: "elm.swallow.content";
-            rel1.offset: -5 -5;
             rel2.to: "elm.swallow.content";
-            rel2.offset: 4 4;
-            image {
-               normal: "button_normal.png";
-               border: 4 4 3 5;
-               middle: SOLID;
-            }
+            rel1.offset: -8 -8;
+            rel2.offset: 7 7;
          }
       }
       part { name: "elm.swallow.content"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.relative: 0.1 0.1;
-            rel2.relative: 0.9 0.9;
+            rel1.offset: 40 40;
+            rel2.offset: -41 -41;
+            offscale;
          }
       }
    }
@@ -38,14 +43,14 @@ group { name: "elm/win/inwin/default";
          source: "elm";
          action: STATE_SET "visible" 0.0;
          transition: DECELERATE 0.5;
-         target: "base";
+         target: "bg";
       }
       program { name: "hide";
          signal: "elm,action,hide";
          source: "elm";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.5;
-         target: "base";
+         target: "bg";
       }
    }
 }
@@ -71,8 +76,8 @@ group { name: "elm/win/inwin/minimal_vertical";
          type: SWALLOW;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.relative: 0.1 0.5;
-            rel2.relative: 0.9 0.5;
+            rel1.relative: 0.0 0.5;
+            rel2.relative: 1.0 0.5;
          }
       }
    }

data/elementary/themes/edc/elm/label.edc

@@ -8,7 +8,7 @@
 group { name: "elm/label/base/default";
    styles {
       style { name: "label_style";
-         base: "font="FN" font_size=10 text_class=tb_plain align=center color=#ffffffff style=shadow,bottom shadow_color=#00000080";
+         base: "font="FN" font_size=10 text_class=tb_plain align=center color=#a0a0a0";
          tag: "br" "\n";
          tag: "b" "+ font="FNBD" text_class=tb_light";
          ENABLED_TEXTBLOCK_TAGS
@@ -56,7 +56,7 @@ group { name: "elm/label/base/default/left";
    inherit: "elm/label/base/default";
    styles {
       style { name: "label_style_left";
-         base: "font="FN" font_size=10 text_class=tb_plain align=left color=#ffffffff style=shadow,bottom shadow_color=#00000080";
+         base: "font="FN" font_size=10 text_class=tb_plain align=left color=#a0a0a0";
          tag: "br" "\n";
          tag: "b" "+ font="FNBD" text_class=tb_light";
          ENABLED_TEXTBLOCK_TAGS
@@ -74,7 +74,7 @@ group { name: "elm/label/base/default/right";
    inherit: "elm/label/base/default";
    styles {
       style { name: "label_style_right";
-         base: "font="FN" font_size=10 text_class=tb_plain align=right color=#ffffffff style=shadow,bottom shadow_color=#00000080";
+         base: "font="FN" font_size=10 text_class=tb_plain align=right color=#a0a0a0";
          tag: "br" "\n";
          tag: "b" "+ font="FNBD" text_class=tb_light";
          ENABLED_TEXTBLOCK_TAGS
@@ -92,7 +92,7 @@ group { name: "elm/label/base/marker";
    inherit: "elm/label/base/default";
    styles {
       style { name: "label_style2";
-         base: "font="FNBD" font_size=10 text_class=tb_plain align=center color=#ffffffff style=shadow,bottom shadow_color=#00000080";
+         base: "font="FNBD" font_size=10 text_class=tb_plain align=center color=#a0a0a0";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD" color=#3399ff text_class=tb_light";
          tag: "b" "+ font="FNBD" color=#3399ff text_class=tb_light";
@@ -115,7 +115,7 @@ group { "elm/label/base/marker/left";
    inherit: "elm/label/base/default";
    styles {
       style { name: "label_style3";
-         base: "font="FNBD" font_size=10 text_class=tb_plain align=left color=#ffffffff style=shadow,bottom shadow_color=#00000080";
+         base: "font="FNBD" font_size=10 text_class=tb_plain align=left color=#a0a0a0";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD" color=#3399ff text_class=tb_light";
          tag: "b" "+ font="FNBD" color=#3399ff text_class=tb_light";
@@ -138,7 +138,7 @@ group { "elm/label/base/marker/right";
    inherit: "elm/label/base/default";
    styles {
       style { name: "label_style4";
-         base: "font="FNBD" font_size=10 text_class=tb_plain align=right color=#ffffffff style=shadow,bottom shadow_color=#00000080";
+         base: "font="FNBD" font_size=10 text_class=tb_plain align=right color=#a0a0a0";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD" color=#3399ff text_class=tb_light";
          tag: "b" "+ font="FNBD" color=#3399ff text_class=tb_light";

data/elementary/themes/edc/elm/list.edc

@@ -5,7 +5,6 @@
          part { name: "base"; \
             description { state: "default" 0.0; \
                color: 56 56 56 255; \
-               color_class: "list_item_base_odd"; \
             } \
          } \
       } \
@@ -28,34 +27,6 @@
                text.ellipsis: 0.0; \
             } \
          } \
-         part { name: "label2"; \
-            description { state: "default" 0.0; \
-               text.min: 0 1; \
-               text.ellipsis: 0.0; \
-            } \
-            description { state: "selected" 0.0; \
-               text.min: 0 1; \
-               text.ellipsis: 0.0; \
-            } \
-            description { state: "disabled" 0.0; \
-               text.min: 0 1; \
-               text.ellipsis: 0.0; \
-            } \
-         } \
-         part { name: "label3"; \
-            description { state: "default" 0.0; \
-               text.min: 0 1; \
-               text.ellipsis: 0.0; \
-            } \
-            description { state: "selected" 0.0; \
-               text.min: 0 1; \
-               text.ellipsis: 0.0; \
-            } \
-            description { state: "disabled" 0.0; \
-               text.min: 0 1; \
-               text.ellipsis: 0.0; \
-            } \
-         } \
       } \
    }
 #define COMPRESS_ODD(_NAME, _SRC) \
@@ -76,51 +47,17 @@
                text.ellipsis: 0.0; \
             } \
          } \
-         part { name: "label2"; \
-            description { state: "default" 0.0; \
-               text.min: 0 1; \
-               text.ellipsis: 0.0; \
-            } \
-            description { state: "selected" 0.0; \
-               text.min: 0 1; \
-               text.ellipsis: 0.0; \
-            } \
-            description { state: "disabled" 0.0; \
-               text.min: 0 1; \
-               text.ellipsis: 0.0; \
-            } \
-         } \
-         part { name: "label3"; \
-            description { state: "default" 0.0; \
-               text.min: 0 1; \
-               text.ellipsis: 0.0; \
-            } \
-            description { state: "selected" 0.0; \
-               text.min: 0 1; \
-               text.ellipsis: 0.0; \
-            } \
-            description { state: "disabled" 0.0; \
-               text.min: 0 1; \
-               text.ellipsis: 0.0; \
-            } \
-         } \
          part { name: "base"; \
             description { state: "default" 0.0; \
                color: 56 56 56 255; \
-               color_class: "list_item_base_odd"; \
             } \
          } \
       } \
    }
 
 group { name: "elm/list/item/default";
-   data.item: "selectraise" "on";
-   data.item: "focusraise" "on";
-   images.image: "bevel_curved_horiz_out.png" COMP;
-   images.image: "shadow_rounded_horiz.png" COMP;
-   images.image: "vgrad_med_dark.png" COMP;
-   images.image: "bevel_horiz_out.png" COMP;
-   images.image: "shine.png" COMP;
+//   data.item: "selectraise" "on";
+//   data.item: "focusraise" "on";
    parts {
       part { name: "event"; type: RECT;
          description { state: "default" 0.0;
@@ -131,14 +68,22 @@ group { name: "elm/list/item/default";
             visible: 0;
          }
       }
-      part { name: "base"; type: RECT; mouse_events: 0;
+      program {
+         signal: "elm,state,disabled"; source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "event";
+      }
+      program {
+         signal: "elm,state,enabled"; source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "event";
+      }
+      part { name: "base"; type: RECT;
          description { state: "default" 0.0;
             color: 64 64 64 255;
-            color_class: "list_item_base";
          }
          description { state: "odd" 0.0;
             color: 56 56 56 255;
-            color_class: "list_item_base_odd";
          }
       }
       program {
@@ -151,46 +96,10 @@ group { name: "elm/list/item/default";
          action: STATE_SET "default" 0.0;
          target: "base";
       }
-      part { name: "bevel"; mouse_events: 0;
+      part { name: "sel"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "bevel_curved_horiz_out.png";
-            image.border: 0 0 2 2;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "sel_shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shadow_rounded_horiz.png";
-            image.border: 0 0 9 9;
-            rel1.offset: 0 -4;
-            rel2.offset: -1 5;
-            fill.smooth: 0;
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "sel_base"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "vgrad_med_dark.png";
-            fill.smooth: 0;
-            visible: 0;
-            TILED_HORIZ(120)
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "sel_bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_horiz_out.png";
-            image.border: 0 0 2 2;
-            image.middle: 0;
-            fill.smooth: 0;
+            rel.to: "base";
+            color: 51 153 255 255;
             visible: 0;
          }
          description { state: "selected" 0.0;
@@ -201,41 +110,27 @@ group { name: "elm/list/item/default";
       program {
          signal: "elm,state,selected"; source: "elm";
          action: STATE_SET "selected" 0.0;
-         target: "sel_shadow";
-         target: "sel_base";
-         target: "sel_bevel";
+         target: "sel";
       }
       program {
          signal: "elm,state,unselected"; source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "sel_shadow";
-         target: "sel_base";
-         target: "sel_bevel";
-      }
-      program {
-         signal: "elm,state,disabled"; source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "event";
-      }
-      program {
-         signal: "elm,state,enabled"; source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "event";
+         target: "sel";
       }
 
       //##//
       part { name: "elm.text"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 3;
+            offscale;
+            min: 0 15;
+            rel1.offset: 4 4;
             rel1.relative: 1.0 0.0;
             rel1.to_x: "elm.swallow.icon";
-            rel2.offset: -3 -3;
+            rel2.offset: -5 -5;
             rel2.relative: 0.0 1.0;
             rel2.to_x: "elm.swallow.end";
-            color: FN_COL_DEFAULT;
-            color_class: "list_item";
+            color: 160 160 160 255;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
@@ -245,160 +140,60 @@ group { name: "elm/list/item/default";
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            visible: 0;
+            color: 255 255 255 255;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "label2"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            color: FN_COL_DISABLE;
-            color_class: "list_item_disabled";
-            text { font: FN; size: 10;
-               text_source: "elm.text";
-               align: 0.0 0.5;
-               text_class: "list_item";
-            }
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "label3"; type: TEXT; mouse_events: 0;
-         effect: GLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.offset: -2 -3;
-            rel1.to: "elm.text";
-            rel2.offset: 1 1;
-            rel2.to: "elm.text";
-            color: FN_COL_HIGHLIGHT;
-            color_class: "list_item_selected";
-            text { font: FN; size: 10;
-               text_source: "elm.text";
-               align: 0.0 0.5;
-               text_class: "list_item";
-            }
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+            color: 80 80 80 255;
          }
       }
       program {
          signal: "elm,state,selected"; source: "elm";
          action: STATE_SET "selected" 0.0;
          target: "elm.text";
-         target: "label2";
-         target: "label3";
       }
       program {
          signal: "elm,state,unselected"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.text";
-         target: "label2";
-         target: "label3";
       }
       program {
          signal: "elm,state,disabled"; source: "elm";
          action: STATE_SET "disabled" 0.0;
          target: "elm.text";
-         target: "label2";
-         target: "label3";
       }
       program {
          signal: "elm,state,enabled"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.text";
-         target: "label2";
-         target: "label3";
       }
       //##//
       part { name: "elm.swallow.icon"; type: SWALLOW;
+         scale;
          description { state: "default" 0.0;
+            offscale;
+            min: 15 15;
             fixed: 1 0;
             align: 0.0 0.5;
             aspect: 1.0 1.0;
-            rel1.offset: 2 2;
+            rel1.offset: 4 4;
             rel2.relative: 0.0 1.0;
-            rel2.offset: 2 -3;
+            rel2.offset: 4 -5;
          }
       }
       part { name: "elm.swallow.end"; type: SWALLOW;
+         scale;
          description { state: "default" 0.0;
+            offscale;
+            min: 15 15;
             fixed: 1 0;
             align: 1.0 0.5;
             aspect: 1.0 1.0;
-            rel1.offset: -3 2;
+            rel1.offset: -5 4;
             rel1.relative: 1.0 0.0;
-            rel2.offset: -3 -3;
+            rel2.offset: -5 -5;
          }
       }
-      //##//
-
-      part { name: "sel_shine"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel1.to: "sel_base";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "sel_base";
-            visible: 0;
-            FIXED_SIZE(69, 5)
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "event_block"; type: RECT;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-            visible: 0;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      program {
-         signal: "elm,state,selected"; source: "elm";
-         action: STATE_SET "selected" 0.0;
-         target: "sel_shine";
-      }
-      program {
-         signal: "elm,state,unselected"; source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "sel_shine";
-      }
-      program {
-         signal: "elm,state,disabled"; source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "event_block";
-      }
-      program {
-         signal: "elm,state,enabled"; source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "event_block";
-      }
    }
 }
 ODD("elm/list/item_odd/default", "elm/list/item/default")
@@ -425,13 +220,8 @@ COMPRESS_ODD("elm/list/item_compress_odd/default", "elm/list/item/default")
 
 
 group { name: "elm/list/h_item/default";
-   data.item: "selectraise" "on";
-   data.item: "focusraise" "on";
-   images.image: "bevel_curved_vert_out.png" COMP;
-   images.image: "shadow_rounded_vert.png" COMP;
-   images.image: "vgrad_med_dark.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "shine.png" COMP;
+//   data.item: "selectraise" "on";
+//   data.item: "focusraise" "on";
    parts {
       part { name: "event"; type: RECT;
          description { state: "default" 0.0;
@@ -442,14 +232,22 @@ group { name: "elm/list/h_item/default";
             visible: 0;
          }
       }
+      program {
+         signal: "elm,state,disabled"; source: "elm";
+         action: STATE_SET "disabled" 0.0;
+         target: "event";
+      }
+      program {
+         signal: "elm,state,enabled"; source: "elm";
+         action: STATE_SET "default" 0.0;
+         target: "event";
+      }
       part { name: "base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
             color: 64 64 64 255;
-            color_class: "list_item_base";
          }
          description { state: "odd" 0.0;
             color: 56 56 56 255;
-            color_class: "list_item_base_odd";
          }
       }
       program {
@@ -462,46 +260,10 @@ group { name: "elm/list/h_item/default";
          action: STATE_SET "default" 0.0;
          target: "base";
       }
-      part { name: "bevel"; mouse_events: 0;
+      part { name: "sel"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "bevel_curved_vert_out.png";
-            image.border: 2 2 0 0;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "sel_shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shadow_rounded_vert.png";
-            image.border: 9 9 0 0;
-            rel1.offset: -6 0;
-            rel2.offset: 5 -1;
-            fill.smooth: 0;
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "sel_base"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "vgrad_med_dark.png";
-            fill.smooth: 0;
-            visible: 0;
-            TILED_HORIZ(120)
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "sel_bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_out.png";
-            image.border: 2 2 2 2;
-            image.middle: 0;
-            fill.smooth: 0;
+            rel.to: "base";
+            color: 51 153 255 255;
             visible: 0;
          }
          description { state: "selected" 0.0;
@@ -512,41 +274,26 @@ group { name: "elm/list/h_item/default";
       program {
          signal: "elm,state,selected"; source: "elm";
          action: STATE_SET "selected" 0.0;
-         target: "sel_shadow";
-         target: "sel_base";
-         target: "sel_bevel";
+         target: "sel";
       }
       program {
          signal: "elm,state,unselected"; source: "elm";
          action: STATE_SET "default" 0.0;
-         target: "sel_shadow";
-         target: "sel_base";
-         target: "sel_bevel";
-      }
-      program {
-         signal: "elm,state,disabled"; source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "event";
-      }
-      program {
-         signal: "elm,state,enabled"; source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "event";
+         target: "sel";
       }
 
       //##//
       part { name: "elm.text"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
+            offscale;
+            rel1.offset: 4 4;
             rel1.relative: 0.0 1.0;
             rel1.to_y: "elm.swallow.icon";
-            rel2.offset: -3 -3;
+            rel2.offset: -5 -5;
             rel2.relative: 1.0 0.0;
             rel2.to_y: "elm.swallow.end";
-            color: FN_COL_DEFAULT;
-            color_class: "list_item";
+            color: 160 160 160 255;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
@@ -556,90 +303,32 @@ group { name: "elm/list/h_item/default";
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            visible: 0;
+            color: 255 255 255 255;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "label2"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "elm.text";
-            rel2.to: "elm.text";
-            color: FN_COL_DISABLE;
-            color_class: "list_item_disabled";
-            text { font: FN; size: 10;
-               text_source: "elm.text";
-               align: 0.5 0.5;
-               text_class: "list_item";
-            }
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "label3"; type: TEXT; mouse_events: 0;
-         effect: GLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.offset: -2 -3;
-            rel1.to: "elm.text";
-            rel2.offset: 1 1;
-            rel2.to: "elm.text";
-            color: FN_COL_HIGHLIGHT;
-            color_class: "list_item_selected";
-            text { font: FN; size: 10;
-               text_source: "elm.text";
-               align: 0.5 0.5;
-               text_class: "list_item";
-            }
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+            color: 80 80 80 255;
          }
       }
       program {
          signal: "elm,state,selected"; source: "elm";
          action: STATE_SET "selected" 0.0;
          target: "elm.text";
-         target: "label2";
-         target: "label3";
       }
       program {
          signal: "elm,state,unselected"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.text";
-         target: "label2";
-         target: "label3";
       }
       program {
          signal: "elm,state,disabled"; source: "elm";
          action: STATE_SET "disabled" 0.0;
          target: "elm.text";
-         target: "label2";
-         target: "label3";
       }
       program {
          signal: "elm,state,enabled"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.text";
-         target: "label2";
-         target: "label3";
       }
       //##//
       part { name: "elm.swallow.icon"; type: SWALLOW;
@@ -647,9 +336,9 @@ group { name: "elm/list/h_item/default";
             fixed: 0 1;
             aspect: 1.0 1.0;
             align: 0.5 0.0;
-            rel1.offset: 2 2;
+            rel1.offset: 4 4;
             rel2.relative: 1.0 0.0;
-            rel2.offset: -3 2;
+            rel2.offset: -5 4;
          }
       }
       part { name: "elm.swallow.end"; type: SWALLOW;
@@ -657,59 +346,11 @@ group { name: "elm/list/h_item/default";
             fixed: 0 1;
             aspect: 1.0 1.0;
             align: 0.5 1.0;
-            rel1.offset: 2 -3;
+            rel1.offset: 4 -5;
             rel1.relative: 0.0 1.0;
-            rel2.offset: -3 -3;
+            rel2.offset: -5 -5;
          }
       }
-      //##//
-
-      part { name: "sel_shine"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel1.to: "sel_base";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "sel_base";
-            visible: 0;
-            FIXED_SIZE(69, 5)
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "event_block"; type: RECT;
-         description { state: "default" 0.0;
-            color: 0 0 0 0;
-            visible: 0;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      program {
-         signal: "elm,state,selected"; source: "elm";
-         action: STATE_SET "selected" 0.0;
-         target: "sel_shine";
-      }
-      program {
-         signal: "elm,state,unselected"; source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "sel_shine";
-      }
-      program {
-         signal: "elm,state,disabled"; source: "elm";
-         action: STATE_SET "disabled" 0.0;
-         target: "event_block";
-      }
-      program {
-         signal: "elm,state,enabled"; source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "event_block";
-      }
    }
 }
 ODD("elm/list/h_item_odd/default", "elm/list/h_item/default")

data/elementary/themes/edc/elm/multibuttonentry.edc

@@ -3,27 +3,22 @@ group { name: "elm/multibuttonentry/base/default";
    data.item: "vertical_pad" 0;
    data.item: "closed_height" 0;
    parts {
-      part { name: "bg";
-         type: RECT;
-         scale: 1;
+      part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
             color_class: "multibuttonentry_bg";
          }
       }
-      part { name: "elm.swallow.background";
-         type: SWALLOW;
+      part { name: "elm.swallow.background"; type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+            rel.to: "bg";
          }
       }
       /* this widget was released with non-namespaced parts in legacy api */
       alias: "box.swallow" "elm.swallow.box";
       part { name: "elm.swallow.box"; type: SWALLOW;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+            rel.to: "bg";
          }
       }
    }
@@ -32,19 +27,18 @@ group { name: "elm/multibuttonentry/base/default";
 group { name: "elm/multibuttonentry/label/default";
    parts {
       part { name: "elm.text"; type: TEXT; mouse_events: 0;
-         effect: GLOW;
          scale: 1;
          description { state: "default" 0.0;
-            color: FN_COL_HIGHLIGHT;
-            color_class: "multibuttonentry_label";
+            color: 160 160 160 255;
             text { font: FNBD; size: 10;
                min: 1 1;
                ellipsis: -1;
                align: 0.5 0.5;
                text_class: "multibuttonentry_label";
             }
-            rel1.offset: 2 2;
+            rel1.offset: 4 4;
             rel2.offset: -5 -5;
+            offscale;
          }
       }
    }
@@ -54,29 +48,25 @@ group { name: "elm/multibuttonentry/guidetext/default";
    parts {
       part { name: "elm.text"; type: TEXT;
          scale: 1;
-         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel2.offset: -4 -4;
-            color: FN_COL_DISABLE;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            color: 80 80 80 255;;
             text { font: FNBD; size: 10;
                min: 0 1;
                align: 0.0 0.5;
             }
+            offscale;
          }
       }
    }
 }
 
 group { name: "elm/multibuttonentry/btn/default";
-   images.image: "button_normal.png" COMP;
-   images.image: "button_clicked.png" COMP;
-   images.image: "sym_close_dark_normal.png" COMP;
-   images.image: "sym_close_dark_selected.png" COMP;
-   images.image: "win_glow.png" COMP;
+   images.image: "border_close.png" COMP;
    styles {
       style { name: "multibuttonentry_textblock_style";
-         base: "font="FN" align=0.5 font_size=10 color=#ffffffff style=shadow,bottom shadow_color=#00000080 text_class=multibuttonentry_item ellipsis=1.0";
+         base: "font="FN" align=0.5 font_size=10 color=#ffff text_class=multibuttonentry_item ellipsis=1.0";
          tag: "br" "\n";
          tag: "ps" "ps";
          tag: "hilight" "+ font="FNBD;
@@ -90,45 +80,31 @@ group { name: "elm/multibuttonentry/btn/default";
    }
 
    parts {
-      part { name: "bg"; type: RECT;
+      part { name: "base"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            color_class: "multibuttonentry_item_bg";
-         }
-         description { state: "pressed" 0.0;
-            color_class: "multibuttonentry_item_bg_selected";
-         }
-      }
-      part { name: "base";
-         description { state: "default" 0.0;
-            image.normal: "button_normal.png";
-            image.border: 4 4 3 5;
-            image.middle: SOLID;
-            rel1.offset: -1 0;
-            rel2.offset: 0 1;
-            fill.smooth: 0;
+            color: 0 0 0 64;
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            offscale;
          }
          description { state: "pressed" 0.0;
             inherit: "default" 0.0;
-            image.normal: "button_clicked.png";
-            image.border: 5 5 4 6;
+            color: 0 0 0 192;
          }
       }
-      part { name: "glow"; mouse_events: 0;
+      part { name: "glow"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "win_glow.png";
-            image.border: 9 9 9 9;
-            image.middle: 0;
-            rel1.offset: -2  -3;
-            rel1.to: "base";
-            rel2.offset: 1 0;
-            rel2.to: "base";
-            fill.smooth: 0;
-            color: 255 255 255 0;
+            rel.to: "base";
+            rel1.offset: 0 -1;
+            rel1.relative: 0.0 1.0;
+            align: 0.5 1.0;
+            color: 51 153 255 255;
             visible: 0;
          }
          description { state: "focused" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            min: 0 5;
             visible: 1;
          }
          description { state: "unfocused" 0.0;
@@ -137,16 +113,16 @@ group { name: "elm/multibuttonentry/btn/default";
       }
       part { name: "close"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "sym_close_dark_normal.png";
-            rel1.to: "del";
-            rel2.to: "del";
+            image.normal: "border_close.png";
+            rel.to: "del";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
+            color: 160 160 160 255;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            image.normal: "sym_close_dark_selected.png";
+            color: 255 255 255 255;
          }
       }
       part { name: "del"; type: RECT;
@@ -156,94 +132,80 @@ group { name: "elm/multibuttonentry/btn/default";
             min: 4 4;
             align: 1.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
+            rel.to: "base";
             rel1.relative: 1.0 0.0;
-            rel1.to: "base";
-            rel1.offset: -6 5;
-            rel2.offset: -6 -7;
-            rel2.to: "base";
+            rel1.offset: -5 4;
+            rel2.offset: -5 -5;
             color: 0 0 0 0;
+            offscale;
          }
       }
       part { name: "elm.btn.text"; type: TEXTBLOCK; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            color_class: "multibuttonentry_item_text";
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            rel1.to: "base";
+            rel2.to_x: "del";
+            rel2.to_y: "base";
+            rel2.relative: 0.0 1.0;
             text { style: "multibuttonentry_textblock_style";
                min: 1 1;
                ellipsis: -1;
                text_class: "multibuttonentry_item_text";
             }
             visible: 0;
-            rel1.offset: 5 5;
-            rel1.to: "base";
-            rel2.to_x: "del";
-            rel2.to_y: "base";
-            rel2.relative: 0.0 1.0;
-            rel2.offset: -3 -7;
+            offscale;
          }
       }
       part { name: "text"; type: TEXTBLOCK; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            color_class: "multibuttonentry_item_text";
+            rel.to: "elm.btn.text";
+            align: 0.0 0.5;
             text { style: "multibuttonentry_textblock_style";
                text_source: "elm.btn.text";
                min: 0 1;
                align: 0.0 0.5;
                text_class: "multibuttonentry_item_text";
             }
-            align: 0.0 0.5;
-            rel1.offset: 5 5;
-            rel1.to: "base";
-            rel2.to_x: "del";
-            rel2.to_y: "base";
-            rel2.relative: 0.0 1.0;
-            rel2.offset: -3 -7;
+            color: 160 160 160 255;
          }
          description { state: "pressed" 0.0;
             inherit: "default";
-            color_class: "multibuttonentry_item_text_pressed";
-            text {
-               text_class: "multibuttonentry_item_text_pressed";
-            }
+            color: 255 255 255 255;
          }
          description { state: "disabled" 0.0;
             inherit: "default";
-            color_class: "multibuttonentry_item_text_disabled";
-            text {
-               text_class: "multibuttonentry_item_text_disabled";
-            }
+            color: 80 80 80 255;
          }
       }
    }
    programs {
-      program {
-         signal: "mouse,clicked,1"; source: "base";
+      program { signal: "mouse,clicked,1"; source: "base";
          script {
             if (get_int(disabled) == 0) {
                emit("clicked", "");
             }
          }
       }
-      program {
-         signal: "elm,state,default"; source: "elm";
+      program { signal: "elm,state,default"; source: "elm";
          action: STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 0.2;
          target: "glow";
       }
-      program {
-         signal: "elm,state,focused"; source: "elm";
+      program { signal: "elm,state,focused"; source: "elm";
          action: STATE_SET "focused" 0.0;
+         transition: SINUSOIDAL 0.2;
          target: "glow";
       }
-      program {
-         signal: "elm,state,enabled"; source: "elm";
+      program { signal: "elm,state,enabled"; source: "elm";
          script {
             set_state(PART:"text", "default", 0.0);
             set_int(disabled , 0);
          }
       }
-      program {
-         signal: "elm,state,disabled"; source: "elm";
+      program { signal: "elm,state,disabled"; source: "elm";
          script {
             new st[31];
             new Float: vl;
@@ -254,42 +216,34 @@ group { name: "elm/multibuttonentry/btn/default";
             set_int(disabled , 1);
          }
       }
-      program {
-         signal: "elm,state,unfocused"; source: "elm";
+      program { signal: "elm,state,unfocused"; source: "elm";
          action: STATE_SET "unfocused" 0.0;
          target: "glow";
       }
-      program {
-         signal: "mouse,down,1"; source: "base";
+      program { signal: "mouse,down,1"; source: "base";
          script {
             if (get_int(disabled) == 0) {
                set_state(PART:"base", "pressed", 0.0);
-               set_state(PART:"bg", "pressed", 0.0);
                set_state(PART:"text", "pressed", 0.0);
             }
          }
       }
-      program {
-         signal: "mouse,up,1"; source: "base";
+      program { signal: "mouse,up,1"; source: "base";
          script {
             if (get_int(disabled) == 0) {
                set_state(PART:"base", "default", 0.0);
-               set_state(PART:"bg", "default", 0.0);
                set_state(PART:"text", "default", 0.0);
             }
          }
       }
-      program {
-         signal: "mouse,clicked,1"; source: "del";
+      program { signal: "mouse,clicked,1"; source: "del";
          action: SIGNAL_EMIT "elm,deleted" "elm";
       }
-      program {
-         signal: "mouse,down,1"; source: "del";
+      program { signal: "mouse,down,1"; source: "del";
          action: STATE_SET "clicked" 0.0;
          target: "close";
       }
-      program {
-         signal: "mouse,up,1"; source: "del";
+      program { signal: "mouse,up,1"; source: "del";
          action: STATE_SET "default" 0.0;
          target: "close";
       }
@@ -299,7 +253,7 @@ group { name: "elm/multibuttonentry/btn/default";
 group { name: "elm/multibuttonentry/closedbutton/default";
    styles {
       style { name: "textblock_style_multibuttonentry_default";
-         base: "font="FNBD" font_size=10 text_class=multibuttonentry_closed style=glow color=#3399ffff glow_color=#3399ff18 align=center glow2_color=#3399ff12 wrap=char";
+         base: "font="FNBD" font_size=10 text_class=multibuttonentry_closed color=#a0a0a0ff align=center wrap=char";
          tag: "br" "\n";
          tag: "ps" "ps";
          tag: "hilight" "+ font="FNBD;
@@ -316,10 +270,9 @@ group { name: "elm/multibuttonentry/closedbutton/default";
       part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel1.to: "bg";
-            rel2.offset: -3 -3;
-            rel2.to: "bg";
+            rel.to: "bg";
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
             text { style: "textblock_style_multibuttonentry_default";
                min: 1 1;
                ellipsis: -1;

data/elementary/themes/edc/elm/naviframe.edc

@@ -1,8 +1,4 @@
 group { name: "elm/naviframe/item/basic/default";
-   images.image: "vgrad_med_dark.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "shine.png" COMP;
-   images.image: "shadow_vert.png" COMP;
    parts {
       // this set of limits and bottoms is evil - but it's a nasty construct
       // allowing EITHER the title and subtitle texts OR the prev/next button
@@ -134,13 +130,13 @@ group { name: "elm/naviframe/item/basic/default";
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 0.0 0.0;
-            rel1.offset: 0 2;
+            rel1.offset: 4 4;
             rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
+            rel2.offset: -5 4;
             align: 0.5 0.0;
-            color: FN_COL_DEFAULT_SOFT_SHADOW;
+            min: 40 24;
             text { font: FN; size: 8;
-               text: "X";
+               text: SPACER_TEXT;
                text_class: "title_bar_sub";
                align: 0.5 0.0;
                min: 0 1;
@@ -151,18 +147,16 @@ group { name: "elm/naviframe/item/basic/default";
       }
       part { name: "title2"; type: TEXT;
          scale: 1;
-         effect: SOFT_SHADOW BOTTOM;
          description { state: "default" 0.0;
             color_class: "border_title_active";
             rel1.to_y: "title1";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 0 -1;
+            rel1.offset: 0 0;
             rel2.to_y: "title1";
             rel2.offset: -1 -1;
             align: 0.5 0.0;
-            color: FN_COL_DEFAULT_SOFT_SHADOW;
             text { font: FNBD; size: 10;
-               text: "X";
+               text: SPACER_TEXT;
                text_class: "title_bar";
                align: 0.5 0.0;
                min: 0 1;
@@ -176,13 +170,12 @@ group { name: "elm/naviframe/item/basic/default";
          description { state: "default" 0.0;
             rel1.to_y: "title2";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 0 -3;
+            rel1.offset: 0 0;
             rel2.to_y: "title2";
-            rel2.offset: -1 -3;
+            rel2.offset: -1 -1;
             align: 0.5 0.0;
-            color: FN_COL_DEFAULT_SOFT_SHADOW;
             text { font: FN; size: 8;
-               text: "X";
+               text: SPACER_TEXT;
                text_class: "title_bar_sub";
                align: 0.5 0.0;
                min: 0 1;
@@ -191,12 +184,16 @@ group { name: "elm/naviframe/item/basic/default";
             visible: 0;
          }
       }
-      
-      
+
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
          }
       }
+      part { name: "top_clip"; type: RECT;
+         clip_to: "clip";
+         description { state: "default" 0.0;
+         }
+      }
       part { name: "base"; type: SPACER;
          description { state: "default" 0.0;
          }
@@ -224,25 +221,6 @@ group { name: "elm/naviframe/item/basic/default";
             rel1.relative: 0.0 0.0;
          }
       }
-      part { name: "shadow"; mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            image.normal: "shadow_vert.png";
-            rel1.to: "top";
-            rel1.relative: 0.0 1.0;
-            rel2.to: "top";
-            rel2.offset: -1 0;
-            fill.smooth: 0;
-            min: 0 20;
-            align: 0.5 0.0;
-            fixed: 1 1;
-         }
-         description { state: "title-hidden" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-      }
       part { name: "tophide0"; type: SPACER;
          description { state: "default" 0.0;
             rel1.to: "base";
@@ -257,16 +235,14 @@ group { name: "elm/naviframe/item/basic/default";
             rel2.to: "tophide0";
          }
       }
-      part { name: "top";
-         clip_to: "clip";
+      part { name: "top"; type: RECT;
+         scale: 1;
+         clip_to: "top_clip";
          description { state: "default" 0.0;
-            color_class: "border_top";
-            image.normal: "vgrad_med_dark.png";
+            color: 32 32 32 255;
             rel1.to: "base";
             rel2.to_x: "base";
             rel2.to_y: "bottom";
-            fill.smooth: 0;
-            TILED_HORIZ(120)
          }
          description { state: "title-hidden" 0.0;
             inherit: "default" 0.0;
@@ -280,42 +256,28 @@ group { name: "elm/naviframe/item/basic/default";
          description { state: "default" 0.0;
             fixed: 1 1;
             color: 0 0 0 0;
-            rel1.to: "top";
-            rel2.to: "top";
-         }
-      }
-      part { name: "bevel"; mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "top";
-            rel2.to: "top";
-            fill.smooth: 0;
+            rel.to: "top";
          }
       }
       part { name: "elm.text.title"; type: TEXT; mouse_events: 0;
          scale: 1;
-         effect: SOFT_SHADOW BOTTOM;
          clip_to: "elements_clip";
          description { state: "default" 0.0;
-            color_class: "border_title_active_sub";
+            color: 255 255 255 255;
+            rel1.offset: 4 14;
             rel1.to_x: "base";
             rel1.to_y: "top";
-            rel1.relative: 0.0 0.5;
-            rel2.offset: 0 -1;
+            rel2.offset: -5 -15;
             rel2.to_x: "base";
             rel2.to_y: "top";
-            rel2.relative: 1.0 0.5;
             align: 0.5 0.5;
-            color: FN_COL_DEFAULT_SOFT_SHADOW;
             text { font: FNBD; size: 10;
                text_class: "title_bar";
                align: 0.5 0.5;
                min: 0 1;
             }
             fixed: 0 1;
+            offscale;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -324,24 +286,24 @@ group { name: "elm/naviframe/item/basic/default";
       }
       part { name: "elm.text.subtitle"; type: TEXT; mouse_events: 0;
          scale: 1;
-         effect: SHADOW BOTTOM;
          clip_to: "elements_clip";
          description { state: "default" 0.0;
+            color: 160 160 160 255;
             rel1.to_x: "base";
-            rel1.to_y: "elm.text.title";
+            rel1.to_y: "top";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 0 -3;
+            rel1.offset: 4 -5;
             rel2.to_x: "base";
-            rel2.to_y: "elm.text.title";
-            rel2.offset: -1 -3;
-            align: 0.5 0.0;
-            color: FN_COL_DEFAULT;
+            rel2.to_y: "top";
+            rel2.offset: -5 -5;
+            align: 0.5 1.0;
             text { font: FN; size: 8;
                text_class: "title_bar_sub";
-               align: 0.5 0.0;
+               align: 0.5 1.0;
                min: 0 1;
             }
             fixed: 0 1;
+            offscale;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -351,8 +313,7 @@ group { name: "elm/naviframe/item/basic/default";
       part { name: "buttons_clip"; type: RECT;
          clip_to: "elements_clip";
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
          }
          description { state: "title-hidden" 0.0;
             inherit: "default" 0.0;
@@ -366,10 +327,10 @@ group { name: "elm/naviframe/item/basic/default";
             rel1.to_x: "base";
 //            rel1.to_y: "top";
             rel1.relative: 1.0 0.0;
-            rel1.offset: -3 2;
+            rel1.offset: -5 4;
             rel2.to_x: "base";
             rel2.to_y: "title3";
-            rel2.offset: -3 -1;
+            rel2.offset: -5 -5;
             align: 1.0 0.5;
             min: 26 26;
             max: 1 1;
@@ -386,9 +347,9 @@ group { name: "elm/naviframe/item/basic/default";
          description { state: "default" 0.0;
             rel1.to_x: "base";
 //            rel1.to_y: "top";
-            rel1.offset: 2 2;
+            rel1.offset: 4 4;
             rel2.relative: 0.0 1.0;
-            rel2.offset: 2 -1;
+            rel2.offset: 4 -5;
             rel2.to_x: "base";
             rel2.to_y: "title3";
             align: 0.0 0.5;
@@ -408,10 +369,10 @@ group { name: "elm/naviframe/item/basic/default";
             rel1.to_x: "elm.swallow.prev_btn";
             rel1.to_y: "top";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 2 2;
+            rel1.offset: 4 4;
             rel2.to_x: "elm.swallow.prev_btn";
             rel2.to_y: "top";
-            rel2.offset: 2 -3;
+            rel2.offset: 4 -5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
             align: 0.0 0.5;
          }
@@ -420,27 +381,14 @@ group { name: "elm/naviframe/item/basic/default";
             rel1.to_x: "top";
             rel1.relative: 0.0 0.0;
             rel2.to_x: "top";
-            rel2.offset: -3 -3;
-           align: 0.5 0.5;
-         }
-      }
-      part { name: "shine"; mouse_events: 0;
-         clip_to: "elements_clip";
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel1.to: "top";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "top";
-            FIXED_SIZE(69, 5)
+            rel2.offset: -5 -5;
+            align: 0.5 0.5;
          }
       }
       part { name: "elements_clip"; type: RECT;
          clip_to: "clip";
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -456,22 +404,18 @@ group { name: "elm/naviframe/item/basic/default";
       }
    }
    programs {
-      program {
-         signal: "elm,state,title,show"; source: "elm";
+      program { signal: "elm,state,title,show"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "top";
-         target: "shadow";
          target: "elm.swallow.content";
          target: "buttons_clip";
          target: "elm.swallow.prev_btn";
          target: "elm.swallow.next_btn";
       }
-      program {
-         signal: "elm,action,title,show"; source: "elm";
+      program { signal: "elm,action,title,show"; source: "elm";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "top";
-         target: "shadow";
          target: "elm.swallow.content";
          after: "titleshow2";
       }
@@ -482,18 +426,15 @@ group { name: "elm/naviframe/item/basic/default";
          target: "elm.swallow.prev_btn";
          target: "elm.swallow.next_btn";
       }
-      program {
-         signal: "elm,state,title,hide"; source: "elm";
+      program { signal: "elm,state,title,hide"; source: "elm";
          action: STATE_SET "title-hidden" 0.0;
          target: "buttons_clip";
          target: "top";
-         target: "shadow";
          target: "elm.swallow.content";
          target: "elm.swallow.prev_btn";
          target: "elm.swallow.next_btn";
       }
-      program {
-         signal: "elm,action,title,hide"; source: "elm";
+      program { signal: "elm,action,title,hide"; source: "elm";
          action: STATE_SET "title-hidden" 0.0;
          target: "buttons_clip";
          target: "elm.swallow.prev_btn";
@@ -502,78 +443,66 @@ group { name: "elm/naviframe/item/basic/default";
       }
       program { name: "titlehide2";
          action: STATE_SET "title-hidden" 0.0;
-         transition: DECEL 0.5;
+         transition: DECEL 0.2;
          target: "top";
-         target: "shadow";
          target: "elm.swallow.content";
          after: "title_transition_finished";
       }
       program { name: "title_transition_finished";
          action: SIGNAL_EMIT "elm,action,title,transition,finished" "elm";
       }
-      program {
-         signal: "elm,state,prev_btn,show"; source: "elm";
+      program { signal: "elm,state,prev_btn,show"; source: "elm";
          action: STATE_SET "default" 0.0;
          filter: "elm.swallow.content" "default";
          target: "elm.swallow.prev_btn";
       }
-      program {
-         signal: "elm,state,prev_btn,hide"; source: "elm";
+      program { signal: "elm,state,prev_btn,hide"; source: "elm";
          action: STATE_SET "title-hidden" 0.0;
          target: "elm.swallow.prev_btn";
       }
-      program {
-         signal: "elm,state,next_btn,show"; source: "elm";
+      program { signal: "elm,state,next_btn,show"; source: "elm";
          action: STATE_SET "default" 0.0;
          filter: "elm.swallow.content" "default";
          target: "elm.swallow.next_btn";
       }
-      program {
-         signal: "elm,state,next_btn,hide"; source: "elm";
+      program { signal: "elm,state,next_btn,hide"; source: "elm";
          action: STATE_SET "title-hidden" 0.0;
          target: "elm.swallow.next_btn";
       }
-      program {
-         signal: "mouse,clicked,1"; source: "top";
+      program { signal: "mouse,clicked,1"; source: "top";
          action: SIGNAL_EMIT "elm,action,title,clicked" "elm";
       }
-      program {
-         signal: "elm,state,title_label,show"; source: "elm";
+      program { signal: "elm,state,title_label,show"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.swallow.icon";
          target: "elm.text.title";
          target: "elm.text.subtitle";
       }
-      program {
-         signal: "elm,state,title_label,hide"; source: "elm";
+      program { signal: "elm,state,title_label,hide"; source: "elm";
          action: STATE_SET "hidden" 0.0;
          target: "elm.swallow.icon";
          target: "elm.text.title";
          target: "elm.text.subtitle";
       }
-      program {
-         signal: "elm,state,visible"; source: "elm";
+      program { signal: "elm,state,visible"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elements_clip";
          target: "base";
       }
-      program {
-         signal: "elm,state,invisible"; source: "elm";
+      program { signal: "elm,state,invisible"; source: "elm";
          action: STATE_SET "hidden" 0.0;
          target: "elements_clip";
       }
 
       /* current page is being pushed: [previous]<----[current] */
-      program {
-         signal: "elm,state,cur,pushed"; source: "elm";
+      program { signal: "elm,state,cur,pushed"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "base";
          target: "elements_clip";
       }
-      program {
-         signal: "elm,state,cur,pushed,deferred"; source: "elm";
+      program { signal: "elm,state,cur,pushed,deferred"; source: "elm";
          action: STATE_SET "prev" 0.0;
-         transition: DECEL 0.5;
+         transition: DECEL 0.2;
          target: "base";
          target: "elements_clip";
          after: "pushed3";
@@ -583,16 +512,14 @@ group { name: "elm/naviframe/item/basic/default";
       }
 
       /* current page is being popped: [current]---->[next] */
-      program {
-         signal: "elm,state,cur,popped"; source: "elm";
+      program { signal: "elm,state,cur,popped"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "base";
          target: "elements_clip";
       }
-      program {
-         signal: "elm,state,cur,popped,deferred"; source: "elm";
+      program { signal: "elm,state,cur,popped,deferred"; source: "elm";
          action: STATE_SET "next" 0.0;
-         transition: DECEL 0.5;
+         transition: DECEL 0.2;
          target: "base";
          target: "elements_clip";
          after: "popped3";
@@ -602,16 +529,14 @@ group { name: "elm/naviframe/item/basic/default";
       }
 
       /* new page is being pushed: [current]<----[next] */
-      program {
-         signal: "elm,state,new,pushed"; source: "elm";
+      program { signal: "elm,state,new,pushed"; source: "elm";
          action: STATE_SET "next" 0.0;
          target: "base";
          target: "elements_clip";
       }
-      program {
-         signal: "elm,state,new,pushed,deferred"; source: "elm";
+      program { signal: "elm,state,new,pushed,deferred"; source: "elm";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "base";
          target: "elements_clip";
          after: "pushedb3";
@@ -621,16 +546,14 @@ group { name: "elm/naviframe/item/basic/default";
       }
 
       /* previous page is being pushed: [previous]---->[current] */
-      program {
-         signal: "elm,state,prev,popped"; source: "elm";
+      program { signal: "elm,state,prev,popped"; source: "elm";
          action: STATE_SET "prev" 0.0;
          target: "base";
          target: "elements_clip";
       }
-      program {
-         signal: "elm,state,prev,popped,deferred"; source: "elm";
+      program { signal: "elm,state,prev,popped,deferred"; source: "elm";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
+         transition: DECELERATE 0.2;
          target: "base";
          target: "elements_clip";
          after: "poppedb3";
@@ -648,20 +571,17 @@ group { name: "elm/naviframe/item/overlap/default";
       // this is a hack around an edje_cc inherit bug - group doesnt seem
       // to inherit properly with limits etc.
       BOTTOMMAX()
-      
+
       part { name: "elm.swallow.content";
          description { state: "default" 0.0;
             rel1.to: "base";
             rel1.relative: 0.0 0.0;
          }
       }
-      part { name: "top";
+      part { name: "top_clip";
          description { state: "default" 0.0;
             color: 255 255 255 224;
          }
-         description { state: "title-hidden" 0.0;
-            color: 255 255 255 224;
-         }
       }
    }
 }

data/elementary/themes/edc/elm/notify.edc

@@ -6,29 +6,25 @@ group { name: "elm/notify/block_events/default";
             color: 0 0 0 0;
          }
          desc { "visible";
-            color: 0 0 0 64; /* FIXME: color_class */
+            color: 0 0 0 128; /* FIXME: color_class */
          }
       }
-      program {
-         signal: "mouse,clicked,1"; source: "block_events";
+      program { signal: "mouse,clicked,1"; source: "block_events";
          action: SIGNAL_EMIT "elm,action,click" "elm";
       }
-      program {
-         signal: "show"; source: "*";
+      program { signal: "show"; source: "*";
          action: STATE_SET "visible";
          targets: "block_events";
-         transition: DECELERATE 0.3;
+         transition: DECELERATE 0.2;
       }
-      program {
-         signal: "hide"; source: "";
+      program { signal: "hide"; source: "";
          action: STATE_SET "default" 0.0;
          target: "block_events";
       }
-      program {
-         signal: "elm,state,hide"; source: "elm";
+      program { signal: "elm,state,hide"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "block_events";
-         transition: DECELERATE 0.3;
+         transition: DECELERATE 0.5;
          after: "hide_finish";
       }
       program { name: "hide_finish";
@@ -38,11 +34,12 @@ group { name: "elm/notify/block_events/default";
 }
 
 group { name: "elm/notify/top/default";
-   images.image: "darken_rounded_square.png" COMP;
    data.item: "hide_finished_signal" "on";
    parts {
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
+            rel1.offset: -500 -500;
+            rel2.offset: 499 499;
             color: 255 255 255 0;
          }
          description { state: "visible" 0.0;
@@ -50,15 +47,26 @@ group { name: "elm/notify/top/default";
             color: 255 255 255 255;
          }
       }
-      part { name: "base";
+      part { name: "shadow"; mouse_events: 0;
          clip_to: "clip";
          description { state: "default" 0.0;
-            image.normal: "darken_rounded_square.png";
-            image.border: 15 15 15 15;
+            rel.to: "base";
+            WIN_SHADOW;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+         }
+      }
+      part { name: "base"; type: RECT;
+         clip_to: "clip";
+         scale: 1;
+         description { state: "default" 0.0;
+            color: 48 48 48 255;
             rel1.offset: 10 10;
-            rel2.offset: -10 -10;
+            rel2.offset: -11 -11;
             rel1.relative: 0.0 -1.0;
             rel2.relative: 1.0 0.0;
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -68,33 +76,34 @@ group { name: "elm/notify/top/default";
       }
       part { name: "elm.swallow.content"; type: SWALLOW;
          clip_to: "clip";
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel1.offset: 12 12;
-            rel2.to: "base";
-            rel2.offset: -13 -13;
+            rel.to: "base";
+            rel1.offset: 10 10;
+            rel2.offset: -11 -11;
+            offscale;
          }
       }
    }
    programs {
-      program {
-         signal: "show"; source: "";
+      program { signal: "show"; source: "";
          action: STATE_SET "visible" 0.0;
          target: "clip";
          target: "base";
-         transition: DECELERATE 0.5;
+         target: "shadow";
+         transition: DECELERATE 0.2;
       }
-      program {
-         signal: "hide"; source: "";
+      program { signal: "hide"; source: "";
          action: STATE_SET "default" 0.0;
          target: "clip";
          target: "base";
+         target: "shadow";
       }
-      program {
-         signal: "elm,state,hide"; source: "elm";
+      program { signal: "elm,state,hide"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "clip";
          target: "base";
+         target: "shadow";
          transition: DECELERATE 0.5;
          after: "hide_finish";
       }
@@ -110,7 +119,7 @@ group { name: "elm/notify/bottom/default";
       part { name: "base";
          description { state: "default" 0.0;
             rel1.offset: 10 10;
-            rel2.offset: -10 -10;
+            rel2.offset: -11 -11;
             rel1.relative: 0.0 1.0;
             rel2.relative: 1.0 2.0;
          }
@@ -124,7 +133,7 @@ group { name: "elm/notify/left/default";
       part { name: "base";
          description { state: "default" 0.0;
             rel1.offset: 10 10;
-            rel2.offset: -10 -10;
+            rel2.offset: -11 -11;
             rel1.relative: -1.0 0.0;
             rel2.relative: 0.0 1.0;
          }
@@ -138,7 +147,7 @@ group { name: "elm/notify/right/default";
       part { name: "base";
          description { state: "default" 0.0;
             rel1.offset: 10 10;
-            rel2.offset: -10 -10;
+            rel2.offset: -11 -11;
             rel1.relative: 1.0 0.0;
             rel2.relative: 2.0 1.0;
          }
@@ -152,7 +161,7 @@ group { name: "elm/notify/top_left/default";
       part { name: "base";
          description { state: "default" 0.0;
             rel1.offset: 10 10;
-            rel2.offset: -10 -10;
+            rel2.offset: -11 -11;
             rel1.relative: 0.0 -1.0;
             rel2.relative: 1.0 0.0;
          }
@@ -166,7 +175,7 @@ group { name: "elm/notify/top_right/default";
       part { name: "base";
          description { state: "default" 0.0;
             rel1.offset: 10 10;
-            rel2.offset: -10 -10;
+            rel2.offset: -11 -11;
             rel1.relative: 0.0 -1.0;
             rel2.relative: 1.0 0.0;
          }
@@ -180,7 +189,7 @@ group { name: "elm/notify/bottom_left/default";
       part { name: "base";
          description { state: "default" 0.0;
             rel1.offset: 10 10;
-            rel2.offset: -10 -10;
+            rel2.offset: -11 -11;
             rel1.relative: 0.0 1.0;
             rel2.relative: 1.0 2.0;
          }
@@ -194,7 +203,7 @@ group { name: "elm/notify/bottom_right/default";
       part { name: "base";
          description { state: "default" 0.0;
             rel1.offset: 10 10;
-            rel2.offset: -10 -10;
+            rel2.offset: -11 -11;
             rel1.relative: 0.0 1.0;
             rel2.relative: 1.0 2.0;
          }
@@ -208,7 +217,7 @@ group { name: "elm/notify/center/default";
       part { name: "base";
          description { state: "default" 0.0;
             rel1.offset: 10 10;
-            rel2.offset: -10 -10;
+            rel2.offset: -11 -11;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 1.0;
          }

data/elementary/themes/edc/elm/panes.edc

@@ -11,12 +11,12 @@
       elm,action,unpress: Used for "unpress" smart callback.
 */
 
-#define PANEMIN  10
-#define PANEMIN2 16
-#define PANEWID  32
+#define PANEMIN  8
+#define PANEMIN2 24
+#define PANEWID  24
 
 group { name: "elm/panes/vertical/default";
-   images.image: "holes_vert.png" COMP;
+   images.image: "pane_handle_v.png" COMP;
    parts {
       part { name: "whole"; type: SPACER;
          description { state: "default" 0.0;
@@ -51,31 +51,27 @@ group { name: "elm/panes/vertical/default";
       part { name: "whole_left"; type: RECT;
          description { state: "default" 0.0;
             rel2.to_x: "elm.bar";
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -4 -1;
+            rel2.relative: 0.0 1.0;
          }
       }
       part { name: "whole_right"; type: RECT;
          description { state: "default" 0.0;
             rel1.to_x: "elm.bar";
-            rel1.relative: 0.0 0.0;
-            rel1.offset: 3 0;
+            rel1.relative: 1.0 0.0;
          }
       }
       part { name: "elm.swallow.left"; type: SWALLOW;
          clip_to: "whole_left";
          description { state: "default" 0.0;
             rel2.to_x: "elm.bar";
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -4 -1;
+            rel2.relative: 0.0 1.0;
          }
       }
       part { name: "elm.swallow.right"; type: SWALLOW;
          clip_to: "whole_right";
          description { state: "default" 0.0;
             rel1.to_x: "elm.bar";
-            rel1.relative: 0.0 0.0;
-            rel1.offset: 3 0;
+            rel1.relative: 1.0 0.0;
          }
       }
       part { name: "elm.bar"; type: SPACER;
@@ -84,8 +80,8 @@ group { name: "elm/panes/vertical/default";
             y: 0 0 0;
          }
          description { state: "default" 0.0;
-            max: 0 99999;
-            min: 0 14;
+            max: 8 99999;
+            min: 8 24;
             fixed: 1 1;
             rel1.relative: 0.0 0.5;
             rel2.relative: 1.0 0.5;
@@ -93,10 +89,11 @@ group { name: "elm/panes/vertical/default";
       }
       part { name: "dots"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "holes_vert.png";
-            rel1.to: "elm.bar";
-            rel2.to: "elm.bar";
-            FIXED_SIZE(4, 14)
+            FIXED_SIZE(8, 24)
+            image.normal: "pane_handle_v.png";
+            fill.smooth: 0;
+            rel.to: "elm.bar";
+            color: 160 160 160 255;
          }
       }
       part { name: "elm.swallow.event"; type: SWALLOW;
@@ -104,8 +101,7 @@ group { name: "elm/panes/vertical/default";
             visible: 0;
             min: PANEMIN PANEMIN2;
             fixed: 1 1;
-            rel1.to: "elm.bar";
-            rel2.to: "elm.bar";
+            rel.to: "elm.bar";
          }
       }
       part { name: "bar"; type: RECT;
@@ -151,7 +147,7 @@ group { name: "elm/panes/vertical/default";
 }
 
 group { name: "elm/panes/horizontal/default";
-   images.image: "holes_horiz.png" COMP;
+   images.image: "pane_handle_h.png" COMP;
    parts {
       part { name: "whole"; type: SPACER;
          description { state: "default" 0.0;
@@ -186,31 +182,27 @@ group { name: "elm/panes/horizontal/default";
       part { name: "whole_left"; type: RECT;
          description { state: "default" 0.0;
             rel2.to_y: "elm.bar";
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -1 -4;
+            rel2.relative: 1.0 0.0;
          }
       }
       part { name: "whole_right"; type: RECT;
          description { state: "default" 0.0;
             rel1.to_y: "elm.bar";
-            rel1.relative: 0.0 0.0;
-            rel1.offset: 0 3;
+            rel1.relative: 0.0 1.0;
          }
       }
       part { name: "elm.swallow.left"; type: SWALLOW;
          clip_to: "whole_left";
          description { state: "default" 0.0;
             rel2.to_y: "elm.bar";
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -1 -4;
+            rel2.relative: 1.0 0.0;
          }
       }
       part { name: "elm.swallow.right"; type: SWALLOW;
          clip_to: "whole_right";
          description { state: "default" 0.0;
             rel1.to_y: "elm.bar";
-            rel1.relative: 0.0 0.0;
-            rel1.offset: 0 3;
+            rel1.relative: 0.0 1.0;
          }
       }
       part { name: "elm.bar"; type: SPACER;
@@ -219,8 +211,8 @@ group { name: "elm/panes/horizontal/default";
             y: 1 1 1;
          }
          description { state: "default" 0.0;
-            max: 99999 0;
-            min: 14 0;
+            max: 99999 8;
+            min: 24 8;
             fixed: 1 1;
             rel1.relative: 0.5 0.0;
             rel2.relative: 0.5 1.0;
@@ -228,10 +220,11 @@ group { name: "elm/panes/horizontal/default";
       }
       part { name: "dots"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "holes_horiz.png";
-            rel1.to: "elm.bar";
-            rel2.to: "elm.bar";
-            FIXED_SIZE(14, 4)
+            FIXED_SIZE(24, 8)
+            image.normal: "pane_handle_h.png";
+            fill.smooth: 0;
+            rel.to: "elm.bar";
+            color: 160 160 160 255;
          }
       }
       part { name: "elm.swallow.event"; type: SWALLOW;
@@ -239,8 +232,7 @@ group { name: "elm/panes/horizontal/default";
             visible: 0;
             min: PANEMIN2 PANEMIN;
             fixed: 1 1;
-            rel1.to: "elm.bar";
-            rel2.to: "elm.bar";
+            rel.to: "elm.bar";
          }
       }
       part { name: "bar"; type: RECT;
@@ -287,10 +279,8 @@ group { name: "elm/panes/horizontal/default";
 
 ////////////////////////////////////////////////////////////////////////////
 
-
 group { name: "elm/panes/vertical/flush";
-   images.image: "downlight_glow_left.png" COMP;
-   images.image: "downlight_glow_right.png" COMP;
+   images.image: "shadow_circle_vert.png" COMP;
    parts {
       part { name: "whole"; type: SPACER;
          description { state: "default" 0.0;
@@ -390,64 +380,81 @@ group { name: "elm/panes/vertical/flush";
          }
       }
       part { name: "glow1a"; mouse_events: 0;
+         clip_to: "whole_right";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "downlight_glow_left.png";
-            image.border: 0 3 0 0;
-            max: 32 99999;
+            image.normal: "shadow_circle_vert.png";
+            rel1.to_x: "elm.bar";
             rel2.to_x: "elm.bar";
             color: 255 255 255 0;
-            align: 1.0 0.5;
+            offscale;
+            visible: 0;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
-         }
-      }
-      part { name: "glow1b"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "downlight_glow_right.png";
-            max: 4 99999;
-            rel1.to_x: "elm.bar";
-            color: 255 255 255 0;
-            align: 0.0 0.5;
-         }
-         description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+            rel1.offset: -16 0;
+            rel2.offset: 15 -1;
+            visible: 1;
          }
       }
       part { name: "glow2a"; mouse_events: 0;
+         clip_to: "whole_left";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "downlight_glow_left.png";
-            max: 4 99999;
+            image.normal: "shadow_circle_vert.png";
+            rel1.to_x: "elm.bar";
             rel2.to_x: "elm.bar";
             color: 255 255 255 0;
-            align: 1.0 0.5;
+            offscale;
+            visible: 0;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+            rel1.offset: -16 0;
+            rel2.offset: 15 -1;
+            visible: 1;
          }
       }
-      part { name: "glow2b"; mouse_events: 0;
+      part { name: "glowbar1a"; type: RECT; mouse_events: 0;
+         clip_to: "whole_left";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "downlight_glow_right.png";
-            image.border: 3 0 0 0;
-            max: 32 99999;
             rel1.to_x: "elm.bar";
-            color: 255 255 255 0;
-            align: 0.0 0.5;
+            rel2.to_x: "elm.bar";
+            color: 51 153 255 255;
+            offscale;
+            visible: 0;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            rel1.offset: -5 0;
+            rel2.offset: 4 -1;
+            visible: 1;
+         }
+      }
+      part { name: "glowbar2a"; type: RECT; mouse_events: 0;
+         clip_to: "whole_right";
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to_x: "elm.bar";
+            rel2.to_x: "elm.bar";
+            color: 51 153 255 255;
+            offscale;
+            visible: 0;
+         }
+         description { state: "active" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: -5 0;
+            rel2.offset: 4 -1;
+            visible: 1;
          }
       }
       part { name: "bar1"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "bar";
-            rel2.to: "bar";
+            rel.to: "bar";
             rel2.relative: 0.5 1.0;
             color: 0 0 0 0;
          }
@@ -455,9 +462,8 @@ group { name: "elm/panes/vertical/flush";
       part { name: "bar2"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "bar";
+            rel.to: "bar";
             rel1.relative: 0.5 0.0;
-            rel2.to: "bar";
             color: 0 0 0 0;
          }
       }
@@ -488,37 +494,36 @@ group { name: "elm/panes/vertical/flush";
       program {
          signal: "mouse,in"; source: "bar1";
          action: STATE_SET "active" 0.0;
-         transition: BOUNCE 0.4 0.5 4;
+         transition: DECELERATE 0.2;
          target: "glow1a";
-         target: "glow1b";
+         target: "glowbar1a";
       }
       program {
          signal: "mouse,out"; source: "bar1";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.5;
          target: "glow1a";
-         target: "glow1b";
+         target: "glowbar1a";
       }
       program {
          signal: "mouse,in"; source: "bar2";
          action: STATE_SET "active" 0.0;
-         transition: BOUNCE 0.4 0.5 4;
+         transition: DECELERATE 0.2;
          target: "glow2a";
-         target: "glow2b";
+         target: "glowbar2a";
       }
       program {
          signal: "mouse,out"; source: "bar2";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.5;
          target: "glow2a";
-         target: "glow2b";
+         target: "glowbar2a";
       }
    }
 }
 
 group { name: "elm/panes/horizontal/flush";
-   images.image: "downlight_glow.png" COMP;
-   images.image: "downlight_glow_up.png" COMP;
+   images.image: "shadow_circle_horiz.png" COMP;
    parts {
       part { name: "whole"; type: SPACER;
          description { state: "default" 0.0;
@@ -618,64 +623,81 @@ group { name: "elm/panes/horizontal/flush";
          }
       }
       part { name: "glow1a"; mouse_events: 0;
+         clip_to: "whole_right";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "downlight_glow_up.png";
-            image.border: 0 0 0 3;
-            max: 99999 32;
+            image.normal: "shadow_circle_horiz.png";
+            rel1.to_y: "elm.bar";
             rel2.to_y: "elm.bar";
             color: 255 255 255 0;
-            align: 0.5 1.0;
+            offscale;
+            visible: 0;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
-         }
-      }
-      part { name: "glow1b"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "downlight_glow.png";
-            max: 99999 4;
-            rel1.to_y: "elm.bar";
-            color: 255 255 255 0;
-            align: 0.5 0.0;
-         }
-         description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+            rel1.offset: 0 -16;
+            rel2.offset: -1 15;
+            visible: 1;
          }
       }
       part { name: "glow2a"; mouse_events: 0;
+         clip_to: "whole_left";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "downlight_glow_up.png";
-            max: 99999 4;
+            image.normal: "shadow_circle_horiz.png";
+            rel1.to_y: "elm.bar";
             rel2.to_y: "elm.bar";
             color: 255 255 255 0;
-            align: 0.5 1.0;
+            offscale;
+            visible: 0;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            color: 255 255 255 128;
+            rel1.offset: 0 -16;
+            rel2.offset: -1 15;
+            visible: 1;
          }
       }
-      part { name: "glow2b"; mouse_events: 0;
+      part { name: "glowbar1a"; type: RECT; mouse_events: 0;
+         clip_to: "whole_left";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "downlight_glow.png";
-            image.border: 0 0 3 0;
-            max: 99999 32;
             rel1.to_y: "elm.bar";
-            color: 255 255 255 0;
-            align: 0.5 0.0;
+            rel2.to_y: "elm.bar";
+            color: 51 153 255 255;
+            offscale;
+            visible: 0;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            rel1.offset: 0 -5;
+            rel2.offset: -1 4;
+            visible: 1;
+         }
+      }
+      part { name: "glowbar2a"; type: RECT; mouse_events: 0;
+         clip_to: "whole_right";
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to_y: "elm.bar";
+            rel2.to_y: "elm.bar";
+            color: 51 153 255 255;
+            offscale;
+            visible: 0;
+         }
+         description { state: "active" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: 0 -5;
+            rel2.offset: -1 4;
+            visible: 1;
          }
       }
       part { name: "bar1"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "bar";
-            rel2.to: "bar";
+            rel.to: "bar";
             rel2.relative: 1.0 0.5;
             color: 0 0 0 0;
          }
@@ -683,42 +705,13 @@ group { name: "elm/panes/horizontal/flush";
       part { name: "bar2"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "bar";
+            rel.to: "bar";
             rel1.relative: 0.0 0.5;
-            rel2.to: "bar";
             color: 0 0 0 0;
          }
       }
    }
    programs {
-      program {
-         signal: "mouse,in"; source: "bar1";
-         action: STATE_SET "active" 0.0;
-         transition: BOUNCE 0.4 0.5 4;
-         target: "glow1a";
-         target: "glow1b";
-      }
-      program {
-         signal: "mouse,out"; source: "bar1";
-         action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
-         target: "glow1a";
-         target: "glow1b";
-      }
-      program {
-         signal: "mouse,in"; source: "bar2";
-         action: STATE_SET "active" 0.0;
-         transition: BOUNCE 0.4 0.5 4;
-         target: "glow2a";
-         target: "glow2b";
-      }
-      program {
-         signal: "mouse,out"; source: "bar2";
-         action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
-         target: "glow2a";
-         target: "glow2b";
-      }
       program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback
          action: SIGNAL_EMIT "elm,action,press" "elm";
       }
@@ -741,39 +734,62 @@ group { name: "elm/panes/horizontal/flush";
          action: STATE_SET "default" 0.0;
          target: "bar";
       }
+      program {
+         signal: "mouse,in"; source: "bar1";
+         action: STATE_SET "active" 0.0;
+         transition: DECELERATE 0.2;
+         target: "glow1a";
+         target: "glowbar1a";
+      }
+      program {
+         signal: "mouse,out"; source: "bar1";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.5;
+         target: "glow1a";
+         target: "glowbar1a";
+      }
+      program {
+         signal: "mouse,in"; source: "bar2";
+         action: STATE_SET "active" 0.0;
+         transition: DECELERATE 0.2;
+         target: "glow2a";
+         target: "glowbar2a";
+      }
+      program {
+         signal: "mouse,out"; source: "bar2";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 0.5;
+         target: "glow2a";
+         target: "glowbar2a";
+      }
    }
 }
 
 group { name: "elm/panes/vertical/left-fold";
    inherit: "elm/panes/vertical/default";
-   images.image: "icon_arrow_left.png" COMP;
-   images.image: "icon_arrow_right.png" COMP;
+   images.image: "big_arrow_left.png" COMP;
+   images.image: "big_arrow_right.png" COMP;
    script {
       public open;
       public drag_x;
       public drag_y;
    }
    parts {
-      spacer { "sub_whole";
-         desc { "default";
-            rel1.offset: 3 0;
-         }
-      }
       image { "dots";
          desc { "default";
-            image.normal: "icon_arrow_left.png";
-            FIXED_SIZE(14, 14)
+            image.normal: "big_arrow_left.png";
+            FIXED_SIZE(14, 17)
+            fill.smooth: 1;
          }
          desc { "closed";
             inherit: "default" 0.0;
-            image.normal: "icon_arrow_right.png";
+            image.normal: "big_arrow_right.png";
          }
       }
       rect { "event";
          repeat;
          desc { "default";
-            rel1.to: "dots";
-            rel2.to: "dots";
+            rel.to: "dots";
             color: 0 0 0 0;
          }
       }
@@ -786,8 +802,7 @@ group { name: "elm/panes/vertical/left-fold";
       }
       program { signal: "mouse,clicked,1"; source: "event";
          script {
-            if (get_int(open) == 1)
-            {
+            if (get_int(open) == 1) {
                new Float: dx;
                new Float: dy;
                set_int(open, 0);
@@ -795,9 +810,7 @@ group { name: "elm/panes/vertical/left-fold";
                set_float(drag_x, dx);
                set_drag(PART:"elm.bar", 0.0, 0.5);
                set_state(PART:"dots", "closed", 0.0);
-            }
-            else if (get_int(open) == 0)
-            {
+            } else if (get_int(open) == 0) {
                set_int(open, 1);
                set_drag(PART:"elm.bar", get_float(drag_x), 0.5);
                set_state(PART:"dots", "default", 0.0);
@@ -809,34 +822,29 @@ group { name: "elm/panes/vertical/left-fold";
 
 group { name: "elm/panes/vertical/right-fold";
    inherit: "elm/panes/vertical/default";
-   images.image: "icon_arrow_left.png" COMP;
-   images.image: "icon_arrow_right.png" COMP;
+   images.image: "big_arrow_left.png" COMP;
+   images.image: "big_arrow_right.png" COMP;
    script {
       public open;
       public drag_x;
       public drag_y;
    }
    parts {
-      spacer { "sub_whole";
-         desc { "default";
-            rel2.offset: -4 0;
-         }
-      }
       image { "dots";
          desc { "default";
-            image.normal: "icon_arrow_right.png";
+            image.normal: "big_arrow_right.png";
             FIXED_SIZE(14, 17)
+            fill.smooth: 1;
          }
          desc { "closed";
             inherit: "default" 0.0;
-            image.normal: "icon_arrow_left.png";
+            image.normal: "big_arrow_left.png";
          }
       }
       rect { "event";
          repeat;
          desc { "default";
-            rel1.to: "dots";
-            rel2.to: "dots";
+            rel.to: "dots";
             color: 0 0 0 0;
          }
       }
@@ -849,8 +857,7 @@ group { name: "elm/panes/vertical/right-fold";
       }
       program { signal: "mouse,clicked,1"; source: "event";
          script {
-            if (get_int(open) == 1)
-            {
+            if (get_int(open) == 1) {
                new Float: dx;
                new Float: dy;
                set_int(open, 0);
@@ -858,9 +865,7 @@ group { name: "elm/panes/vertical/right-fold";
                set_float(drag_x, dx);
                set_drag(PART:"elm.bar", 1.0, 0.5);
                set_state(PART:"dots", "closed", 0.0);
-            }
-            else if (get_int(open) == 0)
-            {
+            } else if (get_int(open) == 0) {
                set_int(open, 1);
                set_drag(PART:"elm.bar", get_float(drag_x), 0.5);
                set_state(PART:"dots", "default", 0.0);
@@ -872,27 +877,23 @@ group { name: "elm/panes/vertical/right-fold";
 
 group { name: "elm/panes/horizontal/up-fold";
    inherit: "elm/panes/horizontal/default";
-   images.image: "icon_arrow_up.png" COMP;
-   images.image: "icon_arrow_down.png" COMP;
+   images.image: "big_arrow_up.png" COMP;
+   images.image: "big_arrow_down.png" COMP;
    script {
       public open;
       public drag_x;
       public drag_y;
    }
    parts {
-      spacer { "sub_whole";
-         desc { "default";
-            rel1.offset: 0 3;
-         }
-      }
       image { "dots";
          desc { "default";
-            image.normal: "icon_arrow_up.png";
+            image.normal: "big_arrow_up.png";
             FIXED_SIZE(17, 14)
+            fill.smooth: 1;
          }
          desc { "closed";
             inherit: "default" 0.0;
-            image.normal: "icon_arrow_down.png";
+            image.normal: "big_arrow_down.png";
          }
       }
       rect { "event";
@@ -912,8 +913,7 @@ group { name: "elm/panes/horizontal/up-fold";
       }
       program { signal: "mouse,clicked,1"; source: "event";
          script {
-            if (get_int(open) == 1)
-            {
+            if (get_int(open) == 1) {
                new Float: dx;
                new Float: dy;
                set_int(open, 0);
@@ -921,9 +921,7 @@ group { name: "elm/panes/horizontal/up-fold";
                set_float(drag_y, dy);
                set_drag(PART:"elm.bar", 0.5, 0.0);
                set_state(PART:"dots", "closed", 0.0);
-            }
-            else if (get_int(open) == 0)
-            {
+            } else if (get_int(open) == 0) {
                set_int(open, 1);
                set_drag(PART:"elm.bar", 0.5, get_float(drag_y));
                set_state(PART:"dots", "default", 0.0);
@@ -935,27 +933,23 @@ group { name: "elm/panes/horizontal/up-fold";
 
 group { name: "elm/panes/horizontal/down-fold";
    inherit: "elm/panes/horizontal/default";
-   images.image: "icon_arrow_up.png" COMP;
-   images.image: "icon_arrow_down.png" COMP;
+   images.image: "big_arrow_up.png" COMP;
+   images.image: "big_arrow_down.png" COMP;
    script {
       public open;
       public drag_x;
       public drag_y;
    }
    parts {
-      spacer { "sub_whole";
-         desc { "default";
-            rel2.offset: 0 -4;
-         }
-      }
       image { "dots";
          desc { "default";
-            image.normal: "icon_arrow_down.png";
+            image.normal: "big_arrow_down.png";
             FIXED_SIZE(17, 14)
+            fill.smooth: 1;
          }
          desc { "closed";
             inherit: "default" 0.0;
-            image.normal: "icon_arrow_up.png";
+            image.normal: "big_arrow_up.png";
          }
       }
       rect { "event";
@@ -975,8 +969,7 @@ group { name: "elm/panes/horizontal/down-fold";
       }
       program { signal: "mouse,clicked,1"; source: "event";
          script {
-            if (get_int(open) == 1)
-            {
+            if (get_int(open) == 1) {
                new Float: dx;
                new Float: dy;
                set_int(open, 0);
@@ -984,9 +977,7 @@ group { name: "elm/panes/horizontal/down-fold";
                set_float(drag_y, dy);
                set_drag(PART:"elm.bar", 0.5, 1.0);
                set_state(PART:"dots", "closed", 0.0);
-            }
-            else if (get_int(open) == 0)
-            {
+            } else if (get_int(open) == 0) {
                set_int(open, 1);
                set_drag(PART:"elm.bar", 0.5, get_float(drag_y));
                set_state(PART:"dots", "default", 0.0);
@@ -995,3 +986,7 @@ group { name: "elm/panes/horizontal/down-fold";
       }
    }
 }
+
+#undef PANEMIN
+#undef PANEMIN2
+#undef PANEWID

data/elementary/themes/edc/elm/photo.edc

@@ -3,38 +3,36 @@ group { name: "elm/photo/base/default";
    parts {
       part { name: "shadow"; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            WIN_SHADOW;
+            rel.to: "base";
+            WIN_SHADOW_SMALL;
          }
       }
       part { name: "base"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 7 7;
-            rel2.offset: -8 -8;
-            color: 255 255 255 255;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            color: 128 128 128 255;
+            offscale;
          }
       }
       part { name: "clip"; type: RECT;
          description { state:    "default" 0.0;
-            rel1.to: "base";
+            rel.to: "base";
             rel1.offset: 4 4;
-            rel2.to: "base";
             rel2.offset: -5 -5;
          }
       }
       part { name: "bg"; type: RECT;
          description { state:    "default" 0.0;
-            rel1.to: "clip";
-            rel2.to: "clip";
-            color: DARK_GREY_BG_COLOR;
+            rel.to: "clip";
+            color: 48 48 48 255;
          }
       }
       part { name: "elm.swallow.content"; type: SWALLOW;
          clip_to: "clip";
          description { state: "default" 0.0;
-            rel1.to: "clip";
-            rel2.to: "clip";
+            rel.to: "clip";
          }
       }
    }
@@ -64,15 +62,14 @@ group { name: "elm/photo/base/shadow";
    parts {
       part { name: "size"; type: SPACER;
          description { state: "default" 0.0;
-            rel1.offset: 7 7;
-            rel2.offset: -8 -8;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
          }
       }
       part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "size";
+            rel.to: "size";
             rel1.offset: 0 0;
-            rel2.to: "size";
             rel2.offset: -1 -1;
          }
       }

data/elementary/themes/edc/elm/player.edc

@@ -1,11 +1,6 @@
-#define BSZ 20
+#define BSZ 24
 group { name: "elm/player/base/default";
-   images.image: "inset_shadow.png" COMP;
-   images.image: "shine.png" COMP;
    images.image: "bevel_out.png" COMP;
-   images.image: "vgrad_med_lighter.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "shine.png" COMP;
    images.image: "vgrad_shadow_bi.png" COMP;
    images.image: "shadow_square_tiny.png" COMP;
    script {
@@ -34,107 +29,37 @@ group { name: "elm/player/base/default";
    parts {
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
-            rel1.offset: 1 1;
-            rel2.offset: -2 -2;
             color: 0 0 0 255;
          }
       }
       part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel2.to: "bg";
+            rel.to: "bg";
          }
       }
       // video (elm_video) content here
       part { name: "elm.swallow.content"; type: SWALLOW;
          clip_to: "clipper";
          description { state: "default" 0.0;
-            rel1.offset: 1 1;
-            rel2.offset: -2 -2;
          }
       }
 
-      part { name: "barshad";
+      part { name: "bar";  type: RECT;
          clip_to: "clipper";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "vgrad_shadow_bi.png";
-            rel1.to: "bar";
-            rel1.relative: 0.0 -0.5;
-            rel2.to: "bar";
-            rel2.relative: 1.0 0.5;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 128;
-            visible: 1;
-         }
-      }
-      part { name: "volpop_shadow"; mouse_events: 0;
-         clip_to: "volclip";
-         description { state: "default" 0.0;
-            rel1.offset: -3 -2;
-            rel1.to: "volpop";
-            rel2.offset: 3 4;
-            rel2.to: "volpop";
-            image.normal: "shadow_square_tiny.png";
-            image.border: 6 6 6 6;
-            fill.smooth: 0;
-         }
-      }
-      
-      part { name: "bar";
-         clip_to: "clipper";
-         description { state: "default" 0.0;
-            color_class: "player_bar";
-            image.normal: "vgrad_med_lighter.png";
+            rel1.offset: 0 -6;
             rel1.to_y: "elm.swallow.media_player.prev";
-            rel1.offset: 1 -1;
             rel2.to_y: "elm.swallow.media_player.positionslider";
-            rel2.offset: -2 -1;
-            fill.smooth: 0;
-            TILED_HORIZ(120)
-         }
-      }
-      part { name: "barbevclip"; type: RECT;
-         clip_to: "clipper";
-         description { state: "default" 0.0;
-            fixed: 0 1;
-            rel1.to: "bar";
-            rel2.to: "bar";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 0;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "barbev";
-         clip_to: "barbevclip";
-         description { state: "default" 0.0;
-            rel1.to: "bar";
-            rel2.to: "bar";
-            image.normal: "bevel_out.png";
-            image.border: 2 2 2 2;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "shine"; mouse_events: 0;
-         clip_to: "clipper";
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel1.to: "bar";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "bar";
-            FIXED_SIZE(69, 5)
+            rel2.offset: -1 4;
+            color: 64 64 64 255;
+            offscale;
          }
       }
 
       part { name: "volclip"; type: RECT;
          description { state: "default" 0.0;
             rel1.to: "bg";
-            rel2.to: "bg";
             color: 255 255 255 0;
             visible: 0;
          }
@@ -144,51 +69,17 @@ group { name: "elm/player/base/default";
             visible: 1;
          }
       }
-      part { name: "volpop";
+      part { name: "volpop"; type: RECT;
          clip_to: "volclip";
          description { state: "default" 0.0;
-            color_class: "player_volume";
-            image.normal: "vgrad_med_lighter.png";
             rel1.to: "elm.swallow.media_player.volumeslider";
             rel1.offset: -1 -1;
             rel2.to: "elm.swallow.media_player.volumeslider";
             rel2.offset: 0 0;
-            fill.smooth: 0;
-            TILED_HORIZ(120)
+            color: 64 64 64 255;
          }
       }
-      part { name: "volpopclip"; type: RECT;
-         clip_to: "volclip";
-         description { state: "default" 0.0;
-            rel1.to: "volpop";
-            rel1.offset: 0 -5;
-            rel2.to: "volpop";
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "volpopbev";
-         clip_to: "volpopclip";
-         description { state: "default" 0.0;
-            rel1.to: "volpop";
-            rel2.to: "volpop";
-            image.normal: "bevel_out.png";
-            image.border: 2 2 2 2;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "volshine"; mouse_events: 0;
-         clip_to: "volpopclip";
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel1.to: "volpop";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "volpop";
-            FIXED_SIZE(69, 5)
-         }
-      }
-      
+
       part { name: "elm.swallow.media_player.prev"; type: SWALLOW; 
          clip_to: "clipper";
          scale: 1;
@@ -197,14 +88,15 @@ group { name: "elm/player/base/default";
             min: BSZ BSZ;
             align: 0.0 0.0;
             rel1.relative: 0.0 1.0;
-            rel1.offset: 1 7;
+            rel1.offset: 5 5;
             rel2.relative: 0.0 1.0;
-            rel2.offset: 1 7;
+            rel2.offset: 5 5;
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            rel1.offset: 1 -2;
-            rel2.offset: 1 -2;
+            rel1.offset: 5 -6;
+            rel2.offset: 5 -6;
             align: 0.0 1.0;
          }
       }
@@ -217,10 +109,11 @@ group { name: "elm/player/base/default";
             align: 0.0 1.0;
             rel1.to: "elm.swallow.media_player.prev";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 0 0;
+            rel1.offset: 5 0;
             rel2.to: "elm.swallow.media_player.prev";
             rel2.relative: 1.0 1.0;
-            rel2.offset: 0 -1;
+            rel2.offset: 5 -1;
+            offscale;
          }
       }
       part { name: "elm.swallow.media_player.play"; type: SWALLOW; 
@@ -232,10 +125,11 @@ group { name: "elm/player/base/default";
             align: 0.0 1.0;
             rel1.to: "elm.swallow.media_player.rewind";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 0 0;
+            rel1.offset: 5 0;
             rel2.to: "elm.swallow.media_player.rewind";
             rel2.relative: 1.0 1.0;
-            rel2.offset: 0 -1;
+            rel2.offset: 5 -1;
+            offscale;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -265,10 +159,11 @@ group { name: "elm/player/base/default";
             align: 0.0 1.0;
             rel1.to: "elm.swallow.media_player.play";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 0 0;
+            rel1.offset: 5 0;
             rel2.to: "elm.swallow.media_player.play";
             rel2.relative: 1.0 1.0;
-            rel2.offset: 0 -1;
+            rel2.offset: 5 -1;
+            offscale;
          }
       }
       part { name: "elm.swallow.media_player.next"; type: SWALLOW; 
@@ -280,10 +175,11 @@ group { name: "elm/player/base/default";
             align: 0.0 1.0;
             rel1.to: "elm.swallow.media_player.forward";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 0 0;
+            rel1.offset: 5 0;
             rel2.to: "elm.swallow.media_player.forward";
             rel2.relative: 1.0 1.0;
-            rel2.offset: 0 -1;
+            rel2.offset: 5 -1;
+            offscale;
          }
       }
       part { name: "elm.swallow.media_player.stop"; type: SWALLOW;
@@ -295,10 +191,11 @@ group { name: "elm/player/base/default";
             align: 0.0 1.0;
             rel1.to: "elm.swallow.media_player.next";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 0 0;
+            rel1.offset: 5 0;
             rel2.to: "elm.swallow.media_player.next";
             rel2.relative: 1.0 1.0;
-            rel2.offset: 0 -1;
+            rel2.offset: 5 -1;
+            offscale;
          }
       }
       part { name: "elm.swallow.media_player.eject"; type: SWALLOW;
@@ -310,10 +207,11 @@ group { name: "elm/player/base/default";
             align: 0.0 1.0;
             rel1.to: "elm.swallow.media_player.stop";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 0 0;
+            rel1.offset: 5 0;
             rel2.to: "elm.swallow.media_player.stop";
             rel2.relative: 1.0 1.0;
-            rel2.offset: 0 -1;
+            rel2.offset: 5 -1;
+            offscale;
          }
       }
       part { name: "elm.swallow.media_player.volume"; type: SWALLOW;
@@ -325,10 +223,11 @@ group { name: "elm/player/base/default";
             align: 0.0 1.0;
             rel1.to: "elm.swallow.media_player.eject";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 0 0;
+            rel1.offset: 5 0;
             rel2.to: "elm.swallow.media_player.eject";
             rel2.relative: 1.0 1.0;
-            rel2.offset: 0 -1;
+            rel2.offset: 5 -1;
+            offscale;
          }
          description { state: "hidden" 0.0;
             inherit: "default" 0.0;
@@ -358,20 +257,24 @@ group { name: "elm/player/base/default";
             align: 0.0 1.0;
             rel1.to: "elm.swallow.media_player.volume";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 0 0;
+            rel1.offset: 5 0;
             rel2.to: "elm.swallow.media_player.volume";
             rel2.relative: 1.0 1.0;
-            rel2.offset: 0 -1;
+            rel2.offset: 5 -1;
+            offscale;
          }
       }
       part { name: "elm.swallow.media_player.positionslider"; type: SWALLOW; 
          clip_to: "clipper";
+         scale: 1;
          description { state: "default" 0.0;
             fixed: 0 1;
             rel1.relative: 1.0 0.0;
+            rel1.offset: 5 0;
             rel1.to: "elm.swallow.media_player.info";
             rel2.to_y: "elm.swallow.media_player.info";
-            rel2.offset: -2 -1;
+            rel2.offset: -6 -1;
+            offscale;
          }
       }
      part { name: "elm.swallow.media_player.volumeslider"; type: SWALLOW;
@@ -388,31 +291,7 @@ group { name: "elm/player/base/default";
             max: 99999 100;
          }
       }
-      
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            fill.smooth: 0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "inset"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel1.offset: -1 -1;
-            rel2.to: "bg";
-            rel2.offset: 0 0;
-            fill.smooth: 0;
-         }
-      }
-      
+
       part { name: "controls"; type: RECT; repeat_events: 1;
          clip_to: "clipper";
          scale: 1;
@@ -423,7 +302,7 @@ group { name: "elm/player/base/default";
             color: 0 0 0 0;
          }
       }
-      
+
       part { name: "volumetop"; type: SPACER;
          description { state: "default" 0.0;
             fixed: 1 1;
@@ -488,15 +367,13 @@ group { name: "elm/player/base/default";
          action: STATE_SET "visible" 0.0;
          transition: DECELERATE 0.2;
          target: "elm.swallow.media_player.prev";
-         target: "barshad";
          target: "volume";
       }
       program {
          signal: "conhide"; source: "";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
+         transition: ACCELERATE 0.5;
          target: "elm.swallow.media_player.prev";
-         target: "barshad";
          target: "volume";
       }
       program {
@@ -508,10 +385,10 @@ group { name: "elm/player/base/default";
       program {
          signal: "mouse,out"; source: "volume";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.5;
+         transition: ACCELERATE 0.5;
          target: "volclip";
       }
-      
+
       program {
          signal: "load"; source: "";
          after: "pause/0";
@@ -594,22 +471,10 @@ group { name: "elm/player/base/flush";
       }
       part { name: "bar";
          description { state: "default" 0.0;
-            rel1.offset: 0 -1;
+            rel1.offset: 0 0;
             rel2.offset: -1 -1;
          }
       }
-      part { name: "barbevclip"; type: RECT;
-         description { state: "default" 0.0;
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -1 -1;
-         }
-      }
-      part { name: "barbev";
-         description { state: "default" 0.0;
-            rel1.offset: -1 0;
-            rel2.offset: 0 -1;
-         }
-      }
       part { name: "elm.swallow.media_player.prev";
          description { state: "default" 0.0;
             rel1.offset: 0 7;
@@ -625,16 +490,5 @@ group { name: "elm/player/base/flush";
             rel2.offset: -1 -1;
          }
       }
-      
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "inset"; mouse_events: 0;
-         description { state: "default" 0.0;
-            visible: 0;
-         }
-      }
    }
 }

data/elementary/themes/edc/elm/pointer.edc

@@ -1,7 +1,6 @@
 group { name: "elm/pointer/base/default";
    images {
       image: "pointer.png" COMP;
-      image: "pointer_glow.png" COMP;
    }
    parts {
       part {
@@ -23,20 +22,6 @@ group { name: "elm/pointer/base/default";
             }
          }
       }
-      part { name: "glow";
-         description { state: "default" 0.0;
-            image.normal: "pointer_glow.png";
-            color: 255 255 255 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-         description { state: "faded" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 128;
-         }
-      }
       part {
          name: "elm.swallow.hotspot";
          /* this is a "fake" swallow part
@@ -64,42 +49,6 @@ group { name: "elm/pointer/base/default";
       }
    }
    programs {
-      program {
-         signal: "elm,action,mouse,down"; source: "elm";
-         action: STATE_SET "visible" 0.0;
-         target: "glow";
-         after: "fade";
-      }
-      program { name: "fade";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.5;
-         target: "glow";
-      }
-      program { name: "pulse";
-         signal: "e,state,mouse,idle"; source: "e";
-         in: 10.0 0.0;
-         action: STATE_SET "faded" 0.0;
-         transition: SINUSOIDAL 0.25;
-         target: "glow";
-         after: "pulse2";
-      }
-      program { name: "pulse2";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.5;
-         target: "glow";
-         after: "pulse";
-      }
-      program {
-         signal: "elm,action,mouse,move"; source: "elm";
-         action: STATE_SET "default" 0.0;
-         target: "glow";
-         after: "stop2";
-      }
-      program { name: "stop2";
-         action: ACTION_STOP;
-         target: "pulse";
-         target: "pulse2";
-      }
    }
 }
 
@@ -108,7 +57,7 @@ group { name: "elm/pointer/base/bottom_right_corner";
    images.image: "mini_box_glow.png" COMP;
    parts {
       part { name: "box";
-         insert_after: "glow";
+         insert_after: "base";
          description { state: "default" 0.0;
             image.normal: "mini_box_glow.png";
             image.border: 7 7 7 7;
@@ -256,7 +205,7 @@ group { name: "elm/pointer/base/hand1";
    images.image: "mini_box_glow.png" COMP;
    parts {
       part { name: "box";
-         insert_after: "glow";
+         insert_after: "base";
          description { state: "default" 0.0;
             image.normal: "mini_box_glow.png";
             image.border: 7 7 7 7;
@@ -323,19 +272,6 @@ group { name: "elm/pointer/base/hand1";
 group { name: "elm/pointer/base/move";
    inherit: "elm/pointer/base/hand1";
    programs {
-      program { name: "move1";
-         signal: "load"; source: "";
-         action: STATE_SET "faded" 0.0;
-         transition: SINUSOIDAL 0.5;
-         target: "glow";
-         after: "move2";
-      }
-      program { name: "move2";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.5;
-         target: "glow";
-         after: "move1";
-      }
    }
 }
 
@@ -344,7 +280,7 @@ group { name: "elm/pointer/base/rotate";
    images.image: "mini_box_glow.png" COMP;
    parts {
       part { name: "box";
-         insert_after: "glow";
+         insert_after: "base";
          description { state: "default" 0.0;
             image.normal: "mini_box_glow.png";
             image.border: 7 7 7 7;
@@ -389,12 +325,12 @@ group { name: "elm/pointer/base/rotate";
 
 group { name: "elm/pointer/base/plus";
    inherit: "elm/pointer/base/default";
-   images.image: "add_glow_small.png" COMP;
+   images.image: "therm_base.png" COMP;
    parts {
       part { name: "add";
-         insert_after: "glow";
+         insert_after: "base";
          description { state: "default" 0.0;
-            image.normal: "add_glow_small.png";
+            image.normal: "therm_base.png";
             aspect: 1.0 1.0; aspect_preference: BOTH;
             rel1.relative: 0.3 0.3;
             rel2.relative: 1.0 1.0;
@@ -425,15 +361,15 @@ group { name: "elm/pointer/base/plus";
 }
 
 group { name: "elm/pointer/base/xterm";
-   images.image: "pointer_entry_bar.png" COMP;
+   images.image: "therm_base.png" COMP;
    images.image: "led_dot_white.png" COMP;
    parts {
       part { name: "base";
          description { state: "default" 0.0;
-            image.normal: "pointer_entry_bar.png";
+            image.normal: "therm_base.png";
             max: 15 99999;
             min: 15 20;
-            image.normal: "pointer_entry_bar.png";
+            image.normal: "therm_base.png";
             image.border: 0 0 10 10;
             rel1.offset: 0 2;
             rel2.offset: -1 -3;

data/elementary/themes/edc/elm/popup.edc

@@ -17,8 +17,7 @@ group { name: "elm/notify/block_events/popup/transparent";
             color: 0 0 0 192;
          }
       }
-      program {
-         signal: "mouse,down,1"; source: "base";
+      program { signal: "mouse,down,1"; source: "base";
          action: SIGNAL_EMIT "elm,action,click" "elm";
          after: "click1";
       }
@@ -27,8 +26,7 @@ group { name: "elm/notify/block_events/popup/transparent";
          target: "base";
          transition: SINUSOIDAL 0.2;
       }
-      program {
-         signal: "mouse,up,1"; source: "base";
+      program { signal: "mouse,up,1"; source: "base";
          action: STATE_SET "default" 0.0;
          target: "base";
          transition: DECELERATE 0.5;
@@ -39,14 +37,19 @@ group { name: "elm/notify/block_events/popup/transparent";
 group { name: "elm/notify/top/popup/default";
    inherit: "elm/notify/top/default";
 #define OVERRIDE_BASE() \
-   images.image: "rounded_square.png" COMP; \
    parts { \
-      part { name: "base"; \
+      part { name: "shadow"; mouse_events: 0; \
          description { state: "default" 0.0; \
-            image.normal: "rounded_square.png"; \
+            rel.to: "base"; \
+            WIN_SHADOW; \
+         } \
+      } \
+      part { name: "base"; type: RECT; \
+         description { state: "default" 0.0; \
+            color: 48 48 48 255; \
          } \
          description { state: "visible" 0.0; \
-            image.normal: "rounded_square.png"; \
+            color: 48 48 48 255; \
          } \
       } \
    }
@@ -134,7 +137,7 @@ group { name: "elm/label/base/popup/default";
    alias: "elm/label/base/popup/transparent";
    styles {
       style { name: "popup_desc_style";
-         base: "font="FN" font_size=10 text_class=label align=center color=#fff color_class=popup_text style=shadow,bottom shadow_color=#00000080 wrap=mixed";
+         base: "font="FN" font_size=10 text_class=label align=center color=#a0a0a0 wrap=mixed";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD" text_class=label_light";
          tag: "b" "+ font="FNBD" text_class=label_light";
@@ -142,7 +145,7 @@ group { name: "elm/label/base/popup/default";
          tag: "tab" "\t";
       }
       style { name: "popup_title_style_ellipsis";
-         base: "font="FNBD" font_size=10 text_class=label align=center color=#fff color_class=popup_title_text style=shadow,bottom shadow_color=#00000080 ellipsis=1.0 wrap=mixed";
+         base: "font="FNBD" font_size=10 text_class=label align=center color=#fff ellipsis=1.0 wrap=mixed";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD" text_class=label_light";
          tag: "b" "+ font="FNBD" text_class=label_light";
@@ -154,13 +157,13 @@ group { name: "elm/label/base/popup/default";
       part { name: "elm.text"; type: TEXTBLOCK; mouse_events: 0;
          scale: 1;
          description { state: "default" 0.0;
-            text {
-               style: "popup_desc_style";
+            text { style: "popup_desc_style";
                min: 0 1;
                max: 0 1;
             }
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
+            rel1.offset: 5 5;
+            rel2.offset: -6 -6;
+            offscale;
          }
       }
    }
@@ -178,7 +181,7 @@ group { name: "elm/popup/base/default";
    alias: "elm/popup/base/transparent";
    styles {
       style { name: "popup_title_style";
-         base: "font="FNBD" font_size=10 text_class=label align=center color=#fff color_class=popup_title_text style=shadow,bottom shadow_color=#00000080 wrap=mixed";
+         base: "font="FNBD" font_size=10 text_class=label align=center color=#fff wrap=mixed";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD" text_class=label_light";
          tag: "b" "+ font="FNBD" text_class=label_light";
@@ -191,39 +194,37 @@ group { name: "elm/popup/base/default";
          scale: 1;
          description { state: "default" 0.0;
             min: 240 0;
-            color_class: "popup_bg";
+            color: 0 0 0 0;
          }
       }
       part { name: "elm.swallow.background"; type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "base";
-            rel2.to: "base";
+            rel.to: "base";
          }
       }
       part { name: "elm.bg.title"; type: RECT;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "elm.text.title";
-            rel2.to: "elm.text.title";
-            color_class: "popup_title_bg";
+            rel.to: "elm.text.title";
+            color: 0 0 0 0;
          }
       }
       part { name: "elm.text.title"; type: TEXTBLOCK;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 0 1;
-            text {
-              style: "popup_title_style";
+            text { style: "popup_title_style";
               min: 1 1;
               ellipsis: -1;
             }
             visible: 0;
-            rel1.offset: 2 2;
-            rel2.offset: -3 2;
+            rel1.offset: 5 5;
+            rel2.offset: -6 5;
             rel2.relative: 1.0 0.0;
             align: 0.5 0.0;
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -247,9 +248,11 @@ group { name: "elm/popup/base/default";
          }
       }
       part { name: "elm.swallow.content"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
+            rel1.offset: 5 5;
+            rel2.offset: -6 -6;
+            offscale;
          }
          description { state: "show_title_area" 0.0;
             inherit: "default" 0.0;
@@ -275,58 +278,51 @@ group { name: "elm/popup/base/default";
             fixed: 0 1;
             align: 0.5 1.0;
             visible: 0;
+            rel.to: "base";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 2 -3;
-            rel1.to: "base";
-            rel2.offset: -3 -3;
-            rel2.to: "base";
+            rel1.offset: 5 -6;
+            rel2.offset: -6 -6;
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
          }
       }
-      
+
       part { name: "access.title"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "elm.bg.title";
-            rel2.to: "elm.bg.title";
+            rel.to: "elm.bg.title";
             color: 0 0 0 0;
          }
       }
       part { name: "access.body"; type: RECT; repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
+            rel.to: "elm.swallow.content";
             color: 0 0 0 0;
          }
       }
    }
    programs {
-      program {
-         signal: "elm,state,title,icon,visible"; source: "elm";
+      program { signal: "elm,state,title,icon,visible"; source: "elm";
          action: STATE_SET "visible" 0.0;
          target: "elm.swallow.title.icon";
       }
-      program {
-         signal: "elm,state,title,icon,hidden"; source: "elm";
+      program { signal: "elm,state,title,icon,hidden"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.swallow.title.icon";
       }
-      program {
-         signal: "elm,state,title,text,visible"; source: "elm";
+      program { signal: "elm,state,title,text,visible"; source: "elm";
          action: STATE_SET "visible" 0.0;
          target: "elm.text.title";
       }
-      program {
-         signal: "elm,state,title,text,hidden"; source: "elm";
+      program { signal: "elm,state,title,text,hidden"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.text.title";
       }
-      program {
-         signal: "elm,state,title_area,visible"; source: "elm";
+      program { signal: "elm,state,title_area,visible"; source: "elm";
          script {
             new st[31], Float:vl;
             get_state(PART:"elm.swallow.action_area", st, 30, vl);
@@ -337,8 +333,7 @@ group { name: "elm/popup/base/default";
             set_state(PART:"elm.text.title", "visible", 0.0);
          }
       }
-      program {
-         signal: "elm,state,title_area,hidden"; source: "elm";
+      program { signal: "elm,state,title_area,hidden"; source: "elm";
          script {
             new st[31], Float:vl;
             get_state(PART:"elm.swallow.action_area", st, 30, vl);
@@ -349,8 +344,7 @@ group { name: "elm/popup/base/default";
             set_state(PART:"elm.text.title", "default", 0.0);
          }
       }
-      program {
-         signal: "elm,state,action_area,visible"; source: "elm";
+      program { signal: "elm,state,action_area,visible"; source: "elm";
          script {
             new st[31], Float:vl;
             get_state(PART:"elm.text.title", st, 30, vl);
@@ -361,8 +355,7 @@ group { name: "elm/popup/base/default";
             set_state(PART:"elm.swallow.action_area", "visible", 0.0);
          }
       }
-      program {
-         signal: "elm,state,action_area,hidden"; source: "elm";
+      program { signal: "elm,state,action_area,hidden"; source: "elm";
          script {
             new st[31], Float:vl;
             get_state(PART:"elm.text.title", st, 30, vl);
@@ -390,13 +383,11 @@ group { name: "elm/popup/content/popup/default";
       }
    }
    programs {
-      program {
-         signal: "elm,scroll,enable"; source: "elm";
+      program { signal: "elm,scroll,enable"; source: "elm";
          action: STATE_SET "scroll" 0.0;
          target: "elm.swallow.content";
       }
-      program {
-         signal: "elm,scroll,disable"; source: "elm";
+      program { signal: "elm,scroll,disable"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.swallow.content";
       }
@@ -466,22 +457,18 @@ group { name: "elm/popup/item/popup/default";
          insert_after: "elm.swallow.icon";
          description { state: "default" 0.0;
             fixed: 0 1;
-            rel1.to: "elm.swallow.icon";
-            rel2.to: "elm.swallow.icon";
+            rel.to: "elm.swallow.icon";
          }
       }
    }
    programs {
-      program {
-         signal: "mouse,down,1"; source: "event";
+      program { signal: "mouse,down,1"; source: "event";
          action: SIGNAL_EMIT "elm,state,selected" "elm";
       }
-      program {
-         signal: "mouse,up,1"; source: "event";
+      program { signal: "mouse,up,1"; source: "event";
          action: SIGNAL_EMIT "elm,state,unselected" "elm";
       }
-      program {
-         signal: "mouse,clicked,1"; source: "event";
+      program { signal: "mouse,clicked,1"; source: "event";
          action: SIGNAL_EMIT "elm,action,click" "elm";
       }
    }
@@ -492,9 +479,8 @@ group { name: "elm/popup/base/subpopup";
    parts {
       part { name: "pad_closebtn"; type: SPACER;
          description { state: "default" 0.0;
-            rel1.to: "base";
+            rel.to: "base";
             rel1.relative: 1 0;
-            rel2.to: "base";
             rel2.relative: 1 0;
             min: 2 2;
             max: 2 2;
@@ -505,9 +491,8 @@ group { name: "elm/popup/base/subpopup";
       part { name: "elm.swallow.closebtn"; type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "pad_closebtn";
+            rel.to: "pad_closebtn";
             rel1.relative: 1 0;
-            rel2.to: "pad_closebtn";
             rel2.relative: 1 0;
             align: 0 1;
             fixed: 1 1;

data/elementary/themes/edc/elm/segment_control.edc

@@ -10,11 +10,9 @@ group { name: "elm/segment_control/base/default";
    #define SEGMENT_STATUS_ENABLED 0
    #define SEGMENT_STATUS_DISABLED 1
    parts {
-      part { name: "bg";
-         type: RECT;
-         mouse_events: 0;
-         description {
-            state: "default" 0.0;
+      part { name: "bg"; type: RECT; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
             color: 0 0 0 0;
             min: 160 31;
          }
@@ -22,399 +20,271 @@ group { name: "elm/segment_control/base/default";
    }
 }
 group { name: "elm/segment_control/item/default";
-   images {
-      image: "day_single_press.png" COMP;
-      image: "day_single_selected.png" COMP;
-      image: "day_single_normal.png" COMP;
-      image: "day_left_press.png" COMP;
-      image: "day_left_selected.png" COMP;
-      image: "day_left_normal.png" COMP;
-      image: "day_middle_press.png" COMP;
-      image: "day_middle_selected.png" COMP;
-      image: "day_middle_normal.png" COMP;
-      image: "day_right_press.png" COMP;
-      image: "day_right_selected.png" COMP;
-      image: "day_right_normal.png" COMP;
-   }
    parts {
-      part { name: "segment";
+      part { name: "segment"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
             visible: 0;
-            image {
-               normal: "day_single_normal.png";
-               border: 4 4 3 5;
-            }
+            offscale;
          }
          description { state: "default_single" 0.0;
             inherit: "default" 0.0;
+            color: 80 80 80 255;
             visible: 1;
          }
          description { state: "default_left" 0.0;
             inherit: "default" 0.0;
+            color: 80 80 80 255;
             visible: 1;
-            image {
-               normal: "day_left_normal.png";
-               border:  4 1 3 5;
-            }
+            rel2.offset: -2 -1;
          }
          description { state: "default_right" 0.0;
             inherit: "default" 0.0;
+            color: 80 80 80 255;
             visible: 1;
-            image {
-               normal: "day_right_normal.png";
-               border: 1 4 3 5;
-            }
+            rel1.offset: 1 0;
          }
          description { state: "default_middle" 0.0;
             inherit: "default" 0.0;
+            color: 80 80 80 255;
             visible: 1;
-            image {
-               normal: "day_middle_normal.png";
-               border: 1 1 3 5;
-            }
+            rel1.offset: 1 0;
+            rel2.offset: -2 -1;
          }
          description { state: "pressed_single" 0.0;
             inherit: "default" 0.0;
+            color: 40 40 40 255;
             visible: 1;
-            image {
-               normal: "day_single_press.png";
-               border: 4 4 3 5;
-            }
          }
          description { state: "pressed_left" 0.0;
             inherit: "default" 0.0;
+            color: 40 40 40 255;
             visible: 1;
-            image {
-               normal: "day_left_press.png";
-               border:  4 1 3 5;
-            }
+            rel2.offset: -2 -1;
          }
          description { state: "pressed_right" 0.0;
             inherit: "default" 0.0;
+            color: 40 40 40 255;
             visible: 1;
-            image {
-               normal: "day_right_press.png";
-               border: 1 4 3 5;
-            }
+            rel1.offset: 1 0;
          }
          description { state: "pressed_middle" 0.0;
             inherit: "default" 0.0;
+            color: 40 40 40 255;
             visible: 1;
-            image {
-               normal: "day_middle_press.png";
-               border: 1 1 3 5;
-            }
+            rel1.offset: 1 0;
+            rel2.offset: -2 -1;
          }
          description { state: "selected_single" 0.0;
             inherit: "default" 0.0;
+            color: 51 153 255 255;
             visible: 1;
-            image {
-               normal: "day_single_selected.png";
-               border: 4 4 3 5;
-            }
          }
          description { state: "selected_left" 0.0;
             inherit: "default" 0.0;
+            color: 51 153 255 255;
             visible: 1;
-            image {
-               normal: "day_left_selected.png";
-               border:  4 1 3 5;
-            }
+            rel2.offset: -2 -1;
          }
          description { state: "selected_right" 0.0;
             inherit: "default" 0.0;
+            color: 51 153 255 255;
             visible: 1;
-            image {
-               normal: "day_right_selected.png";
-               border: 1 4 3 5;
-            }
+            rel1.offset: 1 0;
          }
          description { state: "selected_middle" 0.0;
             inherit: "default" 0.0;
+            color: 51 153 255 255;
             visible: 1;
-            image {
-               normal: "day_middle_selected.png";
-               border: 1 1 3 5;
-            }
+            rel1.offset: 1 0;
+            rel2.offset: -2 -1;
          }
       }
-      part { name: "elm.swallow.icon";
-         type: SWALLOW;
-         scale: 1;
-         clip_to: "disabler";
+      part { name: "disabler"; type: RECT;
          description { state: "default" 0.0;
-            align: 0.5 0.5;
-            fixed: 1 0;
-            rel1.offset: 10 3;
-            rel2.relative: 0.0 1.0;
-            aspect: 1.0 1.0;
-            aspect_preference: BOTH;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            fixed: 0 1;
-            rel2.relative: 0.25 1.0;
-            rel2.offset: -5 -4;
-         }
-         description { state: "icononly" 0.0;
-            inherit: "default" 0.0;
-            fixed: 0 0;
-            rel1.offset: 5 2;
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -5 -4;
-         }
-      }
-      part { name: "elm.text";
-         type: TEXT;
-         mouse_events: 0;
-         scale: 1;
-         effect: SHADOW BOTTOM;
-         description {
-            state: "default" 0.0;
+            rel.to: "segment";
+            color: 64 64 64 255;
             visible: 0;
-            fixed: 1 1;
-            min: 1 1;
-            rel1 {
-               to_x: "elm.swallow.icon";
-               relative: 1.0 0.0;
-               offset: 0 -1;
-            }
-            rel2.offset: -6 -2;
-            color: FN_COL_DEFAULT;
-            text {
-               font: FN;
-               size: 10;
-               min: 0 1;
-               text_class: "button";
-            }
-         }
-         description { state: "normal" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "pressed" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             visible: 1;
-            color: FN_COL_DISABLE;
          }
       }
-      part { name: "text2";
-         type: TEXT;
-         mouse_events: 0;
-         scale: 1;
-         effect: GLOW;
-         description {
-            state: "default" 0.0;
-            visible: 0;
-            fixed: 1 1;
-            min: 1 1;
-            rel1.to: "elm.text";
-            rel1.offset: -2 -2;
-            rel2.to: "elm.text";
-            rel2.offset: 1 1;
-            text {
-               font: FN;
-               size: 10;
-               min: 0 1;
-               text_source: "elm.text";
-               text_class: "button";
-            }
-            color: FN_COL_WHITE_GLOW;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "disabler";
-         type: RECT;
+      part { name: "icon_disabler"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "segment";
-            rel2.to: "segment";
+            rel.to: "segment";
+            color: 255 255 255 255;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
             color: 255 255 255 64;
          }
       }
+      part { name: "elm.swallow.icon"; type: SWALLOW;
+         scale: 1;
+         clip_to: "icon_disabler";
+         description { state: "default" 0.0;
+            align: 0.0 0.5;
+            rel1.offset: 0 4;
+            rel2.offset: 0 -5;
+            rel2.relative: 0.0 1.0;
+            offscale;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: 4 4;
+            rel2.offset: 4 -5;
+            aspect: 1.0 1.0;
+            aspect_preference: VERTICAL;
+            min: 16 16;
+         }
+         description { state: "icononly" 0.0;
+            inherit: "default" 0.0;
+            align: 0.5 0.5;
+            rel1.offset: 4 4;
+            rel2.relative: 1.0 1.0;
+            rel2.offset: -5 -5;
+            aspect: 1.0 1.0;
+            aspect_preference: VERTICAL;
+            min: 16 16;
+         }
+      }
+      part { name: "elm.text"; type: TEXT; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            min: 1 1;
+            rel1.to_x: "elm.swallow.icon";
+            rel1.relative: 1.0 0.0;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            color: 160 160 160 255;
+            text {
+               font: FN;
+               size: 10;
+               min: 0 1;
+               text_class: "button";
+            }
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+         }
+         description { state: "selected" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 96 96 96 255;
+         }
+      }
    }
    programs {
       script {
          public seg_type; // Single, Left, Middle, Right.
          public seg_state; // Normal/Default, Pressed, Selected.
-         public seg_status;// Enabled/Default, Disabled
+         public seg_status; // Enabled/Default, Disabled
 
          public update_state() {
-            new type, state, status;
-            type = get_int(seg_type);
-            state = get_int(seg_state);
-            status = get_int(seg_status);
+            new type = get_int(seg_type);
+            new state = get_int(seg_state);
+            new status = get_int(seg_status);
 
             if (status == SEGMENT_STATUS_ENABLED) {
-               if(state == SEGMENT_STATE_NORMAL) {
-                  if(type == SEGMENT_TYPE_SINGLE)
-                     set_state(PART:"segment", "default_single", 0.0);
-                  else if(type == SEGMENT_TYPE_LEFT)
-                     set_state(PART:"segment", "default_left", 0.0);
-                  else if(type == SEGMENT_TYPE_MIDDLE)
-                    set_state(PART:"segment", "default_middle", 0.0);
-                  else if(type == SEGMENT_TYPE_RIGHT)
-                    set_state(PART:"segment", "default_right", 0.0);
-                  set_state(PART:"elm.text", "normal", 0.0);
-                  set_state(PART:"text2", "default", 0.0);
-               } else if(state == SEGMENT_STATE_PRESSED) {
-                  if(type == SEGMENT_TYPE_SINGLE)
-                     set_state(PART:"segment", "pressed_single", 0.0);
-                  else if(type == SEGMENT_TYPE_LEFT)
-                     set_state(PART:"segment", "pressed_left", 0.0);
-                  else if(type == SEGMENT_TYPE_MIDDLE)
-                     set_state(PART:"segment", "pressed_middle", 0.0);
-                  else if(type == SEGMENT_TYPE_RIGHT)
-                     set_state(PART:"segment", "pressed_right", 0.0);
-                  set_state(PART:"elm.text", "pressed", 0.0);
-                  set_state(PART:"text2", "default", 0.0);
-               } else if(state == SEGMENT_STATE_SELECTED) {
-                  if(type == SEGMENT_TYPE_SINGLE)
-                     set_state(PART:"segment", "selected_single", 0.0);
-                  else if(type == SEGMENT_TYPE_LEFT)
-                    set_state(PART:"segment", "selected_left", 0.0);
-                  else if(type == SEGMENT_TYPE_MIDDLE)
-                    set_state(PART:"segment", "selected_middle", 0.0);
-                  else if(type == SEGMENT_TYPE_RIGHT)
-                    set_state(PART:"segment", "selected_right", 0.0);
-                  set_state(PART:"elm.text", "default", 0.0);
-                  set_state(PART:"text2", "selected", 0.0);
-               }
               set_state(PART:"disabler", "default", 0.0);
+              set_state(PART:"icon_disabler", "default", 0.0);
+               if (state == SEGMENT_STATE_NORMAL) {
+                  if (type == SEGMENT_TYPE_SINGLE)
+                    set_state(PART:"segment", "default_single", 0.0);
+                  else if (type == SEGMENT_TYPE_LEFT)
+                    set_state(PART:"segment", "default_left", 0.0);
+                  else if (type == SEGMENT_TYPE_MIDDLE)
+                    set_state(PART:"segment", "default_middle", 0.0);
+                  else if (type == SEGMENT_TYPE_RIGHT)
+                    set_state(PART:"segment", "default_right", 0.0);
+                  set_state(PART:"elm.text", "default", 0.0);
+               } else if (state == SEGMENT_STATE_PRESSED) {
+                  if (type == SEGMENT_TYPE_SINGLE)
+                    set_state(PART:"segment", "pressed_single", 0.0);
+                  else if (type == SEGMENT_TYPE_LEFT)
+                    set_state(PART:"segment", "pressed_left", 0.0);
+                  else if (type == SEGMENT_TYPE_MIDDLE)
+                    set_state(PART:"segment", "pressed_middle", 0.0);
+                  else if (type == SEGMENT_TYPE_RIGHT)
+                    set_state(PART:"segment", "pressed_right", 0.0);
+                  set_state(PART:"elm.text", "pressed", 0.0);
+               } else if (state == SEGMENT_STATE_SELECTED) {
+                  if (type == SEGMENT_TYPE_SINGLE)
+                    set_state(PART:"segment", "selected_single", 0.0);
+                  else if (type == SEGMENT_TYPE_LEFT)
+                    set_state(PART:"segment", "selected_left", 0.0);
+                  else if (type == SEGMENT_TYPE_MIDDLE)
+                    set_state(PART:"segment", "selected_middle", 0.0);
+                  else if (type == SEGMENT_TYPE_RIGHT)
+                    set_state(PART:"segment", "selected_right", 0.0);
+                  set_state(PART:"elm.text", "selected", 0.0);
+               }
             } else {
-               set_state(PART:"elm.text", "disabled", 0.0);
-               set_state(PART:"text2", "default", 0.0);
                set_state(PART:"disabler", "disabled", 0.0);
-               if(type == SEGMENT_TYPE_SINGLE)
+               set_state(PART:"icon_disabler", "disabled", 0.0);
+               set_state(PART:"elm.text", "disabled", 0.0);
+               if (type == SEGMENT_TYPE_SINGLE)
                  set_state(PART:"segment", "default_single", 0.0);
-               else if(type == SEGMENT_TYPE_LEFT)
+               else if (type == SEGMENT_TYPE_LEFT)
                  set_state(PART:"segment", "default_left", 0.0);
-               else if(type == SEGMENT_TYPE_MIDDLE)
+               else if (type == SEGMENT_TYPE_MIDDLE)
                  set_state(PART:"segment", "default_middle", 0.0);
-               else if(type == SEGMENT_TYPE_RIGHT)
+               else if (type == SEGMENT_TYPE_RIGHT)
                  set_state(PART:"segment", "default_right", 0.0);
             }
-         } 
-      }
-      program {
-         name: "segment_type_s";
-         signal: "elm,type,segment,single";
-         source: "elm";
-         script {
-            set_int(seg_type, SEGMENT_TYPE_SINGLE);
-            update_state();
          }
       }
-      program {
-         name: "segment_type_l";
-         signal: "elm,type,segment,left";
-         source: "elm";
-         script {
-            set_int(seg_type, SEGMENT_TYPE_LEFT);
-            update_state();
-         }
+      program { signal: "elm,type,segment,single"; source: "elm";
+         script { set_int(seg_type, SEGMENT_TYPE_SINGLE); update_state(); }
       }
-      program {
-         name: "segment_type_m";
-         signal: "elm,type,segment,middle";
-         source: "elm";
-         script {
-            set_int(seg_type, SEGMENT_TYPE_MIDDLE);
-            update_state();
-         }
+      program { signal: "elm,type,segment,left"; source: "elm";
+         script { set_int(seg_type, SEGMENT_TYPE_LEFT); update_state(); }
       }
-      program {
-         name: "segment_type_r";
-         signal: "elm,type,segment,right";
-         source: "elm";
-         script {
-            set_int(seg_type, SEGMENT_TYPE_RIGHT);
-            update_state();
-         }
+      program { signal: "elm,type,segment,middle"; source: "elm";
+         script { set_int(seg_type, SEGMENT_TYPE_MIDDLE); update_state(); }
       }
-      program {
-         name: "normal_segment";
-         signal: "elm,state,segment,normal";
-         source: "elm";
-         script {
-            set_int(seg_state, SEGMENT_STATE_NORMAL);
-            update_state();
-         }
+      program { signal: "elm,type,segment,right"; source: "elm";
+         script { set_int(seg_type, SEGMENT_TYPE_RIGHT); update_state(); }
       }
-      program {
-         name: "pressed_segment";
-         signal: "elm,state,segment,pressed";
-         source: "elm";
-         script {
-            set_int(seg_state, SEGMENT_STATE_PRESSED);
-            update_state();
-         }
+      program { signal: "elm,state,segment,normal"; source: "elm";
+         script { set_int(seg_state, SEGMENT_STATE_NORMAL); update_state(); }
       }
-      program {
-         name: "selected_segment";
-         signal: "elm,state,segment,selected";
-         source: "elm";
-         script {
-            set_int(seg_state, SEGMENT_STATE_SELECTED);
-            update_state();
-         }
+      program { signal: "elm,state,segment,pressed"; source: "elm";
+         script { set_int(seg_state, SEGMENT_STATE_PRESSED); update_state(); }
       }
-      program { name: "disable_segment";
-         signal: "elm,state,disabled";
-         source: "elm";
-         script {
-            set_int(seg_status, SEGMENT_STATUS_DISABLED);
-            update_state();
-         }
+      program { signal: "elm,state,segment,selected"; source: "elm";
+         script { set_int(seg_state, SEGMENT_STATE_SELECTED); update_state(); }
       }
-      program { name: "enable_segment";
-         signal: "elm,state,enabled";
-         source: "elm";
-         script {
-            set_int(seg_status, SEGMENT_STATUS_ENABLED);
-            update_state();
-         }
+      program { signal: "elm,state,disabled"; source: "elm";
+         script { set_int(seg_status, SEGMENT_STATUS_DISABLED); update_state(); }
       }
-      program { name: "text_show";
-         signal: "elm,state,text,visible";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
+      program { signal: "elm,state,enabled"; source: "elm";
+         script { set_int(seg_status, SEGMENT_STATUS_ENABLED); update_state(); }
+      }
+      program { signal: "elm,state,text,visible"; source: "elm";
+         script { new st[31]; new Float:vl;
             get_state(PART:"elm.swallow.icon", st, 30, vl);
             if (!strcmp(st, "icononly"))
               set_state(PART:"elm.swallow.icon", "visible", 0.0);
          }
       }
-      program { name: "text_hide";
-         signal: "elm,state,text,hidden";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
+      program { signal: "elm,state,text,hidden"; source: "elm";
+         script { new st[31]; new Float:vl;
             get_state(PART:"elm.swallow.icon", st, 30, vl);
             if (!strcmp(st, "visible"))
               set_state(PART:"elm.swallow.icon", "icononly", 0.0);
             set_state(PART:"elm.text", "default", 0.0);
-            set_state(PART:"text2", "default", 0.0);
          }
       }
-      program { name: "icon_show";
-         signal: "elm,state,icon,visible";
-         source: "elm";
-         script {
-            new st[31];
-            new Float:vl;
+      program { signal: "elm,state,icon,visible"; source: "elm";
+         script { new st[31]; new Float:vl;
             get_state(PART:"elm.text", st, 30, vl);
             if ((!strcmp(st, "normal")) || (!strcmp(st, "selected")))
               set_state(PART:"elm.swallow.icon", "visible", 0.0);
@@ -422,9 +292,7 @@ group { name: "elm/segment_control/item/default";
               set_state(PART:"elm.swallow.icon", "icononly", 0.0);
          }
       }
-      program { name: "icon_hide";
-         signal: "elm,state,icon,hidden";
-         source: "elm";
+      program { signal: "elm,state,icon,hidden"; source: "elm";
          action:  STATE_SET "default" 0.0;
          target: "elm.swallow.icon";
       }

data/elementary/themes/edc/elm/separator.edc

@@ -1,15 +1,14 @@
 group { name: "elm/separator/horizontal/default";
-   images.image: "bevel_dark_in.png" COMP;
    parts {
-      part { name: "base";
+      rect { name: "base";
+         scale: 1;
          description { state: "default" 0.0;
-            min: 2 2;
-            max: 99999 2;
+            min: 1 1;
+            max: 99999 1;
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
-            image.normal: "bevel_dark_in.png";
-            image.border: 2 2 2 2;
-            fill.smooth: 0;
+            color: 72 72 72 255;
+            offscale;
          }
       }
    }
@@ -19,9 +18,9 @@ group { name: "elm/separator/vertical/default";
    parts {
       part { name: "base";
          description { state: "default" 0.0;
-            max: 2 99999;
+            max: 1 99999;
          }
       }
    }
 }
-   
+

data/elementary/themes/edc/elm/spinner.edc

@@ -1,38 +1,22 @@
 group { name: "elm/spinner/base/default";
    alias: "elm/spinner/base/colorselector/default";
-   images.image: "vert_bar_inset.png" COMP;
    parts {
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.text_button";
-            rel2.to: "elm.swallow.text_button";
+            rel.to: "elm.swallow.text_button";
          }
       }
-      part { name: "bg";
-         type: RECT;
+      part { name: "bg"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
-            color_class: "spinner_bg";
+            color: DARK_GREY_BG_COLOR;
          }
       }
-      part { name: "inset"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.offset: 0 1;
-            rel2.offset: -1 -2;
-            image.normal: "vert_bar_inset.png";
-            image.border: 1 1 8 6;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "access";
-         type: RECT;
+      part { name: "access"; type: RECT;
          repeat_events: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
             color: 0 0 0 0;
-            rel1.to: "inset";
-            rel2.to: "inset";
             visible: 0;
          }
          description { state: "active" 0.0;
@@ -40,13 +24,11 @@ group { name: "elm/spinner/base/default";
             visible: 1;
          }
       }
-      part { name: "elm.swallow.entry";
-         type: SWALLOW;
+      part { name: "elm.swallow.entry"; type: SWALLOW;
          clip_to: "clip";
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.to: "elm.swallow.text_button";
-            rel2.to: "elm.swallow.text_button";
+            rel.to: "elm.swallow.text_button";
             visible: 0;
          }
          description { state: "active" 0.0;
@@ -54,49 +36,39 @@ group { name: "elm/spinner/base/default";
             visible: 1;
          }
       }
-      part { name: "elm.swallow.dec_button";
-         type: SWALLOW;
+      part { name: "elm.swallow.dec_button"; type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 0;
-            rel1.to: "inset";
-            rel1.offset: 1 1;
-            rel2.to: "inset";
-            rel2.offset: 1 -2;
+            rel1.offset: 4 4;
+            rel2.offset: 4 -5;
             rel2.relative: 0.0 1.0;
             align: 0.0 0.5;
-            min: 15 15;
-            aspect: 1.0 1.0; aspect_preference: VERTICAL;
+            FIXED_SIZE(15, 15)
+            offscale;
          }
       }
-      part { name: "elm.swallow.inc_button";
-         type: SWALLOW;
+      part { name: "elm.swallow.inc_button"; type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            fixed: 1 0;
-            rel1.to: "inset";
-            rel1.offset: 1 1;
+            rel1.offset: -5 4;
+            rel2.offset: -5 -5;
             rel1.relative: 1.0 0.0;
-            rel2.to: "inset";
-            rel2.offset: 1 -2;
             align: 1.0 0.5;
-            min: 15 15;
-            aspect: 1.0 1.0; aspect_preference: VERTICAL;
+            FIXED_SIZE(15, 15)
+            offscale;
          }
       }
-      part { name: "elm.swallow.text_button";
-         type: SWALLOW;
+      part { name: "elm.swallow.text_button"; type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
             visible: 1;
-            rel1.to_y: "inset";
             rel1.to_x: "elm.swallow.dec_button";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 1 1;
-            rel2.to_y: "inset";
+            rel1.offset: 4 4;
             rel2.to_x: "elm.swallow.inc_button";
             rel2.relative: 0.0 1.0;
-            rel2.offset: -2 -2;
+            rel2.offset: -5 -5;
+            offscale;
          }
          description { state: "inactive" 0.0;
             inherit: "default" 0.0;
@@ -109,13 +81,11 @@ group { name: "elm/spinner/base/default";
          dragable.y: 0 0 0;
          description { state: "default" 0.0;
             fixed: 1 0;
-            rel1.to: "elm.swallow.text_button";
-            rel2.to: "elm.swallow.text_button";
+            rel.to: "elm.swallow.text_button";
             color: 0 0 0 0;
          }
       }
-      part { name: "disabler";
-         type: RECT;
+      part { name: "disabler"; type: RECT;
          repeat_events: 0;
          mouse_events: 0;
          description { state: "default" 0.0;
@@ -130,50 +100,42 @@ group { name: "elm/spinner/base/default";
    }
    programs {
       program { name: "entry_active";
-         signal: "elm,state,entry,active";
-         source: "elm";
+         signal: "elm,state,entry,active"; source: "elm";
          action: STATE_SET "active" 0.0;
          target: "elm.swallow.entry";
       }
       program { name: "entry_inactive";
-         signal: "elm,state,entry,inactive";
-         source: "elm";
+         signal: "elm,state,entry,inactive"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.swallow.entry";
       }
       program { name: "text_button_active";
-         signal: "elm,state,button,active";
-         source: "elm";
+         signal: "elm,state,button,active"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "elm.swallow.text_button";
       }
       program { name: "text_button_inactive";
-         signal: "elm,state,button,inactive";
-         source: "elm";
+         signal: "elm,state,button,inactive"; source: "elm";
          action: STATE_SET "inactive" 0.0;
          target: "elm.swallow.text_button";
       }
       program { name: "access_activate";
-         signal: "elm,state,access,active";
-         source: "elm";
+         signal: "elm,state,access,active"; source: "elm";
          action:  STATE_SET "active" 0.0;
          target: "access";
       }
       program { name: "access_inactivate";
-         signal: "elm,state,access,inactive";
-         source: "elm";
+         signal: "elm,state,access,inactive"; source: "elm";
          action:  STATE_SET "default" 0.0;
          target: "access";
       }
       program { name: "disable";
-         signal: "elm,state,disabled";
-         source: "elm";
+         signal: "elm,state,disabled"; source: "elm";
          action: STATE_SET "disabled" 0.0;
          target: "disabler";
       }
       program { name: "enable";
-         signal: "elm,state,enabled";
-         source: "elm";
+         signal: "elm,state,enabled"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "disabler";
       }
@@ -183,47 +145,44 @@ group { name: "elm/spinner/base/default";
 group { name: "elm/spinner/base/vertical";
    inherit: "elm/spinner/base/default";
    parts {
-      part { name: "elm.swallow.inc_button";
-         type: SWALLOW;
+      part { name: "elm.swallow.inc_button"; type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "inset";
-            rel1.offset: 1 1;
-            rel1.relative: 1.0 0.0;
-            rel2.to: "inset";
-            rel2.offset: 1 -2;
-            align: 1.0 0.5;
+            rel1.offset: 4 4;
+            rel2.offset: -5 4;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 1.0 0.0;
+            align: 0.5 0.0;
+            offscale;
          }
       }
-      part { name: "elm.swallow.text_button";
-         type: SWALLOW;
+      part { name: "elm.swallow.text_button"; type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
             visible: 1;
-            rel1.to_y: "inset";
-            rel1.to_x: "elm.swallow.dec_button";
-            rel1.relative: 1.0 0.0;
-            rel1.offset: 1 1;
-            rel2.to_y: "inset";
-            rel2.to_x: "elm.swallow.inc_button";
-            rel2.relative: 0.0 1.0;
-            rel2.offset: -2 -2;
+            rel1.to_x: "bg";
+            rel1.to_y: "elm.swallow.inc_button";
+            rel1.relative: 0.0 1.0;
+            rel1.offset: 5 5;
+            rel2.to_x: "bg";
+            rel2.to_y: "elm.swallow.dec_button";
+            rel2.relative: 1.0 0.0;
+            rel2.offset: -5 -5;
+            offscale;
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
             visible: 0;
          }
       }
-      part { name: "elm.swallow.dec_button";
-         type: SWALLOW;
+      part { name: "elm.swallow.dec_button"; type: SWALLOW;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "inset";
-            rel1.offset: 1 1;
-            rel2.to: "inset";
-            rel2.offset: 1 -2;
+            rel1.offset: 4 -5;
+            rel2.offset: -5 -5;
             rel2.relative: 0.0 1.0;
-            align: 0.0 0.5;
+            rel2.relative: 1.0 1.0;
+            align: 0.5 1.0;
          }
       }
       part { name: "elm.dragable.slider"; type: RECT;
@@ -232,8 +191,7 @@ group { name: "elm/spinner/base/vertical";
          dragable.y: 1 1 0;
          description { state: "default" 0.0;
             fixed: 1 0;
-            rel1.to: "elm.swallow.text_button";
-            rel2.to: "elm.swallow.text_button";
+            rel.to: "elm.swallow.text_button";
             color: 0 0 0 0;
          }
       }

data/elementary/themes/edc/elm/thumb.edc

@@ -4,34 +4,30 @@ group { name: "elm/thumb/base/default";
    images.image: "shadow_square_tiny.png" COMP;
    parts {
       part { name: "shadow"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: -3 -2;
-            rel1.to: "bg";
-            rel2.offset: 3 4;
-            rel2.to: "bg";
-            image.normal: "shadow_square_tiny.png";
-            image.border: 6 6 6 6;
-            fill.smooth: 0;
+            rel.to: "bg";
+            WIN_SHADOW_SMALL;
          }
       }
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
+            rel.to: "elm.swallow.content";
             color: 64 64 64 255;
          }
       }
       part { name: "clip"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "elm.swallow.content";
             rel2.to: "elm.swallow.content";
          }
       }
       part { name: "elm.swallow.content"; type: SWALLOW;
+         scale: 1;
          clip_to: "clip";
          description { state: "default" 0.0;
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
+            offscale;
          }
       }
       part { name: "busy_clip"; type: RECT;
@@ -44,58 +40,42 @@ group { name: "elm/thumb/base/default";
             color: 255 255 255 255;
          }
       }
-      part { name: "knob"; mouse_events: 0;
+      part { name: "busy"; type: RECT; mouse_events: 0;
          clip_to: "busy_clip";
          description { state: "default" 0.0;
+            rel.to: "bg";
+            color: 51 153 255 255;
             fixed: 1 1;
-            image.normal: "knob_round_busy.png";
-            min: 40 40;
-            max: 40 40;
-            rel1.to: "bg";
-            rel2.to: "bg";
+            min: 10 5;
+            max: 10 5;
+            align: 0.0 1.0;
          }
-      }
-      part { name: "knob_spinner"; mouse_events: 0;
-         clip_to: "busy_clip";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "knob";
-            rel2.to: "knob";
-            image.normal: "glow_round_corners.png";
-            map.on: 1;
-            map.smooth: 1;
-            map.rotation.center: "knob";
-         }
-         description { state: "spin" 0.0;
+         description { state: "other" 0.0;
             inherit: "default" 0.0;
-            map.rotation.z: 360;
+            align: 1.0 1.0;
          }
       }
    }
    programs {
       program { name: "spin";
-         signal: "elm,state,pulse,start";
-         source: "elm";
-         action: STATE_SET "spin" 0.0;
-         transition: LINEAR 1.0;
-         target: "knob_spinner";
+         signal: "elm,state,pulse,start"; source: "elm";
+         action: STATE_SET "other" 0.0;
+         transition: SINUSOIDAL 0.5;
+         target: "busy";
          after: "spin2";
       }
       program { name: "spin2";
          action: STATE_SET "default" 0.0;
-         target: "knob_spinner";
+         transition: SINUSOIDAL 0.5;
+         target: "busy";
          after: "spin";
       }
-      program { name: "pulse_start";
-         signal: "elm,state,pulse,start";
-         source: "elm";
+      program { signal: "elm,state,pulse,start"; source: "elm";
          action: STATE_SET "active" 0.0;
          transition: SINUSOIDAL 0.25;
          target: "busy_clip";
       }
-      program { name: "pulse_stop";
-         signal: "elm,state,pulse,stop";
-         source: "elm";
+      program { signal: "elm,state,pulse,stop"; source: "elm";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 1.0;
          target: "busy_clip";
@@ -109,7 +89,7 @@ group { name: "elm/thumb/base/default";
       }
       program { name: "spin4";
          action: STATE_SET "default" 0.0;
-         target: "knob_spinner";
+         target: "busy";
       }
    }
 }

data/elementary/themes/edc/elm/tooltip.edc

@@ -3,10 +3,10 @@ group { name: "elm/label/base/tooltip/default";
    alias: "elm/label/base/tooltip/transparent";
    styles {
       style { name: "tooltip_style";
-         base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 text_class=bubble";
+         base: "font="FNBD" font_size=10 color=#ffffff text_class=bubble align=0.5";
          tag:  "br" "\n";
-         tag: "hilight" "+ font="FN" text_class=bubble";
-         tag: "b" "+ font="FN" text_class=bubble";
+         tag:  "hilight" "+ font="FNBD" text_class=bubble color=#ff9933";
+         tag:  "b" "+ font="FNBD" text_class=bubble color=#3399ff";
          tag:  "tab" "\t";
       }
    }
@@ -35,7 +35,6 @@ group { name: "elm/tooltip/base/default";
    data.item: "hide_timeout" "0.35";
    // if in a window... it's transparent!
    data.item: "transparent" "enabled";
-   images.image: "tooltip-base.png" COMP;
    images.image: "tooltip-corner-top-left-tip.png" COMP;
    images.image: "tooltip-corner-top-right-tip.png" COMP;
    images.image: "tooltip-corner-bottom-left-tip.png" COMP;
@@ -145,40 +144,39 @@ group { name: "elm/tooltip/base/default";
    }
    parts {
       part { name: "clipper"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
             color: 255 255 255 0;
-            rel1 { to: "pop"; offset: -5 -5; }
-            rel2 { to: "pop"; offset: 5 5; }
+            rel1 { to: "pop"; offset: -500 -500; }
+            rel2 { to: "pop"; offset: 499 499; }
+            offscale;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             color: 255 255 255 255;
          }
       }
-      part { name: "pop"; mouse_events: 0;
+      part { name: "shadow"; mouse_events: 0;
          clip_to: "clipper";
-         scale: 1;
          description { state: "default" 0.0;
-            min: 30 30;
-            rel1 {
-               to: "elm.swallow.content";
-               offset: -5 -4;
-            }
-            rel2 {
-               to: "elm.swallow.content";
-               offset: 4 5;
-            }
-            image {
-               normal: "tooltip-base.png";
-               border: 7 7 6 8;
-            }
-            image.middle: SOLID;
+            rel.to: "pop";
+            WIN_SHADOW;
+         }
+      }
+      part { name: "pop"; type: RECT; mouse_events: 0;
+         scale: 1;
+         clip_to: "clipper";
+         description { state: "default" 0.0;
+            rel.to: "elm.swallow.content";
+            rel1.offset: -10 -10;
+            rel2.offset: 9 9;
+            color: 0 0 0 192;
+            offscale;
          }
       }
       #define TT_CORNER(name_, rx, ry, ax, ay, ox, oy)             \
       part { name: "corner-"name_; mouse_events: 0;                \
          clip_to: "clipper";                                       \
-         scale: 1;                                                 \
          description { state: "default" 0.0;                       \
             visible: 0;                                            \
             align: ax ay;                                          \
@@ -194,16 +192,17 @@ group { name: "elm/tooltip/base/default";
                to: "pop";                                          \
             }                                                      \
             image.normal: "tooltip-corner-"name_"-tip.png";        \
+            color: 0 0 0 192;                                      \
          }                                                         \
          description { state: "visible" 0.0;                       \
             inherit: "default" 0.0;                                \
             visible: 1;                                            \
          }                                                         \
       }
-      TT_CORNER("top-left", 0, 0, 0, 0, -4, -5);
-      TT_CORNER("top-right", 1, 0, 1, 0, 3, -5);
-      TT_CORNER("bottom-left", 0, 1, 0, 1, -4, 2);
-      TT_CORNER("bottom-right", 1, 1, 1, 1, 3, 2);
+      TT_CORNER("top-left", 0, 0, 0, 0, -6, -6);
+      TT_CORNER("top-right", 1, 0, 1, 0, 5, -6);
+      TT_CORNER("bottom-left", 0, 1, 0, 1, -6, 5);
+      TT_CORNER("bottom-right", 1, 1, 1, 1, 5, 5);
       #undef TT_CORNER
 
       #define TT_EDGE_VERT(name_, rx, ax, ox)                      \
@@ -211,18 +210,18 @@ group { name: "elm/tooltip/base/default";
          clip_to: "clipper";                                       \
          description { state: "default" 0.0;                       \
             visible: 0;                                            \
-            min: 9 13;                                             \
+            min: 12 11;                                            \
             align: ax 0.5;                                         \
             fixed: 1 1;                                            \
             rel1 {                                                 \
                relative: rx 0.0;                                   \
                offset: ox 0;                                       \
-               to: "elm.swallow.content";                          \
+               to: "pop";                                          \
             }                                                      \
             rel2 {                                                 \
                relative: rx 1.0;                                   \
                offset: ox 0;                                       \
-               to: "elm.swallow.content";                          \
+               to: "pop";                                          \
             }                                                      \
          }                                                         \
          description { state: "visible" 0.0;                       \
@@ -232,27 +231,25 @@ group { name: "elm/tooltip/base/default";
       }                                                            \
       part { name: "edge-area-"name_; type: RECT; mouse_events: 0; \
          clip_to: "clipper-edge-"name_;                            \
-         scale: 1;                                                 \
          description { state: "default" 0.0;                       \
             color: 0 0 0 0;                                        \
-            min: 9 13;                                             \
+            min: 12 11;                                            \
             align: ax 0.5;                                         \
             fixed: 1 1;                                            \
             rel1 {                                                 \
                relative: rx 0.0;                                   \
                offset: ox 0;                                       \
-               to: "elm.swallow.content";                          \
+               to: "pop";                                          \
             }                                                      \
             rel2 {                                                 \
                relative: rx 1.0;                                   \
                offset: ox 0;                                       \
-               to: "elm.swallow.content";                          \
+               to: "pop";                                          \
             }                                                      \
          }                                                         \
       }                                                            \
       part { name: "edge-drag-"name_; type: RECT; mouse_events: 0; \
          clip_to: "clipper-edge-"name_;                            \
-         scale: 1;                                                 \
          dragable {                                                \
             x: 0 0 0;                                              \
             y: 1 1 0;                                              \
@@ -260,43 +257,41 @@ group { name: "elm/tooltip/base/default";
          }                                                         \
          description { state: "default" 0.0;                       \
             color: 0 0 0 0;                                        \
-            min: 9 13;                                             \
-            rel1.to: "edge-area-"name_;                            \
-            rel2.to: "edge-area-"name_;                            \
+            min: 12 11;                                            \
+            rel.to: "edge-area-"name_;                             \
          }                                                         \
       }                                                            \
       part { name: "edge-img-"name_; mouse_events: 0;              \
          clip_to: "clipper-edge-"name_;                            \
          description { state: "default" 0.0;                       \
-            FIXED_SIZE(9, 13)                                      \
+            FIXED_SIZE(12, 11)                                     \
             align: ax 0.5;                                         \
-            rel1.to: "edge-drag-"name_;                            \
-            rel2.to: "edge-drag-"name_;                            \
+            rel.to: "edge-drag-"name_;                             \
             image.normal: "tooltip-edge-"name_"-tip.png";          \
+            color: 0 0 0 192;                                      \
          }                                                         \
       }
-      TT_EDGE_VERT("left", 0, 1, -3);
-      TT_EDGE_VERT("right", 1, 0, 2);
+      TT_EDGE_VERT("left", 0, 0, -6);
+      TT_EDGE_VERT("right", 1, 1, 5);
       #undef TT_EDGE_VERT
 
       #define TT_EDGE_HORIZ(name_, ry, ay, oy)                     \
       part { name: "clipper-edge-"name_; type: RECT;               \
          clip_to: "clipper";                                       \
-         scale: 1;                                                 \
          description { state: "default" 0.0;                       \
             visible: 0;                                            \
-            min: 11 9;                                             \
+            min: 11 12;                                            \
             align: 0.5 ay;                                         \
             fixed: 1 1;                                            \
             rel1 {                                                 \
                relative: 0.0 ry;                                   \
                offset: 0 oy;                                       \
-               to: "elm.swallow.content";                          \
+               to: "pop";                                          \
             }                                                      \
             rel2 {                                                 \
                relative: 1.0 ry;                                   \
                offset: 0 oy;                                       \
-               to: "elm.swallow.content";                          \
+               to: "pop";                                          \
             }                                                      \
          }                                                         \
          description { state: "visible" 0.0;                       \
@@ -306,19 +301,16 @@ group { name: "elm/tooltip/base/default";
       }                                                            \
       part { name: "edge-area-"name_; type: RECT; mouse_events: 0; \
          clip_to: "clipper-edge-"name_;                            \
-         scale: 1;                                                 \
          description { state: "default" 0.0;                       \
             color: 0 0 0 0;                                        \
-            min: 11 9;                                             \
+            min: 11 12;                                            \
             align: 0.5 ay;                                         \
             fixed: 1 1;                                            \
-            rel1.to: "clipper-edge-"name_;                         \
-            rel2.to: "clipper-edge-"name_;                         \
+            rel.to: "clipper-edge-"name_;                          \
          }                                                         \
       }                                                            \
       part { name: "edge-drag-"name_; type: RECT; mouse_events: 0; \
          clip_to: "clipper-edge-"name_;                            \
-         scale: 1;                                                 \
          dragable {                                                \
             x: 1 1 0;                                              \
             y: 0 0 0;                                              \
@@ -326,30 +318,28 @@ group { name: "elm/tooltip/base/default";
          }                                                         \
          description { state: "default" 0.0;                       \
             color: 0 0 0 0;                                        \
-            min: 11 9;                                             \
-            rel1.to: "edge-area-"name_;                            \
-            rel2.to: "edge-area-"name_;                            \
+            min: 11 12;                                            \
+            rel.to: "edge-area-"name_;                             \
          }                                                         \
       }                                                            \
       part { name: "edge-img-"name_; mouse_events: 0;              \
          clip_to: "clipper-edge-"name_;                            \
-         scale: 1;                                                 \
          description { state: "default" 0.0;                       \
-            FIXED_SIZE(11, 9)                                      \
+            FIXED_SIZE(11, 12)                                     \
             align: 0.5 ay;                                         \
-            rel1.to: "edge-drag-"name_;                            \
-            rel2.to: "edge-drag-"name_;                            \
+            rel.to: "edge-drag-"name_;                             \
             image.normal: "tooltip-edge-"name_"-tip.png";          \
+            color: 0 0 0 192;                                      \
          }                                                         \
       }
-      TT_EDGE_HORIZ("top", 0, 1, -1);
-      TT_EDGE_HORIZ("bottom", 1, 0, 1);
+      TT_EDGE_HORIZ("top", 0, 0, -6);
+      TT_EDGE_HORIZ("bottom", 1, 1, 5);
       #undef TT_EDGE_HORIZ
+
       part { name: "clipper_content"; type: RECT;
          description { state: "default" 0.0;
             color: 255 255 255 0;
-            rel1.to: "elm.swallow.content";
-            rel2.to: "elm.swallow.content";
+            rel.to: "elm.swallow.content";
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -358,9 +348,12 @@ group { name: "elm/tooltip/base/default";
       }
       part { name: "elm.swallow.content"; type: SWALLOW;
          clip_to: "clipper_content";
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 10 10;
-            rel2.offset: -11 -11;
+            min: 48 24;
+            rel1.offset: 20 20;
+            rel2.offset: -21 -21;
+            offscale;
          }
       }
       programs {

data/elementary/themes/edc/elm/video.edc

@@ -8,7 +8,7 @@ group { name: "elm/video/base/default";
             color: 128 128 128 255;
          }
       }
-      part { name: "elm.swallow.video"; type: SWALLOW;  mouse_events: 1;
+      part { name: "elm.swallow.video"; type: SWALLOW;
          clip_to: "clipper";
          description { state: "default" 0.0;
             aspect: 1.0 1.0; aspect_preference: BOTH;
@@ -16,27 +16,23 @@ group { name: "elm/video/base/default";
       }
    }
    programs {
-      program {
-         signal: "elm,video,load"; source: "elm";
+      program { signal: "elm,video,load"; source: "elm";
          action: STATE_SET "darker" 0.0;
          target: "clipper";
       }
-      program {
-         signal: "elm,video,play"; source: "elm";
+      program { signal: "elm,video,play"; source: "elm";
          action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.2 CURRENT;
+         transition: SINUSOIDAL 0.1 CURRENT;
          target: "clipper";
       }
-      program {
-         signal: "elm,video,end"; source: "elm";
+      program { signal: "elm,video,pause"; source: "elm";
          action: STATE_SET "darker" 0.0;
          transition: SINUSOIDAL 0.5 CURRENT;
          target: "clipper";
       }
-      program {
-         signal: "elm,video,pause"; source: "elm";
+      program { signal: "elm,video,end"; source: "elm";
          action: STATE_SET "darker" 0.0;
-         transition: SINUSOIDAL 0.7 CURRENT;
+         transition: SINUSOIDAL 0.5 CURRENT;
          target: "clipper";
       }
    }

data/elementary/themes/edc/entry.edc

@@ -1,14 +1,8 @@
 group { name: "e/widgets/entry/scrollframe";
-   images.image: "inset_shadow.png" COMP;
-   images.image: "bevel_in.png" COMP;
    parts {
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "inset";
-            rel1.offset: 1 1;
-            rel2.to: "inset";
-            rel2.offset: -2 -2;
-            color: 48 48 48 255;
+            color: DARK_GREY_BG_COLOR;
          }
       }
       part { name: "clipper"; type: RECT;
@@ -21,29 +15,8 @@ group { name: "e/widgets/entry/scrollframe";
          mouse_events: 1;
          clip_to: "clipper";
          description { state: "default" 0.0;
-            rel1.offset: 3 3;
-            rel2.offset: -4 -4;
-         }
-      }
-      part { name: "shadow"; mouse_events: 0; repeat_events: 1;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            fill.smooth: 0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "inset"; mouse_events: 0; repeat_events: 1;
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.offset: 0 0;
-            rel2.offset: -1 -1;
-            fill.smooth: 0;
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
          }
       }
    }
@@ -52,10 +25,10 @@ group { name: "e/widgets/entry/scrollframe";
 group { name: "e/widgets/entry/text";
       styles {
          style { name: "entry_textblock_style";
-            base: "font="FN" font_size=10 color=#ffffffff style=shadow,bottom shadow_color=#00000080 text_class=entry color_class=entry_text";
+            base: "font="FN" font_size=10 color=#a0a0a0 text_class=entry color_class=entry_text left_margin=2 right_margin=2";
          }
          style { name: "entry_textblock_disabled_style";
-            base: "font="FN" font_size=10 color=#151515 style=shadow,bottom shadow_color=#ffffff19 text_class=entry color_class=entry_text_disabled";
+            base: "font="FN" font_size=10 color=#707070 text_class=entry color_class=entry_text_disabled left_margin=2 right_margin=2";
          }
       }
    parts {
@@ -124,21 +97,16 @@ group { name: "e/widgets/entry/password";
 
 group { name: "e/widgets/entry/cursor";
    min: 1 0;
-   images.image: "white_bar_vert_glow.png" COMP;
    parts {
-      part { name: "cursor"; mouse_events: 0;
+      part { name: "cursor"; type: RECT; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: -4 -4;
-            rel2.offset: 3 3;
-            image.normal: "white_bar_vert_glow.png";
-            image.border: 4 4 4 4;
-            fill.smooth: 0;
-            color: 255 255 255 0;
-            min: 9 10;
+            min: 1 10;
+            visible: 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            visible: 1;
          }
       }
    }
@@ -176,7 +144,6 @@ group { name: "e/widgets/entry/cursor";
       program { name: "cursor_hide";
          action: STATE_SET "default" 0.0;
          target: "cursor";
-         transition: SINUSOIDAL 0.2;
          after: "cursor_hide_timer";
       }
       program { name: "cursor_show_timer";
@@ -184,7 +151,7 @@ group { name: "e/widgets/entry/cursor";
          after: "cursor_hide";
       }
       program { name: "cursor_hide_timer";
-         in: 0.2 0.0;
+         in: 0.5 0.0;
          after: "cursor_show";
       }
    }

data/elementary/themes/edc/fontpreview.edc

@@ -2,20 +2,19 @@ group { name: "e/widgets/fontpreview";
    parts {
       part { name: "e.fontpreview.text"; type: TEXT; mouse_events: 0;
          scale: 1;
-         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
             color_class: "entry_text";
-            rel1.offset: 3 3;
-            rel2.offset: -4 -4;
-            color: FN_COL_DEFAULT;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            color: 160 160 160 255;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
                align: 0.5 0.5;
                text_class: "_e_font_preview";
             }
+            offscale;
          }
       }
    }
 }
-      

data/elementary/themes/edc/frame.edc

@@ -1,101 +1,80 @@
 group { name: "e/widgets/frame";
-   images.image: "shadow_square_tiny.png" COMP;
-   images.image: "vgrad_med_curved.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "holes_tiny_vert.png" COMP;
+   images.image: "win_shadow.png" COMP;
    parts {
       part { name: "shadow"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: -1 0;
-            rel2.offset: 0 1;
-            image.normal: "shadow_square_tiny.png";
-            image.border: 6 6 6 6;
-            fill.smooth: 0;
+            rel.to: "base";
+            WIN_SHADOW_SMALL;
+         }
+         description { state: "hidden" 0.0;
+            inherit;
+            visible: 0;
          }
       }
       part { name: "base"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.relative: 0.0 1.0;
-            rel1.offset: 2 0;
-            rel1.to_y: "top";
-            rel2.offset: -3 -3;
-            color_class: "frame_base";
-            color: 64 64 64 255;
+            rel1.offset: 6 6;
+            rel2.offset: -7 -7;
+            color: 80 80 80 255;
+            offscale;
          }
       }
-      part { name: "top";
+      part { name: "top"; type: SPACER;
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "vgrad_med_curved.png";
-            rel1.offset: 2 2;
+            rel1.to: "base";
+            rel2.to_x: "base";
             rel2.to_y: "e.text.label";
-            rel2.offset: -3 -1;
-            fill.smooth: 0;
-            TILED_HORIZ(120)
-            color_class: "frame_base";
-         }
-      }
-      part { name: "edge1";
-         description { state: "default" 0.0;
-            image.normal: "holes_tiny_vert.png";
-            rel1.offset: 4 0;
-            rel1.to_y: "e.text.label";
-            rel2.offset: 4 -1;
-            rel2.relative: 0.0 1.0;
-            rel2.to_y: "e.text.label";
-            align: 0.0 0.5;
-            FIXED_SIZE(3, 11)
-         }
-      }
-      part { name: "edge2";
-         description { state: "default" 0.0;
-            image.normal: "holes_tiny_vert.png";
-            rel1.offset: -5 0;
-            rel1.to_y: "e.text.label";
-            rel1.relative: 1.0 0.0;
-            rel2.offset: -5 -1;
-            rel2.relative: 1.0 1.0;
-            rel2.to_y: "e.text.label";
-            align: 1.0 0.5;
-            FIXED_SIZE(3, 11)
+            rel2.offset: -1 3;
+            offscale;
          }
       }
       part { name: "e.text.label"; type: TEXT;
          scale: 1;
-         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            color_class: "frame";
-            rel1.relative: 1.0 0.0;
-            rel1.offset: 1 2;
-            rel1.to_x: "edge1";
-            rel2.relative: 0.0 0.0;
-            rel2.offset: -2 2;
-            rel2.to_x: "edge2";
+            rel1.offset: 4 4;
+            rel1.to: "base";
+            rel2.relative: 1.0 0.0;
+            rel2.offset: -5 4;
+            rel2.to: "base";
             align: 0.0 0.0;
-            color: FN_COL_DISABLE;
+            color: 255 255 255 255;
             text { font: FNBD; size: 10;
-               text_class: "frame";
                align: 0.0 0.0;
                min: 0 1;
             }
             fixed: 0 1;
+            offscale;
+         }
+      }
+      part { name: "bg"; type: RECT;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to_x: "base";
+            rel1.to_y: "top";
+            rel1.relative: 0.0 1.0;
+            rel2.to: "base";
+            color: 64 64 64 255;
+         }
+      }
+      part { name: "clip"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "bg";
+            rel2.to: "bg";
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
+         clip_to: "clip";
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.relative: 0.0 1.0;
-            rel1.offset: 5 0;
-            rel1.to_y: "e.text.label";
-            rel2.offset: -6 -6;
-         }
-      }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
+            align: 0.0 1.0;
+            rel1.to: "bg";
+            rel1.offset: 4 4;
+            rel2.to: "bg";
+            rel2.offset: -5 -5;
+            offscale;
          }
       }
    }

data/elementary/themes/edc/gadman.edc

@@ -1,49 +1,20 @@
 group { name: "e/gadman/popup";
-   images.image: "vgrad_tall.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "shine.png" COMP;
    parts {
-      part { name: "bg"; mouse_events: 0;
+      part { name: "bg"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "vgrad_tall.png";
-            fill.smooth: 0;
-            TILED_HORIZ(40)
-         }
-      }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
+            color: 64 64 64 255;
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW; clip_to: "clip";
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 3 3;
-            rel2.offset: -4 -4;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            offscale;
          }
       }
       part { name: "clip"; type: RECT;
          description { state: "default";
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
-         }
-      }
-      rect { "shine_clip";
-         desc {
-            rel1.to_x: "e.swallow.content";
-            rel2.to_x: "e.swallow.content";
-            rel1.offset: 0 -10;
-         }
-      }
-      part { name: "shine"; mouse_events: 0; clip: "shine_clip";
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            FIXED_SIZE(69, 5)
          }
       }
    }
@@ -147,7 +118,7 @@ group { name: "e/gadman/frame";
 }
 
 group { name: "e/gadman/control";
-   images.image: "outline_glow.png" COMP;
+   images.image: "outline.png" COMP;
    images.image: "diagonal_stripes.png" COMP;
    images.image: "sym_up_glow_normal.png" COMP;
    images.image: "sym_down_glow_normal.png" COMP;
@@ -156,11 +127,11 @@ group { name: "e/gadman/control";
    parts {
       part { name: "base"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "outline_glow.png";
+            image.normal: "outline.png";
             image.border: 4 4 4 4;
             image.middle: 0;
             fill.smooth: 0;
-            color: 255 255 255 255;
+            color: 51 153 255 255;
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
@@ -174,8 +145,8 @@ group { name: "e/gadman/control";
             rel2.offset: -2 -2;
             rel2.to: "base";
             image.normal: "diagonal_stripes.png";
+            color: 51 153 255 25;
             TILED_PATTERN(240, 240)
-            color: 255 255 255 25;
          }
       }
       part { name: "av10"; mouse_events: 0;

data/elementary/themes/edc/ibar-ibox.edc

@@ -1,15 +1,12 @@
 group { name: "e/modules/ibar/separator/default";
-   images.image: "bevel_dark_in.png" COMP;
    parts {
-      part { name: "base";
+      part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            min: 2 2;
-            max: 2 99999;
+            min: 1 1;
+            max: 1 99999;
             rel1.offset: 4 4;
             rel2.offset: -5 -5;
-            image.normal: "bevel_dark_in.png";
-            image.border: 2 2 2 2;
-            fill.smooth: 0;
+            color: 80 80 80 255;
          }
       }
    }
@@ -20,7 +17,7 @@ group { name: "e/modules/ibar/separator/horizontal";
    parts {
       part { name: "base";
          description { state: "default" 0.0;
-            max: 99999 2;
+            max: 99999 1;
          }
       }
    }
@@ -29,9 +26,8 @@ group { name: "e/modules/ibar/separator/horizontal";
 group { name: "e/modules/ibox/icon";
    alias: "e/modules/ibar/icon";
    // 1 or 0 if u want an icon holder to raise when the mouse (or keyboard) hilights it
-   data.item: "raise_on_hilight" "0";
+   data.item: "raise_on_hilight" "1";
 //   data.item: "item_list" "item item2 item3";
-   images.image: "led_tiny_blue.png" COMP;
    parts {
       part { name: "item_clip"; type: RECT;
          description { state: "default" 0.0;
@@ -44,9 +40,20 @@ group { name: "e/modules/ibox/icon";
             color: 255 255 255 64;
          }
       }
+      part { name: "content"; type: SPACER;
+         description { state: "default" 0.0;
+         }
+         description { state: "starting" 0.0;
+            inherit: "default" 0.0;
+            rel1.relative: 0.1 0.1;
+            rel2.relative: 0.9 0.9;
+         }
+      }
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "item_clip";
          description { state: "default" 0.0;
+            rel1.to: "content";
+            rel2.to: "content";
             rel1.offset: 3 3;
             rel2.offset: -4 -4;
          }
@@ -61,21 +68,91 @@ group { name: "e/modules/ibox/icon";
             rel2.relative: 1.0 0.85;
          }
       }
-      part { name: "indicator";
-         description { state: "default";
-            min: 10 10;
-            max: 10 10;
-            rel1.relative: 1.0 1.0;
-            rel1.offset: -5 -5;
-            rel2.relative: 1.0 1.0;
-            rel2.offset: -4 -4;
-            image.normal: "led_tiny_blue.png";
-            color: 255 255 255 0;
+      part { name: "clip"; type: RECT; mouse_events: 0;
+         description { state: "default" 0.0;
+         }
+      }
+      part { name: "clip1"; type: RECT; mouse_events: 0;
+         clip_to: "clip";
+         description { state: "default" 0.0;
+            visible: 1;
+         }
+         description { state: "left" 0.0;
             visible: 0;
          }
+         description { state: "right" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "clip2"; type: RECT; mouse_events: 0;
+         clip_to: "clip";
+         description { state: "default" 0.0;
+            visible: 0;
+         }
+         description { state: "left" 0.0;
+            visible: 1;
+         }
+         description { state: "right" 0.0;
+            visible: 0;
+         }
+      }
+      part { name: "clip3"; type: RECT; mouse_events: 0;
+         clip_to: "clip";
+         description { state: "default" 0.0;
+            visible: 0;
+         }
+         description { state: "left" 0.0;
+            visible: 0;
+         }
+         description { state: "right" 0.0;
+            visible: 1;
+         }
+      }
+      part { name: "indicator1"; type: RECT;
+         scale: 1;
+         clip_to: "clip1";
+         description { state: "default";
+            color: 51 153 255 255;
+            visible: 0;
+            rel1.relative: 0.0 1.0;
+            align: 0.5 1.0;
+            max: 99999 5;
+         }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
+            rel1.relative: 0.0 0.5;
+            visible: 1;
+         }
+      }
+      part { name: "indicator2"; type: RECT;
+         scale: 1;
+         clip_to: "clip2";
+         description { state: "default";
+            color: 51 153 255 255;
+            visible: 0;
+            rel2.relative: 0.0 1.0;
+            align: 0.0 0.5;
+            max: 5 99999;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            rel2.relative: 0.5 1.0;
+            visible: 1;
+         }
+      }
+      part { name: "indicator3"; type: RECT;
+         scale: 1;
+         clip_to: "clip3";
+         description { state: "default";
+            color: 51 153 255 255;
+            visible: 0;
+            rel1.relative: 1.0 0.0;
+            align: 1.0 0.5;
+            max: 5 99999;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            rel1.relative: 0.5 0.0;
             visible: 1;
          }
       }
@@ -86,6 +163,28 @@ group { name: "e/modules/ibox/icon";
       }
    }
    programs {
+      program {
+         signal: "e,origin,center"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "clip1";
+         target: "clip2";
+         target: "clip3";
+      }
+      program {
+         signal: "e,origin,left"; source: "e";
+         action: STATE_SET "left" 0.0;
+         target: "clip1";
+         target: "clip2";
+         target: "clip3";
+      }
+      program {
+         signal: "e,origin,right"; source: "e";
+         action: STATE_SET "right" 0.0;
+         target: "clip1";
+         target: "clip2";
+         target: "clip3";
+      }
+      /////////////////////////////////////////////////////////////
 //      program {
 //         signal: "e,action,exec"; source: "e";
 //      }
@@ -106,38 +205,34 @@ group { name: "e/modules/ibox/icon";
 //      }
       program {
          signal: "e,state,starting"; source: "e";
-         action: STATE_SET "disabled" 0.0;
-         target: "item_clip";
+         action: STATE_SET "starting" 0.0;
+         transition: DECELERATE 0.2;
+         target: "content";
       }
       program {
          signal: "e,state,started"; source: "e";
          action: STATE_SET "default" 0.0;
-         target: "item_clip";
-      }
-      program { name: "ion";
-         signal: "e,state,on"; source: "e";
-         action: STATE_SET "visible" 0.0;
-         target: "indicator";
-         transition: ACCELERATE 0.1;
-      }
-      program { name: "ioff";
-         signal: "e,state,off"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "indicator";
-         transition: DECELERATE 0.1;
+         transition: ACCELERATE 0.2;
+         target: "content";
       }
+      /////////////////////////////////////////////////////////////
       program {
          signal: "e,state,on"; source: "e";
          action: STATE_SET "visible" 0.0;
-         target: "indicator";
+         target: "indicator1";
+         target: "indicator2";
+         target: "indicator3";
          transition: ACCELERATE 0.2;
       }
       program {
          signal: "e,state,off"; source: "e";
          action: STATE_SET "default" 0.0;
-         target: "indicator";
-         transition: DECELERATE 0.8;
+         target: "indicator1";
+         target: "indicator2";
+         target: "indicator3";
+         transition: DECELERATE 0.2;
       }
+      /////////////////////////////////////////////////////////////
       program {
          signal: "e,state,urgent"; source: "e";
          action: STATE_SET "bounce1" 0.0;
@@ -164,270 +259,11 @@ group { name: "e/modules/ibox/icon";
    }
 }
 
-group { name: "e/modules/ibar/menu";
-   images.image: "darken_square.png" COMP;
-   parts {
-      part { name: "sizer"; type: SPACER;
-         description { state: "default"; }
-         description { state: "hidden";
-            fixed: 1 1;
-            rel1.relative: 0.5 1.0;
-            rel2.relative: 0.5 1.0;
-            minmul: 0 0;
-         }
-      }
-      part { name: "clip"; type: RECT;
-         description { state: "default";
-            rel1.offset: -9999 -9999;
-            rel2.offset: 9999 9999;
-         }
-         description { state: "hidden";
-            inherit: "default";
-            color: 0 0 0 0;
-         }
-      }
-      part { name: "base"; mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.to: "sizer";
-            rel2.to: "sizer";
-            image.normal: "darken_square.png";
-            image.border: 6 6 6 6;
-         }
-      }
-      part { name: "e.box"; type: BOX;
-         clip_to: "clip";
-         description { state: "default";
-            rel1.to: "sizer";
-            rel1.offset: 12 12;
-            rel2.to: "sizer";
-            rel2.offset: -13 -13;
-            box { layout: "vertical";
-               padding: 0 0;
-               align: 0.5 0.5;
-               min: 1 1;
-            }
-         }
-      }
-   }
-   programs {
-      program { signal: "e,state,hidden"; source: "e";
-         action: STATE_SET "hidden" 0.0;
-         target: "sizer";
-         target: "clip";
-      }
-
-      program { signal: "e,action,show"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "sizer";
-         target: "clip";
-         transition: SINUSOIDAL 0.2;
-         after: "show2";
-      }
-      program { name: "show2";
-         action: SIGNAL_EMIT "e,action,show,done" "";
-      }
-
-      program { signal: "e,action,hide"; source: "e";
-         action: STATE_SET "hidden" 0.0;
-         target: "sizer";
-         target: "clip";
-         transition: SINUSOIDAL 0.2;
-         after: "hide2";
-      }
-      program { name: "hide2";
-         action: SIGNAL_EMIT "e,action,hide,done" "";
-      }
-   }
-}
-
-group { name: "e/modules/ibar/menu/item";
-   images.image: "glow_small.png" COMP;
-   images.image: "win_shadow.png" COMP;
-   images.image: "mini_box_glow.png" COMP;
-   parts {
-      part { name: "base";
-         description { state: "default";
-            rel1.offset: -6 -6;
-            rel2.offset: 5 5;
-            image.normal: "mini_box_glow.png";
-            image.border: 7 7 7 7;
-            color: 255 255 255 80;
-            visible: 0;
-            link.base: "e,state,unfocused" "e";
-            link.transition: ACCEL 0.1;
-         }
-         description { state: "focused";
-            inherit: "default" 0.0;
-            visible: 1;
-            link.base: "e,state,focused" "e";
-            link.transition: ACCEL 0.1;
-         }
-      }
-      part { name: "clip"; type: RECT;
-         description { state: "default";
-            link.base: "e,state,other,none" "e";
-            link.transition: ACCEL 0.1;
-         }
-         description { state: "otherdesk";
-            inherit: "default" 0.0;
-            color: 255 255 255 160;
-            link.base: "e,state,other,desk" "e";
-            link.transition: ACCEL 0.1;
-         }
-         description { state: "otherscreen";
-            inherit: "default" 0.0;
-            color: 255 255 255 80;
-            link.base: "e,state,other,screen" "e";
-            link.transition: ACCEL 0.1;
-         }
-      }
-      part { name: "icon"; type: SPACER;
-         description { state: "default";
-            rel1.offset: 2 2;
-            rel2.offset: 2 -3;
-            align: 0.0 0.5;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            min: 48 48;
-            max: 48 48;
-         }
-      }
-      part { name: "shadow"; mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            image.normal: "win_shadow.png";
-            image.border: 14 14 14 14;
-            image.middle: 0;
-            rel1.to: "e.swallow.icon";
-            rel1.offset: -7 -3;
-            rel2.to: "e.swallow.icon";
-            rel2.offset: 6 11;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "glow"; mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.to: "e.swallow.icon";
-            rel2.to: "e.swallow.icon";
-            image.normal: "glow_small.png";
-            image.border: 7 7 7 7;
-            fill.smooth: 0;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-         description { state: "focus" 0.0;
-            inherit: "default" 0.0;
-            rel1.offset: -4 -4;
-            rel2.offset: 3 3;
-            color: 255 255 255 255;
-            visible: 1;
-         }
-      }
-      part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
-         clip_to: "icon_clip";
-         description { state: "default";
-            rel1.to: "icon";
-            rel2.to: "icon";
-         }
-      }
-      part { name: "e.text.title"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
-         scale: 1;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.to_x: "icon";
-            rel1.relative: 1.0 0.0;
-            rel1.offset: 3 0;
-            rel2.offset: -3 -3;
-            align: 0.0 0.0;
-            color_class: "menu_item";
-            min: 128 0;
-            text { font: FNBD; size: 10;
-               text: "window name thingy";
-               min: 0 1;
-               align: 0.0 0.5;
-               text_class: "menu_item";
-            }
-         }
-         description { state: "focus";
-            inherit: "default";
-            visible: 0;
-         }
-      }
-      part { name: "title2"; type: TEXT; mouse_events: 0;
-         effect: GLOW;
-         scale: 1;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.offset: -2 -3;
-            rel1.to: "e.text.title";
-            rel2.offset: 2 1;
-            rel2.to: "e.text.title";
-            color_class: "menu_item_active";
-            color: 255 255 255 0;
-            color2: 255 255 255 0;
-            color3: 255 255 255 0;
-            min: 128 0;
-            text { font: FNBD; size: 10;
-               text_source: "e.text.title";
-               min: 0 1;
-               align: 0.0 0.5;
-               text_class: "menu_item";
-            }
-            visible: 0;
-         }
-         description { state: "focus" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-            color2: 255 255 255 255;
-            color3: 255 255 255 255;
-            visible: 1;
-         }
-      }
-      part { name: "icon_clip"; type: RECT;
-         clip_to: "clip";
-         description { state: "default";
-            color: 255 255 255 200;
-            rel1.offset: -9999 -9999;
-            rel2.offset: 9999 9999;
-         }
-         description { state: "focus";
-            inherit: "default";
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "event"; type: RECT;
-         description { state: "default";
-            color: 0 0 0 0;
-         }
-      }
-   }
-   programs {
-      program {
-         signal: "mouse,in"; source: "event";
-         action: STATE_SET "focus" 0.0;
-         target: "e.text.title";
-         target: "title2";
-         target: "icon_clip";
-         target: "glow";
-         transition: ACCELERATE 0.2;
-      }
-      program {
-         signal: "mouse,out"; source: "event";
-         action: STATE_SET "default" 0.0;
-         target: "e.text.title";
-         target: "title2";
-         target: "icon_clip";
-         target: "glow";
-         transition: DECELERATE 0.2;
-      }
-   }
-}
-
 group { name: "e/modules/ibox/icon_overlay";
    alias: "e/modules/ibar/icon_overlay";
-   images.image: "darken_square.png" COMP;
+   IMAGE_RING("ringa", 160)
+   IMAGE_RING("ringb", 160)
+   IMAGE_RING("ringc", 160)
    script_recursion: 1;
    script {
       public urgent;
@@ -488,6 +324,24 @@ group { name: "e/modules/ibox/icon_overlay";
             color: 255 255 255 0;
          }
       }
+      part { name: "content"; type: SPACER;
+         description { state: "default" 0.0;
+         }
+         description { state: "starting" 0.0;
+            inherit: "default" 0.0;
+            rel1.relative: 0.1 0.1;
+            rel2.relative: 0.9 0.9;
+         }
+      }
+      BUSY("busy_area", "e,state,starting", "e", "e,state,started", "e")
+      part { name: "busy_area"; type: SPACER;
+         description { state: "default" 0.0;
+            rel1.to: "content";
+            rel2.to: "content";
+            rel1.relative: -0.5 -0.5;
+            rel2.relative:  1.5  1.5;
+         }
+      }
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "background";
          description {
@@ -496,29 +350,9 @@ group { name: "e/modules/ibox/icon_overlay";
             rel2.to: "background";
          }
       }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.offset: -9 -5;
-            rel1.to: "e.text.label";
-            rel2.offset: 8 4;
-            rel2.to: "e.text.label";
-            image.normal: "darken_square.png";
-            image.border: 6 6 6 6;
-            fill.smooth: 0;
-            fixed: 1 1;
-            color: 255 255 255 0;
-            visible: 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-            visible: 1;
-         }
-      }
-      text { name: "spacer";
-         effect: SHADOW BOTTOM;
-         scale: 1;
-         desc { color: 0 0 0 0;
+      text { name: "spacer"; scale: 1;
+         desc {
+            color: 0 0 0 0;
             rel1.relative: 1 0;
             rel2.relative: 0 1;
             text {
@@ -539,29 +373,44 @@ group { name: "e/modules/ibox/icon_overlay";
             link.transition: SINUSOIDAL 0.1 CURRENT;
          }
       }
+      part { name: "bg"; type: RECT; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.offset: -5 -5;
+            rel1.to: "e.text.label";
+            rel2.offset: 4 4;
+            rel2.to: "e.text.label";
+            fixed: 1 1;
+            color: 0 0 0 0;
+            visible: 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            color: 0 0 0 192;
+            visible: 1;
+         }
+      }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             fixed: 0 1;
             rel1.to_x: "spacer";
             rel2.to_x: "spacer";
             rel1.relative: 0 1;
-            color_class: "module_label_invisible";
-            color3: 255 255 255 255;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
                align: 0.5 0.5;
                text_class: "module_normal";
             }
+            color: 255 255 255 0;
+            visible: 0;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             rel1.relative: 0.0 0.5;
             rel2.relative: 1.0 0.5;
-            color_class: "module_label";
-            color3: 255 255 255 255;
+            color: 255 255 255 255;
+            visible: 1;
          }
       }
    }
@@ -572,6 +421,19 @@ group { name: "e/modules/ibox/icon_overlay";
 //      program {
 //         signal: "e,action,start"; source: "e";
 //      }
+      program {
+         signal: "e,state,starting"; source: "e";
+         action: STATE_SET "starting" 0.0;
+         transition: DECELERATE 0.2;
+         target: "content";
+      }
+      program {
+         signal: "e,state,started"; source: "e";
+         action: STATE_SET "default" 0.0;
+         transition: ACCELERATE 0.2;
+         target: "content";
+      }
+      ///////////////////////////////////////////////////////////
       program {
          signal: "load"; source: "";
          script {
@@ -610,24 +472,24 @@ group { name: "e/modules/ibox/icon_overlay";
          action: STATE_SET "visible" 0.0;
          transition: SINUSOIDAL 0.5;
          target: "e.text.label";
-         target: "bevel";
+         target: "bg";
       }
       program {
          signal: "e,action,hide,label"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 1.0;
          target: "e.text.label";
-         target: "bevel";
+         target: "bg";
       }
-      program { name: "show_bevel";
+      program {
          action: STATE_SET visible 0.0;
          transition: SINUSOIDAL 1.0;
-         target: "bevel";
+         target: "bg";
       }
-      program { name: "hide_bevel";
+      program {
          action: STATE_SET default 0.0;
          transition: SINUSOIDAL 1.0;
-         target: "bevel";
+         target: "bg";
       }
       program { name: "go_passive2";
          action: STATE_SET "default" 0.0;
@@ -692,17 +554,18 @@ group { name: "e/modules/ibox/icon_overlay";
 
 group { name: "e/modules/ibox/drop";
    alias: "e/modules/ibar/drop";
-   images.image: "outline_glow.png" COMP;
+   images.image: "outline.png" COMP;
    images.image: "diagonal_stripes.png" COMP;
    parts {
       part { name: "base"; mouse_events: 0;
          description { state: "default" 0.0;
             rel1.offset: 2 2;
             rel2.offset: -3 -3;
-            image.normal: "outline_glow.png";
+            image.normal: "outline.png";
             image.border: 4 4 4 4;
             image.middle: 0;
             fill.smooth: 0;
+            color: 51 153 255 255;
          }
       }
       part { name: "pat"; mouse_events: 0;
@@ -712,7 +575,7 @@ group { name: "e/modules/ibox/drop";
             rel2.offset: -2 -2;
             rel2.to: "base";
             image.normal: "diagonal_stripes.png";
-            color: 255 255 255 25;
+            color: 51 153 255 25;
             TILED_PATTERN(240, 240)
          }
       }
@@ -844,3 +707,159 @@ group { name: "e/modules/ibox/drop_overlay";
       }
    }
 }
+
+group { name: "e/modules/ibar/menu";
+   parts {
+      part { name: "clip"; type: RECT;
+         description { state: "default"; }
+         description { state: "hidden";
+            inherit: "default";
+            color: 0 0 0 0;
+         }
+      }
+      part { name: "base"; type: RECT; mouse_events: 0;
+         clip_to: "clip";
+         description { state: "default" 0.0;
+            color: 0 0 0 192;
+         }
+      }
+      part { name: "e.box"; type: BOX;
+         clip_to: "clip";
+         scale: 1;
+         description { state: "default";
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            offscale;
+            box { layout: "vertical";
+               padding: 0 0;
+               align: 0.5 0.5;
+               min: 1 1;
+            }
+         }
+      }
+   }
+   programs {
+      program { signal: "e,state,hidden"; source: "e";
+         action: STATE_SET "hidden" 0.0;
+         target: "clip";
+      }
+
+      program { signal: "e,action,show"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "clip";
+         transition: SINUSOIDAL 0.2;
+         after: "show2";
+      }
+      program { name: "show2";
+         action: SIGNAL_EMIT "e,action,show,done" "";
+      }
+
+      program { signal: "e,action,hide"; source: "e";
+         action: STATE_SET "hidden" 0.0;
+         target: "clip";
+         transition: SINUSOIDAL 0.2;
+         after: "hide2";
+      }
+      program { name: "hide2";
+         action: SIGNAL_EMIT "e,action,hide,done" "";
+      }
+   }
+}
+
+group { name: "e/modules/ibar/menu/item";
+   parts {
+      part { name: "base"; type: RECT;
+         description { state: "default";
+            rel1.offset: -5 0;
+            rel2.offset: 4 -1;
+            color: 64 64 64 255;
+            visible: 0;
+            link.base: "e,state,unfocused" "e";
+            link.transition: ACCEL 0.1;
+         }
+         description { state: "focused";
+            inherit: "default" 0.0;
+            visible: 1;
+            link.base: "e,state,focused" "e";
+            link.transition: ACCEL 0.1;
+         }
+      }
+/*
+      part { name: "clip"; type: RECT;
+         description { state: "default";
+            link.base: "e,state,other,none" "e";
+            link.transition: ACCEL 0.1;
+         }
+         description { state: "otherdesk";
+            inherit: "default" 0.0;
+            color: 32 32 32 255;
+            link.base: "e,state,other,desk" "e";
+            link.transition: ACCEL 0.1;
+         }
+         description { state: "otherscreen";
+            inherit: "default" 0.0;
+            color: 32 32 32 255;
+            link.base: "e,state,other,screen" "e";
+            link.transition: ACCEL 0.1;
+         }
+      }
+ */
+      part { name: "icon"; scale: 1; type: SPACER;
+         description { state: "default";
+            rel1.offset: 2 2;
+            rel2.offset: 2 -3;
+            align: 0.0 0.5;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            min: 48 48;
+            max: 48 48;
+         }
+      }
+      part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
+         description { state: "default";
+            rel1.to: "icon";
+            rel2.to: "icon";
+         }
+      }
+      part { name: "e.text.title"; type: TEXT; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.to_x: "icon";
+            rel1.relative: 1.0 0.0;
+            rel1.offset: 3 0;
+            rel2.offset: -3 -3;
+            align: 0.0 0.0;
+            min: 128 0;
+            color: 160 160 160 255;
+            text { font: FNBD; size: 10;
+               text: "window name thingy";
+               min: 0 1;
+               align: 0.0 0.5;
+               text_class: "menu_item";
+            }
+         }
+         description { state: "focus";
+            inherit: "default";
+            color: 255 255 255 255;
+         }
+      }
+      part { name: "event"; type: RECT;
+         description { state: "default";
+            color: 0 0 0 0;
+         }
+      }
+   }
+   programs {
+      program {
+         signal: "mouse,in"; source: "event";
+         action: STATE_SET "focus" 0.0;
+         target: "e.text.title";
+         transition: ACCELERATE 0.2;
+      }
+      program {
+         signal: "mouse,out"; source: "event";
+         action: STATE_SET "default" 0.0;
+         target: "e.text.title";
+         transition: DECELERATE 0.2;
+      }
+   }
+}

data/elementary/themes/edc/icons.edc

@@ -44,3 +44,63 @@
 //   ICON("", 80, "")
 #endif
 #undef ICON
+
+// regular icons
+#define ICON(_NAME, _FILE) \
+   set { name: _FILE"_icon"; \
+      image { image: _FILE"_160.png" COMP; size: 81 81 16000 16000; } \
+      image { image: _FILE"_080.png" COMP; size: 41 41 80 80; } \
+      image { image: _FILE"_040.png" COMP; size: 0 0 40 40; } \
+   } \
+   group { \
+      name: "e/icons/"_NAME; \
+      max: 16000 16000; \
+      parts { \
+         part { name: "icon"; mouse_events: 0; \
+            description { state: "default" 0.0; \
+               aspect: 1.0 1.0; aspect_preference: BOTH; \
+               image.normal: _FILE"_icon"; \
+            } \
+         } \
+      } \
+   }
+   ICON("modules-files", "efm_folder")
+   ICON("system-file-manager", "efm_folder")
+   ICON("folder", "efm_folder")
+   ICON("folder-image", "efm_folder")
+   ICON("inode/directory", "efm_folder")
+   ICON("user-home", "efm_home")
+   ICON("user-desktop", "efm_desktop")
+   ICON("user-temp", "efm_temp")
+   ICON("user-bookmarks", "efm_favorite")
+   ICON("computer", "efm_computer")
+   ICON("drive-optical", "efm_drive_cd")
+   ICON("drive-harddisk", "efm_drive_hdd")
+   ICON("drive-removable-media", "efm_drive_usb_media")
+   ICON("media-flash", "efm_drive_flash")
+
+   ICON("dialog-ask", "ic_unknown")
+   ICON("unknown", "ic_unknown")
+   ICON("emblem-symbolic-link", "ic_unknown")
+#undef ICON
+// mime icons
+#define ICON(_NAME, _FILE) \
+   set { name: _FILE"_icon"; \
+      image { image: _FILE"_160.png" COMP; size: 81 81 16000 16000; } \
+      image { image: _FILE"_080.png" COMP; size: 41 41 80 80; } \
+      image { image: _FILE"_040.png" COMP; size: 0 0 40 40; } \
+   } \
+   group { \
+      name: "e/icons/fileman/mime/"_NAME; \
+      max: 16000 16000; \
+      parts { \
+         part { name: "icon"; mouse_events: 0; \
+            description { state: "default" 0.0; \
+               aspect: 1.0 1.0; aspect_preference: BOTH; \
+               image.normal: _FILE"_icon"; \
+            } \
+         } \
+      } \
+   }
+   ICON("inode/directory", "efm_folder")
+#undef ICON

data/elementary/themes/edc/ilist.edc

@@ -1,5 +1,4 @@
 group { name: "e/ilist";
-   images.image: "darken_square.png" COMP;
    parts {
       part { name: "typebuf_clip"; type: RECT;
          description { state: "default" 0.0;
@@ -11,47 +10,44 @@ group { name: "e/ilist";
             color: 255 255 255 255;
          }
       }
-      part { name: "bevel"; mouse_events: 0;
+      part { name: "base"; type: RECT; mouse_events: 0;
          clip_to: "typebuf_clip";
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: -6 -6;
+            rel1.offset: -8 -8;
             rel1.to: "e.text.label";
-            rel2.offset: 5 5;
+            rel2.offset: 7 7;
             rel2.to: "e.text.label";
-            image.normal: "darken_square.png";
-            image.border: 6 6 6 6;
-            fill.smooth: 0;
+            color: 0 0 0 192;
+            offscale;
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          clip_to: "typebuf_clip";
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.relative: 0.5 0.5;
             rel1.offset: -8 -8;
             rel2.relative: 0.5 0.5;
             rel2.offset: 7 7;
-            color: FN_COL_DEFAULT;
-            color_class: "ilist_typebuf";
+            color: 255 255 255 255;
             text { font: FNBD; size: 10;
                min: 1 1;
                ellipsis: -1;
                align: 0.5 0.5;
                text_class: "ilist_typebuf";
             }
+            offscale;
          }
       }
    }
    programs {
-      program {
-         signal: "e,state,typebuf,start"; source: "e";
+      program { signal: "e,state,typebuf,start"; source: "e";
          action: STATE_SET "active" 0.0;
          transition: SINUSOIDAL 0.25;
          target: "typebuf_clip";
       }
-      program {
-         signal: "e,state,typebuf,stop"; source: "e";
+      program { signal: "e,state,typebuf,stop"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 1.0;
          target: "typebuf_clip";
@@ -61,178 +57,75 @@ group { name: "e/ilist";
 
 group { name: "e/widgets/ilist";
 //   data.item: "stacking" "above";
-   data.item: "stacking" "below";
-   data.item: "selectraise" "on";
-   images.image: "bevel_curved_horiz_out.png" COMP;
-   images.image: "shadow_rounded_horiz.png" COMP;
-   images.image: "vgrad_med_dark.png" COMP;
-   images.image: "bevel_horiz_out.png" COMP;
-   images.image: "shine.png" COMP;
+//   data.item: "stacking" "below";
+//   data.item: "selectraise" "on";
    parts {
       part { name: "base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color_class: "ilist_item_base";
             color: 64 64 64 255;
          }
       }
-      part { name: "bevel"; mouse_events: 0;
+      part { name: "sel_base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "bevel_curved_horiz_out.png";
-            image.border: 0 0 2 2;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "sel_shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shadow_rounded_horiz.png";
-            image.border: 0 0 9 9;
-            rel1.offset: 0 -4;
-            rel2.offset: -1 5;
-            fill.smooth: 0;
+            color: 51 153 255 255;
             visible: 0;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
             visible: 1;
          }
-      }
-      part { name: "sel_base"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "vgrad_med_dark.png";
-            fill.smooth: 0;
-            TILED_HORIZ(120)
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
+         description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "sel_bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_horiz_out.png";
-            image.border: 0 0 2 2;
-            image.middle: 0;
-            fill.smooth: 0;
             visible: 0;
          }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
       }
       part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
             align: 0.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            rel1.offset: 2 2;
+            rel1.offset: 4 4;
             rel2.relative: 0.0 1.0;
-            rel2.offset: 2 -3;
+            rel2.offset: 4 -5;
+            offscale;
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 3;
+            rel1.offset: 4 4;
             rel1.relative: 1.0 0.0;
             rel1.to_x: "e.swallow.icon";
-            rel2.offset: -3 -3;
+            rel2.offset: -5 -5;
             rel2.relative: 0.0 1.0;
             rel2.to_x: "e.swallow.end";
-            color_class: "ilist_item";
-            color3: 255 255 255 255;
+            color: 160 160 160 255;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
                align: 0.0 0.5;
                text_class: "ilist_item";
             }
+            offscale;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            visible: 0;
+            color: 255 255 255 255;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "label2"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "e.text.label";
-            rel2.to: "e.text.label";
-            color: FN_COL_DISABLE;
-            color_class: "ilist_item_disabled";
-            text { font: FN; size: 10;
-               text_source: "e.text.label";
-               align: 0.0 0.5;
-               text_class: "ilist_item";
-            }
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "label3"; type: TEXT; mouse_events: 0;
-         effect: GLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.offset: -2 -3;
-            rel1.to: "e.text.label";
-            rel2.offset: 2 1;
-            rel2.to: "e.text.label";
-            color_class: "ilist_item_selected";
-            color2: 255 255 255 255;
-            color3: 255 255 255 255;
-            text { font: FN; size: 10;
-               text_source: "e.text.label";
-               align: 0.0 0.5;
-               text_class: "ilist_item";
-            }
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-             visible: 0;
+            color: 80 80 80 255;
          }
       }
       part { name: "e.swallow.end"; type: SWALLOW; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
             align: 1.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            rel1.offset: -3 2;
+            rel1.offset: -5 4;
             rel1.relative: 1.0 0.0;
-            rel2.offset: -3 -3;
-         }
-      }
-      part { name: "sel_shine"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel1.to: "sel_base";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "sel_base";
-            FIXED_SIZE(69, 5)
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+            rel2.offset: -5 -5;
+            offscale;
          }
       }
       part { name: "event"; type: RECT;
@@ -249,40 +142,26 @@ group { name: "e/widgets/ilist";
       program {
          signal: "e,state,selected"; source: "e";
          action: STATE_SET "selected" 0.0;
-         target: "sel_shadow";
          target: "sel_base";
-         target: "sel_bevel";
-         target: "sel_shine";
          target: "e.text.label";
-         target: "label2";
-         target: "label3";
       }
       program {
          signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
-         target: "sel_shadow";
          target: "sel_base";
-         target: "sel_bevel";
-         target: "sel_shine";
          target: "e.text.label";
-         target: "label2";
-         target: "label3";
       }
       program {
          signal: "e,state,disabled"; source: "e";
          action: STATE_SET "disabled" 0.0;
-         target: "event";
+         target: "sel_base";
          target: "e.text.label";
-         target: "label2";
-         target: "label3";
       }
       program {
          signal: "e,state,enabled"; source: "e";
          action: STATE_SET "default" 0.0;
-         target: "event";
+         target: "sel_base";
          target: "e.text.label";
-         target: "label2";
-         target: "label3";
       }
    }
 }
@@ -292,19 +171,18 @@ group { name: "e/widgets/ilist_odd";
    parts {
       part { name: "base";
          description { state: "default" 0.0;
-            color_class: "ilist_item_odd_base";
             color: 56 56 56 255;
          }
       }
       part { name: "e.text.label";
          description { state: "default" 0.0;
-            color_class: "ilist_item_odd";
+//            color_class: "ilist_item_odd";
          }
          description { state: "selected" 0.0;
-            color_class: "ilist_item_odd";
+//            color_class: "ilist_item_odd";
          }
          description { state: "disabled" 0.0;
-            color_class: "ilist_item_odd";
+//            color_class: "ilist_item_odd";
          }
       }
    }
@@ -313,89 +191,69 @@ group { name: "e/widgets/ilist_odd";
 group { name: "e/widgets/ilist_header";
    alias: "e/widgets/ilist_header_odd";
    data.item: "stacking" "above";
-   images.image: "dot_pattern.png" COMP;
-   images.image: "inset_shadow.png" COMP;
-   images.image: "shadow_vertical_dark.png" COMP;
    parts {
       part { name: "base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            color_class: "ilist_item_base";
-            color: 48 48 48 255;
-         }
-      }
-      part { name: "pat";
-         description { state: "default" 0.0;
-            image.normal: "dot_pattern.png";
-            TILED_PATTERN(256, 256)
-         }
-      }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shadow_vertical_dark.png";
-            color: 255 255 255 128;
+            color: 32 32 32 255;
          }
       }
       part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
             align: 0.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            rel1.offset: 2 2;
+            rel1.offset: 4 4;
             rel2.relative: 0.0 1.0;
-            rel2.offset: 2 -3;
+            rel2.offset: 4 -5;
+            offscale;
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 6;
+            rel1.offset: 8 8;
             rel1.relative: 1.0 0.0;
             rel1.to_x: "e.swallow.icon";
-            rel2.offset: -3 -7;
+            rel2.offset: -8 -9;
             rel2.relative: 0.0 1.0;
             rel2.to_x: "e.swallow.end";
-            color_class: "ilist_item_header";
-            color3: 255 255 255 255;
+            color: 255 255 255 255;
             text { font: FNBD; size: 10;
                min: 0 1;
                align: 0.0 0.5;
                text_class: "ilist_item";
             }
+            offscale;
          }
       }
       part { name: "e.swallow.end"; type: SWALLOW; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
             align: 1.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            rel1.offset: -3 2;
+            rel1.offset: -5 4;
             rel1.relative: 1.0 0.0;
-            rel2.offset: -3 -3;
-         }
-      }
-      part { name: "shadow2"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            fill.smooth: 0;
+            rel2.offset: -5 -5;
+            offscale;
          }
       }
    }
 }
 
 group { name: "e/widgets/ilist/toggle_end";
-   images.image: "led_dark.png" COMP;
-   images.image: "led_light.png" COMP;
+   images.image: "speaker_vol.png" COMP;
    parts {
       part { name: "base"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "led_dark.png";
+            image.normal: "speaker_vol.png";
             aspect: 1.0 1.0; aspect_preference: BOTH;
-            max: 32 32;
+            color: 80 80 80 255;
+            rel1.relative: 0.2 0.2;
+            rel2.relative: 0.8 0.8;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
-            image.normal: "led_light.png";
+            color: 51 153 255 255;
          }
       }
    }
@@ -403,14 +261,15 @@ group { name: "e/widgets/ilist/toggle_end";
       program {
          signal: "e,state,checked"; source: "e";
          action: STATE_SET "visible" 0.0;
-         transition: BOUNCE 0.4 0.5 4;
+         transition: SINUSOIDAL 0.3;
          target: "base";
       }
       program {
          signal: "e,state,unchecked"; source: "e";
          action: STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 0.3;
          target: "base";
       }
    }
 }
-      
+

data/elementary/themes/edc/init.edc

@@ -1,51 +1,31 @@
 group { name: "e/init/splash";
-   images.image: "screen_circular_shadow.png" COMP;
-   images.image: "bg_radgrad.png" COMP;
-   images.image: "dot_pattern.png" COMP;
-   images.image: "logo_blue_small.png" COMP;
-   images.image: "logo_blue_small_glow.png" COMP;
-   images.image: "led_square_base.png" COMP;
-   images.image: "led_square_glow.png" COMP;
-   images.image: "led_square_shading.png" COMP;
-   images.image: "led_square_shadow.png" COMP;
-   images.image: "led_square_shine.png" COMP;
+   set { name: "logo_mono";
+      image { image: "logo.png" COMP;  size: 601 601 99999 99999; }
+      image { image: "logo2.png" COMP; size: 301 301   600   600; }
+      image { image: "logo3.png" COMP; size: 151 151   300   300; }
+      image { image: "logo4.png" COMP; size:  76  76   150   150; }
+      image { image: "logo5.png" COMP; size:  0    0    75    75; }
+   }
    script {
       public is_ready;
       public do_end;
    }
    parts {
-      part { name: "clip"; type: RECT; mouse_events: 0;
+      part { name: "bg"; type: RECT;
+         clip_to: "fader";
          description { state: "default" 0.0;
-         }
-      }
-      part { name: "bg";
-         description { state: "default" 0.0;
-            image.normal: "bg_radgrad.png";
-            image.scale_hint: STATIC;
-            fill.smooth: 0;
-            ASPECT_FILL((1024/653))
-         }
-      }
-      part { name: "pat";
-         description { state: "default" 0.0;
-            image.normal: "dot_pattern.png";
-            TILED_PATTERN(256, 256)
+            color: 32 32 32 255;
          }
       }
       part { name: "logo";
+         scale: 1;
+         clip_to: "fader";
          description { state: "default" 0.0;
-            image.normal: "logo_blue_small.png";
+            image.normal: "logo_mono";
             rel1.relative: 0.5 0.5;
             rel2.relative: 0.5 0.5;
-            FIXED_SIZE(100, 127)
-         }
-      }
-      part { name: "logo_glow";
-         description { state: "default" 0.0;
-            image.normal: "logo_blue_small_glow.png";
-            rel1.to: "logo";
-            rel2.to: "logo";
-            color: 255 255 255 128;
+            color: 255 255 255 0;
+            FIXED_SIZE(150, 150)
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
@@ -53,18 +33,19 @@ group { name: "e/init/splash";
          }
       }
       part { name: "e.text.title"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
+         clip_to: "fader";
          description { state: "default" 0.0;
             align: 0.5 1.0;
             rel1.relative: 0.05 0.0;
-            rel1.offset: 4 -1;
+            rel1.offset: 4 -16;
             rel1.to_y: "e.text.status";
             rel2.relative: 0.95 0.0;
-            rel2.offset: -5 -1;
+            rel2.offset: -5 -16;
             rel2.to_y: "e.text.status";
-            color: FN_COL_DEFAULT;
+            color: 160 160 160 255;
             text { font: FNBD; size: 20;
+               text: "Title here";
                min: 0 1;
                text_class: "init_title";
             }
@@ -72,18 +53,19 @@ group { name: "e/init/splash";
          }
       }
       part { name: "e.text.status"; type: TEXT;
-         effect: GLOW;
          scale: 1;
+         clip_to: "fader";
          description { state: "default" 0.0;
             align: 0.5 1.0;
             rel1.relative: 0.05 0.0;
             rel1.to_y: "logo";
-            rel1.offset: 4 -1;
+            rel1.offset: 4 -16;
             rel2.relative: 0.95 0.0;
-            rel2.offset: -5 -1;
+            rel2.offset: -5 -16;
             rel2.to_y: "logo";
-            color: FN_COL_HIGHLIGHT;
+            color: 160 160 160 255;
             text { font: FN; size: 10;
+               text: "Status here";
                min: 0 1;
                text_class: "init_status";
             }
@@ -91,16 +73,17 @@ group { name: "e/init/splash";
          }
       }
       part { name: "e.text.version"; type: TEXT;
-         effect: GLOW;
+         scale: 1;
+         clip_to: "fader";
          description { state: "default" 0.0;
             align: 1.0 1.0;
             rel1.relative: 1.0 1.0;
-            rel1.offset: -4 -4;
+            rel1.offset: -16 -16;
             rel2.relative: 1.0 1.0;
-            rel2.offset: -4  -4;
-            color: FN_COL_HIGHLIGHT;
+            rel2.offset: -16  -16;
+            color: 80 80 80 255;
             text { font: FN; size: 8;
-               text: "0.19";
+               text: "0.22.0";
                min: 1 1;
                ellipsis: -1;
                align: 1.0 1.0;
@@ -109,269 +92,6 @@ group { name: "e/init/splash";
             fixed: 1 1;
          }
       }
-      
-      part { name: "shadow"; mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 1.0;
-            color: 255 255 255 255;
-            image.normal: "screen_circular_shadow.png";
-            fill.smooth: 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            rel1.relative: -1.0 -1.0;
-            rel2.relative: 2.0 2.0;
-            color: 255 255 255 255;
-         }
-      }
-      
-#define LED(_NAME, _TO, _SHINE, _C00, _C01, _C10, _C11, _C20, _C21, _C30, _C31, _C40, _C41, _C50, _C51, _C60, _C61) \
-      part { name: _NAME"_shadow"; \
-         description { state: "default" 0.0; \
-            rel1.to: _TO; \
-            rel2.to: _TO; \
-            FIXED_SIZE(20, 20) \
-            image.normal: "led_square_shadow.png"; \
-         } \
-      } \
-      part { name: _NAME"_base"; \
-         description { state: "default" 0.0; \
-            rel1.to: _NAME"_shadow"; \
-            rel2.to: _NAME"_shadow"; \
-            image.normal: "led_square_base.png"; \
-            color: _C00; \
-         } \
-         description { state: "col1" 0.0; \
-            inherit: "default" 0.0; \
-            color: _C10; \
-         } \
-         description { state: "col2" 0.0; \
-            inherit: "default" 0.0; \
-            color: _C20; \
-         } \
-         description { state: "col3" 0.0; \
-            inherit: "default" 0.0; \
-            color: _C30; \
-         } \
-         description { state: "col4" 0.0; \
-            inherit: "default" 0.0; \
-            color: _C40; \
-         } \
-         description { state: "col5" 0.0; \
-            inherit: "default" 0.0; \
-            color: _C50; \
-         } \
-         description { state: "col6" 0.0; \
-            inherit: "default" 0.0; \
-            color: _C60; \
-         } \
-      } \
-      part { name: _NAME"_glow"; \
-         description { state: "default" 0.0; \
-            rel1.to: _NAME"_shadow"; \
-            rel2.to: _NAME"_shadow"; \
-            image.normal: "led_square_glow.png"; \
-            color: _C01; \
-         } \
-         description { state: "col1" 0.0; \
-            inherit: "default" 0.0; \
-            color: _C11; \
-         } \
-         description { state: "col2" 0.0; \
-            inherit: "default" 0.0; \
-            color: _C21; \
-         } \
-         description { state: "col3" 0.0; \
-            inherit: "default" 0.0; \
-            color: _C31; \
-         } \
-         description { state: "col4" 0.0; \
-            inherit: "default" 0.0; \
-            color: _C41; \
-         } \
-         description { state: "col5" 0.0; \
-            inherit: "default" 0.0; \
-            color: _C51; \
-         } \
-         description { state: "col6" 0.0; \
-            inherit: "default" 0.0; \
-            color: _C61; \
-         } \
-      } \
-      part { name: _NAME"_shading"; \
-         description { state: "default" 0.0; \
-            rel1.to: _NAME"_shadow"; \
-            rel2.to: _NAME"_shadow"; \
-            image.normal: "led_square_shading.png"; \
-         } \
-      } \
-      part { name: _NAME"_shine"; \
-         description { state: "default" 0.0; \
-            rel1.to: _NAME"_shadow"; \
-            rel2.to: _NAME"_shadow"; \
-            image.normal: "led_square_shine.png"; \
-            color: 255 255 255 _SHINE; \
-         } \
-      }
-
-#define WHITE  255 255 255 255
-#define RED    255  40  20 255
-#define GREEN   80 255  20 255
-#define BLUE    51 153 255 255
-#define ORANGE 255 128  32 255
-#define YELLOW 255 220  64 255
-#define PURPLE 200  60 255 255
-#define CYAN    40 220 255 255
-      
-      LED("l0", "led0", 255,
-          BLUE, WHITE,
-          RED, ORANGE,
-          GREEN, YELLOW,
-          ORANGE, YELLOW,
-          PURPLE, YELLOW,
-          CYAN, WHITE,
-          YELLOW, WHITE
-         )
-
-      LED("l-1", "led-1", 128,
-          RED, ORANGE,
-          BLUE, WHITE,
-          ORANGE, YELLOW,
-          GREEN, YELLOW,
-          CYAN, WHITE,
-          YELLOW, WHITE,
-          PURPLE, YELLOW
-         )
-      LED("l-2", "led-2", 64,
-          CYAN, WHITE,
-          GREEN, YELLOW,
-          BLUE, WHITE,
-          YELLOW, WHITE,
-          ORANGE, YELLOW,
-          PURPLE, YELLOW,
-          RED, ORANGE
-         )
-      LED("l-3", "led-3", 0,
-          GREEN, YELLOW,
-          PURPLE, YELLOW,
-          YELLOW, WHITE,
-          RED, ORANGE,
-          CYAN, WHITE,
-          ORANGE, YELLOW,
-          BLUE, WHITE
-         )
-
-      LED("l+1", "led+1", 128,
-          YELLOW, WHITE,
-          ORANGE, YELLOW,
-          RED, ORANGE,
-          PURPLE, YELLOW,
-          BLUE, WHITE,
-          GREEN, YELLOW,
-          CYAN, WHITE
-         )
-      LED("l+2", "led+2", 64,
-          PURPLE, YELLOW,
-          BLUE, WHITE,
-          RED, ORANGE,
-          YELLOW, WHITE,
-          ORANGE, YELLOW,
-          CYAN, WHITE,
-          GREEN, YELLOW
-         )
-      LED("l+3", "led+3", 0,
-          ORANGE, YELLOW,
-          RED, ORANGE,
-          PURPLE, YELLOW,
-          GREEN, YELLOW,
-          BLUE, WHITE,
-          YELLOW, WHITE,
-          CYAN, WHITE
-         )
-#undef LED
-
-      part { name: "led0"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.relative: 0.5 1.0;
-            rel1.to: "logo";
-            rel2.relative: 0.5 1.0;
-            rel2.to: "logo";
-            align: 0.5 0.0;
-            FIXED_SIZE(20, 20)
-            visible: 0;
-         }
-      }
-
-      part { name: "led-1"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.relative: -1.0 0.0;
-            rel1.to: "led0";
-            rel2.relative: -1.0 1.0;
-            rel2.to: "led0";
-            align: 0.0 0.5;
-            FIXED_SIZE(20, 20)
-            visible: 0;
-         }
-      }
-      part { name: "led-2"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.relative: -1.0 0.0;
-            rel1.to: "led-1";
-            rel2.relative: -1.0 1.0;
-            rel2.to: "led-1";
-            align: 0.0 0.5;
-            FIXED_SIZE(20, 20)
-            visible: 0;
-         }
-      }
-      part { name: "led-3"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.relative: -1.0 0.0;
-            rel1.to: "led-2";
-            rel2.relative: -1.0 1.0;
-            rel2.to: "led-2";
-            align: 0.0 0.5;
-            FIXED_SIZE(20, 20)
-            visible: 0;
-         }
-      }
-
-      part { name: "led+1"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.relative: 2.0 0.0;
-            rel1.to: "led0";
-            rel2.relative: 2.0 1.0;
-            rel2.to: "led0";
-            align: 1.0 0.5;
-            FIXED_SIZE(20, 20)
-            visible: 0;
-         }
-      }
-      part { name: "led+2"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.relative: 2.0 0.0;
-            rel1.to: "led+1";
-            rel2.relative: 2.0 1.0;
-            rel2.to: "led+1";
-            align: 1.0 0.5;
-            FIXED_SIZE(20, 20)
-            visible: 0;
-         }
-      }
-      part { name: "led+3"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.relative: 2.0 0.0;
-            rel1.to: "led+2";
-            rel2.relative: 2.0 1.0;
-            rel2.to: "led+2";
-            align: 1.0 0.5;
-            FIXED_SIZE(20, 20)
-            visible: 0;
-         }
-      }
-      
       part { name: "blanker"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
             color: 0 0 0 255;
@@ -383,175 +103,76 @@ group { name: "e/init/splash";
             visible: 0;
          }
       }
+      part { name: "fader"; type: RECT;
+         description { state: "default" 0.0;
+            color: 255 255 255 255;
+         }
+         description { state: "faded" 0.0;
+            color: 255 255 255 0;
+         }
+      }
+   }
+   programs {
+      program { signal: "load"; source: "";
+         script {
+            set_int(is_ready, 0);
+            set_int(do_end, 0);
+         }
+      }
+      program { signal: "show"; source: "";
+         action: STATE_SET "visible" 0.0;
+         transition: DECELERATE 1.0;
+         in: 1.0 0.0;
+         target: "blanker";
+      }
+      program { signal: "show"; source: "";
+         action: STATE_SET "active" 0.0;
+         target: "logo";
+         in: 1.5 0.0;
+         transition: SINUSOIDAL 0.8;
+         after: "ready";
+      }
+      program { name: "ready";
+         script {
+            new val;
+            val = get_int(do_end);
+            if (val == 1)
+              run_program(PROGRAM:"exit1");
+            else
+              set_int(is_ready, 1);
+         }
+      }
+      program { signal: "e,state,done"; source: "e";
+         script {
+            new val;
+            set_int(do_end, 1);
+            val = get_int(is_ready);
+            if (val == 1)
+            run_program(PROGRAM:"exit1");
+         }
+      }
+      program { name: "exit1";
+         action: STATE_SET "faded" 0.0;
+         transition: SINUSOIDAL 1.0 CURRENT;
+         target: "fader";
+         after: "exit2";
+      }
+      program { name: "exit2";
+         action: SIGNAL_EMIT "e,state,done_ok" "e";
+      }
    }
-  programs {
-     program { signal: "load"; source: "";
-        script {
-           set_int(is_ready, 0);
-           set_int(do_end, 0);
-        }
-     }
-
-#define PROG(_NAME) \
-     program { name: _NAME"0"; \
-        signal: "show"; source: ""; \
-        action: STATE_SET "col1" 0.0; \
-        target: _NAME"_base"; \
-        target: _NAME"_glow"; \
-        transition: SINUSOIDAL 0.5; \
-        in: 0.2 0.5; \
-        after: _NAME"1"; \
-     } \
-     program { name: _NAME"1"; \
-        action: STATE_SET "col2" 0.0; \
-        target: _NAME"_base"; \
-        target: _NAME"_glow"; \
-        transition: SINUSOIDAL 0.5; \
-        in: 0.2 0.5; \
-        after: _NAME"2"; \
-     } \
-     program { name: _NAME"2"; \
-        action: STATE_SET "col3" 0.0; \
-        target: _NAME"_base"; \
-        target: _NAME"_glow"; \
-        transition: SINUSOIDAL 0.5; \
-        in: 0.2 0.5; \
-        after: _NAME"1"; \
-     } \
-     program { name: _NAME"3"; \
-        action: STATE_SET "col4" 0.0; \
-        target: _NAME"_base"; \
-        target: _NAME"_glow"; \
-        transition: SINUSOIDAL 0.5; \
-        in: 0.2 0.5; \
-        after: _NAME"1"; \
-     } \
-     program { name: _NAME"4"; \
-        action: STATE_SET "col5" 0.0; \
-        target: _NAME"_base"; \
-        target: _NAME"_glow"; \
-        transition: SINUSOIDAL 0.5; \
-        in: 0.2 0.5; \
-        after: _NAME"1"; \
-     } \
-     program { name: _NAME"5"; \
-        action: STATE_SET "col6" 0.0; \
-        target: _NAME"_base"; \
-        target: _NAME"_glow"; \
-        transition: SINUSOIDAL 0.5; \
-        in: 0.2 0.5; \
-        after: _NAME"1"; \
-     } \
-     program { name: _NAME"6"; \
-        action: STATE_SET "default" 0.0; \
-        target: _NAME"_base"; \
-        target: _NAME"_glow"; \
-        transition: SINUSOIDAL 0.5; \
-        in: 0.2 0.5; \
-        after: _NAME"1"; \
-     }
-     PROG("l0")
-     PROG("l-1")
-     PROG("l-2")
-     PROG("l-3")
-     PROG("l+1")
-     PROG("l+2")
-     PROG("l+3")
-#undef PROG     
-     
-     program { signal: "show"; source: "";
-        action: STATE_SET "visible" 0.0;
-        transition: DECELERATE 1.0;
-        target: "shadow";
-        target: "blanker";
-        after: "ready";
-     }
-     program { name: "logo_pulse";
-        signal: "show"; source: "";
-        action: STATE_SET "active" 0.0;
-        target: "logo_glow";
-        transition: BOUNCE 0.8 0.5 6;
-        after: "logo_pulse2";
-     }
-     program { name: "logo_pulse2";
-        action: STATE_SET "default" 0.0;
-        target: "logo_glow";
-        transition: SINUSOIDAL 0.8;
-        after: "logo_pulse";
-     }
-     program { name: "ready";
-        script {
-           new val;
-           val = get_int(do_end);
-           if (val == 1)
-             run_program(PROGRAM:"exit1");
-           else
-             set_int(is_ready, 1);
-        }
-     }
-     program { signal: "e,state,done"; source: "e";
-        script {
-           new val;
-           set_int(do_end, 1);
-           val = get_int(is_ready);
-           if (val == 1)
-             run_program(PROGRAM:"exit1");
-        }
-     }
-     program { name: "exit1";
-        action: STATE_SET "default" 0.0;
-        transition: SINUSOIDAL 1.0 CURRENT;
-        target: "shadow";
-        target: "blanker";
-        after: "exit2";
-     }
-     program { name: "exit2";
-        action: SIGNAL_EMIT "e,state,done_ok" "e";
-     }
-  }
 }
 
 group { name: "e/init/extra_screen";
-   images.image: "screen_circular_shadow.png" COMP;
-   images.image: "bg_radgrad.png" COMP;
-   images.image: "dot_pattern.png" COMP;
    script {
       public is_ready;
       public do_end;
    }
    parts {
-      part { name: "clip"; type: RECT; mouse_events: 0;
+      part { name: "bg"; type: RECT;
+         clip_to: "fader";
          description { state: "default" 0.0;
-         }
-      }
-      part { name: "bg";
-         description { state: "default" 0.0;
-            image.normal: "bg_radgrad.png";
-            image.scale_hint: STATIC;
-            fill.smooth: 0;
-            ASPECT_FILL((1024/653))
-         }
-      }
-      part { name: "pat";
-         description { state: "default" 0.0;
-            image.normal: "dot_pattern.png";
-            TILED_PATTERN(256, 256)
-         }
-      }
-      part { name: "shadow"; mouse_events: 0;
-         clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 1.0;
-            color: 255 255 255 255;
-            image.normal: "screen_circular_shadow.png";
-            fill.smooth: 0;
-         }
-         description { state: "visible" 0.0;
-            inherit: "default" 0.0;
-            rel1.relative: -1.0 -1.0;
-            rel2.relative: 2.0 2.0;
-            color: 255 255 255 255;
+            color: 32 32 32 255;
          }
       }
       part { name: "blanker"; type: RECT; mouse_events: 0;
@@ -565,44 +186,57 @@ group { name: "e/init/extra_screen";
             visible: 0;
          }
       }
+      part { name: "fader"; type: RECT;
+         description { state: "default" 0.0;
+            color: 255 255 255 255;
+         }
+         description { state: "faded" 0.0;
+            color: 255 255 255 0;
+         }
+      }
    }
    programs {
-      program {
-         signal: "show"; source: "";
+      program { signal: "load"; source: "";
+         script {
+            set_int(is_ready, 0);
+            set_int(do_end, 0);
+         }
+      }
+      program { signal: "show"; source: "";
          action: STATE_SET "visible" 0.0;
          transition: DECELERATE 1.0;
-         target: "shadow";
+         in: 1.0 0.0;
          target: "blanker";
          after: "ready";
       }
-     program { name: "ready";
-        script {
-           new val;
-           val = get_int(do_end);
-           if (val == 1)
-             run_program(PROGRAM:"exit1");
-           else
-             set_int(is_ready, 1);
-        }
-     }
-     program { signal: "e,state,done"; source: "e";
-        script {
-           new val;
-           set_int(do_end, 1);
-           val = get_int(is_ready);
-           if (val == 1)
-             run_program(PROGRAM:"exit1");
-        }
-     }
-     program { name: "exit1";
-        action: STATE_SET "default" 0.0;
-        transition: SINUSOIDAL 1.0 CURRENT;
-        target: "shadow";
-        target: "blanker";
-        after: "exit2";
-     }
-     program { name: "exit2";
-        action: SIGNAL_EMIT "e,state,done_ok" "e";
-     }
+      program { name: "ready";
+         in: 0.5 0.0;
+         script {
+            new val;
+            val = get_int(do_end);
+            if (val == 1)
+              run_program(PROGRAM:"exit1");
+            else
+              set_int(is_ready, 1);
+         }
+      }
+      program { signal: "e,state,done"; source: "e";
+         script {
+            new val;
+            set_int(do_end, 1);
+            val = get_int(is_ready);
+            if (val == 1)
+            run_program(PROGRAM:"exit1");
+         }
+      }
+      program { name: "exit1";
+         action: STATE_SET "faded" 0.0;
+         transition: SINUSOIDAL 1.0 CURRENT;
+         target: "fader";
+         after: "exit2";
+      }
+      program { name: "exit2";
+         action: SIGNAL_EMIT "e,state,done_ok" "e";
+      }
    }
 }

data/elementary/themes/edc/label.edc

@@ -1,13 +1,11 @@
 group { name: "e/widgets/label";
    parts {
       part { name: "e.text.label"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
             rel1.offset: 2 2;
             rel2.offset: -3 -3;
-            color_class: "label_text";
-            color3: 255 255 255 255;
+            color: 160 160 160 255;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
@@ -17,19 +15,16 @@ group { name: "e/widgets/label";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color_class: "label_text_disabled";
-            color3: 255 255 255 255;
+            color: 0 0 0 16;
          }
       }
    }
    programs {
-      program {
-         signal: "e,state,disabled"; source: "e";
+      program { signal: "e,state,disabled"; source: "e";
          action: STATE_SET "disabled" 0.0;
          target: "e.text.label";
       }
-      program {
-         signal: "e,state,enabled"; source: "e";
+      program { signal: "e,state,enabled"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.text.label";
       }

data/elementary/themes/edc/luncher.edc

@@ -12,9 +12,9 @@ group { name: "e/gadget/luncher/bar";
       part { name: "e.swallow.bar"; type: SWALLOW;
          description { state: "default" 0.0;
             rel1.relative: 0.0 0.0;
-            rel1.offset: 0 0;
+            rel1.offset: 1 1;
             rel2.relative: 1.0 1.0;
-            rel2.offset: -1 -1;
+            rel2.offset: -2 -2;
          }
       }
    }
@@ -31,9 +31,9 @@ group { name: "e/gadget/luncher/grid";
       part { name: "e.swallow.grid"; type: SWALLOW;
          description { state: "default" 0.0;
             rel1.relative: 0.0 0.0;
-            rel1.offset: 0 0;
+            rel1.offset: 1 1;
             rel2.relative: 1.0 1.0;
-            rel2.offset: -1 -1;
+            rel2.offset: -2 -2;
          }
       }
    }
@@ -61,7 +61,6 @@ group { name: "e/gadget/luncher/icon";
          clip_to: "item_clip";
          mouse_events: 0;
          description {
-            align: 0.5 0.5;
             state: "default" 0.0;
             rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 1.0;
@@ -83,82 +82,64 @@ group { name: "e/gadget/luncher/icon";
             color: 255 255 255 50;
          }
       }
-      part { name: "indicator"; type: RECT;
-         clip_to: "item_clip";
-         mouse_events: 0;
-         description { state: "default" 0.0;
-            visible: 0;
-            color: 255 255 255 0;
-         }
-         description { state: "on_left" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            rel1.relative: 0.0 0.025;
-            rel1.offset: 0 1;
-            rel2.relative: 0.05 0.975;
-            color: 51 153 255 255;
-         }
-         description { state: "on_top" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            rel1.relative: 0.025 0.0;
-            rel1.offset: 1 0;
-            rel2.relative: 0.975 0.05;
-            color: 51 153 255 255;
-         }
-         description { state: "on_right" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            rel1.relative: 0.95 0.025;
-            rel1.offset: 0 1;
-            rel2.relative: 1.0 0.975;
-            color: 51 153 255 255;
-         }
-         description { state: "on_bottom" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            rel1.relative: 0.025 0.95;
-            rel1.offset: 1 0;
-            rel2.relative: 0.975 1.0;
-            color: 51 153 255 255;
-         }
-      }
       part { name: "e.swallow.icon"; type: SWALLOW;
          clip_to: "item_clip";
          mouse_events: 1;
          repeat_events: 1;
          description { state: "default" 0.0;
-            align: 0.5 0.5;
             rel1.to: "sizer";
+            rel1.offset: 3 3;
             rel2.to: "sizer";
+            rel2.offset: -4 -4;
          }
-         description { state: "on_left" 0.0;
-            inherit: "default" 0.0;
-            align: 1.0 0.5;
-            rel1.relative: 0.065 0.0;
-            rel1.offset: 1 1;
-            rel2.offset: -2 -1;
-         }
-         description { state: "on_top" 0.0;
-            inherit: "default" 0.0;
+      }
+      part { name: "indicator"; type: RECT;
+         clip_to: "item_clip";
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            visible: 0;
+            color: 51 153 255 255;
             align: 0.5 1.0;
-            rel1.relative: 0.0 0.065;
-            rel1.offset: 1 1;
-            rel2.offset: -1 -2;
+            max: 99999 5;
          }
-         description { state: "on_right" 0.0;
+         description { state: "left" 0.0;
             inherit: "default" 0.0;
             align: 0.0 0.5;
-            rel2.relative: 0.945 1.0;
-            rel1.offset: 2 1;
-            rel2.offset: -1 -1;
+            max: 5 99999;
+            rel2.relative: 0.5 1.0;
          }
-         description { state: "on_bottom" 0.0;
+         description { state: "top" 0.0;
             inherit: "default" 0.0;
             align: 0.5 0.0;
-            rel2.relative: 1.0 0.945;
-            rel1.offset: 1 2;
-            rel2.offset: -1 -1;
+            rel2.relative: 1.0 0.5;
+         }
+         description { state: "right" 0.0;
+            inherit: "default" 0.0;
+            align: 1.0 0.5;
+            max: 5 99999;
+            rel1.relative: 0.5 0.0;
+         }
+         description { state: "bottom" 0.0;
+            inherit: "default" 0.0;
+            align: 0.5 1.0;
+            rel1.relative: 0.0 0.5;
+
+         }
+         description { state: "on_left" 0.0;
+            inherit: "left" 0.0;
+            visible: 1;
+         }
+         description { state: "on_top" 0.0;
+            inherit: "top" 0.0;
+            visible: 1;
+         }
+         description { state: "on_right" 0.0;
+            inherit: "right" 0.0;
+            visible: 1;
+         }
+         description { state: "on_bottom" 0.0;
+            inherit: "bottom" 0.0;
+            visible: 1;
          }
       }
       part { name: "obackground"; type: RECT;
@@ -236,63 +217,62 @@ group { name: "e/gadget/luncher/icon";
          target: "item_clip";
          transition: DECELERATE 0.1;
       }
-      program { name: "icon_on_left";
+      program { name: "sel_left";
          signal: "e,state,on,left"; source: "e";
-         action: STATE_SET "on_left" 0.0;
+         action: STATE_SET "left" 0.0;
          target: "indicator";
-         target: "e.swallow.icon";
-         transition: ACCELERATE 0.1;
+         after: "on_left";
       }
-      program { name: "icon_on_top";
+      program { name: "sel_top";
          signal: "e,state,on,top"; source: "e";
-         action: STATE_SET "on_top" 0.0;
+         action: STATE_SET "top" 0.0;
          target: "indicator";
-         target: "e.swallow.icon";
-         transition: ACCELERATE 0.1;
+         after: "on_top";
       }
-      program { name: "icon_on_right";
+      program { name: "sel_right";
          signal: "e,state,on,right"; source: "e";
-         action: STATE_SET "on_right" 0.0;
+         action: STATE_SET "right" 0.0;
          target: "indicator";
-         target: "e.swallow.icon";
-         transition: ACCELERATE 0.1;
+         after: "on_right";
       }
-      program { name: "icon_on_bottom";
+      program { name: "sel_bottom";
          signal: "e,state,on,bottom"; source: "e";
-         action: STATE_SET "on_bottom" 0.0;
+         action: STATE_SET "bottom" 0.0;
          target: "indicator";
-         target: "e.swallow.icon";
-         transition: ACCELERATE 0.1;
+         after: "on_bottom";
       }
-      program { name: "icon_off_left";
-         signal: "e,state,off,left"; source: "e";
+      program { name: "on_left";
          action: STATE_SET "on_left" 0.0;
-         target: "e.swallow.icon";
-         transition: ACCELERATE 0.1;
+         transition: DECELERATE 0.2;
+         target: "indicator";
       }
-      program { name: "icon_off_top";
-         signal: "e,state,off,top"; source: "e";
+      program { name: "on_top";
          action: STATE_SET "on_top" 0.0;
-         target: "e.swallow.icon";
-         transition: ACCELERATE 0.1;
+         transition: DECELERATE 0.2;
+         target: "indicator";
       }
-      program { name: "icon_off_right";
-         signal: "e,state,off,right"; source: "e";
+      program { name: "on_right";
          action: STATE_SET "on_right" 0.0;
-         target: "e.swallow.icon";
-         transition: ACCELERATE 0.1;
+         transition: DECELERATE 0.2;
+         target: "indicator";
       }
-      program { name: "icon_off_bottom";
-         signal: "e,state,off,bottom"; source: "e";
+      program { name: "on_bottom";
          action: STATE_SET "on_bottom" 0.0;
-         target: "e.swallow.icon";
-         transition: DECELERATE 0.1;
+         transition: DECELERATE 0.2;
+         target: "indicator";
       }
-      program { name: "icon_off";
+      program {
+         signal: "e,state,off,*"; source: "e";
+         action: ACTION_STOP;
+         target: "sel_left";
+         target: "sel_top";
+         target: "sel_right";
+         target: "sel_bottom";
+      }
+      program {
          signal: "e,state,off,*"; source: "e";
          action: STATE_SET "default" 0.0;
-         target: "indicator";        
-         transition: DECELERATE 0.1;
+         target: "indicator";
       }
       program { name: "urgent";
          signal: "e,state,urgent"; source: "e";

data/elementary/themes/edc/menu.edc

@@ -1,45 +1,25 @@
 group { name: "e/widgets/menu/default/background";
-   images.image: "vgrad_med_lighter.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "shine.png" COMP;
    parts {
       part { name: "base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            rel1.relative: 0.0 1.0;
-            rel1.to_y: "top";
-            color_class: "menu_base";
             color: 64 64 64 255;
          }
       }
-      part { name: "top"; mouse_events: 0;
+      part { name: "clip"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "vgrad_med_lighter.png";
-            rel2.to_y: "e.text.title";
-            rel2.offset: -1 0;
-            min: 0 23;
-            align: 0.0 0.0;
-            fill.smooth: 0;
-            TILED_HORIZ(120)
-            fixed: 0 1;
-            color_class: "menu_base";
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            min: 0 0;
-            rel2.offset: -1 1;
+            rel1.to: "base";
+            rel2.to: "base";
          }
       }
       part { name: "e.text.title"; type: TEXT; mouse_events: 0;
          scale: 1;
-         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
             rel1.relative: 0.0 0.0;
             rel1.offset: 1 0;
             rel2.relative: 1.0 0.0;
             rel2.offset: -2 -1;
             align: 0.5 0.0;
-            color_class: "menu_title";
-            color3: 255 255 255 255;
+            color: 255 255 255 255;
             max: 0 0;
             text { font: FNBD; size: 10;
                text_class: "menu_title";
@@ -59,36 +39,15 @@ group { name: "e/widgets/menu/default/background";
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
+         clip_to: "clip";
          description { state: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel1.offset: 0 3;
-            rel1.to_y: "bevel";
-            rel2.offset: -1 -4;
+            rel1.to_y: "base";
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
             rel1.relative: 0.0 1.0;
-            rel1.offset: 0 0;
-            rel1.to_y: "top";
-         }
-      }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "shine"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel1.to: "top";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "top";
-            FIXED_SIZE(69, 5)
+            rel1.offset: 0 5;
+            rel1.to_y: "e.text.title";
          }
       }
    }
@@ -96,14 +55,12 @@ group { name: "e/widgets/menu/default/background";
       program {
          signal: "e,action,show,title"; source: "e";
          action: STATE_SET "active" 0.0;
-         target: "top";
          target: "e.text.title";
          target: "e.swallow.content";
       }
       program {
          signal: "e,action,hide,title"; source: "e";
          action: STATE_SET "default" 0.0;
-         target: "top";
          target: "e.text.title";
          target: "e.swallow.content";
       }
@@ -113,13 +70,12 @@ group { name: "e/widgets/menu/default/background";
 group { name: "e/widgets/menu/default/separator";
    images.image: "separator_horiz.png" COMP;
    parts {
-      part { name: "base";
+      part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            image.normal: "separator_horiz.png";
-            rel1.offset: 0 2;
-            rel2.offset: -1 -3;
-            min: 0 2;
-            fill.smooth: 0;
+            rel1.offset: 0 10;
+            rel2.offset: -1 -11;
+            min: 0 1;
+            color: 72 72 72 255;
          }
       }
    }
@@ -127,30 +83,10 @@ group { name: "e/widgets/menu/default/separator";
 
 group { name: "e/widgets/menu/default/item_bg";
    alias: "e/widgets/menu/default/submenu_bg";
-   images.image: "shadow_rounded_horiz.png" COMP;
-   images.image: "vgrad_med_dark.png" COMP;
-   images.image: "bevel_horiz_out.png" COMP;
-   images.image: "shine.png" COMP;
    parts {
-      part { name: "shadow"; mouse_events: 0;
+      part { name: "base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "shadow_rounded_horiz.png";
-            image.border: 0 0 9 9;
-            rel1.offset: 0 -4;
-            rel2.offset: -1 5;
-            fill.smooth: 0;
-            visible: 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "base"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "vgrad_med_dark.png";
-            fill.smooth: 0;
-            TILED_HORIZ(120)
+            color: 40 40 40 255;
             visible: 0;
          }
          description { state: "active" 0.0;
@@ -161,37 +97,9 @@ group { name: "e/widgets/menu/default/item_bg";
       part { name: "e.swallow.content"; type: SWALLOW;
          description { state: "default" 0.0;
             rel1.relative: 0.0 0.0;
-            rel1.offset: 3 3;
-            rel2.offset: -3 -4;
-         }
-      }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_horiz_out.png";
-            image.border: 0 0 2 2;
-            image.middle: 0;
-            fill.smooth: 0;
-            visible: 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "shine"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel1.to: "base";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            rel2.to: "base";
-            FIXED_SIZE(69, 5)
-            visible: 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            min: 0 17;
          }
       }
       part { name: "events"; type: RECT;
@@ -204,18 +112,12 @@ group { name: "e/widgets/menu/default/item_bg";
       program {
          signal: "e,state,selected"; source: "e";
          action: STATE_SET "active" 0.0;
-         target: "shadow";
          target: "base";
-         target: "bevel";
-         target: "shine";
       }
       program {
          signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
-         target: "shadow";
          target: "base";
-         target: "bevel";
-         target: "shine";
       }
    }
 }
@@ -227,7 +129,7 @@ group { name: "e/widgets/menu/default/icon";
             color: 255 255 255 255;
          }
          description { state: "disabled" 0.0;
-            color: 255 255 255 128;
+            color: 255 255 255 40;
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
@@ -235,8 +137,8 @@ group { name: "e/widgets/menu/default/icon";
          scale: 1;
          description { state: "default" 0.0;
             min: 16 16;
-            rel1.offset: 2 2;
-            rel2.offset: -3 -3;
+            rel1.offset: 4 2;
+            rel2.offset: -5 -3;
          }
       }
    }
@@ -262,13 +164,12 @@ group { name: "e/widgets/menu/default/label";
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 5 -1;
-            rel2.offset: -4 -1;
-            color_class: "menu_item";
-            color3: 255 255 255 255;
+            rel1.offset: 4 -1;
+            rel2.offset: -5 -1;
+            color: 160 160 160 255;
+            min: 0 16;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
@@ -278,62 +179,11 @@ group { name: "e/widgets/menu/default/label";
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            visible: 0;
+            color: 255 255 255 255;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            visible: 0;
-         }
-      }
-      part { name: "label2"; type: TEXT; mouse_events: 0;
-         effect: SHADOW BOTTOM;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "e.text.label";
-            rel2.to: "e.text.label";
-            color_class: "menu_item_disabled";
-            color3: 255 255 255 255;
-            text { font: FN; size: 10;
-               text_source: "e.text.label";
-               align: 0.0 0.5;
-               text_class: "menu_item";
-            }
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-      }
-      part { name: "label3"; type: TEXT; mouse_events: 0;
-         effect: GLOW;
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.offset: -2 -3;
-            rel1.to: "e.text.label";
-            rel2.offset: 2 1;
-            rel2.to: "e.text.label";
-            color_class: "menu_item_active";
-            color2: 255 255 255 255;
-            color3: 255 255 255 255;
-            text { font: FN; size: 10;
-               text_source: "e.text.label";
-               align: 0.0 0.5;
-               text_class: "menu_item";
-            }
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-         }
-         description { state: "disabled" 0.0;
-            inherit: "default" 0.0;
-            visible: 0;
+            color: 96 96 96 255;
          }
       }
    }
@@ -342,63 +192,40 @@ group { name: "e/widgets/menu/default/label";
          signal: "e,state,selected"; source: "e";
          action: STATE_SET "selected" 0.0;
          target: "e.text.label";
-         target: "label2";
-         target: "label3";
       }
       program {
          signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.text.label";
-         target: "label2";
-         target: "label3";
       }
       program {
          signal: "e,state,enable"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.text.label";
-         target: "label2";
-         target: "label3";
       }
       program {
          signal: "e,state,disable"; source: "e";
          action: STATE_SET "disabled" 0.0;
          target: "e.text.label";
-         target: "label2";
-         target: "label3";
       }
    }
 }
 
 group { name: "e/widgets/menu/default/submenu";
-   images.image: "sym_right_light_normal.png" COMP;
-   images.image: "sym_right_glow_normal.png" COMP;
-   images.image: "vertical_separated_bar_glow.png" COMP;
+   images.image: "menu_submenu.png" COMP;
    parts {
       part { name: "base";
          description { state: "default" 0.0;
-            image.normal: "sym_right_light_normal.png";
-            rel2.offset: -2 -1;
+            image.normal: "menu_submenu.png";
+            rel1.offset: 4 0;
+            rel2.offset: -5 -1;
             min: 15 15;
             max: 15 15;
+            color: 160 160 160 255;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            image.normal: "sym_right_glow_normal.png";
-         }
-      }
-      part { name: "bar"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.relative: 1.0 0.0;
-            rel1.offset: -10 -8;
-            rel2.offset: 4 7;
-            image.normal: "vertical_separated_bar_glow.png";
-            image.border: 7 7 7 7;
-            fill.smooth: 0;
-            visible: 0;
-         }
-         description { state: "selected" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
+            color: 255 255 255 255;
          }
       }
    }
@@ -407,125 +234,142 @@ group { name: "e/widgets/menu/default/submenu";
          signal: "e,state,selected"; source: "e";
          action: STATE_SET "selected" 0.0;
          target: "base";
-         target: "bar";
       }
       program {
          signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "base";
-         target: "bar";
       }
    }
 }
 
 group { name: "e/widgets/menu/default/check";
-   images.image: "inset_shadow_tiny.png" COMP;
-   images.image: "bevel_in.png" COMP;
-   images.image: "sym_check_alum.png" COMP;
+   images.image: "check.png" COMP;
    parts {
-      part { name: "base"; type: RECT;
-         description { state: "default" 0.0;
-            rel1.offset: 1 1;
-            rel1.to: "inset";
-            rel2.offset: -2 -2;
-            rel2.to: "inset";
-            color: 24 24 24 255;
+      part { name: "bg"; type: RECT;
+         description { state: "default";
+            color: 0 0 0 64;
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            rel1.offset: 4 0;
+            rel2.offset: -5 -1;
          }
       }
-      part { name: "shadow"; mouse_events: 0;
+      part { name: "base";
+         clip_to: "selected";
          description { state: "default" 0.0;
-            image.normal: "inset_shadow_tiny.png";
-            rel1.to: "base";
-            rel2.to: "base";
-         }
-      }
-      part { name: "inset"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
+            image.normal: "check.png";
+            rel1.offset: 4 0;
+            rel2.offset: -5 -1;
             min: 13 13;
             max: 13 13;
-         }
-      }
-      part { name: "indicator"; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "sym_check_alum.png";
-            min: 11 11;
-            max: 11 11;
             visible: 0;
          }
-         description { state: "selected" 0.0;
+         description { state: "on" 0.0;
             inherit: "default" 0.0;
             visible: 1;
          }
       }
+      part { name: "selected"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            color: 160 160 160 255;
+         }
+         description { state: "selected" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+         }
+      }
    }
    programs {
-//      program {
-//         signal: "e,state,selected"; source: "e";
-//      }
-//      program {
-//         signal: "e,state,unselected"; source: "e";
-//      }
+      program {
+         signal: "e,state,selected"; source: "e";
+         action: STATE_SET "selected" 0.0;
+         target: "selected";
+      }
+      program {
+         signal: "e,state,unselected"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "selected";
+      }
       program {
          signal: "e,state,on"; source: "e";
-         action: STATE_SET "selected" 0.0;
-         target: "indicator";
+         action: STATE_SET "on" 0.0;
+         target: "base";
       }
       program {
          signal: "e,state,off"; source: "e";
          action: STATE_SET "default" 0.0;
-         target: "indicator";
+         target: "base";
       }
    }
 }
 
 group { name: "e/widgets/menu/default/radio";
-   images.image: "inset_shadow_circle_tiny.png" COMP;
-   images.image: "sym_radio_alum.png" COMP;
+   images.image: "radio.png" COMP;
    parts {
-      part { name: "base";
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow_circle_tiny.png";
-            min: 13 13;
-            max: 13 13;
-         }
-      }
-      part { name: "indicator"; mouse_events: 0;
+      part { name: "bg";
          description { state: "default" 0.0;
+            image.normal: "radio.png";
             rel1.to: "base";
             rel2.to: "base";
-            image.normal: "sym_radio_alum.png";
-            min: 11 11;
-            max: 11 11;
+            color: 0 0 0 64;
+            visible: 1;
+         }
+         description { state: "on" 0.0;
+            inherit: "default" 0.0;
             visible: 0;
          }
-         description { state: "selected" 0.0;
+      }
+      part { name: "base";
+         clip_to: "selected";
+         description { state: "default" 0.0;
+            image.normal: "radio.png";
+            rel1.offset: 4 0;
+            rel2.offset: -5 -1;
+            min: 13 13;
+            max: 13 13;
+            visible: 0;
+         }
+         description { state: "on" 0.0;
             inherit: "default" 0.0;
             visible: 1;
          }
       }
+      part { name: "selected"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            color: 160 160 160 255;
+         }
+         description { state: "selected" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+         }
+      }
    }
    programs {
-//      program {
-//         signal: "e,state,selected"; source: "e";
-//      }
-//      program {
-//         signal: "e,state,unselected"; source: "e";
-//      }
+      program {
+         signal: "e,state,selected"; source: "e";
+         action: STATE_SET "selected" 0.0;
+         target: "selected";
+      }
+      program {
+         signal: "e,state,unselected"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "selected";
+      }
       program {
          signal: "e,state,on"; source: "e";
-         action: STATE_SET "selected" 0.0;
-         target: "indicator";
+         action: STATE_SET "on" 0.0;
+         target: "base";
+         target: "bg";
       }
       program {
          signal: "e,state,off"; source: "e";
          action: STATE_SET "default" 0.0;
-         target: "indicator";
+         target: "base";
+         target: "bg";
       }
    }
 }

data/elementary/themes/edc/mixer.edc

@@ -2,10 +2,8 @@ group { name: "e/modules/mixer/main";
    alias: "e/gadget/mixer/main";
    alias: "e/gadget/mixer/main_vert";
    images.image: "speaker.png" COMP;
-   images.image: "inset_round_hilight.png" COMP;
-   images.image: "inset_round_shadow.png" COMP;
-   images.image: "inset_round_shading.png" COMP;
-   images.image: "led_dot_white.png" COMP;
+   images.image: "speaker_clip.png" COMP;
+   images.image: "speaker_vol.png" COMP;
    max: 160 160;
    min: 16 16;
    script {
@@ -16,110 +14,34 @@ group { name: "e/modules/mixer/main";
             m = getarg(2);
             l = getarg(3);
             r = getarg(4);
-            
+
             if (m) {
                run_program(PROGRAM:"mute");
             } else {
                run_program(PROGRAM:"unmute");
             }
-            
-            if (l <= 0) {
-               run_program(PROGRAM:"l0-off");
-               run_program(PROGRAM:"l1-off");
-               run_program(PROGRAM:"l2-off");
-               run_program(PROGRAM:"l3-off");
-               run_program(PROGRAM:"l4-off");
-            } else if (l <= 20) {
-               run_program(PROGRAM:"l0-on");
-               run_program(PROGRAM:"l1-off");
-               run_program(PROGRAM:"l2-off");
-               run_program(PROGRAM:"l3-off");
-               run_program(PROGRAM:"l4-off");
-            } else if (l <= 40) {
-               run_program(PROGRAM:"l0-on");
-               run_program(PROGRAM:"l1-on");
-               run_program(PROGRAM:"l2-off");
-               run_program(PROGRAM:"l3-off");
-               run_program(PROGRAM:"l4-off");
-            } else if (l <= 60) {
-               run_program(PROGRAM:"l0-on");
-               run_program(PROGRAM:"l1-on");
-               run_program(PROGRAM:"l2-on");
-               run_program(PROGRAM:"l3-off");
-               run_program(PROGRAM:"l4-off");
-            } else if (l <= 80) {
-               run_program(PROGRAM:"l0-on");
-               run_program(PROGRAM:"l1-on");
-               run_program(PROGRAM:"l2-on");
-               run_program(PROGRAM:"l3-on");
-               run_program(PROGRAM:"l4-off");
-            } else {
-               run_program(PROGRAM:"l0-on");
-               run_program(PROGRAM:"l1-on");
-               run_program(PROGRAM:"l2-on");
-               run_program(PROGRAM:"l3-on");
-               run_program(PROGRAM:"l4-on");
-            }
 
-            if (r <= 0) {
-               run_program(PROGRAM:"r0-off");
-               run_program(PROGRAM:"r1-off");
-               run_program(PROGRAM:"r2-off");
-               run_program(PROGRAM:"r3-off");
-               run_program(PROGRAM:"r4-off");
-            } else if (r <= 20) {
-               run_program(PROGRAM:"r0-on");
-               run_program(PROGRAM:"r1-off");
-               run_program(PROGRAM:"r2-off");
-               run_program(PROGRAM:"r3-off");
-               run_program(PROGRAM:"r4-off");
-            } else if (r <= 40) {
-               run_program(PROGRAM:"r0-on");
-               run_program(PROGRAM:"r1-on");
-               run_program(PROGRAM:"r2-off");
-               run_program(PROGRAM:"r3-off");
-               run_program(PROGRAM:"r4-off");
-            } else if (r <= 60) {
-               run_program(PROGRAM:"r0-on");
-               run_program(PROGRAM:"r1-on");
-               run_program(PROGRAM:"r2-on");
-               run_program(PROGRAM:"r3-off");
-               run_program(PROGRAM:"r4-off");
-            } else if (r <= 80) {
-               run_program(PROGRAM:"r0-on");
-               run_program(PROGRAM:"r1-on");
-               run_program(PROGRAM:"r2-on");
-               run_program(PROGRAM:"r3-on");
-               run_program(PROGRAM:"r4-off");
-            } else {
-               run_program(PROGRAM:"r0-on");
-               run_program(PROGRAM:"r1-on");
-               run_program(PROGRAM:"r2-on");
-               run_program(PROGRAM:"r3-on");
-               run_program(PROGRAM:"r4-on");
-            }
+            custom_state(PART:"vol-l", "default", 0.0);
+            set_state_val(PART:"vol-l", STATE_REL1,
+                          (float(100 - l) * 0.5) / 100.0,
+                          (float(100 - l) * 1.0) / 100.0);
+            set_state_val(PART:"vol-l", STATE_REL2,
+                          0.5 + ((float(l) * 0.5) / 100.0),
+                          1.0);
+            set_state(PART:"vol-l", "custom", 0.0);
+
+            custom_state(PART:"vol-r", "default", 0.0);
+            set_state_val(PART:"vol-r", STATE_REL1,
+                          (float(100 - r) * 0.5) / 100.0,
+                          (float(100 - r) * 1.0) / 100.0);
+            set_state_val(PART:"vol-r", STATE_REL2,
+                          0.5 + ((float(r) * 0.5) / 100.0),
+                          1.0);
+            set_state(PART:"vol-r", "custom", 0.0);
          }
       }
    }
    parts {
-      part { name: "base-sh";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel1.offset: 0 -1;
-            rel2.to: "base";
-            rel2.offset: -1 -2;
-            image.normal: "inset_round_shadow.png";
-         }
-      }
-      part { name: "base-hi";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel1.offset: 0 1;
-            rel2.to: "base";
-            rel2.offset: -1 0;
-            image.normal: "inset_round_hilight.png";
-         }
-      }
       part { name: "base";
          description { state: "default" 0.0;
             rel1.relative: (25/380) (25/380);
@@ -130,8 +52,6 @@ group { name: "e/modules/mixer/main";
       }
       part { name: "state"; type: RECT;
          description { state: "default" 0.0;
-            rel1.relative: -1.0 -1.0;
-            rel2.relative: 2.0 2.0;
             color: 51 153 255 255;
          }
          description { state: "mute" 0.0;
@@ -139,51 +59,53 @@ group { name: "e/modules/mixer/main";
             color: 255 153 51 255;
          }
       }
-#define LED(_NAME, _BASE, _X, _SIZE) \
-      part { name: _NAME; type: RECT; \
-         clip_to: "state"; \
-         description { state: "default" 0.0; \
-            fixed: 1 1; \
-            rel1.relative: ((_BASE+(_X*8))/160) (80/160); \
-            rel2.relative: ((_BASE+(_X*8))/160) (80/160); \
-            min: 1 1; \
-            max: 1 1; \
-            visible: 0; \
-            color: 255 255 255 0; \
-         } \
-         description { state: "active" 0.0; \
-            inherit: "default" 0.0; \
-            visible: 1; \
-            color: 255 255 255 255; \
-         } \
-      } \
-      part { name: _NAME"g"; \
-         clip_to: "state"; \
-         description { state: "default" 0.0; \
-            rel1.to: _NAME; \
-            rel2.to: _NAME; \
-            image.normal: "led_dot_white.png"; \
-            min: _SIZE _SIZE; \
-            visible: 0; \
-            color: 255 255 255 0; \
-         } \
-         description { state: "active" 0.0; \
-            inherit: "default" 0.0; \
-            visible: 1; \
-            color: 255 255 255 255; \
-         } \
+      part { name: "state-l"; type: RECT;
+         clip_to: "state";
+         description { state: "default" 0.0;
+            rel1.relative: 0.0 0.0;
+            rel2.relative: 0.5 1.0;
+         }
+      }
+      part { name: "state-r"; type: RECT;
+         clip_to: "state";
+         description { state: "default" 0.0;
+            rel1.relative: 0.5 0.0;
+            rel2.relative: 1.0 1.0;
+         }
+      }
+      part { name: "vclip-l";
+         clip_to: "state-l";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            image.normal: "speaker_clip.png";
+         }
+      }
+      part { name: "vclip-r";
+         clip_to: "state-r";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            image.normal: "speaker_clip.png";
+         }
+      }
+      part { name: "vol-l";
+         clip_to: "vclip-l";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            image.normal: "speaker_vol.png";
+         }
+      }
+      part { name: "vol-r";
+         clip_to: "vclip-r";
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
+            rel2.offset: 0 0;
+            image.normal: "speaker_vol.png";
+         }
       }
-      LED("r0", 99,  0,  1)
-      LED("r1", 99,  1,  9)
-      LED("r2", 99,  2, 15)
-      LED("r3", 99,  3, 21)
-      LED("r4", 99,  4, 27)
-      LED("l0", 61,  0,  1)
-      LED("l1", 61, -1,  9)
-      LED("l2", 61, -2, 15)
-      LED("l3", 61, -3, 21)
-      LED("l4", 61, -4, 27)
-#undef LED
       part { name: "over"; type: RECT;
          description { state: "default" 0.0;
             color: 255 255 255 0;
@@ -201,28 +123,6 @@ group { name: "e/modules/mixer/main";
          transition: LINEAR 0.2;
          target: "state";
       }
-#define PROG(_NAME) \
-      program { name: _NAME"-on"; \
-         action: STATE_SET "active" 0.0; \
-         target: _NAME; \
-         target: _NAME"g"; \
-      } \
-      program { name: _NAME"-off"; \
-         action: STATE_SET "default" 0.0; \
-         target: _NAME; \
-         target: _NAME"g"; \
-      }
-      PROG("r0")
-      PROG("r1")
-      PROG("r2")
-      PROG("r3")
-      PROG("r4")
-      PROG("l0")
-      PROG("l1")
-      PROG("l2")
-      PROG("l3")
-      PROG("l4")
-#undef PROG
    }
 }
 

data/elementary/themes/edc/music_control.edc

@@ -1,12 +1,16 @@
 group { name: "e/modules/music-control/icon";
    alias: "modules/music-control/icon";
-   max: 24 24;
-   images.image: "music_control_icon.png" COMP;
+   max: 160 160;
+   set { name: "efm_drive_cd_icon";
+      image { image: "efm_drive_cd_160.png" COMP; size: 81 81 16000 16000; }
+      image { image: "efm_drive_cd_080.png" COMP; size: 41 41 80 80; }
+      image { image: "efm_drive_cd_040.png" COMP; size: 0 0 40 40; }
+   }
    parts {
       part { name: "image"; mouse_events: 0;
          description { state: "default" 0.0;
             aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "music_control_icon.png";
+            image.normal: "efm_drive_cd_icon";
          }
       }
    }
@@ -14,12 +18,16 @@ group { name: "e/modules/music-control/icon";
 
 group { name: "e/modules/music-control/main";
    alias: "modules/music-control/main";
-   images.image: "music_control_icon.png" COMP;
+   set { name: "efm_drive_cd_icon";
+      image { image: "efm_drive_cd_160.png" COMP; size: 81 81 16000 16000; }
+      image { image: "efm_drive_cd_080.png" COMP; size: 41 41 80 80; }
+      image { image: "efm_drive_cd_040.png" COMP; size: 0 0 40 40; }
+   }
    parts {
       part { name: "icon";
          description { state: "default" 0.0;
             aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "music_control_icon.png";
+            image.normal: "efm_drive_cd_icon";
          }
       }
    }
@@ -30,16 +38,16 @@ group { name: "e/modules/music-control/popup";
 #ifdef SKIP_NAMESPACE_VALIDATION
    skip_namespace_validation: 1;
 #endif
-   min: 150 50;
-   images.image: "icon_prev.png" COMP;
-   images.image: "icon_next.png" COMP;
-   images.image: "icon_pause.png" COMP;
-   images.image: "icon_play.png" COMP;
+   min: 160 160;
+   images.image: "icon_prev_mono.png" COMP;
+   images.image: "icon_next_mono.png" COMP;
+   images.image: "icon_pause_mono.png" COMP;
+   images.image: "icon_play_mono.png" COMP;
    styles {
       style { name: "music_control_metadata_style";
-         base: "font="FN" font_size=10 align=left text_class=tb_plain color=#ffff style=shadow,bottom shadow_color=#00000080";
-         tag: "title" "+ font_size=12 font="FNBD" text_class=tb_big";
-         tag: "tag" "+ font_size=8 color=#888f";
+         base: "font="FN" font_size=10 align=left text_class=tb_plain color=#eee";
+         tag: "title" "+ font_size=10 font="FNBD" text_class=tb_big color=#fff";
+         tag: "tag" "+ font_size=8 color=#33399ff";
          tag: "br" "\n";
       }
    }
@@ -54,77 +62,128 @@ group { name: "e/modules/music-control/popup";
       alias: "cover_swallow" "e.cover_swallow";
       part { name: "cover_bg";
          description { state: "default" 0;
-            min: 90 90;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 0.35 1.0;
-            image.normal: "music_control_icon.png";
+            rel1.relative: 0.25 0.25;
+            rel2.relative: 0.75 0.75;
+            image.normal: "efm_drive_cd_icon";
          }
       }
       part { name: "e.cover_swallow"; type: SWALLOW;
+         scale: 1;
          description { state: "default" 0;
-            rel1.to: "cover_bg";
-            rel2.to: "cover_bg";
+            rel1.offset: -4 -4;
+            rel2.offset: 3 3;
+            offscale;
+         }
+      }
+      part { name: "player_name_back"; type: RECT;
+         scale: 1;
+         description { state: "default" 0;
+            color: 0 0 0 128;
+            rel1.offset: -4 -4;
+            rel2.offset: 3 3;
+            rel2.to_y: "player_name";
+            offscale;
          }
       }
       part { name: "player_name"; type: TEXT;
-         effect: GLOW;
+         scale : 1;
          description { state: "default" 0;
-            color: FN_COL_HIGHLIGHT;
-            text.size: 12;
+            align: 0.5 0.0;
+            color: 255 255 255 255;
+            text.size: 10;
             text.text: "Music player";
+            text.min: 0 1;
             text.font: FNBD;
-            rel1.to: "cover_bg";
-            rel1.relative: 1.0 0.0;
+            rel1.relative: 0.0 0.0;
             rel2.relative: 1.0 0.0;
-            rel2.offset: 0 12;
+            rel1.offset: 8 0;
+            rel2.offset: -9 0;
+            offscale;
          }
       }
       part { name: "metadata"; type: TEXTBLOCK;
+         scale : 1;
          description { state: "default" 0;
+            align: 0.5 0.0;
             text {
                style: "music_control_metadata_style";
                text: "Song Title";
                align: 0.0 0.0;
+               min: 0 0;
+               ellipsis: 0.0;
             }
-            rel1.to: "player_name";
+            rel1.to_y: "player_name";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 3 0;
+            rel1.offset: 8 8;
+            rel2.offset: -9 8;
+            offscale;
          }
       }
-      part { name: "previous_btn";
+      part { name: "btn_back"; type: RECT;
+         scale: 1;
          description { state: "default" 0;
-            max: 32 32;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            align: 0.1 1.0;
-            rel1.relative: 0.35 0.0;
-            image.normal: "icon_prev.png";
+            color: 0 0 0 128;
+            rel1.to_y: "previous_btn";
+            rel1.offset: -4 -4;
+            rel2.offset: 3 3;
+            offscale;
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            color: 0 0 0 220;
          }
       }
       part { name: "play_btn";
+         scale: 1;
          description { state: "default" 0;
-            max: 32 32;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
+            fixed: 1 1;
+            min: 20 20;
+            max: 20 20;
             align: 0.5 1.0;
-            rel1.relative: 0.35 0.0;
-            image.normal: "icon_pause.png";
+            image.normal: "icon_pause_mono.png";
          }
          description { state: "play" 0.0;
             inherit: "default" 0.0;
-            image.normal: "icon_play.png";
+            image.normal: "icon_play_mono.png";
+         }
+      }
+      part { name: "previous_btn";
+         scale: 1;
+         description { state: "default" 0;
+            fixed: 1 1;
+            min: 20 20;
+            max: 20 20;
+            rel.to: "play_btn";
+            rel1.relative: -1.0 0.0;
+            rel2.relative: 0.0  1.0;
+            image.normal: "icon_prev_mono.png";
          }
       }
       part { name: "next_btn";
+         scale: 1;
          description { state: "default" 0;
-            max: 32 32;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            align: 0.9 1.0;
-            rel1.relative: 0.35 0.0;
-            rel1.to: "player_name";
-            image.normal: "icon_next.png";
+            fixed: 1 1;
+            min: 20 20;
+            max: 20 20;
+            rel.to: "play_btn";
+            rel1.relative: 1.0 0.0;
+            rel2.relative: 2.0 1.0;
+            image.normal: "icon_next_mono.png";
          }
       }
    }
    programs {
+      program {
+         signal: "mouse,down,1"; source: "*_btn";
+         action: STATE_SET "pressed" 0.0;
+         target: "btn_back";
+      }
+      program {
+         signal: "mouse,up,1"; source: "*_btn";
+         action: STATE_SET "default" 0.0;
+         transition: DECELERATE 1.0;
+         target: "btn_back";
+      }
       program {
          signal: "mouse,clicked,*"; source: "previous_btn";
          action: SIGNAL_EMIT "btn,clicked" "previous";

data/elementary/themes/edc/notification.edc

@@ -1,75 +1,98 @@
 group { name: "e/modules/notification/logo";
-   images.image: "glow_exclam.png" COMP;
+   images.image: "exclam.png" COMP;
    parts {
-      part { name: "base"; mouse_events: 0;
+      part { name: "spacer"; type: SPACER;
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "glow_exclam.png";
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            min: 48 48;
             max: 48 48;
-            aspect: 1.0 1.0;
+         }
+      }
+      part { name: "base"; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            image.normal: "exclam.png";
+            aspect: (56/160) (56/160); aspect_preference: BOTH;
+            fixed: 1 1;
          }
       }
    }
 }
 
-group { name: "notification/main";
-   alias: "e/modules/notification/main";
-   images.image: "darken_square.png" COMP;
-   images.image: "sym_close_light_normal.png" COMP;
-   images.image: "sym_close_light_selected.png" COMP;
+group { name: "e/modules/notification/main";
+   images.image: "border_close.png" COMP;
+   images.image: "win_shadow.png" COMP;
    data.item: "app_icon_max" "48 48";
-   data.item: "shaped" "1";
-   styles {   
-      style { name: "notification_style_nowrap";
-         base: "font="FN" font_size=10 align=left color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=none text_class=notification_body";
-         tag:  "subject"  "+ text_class=module_large style=glow color=#3399ffff glow_color=#3399ff18 align=center glow2_color=#3399ff12";
-         tag:  "body"  "+ text_class=module_normal";
-         tag:  "br" "\n";
-         tag:  "ps" "ps";
-         tag:  "b" "+ font="FNBD" text_class=module_bold";
-         tag:  "i" "+ font="FNIT" text_class=module_italic";
-         tag:  "u" "+ underline=on underline_color=#3399ffff";
-         tag:  "img" ""; // images not supported
-         tag:  "a" ""; // links not supported
-      }
+   styles {
       style { name: "notification_style";
-         base: "font="FN" font_size=10 align=left color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word text_class=notification_body";
-         tag:  "subject"  "+ text_class=module_large style=glow color=#3399ffff glow_color=#3399ff18 align=center glow2_color=#3399ff12";
+         base: "font="FN" font_size=10 align=left color=#a0a0a0ff wrap=word text_class=notification_body";
+         tag:  "subject"  "+ text_class=module_large color=#3399ffff align=center";
          tag:  "body"  "+ text_class=module_normal";
          tag:  "br" "\n";
          tag:  "ps" "ps";
-         tag:  "b" "+ font="FNBD" text_class=module_bold";
+         tag:  "b" "+ font="FNBD" text_class=module_bold color=#ffff";
          tag:  "i" "+ font="FNIT" text_class=module_italic";
          tag:  "u" "+ underline=on underline_color=#3399ffff";
          tag:  "img" ""; // images not supported
          tag:  "a" ""; // links not supported
       }
    }
-   
+
    parts {
-      alias: "e.event.close" "notification.event.close";
-      part { name: "base";
+      part { name: "rel1"; type: SPACER;
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "darken_square.png";
-            image.border: 6 6 6 6;
+            align: 0.0 0.0;
+            min: 32 32;
+            max: 32 32;
+         }
+      }
+      part { name: "rel2"; type: SPACER;
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 1.0 1.0;
+            min: 32 32;
+            max: 32 32;
+         }
+      }
+      part { name: "shadow"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel.to: "base";
+            WIN_SHADOW;
+         }
+      }
+      part { name: "base"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.to: "rel1";
+            rel1.relative: 1.0 1.0;
+            rel2.to: "rel2";
+            rel2.relative: 0.0 0.0;
+            color: 0 0 0 192;
          }
       }
       part { name: "titleclip"; type: RECT;
          description { state: "default" 0.0;
-            rel2.to_x: "e.event.close";
+            rel2.to_x: "notification.event.close";
             rel2.relative: 0.0 1.0;
          }
       }
       part { name: "bodyclip"; type: RECT;
          description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
             rel2.offset: -13 -13;
             min: 220 80;
          }
       }
       part { name: "notification.swallow.app_icon"; type: SWALLOW; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
             align: 0.0 0.5;
             aspect: 1.0 1.0;
             aspect_preference: BOTH;
+            rel1.to: "base";
+            rel2.to: "base";
             rel1.offset: 12 12;
             rel2.offset: 12 -13;
             rel2.relative: 0.0 1.0;
@@ -82,33 +105,54 @@ group { name: "notification/main";
          scale;
          description { state: "default" 0.0;
             align: 0.0 0.0;
-            min: 260 40;
+            rel1.to: "base";
+            rel2.to: "base";
             rel1.to_x: "notification.swallow.app_icon";
             rel1.to_y: "notification.text.title";
             rel1.relative: 1.0 1.0;
             rel1.offset: 4 4;
-            rel2.offset: -27 -11;
+            rel2.offset: -27 -13;
             text { style: "notification_style";
                min: 0 1;
             }
+            fixed: 1 1;
+         }
+      }
+      part { name: "message"; type: TEXTBLOCK; mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            align: 0.0 0.0;
+            min: 200 20;
+            max: 400 99999;
+            rel1.to: "base";
+            rel2.to: "base";
+            rel1.to_x: "notification.swallow.app_icon";
+            rel1.to_y: "notification.text.title";
+            rel1.relative: 1.0 1.0;
+            rel1.offset: 4 4;
+            rel2.offset: -27 -13;
+            text { style: "notification_style";
+               text_source: "notification.textblock.message";
+               min: 0 1;
+            }
+            visible: 0;
          }
       }
       part { name: "notification.text.title"; type: TEXT; mouse_events: 0;
          clip_to: "titleclip";
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
             rel1.to_x: "notification.swallow.app_icon";
             rel1.relative: 1.0 0.0;
             rel1.offset: 4 12;
             rel2.relative: 0.0 0.0;
-            rel2.to_x: "e.event.close";
+            rel2.to_x: "notification.event.close";
             rel2.offset: -5 12;
-            color: FN_COL_DEFAULT;
+            color: 255 255 255 255;
             align: 0.0 0.0;
-            color_class: "notification_title";
             text { font: FNBD; size: 10;
-               text: "title goes here blah blah";
                min: 0 1;
                align: 0.0 0.5;
                text_class: "notification_title";
@@ -116,23 +160,26 @@ group { name: "notification/main";
             fixed: 0 1;
          }
       }
+
       part { name: "close";
          description { state: "default" 0.0;
-            image.normal: "sym_close_light_normal.png";
-            rel1.to: "e.event.close";
-            rel2.to: "e.event.close";
+            image.normal: "border_close.png";
+            rel.to: "notification.event.close";
             min: 15 15;
             max: 15 15;
             fixed: 1 1;
+            color: 255 255 255 255;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
-            image.normal: "sym_close_light_selected.png";
+            color: 128 128 128 255;
          }
       }
       part { name: "notification.event.close"; type: RECT;
          scale: 1;
          description { state: "default" 0.0;
+            rel1.to: "base";
+            rel2.to: "base";
             rel1.relative: 1.0 0.0;
             rel1.offset: -13 12;
             rel2.relative: 1.0 0.0;

data/elementary/themes/edc/packagekit.edc

@@ -1,64 +1,76 @@
 group { name: "e/modules/packagekit/icon/bugfix";
-   images.image: "icon_spanner.png" COMP;
+   images.image: "pkg-bug.png" COMP;
    parts {
       part { name: "image";  mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "icon_spanner.png";
+            image.normal: "pkg-bug.png";
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            color: 51 153 255 255;
          }
       }
    }
 }
 
 group { name: "e/modules/packagekit/icon/enhancement";
-   images.image: "icon_arrow_up.png" COMP;
+   images.image: "pkg-enhance.png" COMP;
    parts {
       part { name: "image"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "icon_arrow_up.png";
+            image.normal: "pkg-enhance.png";
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            color: 153 255 51 255;
          }
       }
    }
 }
 
 group { name: "e/modules/packagekit/icon/important";
-   images.image: "icon_warning.png" COMP;
+   images.image: "pkg-important.png" COMP;
    parts {
       part { name: "image"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "icon_warning.png";
+            image.normal: "pkg-important.png";
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            color: 255 153 51 255;
          }
       }
    }
 }
 
 group { name: "e/modules/packagekit/icon/low";
-   images.image: "icon_splat_half.png" COMP;
+   images.image: "pkg-low.png" COMP;
    parts {
       part { name: "image"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "icon_splat_half.png";
+            image.normal: "pkg-low.png";
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            color: 255 255 255 128;
          }
       }
    }
 }
 
 group { name: "e/modules/packagekit/icon/normal";
-   images.image: "icon_splat.png" COMP;
+   images.image: "pkg-normal.png" COMP;
    parts {
       part { name: "image"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "icon_splat.png";
+            image.normal: "pkg-normal.png";
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            color: 255 255 255 128;
          }
       }
    }
 }
 
 group { name: "e/modules/packagekit/icon/security";
-   images.image: "icon_system-lock-screen.png" COMP;
+   images.image: "pkg-security.png" COMP;
    parts {
       part { name: "image"; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "icon_system-lock-screen.png";
+            image.normal: "pkg-security.png";
+            aspect: 1.0 1.0; aspect_preference: BOTH;
+            color: 255 255 255 255;
          }
       }
    }
@@ -66,56 +78,60 @@ group { name: "e/modules/packagekit/icon/security";
 
 group { name: "e/modules/packagekit/main";
    max: 160 160;
-   images.image: "packagekit_base.png" COMP;
-   images.image: "icon_check_flat.png" COMP;
-   images.image: "glow_exclam.png" COMP;
-   images.image: "glow_round_corners_small.png" COMP;
-   images.image: "knob_round_small_busy.png" COMP;
+   images.image: "pkg-base.png" COMP;
+   images.image: "pkg-ok.png" COMP;
+   images.image: "pkg-err.png" COMP;
+   images.image: "pkg-busy1.png" COMP;
+   images.image: "pkg-busy2.png" COMP;
+   images.image: "pkg-busy3.png" COMP;
+   images.image: "pkg-busy4.png" COMP;
    parts {
-      part { name: "base"; 
+      part { name: "base";
          description { state: "default" 0.0;
             aspect: 1.0 1.0; aspect_preference: BOTH;
-            image.normal: "packagekit_base.png";
-         }
-      }
-      part { name: "status"; 
-         description { state: "default" 0.0;
-            aspect: 1.0 1.0; aspect_preference: BOTH;
-            visible: 0;
-            rel1.relative: (36/160) (60/160);
-            rel2.relative: ((36+88)/160) ((60+88)/160);
-         }
-         description { state: "running" 0.0;
-            inherit: "default" 0.0;
-         }
-         description { state: "updates" 0.0;
-            inherit: "default" 0.0;
-         }
-         description { state: "updated" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            image.normal: "icon_check_flat.png";
-            color: 64 64 64 255;
-            max: 16 16;
-         }
-         description { state: "error" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            image.normal: "glow_exclam.png";
-            max: 16 16;
+            image.normal: "pkg-base.png";
          }
       }
       part { name: "num_updates"; type: TEXT;
          scale: 1;
-         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            rel1.relative: (36/160) (60/160);
-            rel2.relative: ((36+88)/160) ((60+88)/160);
-            color: FN_COL_DISABLE;
+            rel1.relative: (8/40) (8/40);
+            rel2.relative: (32/40) (32/40);
+            color: 255 255 255 255;
             text { font: FN; size: 10;
             }
          }
       }
+      part { name: "status";
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            visible: 0;
+         }
+         description { state: "running" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+         description { state: "updates" 0.0;
+            inherit: "default" 0.0;
+            visible: 0;
+         }
+         description { state: "updated" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            rel1.relative: (15/40) (15/40);
+            rel2.relative: (25/40) (25/40);
+            image.normal: "pkg-ok.png";
+            color: 255 255 255 255;
+         }
+         description { state: "error" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            rel1.relative: (15/40) (15/40);
+            rel2.relative: (25/40) (25/40);
+            image.normal: "pkg-err.png";
+            color: 255 255 255 255;
+         }
+      }
       part { name: "busy_clip"; type: RECT;
          description { state: "default" 0.0;
             color: 255 255 255 0;
@@ -127,46 +143,88 @@ group { name: "e/modules/packagekit/main";
             visible: 1;
          }
       }
-      part { name: "knob"; mouse_events: 0;
+      part { name: "busy1"; mouse_events: 0;
          clip_to: "busy_clip";
          description { state: "default" 0.0;
             fixed: 1 1;
-            image.normal: "knob_round_small_busy.png";
-            aspect: 1.0 1.0; aspect_preference: VERTICAL;
-            max: 20 20;
-            rel1.relative: (36/160) (60/160);
-            rel2.relative: ((36+88)/160) ((60+88)/160);
-         }
-      }
-      part { name: "knob_spinner"; mouse_events: 0;
-         clip_to: "busy_clip";
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            rel1.to: "knob";
-            rel2.to: "knob";
-            image.normal: "glow_round_corners_small.png";
+            image.normal: "pkg-busy1.png";
+            rel1.relative: (5/40) (5/40);
+            rel2.relative: (35/40) (35/40);
             map.on: 1;
             map.smooth: 1;
-            map.rotation.center: "knob";
+            map.rotation.center: "busy1";
          }
          description { state: "spin" 0.0;
             inherit: "default" 0.0;
             map.rotation.z: 360;
          }
       }
-      
+      part { name: "busy2"; mouse_events: 0;
+         clip_to: "busy_clip";
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            image.normal: "pkg-busy2.png";
+            rel1.relative: (5/40) (5/40);
+            rel2.relative: (35/40) (35/40);
+            map.on: 1;
+            map.smooth: 1;
+            map.rotation.center: "busy1";
+         }
+         description { state: "spin" 0.0;
+            inherit: "default" 0.0;
+            map.rotation.z: -360;
+         }
+      }
+      part { name: "busy3"; mouse_events: 0;
+         clip_to: "busy_clip";
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            image.normal: "pkg-busy3.png";
+            rel1.relative: (5/40) (5/40);
+            rel2.relative: (35/40) (35/40);
+            map.on: 1;
+            map.smooth: 1;
+            map.rotation.center: "busy1";
+         }
+         description { state: "spin" 0.0;
+            inherit: "default" 0.0;
+            map.rotation.z: 720;
+         }
+      }
+      part { name: "busy4"; mouse_events: 0;
+         clip_to: "busy_clip";
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            image.normal: "pkg-busy4.png";
+            rel1.relative: (5/40) (5/40);
+            rel2.relative: (35/40) (35/40);
+            map.on: 1;
+            map.smooth: 1;
+            map.rotation.center: "busy1";
+         }
+         description { state: "spin" 0.0;
+            inherit: "default" 0.0;
+            map.rotation.z: -720;
+         }
+      }
    }
    programs {
       program { name: "spin";
          signal: "e,state,hung"; source: "e";
          action: STATE_SET "spin" 0.0;
          transition: LINEAR 1.0;
-         target: "knob_spinner";
+         target: "busy1";
+         target: "busy2";
+         target: "busy3";
+         target: "busy4";
          after: "spin2";
       }
       program { name: "spin2";
          action: STATE_SET "default" 0.0;
-         target: "knob_spinner";
+         target: "busy1";
+         target: "busy2";
+         target: "busy3";
+         target: "busy4";
          after: "spin";
       }
       program { name: "busy-on";
@@ -190,9 +248,12 @@ group { name: "e/modules/packagekit/main";
       }
       program { name: "spin4";
          action: STATE_SET "default" 0.0;
-         target: "knob_spinner";
+         target: "busy1";
+         target: "busy2";
+         target: "busy3";
+         target: "busy4";
       }
-      
+
       program {
          signal: "packagekit,state,none"; source: "e";
          action: STATE_SET "default" 0.0;

data/elementary/themes/edc/pager.edc

@@ -1,45 +1,30 @@
 group { name: "e/modules/pager/popup";
    alias: "e/gadget/pager/popup";
-   images.image: "vgrad_tall.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "shine.png" COMP;
    parts {
-      part { name: "base"; mouse_events: 0;
+      part { name: "base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "vgrad_tall.png";
-            fill.smooth: 0;
-            TILED_HORIZ(40)
-         }
-      }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
+            color: 64 64 64 255;
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
          description { state: "default" 0.0;
             rel1.to_y: "e.text.label";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 2 0;
+            rel1.offset: 0 8;
             rel2.relative: 1.0 1.0;
-            rel2.offset: -3 -2;
+            rel2.offset: -1 -9;
          }
       }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          scale: 1;
-         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            color_class: "border_title";
             rel1.to: "base";
             rel1.offset: 0 1;
             rel2.to: "base";
             rel2.relative: 1.0 0.0;
             rel2.offset: -1 1;
             align: 0.5 0.0;
-            color: FN_COL_DISABLE;
+            color: 160 160 160 255;
             text { font: FNBD; size: 10;
                text_class: "title_bar";
                align: 0.5 0.0;
@@ -48,24 +33,11 @@ group { name: "e/modules/pager/popup";
             fixed: 0 1;
          }
       }
-      part { name: "shine"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            FIXED_SIZE(69, 5)
-         }
-      }
    }
 }
 
 group { name: "e/modules/pager/desk";
-   images.image: "vgrad_med_darker.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "bevel_in.png" COMP;
-   images.image: "inset_shadow.png" COMP;
-   images.image: "downlight_glow.png" COMP;
+   BACKGROUND_IMG
    images.image: "mini_blue_glow_arrow_0.png" COMP;
    images.image: "mini_blue_glow_arrow_1.png" COMP;
    images.image: "mini_blue_glow_arrow_2.png" COMP;
@@ -73,21 +45,9 @@ group { name: "e/modules/pager/desk";
    parts {
       part { name: "base";
          description { state: "default" 0.0;
-            image.normal: "vgrad_med_darker.png";
-            rel1.to: "inset";
-            rel1.offset: 1 1;
-            rel2.to: "inset";
-            rel2.offset: -2 -2;
-            fill.smooth: 0;
-            TILED_HORIZ(32)
-         }
-      }
-      part { name: "pat"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "dot_pattern.png";
-            rel1.to: "base";
-            rel2.to: "base";
-            TILED_PATTERN(256, 256)
+            image.normal: "background";
+            image.scale_hint: STATIC;
+            ASPECT_FILL((7680/4320))
          }
       }
       part { name: "e.background"; type: SWALLOW;
@@ -101,16 +61,6 @@ group { name: "e/modules/pager/desk";
             visible: 0;
          }
       }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "base";
-            rel2.to: "base";
-            fill.smooth: 0;
-         }
-      }
       part { name: "clip"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
             rel1.to: "base";
@@ -124,58 +74,39 @@ group { name: "e/modules/pager/desk";
             rel2.to: "base";
          }
       }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "base";
-            rel2.to: "base";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "glow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "downlight_glow.png";
-            image.border: 0 0 3 0;
-            rel1.to: "base";
-            rel2.to: "base";
-            color: 255 255 255 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
-         scale: 1;
-         effect: SHADOW BOTTOM;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            color_class: "module_label_invisible";
+         desc { "default";
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
             color3: 255 255 255 255;
-            text { font: FN; size: 10;
+            text { font: "Sans"; size: 10;
                text_class: "module_small";
                align: 0.5 0.5;
             }
             visible: 0;
          }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
+         desc { "active"; inherit;
             color_class: "module_label";
-            color3: 255 255 255 255;
             visible: 1;
          }
       }
-      part { name: "inset"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.offset: 1 2;
-            rel2.offset: -2 -3;
-            fill.smooth: 0;
+      part { name: "sel"; type: RECT; mouse_events: 0;
+         scale: 1;
+         clip_to: "clip";
+         desc { "default";
+            color: 51 153 255 255;
+            visible: 0;
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
+            rel2.offset: -1 0;
+            rel1.relative: 0.0 1.0;
+            align: 0.5 1.0;
+            max: 99999 5;
+         }
+         desc { "active"; inherit;
+            inherit: "default" 0.0;
+            rel1.relative: 0.0 0.5;
+            visible: 1;
          }
       }
       part { name: "drop0"; mouse_events: 0;
@@ -293,8 +224,8 @@ group { name: "e/modules/pager/desk";
       program { name: "sel";
          signal: "e,state,selected"; source: "e";
          action: STATE_SET "active" 0.0;
-         transition: BOUNCE 0.4 0.5 4;
-         target: "glow";
+         transition: DECELERATE 0.2;
+         target: "sel";
       }
       program {
          signal: "e,state,unselected"; source: "e";
@@ -305,7 +236,7 @@ group { name: "e/modules/pager/desk";
          signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.2;
-         target: "glow";
+         target: "sel";
       }
       program {
          signal: "e,preview,on"; source: "e";
@@ -357,10 +288,7 @@ group { name: "e/modules/pager/desk";
 }
 
 group { name: "e/gadget/pager/plain/desk";
-   images.image: "vgrad_med_darker.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "bevel_in.png" COMP;
-   images.image: "inset_shadow.png" COMP;
+   BACKGROUND_IMG
    images.image: "mini_blue_glow_arrow_0.png" COMP;
    images.image: "mini_blue_glow_arrow_1.png" COMP;
    images.image: "mini_blue_glow_arrow_2.png" COMP;
@@ -368,21 +296,9 @@ group { name: "e/gadget/pager/plain/desk";
    parts {
       part { name: "base";
          description { state: "default" 0.0;
-            image.normal: "vgrad_med_darker.png";
-            rel1.to: "inset";
-            rel1.offset: 1 1;
-            rel2.to: "inset";
-            rel2.offset: -2 -2;
-            fill.smooth: 0;
-            TILED_HORIZ(32)
-         }
-      }
-      part { name: "pat"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "dot_pattern.png";
-            rel1.to: "base";
-            rel2.to: "base";
-            TILED_PATTERN(256, 256)
+            image.normal: "background";
+            image.scale_hint: STATIC;
+            ASPECT_FILL((7680/4320))
          }
       }
       part { name: "e.background"; type: SWALLOW;
@@ -396,16 +312,6 @@ group { name: "e/gadget/pager/plain/desk";
             visible: 0;
          }
       }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "base";
-            rel2.to: "base";
-            fill.smooth: 0;
-         }
-      }
       part { name: "clip"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
             rel1.to: "base";
@@ -431,87 +337,70 @@ group { name: "e/gadget/pager/plain/desk";
             rel2.to: "base";
          }
       }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "base";
-            rel2.to: "base";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "inset"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.offset: 1 2;
-            rel2.offset: -2 -3;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "glow"; mouse_events: 0;
-         type: RECT;
-         description { state: "default" 0.0;
-            visible: 0;
-            color: 255 255 255 0;
-         }
-         description { state: "on_left" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            rel1.relative: 0.0 0.025;
-            rel1.offset: 0 1;
-            rel2.relative: 0.05 0.975;
-            rel2.offset: -1 -1;
-            color: 51 153 255 255;
-         }
-         description { state: "on_top" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            rel1.relative: 0.025 0.0;
-            rel1.offset: 1 0;
-            rel2.relative: 0.975 0.05;
-            rel2.offset: -1 -1;
-            color: 51 153 255 255;
-         }
-         description { state: "on_right" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            rel1.relative: 0.95 0.025;
-            rel1.offset: 1 1;
-            rel2.relative: 1.0 0.975;
-            rel2.offset: 0 -1;
-            color: 51 153 255 255;
-         }
-         description { state: "on_bottom" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            rel1.relative: 0.025 0.95;
-            rel1.offset: 0 1;
-            rel2.relative: 0.975 1.0;
-            rel2.offset: -1 0;
-            color: 51 153 255 255;
-         }
-      }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
-         scale: 1;
-         effect: SHADOW BOTTOM;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            color_class: "module_label_invisible";
+         desc { "default";
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
             color3: 255 255 255 255;
-            text { font: FN; size: 10;
+            text { font: "Sans"; size: 10;
                text_class: "module_small";
                align: 0.5 0.5;
             }
             visible: 0;
          }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
+         desc { "active"; inherit;
             color_class: "module_label";
-            color3: 255 255 255 255;
+            visible: 1;
+         }
+      }
+      part { name: "sel"; type: RECT; mouse_events: 0;
+         scale: 1;
+         clip_to: "clip";
+         desc { "default";
+            color: 51 153 255 255;
+            visible: 0;
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
+            align: 0.5 1.0;
+            max: 99999 5;
+         }
+         description { state: "left" 0.0;
+            inherit: "default" 0.0;
+            align: 0.0 0.5;
+            max: 5 99999;
+            rel2.relative: 0.5 1.0;
+         }
+         description { state: "top" 0.0;
+            inherit: "default" 0.0;
+            align: 0.5 0.0;
+            rel2.relative: 1.0 0.5;
+         }
+         description { state: "right" 0.0;
+            inherit: "default" 0.0;
+            align: 1.0 0.5;
+            max: 5 99999;
+            rel1.relative: 0.5 0.0;
+         }
+         description { state: "bottom" 0.0;
+            inherit: "default" 0.0;
+            align: 0.5 1.0;
+            rel1.relative: 0.0 0.5;
+
+         }
+         description { state: "on_left" 0.0;
+            inherit: "left" 0.0;
+            visible: 1;
+         }
+         description { state: "on_top" 0.0;
+            inherit: "top" 0.0;
+            visible: 1;
+         }
+         description { state: "on_right" 0.0;
+            inherit: "right" 0.0;
+            visible: 1;
+         }
+         description { state: "on_bottom" 0.0;
+            inherit: "bottom" 0.0;
             visible: 1;
          }
       }
@@ -629,33 +518,60 @@ group { name: "e/gadget/pager/plain/desk";
    programs {
       program { name: "sel_left";
          signal: "e,state,selected,left"; source: "e";
-         action: STATE_SET "on_left" 0.0;
-         transition: ACCELERATE 0.2;
-         target: "glow";
+         action: STATE_SET "left" 0.0;
+         target: "sel";
+         after: "on_left";
       }
       program { name: "sel_top";
          signal: "e,state,selected,top"; source: "e";
-         action: STATE_SET "on_top" 0.0;
-         transition: ACCELERATE 0.2;
-         target: "glow";
+         action: STATE_SET "top" 0.0;
+         target: "sel";
+         after: "on_top";
       }
       program { name: "sel_right";
          signal: "e,state,selected,right"; source: "e";
-         action: STATE_SET "on_right" 0.0;
-         transition: ACCELERATE 0.2;
-         target: "glow";
+         action: STATE_SET "right" 0.0; 
+         target: "sel";
+         after: "on_right";
       }
       program { name: "sel_bottom";
          signal: "e,state,selected,bottom"; source: "e";
+         action: STATE_SET "bottom" 0.0;
+         target: "sel";
+         after: "on_bottom";
+      }
+      program { name: "on_left";
+         action: STATE_SET "on_left" 0.0;
+         transition: DECELERATE 0.2;
+         target: "sel";
+      }
+      program { name: "on_top";
+         action: STATE_SET "on_top" 0.0;
+         transition: DECELERATE 0.2;
+         target: "sel";
+      }
+      program { name: "on_right";
+         action: STATE_SET "on_right" 0.0;
+         transition: DECELERATE 0.2;
+         target: "sel";
+      }
+      program { name: "on_bottom";
          action: STATE_SET "on_bottom" 0.0;
-         transition: ACCELERATE 0.2;
-         target: "glow";
+         transition: DECELERATE 0.2;
+         target: "sel";
+      }
+      program {
+         signal: "e,state,unselected"; source: "e";
+         action: ACTION_STOP;
+         target: "sel_left";
+         target: "sel_top";
+         target: "sel_right";
+         target: "sel_bottom";
       }
       program {
          signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.2;
-         target: "glow";
+         target: "sel";
       }
       program {
          signal: "e,preview,on"; source: "e";
@@ -707,37 +623,20 @@ group { name: "e/gadget/pager/plain/desk";
 }
 
 group { name: "e/gadget/pager/default/desk";
-   images.image: "vgrad_med_darker.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "bevel_in.png" COMP;
-   images.image: "inset_shadow.png" COMP;
    images.image: "mini_blue_glow_arrow_0.png" COMP;
    images.image: "mini_blue_glow_arrow_1.png" COMP;
    images.image: "mini_blue_glow_arrow_2.png" COMP;
    images.image: "mini_blue_glow_arrow_3.png" COMP;
    parts {
-      part { name: "base"; type: SPACER;
+      part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "inset";
-            rel1.offset: 1 1;
-            rel2.to: "inset";
-            rel2.offset: -2 -2;
-         }
-      }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "base";
-            rel2.to: "base";
-            fill.smooth: 0;
+            color: 0 0 0 0;
          }
       }
       part { name: "clip"; type: RECT; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
+         desc { "default";
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
          }
       }
       part { name: "e.swallow.drop"; type: SWALLOW;
@@ -754,86 +653,18 @@ group { name: "e/gadget/pager/default/desk";
       }
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            rel2.offset: -2 -1;
+         desc { "default";
             link.base: "e,state,visible" "e";
          }
          desc { "hid"; inherit; hid;
             link.base: "e,state,hidden" "e";
          }
       }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "base";
-            rel2.to: "base";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "inset"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.offset: 1 2;
-            rel2.offset: -2 -3;
-            fill.smooth: 0;
-         }
-      }
-      part { name: "glow"; mouse_events: 0;
-         type: RECT;
-         description { state: "default" 0.0;
-            visible: 0;
-            color: 255 255 255 0;
-         }
-         description { state: "on_left" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            rel1.relative: 0.0 0.025;
-            rel1.offset: 0 1;
-            rel2.relative: 0.05 0.975;
-            rel2.offset: -1 -1;
-            color: 51 153 255 255;
-         }
-         description { state: "on_top" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            rel1.relative: 0.025 0.0;
-            rel1.offset: 1 0;
-            rel2.relative: 0.975 0.05;
-            rel2.offset: -1 -1;
-            color: 51 153 255 255;
-         }
-         description { state: "on_right" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            rel1.relative: 0.95 0.025;
-            rel1.offset: 1 1;
-            rel2.relative: 1.0 0.975;
-            rel2.offset: 0 -1;
-            color: 51 153 255 255;
-         }
-         description { state: "on_bottom" 0.0;
-            inherit: "default" 0.0;
-            visible: 1;
-            rel1.relative: 0.025 0.95;
-            rel1.offset: 0 1;
-            rel2.relative: 0.975 1.0;
-            rel2.offset: -1 0;
-            color: 51 153 255 255;
-         }
-      }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          scale: 1;
-         effect: SHADOW BOTTOM;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            color_class: "module_label_invisible";
+         desc { "default";
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
             color3: 255 255 255 255;
             text { font: "Sans"; size: 10;
                text_class: "module_small";
@@ -841,10 +672,59 @@ group { name: "e/gadget/pager/default/desk";
             }
             visible: 0;
          }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
+         desc { "active"; inherit;
             color_class: "module_label";
-            color3: 255 255 255 255;
+            visible: 1;
+         }
+      }
+      part { name: "sel"; type: RECT; mouse_events: 0;
+         scale: 1;
+         clip_to: "clip";
+         desc { "default";
+            color: 51 153 255 255;
+            visible: 0;
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
+            align: 0.5 1.0;
+            max: 99999 5;
+         }
+         description { state: "left" 0.0;
+            inherit: "default" 0.0;
+            align: 0.0 0.5;
+            max: 5 99999;
+            rel2.relative: 0.5 1.0;
+         }
+         description { state: "top" 0.0;
+            inherit: "default" 0.0;
+            align: 0.5 0.0;
+            rel2.relative: 1.0 0.5;
+         }
+         description { state: "right" 0.0;
+            inherit: "default" 0.0;
+            align: 1.0 0.5;
+            max: 5 99999;
+            rel1.relative: 0.5 0.0;
+         }
+         description { state: "bottom" 0.0;
+            inherit: "default" 0.0;
+            align: 0.5 1.0;
+            rel1.relative: 0.0 0.5;
+
+         }
+         description { state: "on_left" 0.0;
+            inherit: "left" 0.0;
+            visible: 1;
+         }
+         description { state: "on_top" 0.0;
+            inherit: "top" 0.0;
+            visible: 1;
+         }
+         description { state: "on_right" 0.0;
+            inherit: "right" 0.0;
+            visible: 1;
+         }
+         description { state: "on_bottom" 0.0;
+            inherit: "bottom" 0.0;
             visible: 1;
          }
       }
@@ -962,33 +842,60 @@ group { name: "e/gadget/pager/default/desk";
    programs {
       program { name: "sel_left";
          signal: "e,state,selected,left"; source: "e";
-         action: STATE_SET "on_left" 0.0;
-         transition: ACCELERATE 0.2;
-         target: "glow";
+         action: STATE_SET "left" 0.0;
+         target: "sel";
+         after: "on_left";
       }
       program { name: "sel_top";
          signal: "e,state,selected,top"; source: "e";
-         action: STATE_SET "on_top" 0.0;
-         transition: ACCELERATE 0.2;
-         target: "glow";
+         action: STATE_SET "top" 0.0;
+         target: "sel";
+         after: "on_top";
       }
       program { name: "sel_right";
          signal: "e,state,selected,right"; source: "e";
-         action: STATE_SET "on_right" 0.0;
-         transition: ACCELERATE 0.2;
-         target: "glow";
+         action: STATE_SET "right" 0.0;
+         target: "sel";
+         after: "on_right";
       }
       program { name: "sel_bottom";
          signal: "e,state,selected,bottom"; source: "e";
+         action: STATE_SET "bottom" 0.0;
+         target: "sel";
+         after: "on_bottom";
+      }
+      program { name: "on_left";
+         action: STATE_SET "on_left" 0.0;
+         transition: DECELERATE 0.2;
+         target: "sel";
+      }
+      program { name: "on_top";
+         action: STATE_SET "on_top" 0.0;
+         transition: DECELERATE 0.2;
+         target: "sel";
+      }
+      program { name: "on_right";
+         action: STATE_SET "on_right" 0.0;
+         transition: DECELERATE 0.2;
+         target: "sel";
+      }
+      program { name: "on_bottom";
          action: STATE_SET "on_bottom" 0.0;
-         transition: ACCELERATE 0.2;
-         target: "glow";
+         transition: DECELERATE 0.2;
+         target: "sel";
+      }
+      program {
+         signal: "e,state,unselected"; source: "e";
+         action: ACTION_STOP;
+         target: "sel_left";
+         target: "sel_top";
+         target: "sel_right";
+         target: "sel_bottom";
       }
       program {
          signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 0.2;
-         target: "glow";
+         target: "sel";
       }
       program { name: "drop1";
          signal: "e,action,drag,in"; source: "e";
@@ -1032,8 +939,20 @@ group { name: "e/gadget/pager/default/desk";
 group { name: "e/modules/pager/window";
    alias: "e/gadget/pager/plain/window";
    images.image: "mini_box_bevel_shadow.png" COMP;
-   images.image: "mini_box_glow.png" COMP;
    parts {
+      part { name: "shadow"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "mini_box_bevel_shadow.png";
+            image.border: 7 7 7 7;
+            image.middle: 0;
+            rel1.to: "win";
+            rel1.offset: -5 -5;
+            rel2.to: "win";
+            rel2.offset: 4 4;
+            fill.smooth: 0;
+            color: 255 255 255 128;
+         }
+      }
       part { name: "base"; type: SPACER;
          description { state: "default" 0.0;
          }
@@ -1042,18 +961,13 @@ group { name: "e/modules/pager/window";
             rel2.offset: -1 -6;
          }
       }
-      part { name: "win"; mouse_events: 0;
+      part { name: "win"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "mini_box_bevel_shadow.png";
-            image.border: 7 7 7 7;
-            rel1.offset: -5 -5;
-            rel1.to: "base";
-            rel2.offset: 4 4;
-            rel2.to: "base";
+            color: 64 64 64 255;
          }
          description { state: "active" 0.0;
             inherit: "default" 0.0;
-            image.normal: "mini_box_glow.png";
+            color: 32 32 32 255;
          }
       }
       part { name: "e.swallow.icon"; type: SWALLOW; mouse_events: 0;

data/elementary/themes/edc/pager16.edc

@@ -1,44 +1,29 @@
 group { name: "e/modules/pager16/popup";
-   images.image: "vgrad_tall.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "shine.png" COMP;
    parts {
-      part { name: "base"; mouse_events: 0;
+      part { name: "base"; type: RECT; mouse_events: 0;
          description { state: "default" 0.0;
-            image.normal: "vgrad_tall.png";
-            fill.smooth: 0;
-            TILED_HORIZ(40)
+            color: 64 64 64 255;
          }
       }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            fill.smooth: 0;
-                  }
-            }
       part { name: "e.swallow.content"; type: SWALLOW;
          description { state: "default" 0.0;
             rel1.to_y: "e.text.label";
             rel1.relative: 0.0 1.0;
-            rel1.offset: 2 0;
+            rel1.offset: 0 8;
             rel2.relative: 1.0 1.0;
-            rel2.offset: -3 -2;
-                  }
-            }
+            rel2.offset: -1 -9;
+         }
+      }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          scale: 1;
-         effect: SHADOW BOTTOM;
          description { state: "default" 0.0;
-            color_class: "border_title";
             rel1.to: "base";
             rel1.offset: 0 1;
             rel2.to: "base";
             rel2.relative: 1.0 0.0;
             rel2.offset: -1 1;
             align: 0.5 0.0;
-            color: FN_COL_DISABLE;
+            color: 160 160 160 255;
             text { font: FNBD; size: 10;
                text_class: "title_bar";
                align: 0.5 0.0;
@@ -47,51 +32,24 @@ group { name: "e/modules/pager16/popup";
             fixed: 0 1;
          }
       }
-      part { name: "shine"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -2;
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 2;
-            FIXED_SIZE(69, 5)
-         }
-      }
    }
 }
 
 group { name: "e/modules/pager16/desk";
-   images.image: "vgrad_med_darker.png" COMP;
-   images.image: "bevel_out.png" COMP;
-   images.image: "bevel_in.png" COMP;
-   images.image: "shine.png" COMP;
-   images.image: "inset_shadow.png" COMP;
    images.image: "mini_blue_glow_arrow_0.png" COMP;
    images.image: "mini_blue_glow_arrow_1.png" COMP;
    images.image: "mini_blue_glow_arrow_2.png" COMP;
    images.image: "mini_blue_glow_arrow_3.png" COMP;
    parts {
-      part { name: "base"; type: SPACER;
+      part { name: "base"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "inset";
-            rel1.offset: 1 1;
-            rel2.to: "inset";
-            rel2.offset: -2 -2;
-         }
-      }
-      part { name: "bevel"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_out.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "base";
-            rel2.to: "base";
-            fill.smooth: 0;
+            color: 0 0 0 0;
          }
       }
       part { name: "clip"; type: RECT; mouse_events: 0;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
+         desc { "default";
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
          }
       }
       part { name: "e.swallow.drop"; type: SWALLOW;
@@ -108,46 +66,18 @@ group { name: "e/modules/pager16/desk";
       }
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "clip";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            rel2.offset: -2 -1;
+         desc { "default";
             link.base: "e,state,visible" "e";
          }
          desc { "hid"; inherit; hid;
             link.base: "e,state,hidden" "e";
          }
       }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "base";
-            rel2.to: "base";
-            fill.smooth: 0;
-         }
-      }
-      part { name: "glow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "downlight_glow.png";
-            image.border: 0 0 3 0;
-            rel1.to: "base";
-            rel2.to: "base";
-            color: 255 255 255 0;
-         }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
       part { name: "e.text.label"; type: TEXT; mouse_events: 0;
          scale: 1;
-         effect: SHADOW BOTTOM;
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            color_class: "module_label_invisible";
+         desc { "default";
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
             color3: 255 255 255 255;
             text { font: "Sans"; size: 10;
                text_class: "module_small";
@@ -155,30 +85,37 @@ group { name: "e/modules/pager16/desk";
             }
             visible: 0;
          }
-         description { state: "active" 0.0;
-            inherit: "default" 0.0;
+         desc { "active"; inherit;
             color_class: "module_label";
-            color3: 255 255 255 255;
             visible: 1;
          }
       }
-      part { name: "inset"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.offset: 1 2;
-            rel2.offset: -2 -3;
-            fill.smooth: 0;
+      part { name: "sel"; type: RECT; mouse_events: 0;
+         scale: 1;
+         clip_to: "clip";
+         desc { "default";
+            color: 51 153 255 255;
+            visible: 0;
+            rel1.to: "e.swallow.content";
+            rel2.to: "e.swallow.content";
+            rel2.offset: -1 0;
+            rel1.relative: 0.0 1.0;
+            align: 0.5 1.0;
+            max: 99999 6;
+         }
+         desc { "active"; inherit;
+            inherit: "default" 0.0;
+            rel1.relative: 0.0 0.5;
+            visible: 1;
          }
       }
       part { name: "drop0"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "mini_blue_glow_arrow_0.png";
-            rel1.to: "base";
+            rel1.to: "e.swallow.content";
             rel1.offset: -1 -1;
             rel1.relative: 0.0 0.0;
-            rel2.to: "base";
+            rel2.to: "e.swallow.content";
             rel2.relative: 0.0 0.0;
             rel2.offset: -1 -1;
             align: 0.0 0.0;
@@ -201,10 +138,10 @@ group { name: "e/modules/pager16/desk";
       part { name: "drop1"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "mini_blue_glow_arrow_1.png";
-            rel1.to: "base";
+            rel1.to: "e.swallow.content";
             rel1.offset: 0 -1;
             rel1.relative: 1.0 0.0;
-            rel2.to: "base";
+            rel2.to: "e.swallow.content";
             rel2.relative: 1.0 0.0;
             rel2.offset: 0 -1;
             align: 1.0 0.0;
@@ -227,10 +164,10 @@ group { name: "e/modules/pager16/desk";
       part { name: "drop2"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "mini_blue_glow_arrow_2.png";
-            rel1.to: "base";
+            rel1.to: "e.swallow.content";
             rel1.offset: 0 0;
             rel1.relative: 1.0 1.0;
-            rel2.to: "base";
+            rel2.to: "e.swallow.content";
             rel2.relative: 1.0 1.0;
             rel2.offset: 0 0;
             align: 1.0 1.0;
@@ -253,10 +190,10 @@ group { name: "e/modules/pager16/desk";
       part { name: "drop3"; mouse_events: 0;
          description { state: "default" 0.0;
             image.normal: "mini_blue_glow_arrow_3.png";
-            rel1.to: "base";
+            rel1.to: "e.swallow.content";
             rel1.offset: -1 0;
             rel1.relative: 0.0 1.0;
-            rel2.to: "base";
+            rel2.to: "e.swallow.content";
             rel2.relative: 0.0 1.0;
             rel2.offset: -1 0;
             align: 0.0 1.0;
@@ -287,8 +224,8 @@ group { name: "e/modules/pager16/desk";
       program { name: "sel";
          signal: "e,state,selected"; source: "e";
          action: STATE_SET "active" 0.0;
-         transition: BOUNCE 0.4 0.5 4;
-         target: "glow";
+         transition: DECELERATE 0.2;
+         target: "sel";
       }
       program {
          signal: "e,state,unselected"; source: "e";
@@ -299,7 +236,7 @@ group { name: "e/modules/pager16/desk";
          signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.2;
-         target: "glow";
+         target: "sel";
       }
       program { name: "drop1";
          signal: "e,action,drag,in"; source: "e";

data/elementary/themes/edc/pointer.edc

@@ -1,11 +1,12 @@
 group { name: "e/pointer/enlightenment/default/color";
    images.image: "pointer.png" COMP;
-   images.image: "pointer_glow.png" COMP;
    data.item: "can_suspend" "1";
    parts {
       part { name: "parent"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
             color: 255 255 255 255;
+            FIXED_SIZE(32, 32)
          }
          description { state: "suspend" 0.0;
             inherit: "default" 0.0;
@@ -20,73 +21,49 @@ group { name: "e/pointer/enlightenment/default/color";
             image.normal: "pointer.png";
             rel.to: "parent";
          }
-      }
-      part { name: "glow";
-         description { state: "default" 0.0;
-            rel.to: "base";
-            image.normal: "pointer_glow.png";
-            color: 255 255 255 0;
-         }
-         description { state: "visible" 0.0;
+         description { state: "clicked" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-         description { state: "faded" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 128;
+            color: 51 153 255 255;
          }
       }
       part { name: "e.swallow.hotspot"; type: SWALLOW;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.relative: (5/32) (5/32);
             rel.to: "base";
-            rel2.relative: (5/32) (5/32); 
+            rel1.relative: (5/32) (5/32);
+            rel2.relative: (5/32) (5/32);
             rel2.offset: 0 0;
         }
       }
    }
    programs {
+      program {
+         signal: "e,state,init"; source: "e";
+         action: STATE_SET "suspend" 0.0;
+         target: "parent";
+         after: "load2";
+      }
+      program { name: "load2";
+         action: STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 1.0;
+         in: 1.0 0.0;
+         target: "parent";
+      }
       program {
          signal: "e,action,mouse,down"; source: "e";
-         action: STATE_SET "visible" 0.0;
-         target: "glow";
+         action: STATE_SET "clicked" 0.0;
+         target: "base";
          after: "fade";
       }
       program { name: "fade";
          action: STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.5;
-         target: "glow";
-      }
-      program { name: "pulse";
-         signal: "e,state,mouse,idle"; source: "e";
-         in: 10.0 0.0;
-         action: STATE_SET "faded" 0.0;
-         transition: SINUSOIDAL 0.25;
-         target: "glow";
-         after: "pulse2";
-      }
-      program { name: "pulse2";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.5;
-         target: "glow";
-         after: "pulse";
-      }
-      program {
-         signal: "e,state,mouse,active"; source: "e";
-         action: STATE_SET "default" 0.0;
-         target: "glow";
-         after: "stop2";
-      }
-      program { name: "stop2";
-         action: ACTION_STOP;
-         target: "pulse";
-         target: "pulse2";
+         target: "base";
       }
       program {
          signal: "e,state,mouse,suspend"; source: "e";
          action: STATE_SET "suspend" 0.0;
-         transition: ACCELERATE 1.0;
+         transition: ACCELERATE 0.5;
          target: "parent";
          sequence {
             action: SIGNAL_EMIT "e,state,mouse,suspend,done" "e";
@@ -95,12 +72,39 @@ group { name: "e/pointer/enlightenment/default/color";
       program {
          signal: "e,state,mouse,resume"; source: "e";
          action: STATE_SET "default" 0.0;
-         transition: DECELERATE 1.0;
+         transition: DECELERATE 0.5;
          target: "parent";
          sequence {
             action: SIGNAL_EMIT "e,state,mouse,resume,done" "e";
          }
       }
+/*
+      program { name: "pulse";
+         signal: "e,state,mouse,idle"; source: "e";
+         in: 10.0 0.0;
+         action: STATE_SET "faded" 0.0;
+         transition: SINUSOIDAL 0.25;
+         target: "base";
+         after: "pulse2";
+      }
+      program { name: "pulse2";
+         action: STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 0.5;
+         target: "base";
+         after: "pulse";
+      }
+      program {
+         signal: "e,state,mouse,active"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "base";
+         after: "stop2";
+      }
+      program { name: "stop2";
+         action: ACTION_STOP;
+         target: "pulse";
+         target: "pulse2";
+      }
+ */
    }
 }
 
@@ -129,13 +133,11 @@ group { name: "e/pointer/enlightenment/default/mono";
 
 group { name: "e/pointer/enlightenment/resize_br/color";
    inherit: "e/pointer/enlightenment/default/color";
-   images.image: "mini_box_glow.png" COMP;
    parts {
-      part { name: "box";
-         insert_after: "glow";
+      part { name: "box"; type: RECT;
+         insert_after: "base";
          description { state: "default" 0.0;
-            image.normal: "mini_box_glow.png";
-            image.border: 7 7 7 7;
+            color: 51 153 255 192;
             rel1.relative: 0.3 0.3;
             rel2.relative: 0.7 0.7;
          }
@@ -277,13 +279,11 @@ group { name: "e/pointer/enlightenment/resize_r/color";
 
 group { name: "e/pointer/enlightenment/hand/color";
    inherit: "e/pointer/enlightenment/default/color";
-   images.image: "mini_box_glow.png" COMP;
    parts {
-      part { name: "box";
-         insert_after: "glow";
+      part { name: "box"; type: RECT;
+         insert_after: "base";
          description { state: "default" 0.0;
-            image.normal: "mini_box_glow.png";
-            image.border: 7 7 7 7;
+            color: 51 153 255 192;
             rel1.relative: 0.5 0.5;
             rel2.relative: 1.0 1.0;
          }
@@ -346,32 +346,15 @@ group { name: "e/pointer/enlightenment/hand/color";
 
 group { name: "e/pointer/enlightenment/move/color";
    inherit: "e/pointer/enlightenment/hand/color";
-   programs {
-      program { name: "move1";
-         signal: "load"; source: "";
-         action: STATE_SET "faded" 0.0;
-         transition: SINUSOIDAL 0.5;
-         target: "glow";
-         after: "move2";
-      }
-      program { name: "move2";
-         action: STATE_SET "default" 0.0;
-         transition: SINUSOIDAL 0.5;
-         target: "glow";
-         after: "move1";
-      }
-   }
 }
 
 group { name: "e/pointer/enlightenment/rotate/color";
    inherit: "e/pointer/enlightenment/default/color";
-   images.image: "mini_box_glow.png" COMP;
    parts {
-      part { name: "box";
-         insert_after: "glow";
+      part { name: "box"; type: RECT;
+         insert_after: "base";
          description { state: "default" 0.0;
-            image.normal: "mini_box_glow.png";
-            image.border: 7 7 7 7;
+            color: 51 153 255 192;
             rel1.relative: 0.3 0.3;
             rel2.relative: 0.8 0.8;
             map.on: 1;
@@ -413,21 +396,20 @@ group { name: "e/pointer/enlightenment/rotate/color";
 
 group { name: "e/pointer/enlightenment/plus/color";
    inherit: "e/pointer/enlightenment/default/color";
-   images.image: "add_glow_small.png" COMP;
+   images.image: "pointer_plus.png" COMP;
    parts {
       part { name: "add";
-         insert_after: "glow";
+         insert_after: "base";
          description { state: "default" 0.0;
-            image.normal: "add_glow_small.png";
+            image.normal: "pointer_plus.png";
             aspect: 1.0 1.0; aspect_preference: BOTH;
-            rel1.relative: 0.3 0.3;
-            rel2.relative: 1.0 1.0;
-            align: 1.0 1.0;
-            max: 21 21;
+            rel1.relative: (40/128) (40/128);
+            rel2.relative: (76/128) (76/128);
+            color: 53 153 255 255;
          }
          description { state: "faded" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 128;
+            color: 53 153 255 128;
          }
       }
    }
@@ -449,37 +431,24 @@ group { name: "e/pointer/enlightenment/plus/color";
 }
 
 group { name: "e/pointer/enlightenment/entry/color";
-   images.image: "pointer_entry_bar.png" COMP;
-   images.image: "led_dot_white.png" COMP;
+   images.image: "pointer_entry.png" COMP;
    parts {
       part { name: "base";
+         scale: 1;
          description { state: "default" 0.0;
-            image.normal: "pointer_entry_bar.png";
-            max: 15 99999;
-            min: 15 20;
-            image.normal: "pointer_entry_bar.png";
-            image.border: 0 0 10 10;
-            rel1.offset: 0 2;
-            rel2.offset: -1 -3;
+            image.normal: "pointer_entry.png";
+            aspect: (44/88) (44/88); aspect_preference: VERTICAL;
+            FIXED_SIZE(32, 32)
          }
       }
       part { name: "e.swallow.hotspot"; type: SWALLOW;
          description { state: "default" 0.0;
             fixed: 1 1;
-            rel1.relative: 0.5 0.5;
             rel1.to: "base";
+            rel1.relative: 0.5 0.5;
             rel2.to: "base";
             rel2.relative: 0.5 0.5;
             rel2.offset: 0 0;
-        }
-      }
-      part { name: "shine";
-         description { state: "default" 0.0;
-            rel1.to: "base";
-            rel2.to: "base";
-            image.normal: "led_dot_white.png";
-            max: 27 27;
-            aspect: 1.0 1.0; aspect_preference: VERTICAL;
          }
       }
    }

data/elementary/themes/edc/preview.edc

@@ -1,6 +1,4 @@
 group { name: "e/widgets/preview";
-   images.image: "inset_shadow.png" COMP;
-   images.image: "bevel_in.png" COMP;
    parts {
       part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
@@ -17,32 +15,11 @@ group { name: "e/widgets/preview";
       }
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "clipper";
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 1 1;
-            rel2.offset: -2 -2;
-         }
-      }
-      part { name: "shadow"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            fill.smooth: 0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "inset"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel1.offset: -1 -1;
-            rel2.to: "bg";
-            rel2.offset: 0 0;
-            fill.smooth: 0;
+            rel1.offset: 4 4;
+            rel2.offset: -5 -5;
+            offscale;
          }
       }
    }

data/elementary/themes/edc/radio.edc

@@ -1,22 +1,23 @@
 group { name: "e/widgets/radio";
-   images.image: "inset_shadow_circle_tiny.png" COMP;
-   images.image: "inset_circle_tiny.png" COMP;
-   images.image: "sym_radio_alum.png" COMP;
+   images.image: "radio.png" COMP;
    parts {
-      part { name: "inset"; mouse_events: 0;
+      part { name: "base"; mouse_events: 0;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel2.relative: 0.0 1.0;
-            rel2.offset: 2 -3;
-            image.normal: "inset_shadow_circle_tiny.png";
-            align: 0.0 0.5;
             min: 13 13;
             max: 13 13;
+            rel1.offset: 4 4;
+            rel2.offset: 4 -5;
+            rel2.relative: 0.0 1.0;
+            image.normal: "radio.png";
+            align: 0.0 0.5;
+            color: 0 0 0 64;
+            offscale;
             fixed: 1 1;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            image.normal: "inset_circle_tiny.png";
+            color: 0 0 0 16;
          }
       }
       part { name: "clip"; type: RECT;
@@ -24,45 +25,51 @@ group { name: "e/widgets/radio";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 64;
+            color: 153 153 153 255;
          }
       }
       part { name: "indicator"; mouse_events: 0;
          clip_to: "clip";
          description { state: "default" 0.0;
-            rel1.to: "inset";
-            rel2.to: "inset";
-            image.normal: "sym_radio_alum.png";
-            min: 11 11;
-            max: 11 11;
+            rel1.to: "base";
+            rel2.to: "base";
+            image.normal: "radio.png";
+            color: 160 160 160 255;
             visible: 0;
          }
          description { state: "selected" 0.0;
             inherit: "default" 0.0;
             visible: 1;
          }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
+            visible: 1;
+         }
       }
       part { name: "e.text.label"; type: TEXT;
-         effect: SHADOW BOTTOM;
          scale: 1;
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel1.to_x: "inset";
+            rel1.offset: 4 4;
+            rel1.to_x: "base";
             rel1.relative: 1.0 0.0;
-            rel2.offset: -3 -3;
-            color_class: "radio_text";
-            color3: 255 255 255 255;
+            rel2.offset: -5 -5;
+            color: 160 160 160 255;
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
                align: 0.0 0.5;
                text_class: "radio_button";
             }
+            offscale;
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color_class: "radio_text_disabled";
-            color3: 255 255 255 255;
+            color: 96 96 96 255;
+         }
+         description { state: "pressed" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
          }
       }
       part { name: "event"; type: RECT;
@@ -87,14 +94,26 @@ group { name: "e/widgets/radio";
          action: STATE_SET "default" 0.0;
          target: "indicator";
       }
+      program {
+         signal: "mouse,down,1"; source: "event";
+         action: STATE_SET "pressed" 0.0;
+//         target: "indicator";
+         target: "e.text.label";
+      }
       program {
          signal: "mouse,up,1"; source: "event";
+         action: STATE_SET "default" 0.0;
+//         target: "indicator";
+         target: "e.text.label";
+      }
+      program {
+         signal: "mouse,clicked,1"; source: "event";
          action: SIGNAL_EMIT "e,action,toggle" "";
       }
       program {
          signal: "e,state,disabled"; source: "e";
          action: STATE_SET "disabled" 0.0;
-         target: "inset";
+         target: "base";
          target: "clip";
          target: "e.text.label";
          target: "event";
@@ -102,7 +121,7 @@ group { name: "e/widgets/radio";
       program {
          signal: "e,state,enabled"; source: "e";
          action: STATE_SET "default" 0.0;
-         target: "inset";
+         target: "base";
          target: "clip";
          target: "e.text.label";
          target: "event";
@@ -114,17 +133,19 @@ group { name: "e/widgets/radio_icon";
    inherit: "e/widgets/radio";
    parts {
       part { name: "e.swallow.icon"; type: SWALLOW;
+         scale: 1;
          insert_before: "event";
          clip_to: "clip";
          description { state: "default" 0.0;
-            rel1.offset: 2 2;
-            rel1.relative: 1.0 0.0; 
-            rel1.to_x: "inset";
-            rel2.offset: 2 -3;
+            rel1.offset: 4 4;
+            rel1.relative: 1.0 0.0;
+            rel1.to_x: "base";
+            rel2.offset: 4 -5;
             rel2.relative: 1.0 1.0;
-            rel1.to_x: "inset";
+            rel1.to_x: "base";
             align: 0.0 0.5;
             aspect: 1.0 1.0; aspect_preference: VERTICAL;
+            offscale;
          }
       }
       part { name: "e.text.label";
@@ -133,7 +154,7 @@ group { name: "e/widgets/radio_icon";
          }
          description { state: "disabled" 0.0;
             inherit: "default" 0.0;
-            color: FN_COL_DISABLE;
+            color: 96 96 96 255;
          }
       }
    }

data/elementary/themes/edc/randr.edc

@@ -1,45 +1,42 @@
 group { name: "e/conf/randr/main";
-   images.image: "inset_shadow.png" COMP;
-   images.image: "bevel_in.png" COMP;
+   images.image: "diagonal_stripes.png" COMP;
    parts {
       part { name: "bg"; type: RECT;
+         scale: 1;
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
-            color: 64 64 64 255;
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            color: DARK_GREY_BG_COLOR;
+            min: 18 18;
+            offscale;
          }
       }
+      part { name: "pat";
+         scale: 1;
+         description
+           { state: "default" 0.0;
+              rel.to: "bg";
+              rel1.offset: 2 2;
+              rel2.offset: -3 -3;
+              image.normal: "diagonal_stripes.png";
+              color: 255 255 255 64;
+              TILED_PATTERN(240, 240)
+              offscale;
+           }
+      }
       part { name: "clipper"; type: RECT;
          description { state: "default" 0.0;
-            rel1.to: "e.swallow.content";
-            rel2.to: "e.swallow.content";
+            rel.to: "pat";
          }
       }
       part { name: "e.swallow.content"; type: SWALLOW;
          clip_to: "clipper";
-         description { state: "default" 0.0; }
-      }
-      part { name: "shadow"; type: IMAGE; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "inset_shadow.png";
-            image.border: 5 5 7 3;
-            image.middle: 0;
-            rel1.to: "bg";
-            rel2.to: "bg";
-            fill.smooth: 0;
-            color: 255 255 255 128;
-         }
-      }
-      part { name: "inset"; type: IMAGE; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "bevel_in.png";
-            image.border: 1 1 1 1;
-            image.middle: 0;
-            rel1.offset: -1 -1;
-            rel1.to: "bg";
-            rel2.offset: 0 0;
-            rel2.to: "bg";
-            fill.smooth: 0;
+         scale: 1;
+         description { state: "default" 0.0; 
+            rel.to: "pat";
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            offscale;
          }
       }
    }
@@ -66,8 +63,6 @@ group { name: "e/conf/randr/main/frame";
    images.image: "led_tiny_orange.png" COMP;
    images.image: "led_tiny_green.png" COMP;
    images.image: "screen_bg.png" COMP;
-   images.image: "screen_fg.png" COMP;
-   images.image: "shine.png" COMP;
    images.image: "mini_blue_glow_arrow_0.png" COMP;
    images.image: "mini_blue_glow_arrow_2.png" COMP;
    images.image: "sym_down_light_normal.png" COMP;
@@ -78,17 +73,17 @@ group { name: "e/conf/randr/main/frame";
    images.image: "icon_arrow_up.png" COMP;
    styles {
       style { name: "randr_name_style";
-         base: "font="FN" font_size=10 text_class=randr_monitor align=center color=#ffff style=shadow,bottom shadow_color=#00000080 wrap=word";
+         base: "font="FNBD" font_size=10 text_class=randr_monitor align=center color=#ffff wrap=word";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD"";
       }
       style { name: "randr_resolution_style";
-         base: "font="FN" font_size=10 text_class=randr_resolution align=center color=#3399ffff wrap=mixed style=glow glow_color=#3399ff18 align=center glow2_color=#3399ff12";
+         base: "font="FN" font_size=10 text_class=randr_resolution align=center color=#ff9933ff wrap=mixed align=center";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD"";
       }
       style { name: "randr_position_style";
-         base: "font="FN" font_size=10 text_class=randr_position align=center color=#3399ffff wrap=mixed style=glow glow_color=#3399ff18 align=center glow2_color=#3399ff12";
+         base: "font="FN" font_size=10 text_class=randr_position align=center color=#3399ffff wrap=mixed align=center";
          tag: "br" "\n";
          tag: "hilight" "+ font="FNBD"";
       }
@@ -99,10 +94,10 @@ group { name: "e/conf/randr/main/frame";
    parts {
       part { name: "primary"; type: IMAGE;
          description { state: "default" 0.0;
-            image.normal: "glow_small.png";
-            image.border: 7 7 7 7;
-            rel1.offset: -4 -4;
-            rel2.offset: 3 3;
+            image.normal: "screen_bg.png";
+            image.border: 4 4 4 4;
+            rel1.offset: -2 -2;
+            rel2.offset: 1 1;
             visible: 0;
          }
          description { state: "on" 0.0;
@@ -181,12 +176,6 @@ group { name: "e/conf/randr/main/frame";
             fixed: 1 1;
          }
       }
-      part { name: "shine"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "screen_fg.png";
-            image.border: 4 4 4 4;
-         }
-      }
       part { name: "led"; mouse_events: 0;
          description { state: "default" 0.0;
             rel1.to: "hole";
@@ -257,17 +246,6 @@ group { name: "e/conf/randr/main/frame";
             visible: 0;
          }
       }
-      part { name: "scr_shine"; mouse_events: 0;
-         description { state: "default" 0.0;
-            image.normal: "shine.png";
-            rel1.offset: 0 -1;
-            rel1.to: "base";
-            rel2.relative: 1.0 0.0;
-            rel2.offset: -1 3;
-            rel2.to: "base";
-            FIXED_SIZE(69, 5)
-         }
-      }
       part { name: "pwrhint"; mouse_events: 0;
          description { state: "default" 0.0;
             rel1.to: "hole";
@@ -276,9 +254,10 @@ group { name: "e/conf/randr/main/frame";
             rel2.to: "hole";
             rel2.offset: -1 3;
             align: 0.5 0.0;
-            FIXED_SIZE(10, 10)
-            image.normal: "icon_arrow_up.png";
+            FIXED_SIZE(15, 15)
+            image.normal: "arrow-u-015.png";
             fixed: 1 1;
+            color: 51 153 255 255;
          }
       }
       part { name: "pwrhint2"; mouse_events: 0;
@@ -288,9 +267,10 @@ group { name: "e/conf/randr/main/frame";
             rel1.relative: 1.0 0.0;
             rel2.to: "pwrhint";
             align: 0.0 0.0;
-            FIXED_SIZE(16, 16)
+            FIXED_SIZE(20, 20)
             image.normal: "icon_system-shutdown.png";
             fixed: 1 1;
+            color: 51 153 255 255;
          }
       }
       part { name: "rsz1"; mouse_events: 0;
@@ -301,13 +281,14 @@ group { name: "e/conf/randr/main/frame";
             rel1.to: "e.event.resize";
             rel2.to: "e.event.resize";
             image.normal: "mini_blue_glow_arrow_2.png";
-            FIXED_SIZE(10, 10)
+            FIXED_SIZE(5, 5)
+            color: 51 153 255 255;
          }
          description { state: "pulse" 0.0;
             inherit: "default" 0.0;
             rel1.relative: -1.0 -1.0;
             rel2.relative: -1.0 -1.0;
-            color: 255 255 255 0;
+            color: 51 153 255 0;
          }
       }
       part { name: "rsz2"; mouse_events: 0;
@@ -318,13 +299,14 @@ group { name: "e/conf/randr/main/frame";
             rel1.to: "e.event.resize";
             rel2.to: "e.event.resize";
             image.normal: "mini_blue_glow_arrow_0.png";
-            FIXED_SIZE(10, 10)
+            FIXED_SIZE(5, 5)
+            color: 51 153 255 255;
          }
          description { state: "pulse" 0.0;
             inherit: "default" 0.0;
             rel1.relative: 2.0 2.0;
             rel2.relative: 2.0 2.0;
-            color: 255 255 255 0;
+            color: 51 153 255 0;
          }
       } 
       part { name: "rotc"; type: RECT;
@@ -344,14 +326,15 @@ group { name: "e/conf/randr/main/frame";
             rel1.to: "e.event.rotate";
             rel2.to: "e.event.rotate";
             image.normal: "mini_blue_glow_arrow_2.png";
-            FIXED_SIZE(10, 10)
+            FIXED_SIZE(5, 5)
             map.on: 1;
             map.smooth: 1;
             map.rotation.center: "rotc";
+            color: 51 153 255 255;
          }
          description { state: "pulse" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 0;
+            color: 51 153 255 0;
             map.rotation.z: -60;
          }
       }
@@ -363,14 +346,15 @@ group { name: "e/conf/randr/main/frame";
             rel1.to: "e.event.rotate";
             rel2.to: "e.event.rotate";
             image.normal: "mini_blue_glow_arrow_0.png";
-            FIXED_SIZE(10, 10)
+            FIXED_SIZE(5, 5)
             map.on: 1;
             map.smooth: 1;
             map.rotation.center: "rotc";
+            color: 51 153 255 255;
          }
          description { state: "pulse" 0.0;
             inherit: "default" 0.0;
-            color: 255 255 255 0;
+            color: 51 153 255 0;
             map.rotation.z: 60;
          }
       }
@@ -428,8 +412,9 @@ group { name: "e/conf/randr/main/frame";
          description { state: "default" 0.0;
             rel1.to: "e.event.arrow.show";
             rel2.to: "e.event.arrow.show";
-            image.normal: "sym_down_light_normal.png";
+            image.normal: "arrow-d-015.png";
             FIXED_SIZE(15, 15)
+            color: 51 153 255 255;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
@@ -441,8 +426,9 @@ group { name: "e/conf/randr/main/frame";
          description { state: "default" 0.0;
             rel1.to: "e.event.arrow.show";
             rel2.to: "e.event.arrow.show";
-            image.normal: "sym_up_light_normal.png";
+            image.normal: "arrow-u-015.png";
             FIXED_SIZE(15, 15)
+            color: 51 153 255 255;
          }
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
@@ -529,7 +515,7 @@ group { name: "e/conf/randr/main/frame";
       }
       program { name: "refresh_show";
          action: STATE_SET "expanded" 0.0;
-         transition: BOUNCE 1.0 0.5 4;
+         transition: DECELERATE 0.5;
          target: "e.swallow.refresh";
       }
       program { name: "refresh_hide";