diff --git a/data/DataCache.scr b/data/DataCache.scr
index 6a535c402..477276a3c 100644
--- a/data/DataCache.scr
+++ b/data/DataCache.scr
@@ -6,9 +6,12 @@ translations/ita.dat
 translations/ger.dat
 translations/id.dat
 translations/eng.dat
-music/ingame.pxm
-music/ingame.vb
-music/ingame.vh
+music/chapter1.pxm
+music/chapter1.vb
+music/chapter1.vh
+music/chapter3.pxm
+music/chapter3.vb
+music/chapter3.vh
 music/sb-title.pxm
 music/sb-title.vb
 music/sb-title.vh
diff --git a/data/Music/chapter1/CHAPTER1.PXM b/data/Music/chapter1/CHAPTER1.PXM
new file mode 100644
index 000000000..f3782c421
Binary files /dev/null and b/data/Music/chapter1/CHAPTER1.PXM differ
diff --git a/data/Music/chapter1/CHAPTER1.VB b/data/Music/chapter1/CHAPTER1.VB
new file mode 100644
index 000000000..9d8299107
Binary files /dev/null and b/data/Music/chapter1/CHAPTER1.VB differ
diff --git a/data/Music/chapter1/CHAPTER1.VH b/data/Music/chapter1/CHAPTER1.VH
new file mode 100644
index 000000000..094920aa7
Binary files /dev/null and b/data/Music/chapter1/CHAPTER1.VH differ
diff --git a/data/Music/chapter1/CHAPTER1.XM b/data/Music/chapter1/CHAPTER1.XM
new file mode 100644
index 000000000..80008a0a4
Binary files /dev/null and b/data/Music/chapter1/CHAPTER1.XM differ
diff --git a/data/Music/chapter3/CHAPTER3.PXM b/data/Music/chapter3/CHAPTER3.PXM
new file mode 100644
index 000000000..bffe3d0ca
Binary files /dev/null and b/data/Music/chapter3/CHAPTER3.PXM differ
diff --git a/data/Music/chapter3/CHAPTER3.VB b/data/Music/chapter3/CHAPTER3.VB
new file mode 100644
index 000000000..9b6fefc42
Binary files /dev/null and b/data/Music/chapter3/CHAPTER3.VB differ
diff --git a/data/Music/chapter3/CHAPTER3.VH b/data/Music/chapter3/CHAPTER3.VH
new file mode 100644
index 000000000..b469f85db
Binary files /dev/null and b/data/Music/chapter3/CHAPTER3.VH differ
diff --git a/data/Music/chapter3/CHAPTER3.XM b/data/Music/chapter3/CHAPTER3.XM
new file mode 100644
index 000000000..5ac7e050e
Binary files /dev/null and b/data/Music/chapter3/CHAPTER3.XM differ
diff --git a/makefile.gfx b/makefile.gfx
index 7634174ad..21fd6cfda 100644
--- a/makefile.gfx
+++ b/makefile.gfx
@@ -401,7 +401,8 @@ GFX_DATA_OUT		+= $(MC_HEADER_OUT)
 MUSIC_IN_DIR :=		data/music
 MUSIC_OUT_DIR :=	$(DATA_OUT)/music
 
-MUSIC_LIST :=		ingame sb-title
+MUSIC_LIST :=		sb-title \
+					chapter1 chapter3
 
 MUSIC_ALL_IN :=		$(foreach MUSIC,$(MUSIC_LIST),$(MUSIC_IN_DIR)/$(MUSIC)/$(MUSIC).PXM $(MUSIC_IN_DIR)/$(MUSIC)/$(MUSIC).VH $(MUSIC_IN_DIR)/$(MUSIC)/$(MUSIC).VB)
 MUSIC_ALL_OUT :=	$(foreach MUSIC,$(MUSIC_LIST),$(MUSIC_OUT_DIR)/$(MUSIC).PXM $(MUSIC_OUT_DIR)/$(MUSIC).VH $(MUSIC_OUT_DIR)/$(MUSIC).VB)
