diff --git a/configure.ac b/configure.ac
index b7edad2..aaa0cb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,6 +101,7 @@ data/themes/default/Makefile
 data/themes/default/images/Makefile
 data/templates/Makefile
 data/color/Makefile
+data/sounds/Makefile
 ])
 
 AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
index de3a12a..5c5e3c6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = images themes templates desktop icon color
+SUBDIRS = images themes templates desktop icon color sounds
diff --git a/data/sounds/Makefile.am b/data/sounds/Makefile.am
new file mode 100644
index 0000000..b5e47f3
--- /dev/null
+++ b/data/sounds/Makefile.am
@@ -0,0 +1,6 @@
+MAINTAINERCLEANFILES = Makefile.in
+filesdir = $(datadir)/$(PACKAGE)/sounds
+files_DATA = \
+kbd-tap.wav
+
+EXTRA_DIST = $(files_DATA)
diff --git a/data/sounds/kbd-tap.wav b/data/sounds/kbd-tap.wav
new file mode 100644
index 0000000..eecd4e3
Binary files /dev/null and b/data/sounds/kbd-tap.wav differ
diff --git a/data/templates/Makefile.am b/data/templates/Makefile.am
index 2413c5e..c6bdde1 100644
--- a/data/templates/Makefile.am
+++ b/data/templates/Makefile.am
@@ -1,19 +1,27 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 EDJE_CC = @edje_cc@
-EDJE_FLAGS = -id $(top_srcdir)/data/images
+EDJE_FLAGS = -id $(top_srcdir)/data/images -sd $(top_srcdir)/data/sounds
 
 filesdir = $(datadir)/$(PACKAGE)/templates
 files_DATA = basic.edc \
              basic.edj \
+             clip.edc \
+             clip.edj \
              empty.edc \
              empty.edj \
              image.edc \
              image.edj \
              map.edc \
              map.edj \
+             proxy.edc \
+             proxy.edj \
              rect.edc \
              rect.edj \
+             sound.edc \
+             sound.edj \
+             spacer.edc \
+             spacer.edj \
              text.edc \
              text.edj \
              textblock.edc \
@@ -55,5 +63,17 @@ image.edj: Makefile image.edc
 text.edj: Makefile text.edc
 	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/text.edc $(builddir)/text.edj
 
+proxy.edj: Makefile proxy.edc
+	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/proxy.edc $(builddir)/proxy.edj
+
+clip.edj: Makefile clip.edc
+	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/clip.edc $(builddir)/clip.edj
+
+spacer.edj: Makefile spacer.edc
+	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/spacer.edc $(builddir)/spacer.edj
+
+sound.edj: Makefile sound.edc
+	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/sound.edc $(builddir)/sound.edj
+
 clean-local:
 	rm -f *.edj
diff --git a/data/templates/clip.edc b/data/templates/clip.edc
new file mode 100644
index 0000000..95360db
--- /dev/null
+++ b/data/templates/clip.edc
@@ -0,0 +1,28 @@
+collections {
+   images {
+      image: "logo.png" COMP;
+   }
+   group { name: "main";
+      parts {
+         part { name: "clipper";
+            type: RECT;
+            description { state: "default" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.5 1.0;
+               color: 0 136 170 255;
+            }
+         }
+         part { name: "logo";
+            type: IMAGE;
+            clip_to: "clipper";
+            description { state: "default" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 1.0;
+               image.normal: "logo.png";
+               aspect: 1 1;
+               aspect_preference: BOTH;
+            }
+         }
+      }
+   }
+}
\ No newline at end of file
diff --git a/data/templates/proxy.edc b/data/templates/proxy.edc
new file mode 100644
index 0000000..7361914
--- /dev/null
+++ b/data/templates/proxy.edc
@@ -0,0 +1,29 @@
+collections {
+   images {
+      image: "logo.png" COMP;
+   }
+   group { name: "main";
+      parts {
+         part { name: "logo";
+            type: IMAGE;
+            description { state: "default" 0.0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.5 0.5;
+               image.normal: "logo.png";
+               aspect: 1 1;
+               aspect_preference: BOTH;
+            }
+         }
+         part { name: "proxy";
+            type: PROXY;
+            description { state: "default" 0.0;
+               rel1.relative: 0.5 0.5;
+               rel2.relative: 1.0 1.0;
+               aspect: 1 1;
+               aspect_preference: BOTH;
+               source: "logo";
+            }
+         }
+      }
+   }
+}
\ No newline at end of file
diff --git a/data/templates/sound.edc b/data/templates/sound.edc
new file mode 100644
index 0000000..e16e8b7
--- /dev/null
+++ b/data/templates/sound.edc
@@ -0,0 +1,24 @@
+collections {
+   sounds {
+      sample { name: "sound" LOSSY 64;
+         source: "kbd-tap.wav";
+      }
+   }
+   group { name: "main";
+      parts {
+         part { name: "rect";
+            type: RECT;
+            description { state: "default" 0.0;
+               color: 0 136 170 255;
+            }
+         }
+      }
+      programs {
+         program { name: "mouse_down";
+            signal: "mouse,down,1";
+            source: "rect";
+            action: PLAY_SAMPLE "sound" 1.0;
+         }
+      }
+   }
+}
\ No newline at end of file
diff --git a/data/templates/spacer.edc b/data/templates/spacer.edc
new file mode 100644
index 0000000..3fc3bc4
--- /dev/null
+++ b/data/templates/spacer.edc
@@ -0,0 +1,38 @@
+collections {
+   group { name: "main";
+      parts {
+         part { name: "spacer1";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 50 50;
+               fixed: 1 1;
+               align: 0 0;
+               rel1.relative: 0.0 0.0;
+               rel2.relative: 0.0 0.0;
+            }
+         }
+         part { name: "spacer2";
+            type: SPACER;
+            scale: 1;
+            description { state: "default" 0.0;
+               min: 50 50;
+               fixed: 1 1;
+               align: 1 1;
+               rel1.relative: 1.0 1.0;
+               rel2.relative: 1.0 1.0;
+            }
+         }
+         part { name: "rect";
+            type: RECT;
+            description { state: "default" 0.0;
+               rel1.to: "spacer1";
+               rel1.relative: 1.0 1.0;
+               rel2.to: "spacer2";
+               rel2.relative: 0.0 0.0;
+               color: 0 136 170 255;
+            }
+         }
+      }
+   }
+}
\ No newline at end of file