diff --git a/sc2/content/comm/comandr.lst b/sc2/content/comm/comandr.lst
index c8487dfb1..66968192d 100644
--- a/sc2/content/comm/comandr.lst
+++ b/sc2/content/comm/comandr.lst
@@ -4,3 +4,5 @@
 1 0 6 comm/comandr/comandr.mod
 2 1 4 comm/comandr/comandr.txt
 3 2 4 comm/starbas/starbas.txt
+4 1 6 comm/starbas/starbas.ogg
+5 2 6 comm/comandr/comlowpw.ogg
diff --git a/sc2/content/comm/spathi.lst b/sc2/content/comm/spathi.lst
index f1f3fca16..02a664919 100644
--- a/sc2/content/comm/spathi.lst
+++ b/sc2/content/comm/spathi.lst
@@ -5,3 +5,5 @@
 2 1 4 comm/spahome/spahome.ct
 2 2 4 comm/spahome/spahome.txt
 3 0 6 comm/spathi/spathi.mod
+4 1 6 comm/spahome/spahome.ogg
+5 2 6 comm/spathi/spafwiff.ogg
diff --git a/sc2/content/comm/utwig.lst b/sc2/content/comm/utwig.lst
index 8b3379f4b..7013c8a29 100644
--- a/sc2/content/comm/utwig.lst
+++ b/sc2/content/comm/utwig.lst
@@ -2,3 +2,4 @@
 1 0 3 comm/utwig/utwig.fon
 1 0 4 comm/utwig/utwig.txt
 1 0 6 comm/utwig/utwig.mod
+2 1 6 comm/utwig/utwigult.ogg
diff --git a/sc2/content/comm/yehat.lst b/sc2/content/comm/yehat.lst
index a47e60bdf..4bd91d5f2 100644
--- a/sc2/content/comm/yehat.lst
+++ b/sc2/content/comm/yehat.lst
@@ -3,3 +3,4 @@
 1 0 6 comm/yehat/yehat.mod
 2 0 4 comm/yehat/yehat.txt
 3 1 4 comm/rebel/rebel.txt
+4 1 6 comm/rebel/rebel.ogg
diff --git a/sc2/content/starcon.lst b/sc2/content/starcon.lst
index 14b3fc7ce..002e426e8 100644
--- a/sc2/content/starcon.lst
+++ b/sc2/content/starcon.lst
@@ -58,6 +58,7 @@
  41  20 2 ipanims/sis_ip.ani
  41  21 2 ipanims/orbplan.ani
  41  22 2 ipanims/ip_sun.ani
+ 41  96 4 ipanims/ip_sun.ct
  42   2 5 ipanims/landsnds.snd
  42  23 2 ipanims/lander.ani
  42  24 2 ipanims/quake.ani
@@ -206,6 +207,7 @@
 160   5 6 ipanims/orbit3.mod
 160   6 6 ipanims/orbit4.mod
 160   7 6 ipanims/orbit5.mod
+161  14 6 melee/melemenu.ogg
 161  72 2 melee/melebkgd.ani
 162  73 2 melee/melee.ani
 163   8 6 lbm/redalert.mod
@@ -239,6 +241,7 @@
 190  49 7 sis.lst
 191  50 7 lastbat.lst
 192  51 7 probe.lst
+193  15 6 lbm/mainmenu.ogg
 193  76 2 lbm/newgame.ani
 194  77 2 lbm/modules.ani
 195  78 2 lbm/sismods.ani
@@ -246,6 +249,7 @@
 196   9 6 lbm/outfit.mod
 197  80 2 lbm/sisblu.ani
 197  81 2 lbm/shipyard.ani
+197  97 4 lbm/dockpani.ct
 198  10 6 lbm/shipyard.mod
 199  11 6 lbm/starbase.mod
 199  82 2 lbm/starbase.ani
@@ -452,3 +456,6 @@
 280 282 2 lbm/credit18.ani
 281 283 2 lbm/credit19.ani
 282  13 6 lbm/credits.mod
+283 284 2 slides/ending/sis_skel.ani
+284 285 2 ipanims/orbenter.ani
+285 286 2 lbm/setupmenu.ani
diff --git a/sc2/src/sc2code/comm.c b/sc2/src/sc2code/comm.c
index a85dd0b3c..a2ae93386 100644
--- a/sc2/src/sc2code/comm.c
+++ b/sc2/src/sc2code/comm.c
@@ -1996,7 +1996,7 @@ HailAlien (void)
 			);
 	if ((CommData.AlienSongFlags & LDASF_USE_ALTERNATE)
 			&& CommData.AlienAltSong)
