diff --git a/data/themes/default.edc b/data/themes/default.edc
index ab3fc67d2..b7573fbca 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -30151,203 +30151,109 @@ collections {
 /////////////////////////////////////////////////////////////////////////////
 /*** MOD: WIZARD ***/
 
-   group {
-      name: "e/wizard/extra";
+   group { name: "e/wizard/firstpage";
+      images {
+         image: "logo_black_128.png" COMP;
+      }
       parts {
-         part {
-            name: "base";
-            type: RECT;
-            description {
-               state: "default" 0.0;
-               color: 0 0 0 255;
+         part { name: "base";
+            description { state: "default" 0.0;
+               max: 128 128;
+               image.normal: "logo_black_128.png";
+               aspect: 1.0 1.0;
+               aspect_preference: BOTH;
             }
          }
       }
    }
-   group {
-      name: "e/wizard/main";
-      /* images used */
+   group { name: "e/wizard/extra";
       images {
-         image: "exq-bglight.png" COMP;
-         image: "exq-logo.png" COMP;
-         image: "exq-dot.png" COMP;
-         image: "exq-dot-glow.png" COMP;
-         image: "exq-vgrad.png" COMP;
+         image: "bg_shadow.png" COMP;
+         image: "wizard_pattern.png" COMP;
       }
       parts {
-         part {
-            name: "base";
-            type: RECT;
-            description {
-               state: "default" 0.0;
-               color: 0 0 0 255;
+         part { name: "base";
+            description { state: "default" 0.0;
+               image.normal: "wizard_pattern.png";
+               fill {
+                  smooth: 0;
+                  size {
+                     relative: 0.0 0.0;
+                     offset: 200 200;
+                  }
+               }
             }
          }
-         part {
-            name: "content";
-            type: RECT;
-            description {
-               state: "default" 0.0;
+         part { name: "shadow";
+            description { state: "default" 0.0;
+               image.normal: "bg_shadow.png";
+               fill.smooth: 0;
+            }
+         }
+         part { name: "fade"; type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               color: 0 0 0 255;
+            }
+            description { state: "hidden" 0.0;
+               inherit: "default" 0.0;
+               color: 0 0 0 0;
                visible: 0;
+            }
+         }
+      }
+      programs {
+         program { name: "fade_in";
+            signal: "show";
+            source: "";
+            action: STATE_SET "hidden" 0.0;
+            transition: DECELERATE 0.5;
+            target: "fade";
+         }
+      }
+   }
+   group { name: "e/wizard/main";
+      images {
+         image: "bg_shadow.png" COMP;
+         image: "wizard_pattern.png" COMP;
+         image: "wizard_bt1.png" COMP;
+         image: "wizard_bt2.png" COMP;
+      }
+      parts {
+         part { name: "base";
+            description { state: "default" 0.0;
+               image.normal: "wizard_pattern.png";
+               fill {
+                  smooth: 0;
+                  size {
+                     relative: 0.0 0.0;
+                     offset: 200 200;
+                  }
+               }
+            }
+         }
+         part { name: "e.swallow.content"; type: SWALLOW;
+            description { state: "default" 0.0;
                rel1 {
                   to_y: "e.text.title";
                   relative: 0.2 1.0;
                   offset: 8 8;
                }
                rel2 {
-                  to_y: "logo";
-                  relative: 0.8 (143/217);
-                  offset: -9 -9;
+                  to_y: "e.text.label";
+                  relative: 0.8 0.0;
+                  offset: -9 -21;
                }
             }
          }
-         part {
-            name: "swallow_center";
-            type: RECT;
-            description {
-               state: "default" 0.0;
-               visible: 0;
-               rel1 {
-                  to: "content";
-                  relative: 0.5 1.0;
-               }
-               rel2 {
-                  to: "content";
-                  relative: 0.5 1.0;
-               }
-            }
-         }
-         part {
-            name: "swallow_mirror";
-            type: PROXY;
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               source: "e.swallow.content";
-               rel1 {
-                  to: "content";
-               }
-               rel2 {
-                  to: "content";
-               }
-               perspective {
-                  zplane: 0;
-                  focal: 1000;
-               }
-               color: 255 255 255 64;
-               map {
-                  on: 1;
-                  smooth: 0;
-                  alpha: 1;
-                  rotation {
-                     center: "swallow_center";
-                     x: 180;
-                  }
-               }
-            }
-         }
-         part {
-            name: "mirror_fade";
-            description {
-               state: "default" 0.0;
-               rel1 {
-                  to_y: "content";
-                  relative: 0.0 1.0;
-               }
-               image {
-                  normal: "exq-vgrad.png";
-               }
-               fill.smooth: 0;
-            }
-            description {
-               state: "clicked" 0.0;
-               inherit: "default" 0.0;
-               image.normal: "bt_base1.png";
-            }
-            description {
-               state: "disabled" 0.0;
-               inherit: "default" 0.0;
-               image {
-                  normal: "bt_dis_base.png";
-                  border: 4 4 4 4;
-               }
-            }
-         }
-         part {
-            name: "light";
-            description {
-               state: "default" 0.0;
-               align: 0.5 0.5;
-               rel1.relative: 0.1 0.8;
-               rel2.relative: 0.9 1.2;
-               aspect: (380/180) (380/180);
-               aspect_preference: HORIZONTAL;
-               max: 380 180;
-               image.normal: "exq-bglight.png";
-               color: 255 255 255 0;
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
-         }
-         part {
-            name: "e.swallow.content";
-            type: SWALLOW;
-            description {
-               state: "default" 0.0;
-               rel1 {
-                  to: "content";
-               }
-               rel2 {
-                  to: "content";
-               }
-            }
-         }
-         part {
-            name: "logoclip";
-            type: RECT;
-            description {
-               state: "default" 0.0;
-               visible: 0;
-               color: 255 255 255 0;
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               visible: 1;
-               color: 255 255 255 255;
-            }
-         }
-         part {
-            name: "logo";
-            clip_to: "logoclip";
-            mouse_events: 0;
-            description {
-               state: "default" 0.0;
-               align: 0.5 1.0;
-               rel1.relative: 0.2 0.6;
-               rel2.relative: 0.8 1.0;
-               aspect: (121/217) (121/217);
-               aspect_preference: BOTH;
-               max: 121 217;
-               image.normal: "exq-logo.png";
-            }
-         }
-         part {
-            name: "e.text.title";
-            type: TEXT;
+         part { name: "e.text.title"; type: TEXT;
+            effect: SOFT_SHADOW;
             scale: 1;
-            description {
-               state: "default" 0.0;
-               rel1 {
-                  relative: 0.05 0.05;
-               }
-               rel2 {
-                  relative: 0.95 0.10;
-               }
-               color: 255 255 255 0;
+            description { state: "default" 0.0;
+               rel1.relative: 0.05 0.05;
+               rel2.relative: 0.95 0.10;
+               color: 255 255 255 255;
+               color3: 0 0 0 32;
                text {
                   font: "Sans:style=Bold";
                   size: 16;
@@ -30355,592 +30261,36 @@ collections {
                   text_class: "init_title";
                }
             }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
          }
-         part {
-            name: "p0-0";
-            description {
-               state: "default" 0.0;
-               min: 22 22;
-               max: 22 22;
+         part { name: "button";
+            description { state: "default" 0.0;
+               image.normal: "wizard_bt1.png";
+               image.border: 12 12 12 12;
                rel1 {
-                  to: "logo";
-                  relative: -0.5 0.7;
+                  to: "e.text.label";
+                  offset: -12 -12;
                }
                rel2 {
-                  to: "logo";
-                  relative: -0.5 0.7;
+                  to: "e.text.label";
+                  offset: 11 11;
                }
-               image.normal: "exq-dot.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: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-               rel1.relative: -0.5 0.6;
-               rel2.relative: -0.5 0.6;
+               image.normal: "wizard_bt2.png";
             }
          }
-         part {
-            name: "p0-1";
-            description {
-               state: "default" 0.0;
-               image.normal: "exq-dot-glow.png";
-               color: 255 255 255 0;
-               rel1.to: "p0-0";
-               rel2.to: "p0-0";
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
-         }
-         part {
-            name: "p0-0.1";
-            description {
-               state: "default" 0.0;
-               image.normal: "exq-dot-glow.png";
-               color: 255 255 255 0;
-               min: 22 11;
-               max: 22 11;
-               rel1 {
-                  to_x: "p0-0";
-                  to_y: "logo";
-                  relative: 0.0 0.8;
-               }
-               rel2 {
-                  to_x: "p0-0";
-                  to_y: "logo";
-                  relative: 1.0 0.8;
-               }
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 16;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 4;
-            }
-         }
-         part {
-            name: "p0-0.2";
-            description {
-               state: "default" 0.0;
-               min: 22 22;
-               max: 22 22;
-               rel1 {
-                  to_x: "p0-0";
-                  to_y: "logo";
-                  relative: 0.0 0.9;
-               }
-               rel2 {
-                  to_x: "p0-0";
-                  to_y: "logo";
-                  relative: 1.0 0.9;
-               }
-               image.normal: "exq-dot.png";
-               color: 255 255 255 0;
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 16;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 4;
-               rel1.relative: 0.0 1.0;
-               rel2.relative: 1.0 1.0;
-            }
-         }
-         part {
-            name: "p1-0";
-            description {
-               state: "default" 0.0;
-               min: 22 22;
-               max: 22 22;
-               rel1 {
-                  to: "logo";
-                  relative: 0.0 0.7;
-               }
-               rel2 {
-                  to: "logo";
-                  relative: 0.0 0.7;
-               }
-               image.normal: "exq-dot.png";
-               color: 255 255 255 0;
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-               rel1.relative: 0.0 0.6;
-               rel2.relative: 0.0 0.6;
-            }
-         }
-         part {
-            name: "p1-1";
-            description {
-               state: "default" 0.0;
-               image.normal: "exq-dot-glow.png";
-               color: 255 255 255 0;
-               rel1.to: "p1-0";
-               rel2.to: "p1-0";
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
-         }
-         part {
-            name: "p1-0.1";
-            description {
-               state: "default" 0.0;
-               image.normal: "exq-dot-glow.png";
-               color: 255 255 255 0;
-               min: 22 11;
-               max: 22 11;
-               rel1 {
-                  to_x: "p1-0";
-                  to_y: "logo";
-                  relative: 0.0 0.8;
-               }
-               rel2 {
-                  to_x: "p1-0";
-                  to_y: "logo";
-                  relative: 1.0 0.8;
-               }
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 16;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 4;
-            }
-         }
-         part {
-            name: "p1-0.2";
-            description {
-               state: "default" 0.0;
-               min: 22 22;
-               max: 22 22;
-               rel1 {
-                  to_x: "p1-0";
-                  to_y: "logo";
-                  relative: 0.0 0.9;
-               }
-               rel2 {
-                  to_x: "p1-0";
-                  to_y: "logo";
-                  relative: 1.0 0.9;
-               }
-               image.normal: "exq-dot.png";
-               color: 255 255 255 0;
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 16;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 4;
-               rel1.relative: 0.0 1.0;
-               rel2.relative: 1.0 1.0;
-            }
-         }
-         part {
-            name: "p2-0";
-            description {
-               state: "default" 0.0;
-               min: 22 22;
-               max: 22 22;
-               rel1 {
-                  to: "logo";
-                  relative: 0.5 0.7;
-               }
-               rel2 {
-                  to: "logo";
-                  relative: 0.5 0.7;
-               }
-               image.normal: "exq-dot.png";
-               color: 255 255 255 0;
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-               rel1.relative: 0.5 0.6;
-               rel2.relative: 0.5 0.6;
-            }
-         }
-         part {
-            name: "p2-1";
-            description {
-               state: "default" 0.0;
-               image.normal: "exq-dot-glow.png";
-               color: 255 255 255 0;
-               rel1.to: "p2-0";
-               rel2.to: "p2-0";
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
-         }
-         part {
-            name: "p2-0.1";
-            description {
-               state: "default" 0.0;
-               image.normal: "exq-dot-glow.png";
-               color: 255 255 255 0;
-               min: 22 11;
-               max: 22 11;
-               rel1 {
-                  to_x: "p2-0";
-                  to_y: "logo";
-                  relative: 0.0 0.8;
-               }
-               rel2 {
-                  to_x: "p2-0";
-                  to_y: "logo";
-                  relative: 1.0 0.8;
-               }
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 16;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 4;
-            }
-         }
-         part {
-            name: "p2-0.2";
-            description {
-               state: "default" 0.0;
-               min: 22 22;
-               max: 22 22;
-               rel1 {
-                  to_x: "p2-0";
-                  to_y: "logo";
-                  relative: 0.0 0.9;
-               }
-               rel2 {
-                  to_x: "p2-0";
-                  to_y: "logo";
-                  relative: 1.0 0.9;
-               }
-               image.normal: "exq-dot.png";
-               color: 255 255 255 0;
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 16;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 4;
-               rel1.relative: 0.0 1.0;
-               rel2.relative: 1.0 1.0;
-            }
-         }
-         part {
-            name: "p3-0";
-            description {
-               state: "default" 0.0;
-               min: 22 22;
-               max: 22 22;
-               rel1 {
-                  to: "logo";
-                  relative: 1.0 0.7;
-               }
-               rel2 {
-                  to: "logo";
-                  relative: 1.0 0.7;
-               }
-               image.normal: "exq-dot.png";
-               color: 255 255 255 0;
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-               rel1.relative: 1.0 0.6;
-               rel2.relative: 1.0 0.6;
-            }
-         }
-         part {
-            name: "p3-1";
-            description {
-               state: "default" 0.0;
-               image.normal: "exq-dot-glow.png";
-               color: 255 255 255 0;
-               rel1.to: "p3-0";
-               rel2.to: "p3-0";
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
-         }
-         part {
-            name: "p3-0.1";
-            description {
-               state: "default" 0.0;
-               image.normal: "exq-dot-glow.png";
-               color: 255 255 255 0;
-               min: 22 11;
-               max: 22 11;
-               rel1 {
-                  to_x: "p3-0";
-                  to_y: "logo";
-                  relative: 0.0 0.8;
-               }
-               rel2 {
-                  to_x: "p3-0";
-                  to_y: "logo";
-                  relative: 1.0 0.8;
-               }
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 16;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 4;
-            }
-         }
-         part {
-            name: "p3-0.2";
-            description {
-               state: "default" 0.0;
-               min: 22 22;
-               max: 22 22;
-               rel1 {
-                  to_x: "p3-0";
-                  to_y: "logo";
-                  relative: 0.0 0.9;
-               }
-               rel2 {
-                  to_x: "p3-0";
-                  to_y: "logo";
-                  relative: 1.0 0.9;
-               }
-               image.normal: "exq-dot.png";
-               color: 255 255 255 0;
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 16;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 4;
-               rel1.relative: 0.0 1.0;
-               rel2.relative: 1.0 1.0;
-            }
-         }
-         part {
-            name: "p4-0";
-            description {
-               state: "default" 0.0;
-               min: 22 22;
-               max: 22 22;
-               rel1 {
-                  to: "logo";
-                  relative: 1.5 0.7;
-               }
-               rel2 {
-                  to: "logo";
-                  relative: 1.5 0.7;
-               }
-               image.normal: "exq-dot.png";
-               color: 255 255 255 0;
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-               rel1.relative: 1.5 0.6;
-               rel2.relative: 1.5 0.6;
-            }
-         }
-         part {
-            name: "p4-1";
-            description {
-               state: "default" 0.0;
-               image.normal: "exq-dot-glow.png";
-               color: 255 255 255 0;
-               rel1.to: "p4-0";
-               rel2.to: "p4-0";
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 255;
-            }
-         }
-         part {
-            name: "p4-0.1";
-            description {
-               state: "default" 0.0;
-               image.normal: "exq-dot-glow.png";
-               color: 255 255 255 0;
-               min: 22 11;
-               max: 22 11;
-               rel1 {
-                  to_x: "p4-0";
-                  to_y: "logo";
-                  relative: 0.0 0.8;
-               }
-               rel2 {
-                  to_x: "p4-0";
-                  to_y: "logo";
-                  relative: 1.0 0.8;
-               }
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 16;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 4;
-            }
-         }
-         part {
-            name: "p4-0.2";
-            description {
-               state: "default" 0.0;
-               min: 22 22;
-               max: 22 22;
-               rel1 {
-                  to_x: "p4-0";
-                  to_y: "logo";
-                  relative: 0.0 0.9;
-               }
-               rel2 {
-                  to_x: "p4-0";
-                  to_y: "logo";
-                  relative: 1.0 0.9;
-               }
-               image.normal: "exq-dot.png";
-               color: 255 255 255 0;
-            }
-            description {
-               state: "visible" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 16;
-            }
-            description {
-               state: "visible2" 0.0;
-               inherit: "default" 0.0;
-               color: 255 255 255 4;
-               rel1.relative: 0.0 1.0;
-               rel2.relative: 1.0 1.0;
-            }
-         }
-         part {
-            name: "e.text.label";
-            type: TEXT;
-            effect: GLOW;
+         part { name: "e.text.label"; type: TEXT;
+            effect: SHADOW BOTTOM;
             mouse_events: 1;
             scale: 1;
-            clip_to: "bdis";
-            description {
-               state: "default" 0.0;
+            description { state: "default" 0.0;
                min: 64 32;
                align: 0.5 1.0;
-               rel1 {
-                  relative: 0.5  0.95;
-               }
-               rel2 {
-                  relative: 0.5  0.95;
-               }
-               color: 180 180 180 255;
-               color2: 255 255 255 24;
-               color3: 255 255 255 6;
+               rel1.relative: 0.5  0.95;
+               rel2.relative: 0.5  0.95;
+               color: 32 32 32 255;
+               color3: 255 255 255 128;
                text {
                   text: "Next";
                   font: "Sans:style=Bold";
@@ -30948,359 +30298,82 @@ collections {
                   min: 1 1;
                }
             }
-            description {
-               state: "clicked" 0.0;
+            description { state: "disabled" 0.0;
                inherit: "default" 0.0;
-               color: 255 255 255 255;
-               color2: 255 255 255 40;
-               color3: 255 255 255 10;
+               color: 128 128 128 255;
+               color3: 255 255 255 64;
             }
          }
-         part {
-            name: "arrow";
-            type: TEXT;
-            effect: GLOW;
-            scale: 1;
-            clip_to: "bdis";
-            description {
-               state: "default" 0.0;
-               min: 32 32;
-               align: 0.0 0.5;
-               rel1 {
-                  to: "e.text.label";
-                  relative: 1.0  0.0;
-               }
-               rel2 {
-                  to: "e.text.label";
-                  relative: 1.0  1.0;
-               }
-               color: 255 255 255 255;
-               color2: 255 255 255 40;
-               color3: 255 255 255 10;
-               text {
-                  text: ">";
-                  font: "Sans:style=Bold";
-                  size: 16;
-                  min: 1 1;
-               }
-            }
-            description {
-               state: "go" 0.0;
-               inherit: "default" 0.0;
-               color: 180 180 180 0;
-               color2: 255 255 255 0;
-               color3: 255 255 255 0;
-               rel1.relative: 2.0 0.0;
-               rel2.relative: 2.0 1.0;
-            }
-         }
-         part {
-            name: "block";
+         part { name: "block"; type: RECT;
             mouse_events: 1;
-            description {
-               state: "default" 0.0;
+            description { state: "default" 0.0;
                rel1.to: "e.text.label";
                rel2.to: "e.text.label";
                visible: 0;
                color: 0 0 0 0;
             }
-            description {
-               state: "disabled" 0.0;
+            description { state: "disabled" 0.0;
                inherit: "default" 0.0;
                visible: 1;
-               color: 0 0 255 128;
             }
          }
-         part {
-            name: "bdis";
-            type: RECT;
-            description {
-               state: "default" 0.0;
-               color: 255 255 255 255;
+         part { name: "shadow2";
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               image.normal: "bg_shadow.png";
+               fill.smooth: 0;
             }
-            description {
-               state: "disabled" 0.0;
+         }
+         part { name: "fade"; type: RECT;
+            mouse_events: 0;
+            description { state: "default" 0.0;
+               color: 0 0 0 255;
+            }
+            description { state: "hidden" 0.0;
                inherit: "default" 0.0;
-               color: 255 255 255 64;
+               color: 0 0 0 0;
+               visible: 0;
             }
          }
       }
       programs {
-         program {
-            name: "button_click";
+         program { name: "fade_in";
+            signal: "show";
+            source: "";
+            action: STATE_SET "hidden" 0.0;
+            transition: DECELERATE 0.5;
+            target: "fade";
+         }
+         program { name: "button_click";
             signal: "mouse,down,1";
             source: "e.text.label";
             action: STATE_SET "clicked" 0.0;
-            target: "e.text.label";
+            target: "button";
          }
-         program {
-            name: "button_unclick";
+         program { name: "button_unclick";
             signal: "mouse,up,1";
             source: "e.text.label";
             action: STATE_SET "default" 0.0;
-            target: "e.text.label";
+            target: "button";
          }
-         program {
-            name: "button_unclick2";
+         program { name: "button_unclick2";
             signal: "mouse,clicked,1";
             source: "e.text.label";
             action: SIGNAL_EMIT "e,action,next" "";
-            after: "button_go";
          }
-         program {
-            name: "button_go";
-            action: STATE_SET "go" 0.0;
-            transition: ACCELERATE 0.5;
-            target: "arrow";
-            after: "button_go2";
-         }
-         program {
-            name: "button_go2";
-            action: STATE_SET "default" 0.0;
-            target: "arrow";
-         }
-         program {
-            name: "button_enable";
+         program { name: "button_enable";
             signal: "e,state,next,enable";
             source: "e";
             action: STATE_SET "default" 0.0;
             target: "block";
-            target: "bdis";
+            target: "e.text.label";
          }
-         program {
-            name: "button_disable";
+         program { name: "button_disable";
             signal: "e,state,next,disable";
             source: "e";
             action: STATE_SET "disabled" 0.0;
             target: "block";
-            target: "bdis";
-         }
-         program {
-            name: "show1";
-            signal: "show";
-            source: "";
-            action: STATE_SET "visible" 0.0;
-            transition: LINEAR 0.3;
-            target: "light";
-         }
-         program {
-            name: "show2";
-            signal: "show";
-            source: "";
-            in: 0.1 0.0;
-            action: STATE_SET "visible" 0.0;
-            transition: LINEAR 0.4;
-            target: "logoclip";
-            target: "e.text.title";
-         }
-         program {
-            name: "show3";
-            signal: "show";
-            source: "";
-            action: STATE_SET "visible" 0.0;
-            transition: LINEAR 0.2;
-            target: "p0-0";
-            target: "p0-0.1";
-            target: "p0-0.2";
-            target: "p1-0";
-            target: "p1-0.1";
-            target: "p1-0.2";
-            target: "p2-0";
-            target: "p2-0.1";
-            target: "p2-0.2";
-            target: "p3-0";
-            target: "p3-0.1";
-            target: "p3-0.2";
-            target: "p4-0";
-            target: "p4-0.1";
-            target: "p4-0.2";
-            after: "pulsate1";
-            after: "pulsate1.2";
-            after: "pulsate2";
-            after: "pulsate2.2";
-            after: "pulsate3";
-            after: "pulsate3.2";
-            after: "pulsate4";
-            after: "pulsate4.2";
-            after: "pulsate5";
-            after: "pulsate5.2";
-            after: "ready";
-         }
-         program {
-            name: "ready";
-            action: STATE_SET "default" 0.0;
-            transition: ACCELERATE 2.0;
-            target: "logoclip";
-         }
-         program {
-            name: "pulsate1";
-            action: STATE_SET "visible" 0.0;
-            transition: SINUSOIDAL 0.5;
-            in: 0.2 0.2;
-            after: "pulsate1.1";
-            target: "p0-1";
-         }
-         program {
-            name: "pulsate1.1";
-            action: STATE_SET "default" 0.0;
-            transition: SINUSOIDAL 0.5;
-            after: "pulsate1";
-            target: "p0-1";
-         }
-         program {
-            name: "pulsate1.2";
-            action: STATE_SET "visible2" 0.0;
-            transition: SINUSOIDAL 0.6;
-            in: 0.2 0.2;
-            after: "pulsate1.2.1";
-            target: "p0-0";
-            target: "p0-0.1";
-            target: "p0-0.2";
-         }
-         program {
-            name: "pulsate1.2.1";
-            action: STATE_SET "visible" 0.0;
-            transition: SINUSOIDAL 0.7;
-            after: "pulsate1.2";
-            target: "p0-0";
-            target: "p0-0.1";
-            target: "p0-0.2";
-         }
-         program {
-            name: "pulsate2";
-            action: STATE_SET "visible" 0.0;
-            transition: SINUSOIDAL 0.5;
-            in: 0.2 0.2;
-            after: "pulsate2.1";
-            target: "p1-1";
-         }
-         program {
-            name: "pulsate2.1";
-            action: STATE_SET "default" 0.0;
-            transition: SINUSOIDAL 0.5;
-            after: "pulsate2";
-            target: "p1-1";
-         }
-         program {
-            name: "pulsate2.2";
-            action: STATE_SET "visible2" 0.0;
-            transition: SINUSOIDAL 0.6;
-            in: 0.2 0.2;
-            after: "pulsate2.2.1";
-            target: "p1-0";
-            target: "p1-0.1";
-            target: "p1-0.2";
-         }
-         program {
-            name: "pulsate2.2.1";
-            action: STATE_SET "visible" 0.0;
-            transition: SINUSOIDAL 0.7;
-            after: "pulsate2.2";
-            target: "p1-0";
-            target: "p1-0.1";
-            target: "p1-0.2";
-         }
-         program {
-            name: "pulsate3";
-            action: STATE_SET "visible" 0.0;
-            transition: SINUSOIDAL 0.5;
-            in: 0.2 0.2;
-            after: "pulsate3.1";
-            target: "p2-1";
-         }
-         program {
-            name: "pulsate3.1";
-            action: STATE_SET "default" 0.0;
-            transition: SINUSOIDAL 0.5;
-            after: "pulsate3";
-            target: "p2-1";
-         }
-         program {
-            name: "pulsate3.2";
-            action: STATE_SET "visible2" 0.0;
-            transition: SINUSOIDAL 0.6;
-            in: 0.2 0.2;
-            after: "pulsate3.2.1";
-            target: "p2-0";
-            target: "p2-0.1";
-            target: "p2-0.2";
-         }
-         program {
-            name: "pulsate3.2.1";
-            action: STATE_SET "visible" 0.0;
-            transition: SINUSOIDAL 0.7;
-            after: "pulsate3.2";
-            target: "p2-0";
-            target: "p2-0.1";
-            target: "p2-0.2";
-         }
-         program {
-            name: "pulsate4";
-            action: STATE_SET "visible" 0.0;
-            transition: SINUSOIDAL 0.5;
-            in: 0.2 0.2;
-            after: "pulsate4.1";
-            target: "p3-1";
-         }
-         program {
-            name: "pulsate4.1";
-            action: STATE_SET "default" 0.0;
-            transition: SINUSOIDAL 0.5;
-            after: "pulsate4";
-            target: "p3-1";
-         }
-         program {
-            name: "pulsate4.2";
-            action: STATE_SET "visible2" 0.0;
-            transition: SINUSOIDAL 0.6;
-            in: 0.2 0.2;
-            after: "pulsate4.2.1";
-            target: "p3-0";
-            target: "p3-0.1";
-            target: "p3-0.2";
-         }
-         program {
-            name: "pulsate4.2.1";
-            action: STATE_SET "visible" 0.0;
-            transition: SINUSOIDAL 0.7;
-            after: "pulsate4.2";
-            target: "p3-0";
-            target: "p3-0.1";
-            target: "p3-0.2";
-         }
-         program {
-            name: "pulsate5";
-            action: STATE_SET "visible" 0.0;
-            transition: SINUSOIDAL 0.5;
-            in: 0.2 0.2;
-            after: "pulsate5.1";
-            target: "p4-1";
-         }
-         program {
-            name: "pulsate5.1";
-            action: STATE_SET "default" 0.0;
-            transition: SINUSOIDAL 0.5;
-            after: "pulsate5";
-            target: "p4-1";
-         }
-         program {
-            name: "pulsate5.2";
-            action: STATE_SET "visible2" 0.0;
-            transition: SINUSOIDAL 0.6;
-            in: 0.2 0.2;
-            after: "pulsate5.2.1";
-            target: "p4-0";
-            target: "p4-0.1";
-            target: "p4-0.2";
-         }
-         program {
-            name: "pulsate5.2.1";
-            action: STATE_SET "visible" 0.0;
-            transition: SINUSOIDAL 0.7;
-            after: "pulsate5.2";
-            target: "p4-0";
-            target: "p4-0.1";
-            target: "p4-0.2";
+            target: "e.text.label";
          }
       }
    }
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index 03d8d659c..0cd1387b3 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -447,4 +447,7 @@ batt_power.png \
 bg_shadow.png \
 bg_over.png \
 bg_base.png \
-xkbshad.png
+xkbshad.png \
+wizard_pattern.png \
+wizard_bt1.png \
+wizard_bt2.png
diff --git a/data/themes/images/wizard_bt1.png b/data/themes/images/wizard_bt1.png
new file mode 100644
index 000000000..26cfc0f4a
Binary files /dev/null and b/data/themes/images/wizard_bt1.png differ
diff --git a/data/themes/images/wizard_bt2.png b/data/themes/images/wizard_bt2.png
new file mode 100644
index 000000000..b929d45bb
Binary files /dev/null and b/data/themes/images/wizard_bt2.png differ
diff --git a/data/themes/images/wizard_pattern.png b/data/themes/images/wizard_pattern.png
new file mode 100644
index 000000000..662c9e05f
Binary files /dev/null and b/data/themes/images/wizard_pattern.png differ