diff --git a/data/sounds/default/address.wav b/data/sounds/default/address.wav
deleted file mode 100755
index 941524e448..0000000000
Binary files a/data/sounds/default/address.wav and /dev/null differ
diff --git a/data/sounds/default/closed.wav b/data/sounds/default/closed.wav
deleted file mode 100755
index f31fcb32c3..0000000000
Binary files a/data/sounds/default/closed.wav and /dev/null differ
diff --git a/data/sounds/default/dot.wav b/data/sounds/default/dot.wav
deleted file mode 100755
index b5fa3107f9..0000000000
Binary files a/data/sounds/default/dot.wav and /dev/null differ
diff --git a/data/sounds/default/num0.wav b/data/sounds/default/num0.wav
deleted file mode 100755
index 3a234f3de3..0000000000
Binary files a/data/sounds/default/num0.wav and /dev/null differ
diff --git a/data/sounds/default/num1.wav b/data/sounds/default/num1.wav
deleted file mode 100755
index c844d5648f..0000000000
Binary files a/data/sounds/default/num1.wav and /dev/null differ
diff --git a/data/sounds/default/num2.wav b/data/sounds/default/num2.wav
deleted file mode 100755
index bd95a86519..0000000000
Binary files a/data/sounds/default/num2.wav and /dev/null differ
diff --git a/data/sounds/default/num3.wav b/data/sounds/default/num3.wav
deleted file mode 100755
index 61fb6096cb..0000000000
Binary files a/data/sounds/default/num3.wav and /dev/null differ
diff --git a/data/sounds/default/num4.wav b/data/sounds/default/num4.wav
deleted file mode 100755
index 81e89e87a9..0000000000
Binary files a/data/sounds/default/num4.wav and /dev/null differ
diff --git a/data/sounds/default/num5.wav b/data/sounds/default/num5.wav
deleted file mode 100755
index 6b0428ac39..0000000000
Binary files a/data/sounds/default/num5.wav and /dev/null differ
diff --git a/data/sounds/default/num6.wav b/data/sounds/default/num6.wav
deleted file mode 100755
index bc048b135c..0000000000
Binary files a/data/sounds/default/num6.wav and /dev/null differ
diff --git a/data/sounds/default/num7.wav b/data/sounds/default/num7.wav
deleted file mode 100755
index ab698dc5de..0000000000
Binary files a/data/sounds/default/num7.wav and /dev/null differ
diff --git a/data/sounds/default/num8.wav b/data/sounds/default/num8.wav
deleted file mode 100755
index 316f53dc1e..0000000000
Binary files a/data/sounds/default/num8.wav and /dev/null differ
diff --git a/data/sounds/default/num9.wav b/data/sounds/default/num9.wav
deleted file mode 100755
index 49559f3dc8..0000000000
Binary files a/data/sounds/default/num9.wav and /dev/null differ
diff --git a/data/sounds/default/opened.wav b/data/sounds/default/opened.wav
deleted file mode 100755
index 24c18e70d6..0000000000
Binary files a/data/sounds/default/opened.wav and /dev/null differ
diff --git a/data/sounds/default/plugin_load.wav b/data/sounds/default/plugin_load.wav
deleted file mode 100755
index 9c8581c920..0000000000
Binary files a/data/sounds/default/plugin_load.wav and /dev/null differ
diff --git a/data/sounds/default/plugin_unload.wav b/data/sounds/default/plugin_unload.wav
deleted file mode 100755
index 19272d765d..0000000000
Binary files a/data/sounds/default/plugin_unload.wav and /dev/null differ
diff --git a/data/sounds/default/port.wav b/data/sounds/default/port.wav
deleted file mode 100755
index 511e435b58..0000000000
Binary files a/data/sounds/default/port.wav and /dev/null differ
diff --git a/data/sounds/default/session.wav b/data/sounds/default/session.wav
deleted file mode 100755
index 27455c39ab..0000000000
Binary files a/data/sounds/default/session.wav and /dev/null differ
diff --git a/data/sounds/default/session_open_meterpreter.wav b/data/sounds/default/session_open_meterpreter.wav
deleted file mode 100755
index f5ad6e2164..0000000000
Binary files a/data/sounds/default/session_open_meterpreter.wav and /dev/null differ
diff --git a/data/sounds/default/session_open_shell.wav b/data/sounds/default/session_open_shell.wav
deleted file mode 100755
index fccf4883f9..0000000000
Binary files a/data/sounds/default/session_open_shell.wav and /dev/null differ
diff --git a/data/sounds/default/session_open_vnc.wav b/data/sounds/default/session_open_vnc.wav
deleted file mode 100755
index 10816cdf88..0000000000
Binary files a/data/sounds/default/session_open_vnc.wav and /dev/null differ
diff --git a/plugins/sounds.rb b/plugins/sounds.rb
index 21ed81bff5..1db8e3bef5 100644
--- a/plugins/sounds.rb
+++ b/plugins/sounds.rb
@@ -14,6 +14,10 @@ module Msf
 class Plugin::EventSounds < Msf::Plugin
 
 
+  SESSION_CLOSE = 'try_harder'
+  SESSION_OPEN  = 'excellent'
+
+
   attr_accessor :theme, :base, :queue, :queue_thread
 
   include Msf::SessionEvent
@@ -23,25 +27,17 @@ class Plugin::EventSounds < Msf::Plugin
   end
 
   def on_session_open(session)
-    event = 'session_open_' + session.type
-    play_sound(event)
+    play_sound(SESSION_OPEN)
   end
 
   def on_session_close(session, reason='')
-    sid = session.sid.to_s
-    play_sound('session')
-    sid.unpack("C*").each do |c|
-      play_sound("num" + [c].pack("C"))
-    end
-    play_sound('closed')
+    play_sound(SESSION_CLOSE)
   end
 
   def on_plugin_load
-    play_sound('plugin_load')
   end
 
   def on_plugin_unload
-    play_sound('plugin_unload')
   end
 
   def start_sound_queue
@@ -49,7 +45,7 @@ class Plugin::EventSounds < Msf::Plugin
       begin
       while(true)
         while(event = self.queue.shift)
-          path = ::File.join(self.base, self.theme, "#{event}.wav")
+          path = ::File.join(self.base, self.theme, "#{event}.mp3")
           if(::File.exists?(path))
             Rex::Compat.play_sound(path)
           else