diff --git a/source/sound/sound.cpp b/source/sound/sound.cpp
index 1af0b59ed..fb5364350 100644
--- a/source/sound/sound.cpp
+++ b/source/sound/sound.cpp
@@ -95,12 +95,22 @@ static CXMPlaySound		*s_xmplaySound;
 // Songs
 static XMSONGDATA	s_xmSongData[CSoundMediator::NUM_SONGIDS]=
 {
-	{	MUSIC_INGAME_VH,		MUSIC_INGAME_VB,		MUSIC_INGAME_PXM,		0		},		// SONG_INGAME
-	{	MUSIC_SB_TITLE_VH,		MUSIC_SB_TITLE_VB,		MUSIC_SB_TITLE_PXM,		0		},		// SONG_TITLE
-	{	MUSIC_SB_TITLE_VH,		MUSIC_SB_TITLE_VB,		MUSIC_SB_TITLE_PXM,		0xa		},		// SONG_OPTIONS
+	{	MUSIC_SB_TITLE_VH,		MUSIC_SB_TITLE_VB,		MUSIC_SB_TITLE_PXM,		0x00	},		// SONG_TITLE
+	{	MUSIC_SB_TITLE_VH,		MUSIC_SB_TITLE_VB,		MUSIC_SB_TITLE_PXM,		0x0a	},		// SONG_OPTIONS
 	{	MUSIC_SB_TITLE_VH,		MUSIC_SB_TITLE_VB,		MUSIC_SB_TITLE_PXM,		0x13	},		// SONG_MEMORYCARD
 	{	MUSIC_SB_TITLE_VH,		MUSIC_SB_TITLE_VB,		MUSIC_SB_TITLE_PXM,		0x14	},		// SONG_GAMECOMPLETE
 	{	MUSIC_SB_TITLE_VH,		MUSIC_SB_TITLE_VB,		MUSIC_SB_TITLE_PXM,		0x23	},		// SONG_GAMEOVER
+	{	MUSIC_CHAPTER1_VH,		MUSIC_CHAPTER1_VB,		MUSIC_CHAPTER1_PXM,		0x19	},		// SONG_CHAPTER1_LEVEL1,
+	{	MUSIC_CHAPTER1_VH,		MUSIC_CHAPTER1_VB,		MUSIC_CHAPTER1_PXM,		0x2d	},		// SONG_CHAPTER1_LEVEL2,
+	{	MUSIC_CHAPTER1_VH,		MUSIC_CHAPTER1_VB,		MUSIC_CHAPTER1_PXM,		0x00	},		// SONG_CHAPTER1_LEVEL3,
+	{	MUSIC_CHAPTER1_VH,		MUSIC_CHAPTER1_VB,		MUSIC_CHAPTER1_PXM,		0x2c	},		// SONG_CHAPTER1_LEVEL4,
+	{	MUSIC_CHAPTER1_VH,		MUSIC_CHAPTER1_VB,		MUSIC_CHAPTER1_PXM,		0x40	},		// SONG_CHAPTER1_BOSS,
+	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x18	},		// SONG_CHAPTER1_LEVEL1,
+	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x00	},		// SONG_CHAPTER1_LEVEL2,
+	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x00	},		// SONG_CHAPTER1_LEVEL3,
+	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x0b	},		// SONG_CHAPTER1_LEVEL4,
+	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x21	},		// SONG_CHAPTER1_BOSS_ASLEEP,
+	{	MUSIC_CHAPTER3_VH,		MUSIC_CHAPTER3_VB,		MUSIC_CHAPTER3_PXM,		0x22	},		// SONG_CHAPTER1_BOSS_AWAKE,
 };
 
 // SFX banks
diff --git a/source/sound/sound.h b/source/sound/sound.h
index fe14288f3..fd9b4d462 100644
--- a/source/sound/sound.h
+++ b/source/sound/sound.h
@@ -49,12 +49,22 @@ class CSoundMediator
 public:
 	typedef enum SONGID
 	{
-		SONG_INGAME,
 		SONG_TITLE,
 		SONG_OPTIONS,
 		SONG_MEMORYCARD,
 		SONG_GAMECOMPLETE,
 		SONG_GAMEOVER,
+		SONG_CHAPTER1_LEVEL1,
+		SONG_CHAPTER1_LEVEL2,
+		SONG_CHAPTER1_LEVEL3,
+		SONG_CHAPTER1_LEVEL4,
+		SONG_CHAPTER1_BOSS,
+		SONG_CHAPTER3_LEVEL1,
+		SONG_CHAPTER3_LEVEL2,
+		SONG_CHAPTER3_LEVEL3,
+		SONG_CHAPTER3_LEVEL4,
+		SONG_CHAPTER3_BOSS_ALSEEP,
+		SONG_CHAPTER3_BOSS_AWAKE,
 		NUM_SONGIDS,
 	};
 	typedef enum SFXBANKID