diff --git a/data/themes/default.edc b/data/themes/default.edc
index d74358d6..e88f4f06 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -2239,23 +2239,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
         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;
@@ -2399,55 +2382,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
                target: "glow";
                target: "outline";
             }
-            program {
-               signal: "key,down"; source: "terminology";
-               script {
-#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 8)
-                  new buf[32];
-                  snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
-                  run_program(get_program_id(buf));
-#else
-                  run_program(PROGRAM:"key-down4"); // chosen by a fair dice roll
-                                                    // guaranteed to be random.
-                                                    // http://xkcd.com/221/
-#endif
-               }
-            }
-            program { name: "key-down1";
-#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
-               action: PLAY_SAMPLE "key-tap1" 1.0 INPUT;
-#else
-               action: PLAY_SAMPLE "key-tap1" 1.0;
-#endif
-            }
-            program { name: "key-down2";
-#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
-               action: PLAY_SAMPLE "key-tap2" 1.0 INPUT;
-#else
-               action: PLAY_SAMPLE "key-tap2" 1.0;
-#endif
-            }
-            program { name: "key-down3";
-#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
-               action: PLAY_SAMPLE "key-tap3" 1.0 INPUT;
-#else
-               action: PLAY_SAMPLE "key-tap3" 1.0;
-#endif
-            }
-            program { name: "key-down4";
-#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
-               action: PLAY_SAMPLE "key-tap4" 1.0 INPUT;
-#else
-               action: PLAY_SAMPLE "key-tap4" 1.0;
-#endif
-            }
-            program { name: "key-down5";
-#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
-               action: PLAY_SAMPLE "key-tap5" 1.0 INPUT;
-#else
-               action: PLAY_SAMPLE "key-tap5" 1.0;
-#endif
-            }
             program {
                signal: "key,down"; source: "terminology";
                action: STATE_SET "default" 0.0;
diff --git a/data/themes/mild.edc b/data/themes/mild.edc
index 9c6538cd..d1bfebe7 100644
--- a/data/themes/mild.edc
+++ b/data/themes/mild.edc
@@ -1101,23 +1101,6 @@ collections {
         image: "cr_key.png" COMP;
         image: "cr_out.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: "pulsclip"; type: RECT;
             description { state: "default" 0.0;
@@ -1214,35 +1197,6 @@ collections {
                target: "outline";
                target: "pulsclip";
             }
-            program {
-               signal: "key,down"; source: "terminology";
-               script {
-#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 8)
-                  new buf[32];
-                  snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
-                  run_program(get_program_id(buf));
-#else
-                  run_program(PROGRAM:"key-down4"); // chosen by a fair dice roll
-                                                    // guaranteed to be random.
-                                                    // http://xkcd.com/221/
-#endif
-               }
-            }
-            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 { name: "key";
                signal: "key,down";
                source: "terminology";
diff --git a/data/themes/sounds/Makefile.am b/data/themes/sounds/Makefile.am
index 68a996fb..ef6c469e 100644
--- a/data/themes/sounds/Makefile.am
+++ b/data/themes/sounds/Makefile.am
@@ -1,8 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = \
-bell.wav \
-kbd-tap2.wav \
-kbd-tap3.wav \
-kbd-tap4.wav \
-kbd-tap5.wav \
-kbd-tap.wav
+bell.wav
diff --git a/data/themes/sounds/kbd-tap.wav b/data/themes/sounds/kbd-tap.wav
deleted file mode 100644
index 50bbf4cc..00000000
Binary files a/data/themes/sounds/kbd-tap.wav and /dev/null differ
diff --git a/data/themes/sounds/kbd-tap2.wav b/data/themes/sounds/kbd-tap2.wav
deleted file mode 100644
index 8ca8d0a3..00000000
Binary files a/data/themes/sounds/kbd-tap2.wav and /dev/null differ
diff --git a/data/themes/sounds/kbd-tap3.wav b/data/themes/sounds/kbd-tap3.wav
deleted file mode 100644
index 849fa1c9..00000000
Binary files a/data/themes/sounds/kbd-tap3.wav and /dev/null differ
diff --git a/data/themes/sounds/kbd-tap4.wav b/data/themes/sounds/kbd-tap4.wav
deleted file mode 100644
index eecd4e3d..00000000
Binary files a/data/themes/sounds/kbd-tap4.wav and /dev/null differ
diff --git a/data/themes/sounds/kbd-tap5.wav b/data/themes/sounds/kbd-tap5.wav
deleted file mode 100644
index a2dc79b6..00000000
Binary files a/data/themes/sounds/kbd-tap5.wav and /dev/null differ