diff --git a/audio/fire-0.wav b/audio/fire-0.wav
deleted file mode 100644
index c2046fc..0000000
Binary files a/audio/fire-0.wav and /dev/null differ
diff --git a/audio/fire-1.wav b/audio/fire-1.wav
deleted file mode 100644
index 669f2c9..0000000
Binary files a/audio/fire-1.wav and /dev/null differ
diff --git a/audio/fire-2.wav b/audio/fire-2.wav
deleted file mode 100644
index 7698a1e..0000000
Binary files a/audio/fire-2.wav and /dev/null differ
diff --git a/audio/fire-3.wav b/audio/fire-3.wav
deleted file mode 100644
index 6c6c999..0000000
Binary files a/audio/fire-3.wav and /dev/null differ
diff --git a/audio/fire-4.wav b/audio/fire-4.wav
deleted file mode 100644
index 8550291..0000000
Binary files a/audio/fire-4.wav and /dev/null differ
diff --git a/audio/fire-burning.wav b/audio/fire-burning.wav
new file mode 100644
index 0000000..77e9794
Binary files /dev/null and b/audio/fire-burning.wav differ
diff --git a/audio/fire-dead.wav b/audio/fire-dead.wav
new file mode 100644
index 0000000..62e32f6
Binary files /dev/null and b/audio/fire-dead.wav differ
diff --git a/audio/fire-flickering.wav b/audio/fire-flickering.wav
new file mode 100644
index 0000000..3185750
Binary files /dev/null and b/audio/fire-flickering.wav differ
diff --git a/audio/fire-roaring.wav b/audio/fire-roaring.wav
new file mode 100644
index 0000000..6cee6eb
Binary files /dev/null and b/audio/fire-roaring.wav differ
diff --git a/audio/fire-smoldering.wav b/audio/fire-smoldering.wav
new file mode 100644
index 0000000..0eb20e6
Binary files /dev/null and b/audio/fire-smoldering.wav differ
diff --git a/script/audioLibrary.js b/script/audioLibrary.js
index 592c11e..6c612dc 100644
--- a/script/audioLibrary.js
+++ b/script/audioLibrary.js
@@ -50,11 +50,11 @@ var AudioLibrary = {
     MUSIC_RAUCOUS_VILLAGE: '/audio/raucous-village.wav',
     MUSIC_COMBAT: '/audio/combat.wav',
     MUSIC_EVENT: '/audio/event.wav',
-    MUSIC_FIRE_0: '/audio/fire-0.wav',
-    MUSIC_FIRE_1: '/audio/fire-1.wav',
-    MUSIC_FIRE_2: '/audio/fire-2.wav',
-    MUSIC_FIRE_3: '/audio/fire-3.wav',
-    MUSIC_FIRE_4: '/audio/fire-4.wav',
+    MUSIC_FIRE_DEAD: '/audio/fire-dead.wav',
+    MUSIC_FIRE_SMOLDERING: '/audio/fire-smoldering.wav',
+    MUSIC_FIRE_FLICKERING: '/audio/fire-flickering.wav',
+    MUSIC_FIRE_BURNING: '/audio/fire-burning.wav',
+    MUSIC_FIRE_ROARING: '/audio/fire-roaring.wav',
     MUSIC_WORLD: '/audio/world.wav',
     MUSIC_SPACE: '/audio/space.wav',
     MUSIC_TROPOSPHERE: '/audio/troposphere.wav',
diff --git a/script/room.js b/script/room.js
index 85b16cb..95ce813 100644
--- a/script/room.js
+++ b/script/room.js
@@ -9,6 +9,7 @@ var Room = {
 	_STOKE_COOLDOWN: 10, // cooldown to stoke the fire
 	_NEED_WOOD_DELAY: 15 * 1000, // from when the stranger shows up, to when you need wood
 	buttons: {},
+	currentFireMusic: 0,
 	Craftables: {
 		'trap': {
 			name: _('trap'),
@@ -602,26 +603,7 @@ var Room = {
 
 		Engine.moveStoresView(null, transition_diff);
 		
-		// set music based on fire level
-		var fireValue = $SM.get('game.fire.value');
-		switch (fireValue) {
-			case 0:
-				AudioEngine.changeMusic(AudioLibrary.MUSIC_FIRE0);
-				break;
-			case 1:
-				AudioEngine.changeMusic(AudioLibrary.MUSIC_FIRE1);
-				break;
-			case 2:
-				AudioEngine.changeMusic(AudioLibrary.MUSIC_FIRE2);
-				break;
-			case 3:
-				AudioEngine.changeMusic(AudioLibrary.MUSIC_FIRE3);
-				break;
-			case 4:
-				AudioEngine.changeMusic(AudioLibrary.MUSIC_FIRE4);
-				break;
-		}
-		Room.currentMusic = fireValue;
+		Room.setMusic();
 	},
 
 	TempEnum: {
@@ -737,10 +719,7 @@ var Room = {
 		Room._fireTimer = Engine.setTimeout(Room.coolFire, Room._FIRE_COOL_DELAY);
 		Room.updateButton();
 		Room.setTitle();
-
-		if ($SM.get('game.fire.value') !== Room.currentMusic) {
-			Room.setMusic();
-		}
+		Room.setMusic();
 	},
 
 	coolFire: function () {
@@ -1234,5 +1213,30 @@ var Room = {
 		} else if (e.stateName.indexOf('game.buildings') === 0) {
 			Room.updateBuildButtons();
 		}
+	},
+
+	setMusic() {
+		// set music based on fire level
+		var fireValue = $SM.get('game.fire.value');
+		if ($SM.get('game.fire.value') !== Room.currentFireMusic) {
+			switch (fireValue) {
+				case 0:
+					AudioEngine.changeMusic(AudioLibrary.MUSIC_FIRE_DEAD);
+					break;
+				case 1:
+					AudioEngine.changeMusic(AudioLibrary.MUSIC_FIRE_SMOLDERING);
+					break;
+				case 2:
+					AudioEngine.changeMusic(AudioLibrary.MUSIC_FIRE_FLICKERING);
+					break;
+				case 3:
+					AudioEngine.changeMusic(AudioLibrary.MUSIC_FIRE_BURNING);
+					break;
+				case 4:
+					AudioEngine.changeMusic(AudioLibrary.MUSIC_FIRE_ROARING);
+					break;
+			}
+		}
+		Room.currentFireMusic = fireValue;
 	}
 };