-		SongRef = LoadMusicFile (CommData.AlienAltSong);
+		SongRef = LoadMusicInstance ((RESOURCE)CommData.AlienAltSong);
 	if (SongRef)
 		CommData.AlienSong = SongRef;
 	else
diff --git a/sc2/src/sc2code/comm/comandr/comandr.c b/sc2/src/sc2code/comm/comandr/comandr.c
index 71b5621a2..15a7cb3ee 100644
--- a/sc2/src/sc2code/comm/comandr/comandr.c
+++ b/sc2/src/sc2code/comm/comandr/comandr.c
@@ -697,7 +697,7 @@ init_commander_comm ()
 	{	
 		commander_desc.AlienAmbientArray[2].AnimFlags &= ~ANIM_DISABLED;
 		// use alternate 'low-power' track if available
-		commander_desc.AlienAltSong = "comm/comandr/comlowpw.mod";
+		commander_desc.AlienAltSong = COMMANDER_LOWPOW_MUSIC;
 		commander_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
 	}
 
diff --git a/sc2/src/sc2code/comm/comandr/imusicre.h b/sc2/src/sc2code/comm/comandr/imusicre.h
index 3d4c697dd..91b963a95 100644
--- a/sc2/src/sc2code/comm/comandr/imusicre.h
+++ b/sc2/src/sc2code/comm/comandr/imusicre.h
@@ -1,3 +1,5 @@
 #define COMMANDER_MUSIC 0x00200006L
 
+#define STARBASE_ALT_MUSIC 0x00800106L
+#define COMMANDER_LOWPOW_MUSIC 0x00a00206L
 
diff --git a/sc2/src/sc2code/comm/comandr/respkg.h b/sc2/src/sc2code/comm/comandr/respkg.h
index 557c6a935..d532bec34 100644
--- a/sc2/src/sc2code/comm/comandr/respkg.h
+++ b/sc2/src/sc2code/comm/comandr/respkg.h
@@ -2,6 +2,8 @@ enum
 {
 	COMMANDER_PACKAGE = 1,
 	COMMANDER_PHRASE_PACKAGE,
-	STARBASE_PHRASE_PACKAGE
+	STARBASE_PHRASE_PACKAGE,
+	STARBASE_MUSIC_PACKAGE,
+	COMMANDER_LOWPOW_PACKAGE,
 };
 
diff --git a/sc2/src/sc2code/comm/rebel/rebel.c b/sc2/src/sc2code/comm/rebel/rebel.c
index b281e9d98..c9f906a35 100644
--- a/sc2/src/sc2code/comm/rebel/rebel.c
+++ b/sc2/src/sc2code/comm/rebel/rebel.c
@@ -436,7 +436,7 @@ init_rebel_yehat_comm (void)
 	yehat_desc.AlienTextWidth = (SIS_TEXT_WIDTH - 16) * 2 / 3;
 
 	// use alternate "Rebels" track if available
-	yehat_desc.AlienAltSong = "comm/rebel/rebel.mod";
+	yehat_desc.AlienAltSong = REBEL_MUSIC;
 	yehat_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
 
 	SET_GAME_STATE (BATTLE_SEGUE, 0);
diff --git a/sc2/src/sc2code/comm/spahome/spahome.c b/sc2/src/sc2code/comm/spahome/spahome.c
index b1997d0a5..a0d70f794 100644
--- a/sc2/src/sc2code/comm/spahome/spahome.c
+++ b/sc2/src/sc2code/comm/spahome/spahome.c
@@ -998,7 +998,7 @@ init_spahome_comm ()
 	spahome_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16;
 
 	// use alternate "Safe Ones" track if available
-	spahome_desc.AlienAltSong = "comm/spahome/spahome.mod";
+	spahome_desc.AlienAltSong = SPAHOME_MUSIC;
 	spahome_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
 
 	if (GET_GAME_STATE (SPATHI_MANNER) == 3)
diff --git a/sc2/src/sc2code/comm/spathi/imusicre.h b/sc2/src/sc2code/comm/spathi/imusicre.h
index bf2a5d8c9..7616e7d74 100644
--- a/sc2/src/sc2code/comm/spathi/imusicre.h
+++ b/sc2/src/sc2code/comm/spathi/imusicre.h
@@ -1,3 +1,6 @@
 #define SPATHI_MUSIC 0x00600006L
 
