diff --git a/gameover.ogg b/gameover.ogg
new file mode 100644
index 0000000..8c91c67
Binary files /dev/null and b/gameover.ogg differ
diff --git a/index.html b/index.html
index 4e7877a..27c49c4 100644
--- a/index.html
+++ b/index.html
@@ -120,10 +120,12 @@
     </div>
 
     <div style="display: none">
-      <audio src="richtig.ogg" id="audio_right"></audio>
-      <audio src="falsch.ogg" id="audio_wrong"></audio>
+      <audio src="slay.ogg" id="audio_right"></audio>
+      <audio src="gameover.ogg" id="audio_wrong"></audio>
       <audio src="timeout.ogg" id="audio_timeout"></audio>
+      <audio src="timeup.ogg" id="audio_timeup"></audio>
       <audio src="buzz.ogg" id="audio_buzz"></audio>
+      <audio src="levelcomplete.ogg" id="audio_final"></audio>
     </div>
   </body>
 </html>
diff --git a/levelcomplete.ogg b/levelcomplete.ogg
new file mode 100644
index 0000000..02253d9
Binary files /dev/null and b/levelcomplete.ogg differ
diff --git a/quiz.js b/quiz.js
index c9ef809..5f04777 100644
--- a/quiz.js
+++ b/quiz.js
@@ -106,10 +106,14 @@ Timer.prototype.set = function(t, cb) {
 	if (t > 0) {
 	    t--;
 	    $('#timer').text('' + t);
-	    if (t > 21 && t < 23) {
+	    if (t > 25 && t < 27) {
 		$('#audio_timeout')[0].load();
 		$('#audio_timeout')[0].play();
 	    }
+	    if (t > 0 && t < 2) {
+		$('#audio_timeup')[0].load();
+		$('#audio_timeup')[0].play();
+	    }
 	} else {
 	    that.elapse();
 	}
@@ -180,6 +184,8 @@ function switchToScoreboard() {
     }
 
     $('#scoreboard').fadeIn(300);
+    if (currentQuestion >= questions.length)
+	$('#audio_final')[0].play();
 }
 
 function updateScores() {
diff --git a/slay.ogg b/slay.ogg
new file mode 100644
index 0000000..902bd40
Binary files /dev/null and b/slay.ogg differ
diff --git a/timeup.ogg b/timeup.ogg
new file mode 100644
index 0000000..fb61597
Binary files /dev/null and b/timeup.ogg differ