diff --git a/source/sound/sound.cpp b/source/sound/sound.cpp
index 6f44b96ce..5e2b92123 100644
--- a/source/sound/sound.cpp
+++ b/source/sound/sound.cpp
@@ -52,14 +52,13 @@ typedef struct XMFILEDATA
 
 static XMFILEDATA	s_xmSongData[CSoundMediator::NUM_SONGIDS]=
 {
-	{	HYPERMMX_HYPERMMX_VH,		HYPERMMX_HYPERMMX_VB,		HYPERMMX_HYPERMMX_PXM	},		// HYPERMMX
-	{	DROPPOP_DROPPOP_VH,		DROPPOP_DROPPOP_VB,		DROPPOP_DROPPOP_PXM	},		// DROPPOP
+	{	MUSIC_HYPERMMX_VH,		MUSIC_HYPERMMX_VB,		MUSIC_HYPERMMX_PXM	},		// HYPERMMX
+	{	MUSIC_DROPPOP_VH,		MUSIC_DROPPOP_VB,		MUSIC_DROPPOP_PXM	},		// DROPPOP
 };
 
 static XMFILEDATA	s_xmSfxData[CSoundMediator::NUM_SFXBANKIDS]=
 {
-//	{	SFX_INGAME_VH,			SFX_INGAME_VB,			SFX_INGAME_PXM		},		// INGAME
-	{	DROPPOP_DROPPOP_VH,		DROPPOP_DROPPOP_VB,		DROPPOP_DROPPOP_PXM	},		// DROPPOP
+	{	SFX_INGAME_VH,			SFX_INGAME_VB,			SFX_INGAME_PXM		},		// INGAME
 };
 
 
diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp
index 59ea4f21a..02aa61127 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -257,19 +257,31 @@ SOURCE=..\..\..\source\sound\cdxa.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\source\sound\music.cpp
+SOURCE=..\..\..\source\sound\sound.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\source\sound\music.h
+SOURCE=..\..\..\source\sound\sound.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\source\sound\sndbank.cpp
+SOURCE=..\..\..\source\sound\speech.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\source\sound\sndbank.h
+SOURCE=..\..\..\source\sound\spu.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sound\spu.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sound\xmplay.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\sound\xmplay.h
 # End Source File
 # End Group
 # Begin Group "system"