+#define SPAHOME_MUSIC 0x00800106L
+#define FWIFFO_MUSIC 0x00a00206L
+
 
diff --git a/sc2/src/sc2code/comm/spathi/respkg.h b/sc2/src/sc2code/comm/spathi/respkg.h
index 938cf7d3b..6eb526a68 100644
--- a/sc2/src/sc2code/comm/spathi/respkg.h
+++ b/sc2/src/sc2code/comm/spathi/respkg.h
@@ -2,6 +2,8 @@ enum
 {
 	SPATHI_ART_PACKAGE = 1,
 	SPATHI_HOME_ART_PACKAGE,
-	SPATHI_COMMON_PACKAGE
+	SPATHI_COMMON_PACKAGE,
+	SPATHI_HOME_MUSIC_PACKAGE,
+	SPATHI_FWIFFO_MUSIC_PACKAGE,
 };
 
diff --git a/sc2/src/sc2code/comm/spathi/spathic.c b/sc2/src/sc2code/comm/spathi/spathic.c
index 15bdaa9a2..e66075838 100644
--- a/sc2/src/sc2code/comm/spathi/spathic.c
+++ b/sc2/src/sc2code/comm/spathi/spathic.c
@@ -803,7 +803,7 @@ init_spathi_comm (void)
 
 	if (GET_GAME_STATE (FOUND_PLUTO_SPATHI) == 1)
 	{	// use alternate Fwiffo track if available
-		spathi_desc.AlienAltSong = "comm/spathi/spafwiff.mod";
+		spathi_desc.AlienAltSong = FWIFFO_MUSIC;
 		spathi_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
 	}
 	else
diff --git a/sc2/src/sc2code/comm/starbas/starbas.c b/sc2/src/sc2code/comm/starbas/starbas.c
index 09d865280..a19bf9c5d 100644
--- a/sc2/src/sc2code/comm/starbas/starbas.c
+++ b/sc2/src/sc2code/comm/starbas/starbas.c
@@ -1983,7 +1983,7 @@ init_starbase_comm ()
 	commander_desc.AlienTextTemplate.valign = VALIGN_MIDDLE;
 
 	// use alternate Starbase track if available
-	commander_desc.AlienAltSong = "comm/starbas/starbas.mod";
+	commander_desc.AlienAltSong = STARBASE_ALT_MUSIC;
 	commander_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
 
 	CurBulletinMask = 0;
diff --git a/sc2/src/sc2code/comm/utwig/imusicre.h b/sc2/src/sc2code/comm/utwig/imusicre.h
index 0565a4d8d..8efa4c02a 100644
--- a/sc2/src/sc2code/comm/utwig/imusicre.h
+++ b/sc2/src/sc2code/comm/utwig/imusicre.h
@@ -1,3 +1,5 @@
 #define UTWIG_MUSIC 0x00200006L
 
+#define UTWIG_ULTRON_MUSIC 0x00400106L
+
 
diff --git a/sc2/src/sc2code/comm/utwig/respkg.h b/sc2/src/sc2code/comm/utwig/respkg.h
index b555f33c6..fd6b206e0 100644
--- a/sc2/src/sc2code/comm/utwig/respkg.h
+++ b/sc2/src/sc2code/comm/utwig/respkg.h
@@ -1,5 +1,6 @@
 enum
 {
-	UTWIG_PACKAGE = 1
+	UTWIG_PACKAGE = 1,
+	UTWIG_ULTRON_MUSIC_PACKAGE,
 };
 
diff --git a/sc2/src/sc2code/comm/utwig/utwigc.c b/sc2/src/sc2code/comm/utwig/utwigc.c
index 2f857e51b..e54e1f9bf 100644
--- a/sc2/src/sc2code/comm/utwig/utwigc.c
+++ b/sc2/src/sc2code/comm/utwig/utwigc.c
@@ -966,7 +966,7 @@ init_utwig_comm (void)
 
 	if (GET_GAME_STATE (UTWIG_HAVE_ULTRON))
 	{	// use alternate 'Happy Utwig!' track
-		utwig_desc.AlienAltSong = "comm/utwig/utwigult.mod";
+		utwig_desc.AlienAltSong = UTWIG_ULTRON_MUSIC;
 		utwig_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
 	}
 	else
