diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 19e436fd..91b5ff49 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -6,7 +6,7 @@ EDJE_CC = @edje_cc@
 EDJE_FLAGS_VERBOSE_ =
 EDJE_FLAGS_VERBOSE_0 =
 EDJE_FLAGS_VERBOSE_1 = -v
-EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) -id $(top_srcdir)/data/themes/images -fd $(top_srcdir)/data/fonts
+EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) -id $(top_srcdir)/data/themes/images -fd $(top_srcdir)/data/fonts -sd $(top_srcdir)/data/themes/sounds
 
 filesdir = $(pkgdatadir)/themes
 files_DATA = \
diff --git a/data/themes/default.edc b/data/themes/default.edc
index d2c2b894..42e3f2ad 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -95,6 +95,11 @@ collections {
         image: "pm_fill.png" COMP;
         image: "cr_glow.png" COMP;
       }
+      sounds {
+         sample { name: "bell" LOSSY 64;
+            source: "bell.wav";
+         }
+      }
       parts {
          ////////////////////////////////////////////////////////////////////
          // background handling
@@ -603,6 +608,10 @@ collections {
                map.rotation.z: 720.0;
             }
          }
+         program {
+            signal: "bell"; source: "terminology";
+            action: PLAY_SAMPLE "bell" 1.0;
+         }
          program {
             signal: "bell"; source: "terminology";
             action: STATE_SET "default" 0.0;
@@ -2353,6 +2362,23 @@ target: "4.bottom"
         image: "cr_pulse.png" COMP;
         image: "cr_glow.png" COMP;
       }
+      sounds {
+         sample { name: "key-tap1" LOSSY 64;
+            source: "kbd-tap.wav";
+         }
+         sample { name: "key-tap2" LOSSY 64;
+            source: "kbd-tap2.wav";
+         }
+         sample { name: "key-tap3" LOSSY 64;
+            source: "kbd-tap3.wav";
+         }
+         sample { name: "key-tap4" LOSSY 64;
+            source: "kbd-tap4.wav";
+         }
+         sample { name: "key-tap5" LOSSY 64;
+            source: "kbd-tap5.wav";
+         }
+      }
       parts {
          part { name: "key";
             mouse_events: 0;
@@ -2496,6 +2522,29 @@ target: "4.bottom"
                target: "glow";
                target: "outline";
             }
+            program {
+               signal: "key,down"; source: "terminology";
+               script {
+                  new buf[32];
+                  snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
+                  run_program(get_program_id(buf));
+               }
+            }
+            program { name: "key-down1";
+               action: PLAY_SAMPLE "key-tap1" 1.0;
+            }
+            program { name: "key-down2";
+               action: PLAY_SAMPLE "key-tap2" 1.0;
+            }
+            program { name: "key-down3";
+               action: PLAY_SAMPLE "key-tap3" 1.0;
+            }
+            program { name: "key-down4";
+               action: PLAY_SAMPLE "key-tap4" 1.0;
+            }
+            program { name: "key-down5";
+               action: PLAY_SAMPLE "key-tap5" 1.0;
+            }
             program {
                signal: "key,down"; source: "terminology";
                action: STATE_SET "default" 0.0;
diff --git a/data/themes/sounds/bell.wav b/data/themes/sounds/bell.wav
new file mode 100644
index 00000000..c0528812
Binary files /dev/null and b/data/themes/sounds/bell.wav differ
diff --git a/data/themes/sounds/kbd-tap.wav b/data/themes/sounds/kbd-tap.wav
new file mode 100644
index 00000000..50bbf4cc
Binary files /dev/null and b/data/themes/sounds/kbd-tap.wav differ
diff --git a/data/themes/sounds/kbd-tap2.wav b/data/themes/sounds/kbd-tap2.wav
new file mode 100644
index 00000000..8ca8d0a3
Binary files /dev/null and b/data/themes/sounds/kbd-tap2.wav differ
diff --git a/data/themes/sounds/kbd-tap3.wav b/data/themes/sounds/kbd-tap3.wav
new file mode 100644
index 00000000..849fa1c9
Binary files /dev/null and b/data/themes/sounds/kbd-tap3.wav differ
diff --git a/data/themes/sounds/kbd-tap4.wav b/data/themes/sounds/kbd-tap4.wav
new file mode 100644
index 00000000..eecd4e3d
Binary files /dev/null and b/data/themes/sounds/kbd-tap4.wav differ
diff --git a/data/themes/sounds/kbd-tap5.wav b/data/themes/sounds/kbd-tap5.wav
new file mode 100644
index 00000000..a2dc79b6
Binary files /dev/null and b/data/themes/sounds/kbd-tap5.wav differ