diff --git a/sc2/src/sc2code/comm/yehat/imusicre.h b/sc2/src/sc2code/comm/yehat/imusicre.h
index d36abc0a6..ca83b4a82 100644
--- a/sc2/src/sc2code/comm/yehat/imusicre.h
+++ b/sc2/src/sc2code/comm/yehat/imusicre.h
@@ -1,3 +1,5 @@
 #define YEHAT_MUSIC 0x00200006L
 
+#define REBEL_MUSIC 0x00800106L
+
 
diff --git a/sc2/src/sc2code/comm/yehat/respkg.h b/sc2/src/sc2code/comm/yehat/respkg.h
index ffcd8ddaf..f5acc837a 100644
--- a/sc2/src/sc2code/comm/yehat/respkg.h
+++ b/sc2/src/sc2code/comm/yehat/respkg.h
@@ -2,6 +2,7 @@ enum
 {
 	YEHAT_PACKAGE = 1,
 	YEHAT_PHRASE_PACKAGE,
-	REBEL_PHRASE_PACKAGE
+	REBEL_PHRASE_PACKAGE,
+	REBEL_MUSIC_PACKAGE,
 };
 
diff --git a/sc2/src/sc2code/globdata.h b/sc2/src/sc2code/globdata.h
index 18b0f0caf..bd1c24c4a 100644
--- a/sc2/src/sc2code/globdata.h
+++ b/sc2/src/sc2code/globdata.h
@@ -130,7 +130,7 @@ typedef struct
 	COUNT AlienTextWidth;
 	COLORMAP AlienColorMap;
 	DWORD AlienSong;
-	PVOID AlienAltSong;
+	DWORD AlienAltSong;
 	LDAS_FLAGS AlienSongFlags;
 
 	STRING ConversationPhrases;
diff --git a/sc2/src/sc2code/igfxres.h b/sc2/src/sc2code/igfxres.h
index c4e806eed..3a6257e47 100644
--- a/sc2/src/sc2code/igfxres.h
+++ b/sc2/src/sc2code/igfxres.h
@@ -283,4 +283,7 @@
 #define CREDIT18_ANIM 0x23011a02L
 #define CREDIT19_ANIM 0x23211b02L
 
+#define SISSKEL_MASK_PMAP_ANIM 0x23611c02L
+#define ORBENTER_PMAP_ANIM 0x23811d02L
+#define MENUBKG_PMAP_ANIM 0x23a11e02L
 
diff --git a/sc2/src/sc2code/imusicre.h b/sc2/src/sc2code/imusicre.h
index 9666f8819..3e83ae22a 100644
--- a/sc2/src/sc2code/imusicre.h
+++ b/sc2/src/sc2code/imusicre.h
@@ -13,4 +13,7 @@
 #define BATTLE_MUSIC 0x20a00c06L
 #define CREDITS_MUSIC 0x23400d06L
 
+#define MELEE_MUSIC 0x14200e06L
+#define MAINMENU_MUSIC 0x18200f06L
+
 
diff --git a/sc2/src/sc2code/intro.c b/sc2/src/sc2code/intro.c
index 13fa01923..7064fcf06 100644
--- a/sc2/src/sc2code/intro.c
+++ b/sc2/src/sc2code/intro.c
@@ -201,7 +201,7 @@ Present_GenerateSIS (PRESENTATION_INPUT_STATE* pPIS)
 	LockMutex (GraphicsLock);
 	OldContext = SetContext (OffScreenContext);
 
-	SkelFrame = CaptureDrawable (LoadCelFile ("slides/ending/sis_skel.ani"));
+	SkelFrame = CaptureDrawable (LoadGraphic (SISSKEL_MASK_PMAP_ANIM));
 	ModuleFrame = CaptureDrawable (LoadGraphic (SISMODS_MASK_PMAP_ANIM));
 
 	GetFrameRect (SkelFrame, &r);
diff --git a/sc2/src/sc2code/istrtab.h b/sc2/src/sc2code/istrtab.h
index e16e7bf3e..585135421 100644
--- a/sc2/src/sc2code/istrtab.h
+++ b/sc2/src/sc2code/istrtab.h
@@ -95,4 +95,6 @@
 #define RUINS_STRTAB 0x13a05e04L
 #define UMGAH_BCS_STRTAB 0x13c05f04L
 
+#define IPSUN_COLOR_MAP 0x05206004L
+#define HANGAR_COLOR_TAB 0x18a06104L
 
diff --git a/sc2/src/sc2code/melee.c b/sc2/src/sc2code/melee.c
index 82af18813..c389fa197 100644
--- a/sc2/src/sc2code/melee.c
+++ b/sc2/src/sc2code/melee.c
@@ -1662,7 +1662,7 @@ DoMelee (PMELEE_STATE pMS)
 			DestroyMusic (pMS->hMusic);
 			pMS->hMusic = 0;
 		}
-		pMS->hMusic = LoadMusicFile ("melee/melemenu.ogg");
+		pMS->hMusic = LoadMusicInstance (MELEE_MUSIC);
 		pMS->Initialized = TRUE;
 		
 		pMS->MeleeOption = START_MELEE;
diff --git a/sc2/src/sc2code/respkg.h b/sc2/src/sc2code/respkg.h
index db02bb560..da4249789 100644
--- a/sc2/src/sc2code/respkg.h
+++ b/sc2/src/sc2code/respkg.h
@@ -299,6 +299,9 @@ enum
 	CREDIT17_PACKAGE,
 	CREDIT18_PACKAGE,
 	CREDIT19_PACKAGE,
-	CREDIT_MUSIC_PACKAGE
+	CREDIT_MUSIC_PACKAGE,
+	SISSKEL_PACKAGE,
+	ORBENTER_PACKAGE,
+	MENUBKG_PACKAGE,
 };
 
diff --git a/sc2/src/sc2code/restart.c b/sc2/src/sc2code/restart.c
index f66f04931..b3e1828e4 100644
--- a/sc2/src/sc2code/restart.c
+++ b/sc2/src/sc2code/restart.c
@@ -134,7 +134,7 @@ DoRestart (PMENU_STATE pMS)
 			DestroyMusic (pMS->hMusic);
 			pMS->hMusic = 0;
 		}
-		pMS->hMusic = LoadMusicFile ("lbm/mainmenu.ogg");
+		pMS->hMusic = LoadMusicInstance (MAINMENU_MUSIC);
 		InactTimeOut = (pMS->hMusic ? 120 : 20) * ONE_SECOND;
 		
 		PlayMusic (pMS->hMusic, TRUE, 1);
diff --git a/sc2/src/sc2code/setupmenu.c b/sc2/src/sc2code/setupmenu.c
index 9494fbbd8..27c178f13 100644
--- a/sc2/src/sc2code/setupmenu.c
+++ b/sc2/src/sc2code/setupmenu.c
@@ -27,8 +27,8 @@
 #include "libs/graphics/widgets.h"
 #include "libs/graphics/tfb_draw.h"
 #include "libs/reslib.h"
+#include "resinst.h"
 
-#define MENU_BKG "lbm/setupmenu.ani"
 
 typedef struct setup_menu_state {
 	BOOLEAN (*InputFunc) (struct setup_menu_state *pInputState);
@@ -503,7 +503,7 @@ DoSetupMenu (PSETUP_MENU_STATE pInputState)
 	}
 	if (!menu.bgStamp.frame)
 	{
-		FRAME f = CaptureDrawable (LoadCelFile (MENU_BKG));
+		FRAME f = CaptureDrawable (LoadGraphic (MENUBKG_PMAP_ANIM));
 		menu.bgStamp.origin.x = 0;
 		menu.bgStamp.origin.y = 0;
 		menu.bgStamp.frame = SetAbsFrameIndex (f, 0);
diff --git a/sc2/src/sc2code/shipyard.c b/sc2/src/sc2code/shipyard.c
index 7f3bb94a5..5ca158b50 100644
--- a/sc2/src/sc2code/shipyard.c
+++ b/sc2/src/sc2code/shipyard.c
@@ -25,6 +25,7 @@
 #include "melee.h"
 #include "options.h"
 #include "races.h"
+#include "nameref.h"
 #include "resinst.h"
 #include "settings.h"
 #include "setup.h"
@@ -1210,8 +1211,8 @@ DoShipyard (PMENU_STATE pMS)
 
 			s.frame = CaptureDrawable (LoadGraphic (SHIPYARD_PMAP_ANIM));
 
-			pMS->CurString = CaptureColorMap (LoadColorMapFile (
-					contentDir, "lbm/dockpani.ct"));
+			pMS->CurString = CaptureColorMap (
+					LoadColorMap (HANGAR_COLOR_TAB));
 
 			pMS->hMusic = LoadMusicInstance (SHIPYARD_MUSIC);