diff --git a/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromSourceLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromSourceLogic.cs
index 406de96bfe..eed21fc83a 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromSourceLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Installation/InstallFromSourceLogic.cs
@@ -237,12 +237,30 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 
 				try
 				{
-					foreach (var i in modSource.Install)
+					void RunSourceActions(MiniYamlNode contentPackageYaml)
 					{
-						var sourceAction = modSource.ObjectCreator.CreateObject<ISourceAction>($"{i.Key}SourceAction");
-						sourceAction.RunActionOnSource(i.Value, path, modData, extracted, m => message = m);
+						var sourceActionListYaml = contentPackageYaml.Value.Nodes.FirstOrDefault(x => x.Key == "Actions");
+						if (sourceActionListYaml == null)
+							return;
+
+						foreach (var sourceActionNode in sourceActionListYaml.Value.Nodes)
+						{
+							var sourceAction = modSource.ObjectCreator.CreateObject<ISourceAction>($"{sourceActionNode.Key}SourceAction");
+							sourceAction.RunActionOnSource(sourceActionNode.Value, path, modData, extracted, m => message = m);
+						}
 					}
 
+					var beforeInstall = modSource.Install.FirstOrDefault(x => x.Key == "BeforeInstall");
+					if (beforeInstall != null)
+						RunSourceActions(beforeInstall);
+
+					foreach (var packageInstallationNode in modSource.Install.Where(x => x.Key == "ContentPackage"))
+						RunSourceActions(packageInstallationNode);
+
+					var afterInstall = modSource.Install.FirstOrDefault(x => x.Key == "AfterInstall");
+					if (afterInstall != null)
+						RunSourceActions(afterInstall);
+
 					Game.RunAfterTick(Ui.CloseWindow);
 				}
 				catch (Exception e)
diff --git a/mods/cnc/installer/covertops.yaml b/mods/cnc/installer/covertops.yaml
index 14d85ee24f..16982d7ce3 100644
--- a/mods/cnc/installer/covertops.yaml
+++ b/mods/cnc/installer/covertops.yaml
@@ -4,5 +4,9 @@ covertops: Covert Operations Expansion (English)
 		GAME/GAME.DAT: be5a6c4c0a581da09e8f34a3bbf7bd17e525085c
 		CONQUER.MIX: 713b53fa4c188ca9619c6bbeadbfc86513704266
 	Install:
-		Copy: .
-			^SupportDir|Content/cnc/scores-covertops.mix: SCORES.MIX
+		# Covert Operations music (optional):
+		ContentPackage:
+			Name: music-covertops
+			Actions:
+				Copy: .
+					^SupportDir|Content/cnc/scores-covertops.mix: SCORES.MIX
diff --git a/mods/cnc/installer/firstdecade.yaml b/mods/cnc/installer/firstdecade.yaml
index ec23d90dc5..d78664cb53 100644
--- a/mods/cnc/installer/firstdecade.yaml
+++ b/mods/cnc/installer/firstdecade.yaml
@@ -4,126 +4,178 @@ tfd: C&C The First Decade (English)
 		data1.hdr: bef3a08c3fc1b1caf28ca0dbb97c1f900005930e
 		data1.cab: 12ad6113a6890a1b4d5651a75378c963eaf513b9
 	Install:
-		ExtractIscab: data1.hdr
-			Volumes:
-				2: data2.cab
-				3: data3.cab
-			Extract:
-				^SupportDir|Content/cnc/conquer.mix: CnC\\CONQUER.MIX
-				^SupportDir|Content/cnc/desert.mix: CnC\\DESERT.MIX
-				^SupportDir|Content/cnc/general.mix: CnC\\GENERAL.MIX
-				^SupportDir|Content/cnc/scores.mix: CnC\\SCORES.MIX
-				^SupportDir|Content/cnc/sounds.mix: CnC\\SOUNDS.MIX
-				^SupportDir|Content/cnc/temperat.mix: CnC\\TEMPERAT.MIX
-				^SupportDir|Content/cnc/winter.mix: CnC\\WINTER.MIX
-				^SupportDir|Content/cnc/speech.mix: CnC\\SPEECH.MIX
-				^SupportDir|Content/cnc/tempicnh.mix: CnC\\TEMPICNH.MIX
-				^SupportDir|Content/cnc/transit.mix: CnC\\TRANSIT.MIX
-				^SupportDir|Content/cnc/scores-covertops.mix: CnC\covert\SCORES.MIX
-				^SupportDir|Content/cnc/movies.mix: CnC\\MOVIES.MIX
-		ExtractMix: ^SupportDir|Content/cnc/movies.mix
-			^SupportDir|Content/cnc/movies/airstrk.vqa: airstrk.vqa
-			^SupportDir|Content/cnc/movies/akira.vqa: akira.vqa
-			^SupportDir|Content/cnc/movies/bkground.vqa: bkground.vqa
-			^SupportDir|Content/cnc/movies/burdet1.vqa: burdet1.vqa
-			^SupportDir|Content/cnc/movies/burdet2.vqa: burdet2.vqa
-			^SupportDir|Content/cnc/movies/gdi4a.vqa: gdi4a.vqa
-			^SupportDir|Content/cnc/movies/gdi4b.vqa: gdi4b.vqa
-			^SupportDir|Content/cnc/movies/gdifina.vqa: gdifina.vqa
-			^SupportDir|Content/cnc/movies/gdifinb.vqa: gdifinb.vqa
-			^SupportDir|Content/cnc/movies/nod7a.vqa: nod7a.vqa
-			^SupportDir|Content/cnc/movies/nod7b.vqa: nod7b.vqa
-			^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
-			^SupportDir|Content/cnc/movies/turtkill.vqa: turtkill.vqa
-			^SupportDir|Content/cnc/movies/trtkil_d.vqa: trtkil_d.vqa
-			^SupportDir|Content/cnc/movies/trailer.vqa: trailer.vqa
-			^SupportDir|Content/cnc/movies/tiberfx.vqa: tiberfx.vqa
-			^SupportDir|Content/cnc/movies/tbrinfo3.vqa: tbrinfo3.vqa
-			^SupportDir|Content/cnc/movies/tbrinfo2.vqa: tbrinfo2.vqa
-			^SupportDir|Content/cnc/movies/tbrinfo1.vqa: tbrinfo1.vqa
-			^SupportDir|Content/cnc/movies/tankkill.vqa: tankkill.vqa
-			^SupportDir|Content/cnc/movies/tankgo.vqa: tankgo.vqa
-			^SupportDir|Content/cnc/movies/sundial.vqa: sundial.vqa
-			^SupportDir|Content/cnc/movies/stealth.vqa: stealth.vqa
-			^SupportDir|Content/cnc/movies/spycrash.vqa: spycrash.vqa
-			^SupportDir|Content/cnc/movies/sethpre.vqa: sethpre.vqa
-			^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
-			^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
-			^SupportDir|Content/cnc/movies/samdie.vqa: samdie.vqa
-			^SupportDir|Content/cnc/movies/sabotage.vqa: sabotage.vqa
-			^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
-			^SupportDir|Content/cnc/movies/refint.vqa: refint.vqa
-			^SupportDir|Content/cnc/movies/podium.vqa: podium.vqa
-			^SupportDir|Content/cnc/movies/planecra.vqa: planecra.vqa
-			^SupportDir|Content/cnc/movies/pintle.vqa: pintle.vqa
-			^SupportDir|Content/cnc/movies/paratrop.vqa: paratrop.vqa
-			^SupportDir|Content/cnc/movies/obel.vqa: obel.vqa
-			^SupportDir|Content/cnc/movies/nuke.vqa: nuke.vqa
-			^SupportDir|Content/cnc/movies/nodsweep.vqa: nodsweep.vqa
-			^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
-			^SupportDir|Content/cnc/movies/nodflees.vqa: nodflees.vqa
-			^SupportDir|Content/cnc/movies/nodfinal.vqa: nodfinal.vqa
-			^SupportDir|Content/cnc/movies/nodend4.vqa: nodend4.vqa
-			^SupportDir|Content/cnc/movies/nodend3.vqa: nodend3.vqa
-			^SupportDir|Content/cnc/movies/nodend2.vqa: nodend2.vqa
-			^SupportDir|Content/cnc/movies/nodend1.vqa: nodend1.vqa
-			^SupportDir|Content/cnc/movies/nod9.vqa: nod9.vqa
-			^SupportDir|Content/cnc/movies/nod8.vqa: nod8.vqa
-			^SupportDir|Content/cnc/movies/nod6.vqa: nod6.vqa
-			^SupportDir|Content/cnc/movies/nod5.vqa: nod5.vqa
-			^SupportDir|Content/cnc/movies/nod4b.vqa: nod4b.vqa
-			^SupportDir|Content/cnc/movies/nod4a.vqa: nod4a.vqa
-			^SupportDir|Content/cnc/movies/nod3.vqa: nod3.vqa
-			^SupportDir|Content/cnc/movies/nod2.vqa: nod2.vqa
-			^SupportDir|Content/cnc/movies/nod1pre.vqa: nod1pre.vqa
-			^SupportDir|Content/cnc/movies/nod13.vqa: nod13.vqa
-			^SupportDir|Content/cnc/movies/nod12.vqa: nod12.vqa
-			^SupportDir|Content/cnc/movies/nod11.vqa: nod11.vqa
-			^SupportDir|Content/cnc/movies/nod10b.vqa: nod10b.vqa
-			^SupportDir|Content/cnc/movies/nod10a.vqa: nod10a.vqa
-			^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
-			^SupportDir|Content/cnc/movies/nitejump.vqa: nitejump.vqa
-			^SupportDir|Content/cnc/movies/napalm.vqa: napalm.vqa
-			^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
-			^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/cnc/movies/kanepre.vqa: kanepre.vqa
-			^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
-			^SupportDir|Content/cnc/movies/insites.vqa: insites.vqa
-			^SupportDir|Content/cnc/movies/hellvaly.vqa: hellvaly.vqa
-			^SupportDir|Content/cnc/movies/gunboat.vqa: gunboat.vqa
-			^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
-			^SupportDir|Content/cnc/movies/gdilose.vqa: gdilose.vqa
-			^SupportDir|Content/cnc/movies/gdiend2.vqa: gdiend2.vqa
-			^SupportDir|Content/cnc/movies/gdiend1.vqa: gdiend1.vqa
-			^SupportDir|Content/cnc/movies/gdi9.vqa: gdi9.vqa
-			^SupportDir|Content/cnc/movies/gdi8b.vqa: gdi8b.vqa
-			^SupportDir|Content/cnc/movies/gdi8a.vqa: gdi8a.vqa
-			^SupportDir|Content/cnc/movies/gdi7.vqa: gdi7.vqa
-			^SupportDir|Content/cnc/movies/gdi6.vqa: gdi6.vqa
-			^SupportDir|Content/cnc/movies/gdi5.vqa: gdi5.vqa
-			^SupportDir|Content/cnc/movies/gdi3lose.vqa: gdi3lose.vqa
-			^SupportDir|Content/cnc/movies/gdi3.vqa: gdi3.vqa
-			^SupportDir|Content/cnc/movies/gdi2.vqa: gdi2.vqa
-			^SupportDir|Content/cnc/movies/gdi15.vqa: gdi15.vqa
-			^SupportDir|Content/cnc/movies/gdi14.vqa: gdi14.vqa
-			^SupportDir|Content/cnc/movies/gdi13.vqa: gdi13.vqa
-			^SupportDir|Content/cnc/movies/gdi12.vqa: gdi12.vqa
-			^SupportDir|Content/cnc/movies/gdi11.vqa: gdi11.vqa
-			^SupportDir|Content/cnc/movies/gdi10.vqa: gdi10.vqa
-			^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
-			^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
-			^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
-			^SupportDir|Content/cnc/movies/flyy.vqa: flyy.vqa
-			^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
-			^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
-			^SupportDir|Content/cnc/movies/dessweep.vqa: dessweep.vqa
-			^SupportDir|Content/cnc/movies/desolat.vqa: desolat.vqa
-			^SupportDir|Content/cnc/movies/deskill.vqa: deskill.vqa
-			^SupportDir|Content/cnc/movies/desflees.vqa: desflees.vqa
-			^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
-			^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
-			^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
-			^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
-			^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
-			^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
-		Delete: ^SupportDir|Content/cnc/movies.mix
+		BeforeInstall:
+			# This one step sets up the 1 required package and the two optional video packages.
+			ExtractIscab: data1.hdr
+				Volumes:
+					2: data2.cab
+					3: data3.cab
+				Extract:
+					^SupportDir|Content/cnc/conquer.mix: CnC\\CONQUER.MIX
+					^SupportDir|Content/cnc/desert.mix: CnC\\DESERT.MIX
+					^SupportDir|Content/cnc/general.mix: CnC\\GENERAL.MIX
+					^SupportDir|Content/cnc/sounds.mix: CnC\\SOUNDS.MIX
+					^SupportDir|Content/cnc/temperat.mix: CnC\\TEMPERAT.MIX
+					^SupportDir|Content/cnc/winter.mix: CnC\\WINTER.MIX
+					^SupportDir|Content/cnc/speech.mix: CnC\\SPEECH.MIX
+					^SupportDir|Content/cnc/tempicnh.mix: CnC\\TEMPICNH.MIX
+					^SupportDir|Content/cnc/transit.mix: CnC\\TRANSIT.MIX
+					^SupportDir|Content/cnc/movies.mix: CnC\\MOVIES.MIX
+		# GDI campaign briefings (optional):
+		ContentPackage:
+			Name: movies-gdi
+			Actions:
+				ExtractMix: ^SupportDir|Content/cnc/movies.mix
+					^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
+					^SupportDir|Content/cnc/movies/turtkill.vqa: turtkill.vqa
+					^SupportDir|Content/cnc/movies/trailer.vqa: trailer.vqa
+					^SupportDir|Content/cnc/movies/tbrinfo3.vqa: tbrinfo3.vqa
+					^SupportDir|Content/cnc/movies/tbrinfo2.vqa: tbrinfo2.vqa
+					^SupportDir|Content/cnc/movies/tbrinfo1.vqa: tbrinfo1.vqa
+					^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
+					^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
+					^SupportDir|Content/cnc/movies/samdie.vqa: samdie.vqa
+					^SupportDir|Content/cnc/movies/sabotage.vqa: sabotage.vqa
+					^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
+					^SupportDir|Content/cnc/movies/podium.vqa: podium.vqa
+					^SupportDir|Content/cnc/movies/planecra.vqa: planecra.vqa
+					^SupportDir|Content/cnc/movies/pintle.vqa: pintle.vqa
+					^SupportDir|Content/cnc/movies/paratrop.vqa: paratrop.vqa
+					^SupportDir|Content/cnc/movies/nodsweep.vqa: nodsweep.vqa
+					^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
+					^SupportDir|Content/cnc/movies/nodflees.vqa: nodflees.vqa
+					^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
+					^SupportDir|Content/cnc/movies/nitejump.vqa: nitejump.vqa
+					^SupportDir|Content/cnc/movies/napalm.vqa: napalm.vqa
+					^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
+					^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
+					^SupportDir|Content/cnc/movies/hellvaly.vqa: hellvaly.vqa
+					^SupportDir|Content/cnc/movies/gunboat.vqa: gunboat.vqa
+					^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
+					^SupportDir|Content/cnc/movies/gdilose.vqa: gdilose.vqa
+					^SupportDir|Content/cnc/movies/gdifinb.vqa: gdifinb.vqa
+					^SupportDir|Content/cnc/movies/gdifina.vqa: gdifina.vqa
+					^SupportDir|Content/cnc/movies/gdiend2.vqa: gdiend2.vqa
+					^SupportDir|Content/cnc/movies/gdiend1.vqa: gdiend1.vqa
+					^SupportDir|Content/cnc/movies/gdi9.vqa: gdi9.vqa
+					^SupportDir|Content/cnc/movies/gdi8b.vqa: gdi8b.vqa
+					^SupportDir|Content/cnc/movies/gdi8a.vqa: gdi8a.vqa
+					^SupportDir|Content/cnc/movies/gdi7.vqa: gdi7.vqa
+					^SupportDir|Content/cnc/movies/gdi6.vqa: gdi6.vqa
+					^SupportDir|Content/cnc/movies/gdi5.vqa: gdi5.vqa
+					^SupportDir|Content/cnc/movies/gdi4b.vqa: gdi4b.vqa
+					^SupportDir|Content/cnc/movies/gdi4a.vqa: gdi4a.vqa
+					^SupportDir|Content/cnc/movies/gdi3lose.vqa: gdi3lose.vqa
+					^SupportDir|Content/cnc/movies/gdi3.vqa: gdi3.vqa
+					^SupportDir|Content/cnc/movies/gdi2.vqa: gdi2.vqa
+					^SupportDir|Content/cnc/movies/gdi15.vqa: gdi15.vqa
+					^SupportDir|Content/cnc/movies/gdi14.vqa: gdi14.vqa
+					^SupportDir|Content/cnc/movies/gdi13.vqa: gdi13.vqa
+					^SupportDir|Content/cnc/movies/gdi12.vqa: gdi12.vqa
+					^SupportDir|Content/cnc/movies/gdi11.vqa: gdi11.vqa
+					^SupportDir|Content/cnc/movies/gdi10.vqa: gdi10.vqa
+					^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
+					^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
+					^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
+					^SupportDir|Content/cnc/movies/flyy.vqa: flyy.vqa
+					^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
+					^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
+					^SupportDir|Content/cnc/movies/desolat.vqa: desolat.vqa
+					^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
+					^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
+					^SupportDir|Content/cnc/movies/burdet2.vqa: burdet2.vqa
+					^SupportDir|Content/cnc/movies/burdet1.vqa: burdet1.vqa
+					^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
+					^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
+					^SupportDir|Content/cnc/movies/bkground.vqa: bkground.vqa
+					^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
+					^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
+		# Nod campaign briefings (optional):
+		ContentPackage:
+			Name: movies-nod
+			Actions:
+				ExtractMix: ^SupportDir|Content/cnc/movies.mix
+					^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
+					^SupportDir|Content/cnc/movies/trtkil_d.vqa: trtkil_d.vqa
+					^SupportDir|Content/cnc/movies/trailer.vqa: trailer.vqa
+					^SupportDir|Content/cnc/movies/tiberfx.vqa: tiberfx.vqa
+					^SupportDir|Content/cnc/movies/tankkill.vqa: tankkill.vqa
+					^SupportDir|Content/cnc/movies/tankgo.vqa: tankgo.vqa
+					^SupportDir|Content/cnc/movies/sundial.vqa: sundial.vqa
+					^SupportDir|Content/cnc/movies/stealth.vqa: stealth.vqa
+					^SupportDir|Content/cnc/movies/spycrash.vqa: spycrash.vqa
+					^SupportDir|Content/cnc/movies/sethpre.vqa: sethpre.vqa
+					^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
+					^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
+					^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
+					^SupportDir|Content/cnc/movies/refint.vqa: refint.vqa
+					^SupportDir|Content/cnc/movies/obel.vqa: obel.vqa
+					^SupportDir|Content/cnc/movies/nuke.vqa: nuke.vqa
+					^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
+					^SupportDir|Content/cnc/movies/nodfinal.vqa: nodfinal.vqa
+					^SupportDir|Content/cnc/movies/nodend4.vqa: nodend4.vqa
+					^SupportDir|Content/cnc/movies/nodend3.vqa: nodend3.vqa
+					^SupportDir|Content/cnc/movies/nodend2.vqa: nodend2.vqa
+					^SupportDir|Content/cnc/movies/nodend1.vqa: nodend1.vqa
+					^SupportDir|Content/cnc/movies/nod9.vqa: nod9.vqa
+					^SupportDir|Content/cnc/movies/nod8.vqa: nod8.vqa
+					^SupportDir|Content/cnc/movies/nod7b.vqa: nod7b.vqa
+					^SupportDir|Content/cnc/movies/nod7a.vqa: nod7a.vqa
+					^SupportDir|Content/cnc/movies/nod6.vqa: nod6.vqa
+					^SupportDir|Content/cnc/movies/nod5.vqa: nod5.vqa
+					^SupportDir|Content/cnc/movies/nod4b.vqa: nod4b.vqa
+					^SupportDir|Content/cnc/movies/nod4a.vqa: nod4a.vqa
+					^SupportDir|Content/cnc/movies/nod3.vqa: nod3.vqa
+					^SupportDir|Content/cnc/movies/nod2.vqa: nod2.vqa
+					^SupportDir|Content/cnc/movies/nod1pre.vqa: nod1pre.vqa
+					^SupportDir|Content/cnc/movies/nod13.vqa: nod13.vqa
+					^SupportDir|Content/cnc/movies/nod12.vqa: nod12.vqa
+					^SupportDir|Content/cnc/movies/nod11.vqa: nod11.vqa
+					^SupportDir|Content/cnc/movies/nod10b.vqa: nod10b.vqa
+					^SupportDir|Content/cnc/movies/nod10a.vqa: nod10a.vqa
+					^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
+					^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
+					^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/cnc/movies/kanepre.vqa: kanepre.vqa
+					^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
+					^SupportDir|Content/cnc/movies/insites.vqa: insites.vqa
+					^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
+					^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
+					^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
+					^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
+					^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
+					^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
+					^SupportDir|Content/cnc/movies/dessweep.vqa: dessweep.vqa
+					^SupportDir|Content/cnc/movies/deskill.vqa: deskill.vqa
+					^SupportDir|Content/cnc/movies/desflees.vqa: desflees.vqa
+					^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
+					^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
+					^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
+					^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
+					^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
+					^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
+					^SupportDir|Content/cnc/movies/akira.vqa: akira.vqa
+					^SupportDir|Content/cnc/movies/airstrk.vqa: airstrk.vqa
+		# Base game music (optional):
+		ContentPackage:
+			Name: music
+			Actions:
+				ExtractIscab: data1.hdr
+					Volumes:
+						2: data2.cab
+						3: data3.cab
+					Extract:
+						^SupportDir|Content/cnc/scores.mix: CnC\\SCORES.MIX
+		# Covert Operations music (optional):
+		ContentPackage:
+			Name: music-covertops
+			Actions:
+				ExtractIscab: data1.hdr
+					Volumes:
+						2: data2.cab
+						3: data3.cab
+					Extract:
+						^SupportDir|Content/cnc/scores-covertops.mix: CnC\covert\SCORES.MIX
+		AfterInstall:
+			Delete: ^SupportDir|Content/cnc/movies.mix
diff --git a/mods/cnc/installer/gdi95.yaml b/mods/cnc/installer/gdi95.yaml
index a365138615..fd7130154c 100644
--- a/mods/cnc/installer/gdi95.yaml
+++ b/mods/cnc/installer/gdi95.yaml
@@ -4,81 +4,94 @@ gdi95: C&C Gold (GDI Disc, English)
 		DISK.WAV: 8bef9a6687c0fe0afd57c6561df58fa6e64f145d
 		CONQUER.MIX: 833e02a09aae694659eb312d3838367f681d1b30
 	Install:
-		Copy: .
-			^SupportDir|Content/cnc/conquer.mix: CONQUER.MIX
-			^SupportDir|Content/cnc/desert.mix: DESERT.MIX
-			^SupportDir|Content/cnc/general.mix: GENERAL.MIX
-			^SupportDir|Content/cnc/scores.mix: SCORES.MIX
-			^SupportDir|Content/cnc/sounds.mix: SOUNDS.MIX
-			^SupportDir|Content/cnc/temperat.mix: TEMPERAT.MIX
-			^SupportDir|Content/cnc/winter.mix: WINTER.MIX
-		ExtractBlast: INSTALL/SETUP.Z
-			^SupportDir|Content/cnc/speech.mix: SPEECH.MIX
-			^SupportDir|Content/cnc/tempicnh.mix: TEMPICNH.MIX
-			^SupportDir|Content/cnc/transit.mix: TRANSIT.MIX
-		ExtractMix: MOVIES.MIX
-			^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
-			^SupportDir|Content/cnc/movies/turtkill.vqa: turtkill.vqa
-			^SupportDir|Content/cnc/movies/trailer.vqa: trailer.vqa
-			^SupportDir|Content/cnc/movies/tbrinfo3.vqa: tbrinfo3.vqa
-			^SupportDir|Content/cnc/movies/tbrinfo2.vqa: tbrinfo2.vqa
-			^SupportDir|Content/cnc/movies/tbrinfo1.vqa: tbrinfo1.vqa
-			^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
-			^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
-			^SupportDir|Content/cnc/movies/samdie.vqa: samdie.vqa
-			^SupportDir|Content/cnc/movies/sabotage.vqa: sabotage.vqa
-			^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
-			^SupportDir|Content/cnc/movies/podium.vqa: podium.vqa
-			^SupportDir|Content/cnc/movies/planecra.vqa: planecra.vqa
-			^SupportDir|Content/cnc/movies/pintle.vqa: pintle.vqa
-			^SupportDir|Content/cnc/movies/paratrop.vqa: paratrop.vqa
-			^SupportDir|Content/cnc/movies/nodsweep.vqa: nodsweep.vqa
-			^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
-			^SupportDir|Content/cnc/movies/nodflees.vqa: nodflees.vqa
-			^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
-			^SupportDir|Content/cnc/movies/nitejump.vqa: nitejump.vqa
-			^SupportDir|Content/cnc/movies/napalm.vqa: napalm.vqa
-			^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
-			^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
-			^SupportDir|Content/cnc/movies/hellvaly.vqa: hellvaly.vqa
-			^SupportDir|Content/cnc/movies/gunboat.vqa: gunboat.vqa
-			^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
-			^SupportDir|Content/cnc/movies/gdilose.vqa: gdilose.vqa
-			^SupportDir|Content/cnc/movies/gdifinb.vqa: gdifinb.vqa
-			^SupportDir|Content/cnc/movies/gdifina.vqa: gdifina.vqa
-			^SupportDir|Content/cnc/movies/gdiend2.vqa: gdiend2.vqa
-			^SupportDir|Content/cnc/movies/gdiend1.vqa: gdiend1.vqa
-			^SupportDir|Content/cnc/movies/gdi9.vqa: gdi9.vqa
-			^SupportDir|Content/cnc/movies/gdi8b.vqa: gdi8b.vqa
-			^SupportDir|Content/cnc/movies/gdi8a.vqa: gdi8a.vqa
-			^SupportDir|Content/cnc/movies/gdi7.vqa: gdi7.vqa
-			^SupportDir|Content/cnc/movies/gdi6.vqa: gdi6.vqa
-			^SupportDir|Content/cnc/movies/gdi5.vqa: gdi5.vqa
-			^SupportDir|Content/cnc/movies/gdi4b.vqa: gdi4b.vqa
-			^SupportDir|Content/cnc/movies/gdi4a.vqa: gdi4a.vqa
-			^SupportDir|Content/cnc/movies/gdi3lose.vqa: gdi3lose.vqa
-			^SupportDir|Content/cnc/movies/gdi3.vqa: gdi3.vqa
-			^SupportDir|Content/cnc/movies/gdi2.vqa: gdi2.vqa
-			^SupportDir|Content/cnc/movies/gdi15.vqa: gdi15.vqa
-			^SupportDir|Content/cnc/movies/gdi14.vqa: gdi14.vqa
-			^SupportDir|Content/cnc/movies/gdi13.vqa: gdi13.vqa
-			^SupportDir|Content/cnc/movies/gdi12.vqa: gdi12.vqa
-			^SupportDir|Content/cnc/movies/gdi11.vqa: gdi11.vqa
-			^SupportDir|Content/cnc/movies/gdi10.vqa: gdi10.vqa
-			^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
-			^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
-			^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
-			^SupportDir|Content/cnc/movies/flyy.vqa: flyy.vqa
-			^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
-			^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
-			^SupportDir|Content/cnc/movies/desolat.vqa: desolat.vqa
-			^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
-			^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
-			^SupportDir|Content/cnc/movies/burdet2.vqa: burdet2.vqa
-			^SupportDir|Content/cnc/movies/burdet1.vqa: burdet1.vqa
-			^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
-			^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
-			^SupportDir|Content/cnc/movies/bkground.vqa: bkground.vqa
-			^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
-			^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
+		# Base game files:
+		ContentPackage:
+			Name: base
+			Actions:
+				Copy: .
+					^SupportDir|Content/cnc/conquer.mix: CONQUER.MIX
+					^SupportDir|Content/cnc/desert.mix: DESERT.MIX
+					^SupportDir|Content/cnc/general.mix: GENERAL.MIX
+					^SupportDir|Content/cnc/sounds.mix: SOUNDS.MIX
+					^SupportDir|Content/cnc/temperat.mix: TEMPERAT.MIX
+					^SupportDir|Content/cnc/winter.mix: WINTER.MIX
+				ExtractBlast: INSTALL/SETUP.Z
+					^SupportDir|Content/cnc/speech.mix: SPEECH.MIX
+					^SupportDir|Content/cnc/tempicnh.mix: TEMPICNH.MIX
+					^SupportDir|Content/cnc/transit.mix: TRANSIT.MIX
+		# Base game music (optional):
+		ContentPackage:
+			Name: music
+			Actions:
+				Copy: .
+					^SupportDir|Content/cnc/scores.mix: SCORES.MIX
+		# GDI campaign briefings (optional):
+		ContentPackage:
+			Name: movies-gdi
+			Actions:
+				ExtractMix: MOVIES.MIX
+					^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
+					^SupportDir|Content/cnc/movies/turtkill.vqa: turtkill.vqa
+					^SupportDir|Content/cnc/movies/trailer.vqa: trailer.vqa
+					^SupportDir|Content/cnc/movies/tbrinfo3.vqa: tbrinfo3.vqa
+					^SupportDir|Content/cnc/movies/tbrinfo2.vqa: tbrinfo2.vqa
+					^SupportDir|Content/cnc/movies/tbrinfo1.vqa: tbrinfo1.vqa
+					^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
+					^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
+					^SupportDir|Content/cnc/movies/samdie.vqa: samdie.vqa
+					^SupportDir|Content/cnc/movies/sabotage.vqa: sabotage.vqa
+					^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
+					^SupportDir|Content/cnc/movies/podium.vqa: podium.vqa
+					^SupportDir|Content/cnc/movies/planecra.vqa: planecra.vqa
+					^SupportDir|Content/cnc/movies/pintle.vqa: pintle.vqa
+					^SupportDir|Content/cnc/movies/paratrop.vqa: paratrop.vqa
+					^SupportDir|Content/cnc/movies/nodsweep.vqa: nodsweep.vqa
+					^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
+					^SupportDir|Content/cnc/movies/nodflees.vqa: nodflees.vqa
+					^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
+					^SupportDir|Content/cnc/movies/nitejump.vqa: nitejump.vqa
+					^SupportDir|Content/cnc/movies/napalm.vqa: napalm.vqa
+					^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
+					^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
+					^SupportDir|Content/cnc/movies/hellvaly.vqa: hellvaly.vqa
+					^SupportDir|Content/cnc/movies/gunboat.vqa: gunboat.vqa
+					^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
+					^SupportDir|Content/cnc/movies/gdilose.vqa: gdilose.vqa
+					^SupportDir|Content/cnc/movies/gdifinb.vqa: gdifinb.vqa
+					^SupportDir|Content/cnc/movies/gdifina.vqa: gdifina.vqa
+					^SupportDir|Content/cnc/movies/gdiend2.vqa: gdiend2.vqa
+					^SupportDir|Content/cnc/movies/gdiend1.vqa: gdiend1.vqa
+					^SupportDir|Content/cnc/movies/gdi9.vqa: gdi9.vqa
+					^SupportDir|Content/cnc/movies/gdi8b.vqa: gdi8b.vqa
+					^SupportDir|Content/cnc/movies/gdi8a.vqa: gdi8a.vqa
+					^SupportDir|Content/cnc/movies/gdi7.vqa: gdi7.vqa
+					^SupportDir|Content/cnc/movies/gdi6.vqa: gdi6.vqa
+					^SupportDir|Content/cnc/movies/gdi5.vqa: gdi5.vqa
+					^SupportDir|Content/cnc/movies/gdi4b.vqa: gdi4b.vqa
+					^SupportDir|Content/cnc/movies/gdi4a.vqa: gdi4a.vqa
+					^SupportDir|Content/cnc/movies/gdi3lose.vqa: gdi3lose.vqa
+					^SupportDir|Content/cnc/movies/gdi3.vqa: gdi3.vqa
+					^SupportDir|Content/cnc/movies/gdi2.vqa: gdi2.vqa
+					^SupportDir|Content/cnc/movies/gdi15.vqa: gdi15.vqa
+					^SupportDir|Content/cnc/movies/gdi14.vqa: gdi14.vqa
+					^SupportDir|Content/cnc/movies/gdi13.vqa: gdi13.vqa
+					^SupportDir|Content/cnc/movies/gdi12.vqa: gdi12.vqa
+					^SupportDir|Content/cnc/movies/gdi11.vqa: gdi11.vqa
+					^SupportDir|Content/cnc/movies/gdi10.vqa: gdi10.vqa
+					^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
+					^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
+					^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
+					^SupportDir|Content/cnc/movies/flyy.vqa: flyy.vqa
+					^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
+					^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
+					^SupportDir|Content/cnc/movies/desolat.vqa: desolat.vqa
+					^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
+					^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
+					^SupportDir|Content/cnc/movies/burdet2.vqa: burdet2.vqa
+					^SupportDir|Content/cnc/movies/burdet1.vqa: burdet1.vqa
+					^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
+					^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
+					^SupportDir|Content/cnc/movies/bkground.vqa: bkground.vqa
+					^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
+					^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
diff --git a/mods/cnc/installer/nod95.yaml b/mods/cnc/installer/nod95.yaml
index 2e2fcc159c..78435bcc3f 100644
--- a/mods/cnc/installer/nod95.yaml
+++ b/mods/cnc/installer/nod95.yaml
@@ -4,77 +4,90 @@ nod95: C&C Gold (Nod Disc, English)
 		DISK.WAV: 83a0235525afa5cd6096f2967e3eae032996e38c
 		CONQUER.MIX: 833e02a09aae694659eb312d3838367f681d1b30
 	Install:
-		Copy: .
-			^SupportDir|Content/cnc/conquer.mix: CONQUER.MIX
-			^SupportDir|Content/cnc/desert.mix: DESERT.MIX
-			^SupportDir|Content/cnc/general.mix: GENERAL.MIX
-			^SupportDir|Content/cnc/scores.mix: SCORES.MIX
-			^SupportDir|Content/cnc/sounds.mix: SOUNDS.MIX
-			^SupportDir|Content/cnc/temperat.mix: TEMPERAT.MIX
-			^SupportDir|Content/cnc/winter.mix: WINTER.MIX
-		ExtractBlast: INSTALL/SETUP.Z
-			^SupportDir|Content/cnc/speech.mix: SPEECH.MIX
-			^SupportDir|Content/cnc/tempicnh.mix: TEMPICNH.MIX
-			^SupportDir|Content/cnc/transit.mix: TRANSIT.MIX
-		ExtractMix: MOVIES.MIX
-			^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
-			^SupportDir|Content/cnc/movies/trtkil_d.vqa: trtkil_d.vqa
-			^SupportDir|Content/cnc/movies/trailer.vqa: trailer.vqa
-			^SupportDir|Content/cnc/movies/tiberfx.vqa: tiberfx.vqa
-			^SupportDir|Content/cnc/movies/tankkill.vqa: tankkill.vqa
-			^SupportDir|Content/cnc/movies/tankgo.vqa: tankgo.vqa
-			^SupportDir|Content/cnc/movies/sundial.vqa: sundial.vqa
-			^SupportDir|Content/cnc/movies/stealth.vqa: stealth.vqa
-			^SupportDir|Content/cnc/movies/spycrash.vqa: spycrash.vqa
-			^SupportDir|Content/cnc/movies/sethpre.vqa: sethpre.vqa
-			^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
-			^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
-			^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
-			^SupportDir|Content/cnc/movies/refint.vqa: refint.vqa
-			^SupportDir|Content/cnc/movies/obel.vqa: obel.vqa
-			^SupportDir|Content/cnc/movies/nuke.vqa: nuke.vqa
-			^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
-			^SupportDir|Content/cnc/movies/nodfinal.vqa: nodfinal.vqa
-			^SupportDir|Content/cnc/movies/nodend4.vqa: nodend4.vqa
-			^SupportDir|Content/cnc/movies/nodend3.vqa: nodend3.vqa
-			^SupportDir|Content/cnc/movies/nodend2.vqa: nodend2.vqa
-			^SupportDir|Content/cnc/movies/nodend1.vqa: nodend1.vqa
-			^SupportDir|Content/cnc/movies/nod9.vqa: nod9.vqa
-			^SupportDir|Content/cnc/movies/nod8.vqa: nod8.vqa
-			^SupportDir|Content/cnc/movies/nod7b.vqa: nod7b.vqa
-			^SupportDir|Content/cnc/movies/nod7a.vqa: nod7a.vqa
-			^SupportDir|Content/cnc/movies/nod6.vqa: nod6.vqa
-			^SupportDir|Content/cnc/movies/nod5.vqa: nod5.vqa
-			^SupportDir|Content/cnc/movies/nod4b.vqa: nod4b.vqa
-			^SupportDir|Content/cnc/movies/nod4a.vqa: nod4a.vqa
-			^SupportDir|Content/cnc/movies/nod3.vqa: nod3.vqa
-			^SupportDir|Content/cnc/movies/nod2.vqa: nod2.vqa
-			^SupportDir|Content/cnc/movies/nod1pre.vqa: nod1pre.vqa
-			^SupportDir|Content/cnc/movies/nod13.vqa: nod13.vqa
-			^SupportDir|Content/cnc/movies/nod12.vqa: nod12.vqa
-			^SupportDir|Content/cnc/movies/nod11.vqa: nod11.vqa
-			^SupportDir|Content/cnc/movies/nod10b.vqa: nod10b.vqa
-			^SupportDir|Content/cnc/movies/nod10a.vqa: nod10a.vqa
-			^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
-			^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
-			^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/cnc/movies/kanepre.vqa: kanepre.vqa
-			^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
-			^SupportDir|Content/cnc/movies/insites.vqa: insites.vqa
-			^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
-			^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
-			^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
-			^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
-			^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
-			^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
-			^SupportDir|Content/cnc/movies/dessweep.vqa: dessweep.vqa
-			^SupportDir|Content/cnc/movies/deskill.vqa: deskill.vqa
-			^SupportDir|Content/cnc/movies/desflees.vqa: desflees.vqa
-			^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
-			^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
-			^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
-			^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
-			^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
-			^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
-			^SupportDir|Content/cnc/movies/akira.vqa: akira.vqa
-			^SupportDir|Content/cnc/movies/airstrk.vqa: airstrk.vqa
+		# Base game files:
+		ContentPackage:
+			Name: base
+			Actions:
+				Copy: .
+					^SupportDir|Content/cnc/conquer.mix: CONQUER.MIX
+					^SupportDir|Content/cnc/desert.mix: DESERT.MIX
+					^SupportDir|Content/cnc/general.mix: GENERAL.MIX
+					^SupportDir|Content/cnc/sounds.mix: SOUNDS.MIX
+					^SupportDir|Content/cnc/temperat.mix: TEMPERAT.MIX
+					^SupportDir|Content/cnc/winter.mix: WINTER.MIX
+				ExtractBlast: INSTALL/SETUP.Z
+					^SupportDir|Content/cnc/speech.mix: SPEECH.MIX
+					^SupportDir|Content/cnc/tempicnh.mix: TEMPICNH.MIX
+					^SupportDir|Content/cnc/transit.mix: TRANSIT.MIX
+		# Base game music (optional):
+		ContentPackage:
+			Name: music
+			Actions:
+				Copy: .
+					^SupportDir|Content/cnc/scores.mix: SCORES.MIX
+		# Nod campaign briefings (optional):
+		ContentPackage:
+			Name: movies-nod
+			Actions:
+				ExtractMix: MOVIES.MIX
+					^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
+					^SupportDir|Content/cnc/movies/trtkil_d.vqa: trtkil_d.vqa
+					^SupportDir|Content/cnc/movies/trailer.vqa: trailer.vqa
+					^SupportDir|Content/cnc/movies/tiberfx.vqa: tiberfx.vqa
+					^SupportDir|Content/cnc/movies/tankkill.vqa: tankkill.vqa
+					^SupportDir|Content/cnc/movies/tankgo.vqa: tankgo.vqa
+					^SupportDir|Content/cnc/movies/sundial.vqa: sundial.vqa
+					^SupportDir|Content/cnc/movies/stealth.vqa: stealth.vqa
+					^SupportDir|Content/cnc/movies/spycrash.vqa: spycrash.vqa
+					^SupportDir|Content/cnc/movies/sethpre.vqa: sethpre.vqa
+					^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
+					^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
+					^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
+					^SupportDir|Content/cnc/movies/refint.vqa: refint.vqa
+					^SupportDir|Content/cnc/movies/obel.vqa: obel.vqa
+					^SupportDir|Content/cnc/movies/nuke.vqa: nuke.vqa
+					^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
+					^SupportDir|Content/cnc/movies/nodfinal.vqa: nodfinal.vqa
+					^SupportDir|Content/cnc/movies/nodend4.vqa: nodend4.vqa
+					^SupportDir|Content/cnc/movies/nodend3.vqa: nodend3.vqa
+					^SupportDir|Content/cnc/movies/nodend2.vqa: nodend2.vqa
+					^SupportDir|Content/cnc/movies/nodend1.vqa: nodend1.vqa
+					^SupportDir|Content/cnc/movies/nod9.vqa: nod9.vqa
+					^SupportDir|Content/cnc/movies/nod8.vqa: nod8.vqa
+					^SupportDir|Content/cnc/movies/nod7b.vqa: nod7b.vqa
+					^SupportDir|Content/cnc/movies/nod7a.vqa: nod7a.vqa
+					^SupportDir|Content/cnc/movies/nod6.vqa: nod6.vqa
+					^SupportDir|Content/cnc/movies/nod5.vqa: nod5.vqa
+					^SupportDir|Content/cnc/movies/nod4b.vqa: nod4b.vqa
+					^SupportDir|Content/cnc/movies/nod4a.vqa: nod4a.vqa
+					^SupportDir|Content/cnc/movies/nod3.vqa: nod3.vqa
+					^SupportDir|Content/cnc/movies/nod2.vqa: nod2.vqa
+					^SupportDir|Content/cnc/movies/nod1pre.vqa: nod1pre.vqa
+					^SupportDir|Content/cnc/movies/nod13.vqa: nod13.vqa
+					^SupportDir|Content/cnc/movies/nod12.vqa: nod12.vqa
+					^SupportDir|Content/cnc/movies/nod11.vqa: nod11.vqa
+					^SupportDir|Content/cnc/movies/nod10b.vqa: nod10b.vqa
+					^SupportDir|Content/cnc/movies/nod10a.vqa: nod10a.vqa
+					^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
+					^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
+					^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/cnc/movies/kanepre.vqa: kanepre.vqa
+					^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
+					^SupportDir|Content/cnc/movies/insites.vqa: insites.vqa
+					^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
+					^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
+					^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
+					^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
+					^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
+					^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
+					^SupportDir|Content/cnc/movies/dessweep.vqa: dessweep.vqa
+					^SupportDir|Content/cnc/movies/deskill.vqa: deskill.vqa
+					^SupportDir|Content/cnc/movies/desflees.vqa: desflees.vqa
+					^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
+					^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
+					^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
+					^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
+					^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
+					^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
+					^SupportDir|Content/cnc/movies/akira.vqa: akira.vqa
+					^SupportDir|Content/cnc/movies/airstrk.vqa: airstrk.vqa
diff --git a/mods/cnc/installer/origin.yaml b/mods/cnc/installer/origin.yaml
index dba788f0a0..c7e5078f74 100644
--- a/mods/cnc/installer/origin.yaml
+++ b/mods/cnc/installer/origin.yaml
@@ -6,123 +6,169 @@ origin: C&C The Ultimate Collection (Origin version, English)
 	IDFiles:
 		CONQUER.MIX: 833e02a09aae694659eb312d3838367f681d1b30
 	Install:
-		Copy: .
-			^SupportDir|Content/cnc/conquer.mix: CONQUER.MIX
-			^SupportDir|Content/cnc/desert.mix: DESERT.MIX
-			^SupportDir|Content/cnc/general.mix: GENERAL.MIX
-			^SupportDir|Content/cnc/scores.mix: SCORES.MIX
-			^SupportDir|Content/cnc/sounds.mix: SOUNDS.MIX
-			^SupportDir|Content/cnc/temperat.mix: TEMPERAT.MIX
-			^SupportDir|Content/cnc/winter.mix: WINTER.MIX
-			^SupportDir|Content/cnc/speech.mix: SPEECH.MIX
-			^SupportDir|Content/cnc/tempicnh.mix: TEMPICNH.MIX
-			^SupportDir|Content/cnc/transit.mix: TRANSIT.MIX
-			^SupportDir|Content/cnc/scores-covertops.mix: covert/SCORES.MIX
-		ExtractMix: movies.mix
-			^SupportDir|Content/cnc/movies/akira.vqa: akira.vqa
-			^SupportDir|Content/cnc/movies/bkground.vqa: bkground.vqa
-			^SupportDir|Content/cnc/movies/burdet1.vqa: burdet1.vqa
-			^SupportDir|Content/cnc/movies/burdet2.vqa: burdet2.vqa
-			^SupportDir|Content/cnc/movies/gdi4a.vqa: gdi4a.vqa
-			^SupportDir|Content/cnc/movies/gdi4b.vqa: gdi4b.vqa
-			^SupportDir|Content/cnc/movies/gdifina.vqa: gdifina.vqa
-			^SupportDir|Content/cnc/movies/gdifinb.vqa: gdifinb.vqa
-			^SupportDir|Content/cnc/movies/nod7a.vqa: nod7a.vqa
-			^SupportDir|Content/cnc/movies/nod7b.vqa: nod7b.vqa
-			^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
-			^SupportDir|Content/cnc/movies/turtkill.vqa: turtkill.vqa
-			^SupportDir|Content/cnc/movies/trtkil_d.vqa: trtkil_d.vqa
-			^SupportDir|Content/cnc/movies/trailer.vqa: trailer.vqa
-			^SupportDir|Content/cnc/movies/tiberfx.vqa: tiberfx.vqa
-			^SupportDir|Content/cnc/movies/tbrinfo3.vqa: tbrinfo3.vqa
-			^SupportDir|Content/cnc/movies/tbrinfo2.vqa: tbrinfo2.vqa
-			^SupportDir|Content/cnc/movies/tbrinfo1.vqa: tbrinfo1.vqa
-			^SupportDir|Content/cnc/movies/tankkill.vqa: tankkill.vqa
-			^SupportDir|Content/cnc/movies/tankgo.vqa: tankgo.vqa
-			^SupportDir|Content/cnc/movies/sundial.vqa: sundial.vqa
-			^SupportDir|Content/cnc/movies/stealth.vqa: stealth.vqa
-			^SupportDir|Content/cnc/movies/spycrash.vqa: spycrash.vqa
-			^SupportDir|Content/cnc/movies/sethpre.vqa: sethpre.vqa
-			^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
-			^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
-			^SupportDir|Content/cnc/movies/samdie.vqa: samdie.vqa
-			^SupportDir|Content/cnc/movies/sabotage.vqa: sabotage.vqa
-			^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
-			^SupportDir|Content/cnc/movies/refint.vqa: refint.vqa
-			^SupportDir|Content/cnc/movies/podium.vqa: podium.vqa
-			^SupportDir|Content/cnc/movies/planecra.vqa: planecra.vqa
-			^SupportDir|Content/cnc/movies/pintle.vqa: pintle.vqa
-			^SupportDir|Content/cnc/movies/paratrop.vqa: paratrop.vqa
-			^SupportDir|Content/cnc/movies/obel.vqa: obel.vqa
-			^SupportDir|Content/cnc/movies/nuke.vqa: nuke.vqa
-			^SupportDir|Content/cnc/movies/nodsweep.vqa: nodsweep.vqa
-			^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
-			^SupportDir|Content/cnc/movies/nodflees.vqa: nodflees.vqa
-			^SupportDir|Content/cnc/movies/nodfinal.vqa: nodfinal.vqa
-			^SupportDir|Content/cnc/movies/nod9.vqa: nod9.vqa
-			^SupportDir|Content/cnc/movies/nod8.vqa: nod8.vqa
-			^SupportDir|Content/cnc/movies/nod6.vqa: nod6.vqa
-			^SupportDir|Content/cnc/movies/nod5.vqa: nod5.vqa
-			^SupportDir|Content/cnc/movies/nod4b.vqa: nod4b.vqa
-			^SupportDir|Content/cnc/movies/nod4a.vqa: nod4a.vqa
-			^SupportDir|Content/cnc/movies/nod3.vqa: nod3.vqa
-			^SupportDir|Content/cnc/movies/nod2.vqa: nod2.vqa
-			^SupportDir|Content/cnc/movies/nod1pre.vqa: nod1pre.vqa
-			^SupportDir|Content/cnc/movies/nod13.vqa: nod13.vqa
-			^SupportDir|Content/cnc/movies/nod12.vqa: nod12.vqa
-			^SupportDir|Content/cnc/movies/nod11.vqa: nod11.vqa
-			^SupportDir|Content/cnc/movies/nod10b.vqa: nod10b.vqa
-			^SupportDir|Content/cnc/movies/nod10a.vqa: nod10a.vqa
-			^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
-			^SupportDir|Content/cnc/movies/nitejump.vqa: nitejump.vqa
-			^SupportDir|Content/cnc/movies/napalm.vqa: napalm.vqa
-			^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
-			^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/cnc/movies/kanepre.vqa: kanepre.vqa
-			^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
-			^SupportDir|Content/cnc/movies/insites.vqa: insites.vqa
-			^SupportDir|Content/cnc/movies/hellvaly.vqa: hellvaly.vqa
-			^SupportDir|Content/cnc/movies/gunboat.vqa: gunboat.vqa
-			^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
-			^SupportDir|Content/cnc/movies/gdilose.vqa: gdilose.vqa
-			^SupportDir|Content/cnc/movies/gdiend2.vqa: gdiend2.vqa
-			^SupportDir|Content/cnc/movies/gdiend1.vqa: gdiend1.vqa
-			^SupportDir|Content/cnc/movies/gdi9.vqa: gdi9.vqa
-			^SupportDir|Content/cnc/movies/gdi8b.vqa: gdi8b.vqa
-			^SupportDir|Content/cnc/movies/gdi8a.vqa: gdi8a.vqa
-			^SupportDir|Content/cnc/movies/gdi7.vqa: gdi7.vqa
-			^SupportDir|Content/cnc/movies/gdi6.vqa: gdi6.vqa
-			^SupportDir|Content/cnc/movies/gdi5.vqa: gdi5.vqa
-			^SupportDir|Content/cnc/movies/gdi3lose.vqa: gdi3lose.vqa
-			^SupportDir|Content/cnc/movies/gdi3.vqa: gdi3.vqa
-			^SupportDir|Content/cnc/movies/gdi2.vqa: gdi2.vqa
-			^SupportDir|Content/cnc/movies/gdi15.vqa: gdi15.vqa
-			^SupportDir|Content/cnc/movies/gdi14.vqa: gdi14.vqa
-			^SupportDir|Content/cnc/movies/gdi13.vqa: gdi13.vqa
-			^SupportDir|Content/cnc/movies/gdi12.vqa: gdi12.vqa
-			^SupportDir|Content/cnc/movies/gdi11.vqa: gdi11.vqa
-			^SupportDir|Content/cnc/movies/gdi10.vqa: gdi10.vqa
-			^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
-			^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
-			^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
-			^SupportDir|Content/cnc/movies/flyy.vqa: flyy.vqa
-			^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
-			^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
-			^SupportDir|Content/cnc/movies/dessweep.vqa: dessweep.vqa
-			^SupportDir|Content/cnc/movies/desolat.vqa: desolat.vqa
-			^SupportDir|Content/cnc/movies/deskill.vqa: deskill.vqa
-			^SupportDir|Content/cnc/movies/desflees.vqa: desflees.vqa
-			^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
-			^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
-			^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
-			^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
-			^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
-			^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
-			^SupportDir|Content/cnc/movies/airstrk.vqa: airstrk.vqa
-			^SupportDir|Content/cnc/movies/nodend1.vqa: nodend1.vqa
-			^SupportDir|Content/cnc/movies/nodend2.vqa: nodend2.vqa
-			^SupportDir|Content/cnc/movies/nodend3.vqa: nodend3.vqa
-			^SupportDir|Content/cnc/movies/nodend4.vqa: nodend4.vqa
+		# Base game files:
+		ContentPackage:
+			Name: base
+			Actions:
+				Copy: .
+					^SupportDir|Content/cnc/conquer.mix: CONQUER.MIX
+					^SupportDir|Content/cnc/desert.mix: DESERT.MIX
+					^SupportDir|Content/cnc/general.mix: GENERAL.MIX
+					^SupportDir|Content/cnc/sounds.mix: SOUNDS.MIX
+					^SupportDir|Content/cnc/temperat.mix: TEMPERAT.MIX
+					^SupportDir|Content/cnc/winter.mix: WINTER.MIX
+					^SupportDir|Content/cnc/speech.mix: SPEECH.MIX
+					^SupportDir|Content/cnc/tempicnh.mix: TEMPICNH.MIX
+					^SupportDir|Content/cnc/transit.mix: TRANSIT.MIX
+		# Base game music (optional):
+		ContentPackage:
+			Name: music
+			Actions:
+				Copy: .
+					^SupportDir|Content/cnc/scores.mix: SCORES.MIX
+		# Covert Operations music (optional):
+		ContentPackage:
+			Name: music-covertops
+			Actions:
+				Copy: .
+					^SupportDir|Content/cnc/scores-covertops.mix: covert/SCORES.MIX
+		# GDI campaign briefings (optional):
+		ContentPackage:
+			Name: movies-gdi
+			Actions:
+				ExtractMix: movies.mix
+					^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
+					^SupportDir|Content/cnc/movies/turtkill.vqa: turtkill.vqa
+					^SupportDir|Content/cnc/movies/trailer.vqa: trailer.vqa
+					^SupportDir|Content/cnc/movies/tbrinfo3.vqa: tbrinfo3.vqa
+					^SupportDir|Content/cnc/movies/tbrinfo2.vqa: tbrinfo2.vqa
+					^SupportDir|Content/cnc/movies/tbrinfo1.vqa: tbrinfo1.vqa
+					^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
+					^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
+					^SupportDir|Content/cnc/movies/samdie.vqa: samdie.vqa
+					^SupportDir|Content/cnc/movies/sabotage.vqa: sabotage.vqa
+					^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
+					^SupportDir|Content/cnc/movies/podium.vqa: podium.vqa
+					^SupportDir|Content/cnc/movies/planecra.vqa: planecra.vqa
+					^SupportDir|Content/cnc/movies/pintle.vqa: pintle.vqa
+					^SupportDir|Content/cnc/movies/paratrop.vqa: paratrop.vqa
+					^SupportDir|Content/cnc/movies/nodsweep.vqa: nodsweep.vqa
+					^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
+					^SupportDir|Content/cnc/movies/nodflees.vqa: nodflees.vqa
+					^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
+					^SupportDir|Content/cnc/movies/nitejump.vqa: nitejump.vqa
+					^SupportDir|Content/cnc/movies/napalm.vqa: napalm.vqa
+					^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
+					^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
+					^SupportDir|Content/cnc/movies/hellvaly.vqa: hellvaly.vqa
+					^SupportDir|Content/cnc/movies/gunboat.vqa: gunboat.vqa
+					^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
+					^SupportDir|Content/cnc/movies/gdilose.vqa: gdilose.vqa
+					^SupportDir|Content/cnc/movies/gdifinb.vqa: gdifinb.vqa
+					^SupportDir|Content/cnc/movies/gdifina.vqa: gdifina.vqa
+					^SupportDir|Content/cnc/movies/gdiend2.vqa: gdiend2.vqa
+					^SupportDir|Content/cnc/movies/gdiend1.vqa: gdiend1.vqa
+					^SupportDir|Content/cnc/movies/gdi9.vqa: gdi9.vqa
+					^SupportDir|Content/cnc/movies/gdi8b.vqa: gdi8b.vqa
+					^SupportDir|Content/cnc/movies/gdi8a.vqa: gdi8a.vqa
+					^SupportDir|Content/cnc/movies/gdi7.vqa: gdi7.vqa
+					^SupportDir|Content/cnc/movies/gdi6.vqa: gdi6.vqa
+					^SupportDir|Content/cnc/movies/gdi5.vqa: gdi5.vqa
+					^SupportDir|Content/cnc/movies/gdi4b.vqa: gdi4b.vqa
+					^SupportDir|Content/cnc/movies/gdi4a.vqa: gdi4a.vqa
+					^SupportDir|Content/cnc/movies/gdi3lose.vqa: gdi3lose.vqa
+					^SupportDir|Content/cnc/movies/gdi3.vqa: gdi3.vqa
+					^SupportDir|Content/cnc/movies/gdi2.vqa: gdi2.vqa
+					^SupportDir|Content/cnc/movies/gdi15.vqa: gdi15.vqa
+					^SupportDir|Content/cnc/movies/gdi14.vqa: gdi14.vqa
+					^SupportDir|Content/cnc/movies/gdi13.vqa: gdi13.vqa
+					^SupportDir|Content/cnc/movies/gdi12.vqa: gdi12.vqa
+					^SupportDir|Content/cnc/movies/gdi11.vqa: gdi11.vqa
+					^SupportDir|Content/cnc/movies/gdi10.vqa: gdi10.vqa
+					^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
+					^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
+					^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
+					^SupportDir|Content/cnc/movies/flyy.vqa: flyy.vqa
+					^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
+					^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
+					^SupportDir|Content/cnc/movies/desolat.vqa: desolat.vqa
+					^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
+					^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
+					^SupportDir|Content/cnc/movies/burdet2.vqa: burdet2.vqa
+					^SupportDir|Content/cnc/movies/burdet1.vqa: burdet1.vqa
+					^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
+					^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
+					^SupportDir|Content/cnc/movies/bkground.vqa: bkground.vqa
+					^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
+					^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
+		# Nod campaign briefings (optional):
+		ContentPackage:
+			Name: movies-nod
+			Actions:
+				ExtractMix: movies.mix
+					^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
+					^SupportDir|Content/cnc/movies/trtkil_d.vqa: trtkil_d.vqa
+					^SupportDir|Content/cnc/movies/trailer.vqa: trailer.vqa
+					^SupportDir|Content/cnc/movies/tiberfx.vqa: tiberfx.vqa
+					^SupportDir|Content/cnc/movies/tankkill.vqa: tankkill.vqa
+					^SupportDir|Content/cnc/movies/tankgo.vqa: tankgo.vqa
+					^SupportDir|Content/cnc/movies/sundial.vqa: sundial.vqa
+					^SupportDir|Content/cnc/movies/stealth.vqa: stealth.vqa
+					^SupportDir|Content/cnc/movies/spycrash.vqa: spycrash.vqa
+					^SupportDir|Content/cnc/movies/sethpre.vqa: sethpre.vqa
+					^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
+					^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
+					^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
+					^SupportDir|Content/cnc/movies/refint.vqa: refint.vqa
+					^SupportDir|Content/cnc/movies/obel.vqa: obel.vqa
+					^SupportDir|Content/cnc/movies/nuke.vqa: nuke.vqa
+					^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
+					^SupportDir|Content/cnc/movies/nodfinal.vqa: nodfinal.vqa
+					^SupportDir|Content/cnc/movies/nodend4.vqa: nodend4.vqa
+					^SupportDir|Content/cnc/movies/nodend3.vqa: nodend3.vqa
+					^SupportDir|Content/cnc/movies/nodend2.vqa: nodend2.vqa
+					^SupportDir|Content/cnc/movies/nodend1.vqa: nodend1.vqa
+					^SupportDir|Content/cnc/movies/nod9.vqa: nod9.vqa
+					^SupportDir|Content/cnc/movies/nod8.vqa: nod8.vqa
+					^SupportDir|Content/cnc/movies/nod7b.vqa: nod7b.vqa
+					^SupportDir|Content/cnc/movies/nod7a.vqa: nod7a.vqa
+					^SupportDir|Content/cnc/movies/nod6.vqa: nod6.vqa
+					^SupportDir|Content/cnc/movies/nod5.vqa: nod5.vqa
+					^SupportDir|Content/cnc/movies/nod4b.vqa: nod4b.vqa
+					^SupportDir|Content/cnc/movies/nod4a.vqa: nod4a.vqa
+					^SupportDir|Content/cnc/movies/nod3.vqa: nod3.vqa
+					^SupportDir|Content/cnc/movies/nod2.vqa: nod2.vqa
+					^SupportDir|Content/cnc/movies/nod1pre.vqa: nod1pre.vqa
+					^SupportDir|Content/cnc/movies/nod13.vqa: nod13.vqa
+					^SupportDir|Content/cnc/movies/nod12.vqa: nod12.vqa
+					^SupportDir|Content/cnc/movies/nod11.vqa: nod11.vqa
+					^SupportDir|Content/cnc/movies/nod10b.vqa: nod10b.vqa
+					^SupportDir|Content/cnc/movies/nod10a.vqa: nod10a.vqa
+					^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
+					^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
+					^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/cnc/movies/kanepre.vqa: kanepre.vqa
+					^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
+					^SupportDir|Content/cnc/movies/insites.vqa: insites.vqa
+					^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
+					^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
+					^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
+					^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
+					^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
+					^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
+					^SupportDir|Content/cnc/movies/dessweep.vqa: dessweep.vqa
+					^SupportDir|Content/cnc/movies/deskill.vqa: deskill.vqa
+					^SupportDir|Content/cnc/movies/desflees.vqa: desflees.vqa
+					^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
+					^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
+					^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
+					^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
+					^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
+					^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
+					^SupportDir|Content/cnc/movies/akira.vqa: akira.vqa
+					^SupportDir|Content/cnc/movies/airstrk.vqa: airstrk.vqa
+
 
 cncr-origin: C&C Remastered Collection (Origin version, English)
 	Type: RegistryDirectory
@@ -132,142 +178,165 @@ cncr-origin: C&C Remastered Collection (Origin version, English)
 	IDFiles:
 		Data/CNCDATA/TIBERIAN_DAWN/CD1/CONQUER.MIX: 3f891c8dc0864f654e1710430ea4ff34c3715e97
 	Install:
-		Copy: Data/CNCDATA/TIBERIAN_DAWN/CD1
-			^SupportDir|Content/cnc/conquer.mix: CONQUER.MIX
-			^SupportDir|Content/cnc/desert.mix: DESERT.MIX
-			^SupportDir|Content/cnc/general.mix: GENERAL.MIX
-			^SupportDir|Content/cnc/scores.mix: SCORES.MIX
-			^SupportDir|Content/cnc/sounds.mix: SOUNDS.MIX
-			^SupportDir|Content/cnc/speech.mix: SPEECH.MIX
-			^SupportDir|Content/cnc/temperat.mix: TEMPERAT.MIX
-			^SupportDir|Content/cnc/tempicnh.mix: TEMPICNH.MIX
-			^SupportDir|Content/cnc/transit.mix: TRANSIT.MIX
-			^SupportDir|Content/cnc/winter.mix: WINTER.MIX
-		ExtractMix: Data/CNCDATA/TIBERIAN_DAWN/CD1/MOVIES.MIX
-			^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
-			^SupportDir|Content/cnc/movies/turtkill.vqa: turtkill.vqa
-			^SupportDir|Content/cnc/movies/tbrinfo3.vqa: tbrinfo3.vqa
-			^SupportDir|Content/cnc/movies/tbrinfo2.vqa: tbrinfo2.vqa
-			^SupportDir|Content/cnc/movies/tbrinfo1.vqa: tbrinfo1.vqa
-			^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
-			^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
-			^SupportDir|Content/cnc/movies/samdie.vqa: samdie.vqa
-			^SupportDir|Content/cnc/movies/sabotage.vqa: sabotage.vqa
-			^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
-			^SupportDir|Content/cnc/movies/podium.vqa: podium.vqa
-			^SupportDir|Content/cnc/movies/planecra.vqa: planecra.vqa
-			^SupportDir|Content/cnc/movies/pintle.vqa: pintle.vqa
-			^SupportDir|Content/cnc/movies/paratrop.vqa: paratrop.vqa
-			^SupportDir|Content/cnc/movies/nodsweep.vqa: nodsweep.vqa
-			^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
-			^SupportDir|Content/cnc/movies/nodflees.vqa: nodflees.vqa
-			^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
-			^SupportDir|Content/cnc/movies/nitejump.vqa: nitejump.vqa
-			^SupportDir|Content/cnc/movies/napalm.vqa: napalm.vqa
-			^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
-			^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
-			^SupportDir|Content/cnc/movies/hellvaly.vqa: hellvaly.vqa
-			^SupportDir|Content/cnc/movies/gunboat.vqa: gunboat.vqa
-			^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
-			^SupportDir|Content/cnc/movies/gdilose.vqa: gdilose.vqa
-			^SupportDir|Content/cnc/movies/gdifinb.vqa: gdifinb.vqa
-			^SupportDir|Content/cnc/movies/gdifina.vqa: gdifina.vqa
-			^SupportDir|Content/cnc/movies/gdiend2.vqa: gdiend2.vqa
-			^SupportDir|Content/cnc/movies/gdiend1.vqa: gdiend1.vqa
-			^SupportDir|Content/cnc/movies/gdi9.vqa: gdi9.vqa
-			^SupportDir|Content/cnc/movies/gdi8b.vqa: gdi8b.vqa
-			^SupportDir|Content/cnc/movies/gdi8a.vqa: gdi8a.vqa
-			^SupportDir|Content/cnc/movies/gdi7.vqa: gdi7.vqa
-			^SupportDir|Content/cnc/movies/gdi6.vqa: gdi6.vqa
-			^SupportDir|Content/cnc/movies/gdi5.vqa: gdi5.vqa
-			^SupportDir|Content/cnc/movies/gdi4b.vqa: gdi4b.vqa
-			^SupportDir|Content/cnc/movies/gdi4a.vqa: gdi4a.vqa
-			^SupportDir|Content/cnc/movies/gdi3lose.vqa: gdi3lose.vqa
-			^SupportDir|Content/cnc/movies/gdi3.vqa: gdi3.vqa
-			^SupportDir|Content/cnc/movies/gdi2.vqa: gdi2.vqa
-			^SupportDir|Content/cnc/movies/gdi15.vqa: gdi15.vqa
-			^SupportDir|Content/cnc/movies/gdi14.vqa: gdi14.vqa
-			^SupportDir|Content/cnc/movies/gdi13.vqa: gdi13.vqa
-			^SupportDir|Content/cnc/movies/gdi12.vqa: gdi12.vqa
-			^SupportDir|Content/cnc/movies/gdi11.vqa: gdi11.vqa
-			^SupportDir|Content/cnc/movies/gdi10.vqa: gdi10.vqa
-			^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
-			^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
-			^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
-			^SupportDir|Content/cnc/movies/flyy.vqa: flyy.vqa
-			^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
-			^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
-			^SupportDir|Content/cnc/movies/desolat.vqa: desolat.vqa
-			^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
-			^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
-			^SupportDir|Content/cnc/movies/burdet2.vqa: burdet2.vqa
-			^SupportDir|Content/cnc/movies/burdet1.vqa: burdet1.vqa
-			^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
-			^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
-			^SupportDir|Content/cnc/movies/bkground.vqa: bkground.vqa
-			^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
-			^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
-		ExtractMix: Data/CNCDATA/TIBERIAN_DAWN/CD2/MOVIES.MIX
-			^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
-			^SupportDir|Content/cnc/movies/trtkil_d.vqa: trtkil_d.vqa
-			^SupportDir|Content/cnc/movies/tiberfx.vqa: tiberfx.vqa
-			^SupportDir|Content/cnc/movies/tankkill.vqa: tankkill.vqa
-			^SupportDir|Content/cnc/movies/tankgo.vqa: tankgo.vqa
-			^SupportDir|Content/cnc/movies/sundial.vqa: sundial.vqa
-			^SupportDir|Content/cnc/movies/stealth.vqa: stealth.vqa
-			^SupportDir|Content/cnc/movies/spycrash.vqa: spycrash.vqa
-			^SupportDir|Content/cnc/movies/sethpre.vqa: sethpre.vqa
-			^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
-			^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
-			^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
-			^SupportDir|Content/cnc/movies/refint.vqa: refint.vqa
-			^SupportDir|Content/cnc/movies/obel.vqa: obel.vqa
-			^SupportDir|Content/cnc/movies/nuke.vqa: nuke.vqa
-			^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
-			^SupportDir|Content/cnc/movies/nodfinal.vqa: nodfinal.vqa
-			^SupportDir|Content/cnc/movies/nodend4.vqa: nodend4.vqa
-			^SupportDir|Content/cnc/movies/nodend3.vqa: nodend3.vqa
-			^SupportDir|Content/cnc/movies/nodend2.vqa: nodend2.vqa
-			^SupportDir|Content/cnc/movies/nodend1.vqa: nodend1.vqa
-			^SupportDir|Content/cnc/movies/nod9.vqa: nod9.vqa
-			^SupportDir|Content/cnc/movies/nod8.vqa: nod8.vqa
-			^SupportDir|Content/cnc/movies/nod7b.vqa: nod7b.vqa
-			^SupportDir|Content/cnc/movies/nod7a.vqa: nod7a.vqa
-			^SupportDir|Content/cnc/movies/nod6.vqa: nod6.vqa
-			^SupportDir|Content/cnc/movies/nod5.vqa: nod5.vqa
-			^SupportDir|Content/cnc/movies/nod4b.vqa: nod4b.vqa
-			^SupportDir|Content/cnc/movies/nod4a.vqa: nod4a.vqa
-			^SupportDir|Content/cnc/movies/nod3.vqa: nod3.vqa
-			^SupportDir|Content/cnc/movies/nod2.vqa: nod2.vqa
-			^SupportDir|Content/cnc/movies/nod1pre.vqa: nod1pre.vqa
-			^SupportDir|Content/cnc/movies/nod13.vqa: nod13.vqa
-			^SupportDir|Content/cnc/movies/nod12.vqa: nod12.vqa
-			^SupportDir|Content/cnc/movies/nod11.vqa: nod11.vqa
-			^SupportDir|Content/cnc/movies/nod10b.vqa: nod10b.vqa
-			^SupportDir|Content/cnc/movies/nod10a.vqa: nod10a.vqa
-			^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
-			^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
-			^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/cnc/movies/kanepre.vqa: kanepre.vqa
-			^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
-			^SupportDir|Content/cnc/movies/insites.vqa: insites.vqa
-			^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
-			^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
-			^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
-			^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
-			^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
-			^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
-			^SupportDir|Content/cnc/movies/dessweep.vqa: dessweep.vqa
-			^SupportDir|Content/cnc/movies/deskill.vqa: deskill.vqa
-			^SupportDir|Content/cnc/movies/desflees.vqa: desflees.vqa
-			^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
-			^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
-			^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
-			^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
-			^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
-			^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
-			^SupportDir|Content/cnc/movies/akira.vqa: akira.vqa
-			^SupportDir|Content/cnc/movies/airstrk.vqa: airstrk.vqa
-		Copy: Data/CNCDATA/TIBERIAN_DAWN/CD3
-			^SupportDir|Content/cnc/scores-covertops.mix: SCORES.MIX
+		# Base game files:
+		ContentPackage:
+			Name: base
+			Actions:
+				Copy: Data/CNCDATA/TIBERIAN_DAWN/CD1
+					^SupportDir|Content/cnc/conquer.mix: CONQUER.MIX
+					^SupportDir|Content/cnc/desert.mix: DESERT.MIX
+					^SupportDir|Content/cnc/general.mix: GENERAL.MIX
+					^SupportDir|Content/cnc/sounds.mix: SOUNDS.MIX
+					^SupportDir|Content/cnc/speech.mix: SPEECH.MIX
+					^SupportDir|Content/cnc/temperat.mix: TEMPERAT.MIX
+					^SupportDir|Content/cnc/tempicnh.mix: TEMPICNH.MIX
+					^SupportDir|Content/cnc/transit.mix: TRANSIT.MIX
+					^SupportDir|Content/cnc/winter.mix: WINTER.MIX
+		# Base game music (optional):
+		ContentPackage:
+			Name: music
+			Actions:
+				Copy: Data/CNCDATA/TIBERIAN_DAWN/CD1
+					^SupportDir|Content/cnc/scores.mix: SCORES.MIX
+		# Covert Operations music (optional):
+		ContentPackage:
+			Name: music-covertops
+			Actions:
+				Copy: Data/CNCDATA/TIBERIAN_DAWN/CD3
+					^SupportDir|Content/cnc/scores-covertops.mix: SCORES.MIX
+		# GDI campaign briefings (optional):
+		# The Remastered Collection doesn't include trailer.vqa.
+		ContentPackage:
+			Name: movies-gdi
+			Actions:
+				ExtractMix: Data/CNCDATA/TIBERIAN_DAWN/CD1/MOVIES.MIX
+					^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
+					^SupportDir|Content/cnc/movies/turtkill.vqa: turtkill.vqa
+					^SupportDir|Content/cnc/movies/tbrinfo3.vqa: tbrinfo3.vqa
+					^SupportDir|Content/cnc/movies/tbrinfo2.vqa: tbrinfo2.vqa
+					^SupportDir|Content/cnc/movies/tbrinfo1.vqa: tbrinfo1.vqa
+					^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
+					^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
+					^SupportDir|Content/cnc/movies/samdie.vqa: samdie.vqa
+					^SupportDir|Content/cnc/movies/sabotage.vqa: sabotage.vqa
+					^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
+					^SupportDir|Content/cnc/movies/podium.vqa: podium.vqa
+					^SupportDir|Content/cnc/movies/planecra.vqa: planecra.vqa
+					^SupportDir|Content/cnc/movies/pintle.vqa: pintle.vqa
+					^SupportDir|Content/cnc/movies/paratrop.vqa: paratrop.vqa
+					^SupportDir|Content/cnc/movies/nodsweep.vqa: nodsweep.vqa
+					^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
+					^SupportDir|Content/cnc/movies/nodflees.vqa: nodflees.vqa
+					^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
+					^SupportDir|Content/cnc/movies/nitejump.vqa: nitejump.vqa
+					^SupportDir|Content/cnc/movies/napalm.vqa: napalm.vqa
+					^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
+					^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
+					^SupportDir|Content/cnc/movies/hellvaly.vqa: hellvaly.vqa
+					^SupportDir|Content/cnc/movies/gunboat.vqa: gunboat.vqa
+					^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
+					^SupportDir|Content/cnc/movies/gdilose.vqa: gdilose.vqa
+					^SupportDir|Content/cnc/movies/gdifinb.vqa: gdifinb.vqa
+					^SupportDir|Content/cnc/movies/gdifina.vqa: gdifina.vqa
+					^SupportDir|Content/cnc/movies/gdiend2.vqa: gdiend2.vqa
+					^SupportDir|Content/cnc/movies/gdiend1.vqa: gdiend1.vqa
+					^SupportDir|Content/cnc/movies/gdi9.vqa: gdi9.vqa
+					^SupportDir|Content/cnc/movies/gdi8b.vqa: gdi8b.vqa
+					^SupportDir|Content/cnc/movies/gdi8a.vqa: gdi8a.vqa
+					^SupportDir|Content/cnc/movies/gdi7.vqa: gdi7.vqa
+					^SupportDir|Content/cnc/movies/gdi6.vqa: gdi6.vqa
+					^SupportDir|Content/cnc/movies/gdi5.vqa: gdi5.vqa
+					^SupportDir|Content/cnc/movies/gdi4b.vqa: gdi4b.vqa
+					^SupportDir|Content/cnc/movies/gdi4a.vqa: gdi4a.vqa
+					^SupportDir|Content/cnc/movies/gdi3lose.vqa: gdi3lose.vqa
+					^SupportDir|Content/cnc/movies/gdi3.vqa: gdi3.vqa
+					^SupportDir|Content/cnc/movies/gdi2.vqa: gdi2.vqa
+					^SupportDir|Content/cnc/movies/gdi15.vqa: gdi15.vqa
+					^SupportDir|Content/cnc/movies/gdi14.vqa: gdi14.vqa
+					^SupportDir|Content/cnc/movies/gdi13.vqa: gdi13.vqa
+					^SupportDir|Content/cnc/movies/gdi12.vqa: gdi12.vqa
+					^SupportDir|Content/cnc/movies/gdi11.vqa: gdi11.vqa
+					^SupportDir|Content/cnc/movies/gdi10.vqa: gdi10.vqa
+					^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
+					^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
+					^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
+					^SupportDir|Content/cnc/movies/flyy.vqa: flyy.vqa
+					^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
+					^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
+					^SupportDir|Content/cnc/movies/desolat.vqa: desolat.vqa
+					^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
+					^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
+					^SupportDir|Content/cnc/movies/burdet2.vqa: burdet2.vqa
+					^SupportDir|Content/cnc/movies/burdet1.vqa: burdet1.vqa
+					^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
+					^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
+					^SupportDir|Content/cnc/movies/bkground.vqa: bkground.vqa
+					^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
+					^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
+		# Nod campaign briefings (optional):
+		# The Remastered Collection doesn't include trailer.vqa.
+		ContentPackage:
+			Name: movies-nod
+			Actions:
+				ExtractMix: Data/CNCDATA/TIBERIAN_DAWN/CD2/MOVIES.MIX
+					^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
+					^SupportDir|Content/cnc/movies/trtkil_d.vqa: trtkil_d.vqa
+					^SupportDir|Content/cnc/movies/tiberfx.vqa: tiberfx.vqa
+					^SupportDir|Content/cnc/movies/tankkill.vqa: tankkill.vqa
+					^SupportDir|Content/cnc/movies/tankgo.vqa: tankgo.vqa
+					^SupportDir|Content/cnc/movies/sundial.vqa: sundial.vqa
+					^SupportDir|Content/cnc/movies/stealth.vqa: stealth.vqa
+					^SupportDir|Content/cnc/movies/spycrash.vqa: spycrash.vqa
+					^SupportDir|Content/cnc/movies/sethpre.vqa: sethpre.vqa
+					^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
+					^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
+					^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
+					^SupportDir|Content/cnc/movies/refint.vqa: refint.vqa
+					^SupportDir|Content/cnc/movies/obel.vqa: obel.vqa
+					^SupportDir|Content/cnc/movies/nuke.vqa: nuke.vqa
+					^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
+					^SupportDir|Content/cnc/movies/nodfinal.vqa: nodfinal.vqa
+					^SupportDir|Content/cnc/movies/nodend4.vqa: nodend4.vqa
+					^SupportDir|Content/cnc/movies/nodend3.vqa: nodend3.vqa
+					^SupportDir|Content/cnc/movies/nodend2.vqa: nodend2.vqa
+					^SupportDir|Content/cnc/movies/nodend1.vqa: nodend1.vqa
+					^SupportDir|Content/cnc/movies/nod9.vqa: nod9.vqa
+					^SupportDir|Content/cnc/movies/nod8.vqa: nod8.vqa
+					^SupportDir|Content/cnc/movies/nod7b.vqa: nod7b.vqa
+					^SupportDir|Content/cnc/movies/nod7a.vqa: nod7a.vqa
+					^SupportDir|Content/cnc/movies/nod6.vqa: nod6.vqa
+					^SupportDir|Content/cnc/movies/nod5.vqa: nod5.vqa
+					^SupportDir|Content/cnc/movies/nod4b.vqa: nod4b.vqa
+					^SupportDir|Content/cnc/movies/nod4a.vqa: nod4a.vqa
+					^SupportDir|Content/cnc/movies/nod3.vqa: nod3.vqa
+					^SupportDir|Content/cnc/movies/nod2.vqa: nod2.vqa
+					^SupportDir|Content/cnc/movies/nod1pre.vqa: nod1pre.vqa
+					^SupportDir|Content/cnc/movies/nod13.vqa: nod13.vqa
+					^SupportDir|Content/cnc/movies/nod12.vqa: nod12.vqa
+					^SupportDir|Content/cnc/movies/nod11.vqa: nod11.vqa
+					^SupportDir|Content/cnc/movies/nod10b.vqa: nod10b.vqa
+					^SupportDir|Content/cnc/movies/nod10a.vqa: nod10a.vqa
+					^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
+					^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
+					^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/cnc/movies/kanepre.vqa: kanepre.vqa
+					^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
+					^SupportDir|Content/cnc/movies/insites.vqa: insites.vqa
+					^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
+					^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
+					^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
+					^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
+					^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
+					^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
+					^SupportDir|Content/cnc/movies/dessweep.vqa: dessweep.vqa
+					^SupportDir|Content/cnc/movies/deskill.vqa: deskill.vqa
+					^SupportDir|Content/cnc/movies/desflees.vqa: desflees.vqa
+					^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
+					^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
+					^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
+					^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
+					^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
+					^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
+					^SupportDir|Content/cnc/movies/akira.vqa: akira.vqa
+					^SupportDir|Content/cnc/movies/airstrk.vqa: airstrk.vqa
diff --git a/mods/cnc/installer/steam.yaml b/mods/cnc/installer/steam.yaml
index ec398e4e92..bae5076b2a 100644
--- a/mods/cnc/installer/steam.yaml
+++ b/mods/cnc/installer/steam.yaml
@@ -4,142 +4,165 @@ cncr-steam: C&C Remastered Collection (Steam version, English)
 	IDFiles:
 		Data/CNCDATA/TIBERIAN_DAWN/CD1/CONQUER.MIX: 3f891c8dc0864f654e1710430ea4ff34c3715e97
 	Install:
-		Copy: Data/CNCDATA/TIBERIAN_DAWN/CD1
-			^SupportDir|Content/cnc/conquer.mix: CONQUER.MIX
-			^SupportDir|Content/cnc/desert.mix: DESERT.MIX
-			^SupportDir|Content/cnc/general.mix: GENERAL.MIX
-			^SupportDir|Content/cnc/scores.mix: SCORES.MIX
-			^SupportDir|Content/cnc/sounds.mix: SOUNDS.MIX
-			^SupportDir|Content/cnc/speech.mix: SPEECH.MIX
-			^SupportDir|Content/cnc/temperat.mix: TEMPERAT.MIX
-			^SupportDir|Content/cnc/tempicnh.mix: TEMPICNH.MIX
-			^SupportDir|Content/cnc/transit.mix: TRANSIT.MIX
-			^SupportDir|Content/cnc/winter.mix: WINTER.MIX
-		ExtractMix: Data/CNCDATA/TIBERIAN_DAWN/CD1/MOVIES.MIX
-			^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
-			^SupportDir|Content/cnc/movies/turtkill.vqa: turtkill.vqa
-			^SupportDir|Content/cnc/movies/tbrinfo3.vqa: tbrinfo3.vqa
-			^SupportDir|Content/cnc/movies/tbrinfo2.vqa: tbrinfo2.vqa
-			^SupportDir|Content/cnc/movies/tbrinfo1.vqa: tbrinfo1.vqa
-			^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
-			^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
-			^SupportDir|Content/cnc/movies/samdie.vqa: samdie.vqa
-			^SupportDir|Content/cnc/movies/sabotage.vqa: sabotage.vqa
-			^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
-			^SupportDir|Content/cnc/movies/podium.vqa: podium.vqa
-			^SupportDir|Content/cnc/movies/planecra.vqa: planecra.vqa
-			^SupportDir|Content/cnc/movies/pintle.vqa: pintle.vqa
-			^SupportDir|Content/cnc/movies/paratrop.vqa: paratrop.vqa
-			^SupportDir|Content/cnc/movies/nodsweep.vqa: nodsweep.vqa
-			^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
-			^SupportDir|Content/cnc/movies/nodflees.vqa: nodflees.vqa
-			^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
-			^SupportDir|Content/cnc/movies/nitejump.vqa: nitejump.vqa
-			^SupportDir|Content/cnc/movies/napalm.vqa: napalm.vqa
-			^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
-			^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
-			^SupportDir|Content/cnc/movies/hellvaly.vqa: hellvaly.vqa
-			^SupportDir|Content/cnc/movies/gunboat.vqa: gunboat.vqa
-			^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
-			^SupportDir|Content/cnc/movies/gdilose.vqa: gdilose.vqa
-			^SupportDir|Content/cnc/movies/gdifinb.vqa: gdifinb.vqa
-			^SupportDir|Content/cnc/movies/gdifina.vqa: gdifina.vqa
-			^SupportDir|Content/cnc/movies/gdiend2.vqa: gdiend2.vqa
-			^SupportDir|Content/cnc/movies/gdiend1.vqa: gdiend1.vqa
-			^SupportDir|Content/cnc/movies/gdi9.vqa: gdi9.vqa
-			^SupportDir|Content/cnc/movies/gdi8b.vqa: gdi8b.vqa
-			^SupportDir|Content/cnc/movies/gdi8a.vqa: gdi8a.vqa
-			^SupportDir|Content/cnc/movies/gdi7.vqa: gdi7.vqa
-			^SupportDir|Content/cnc/movies/gdi6.vqa: gdi6.vqa
-			^SupportDir|Content/cnc/movies/gdi5.vqa: gdi5.vqa
-			^SupportDir|Content/cnc/movies/gdi4b.vqa: gdi4b.vqa
-			^SupportDir|Content/cnc/movies/gdi4a.vqa: gdi4a.vqa
-			^SupportDir|Content/cnc/movies/gdi3lose.vqa: gdi3lose.vqa
-			^SupportDir|Content/cnc/movies/gdi3.vqa: gdi3.vqa
-			^SupportDir|Content/cnc/movies/gdi2.vqa: gdi2.vqa
-			^SupportDir|Content/cnc/movies/gdi15.vqa: gdi15.vqa
-			^SupportDir|Content/cnc/movies/gdi14.vqa: gdi14.vqa
-			^SupportDir|Content/cnc/movies/gdi13.vqa: gdi13.vqa
-			^SupportDir|Content/cnc/movies/gdi12.vqa: gdi12.vqa
-			^SupportDir|Content/cnc/movies/gdi11.vqa: gdi11.vqa
-			^SupportDir|Content/cnc/movies/gdi10.vqa: gdi10.vqa
-			^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
-			^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
-			^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
-			^SupportDir|Content/cnc/movies/flyy.vqa: flyy.vqa
-			^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
-			^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
-			^SupportDir|Content/cnc/movies/desolat.vqa: desolat.vqa
-			^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
-			^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
-			^SupportDir|Content/cnc/movies/burdet2.vqa: burdet2.vqa
-			^SupportDir|Content/cnc/movies/burdet1.vqa: burdet1.vqa
-			^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
-			^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
-			^SupportDir|Content/cnc/movies/bkground.vqa: bkground.vqa
-			^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
-			^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
-		ExtractMix: Data/CNCDATA/TIBERIAN_DAWN/CD2/MOVIES.MIX
-			^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
-			^SupportDir|Content/cnc/movies/trtkil_d.vqa: trtkil_d.vqa
-			^SupportDir|Content/cnc/movies/tiberfx.vqa: tiberfx.vqa
-			^SupportDir|Content/cnc/movies/tankkill.vqa: tankkill.vqa
-			^SupportDir|Content/cnc/movies/tankgo.vqa: tankgo.vqa
-			^SupportDir|Content/cnc/movies/sundial.vqa: sundial.vqa
-			^SupportDir|Content/cnc/movies/stealth.vqa: stealth.vqa
-			^SupportDir|Content/cnc/movies/spycrash.vqa: spycrash.vqa
-			^SupportDir|Content/cnc/movies/sethpre.vqa: sethpre.vqa
-			^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
-			^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
-			^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
-			^SupportDir|Content/cnc/movies/refint.vqa: refint.vqa
-			^SupportDir|Content/cnc/movies/obel.vqa: obel.vqa
-			^SupportDir|Content/cnc/movies/nuke.vqa: nuke.vqa
-			^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
-			^SupportDir|Content/cnc/movies/nodfinal.vqa: nodfinal.vqa
-			^SupportDir|Content/cnc/movies/nodend4.vqa: nodend4.vqa
-			^SupportDir|Content/cnc/movies/nodend3.vqa: nodend3.vqa
-			^SupportDir|Content/cnc/movies/nodend2.vqa: nodend2.vqa
-			^SupportDir|Content/cnc/movies/nodend1.vqa: nodend1.vqa
-			^SupportDir|Content/cnc/movies/nod9.vqa: nod9.vqa
-			^SupportDir|Content/cnc/movies/nod8.vqa: nod8.vqa
-			^SupportDir|Content/cnc/movies/nod7b.vqa: nod7b.vqa
-			^SupportDir|Content/cnc/movies/nod7a.vqa: nod7a.vqa
-			^SupportDir|Content/cnc/movies/nod6.vqa: nod6.vqa
-			^SupportDir|Content/cnc/movies/nod5.vqa: nod5.vqa
-			^SupportDir|Content/cnc/movies/nod4b.vqa: nod4b.vqa
-			^SupportDir|Content/cnc/movies/nod4a.vqa: nod4a.vqa
-			^SupportDir|Content/cnc/movies/nod3.vqa: nod3.vqa
-			^SupportDir|Content/cnc/movies/nod2.vqa: nod2.vqa
-			^SupportDir|Content/cnc/movies/nod1pre.vqa: nod1pre.vqa
-			^SupportDir|Content/cnc/movies/nod13.vqa: nod13.vqa
-			^SupportDir|Content/cnc/movies/nod12.vqa: nod12.vqa
-			^SupportDir|Content/cnc/movies/nod11.vqa: nod11.vqa
-			^SupportDir|Content/cnc/movies/nod10b.vqa: nod10b.vqa
-			^SupportDir|Content/cnc/movies/nod10a.vqa: nod10a.vqa
-			^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
-			^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
-			^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/cnc/movies/kanepre.vqa: kanepre.vqa
-			^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
-			^SupportDir|Content/cnc/movies/insites.vqa: insites.vqa
-			^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
-			^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
-			^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
-			^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
-			^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
-			^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
-			^SupportDir|Content/cnc/movies/dessweep.vqa: dessweep.vqa
-			^SupportDir|Content/cnc/movies/deskill.vqa: deskill.vqa
-			^SupportDir|Content/cnc/movies/desflees.vqa: desflees.vqa
-			^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
-			^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
-			^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
-			^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
-			^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
-			^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
-			^SupportDir|Content/cnc/movies/akira.vqa: akira.vqa
-			^SupportDir|Content/cnc/movies/airstrk.vqa: airstrk.vqa
-		Copy: Data/CNCDATA/TIBERIAN_DAWN/CD3
-			^SupportDir|Content/cnc/scores-covertops.mix: SCORES.MIX
+		# Base game files:
+		ContentPackage:
+			Name: base
+			Actions:
+				Copy: Data/CNCDATA/TIBERIAN_DAWN/CD1
+					^SupportDir|Content/cnc/conquer.mix: CONQUER.MIX
+					^SupportDir|Content/cnc/desert.mix: DESERT.MIX
+					^SupportDir|Content/cnc/general.mix: GENERAL.MIX
+					^SupportDir|Content/cnc/sounds.mix: SOUNDS.MIX
+					^SupportDir|Content/cnc/speech.mix: SPEECH.MIX
+					^SupportDir|Content/cnc/temperat.mix: TEMPERAT.MIX
+					^SupportDir|Content/cnc/tempicnh.mix: TEMPICNH.MIX
+					^SupportDir|Content/cnc/transit.mix: TRANSIT.MIX
+					^SupportDir|Content/cnc/winter.mix: WINTER.MIX
+		# Base game music (optional):
+		ContentPackage:
+			Name: music
+			Actions:
+				Copy: Data/CNCDATA/TIBERIAN_DAWN/CD1
+					^SupportDir|Content/cnc/scores.mix: SCORES.MIX
+		# Covert Operations music (optional):
+		ContentPackage:
+			Name: music-covertops
+			Actions:
+				Copy: Data/CNCDATA/TIBERIAN_DAWN/CD3
+					^SupportDir|Content/cnc/scores-covertops.mix: SCORES.MIX
+		# GDI campaign briefings (optional):
+		# The Remastered Collection doesn't include trailer.vqa.
+		ContentPackage:
+			Name: movies-gdi
+			Actions:
+				ExtractMix: Data/CNCDATA/TIBERIAN_DAWN/CD1/MOVIES.MIX
+					^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
+					^SupportDir|Content/cnc/movies/turtkill.vqa: turtkill.vqa
+					^SupportDir|Content/cnc/movies/tbrinfo3.vqa: tbrinfo3.vqa
+					^SupportDir|Content/cnc/movies/tbrinfo2.vqa: tbrinfo2.vqa
+					^SupportDir|Content/cnc/movies/tbrinfo1.vqa: tbrinfo1.vqa
+					^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
+					^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
+					^SupportDir|Content/cnc/movies/samdie.vqa: samdie.vqa
+					^SupportDir|Content/cnc/movies/sabotage.vqa: sabotage.vqa
+					^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
+					^SupportDir|Content/cnc/movies/podium.vqa: podium.vqa
+					^SupportDir|Content/cnc/movies/planecra.vqa: planecra.vqa
+					^SupportDir|Content/cnc/movies/pintle.vqa: pintle.vqa
+					^SupportDir|Content/cnc/movies/paratrop.vqa: paratrop.vqa
+					^SupportDir|Content/cnc/movies/nodsweep.vqa: nodsweep.vqa
+					^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
+					^SupportDir|Content/cnc/movies/nodflees.vqa: nodflees.vqa
+					^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
+					^SupportDir|Content/cnc/movies/nitejump.vqa: nitejump.vqa
+					^SupportDir|Content/cnc/movies/napalm.vqa: napalm.vqa
+					^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
+					^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
+					^SupportDir|Content/cnc/movies/hellvaly.vqa: hellvaly.vqa
+					^SupportDir|Content/cnc/movies/gunboat.vqa: gunboat.vqa
+					^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
+					^SupportDir|Content/cnc/movies/gdilose.vqa: gdilose.vqa
+					^SupportDir|Content/cnc/movies/gdifinb.vqa: gdifinb.vqa
+					^SupportDir|Content/cnc/movies/gdifina.vqa: gdifina.vqa
+					^SupportDir|Content/cnc/movies/gdiend2.vqa: gdiend2.vqa
+					^SupportDir|Content/cnc/movies/gdiend1.vqa: gdiend1.vqa
+					^SupportDir|Content/cnc/movies/gdi9.vqa: gdi9.vqa
+					^SupportDir|Content/cnc/movies/gdi8b.vqa: gdi8b.vqa
+					^SupportDir|Content/cnc/movies/gdi8a.vqa: gdi8a.vqa
+					^SupportDir|Content/cnc/movies/gdi7.vqa: gdi7.vqa
+					^SupportDir|Content/cnc/movies/gdi6.vqa: gdi6.vqa
+					^SupportDir|Content/cnc/movies/gdi5.vqa: gdi5.vqa
+					^SupportDir|Content/cnc/movies/gdi4b.vqa: gdi4b.vqa
+					^SupportDir|Content/cnc/movies/gdi4a.vqa: gdi4a.vqa
+					^SupportDir|Content/cnc/movies/gdi3lose.vqa: gdi3lose.vqa
+					^SupportDir|Content/cnc/movies/gdi3.vqa: gdi3.vqa
+					^SupportDir|Content/cnc/movies/gdi2.vqa: gdi2.vqa
+					^SupportDir|Content/cnc/movies/gdi15.vqa: gdi15.vqa
+					^SupportDir|Content/cnc/movies/gdi14.vqa: gdi14.vqa
+					^SupportDir|Content/cnc/movies/gdi13.vqa: gdi13.vqa
+					^SupportDir|Content/cnc/movies/gdi12.vqa: gdi12.vqa
+					^SupportDir|Content/cnc/movies/gdi11.vqa: gdi11.vqa
+					^SupportDir|Content/cnc/movies/gdi10.vqa: gdi10.vqa
+					^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
+					^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
+					^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
+					^SupportDir|Content/cnc/movies/flyy.vqa: flyy.vqa
+					^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
+					^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
+					^SupportDir|Content/cnc/movies/desolat.vqa: desolat.vqa
+					^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
+					^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
+					^SupportDir|Content/cnc/movies/burdet2.vqa: burdet2.vqa
+					^SupportDir|Content/cnc/movies/burdet1.vqa: burdet1.vqa
+					^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
+					^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
+					^SupportDir|Content/cnc/movies/bkground.vqa: bkground.vqa
+					^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
+					^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
+		# Nod campaign briefings (optional):
+		# The Remastered Collection doesn't include trailer.vqa.
+		ContentPackage:
+			Name: movies-nod
+			Actions:
+				ExtractMix: Data/CNCDATA/TIBERIAN_DAWN/CD2/MOVIES.MIX
+					^SupportDir|Content/cnc/movies/visor.vqa: visor.vqa
+					^SupportDir|Content/cnc/movies/trtkil_d.vqa: trtkil_d.vqa
+					^SupportDir|Content/cnc/movies/tiberfx.vqa: tiberfx.vqa
+					^SupportDir|Content/cnc/movies/tankkill.vqa: tankkill.vqa
+					^SupportDir|Content/cnc/movies/tankgo.vqa: tankgo.vqa
+					^SupportDir|Content/cnc/movies/sundial.vqa: sundial.vqa
+					^SupportDir|Content/cnc/movies/stealth.vqa: stealth.vqa
+					^SupportDir|Content/cnc/movies/spycrash.vqa: spycrash.vqa
+					^SupportDir|Content/cnc/movies/sethpre.vqa: sethpre.vqa
+					^SupportDir|Content/cnc/movies/seige.vqa: seige.vqa
+					^SupportDir|Content/cnc/movies/samsite.vqa: samsite.vqa
+					^SupportDir|Content/cnc/movies/retro.vqa: retro.vqa
+					^SupportDir|Content/cnc/movies/refint.vqa: refint.vqa
+					^SupportDir|Content/cnc/movies/obel.vqa: obel.vqa
+					^SupportDir|Content/cnc/movies/nuke.vqa: nuke.vqa
+					^SupportDir|Content/cnc/movies/nodlose.vqa: nodlose.vqa
+					^SupportDir|Content/cnc/movies/nodfinal.vqa: nodfinal.vqa
+					^SupportDir|Content/cnc/movies/nodend4.vqa: nodend4.vqa
+					^SupportDir|Content/cnc/movies/nodend3.vqa: nodend3.vqa
+					^SupportDir|Content/cnc/movies/nodend2.vqa: nodend2.vqa
+					^SupportDir|Content/cnc/movies/nodend1.vqa: nodend1.vqa
+					^SupportDir|Content/cnc/movies/nod9.vqa: nod9.vqa
+					^SupportDir|Content/cnc/movies/nod8.vqa: nod8.vqa
+					^SupportDir|Content/cnc/movies/nod7b.vqa: nod7b.vqa
+					^SupportDir|Content/cnc/movies/nod7a.vqa: nod7a.vqa
+					^SupportDir|Content/cnc/movies/nod6.vqa: nod6.vqa
+					^SupportDir|Content/cnc/movies/nod5.vqa: nod5.vqa
+					^SupportDir|Content/cnc/movies/nod4b.vqa: nod4b.vqa
+					^SupportDir|Content/cnc/movies/nod4a.vqa: nod4a.vqa
+					^SupportDir|Content/cnc/movies/nod3.vqa: nod3.vqa
+					^SupportDir|Content/cnc/movies/nod2.vqa: nod2.vqa
+					^SupportDir|Content/cnc/movies/nod1pre.vqa: nod1pre.vqa
+					^SupportDir|Content/cnc/movies/nod13.vqa: nod13.vqa
+					^SupportDir|Content/cnc/movies/nod12.vqa: nod12.vqa
+					^SupportDir|Content/cnc/movies/nod11.vqa: nod11.vqa
+					^SupportDir|Content/cnc/movies/nod10b.vqa: nod10b.vqa
+					^SupportDir|Content/cnc/movies/nod10a.vqa: nod10a.vqa
+					^SupportDir|Content/cnc/movies/nod1.vqa: nod1.vqa
+					^SupportDir|Content/cnc/movies/logo.vqa: logo.vqa
+					^SupportDir|Content/cnc/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/cnc/movies/kanepre.vqa: kanepre.vqa
+					^SupportDir|Content/cnc/movies/intro2.vqa: intro2.vqa
+					^SupportDir|Content/cnc/movies/insites.vqa: insites.vqa
+					^SupportDir|Content/cnc/movies/generic.vqa: generic.vqa
+					^SupportDir|Content/cnc/movies/gdi1.vqa: gdi1.vqa
+					^SupportDir|Content/cnc/movies/gameover.vqa: gameover.vqa
+					^SupportDir|Content/cnc/movies/forestkl.vqa: forestkl.vqa
+					^SupportDir|Content/cnc/movies/flag.vqa: flag.vqa
+					^SupportDir|Content/cnc/movies/dino.vqa: dino.vqa
+					^SupportDir|Content/cnc/movies/dessweep.vqa: dessweep.vqa
+					^SupportDir|Content/cnc/movies/deskill.vqa: deskill.vqa
+					^SupportDir|Content/cnc/movies/desflees.vqa: desflees.vqa
+					^SupportDir|Content/cnc/movies/consyard.vqa: consyard.vqa
+					^SupportDir|Content/cnc/movies/cc2tease.vqa: cc2tease.vqa
+					^SupportDir|Content/cnc/movies/bombflee.vqa: bombflee.vqa
+					^SupportDir|Content/cnc/movies/bombaway.vqa: bombaway.vqa
+					^SupportDir|Content/cnc/movies/bcanyon.vqa: bcanyon.vqa
+					^SupportDir|Content/cnc/movies/banner.vqa: banner.vqa
+					^SupportDir|Content/cnc/movies/akira.vqa: akira.vqa
+					^SupportDir|Content/cnc/movies/airstrk.vqa: airstrk.vqa
diff --git a/mods/d2k/installer/d2k.yaml b/mods/d2k/installer/d2k.yaml
index 0f9e93e46d..6b2037f3fa 100644
--- a/mods/d2k/installer/d2k.yaml
+++ b/mods/d2k/installer/d2k.yaml
@@ -3,328 +3,340 @@ d2k: Dune 2000 (English)
 	IDFiles:
 		MUSIC/AMBUSH.AUD: bd5926a56a83bc0e49f96037e1f909014ac0772a
 	Install:
-		Copy: MOVIES
-			^SupportDir|Content/d2k/v2/Movies/A_BR01_E.VQA: A_BR01_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/A_BR02_E.VQA: A_BR02_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/A_BR03_E.VQA: A_BR03_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/A_BR04_E.VQA: A_BR04_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/A_BR05_E.VQA: A_BR05_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/A_BR06_E.VQA: A_BR06_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/A_BR07_E.VQA: A_BR07_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/A_BR08_E.VQA: A_BR08_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/A_BR09_E.VQA: A_BR09_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/A_FINL_E.VQA: A_FINL_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/A_LOSE_E.VQA: A_LOSE_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/A_MNTG_E.VQA: A_MNTG_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/H_BR01_E.VQA: H_BR01_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/H_BR02_E.VQA: H_BR02_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/H_BR03_E.VQA: H_BR03_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/H_BR04_E.VQA: H_BR04_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/H_BR05_E.VQA: H_BR05_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/H_BR06_E.VQA: H_BR06_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/H_BR07_E.VQA: H_BR07_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/H_BR08_E.VQA: H_BR08_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/H_BR09_E.VQA: H_BR09_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/H_FINL_E.VQA: H_FINL_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/H_LOSE_E.VQA: H_LOSE_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/H_MNTG_E.VQA: H_MNTG_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/O_BR01_E.VQA: O_BR01_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/O_BR02_E.VQA: O_BR02_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/O_BR03_E.VQA: O_BR03_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/O_BR04_E.VQA: O_BR04_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/O_BR05_E.VQA: O_BR05_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/O_BR06_E.VQA: O_BR06_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/O_BR07_E.VQA: O_BR07_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/O_BR08_E.VQA: O_BR08_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/O_BR09_E.VQA: O_BR09_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/O_FINL_E.VQA: O_FINL_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/O_LOSE_E.VQA: O_LOSE_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/O_MNTG_E.VQA: O_MNTG_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/G_INT1_E.VQA: G_INT1_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/G_INT2_E.VQA: G_INT2_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/G_MAPS_E.VQA: G_MAPS_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/G_PLN2_E.VQA: G_PLN2_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/G_PLNT_E.VQA: G_PLNT_E.VQA
-			^SupportDir|Content/d2k/v2/Movies/T_TITL_E.VQA: T_TITL_E.VQA
-		Copy: MUSIC
-			^SupportDir|Content/d2k/v2/Music/AMBUSH.AUD: AMBUSH.AUD
-			^SupportDir|Content/d2k/v2/Music/ARAKATAK.AUD: ARAKATAK.AUD
-			^SupportDir|Content/d2k/v2/Music/ATREGAIN.AUD: ATREGAIN.AUD
-			^SupportDir|Content/d2k/v2/Music/ENTORDOS.AUD: ENTORDOS.AUD
-			^SupportDir|Content/d2k/v2/Music/FIGHTPWR.AUD: FIGHTPWR.AUD
-			^SupportDir|Content/d2k/v2/Music/FREMEN.AUD: FREMEN.AUD
-			^SupportDir|Content/d2k/v2/Music/HARK_BAT.AUD: HARK_BAT.AUD
-			^SupportDir|Content/d2k/v2/Music/LANDSAND.AUD: LANDSAND.AUD
-			^SupportDir|Content/d2k/v2/Music/OPTIONS.AUD: OPTIONS.AUD
-			^SupportDir|Content/d2k/v2/Music/PLOTTING.AUD: PLOTTING.AUD
-			^SupportDir|Content/d2k/v2/Music/RISEHARK.AUD: RISEHARK.AUD
-			^SupportDir|Content/d2k/v2/Music/ROBOTIX.AUD: ROBOTIX.AUD
-			^SupportDir|Content/d2k/v2/Music/SCORE.AUD: SCORE.AUD
-			^SupportDir|Content/d2k/v2/Music/SOLDAPPR.AUD: SOLDAPPR.AUD
-			^SupportDir|Content/d2k/v2/Music/SPICESCT.AUD: SPICESCT.AUD
-			^SupportDir|Content/d2k/v2/Music/UNDERCON.AUD: UNDERCON.AUD
-			^SupportDir|Content/d2k/v2/Music/WAITGAME.AUD: WAITGAME.AUD
-		ExtractBlast: SETUP/SETUP.Z
-			^SupportDir|Content/d2k/v2/BLOXBAT.R8: BLOXBAT.R8
-			^SupportDir|Content/d2k/v2/BLOXBASE.R8: BLOXBASE.R8
-			^SupportDir|Content/d2k/v2/BLOXBGBS.R8: BLOXBGBS.R8
-			^SupportDir|Content/d2k/v2/BLOXICE.R8: BLOXICE.R8
-			^SupportDir|Content/d2k/v2/BLOXTREE.R8: BLOXTREE.R8
-			^SupportDir|Content/d2k/v2/BLOXWAST.R8: BLOXWAST.R8
-			^SupportDir|Content/d2k/v2/MOUSE.R8: MOUSE.R8
-			^SupportDir|Content/d2k/v2/PALETTE.BIN: PALETTE.BIN
-			^SupportDir|Content/d2k/v2/FONT.BIN: FONT.BIN
-			^SupportDir|Content/d2k/v2/FONTCOL.FNT: FONTCOL.FNT
-			^SupportDir|Content/d2k/v2/FONTCOL.FPL: FONTCOL.FPL
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ECONF2.AUD: A_ECONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ECONF1.AUD: A_ECONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ECONF3.AUD: A_ECONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ESEL1.AUD: A_ESEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ESEL2.AUD: A_ESEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ESEL3.AUD: A_ESEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF1.AUD: A_FCONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF2.AUD: A_FCONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF3.AUD: A_FCONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_ENEMY.AUD: OI_ENEMY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_POWER.AUD: AI_POWER.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_PREP.AUD: AI_PREP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_PRMRY.AUD: AI_PRMRY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_REINF.AUD: AI_REINF.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_GANEW.AUD: AI_GANEW.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_SPORT.AUD: HI_SPORT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_GSAVE.AUD: OI_GSAVE.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_GUARD.AUD: OI_GUARD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP3B.AUD: HI_MAP3B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP4A.AUD: HI_MAP4A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP5A.AUD: HI_MAP5A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP6A.AUD: HI_MAP6A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ECONF3.AUD: O_ECONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_SCONF3.AUD: O_SCONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_SSEL1.AUD: O_SSEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_SSEL2.AUD: O_SSEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_SSEL3.AUD: O_SSEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_VCONF1.AUD: O_VCONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_VCONF2.AUD: O_VCONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_VCONF3.AUD: O_VCONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MWIN.AUD: OI_MWIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ECONF1.AUD: O_ECONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ECONF2.AUD: O_ECONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_NROOM.AUD: OI_NROOM.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ESEL1.AUD: O_ESEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ESEL2.AUD: O_ESEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ESEL3.AUD: O_ESEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ICONF1.AUD: O_ICONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ICONF2.AUD: O_ICONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ICONF3.AUD: O_ICONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP4B.AUD: HI_MAP4B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ISEL2.AUD: O_ISEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_BLOST.AUD: HI_BLOST.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_BUILD.AUD: HI_BUILD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP6B.AUD: HI_MAP6B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP7A.AUD: HI_MAP7A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP9.AUD: HI_MAP9.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_VSEL3.AUD: A_VSEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_1MIN.AUD: AI_1MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_2MIN.AUD: AI_2MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_3MIN.AUD: AI_3MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_VSEL1.AUD: O_VSEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_RUN.AUD: HI_RUN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL1.AUD: A_FSEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL2.AUD: A_FSEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL3.AUD: A_FSEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL4.AUD: A_FSEL4.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP8A.AUD: OI_MAP8A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP9A.AUD: OI_MAP9A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MEND.AUD: OI_MEND.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MFAIL.AUD: OI_MFAIL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_4MIN.AUD: AI_4MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_CANCL.AUD: AI_CANCL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_ULOST.AUD: OI_ULOST.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_UNRDY.AUD: OI_UNRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_VSEL3.AUD: O_VSEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_1MIN.AUD: OI_1MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP7A.AUD: OI_MAP7A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_TRAIN.AUD: HI_TRAIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_ULOST.AUD: HI_ULOST.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_UNRDY.AUD: HI_UNRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP2A.AUD: OI_MAP2A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_REINF.AUD: HI_REINF.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP2C.AUD: OI_MAP2C.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP3A.AUD: OI_MAP3A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP4A.AUD: OI_MAP4A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_SPORT.AUD: OI_SPORT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_UPGOP.AUD: OI_UPGOP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_UPGRD.AUD: OI_UPGRD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_WATTK.AUD: OI_WATTK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MONEY.AUD: AI_MONEY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_SELL.AUD: AI_SELL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_NEWOP.AUD: HI_NEWOP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_5MIN.AUD: AI_5MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_HATTK.AUD: OI_HATTK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_VSEL2.AUD: H_VSEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP1B.AUD: OI_MAP1B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP1C.AUD: OI_MAP1C.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_GSAVE.AUD: AI_GSAVE.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_GUARD.AUD: AI_GUARD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_HATTK.AUD: AI_HATTK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_HOLD.AUD: AI_HOLD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_UPGOP.AUD: HI_UPGOP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_UPGRD.AUD: HI_UPGRD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP2B.AUD: OI_MAP2B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_WSIGN.AUD: HI_WSIGN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_HATTK.AUD: HI_HATTK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_SCONF2.AUD: O_SCONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_HOLD.AUD: HI_HOLD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_VSEL2.AUD: A_VSEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_ATACK.AUD: AI_ATACK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_BDRDY.AUD: AI_BDRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_BLOST.AUD: AI_BLOST.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_BUILD.AUD: AI_BUILD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_GLOAD.AUD: HI_GLOAD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_CAPT.AUD: AI_CAPT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_DHRDY.AUD: AI_DHRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_DPLOY.AUD: AI_DPLOY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_ENEMY.AUD: AI_ENEMY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_VCONF1.AUD: A_VCONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_PLACE.AUD: HI_PLACE.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_POWER.AUD: HI_POWER.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_PREP.AUD: HI_PREP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_PRMRY.AUD: HI_PRMRY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MONEY.AUD: OI_MONEY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ISEL1.AUD: O_ISEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_NEWOP.AUD: OI_NEWOP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_VCONF3.AUD: A_VCONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_VSEL1.AUD: A_VSEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_PLACE.AUD: OI_PLACE.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_POWER.AUD: OI_POWER.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_PREP.AUD: OI_PREP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_PRMRY.AUD: OI_PRMRY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_REINF.AUD: OI_REINF.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_RUN.AUD: OI_RUN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_CAPT.AUD: OI_CAPT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ECONF1.AUD: H_ECONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_VSEL2.AUD: O_VSEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_VSEL3.AUD: H_VSEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_1MIN.AUD: HI_1MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_2MIN.AUD: HI_2MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_3MIN.AUD: HI_3MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_4MIN.AUD: HI_4MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_5MIN.AUD: HI_5MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_ABORT.AUD: HI_ABORT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_ATACK.AUD: HI_ATACK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_NROOM.AUD: HI_NROOM.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_SILOS.AUD: OI_SILOS.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF4.AUD: A_FCONF4.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP5A.AUD: OI_MAP5A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP6A.AUD: OI_MAP6A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_CANCL.AUD: HI_CANCL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_CAPT.AUD: HI_CAPT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_DHRDY.AUD: HI_DHRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_DPLOY.AUD: HI_DPLOY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_ENEMY.AUD: HI_ENEMY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_GANEW.AUD: HI_GANEW.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_DHRDY.AUD: OI_DHRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_GSAVE.AUD: HI_GSAVE.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_GUARD.AUD: HI_GUARD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_VSEL1.AUD: H_VSEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_ORDER.AUD: OI_ORDER.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/G_SCONF1.AUD: G_SCONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/G_SCONF2.AUD: G_SCONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/G_SCONF3.AUD: G_SCONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/G_SSEL1.AUD: G_SSEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/G_SSEL2.AUD: G_SSEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/G_SSEL3.AUD: G_SSEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_SELL.AUD: OI_SELL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ECONF2.AUD: H_ECONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ECONF3.AUD: H_ECONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ESEL1.AUD: H_ESEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ESEL2.AUD: H_ESEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP2C.AUD: AI_MAP2C.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP3A.AUD: AI_MAP3A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP4A.AUD: AI_MAP4A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP5A.AUD: AI_MAP5A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP6A.AUD: AI_MAP6A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_BDRDY.AUD: HI_BDRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP8A.AUD: AI_MAP8A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP9A.AUD: AI_MAP9A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MEND.AUD: AI_MEND.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MFAIL.AUD: AI_MFAIL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_GLOAD.AUD: AI_GLOAD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP9A.AUD: HI_MAP9A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MEND.AUD: HI_MEND.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MFAIL.AUD: HI_MFAIL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MONEY.AUD: HI_MONEY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MWIN.AUD: HI_MWIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_WATTK.AUD: HI_WATTK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP1A.AUD: AI_MAP1A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP1B.AUD: AI_MAP1B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP1C.AUD: AI_MAP1C.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP2A.AUD: AI_MAP2A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_ABORT.AUD: AI_ABORT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ESEL3.AUD: H_ESEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_SILOS.AUD: AI_SILOS.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_SPORT.AUD: AI_SPORT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_TRAIN.AUD: AI_TRAIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_ULOST.AUD: AI_ULOST.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP7A.AUD: AI_MAP7A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_UPGOP.AUD: AI_UPGOP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_UPGRD.AUD: AI_UPGRD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_WATTK.AUD: AI_WATTK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_WSIGN.AUD: AI_WSIGN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP2B.AUD: AI_MAP2B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ICONF1.AUD: A_ICONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ICONF2.AUD: A_ICONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ICONF3.AUD: A_ICONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ISEL1.AUD: A_ISEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_CANCL.AUD: OI_CANCL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ISEL2.AUD: H_ISEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ISEL3.AUD: H_ISEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_VCONF1.AUD: H_VCONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_VCONF2.AUD: H_VCONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_VCONF3.AUD: H_VCONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_TRAIN.AUD: OI_TRAIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_ORDER.AUD: HI_ORDER.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_WSIGN.AUD: OI_WSIGN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_BLOST.AUD: OI_BLOST.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_BUILD.AUD: OI_BUILD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_LAUNC.AUD: AI_LAUNC.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ISEL3.AUD: A_ISEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_VCONF2.AUD: A_VCONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_HOLD.AUD: OI_HOLD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_LAUNC.AUD: OI_LAUNC.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP1A.AUD: OI_MAP1A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_LAUNC.AUD: HI_LAUNC.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ICONF1.AUD: H_ICONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ICONF2.AUD: H_ICONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ICONF3.AUD: H_ICONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ISEL1.AUD: H_ISEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ISEL2.AUD: A_ISEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_RUN.AUD: AI_RUN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_SILOS.AUD: HI_SILOS.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP1A.AUD: HI_MAP1A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP1B.AUD: HI_MAP1B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP1C.AUD: HI_MAP1C.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP2A.AUD: HI_MAP2A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP2B.AUD: HI_MAP2B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP2C.AUD: HI_MAP2C.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP3A.AUD: HI_MAP3A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ISEL3.AUD: O_ISEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_SCONF1.AUD: O_SCONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_2MIN.AUD: OI_2MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_3MIN.AUD: OI_3MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_4MIN.AUD: OI_4MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_5MIN.AUD: OI_5MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_ABORT.AUD: OI_ABORT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_ATACK.AUD: OI_ATACK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_BDRDY.AUD: OI_BDRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_SELL.AUD: HI_SELL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_DPLOY.AUD: OI_DPLOY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_PLACE.AUD: AI_PLACE.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_GANEW.AUD: OI_GANEW.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_GLOAD.AUD: OI_GLOAD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MWIN.AUD: AI_MWIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_NEWOP.AUD: AI_NEWOP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_NROOM.AUD: AI_NROOM.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_ORDER.AUD: AI_ORDER.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_UNRDY.AUD: AI_UNRDY.AUD
-			^SupportDir|Content/d2k/v2/SOUND.RS: SOUND.RS
+		# Campaign briefings (optional):
+		ContentPackage:
+			Name: movies
+			Actions:
+				Copy: MOVIES
+					^SupportDir|Content/d2k/v2/Movies/A_BR01_E.VQA: A_BR01_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/A_BR02_E.VQA: A_BR02_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/A_BR03_E.VQA: A_BR03_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/A_BR04_E.VQA: A_BR04_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/A_BR05_E.VQA: A_BR05_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/A_BR06_E.VQA: A_BR06_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/A_BR07_E.VQA: A_BR07_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/A_BR08_E.VQA: A_BR08_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/A_BR09_E.VQA: A_BR09_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/A_FINL_E.VQA: A_FINL_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/A_LOSE_E.VQA: A_LOSE_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/A_MNTG_E.VQA: A_MNTG_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/H_BR01_E.VQA: H_BR01_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/H_BR02_E.VQA: H_BR02_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/H_BR03_E.VQA: H_BR03_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/H_BR04_E.VQA: H_BR04_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/H_BR05_E.VQA: H_BR05_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/H_BR06_E.VQA: H_BR06_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/H_BR07_E.VQA: H_BR07_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/H_BR08_E.VQA: H_BR08_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/H_BR09_E.VQA: H_BR09_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/H_FINL_E.VQA: H_FINL_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/H_LOSE_E.VQA: H_LOSE_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/H_MNTG_E.VQA: H_MNTG_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/O_BR01_E.VQA: O_BR01_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/O_BR02_E.VQA: O_BR02_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/O_BR03_E.VQA: O_BR03_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/O_BR04_E.VQA: O_BR04_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/O_BR05_E.VQA: O_BR05_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/O_BR06_E.VQA: O_BR06_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/O_BR07_E.VQA: O_BR07_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/O_BR08_E.VQA: O_BR08_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/O_BR09_E.VQA: O_BR09_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/O_FINL_E.VQA: O_FINL_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/O_LOSE_E.VQA: O_LOSE_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/O_MNTG_E.VQA: O_MNTG_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/G_INT1_E.VQA: G_INT1_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/G_INT2_E.VQA: G_INT2_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/G_MAPS_E.VQA: G_MAPS_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/G_PLN2_E.VQA: G_PLN2_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/G_PLNT_E.VQA: G_PLNT_E.VQA
+					^SupportDir|Content/d2k/v2/Movies/T_TITL_E.VQA: T_TITL_E.VQA
+		# Game music (optional):
+		ContentPackage:
+			Name: music
+			Actions:
+				Copy: MUSIC
+					^SupportDir|Content/d2k/v2/Music/AMBUSH.AUD: AMBUSH.AUD
+					^SupportDir|Content/d2k/v2/Music/ARAKATAK.AUD: ARAKATAK.AUD
+					^SupportDir|Content/d2k/v2/Music/ATREGAIN.AUD: ATREGAIN.AUD
+					^SupportDir|Content/d2k/v2/Music/ENTORDOS.AUD: ENTORDOS.AUD
+					^SupportDir|Content/d2k/v2/Music/FIGHTPWR.AUD: FIGHTPWR.AUD
+					^SupportDir|Content/d2k/v2/Music/FREMEN.AUD: FREMEN.AUD
+					^SupportDir|Content/d2k/v2/Music/HARK_BAT.AUD: HARK_BAT.AUD
+					^SupportDir|Content/d2k/v2/Music/LANDSAND.AUD: LANDSAND.AUD
+					^SupportDir|Content/d2k/v2/Music/OPTIONS.AUD: OPTIONS.AUD
+					^SupportDir|Content/d2k/v2/Music/PLOTTING.AUD: PLOTTING.AUD
+					^SupportDir|Content/d2k/v2/Music/RISEHARK.AUD: RISEHARK.AUD
+					^SupportDir|Content/d2k/v2/Music/ROBOTIX.AUD: ROBOTIX.AUD
+					^SupportDir|Content/d2k/v2/Music/SCORE.AUD: SCORE.AUD
+					^SupportDir|Content/d2k/v2/Music/SOLDAPPR.AUD: SOLDAPPR.AUD
+					^SupportDir|Content/d2k/v2/Music/SPICESCT.AUD: SPICESCT.AUD
+					^SupportDir|Content/d2k/v2/Music/UNDERCON.AUD: UNDERCON.AUD
+					^SupportDir|Content/d2k/v2/Music/WAITGAME.AUD: WAITGAME.AUD
+		# Base game files:
+		ContentPackage:
+			Name: base
+			Actions:
+				ExtractBlast: SETUP/SETUP.Z
+					^SupportDir|Content/d2k/v2/BLOXBAT.R8: BLOXBAT.R8
+					^SupportDir|Content/d2k/v2/BLOXBASE.R8: BLOXBASE.R8
+					^SupportDir|Content/d2k/v2/BLOXBGBS.R8: BLOXBGBS.R8
+					^SupportDir|Content/d2k/v2/BLOXICE.R8: BLOXICE.R8
+					^SupportDir|Content/d2k/v2/BLOXTREE.R8: BLOXTREE.R8
+					^SupportDir|Content/d2k/v2/BLOXWAST.R8: BLOXWAST.R8
+					^SupportDir|Content/d2k/v2/MOUSE.R8: MOUSE.R8
+					^SupportDir|Content/d2k/v2/PALETTE.BIN: PALETTE.BIN
+					^SupportDir|Content/d2k/v2/FONT.BIN: FONT.BIN
+					^SupportDir|Content/d2k/v2/FONTCOL.FNT: FONTCOL.FNT
+					^SupportDir|Content/d2k/v2/FONTCOL.FPL: FONTCOL.FPL
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ECONF2.AUD: A_ECONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ECONF1.AUD: A_ECONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ECONF3.AUD: A_ECONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ESEL1.AUD: A_ESEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ESEL2.AUD: A_ESEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ESEL3.AUD: A_ESEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF1.AUD: A_FCONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF2.AUD: A_FCONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF3.AUD: A_FCONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_ENEMY.AUD: OI_ENEMY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_POWER.AUD: AI_POWER.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_PREP.AUD: AI_PREP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_PRMRY.AUD: AI_PRMRY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_REINF.AUD: AI_REINF.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_GANEW.AUD: AI_GANEW.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_SPORT.AUD: HI_SPORT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_GSAVE.AUD: OI_GSAVE.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_GUARD.AUD: OI_GUARD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP3B.AUD: HI_MAP3B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP4A.AUD: HI_MAP4A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP5A.AUD: HI_MAP5A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP6A.AUD: HI_MAP6A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ECONF3.AUD: O_ECONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_SCONF3.AUD: O_SCONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_SSEL1.AUD: O_SSEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_SSEL2.AUD: O_SSEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_SSEL3.AUD: O_SSEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_VCONF1.AUD: O_VCONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_VCONF2.AUD: O_VCONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_VCONF3.AUD: O_VCONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MWIN.AUD: OI_MWIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ECONF1.AUD: O_ECONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ECONF2.AUD: O_ECONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_NROOM.AUD: OI_NROOM.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ESEL1.AUD: O_ESEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ESEL2.AUD: O_ESEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ESEL3.AUD: O_ESEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ICONF1.AUD: O_ICONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ICONF2.AUD: O_ICONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ICONF3.AUD: O_ICONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP4B.AUD: HI_MAP4B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ISEL2.AUD: O_ISEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_BLOST.AUD: HI_BLOST.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_BUILD.AUD: HI_BUILD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP6B.AUD: HI_MAP6B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP7A.AUD: HI_MAP7A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP9.AUD: HI_MAP9.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_VSEL3.AUD: A_VSEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_1MIN.AUD: AI_1MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_2MIN.AUD: AI_2MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_3MIN.AUD: AI_3MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_VSEL1.AUD: O_VSEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_RUN.AUD: HI_RUN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL1.AUD: A_FSEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL2.AUD: A_FSEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL3.AUD: A_FSEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL4.AUD: A_FSEL4.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP8A.AUD: OI_MAP8A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP9A.AUD: OI_MAP9A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MEND.AUD: OI_MEND.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MFAIL.AUD: OI_MFAIL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_4MIN.AUD: AI_4MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_CANCL.AUD: AI_CANCL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_ULOST.AUD: OI_ULOST.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_UNRDY.AUD: OI_UNRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_VSEL3.AUD: O_VSEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_1MIN.AUD: OI_1MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP7A.AUD: OI_MAP7A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_TRAIN.AUD: HI_TRAIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_ULOST.AUD: HI_ULOST.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_UNRDY.AUD: HI_UNRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP2A.AUD: OI_MAP2A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_REINF.AUD: HI_REINF.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP2C.AUD: OI_MAP2C.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP3A.AUD: OI_MAP3A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP4A.AUD: OI_MAP4A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_SPORT.AUD: OI_SPORT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_UPGOP.AUD: OI_UPGOP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_UPGRD.AUD: OI_UPGRD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_WATTK.AUD: OI_WATTK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MONEY.AUD: AI_MONEY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_SELL.AUD: AI_SELL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_NEWOP.AUD: HI_NEWOP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_5MIN.AUD: AI_5MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_HATTK.AUD: OI_HATTK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_VSEL2.AUD: H_VSEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP1B.AUD: OI_MAP1B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP1C.AUD: OI_MAP1C.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_GSAVE.AUD: AI_GSAVE.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_GUARD.AUD: AI_GUARD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_HATTK.AUD: AI_HATTK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_HOLD.AUD: AI_HOLD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_UPGOP.AUD: HI_UPGOP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_UPGRD.AUD: HI_UPGRD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP2B.AUD: OI_MAP2B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_WSIGN.AUD: HI_WSIGN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_HATTK.AUD: HI_HATTK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_SCONF2.AUD: O_SCONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_HOLD.AUD: HI_HOLD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_VSEL2.AUD: A_VSEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_ATACK.AUD: AI_ATACK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_BDRDY.AUD: AI_BDRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_BLOST.AUD: AI_BLOST.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_BUILD.AUD: AI_BUILD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_GLOAD.AUD: HI_GLOAD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_CAPT.AUD: AI_CAPT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_DHRDY.AUD: AI_DHRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_DPLOY.AUD: AI_DPLOY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_ENEMY.AUD: AI_ENEMY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_VCONF1.AUD: A_VCONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_PLACE.AUD: HI_PLACE.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_POWER.AUD: HI_POWER.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_PREP.AUD: HI_PREP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_PRMRY.AUD: HI_PRMRY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MONEY.AUD: OI_MONEY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ISEL1.AUD: O_ISEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_NEWOP.AUD: OI_NEWOP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_VCONF3.AUD: A_VCONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_VSEL1.AUD: A_VSEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_PLACE.AUD: OI_PLACE.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_POWER.AUD: OI_POWER.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_PREP.AUD: OI_PREP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_PRMRY.AUD: OI_PRMRY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_REINF.AUD: OI_REINF.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_RUN.AUD: OI_RUN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_CAPT.AUD: OI_CAPT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ECONF1.AUD: H_ECONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_VSEL2.AUD: O_VSEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_VSEL3.AUD: H_VSEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_1MIN.AUD: HI_1MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_2MIN.AUD: HI_2MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_3MIN.AUD: HI_3MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_4MIN.AUD: HI_4MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_5MIN.AUD: HI_5MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_ABORT.AUD: HI_ABORT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_ATACK.AUD: HI_ATACK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_NROOM.AUD: HI_NROOM.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_SILOS.AUD: OI_SILOS.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF4.AUD: A_FCONF4.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP5A.AUD: OI_MAP5A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP6A.AUD: OI_MAP6A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_CANCL.AUD: HI_CANCL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_CAPT.AUD: HI_CAPT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_DHRDY.AUD: HI_DHRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_DPLOY.AUD: HI_DPLOY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_ENEMY.AUD: HI_ENEMY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_GANEW.AUD: HI_GANEW.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_DHRDY.AUD: OI_DHRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_GSAVE.AUD: HI_GSAVE.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_GUARD.AUD: HI_GUARD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_VSEL1.AUD: H_VSEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_ORDER.AUD: OI_ORDER.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/G_SCONF1.AUD: G_SCONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/G_SCONF2.AUD: G_SCONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/G_SCONF3.AUD: G_SCONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/G_SSEL1.AUD: G_SSEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/G_SSEL2.AUD: G_SSEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/G_SSEL3.AUD: G_SSEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_SELL.AUD: OI_SELL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ECONF2.AUD: H_ECONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ECONF3.AUD: H_ECONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ESEL1.AUD: H_ESEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ESEL2.AUD: H_ESEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP2C.AUD: AI_MAP2C.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP3A.AUD: AI_MAP3A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP4A.AUD: AI_MAP4A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP5A.AUD: AI_MAP5A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP6A.AUD: AI_MAP6A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_BDRDY.AUD: HI_BDRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP8A.AUD: AI_MAP8A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP9A.AUD: AI_MAP9A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MEND.AUD: AI_MEND.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MFAIL.AUD: AI_MFAIL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_GLOAD.AUD: AI_GLOAD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP9A.AUD: HI_MAP9A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MEND.AUD: HI_MEND.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MFAIL.AUD: HI_MFAIL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MONEY.AUD: HI_MONEY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MWIN.AUD: HI_MWIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_WATTK.AUD: HI_WATTK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP1A.AUD: AI_MAP1A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP1B.AUD: AI_MAP1B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP1C.AUD: AI_MAP1C.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP2A.AUD: AI_MAP2A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_ABORT.AUD: AI_ABORT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ESEL3.AUD: H_ESEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_SILOS.AUD: AI_SILOS.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_SPORT.AUD: AI_SPORT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_TRAIN.AUD: AI_TRAIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_ULOST.AUD: AI_ULOST.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP7A.AUD: AI_MAP7A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_UPGOP.AUD: AI_UPGOP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_UPGRD.AUD: AI_UPGRD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_WATTK.AUD: AI_WATTK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_WSIGN.AUD: AI_WSIGN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP2B.AUD: AI_MAP2B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ICONF1.AUD: A_ICONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ICONF2.AUD: A_ICONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ICONF3.AUD: A_ICONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ISEL1.AUD: A_ISEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_CANCL.AUD: OI_CANCL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ISEL2.AUD: H_ISEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ISEL3.AUD: H_ISEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_VCONF1.AUD: H_VCONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_VCONF2.AUD: H_VCONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_VCONF3.AUD: H_VCONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_TRAIN.AUD: OI_TRAIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_ORDER.AUD: HI_ORDER.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_WSIGN.AUD: OI_WSIGN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_BLOST.AUD: OI_BLOST.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_BUILD.AUD: OI_BUILD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_LAUNC.AUD: AI_LAUNC.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ISEL3.AUD: A_ISEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_VCONF2.AUD: A_VCONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_HOLD.AUD: OI_HOLD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_LAUNC.AUD: OI_LAUNC.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP1A.AUD: OI_MAP1A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_LAUNC.AUD: HI_LAUNC.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ICONF1.AUD: H_ICONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ICONF2.AUD: H_ICONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ICONF3.AUD: H_ICONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ISEL1.AUD: H_ISEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ISEL2.AUD: A_ISEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_RUN.AUD: AI_RUN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_SILOS.AUD: HI_SILOS.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP1A.AUD: HI_MAP1A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP1B.AUD: HI_MAP1B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP1C.AUD: HI_MAP1C.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP2A.AUD: HI_MAP2A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP2B.AUD: HI_MAP2B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP2C.AUD: HI_MAP2C.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP3A.AUD: HI_MAP3A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ISEL3.AUD: O_ISEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_SCONF1.AUD: O_SCONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_2MIN.AUD: OI_2MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_3MIN.AUD: OI_3MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_4MIN.AUD: OI_4MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_5MIN.AUD: OI_5MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_ABORT.AUD: OI_ABORT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_ATACK.AUD: OI_ATACK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_BDRDY.AUD: OI_BDRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_SELL.AUD: HI_SELL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_DPLOY.AUD: OI_DPLOY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_PLACE.AUD: AI_PLACE.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_GANEW.AUD: OI_GANEW.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_GLOAD.AUD: OI_GLOAD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MWIN.AUD: AI_MWIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_NEWOP.AUD: AI_NEWOP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_NROOM.AUD: AI_NROOM.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_ORDER.AUD: AI_ORDER.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_UNRDY.AUD: AI_UNRDY.AUD
+					^SupportDir|Content/d2k/v2/SOUND.RS: SOUND.RS
diff --git a/mods/d2k/installer/gruntmods.yaml b/mods/d2k/installer/gruntmods.yaml
index a40671f491..146486fb05 100644
--- a/mods/d2k/installer/gruntmods.yaml
+++ b/mods/d2k/installer/gruntmods.yaml
@@ -6,289 +6,298 @@ gruntmods: Dune 2000: GruntMods Edition
 		Dune 2000/data/BLOXXMAS.R8: afc818feda44f5873e3af07bd2191573ba9965db
 		Dune 2000/data/DATA.R8: 2b229cf4be47104a6214237039a55329f6c45bc9
 	Install:
-		Copy: Dune 2000/data/Music
-			^SupportDir|Content/d2k/v2/Music/AMBUSH.AUD: AMBUSH.AUD
-			^SupportDir|Content/d2k/v2/Music/ARAKATAK.AUD: ARAKATAK.AUD
-			^SupportDir|Content/d2k/v2/Music/ATREGAIN.AUD: ATREGAIN.AUD
-			^SupportDir|Content/d2k/v2/Music/ENTORDOS.AUD: ENTORDOS.AUD
-			^SupportDir|Content/d2k/v2/Music/FIGHTPWR.AUD: FIGHTPWR.AUD
-			^SupportDir|Content/d2k/v2/Music/FREMEN.AUD: FREMEN.AUD
-			^SupportDir|Content/d2k/v2/Music/HARK_BAT.AUD: HARK_BAT.AUD
-			^SupportDir|Content/d2k/v2/Music/LANDSAND.AUD: LANDSAND.AUD
-			^SupportDir|Content/d2k/v2/Music/OPTIONS.AUD: OPTIONS.AUD
-			^SupportDir|Content/d2k/v2/Music/PLOTTING.AUD: PLOTTING.AUD
-			^SupportDir|Content/d2k/v2/Music/RISEHARK.AUD: RISEHARK.AUD
-			^SupportDir|Content/d2k/v2/Music/ROBOTIX.AUD: ROBOTIX.AUD
-			^SupportDir|Content/d2k/v2/Music/SCORE.AUD: SCORE.AUD
-			^SupportDir|Content/d2k/v2/Music/SOLDAPPR.AUD: SOLDAPPR.AUD
-			^SupportDir|Content/d2k/v2/Music/SPICESCT.AUD: SPICESCT.AUD
-			^SupportDir|Content/d2k/v2/Music/UNDERCON.AUD: UNDERCON.AUD
-			^SupportDir|Content/d2k/v2/Music/WAITGAME.AUD: WAITGAME.AUD
-		Copy: Dune 2000/data
-			^SupportDir|Content/d2k/v2/BLOXBAT.R8: BLOXBAT.R8
-			^SupportDir|Content/d2k/v2/BLOXBASE.R8: BLOXBASE.R8
-			^SupportDir|Content/d2k/v2/BLOXBGBS.R8: BLOXBGBS.R8
-			^SupportDir|Content/d2k/v2/BLOXICE.R8: BLOXICE.R8
-			^SupportDir|Content/d2k/v2/BLOXTREE.R8: BLOXTREE.R8
-			^SupportDir|Content/d2k/v2/BLOXWAST.R8: BLOXWAST.R8
-			^SupportDir|Content/d2k/v2/BLOXXMAS.R8: BLOXXMAS.R8
-			^SupportDir|Content/d2k/v2/DATA.R8: DATA.R8
-			^SupportDir|Content/d2k/v2/MOUSE.R8: MOUSE.R8
-			^SupportDir|Content/d2k/v2/FONTCOL.FNT: FONTCOL.FNT
-			^SupportDir|Content/d2k/v2/FONTCOL.FPL: FONTCOL.FPL
-		Copy: Dune 2000/data/bin
-			^SupportDir|Content/d2k/v2/PALETTE.BIN: PALETTE.BIN
-			^SupportDir|Content/d2k/v2/FONT.BIN: FONT.BIN
-		Copy: Dune 2000/data/GAMESFX
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ECONF2.AUD: A_ECONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ECONF1.AUD: A_ECONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ECONF3.AUD: A_ECONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ESEL1.AUD: A_ESEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ESEL2.AUD: A_ESEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ESEL3.AUD: A_ESEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF1.AUD: A_FCONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF2.AUD: A_FCONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF3.AUD: A_FCONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_ENEMY.AUD: OI_ENEMY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_POWER.AUD: AI_POWER.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_PREP.AUD: AI_PREP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_PRMRY.AUD: AI_PRMRY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_REINF.AUD: AI_REINF.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_GANEW.AUD: AI_GANEW.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_SPORT.AUD: HI_SPORT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_GSAVE.AUD: OI_GSAVE.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_GUARD.AUD: OI_GUARD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP3B.AUD: HI_MAP3B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP4A.AUD: HI_MAP4A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP5A.AUD: HI_MAP5A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP6A.AUD: HI_MAP6A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ECONF3.AUD: O_ECONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_SCONF3.AUD: O_SCONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_SSEL1.AUD: O_SSEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_SSEL2.AUD: O_SSEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_SSEL3.AUD: O_SSEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_VCONF1.AUD: O_VCONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_VCONF2.AUD: O_VCONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_VCONF3.AUD: O_VCONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MWIN.AUD: OI_MWIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ECONF1.AUD: O_ECONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ECONF2.AUD: O_ECONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_NROOM.AUD: OI_NROOM.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ESEL1.AUD: O_ESEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ESEL2.AUD: O_ESEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ESEL3.AUD: O_ESEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ICONF1.AUD: O_ICONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ICONF2.AUD: O_ICONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ICONF3.AUD: O_ICONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP4B.AUD: HI_MAP4B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ISEL2.AUD: O_ISEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_BLOST.AUD: HI_BLOST.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_BUILD.AUD: HI_BUILD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP6B.AUD: HI_MAP6B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP7A.AUD: HI_MAP7A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP9.AUD: HI_MAP9.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_VSEL3.AUD: A_VSEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_1MIN.AUD: AI_1MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_2MIN.AUD: AI_2MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_3MIN.AUD: AI_3MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_VSEL1.AUD: O_VSEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_RUN.AUD: HI_RUN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL1.AUD: A_FSEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL2.AUD: A_FSEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL3.AUD: A_FSEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL4.AUD: A_FSEL4.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP8A.AUD: OI_MAP8A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP9A.AUD: OI_MAP9A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MEND.AUD: OI_MEND.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MFAIL.AUD: OI_MFAIL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_4MIN.AUD: AI_4MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_CANCL.AUD: AI_CANCL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_ULOST.AUD: OI_ULOST.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_UNRDY.AUD: OI_UNRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_VSEL3.AUD: O_VSEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_1MIN.AUD: OI_1MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP7A.AUD: OI_MAP7A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_TRAIN.AUD: HI_TRAIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_ULOST.AUD: HI_ULOST.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_UNRDY.AUD: HI_UNRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP2A.AUD: OI_MAP2A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_REINF.AUD: HI_REINF.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP2C.AUD: OI_MAP2C.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP3A.AUD: OI_MAP3A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP4A.AUD: OI_MAP4A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_SPORT.AUD: OI_SPORT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_UPGOP.AUD: OI_UPGOP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_UPGRD.AUD: OI_UPGRD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_WATTK.AUD: OI_WATTK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MONEY.AUD: AI_MONEY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_SELL.AUD: AI_SELL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_NEWOP.AUD: HI_NEWOP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_5MIN.AUD: AI_5MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_HATTK.AUD: OI_HATTK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_VSEL2.AUD: H_VSEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP1B.AUD: OI_MAP1B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP1C.AUD: OI_MAP1C.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_GSAVE.AUD: AI_GSAVE.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_GUARD.AUD: AI_GUARD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_HATTK.AUD: AI_HATTK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_HOLD.AUD: AI_HOLD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_UPGOP.AUD: HI_UPGOP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_UPGRD.AUD: HI_UPGRD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP2B.AUD: OI_MAP2B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_WSIGN.AUD: HI_WSIGN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_HATTK.AUD: HI_HATTK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_SCONF2.AUD: O_SCONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_HOLD.AUD: HI_HOLD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_VSEL2.AUD: A_VSEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_ATACK.AUD: AI_ATACK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_BDRDY.AUD: AI_BDRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_BLOST.AUD: AI_BLOST.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_BUILD.AUD: AI_BUILD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_GLOAD.AUD: HI_GLOAD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_CAPT.AUD: AI_CAPT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_DHRDY.AUD: AI_DHRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_DPLOY.AUD: AI_DPLOY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_ENEMY.AUD: AI_ENEMY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_VCONF1.AUD: A_VCONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_PLACE.AUD: HI_PLACE.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_POWER.AUD: HI_POWER.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_PREP.AUD: HI_PREP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_PRMRY.AUD: HI_PRMRY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MONEY.AUD: OI_MONEY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ISEL1.AUD: O_ISEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_NEWOP.AUD: OI_NEWOP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_VCONF3.AUD: A_VCONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_VSEL1.AUD: A_VSEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_PLACE.AUD: OI_PLACE.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_POWER.AUD: OI_POWER.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_PREP.AUD: OI_PREP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_PRMRY.AUD: OI_PRMRY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_REINF.AUD: OI_REINF.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_RUN.AUD: OI_RUN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_CAPT.AUD: OI_CAPT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ECONF1.AUD: H_ECONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_VSEL2.AUD: O_VSEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_VSEL3.AUD: H_VSEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_1MIN.AUD: HI_1MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_2MIN.AUD: HI_2MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_3MIN.AUD: HI_3MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_4MIN.AUD: HI_4MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_5MIN.AUD: HI_5MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_ABORT.AUD: HI_ABORT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_ATACK.AUD: HI_ATACK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_NROOM.AUD: HI_NROOM.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_SILOS.AUD: OI_SILOS.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF4.AUD: A_FCONF4.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP5A.AUD: OI_MAP5A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP6A.AUD: OI_MAP6A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_CANCL.AUD: HI_CANCL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_CAPT.AUD: HI_CAPT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_DHRDY.AUD: HI_DHRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_DPLOY.AUD: HI_DPLOY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_ENEMY.AUD: HI_ENEMY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_GANEW.AUD: HI_GANEW.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_DHRDY.AUD: OI_DHRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_GSAVE.AUD: HI_GSAVE.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_GUARD.AUD: HI_GUARD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_VSEL1.AUD: H_VSEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_ORDER.AUD: OI_ORDER.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/G_SCONF1.AUD: G_SCONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/G_SCONF2.AUD: G_SCONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/G_SCONF3.AUD: G_SCONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/G_SSEL1.AUD: G_SSEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/G_SSEL2.AUD: G_SSEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/G_SSEL3.AUD: G_SSEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_SELL.AUD: OI_SELL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ECONF2.AUD: H_ECONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ECONF3.AUD: H_ECONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ESEL1.AUD: H_ESEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ESEL2.AUD: H_ESEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP2C.AUD: AI_MAP2C.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP3A.AUD: AI_MAP3A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP4A.AUD: AI_MAP4A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP5A.AUD: AI_MAP5A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP6A.AUD: AI_MAP6A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_BDRDY.AUD: HI_BDRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP8A.AUD: AI_MAP8A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP9A.AUD: AI_MAP9A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MEND.AUD: AI_MEND.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MFAIL.AUD: AI_MFAIL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_GLOAD.AUD: AI_GLOAD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP9A.AUD: HI_MAP9A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MEND.AUD: HI_MEND.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MFAIL.AUD: HI_MFAIL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MONEY.AUD: HI_MONEY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MWIN.AUD: HI_MWIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_WATTK.AUD: HI_WATTK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP1A.AUD: AI_MAP1A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP1B.AUD: AI_MAP1B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP1C.AUD: AI_MAP1C.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP2A.AUD: AI_MAP2A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_ABORT.AUD: AI_ABORT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ESEL3.AUD: H_ESEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_SILOS.AUD: AI_SILOS.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_SPORT.AUD: AI_SPORT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_TRAIN.AUD: AI_TRAIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_ULOST.AUD: AI_ULOST.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP7A.AUD: AI_MAP7A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_UPGOP.AUD: AI_UPGOP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_UPGRD.AUD: AI_UPGRD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_WATTK.AUD: AI_WATTK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_WSIGN.AUD: AI_WSIGN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP2B.AUD: AI_MAP2B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ICONF1.AUD: A_ICONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ICONF2.AUD: A_ICONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ICONF3.AUD: A_ICONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ISEL1.AUD: A_ISEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_CANCL.AUD: OI_CANCL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ISEL2.AUD: H_ISEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ISEL3.AUD: H_ISEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_VCONF1.AUD: H_VCONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_VCONF2.AUD: H_VCONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_VCONF3.AUD: H_VCONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_TRAIN.AUD: OI_TRAIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_ORDER.AUD: HI_ORDER.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_WSIGN.AUD: OI_WSIGN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_BLOST.AUD: OI_BLOST.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_BUILD.AUD: OI_BUILD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_LAUNC.AUD: AI_LAUNC.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ISEL3.AUD: A_ISEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_VCONF2.AUD: A_VCONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_HOLD.AUD: OI_HOLD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_LAUNC.AUD: OI_LAUNC.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP1A.AUD: OI_MAP1A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_LAUNC.AUD: HI_LAUNC.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ICONF1.AUD: H_ICONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ICONF2.AUD: H_ICONF2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ICONF3.AUD: H_ICONF3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/H_ISEL1.AUD: H_ISEL1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/A_ISEL2.AUD: A_ISEL2.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_RUN.AUD: AI_RUN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_SILOS.AUD: HI_SILOS.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP1A.AUD: HI_MAP1A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP1B.AUD: HI_MAP1B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP1C.AUD: HI_MAP1C.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP2A.AUD: HI_MAP2A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP2B.AUD: HI_MAP2B.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP2C.AUD: HI_MAP2C.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP3A.AUD: HI_MAP3A.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_ISEL3.AUD: O_ISEL3.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/O_SCONF1.AUD: O_SCONF1.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_2MIN.AUD: OI_2MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_3MIN.AUD: OI_3MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_4MIN.AUD: OI_4MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_5MIN.AUD: OI_5MIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_ABORT.AUD: OI_ABORT.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_ATACK.AUD: OI_ATACK.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_BDRDY.AUD: OI_BDRDY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/HI_SELL.AUD: HI_SELL.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_DPLOY.AUD: OI_DPLOY.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_PLACE.AUD: AI_PLACE.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_GANEW.AUD: OI_GANEW.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/OI_GLOAD.AUD: OI_GLOAD.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_MWIN.AUD: AI_MWIN.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_NEWOP.AUD: AI_NEWOP.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_NROOM.AUD: AI_NROOM.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_ORDER.AUD: AI_ORDER.AUD
-			^SupportDir|Content/d2k/v2/GAMESFX/AI_UNRDY.AUD: AI_UNRDY.AUD
-			^SupportDir|Content/d2k/v2/SOUND.RS: SOUND.RS
+		# Game music (optional):
+		ContentPackage:
+			Name: music
+			Actions:
+				Copy: Dune 2000/data/Music
+					^SupportDir|Content/d2k/v2/Music/AMBUSH.AUD: AMBUSH.AUD
+					^SupportDir|Content/d2k/v2/Music/ARAKATAK.AUD: ARAKATAK.AUD
+					^SupportDir|Content/d2k/v2/Music/ATREGAIN.AUD: ATREGAIN.AUD
+					^SupportDir|Content/d2k/v2/Music/ENTORDOS.AUD: ENTORDOS.AUD
+					^SupportDir|Content/d2k/v2/Music/FIGHTPWR.AUD: FIGHTPWR.AUD
+					^SupportDir|Content/d2k/v2/Music/FREMEN.AUD: FREMEN.AUD
+					^SupportDir|Content/d2k/v2/Music/HARK_BAT.AUD: HARK_BAT.AUD
+					^SupportDir|Content/d2k/v2/Music/LANDSAND.AUD: LANDSAND.AUD
+					^SupportDir|Content/d2k/v2/Music/OPTIONS.AUD: OPTIONS.AUD
+					^SupportDir|Content/d2k/v2/Music/PLOTTING.AUD: PLOTTING.AUD
+					^SupportDir|Content/d2k/v2/Music/RISEHARK.AUD: RISEHARK.AUD
+					^SupportDir|Content/d2k/v2/Music/ROBOTIX.AUD: ROBOTIX.AUD
+					^SupportDir|Content/d2k/v2/Music/SCORE.AUD: SCORE.AUD
+					^SupportDir|Content/d2k/v2/Music/SOLDAPPR.AUD: SOLDAPPR.AUD
+					^SupportDir|Content/d2k/v2/Music/SPICESCT.AUD: SPICESCT.AUD
+					^SupportDir|Content/d2k/v2/Music/UNDERCON.AUD: UNDERCON.AUD
+					^SupportDir|Content/d2k/v2/Music/WAITGAME.AUD: WAITGAME.AUD
+		# TODO: DOES THIS NEED TO BE SEPARATED INTO TWO PACKAGES?
+		# Base game files + 1.06 Patch Content:
+		ContentPackage:
+			Name: patch
+			Actions:
+				Copy: Dune 2000/data
+					^SupportDir|Content/d2k/v2/BLOXBAT.R8: BLOXBAT.R8
+					^SupportDir|Content/d2k/v2/BLOXBASE.R8: BLOXBASE.R8
+					^SupportDir|Content/d2k/v2/BLOXBGBS.R8: BLOXBGBS.R8
+					^SupportDir|Content/d2k/v2/BLOXICE.R8: BLOXICE.R8
+					^SupportDir|Content/d2k/v2/BLOXTREE.R8: BLOXTREE.R8
+					^SupportDir|Content/d2k/v2/BLOXWAST.R8: BLOXWAST.R8
+					^SupportDir|Content/d2k/v2/BLOXXMAS.R8: BLOXXMAS.R8
+					^SupportDir|Content/d2k/v2/DATA.R8: DATA.R8
+					^SupportDir|Content/d2k/v2/MOUSE.R8: MOUSE.R8
+					^SupportDir|Content/d2k/v2/FONTCOL.FNT: FONTCOL.FNT
+					^SupportDir|Content/d2k/v2/FONTCOL.FPL: FONTCOL.FPL
+				Copy: Dune 2000/data/bin
+					^SupportDir|Content/d2k/v2/PALETTE.BIN: PALETTE.BIN
+					^SupportDir|Content/d2k/v2/FONT.BIN: FONT.BIN
+				Copy: Dune 2000/data/GAMESFX
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ECONF2.AUD: A_ECONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ECONF1.AUD: A_ECONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ECONF3.AUD: A_ECONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ESEL1.AUD: A_ESEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ESEL2.AUD: A_ESEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ESEL3.AUD: A_ESEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF1.AUD: A_FCONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF2.AUD: A_FCONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF3.AUD: A_FCONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_ENEMY.AUD: OI_ENEMY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_POWER.AUD: AI_POWER.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_PREP.AUD: AI_PREP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_PRMRY.AUD: AI_PRMRY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_REINF.AUD: AI_REINF.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_GANEW.AUD: AI_GANEW.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_SPORT.AUD: HI_SPORT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_GSAVE.AUD: OI_GSAVE.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_GUARD.AUD: OI_GUARD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP3B.AUD: HI_MAP3B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP4A.AUD: HI_MAP4A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP5A.AUD: HI_MAP5A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP6A.AUD: HI_MAP6A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ECONF3.AUD: O_ECONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_SCONF3.AUD: O_SCONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_SSEL1.AUD: O_SSEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_SSEL2.AUD: O_SSEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_SSEL3.AUD: O_SSEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_VCONF1.AUD: O_VCONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_VCONF2.AUD: O_VCONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_VCONF3.AUD: O_VCONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MWIN.AUD: OI_MWIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ECONF1.AUD: O_ECONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ECONF2.AUD: O_ECONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_NROOM.AUD: OI_NROOM.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ESEL1.AUD: O_ESEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ESEL2.AUD: O_ESEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ESEL3.AUD: O_ESEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ICONF1.AUD: O_ICONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ICONF2.AUD: O_ICONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ICONF3.AUD: O_ICONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP4B.AUD: HI_MAP4B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ISEL2.AUD: O_ISEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_BLOST.AUD: HI_BLOST.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_BUILD.AUD: HI_BUILD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP6B.AUD: HI_MAP6B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP7A.AUD: HI_MAP7A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP9.AUD: HI_MAP9.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_VSEL3.AUD: A_VSEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_1MIN.AUD: AI_1MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_2MIN.AUD: AI_2MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_3MIN.AUD: AI_3MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_VSEL1.AUD: O_VSEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_RUN.AUD: HI_RUN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL1.AUD: A_FSEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL2.AUD: A_FSEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL3.AUD: A_FSEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FSEL4.AUD: A_FSEL4.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP8A.AUD: OI_MAP8A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP9A.AUD: OI_MAP9A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MEND.AUD: OI_MEND.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MFAIL.AUD: OI_MFAIL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_4MIN.AUD: AI_4MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_CANCL.AUD: AI_CANCL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_ULOST.AUD: OI_ULOST.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_UNRDY.AUD: OI_UNRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_VSEL3.AUD: O_VSEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_1MIN.AUD: OI_1MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP7A.AUD: OI_MAP7A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_TRAIN.AUD: HI_TRAIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_ULOST.AUD: HI_ULOST.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_UNRDY.AUD: HI_UNRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP2A.AUD: OI_MAP2A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_REINF.AUD: HI_REINF.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP2C.AUD: OI_MAP2C.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP3A.AUD: OI_MAP3A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP4A.AUD: OI_MAP4A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_SPORT.AUD: OI_SPORT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_UPGOP.AUD: OI_UPGOP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_UPGRD.AUD: OI_UPGRD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_WATTK.AUD: OI_WATTK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MONEY.AUD: AI_MONEY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_SELL.AUD: AI_SELL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_NEWOP.AUD: HI_NEWOP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_5MIN.AUD: AI_5MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_HATTK.AUD: OI_HATTK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_VSEL2.AUD: H_VSEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP1B.AUD: OI_MAP1B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP1C.AUD: OI_MAP1C.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_GSAVE.AUD: AI_GSAVE.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_GUARD.AUD: AI_GUARD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_HATTK.AUD: AI_HATTK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_HOLD.AUD: AI_HOLD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_UPGOP.AUD: HI_UPGOP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_UPGRD.AUD: HI_UPGRD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP2B.AUD: OI_MAP2B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_WSIGN.AUD: HI_WSIGN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_HATTK.AUD: HI_HATTK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_SCONF2.AUD: O_SCONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_HOLD.AUD: HI_HOLD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_VSEL2.AUD: A_VSEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_ATACK.AUD: AI_ATACK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_BDRDY.AUD: AI_BDRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_BLOST.AUD: AI_BLOST.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_BUILD.AUD: AI_BUILD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_GLOAD.AUD: HI_GLOAD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_CAPT.AUD: AI_CAPT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_DHRDY.AUD: AI_DHRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_DPLOY.AUD: AI_DPLOY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_ENEMY.AUD: AI_ENEMY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_VCONF1.AUD: A_VCONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_PLACE.AUD: HI_PLACE.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_POWER.AUD: HI_POWER.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_PREP.AUD: HI_PREP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_PRMRY.AUD: HI_PRMRY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MONEY.AUD: OI_MONEY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ISEL1.AUD: O_ISEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_NEWOP.AUD: OI_NEWOP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_VCONF3.AUD: A_VCONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_VSEL1.AUD: A_VSEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_PLACE.AUD: OI_PLACE.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_POWER.AUD: OI_POWER.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_PREP.AUD: OI_PREP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_PRMRY.AUD: OI_PRMRY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_REINF.AUD: OI_REINF.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_RUN.AUD: OI_RUN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_CAPT.AUD: OI_CAPT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ECONF1.AUD: H_ECONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_VSEL2.AUD: O_VSEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_VSEL3.AUD: H_VSEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_1MIN.AUD: HI_1MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_2MIN.AUD: HI_2MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_3MIN.AUD: HI_3MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_4MIN.AUD: HI_4MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_5MIN.AUD: HI_5MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_ABORT.AUD: HI_ABORT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_ATACK.AUD: HI_ATACK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_NROOM.AUD: HI_NROOM.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_SILOS.AUD: OI_SILOS.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_FCONF4.AUD: A_FCONF4.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP5A.AUD: OI_MAP5A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP6A.AUD: OI_MAP6A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_CANCL.AUD: HI_CANCL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_CAPT.AUD: HI_CAPT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_DHRDY.AUD: HI_DHRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_DPLOY.AUD: HI_DPLOY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_ENEMY.AUD: HI_ENEMY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_GANEW.AUD: HI_GANEW.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_DHRDY.AUD: OI_DHRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_GSAVE.AUD: HI_GSAVE.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_GUARD.AUD: HI_GUARD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_VSEL1.AUD: H_VSEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_ORDER.AUD: OI_ORDER.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/G_SCONF1.AUD: G_SCONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/G_SCONF2.AUD: G_SCONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/G_SCONF3.AUD: G_SCONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/G_SSEL1.AUD: G_SSEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/G_SSEL2.AUD: G_SSEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/G_SSEL3.AUD: G_SSEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_SELL.AUD: OI_SELL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ECONF2.AUD: H_ECONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ECONF3.AUD: H_ECONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ESEL1.AUD: H_ESEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ESEL2.AUD: H_ESEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP2C.AUD: AI_MAP2C.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP3A.AUD: AI_MAP3A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP4A.AUD: AI_MAP4A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP5A.AUD: AI_MAP5A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP6A.AUD: AI_MAP6A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_BDRDY.AUD: HI_BDRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP8A.AUD: AI_MAP8A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP9A.AUD: AI_MAP9A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MEND.AUD: AI_MEND.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MFAIL.AUD: AI_MFAIL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_GLOAD.AUD: AI_GLOAD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP9A.AUD: HI_MAP9A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MEND.AUD: HI_MEND.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MFAIL.AUD: HI_MFAIL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MONEY.AUD: HI_MONEY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MWIN.AUD: HI_MWIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_WATTK.AUD: HI_WATTK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP1A.AUD: AI_MAP1A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP1B.AUD: AI_MAP1B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP1C.AUD: AI_MAP1C.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP2A.AUD: AI_MAP2A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_ABORT.AUD: AI_ABORT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ESEL3.AUD: H_ESEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_SILOS.AUD: AI_SILOS.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_SPORT.AUD: AI_SPORT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_TRAIN.AUD: AI_TRAIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_ULOST.AUD: AI_ULOST.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP7A.AUD: AI_MAP7A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_UPGOP.AUD: AI_UPGOP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_UPGRD.AUD: AI_UPGRD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_WATTK.AUD: AI_WATTK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_WSIGN.AUD: AI_WSIGN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MAP2B.AUD: AI_MAP2B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ICONF1.AUD: A_ICONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ICONF2.AUD: A_ICONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ICONF3.AUD: A_ICONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ISEL1.AUD: A_ISEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_CANCL.AUD: OI_CANCL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ISEL2.AUD: H_ISEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ISEL3.AUD: H_ISEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_VCONF1.AUD: H_VCONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_VCONF2.AUD: H_VCONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_VCONF3.AUD: H_VCONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_TRAIN.AUD: OI_TRAIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_ORDER.AUD: HI_ORDER.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_WSIGN.AUD: OI_WSIGN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_BLOST.AUD: OI_BLOST.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_BUILD.AUD: OI_BUILD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_LAUNC.AUD: AI_LAUNC.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ISEL3.AUD: A_ISEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_VCONF2.AUD: A_VCONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_HOLD.AUD: OI_HOLD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_LAUNC.AUD: OI_LAUNC.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_MAP1A.AUD: OI_MAP1A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_LAUNC.AUD: HI_LAUNC.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ICONF1.AUD: H_ICONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ICONF2.AUD: H_ICONF2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ICONF3.AUD: H_ICONF3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/H_ISEL1.AUD: H_ISEL1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/A_ISEL2.AUD: A_ISEL2.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_RUN.AUD: AI_RUN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_SILOS.AUD: HI_SILOS.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP1A.AUD: HI_MAP1A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP1B.AUD: HI_MAP1B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP1C.AUD: HI_MAP1C.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP2A.AUD: HI_MAP2A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP2B.AUD: HI_MAP2B.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP2C.AUD: HI_MAP2C.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_MAP3A.AUD: HI_MAP3A.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_ISEL3.AUD: O_ISEL3.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/O_SCONF1.AUD: O_SCONF1.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_2MIN.AUD: OI_2MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_3MIN.AUD: OI_3MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_4MIN.AUD: OI_4MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_5MIN.AUD: OI_5MIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_ABORT.AUD: OI_ABORT.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_ATACK.AUD: OI_ATACK.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_BDRDY.AUD: OI_BDRDY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/HI_SELL.AUD: HI_SELL.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_DPLOY.AUD: OI_DPLOY.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_PLACE.AUD: AI_PLACE.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_GANEW.AUD: OI_GANEW.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/OI_GLOAD.AUD: OI_GLOAD.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_MWIN.AUD: AI_MWIN.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_NEWOP.AUD: AI_NEWOP.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_NROOM.AUD: AI_NROOM.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_ORDER.AUD: AI_ORDER.AUD
+					^SupportDir|Content/d2k/v2/GAMESFX/AI_UNRDY.AUD: AI_UNRDY.AUD
+					^SupportDir|Content/d2k/v2/SOUND.RS: SOUND.RS
diff --git a/mods/ra/installer/aftermath.yaml b/mods/ra/installer/aftermath.yaml
index 775356e660..9e0dc0c8c3 100644
--- a/mods/ra/installer/aftermath.yaml
+++ b/mods/ra/installer/aftermath.yaml
@@ -4,53 +4,62 @@ aftermath: Aftermath Expansion Disc (English)
 		README.TXT: 9902fb74c019df1b76ff5634e68f0371d790b5e0
 		SETUP/INSTALL/PATCH.RTP: 5bce93f834f9322ddaa7233242e5b6c7fea0bf17
 	Install:
-		ExtractRaw: SETUP/INSTALL/PATCH.RTP
-			^SupportDir|Content/ra/v2/expand/expand2.mix:
-				Offset: 4712984
-				Length: 469922
-			^SupportDir|Content/ra/v2/expand/hires1.mix:
-				Offset: 5182981
-				Length: 90264
-			^SupportDir|Content/ra/v2/expand/lores1.mix:
-				Offset: 5273320
-				Length: 57076
-		ExtractMix: MAIN.MIX
-			^SupportDir|Content/ra/v2/expand/scores.mix: scores.mix
-			^SupportDir|Content/ra/v2/expand/sounds.mix: sounds.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/expand/scores.mix
-			^SupportDir|Content/ra/v2/expand/await.aud: await.aud
-			^SupportDir|Content/ra/v2/expand/bog.aud: bog.aud
-			^SupportDir|Content/ra/v2/expand/float_v2.aud: float_v2.aud
-			^SupportDir|Content/ra/v2/expand/gloom.aud: gloom.aud
-			^SupportDir|Content/ra/v2/expand/grndwire.aud: grndwire.aud
-			^SupportDir|Content/ra/v2/expand/rpt.aud: rpt.aud
-			^SupportDir|Content/ra/v2/expand/search.aud: search.aud
-			^SupportDir|Content/ra/v2/expand/traction.aud: traction.aud
-			^SupportDir|Content/ra/v2/expand/wastelnd.aud: wastelnd.aud
-		Delete: ^SupportDir|Content/ra/v2/expand/scores.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/expand/sounds.mix
-			^SupportDir|Content/ra/v2/expand/chrotnk1.aud: chrotnk1.aud
-			^SupportDir|Content/ra/v2/expand/fixit1.aud: fixit1.aud
-			^SupportDir|Content/ra/v2/expand/jburn1.aud: jburn1.aud
-			^SupportDir|Content/ra/v2/expand/jchrge1.aud: jchrge1.aud
-			^SupportDir|Content/ra/v2/expand/jcrisp1.aud: jcrisp1.aud
-			^SupportDir|Content/ra/v2/expand/jdance1.aud: jdance1.aud
-			^SupportDir|Content/ra/v2/expand/jjuice1.aud: jjuice1.aud
-			^SupportDir|Content/ra/v2/expand/jjump1.aud: jjump1.aud
-			^SupportDir|Content/ra/v2/expand/jlight1.aud: jlight1.aud
-			^SupportDir|Content/ra/v2/expand/jpower1.aud: jpower1.aud
-			^SupportDir|Content/ra/v2/expand/jshock1.aud: jshock1.aud
-			^SupportDir|Content/ra/v2/expand/jyes1.aud: jyes1.aud
-			^SupportDir|Content/ra/v2/expand/madchrg2.aud: madchrg2.aud
-			^SupportDir|Content/ra/v2/expand/madexplo.aud: madexplo.aud
-			^SupportDir|Content/ra/v2/expand/mboss1.aud: mboss1.aud
-			^SupportDir|Content/ra/v2/expand/mhear1.aud: mhear1.aud
-			^SupportDir|Content/ra/v2/expand/mhotdig1.aud: mhotdig1.aud
-			^SupportDir|Content/ra/v2/expand/mhowdy1.aud: mhowdy1.aud
-			^SupportDir|Content/ra/v2/expand/mhuh1.aud: mhuh1.aud
-			^SupportDir|Content/ra/v2/expand/mlaff1.aud: mlaff1.aud
-			^SupportDir|Content/ra/v2/expand/mrise1.aud: mrise1.aud
-			^SupportDir|Content/ra/v2/expand/mwrench1.aud: mwrench1.aud
-			^SupportDir|Content/ra/v2/expand/myeehaw1.aud: myeehaw1.aud
-			^SupportDir|Content/ra/v2/expand/myes1.aud: myes1.aud
-		Delete: ^SupportDir|Content/ra/v2/expand/sounds.mix
+		# Aftermath expansion files:
+		ContentPackage:
+			Name: aftermathbase
+			Actions:
+				ExtractRaw: SETUP/INSTALL/PATCH.RTP
+					^SupportDir|Content/ra/v2/expand/expand2.mix:
+						Offset: 4712984
+						Length: 469922
+					^SupportDir|Content/ra/v2/expand/hires1.mix:
+						Offset: 5182981
+						Length: 90264
+					^SupportDir|Content/ra/v2/expand/lores1.mix:
+						Offset: 5273320
+						Length: 57076
+				ExtractMix: MAIN.MIX
+					^SupportDir|Content/ra/v2/expand/sounds.mix: sounds.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/expand/sounds.mix
+					^SupportDir|Content/ra/v2/expand/chrotnk1.aud: chrotnk1.aud
+					^SupportDir|Content/ra/v2/expand/fixit1.aud: fixit1.aud
+					^SupportDir|Content/ra/v2/expand/jburn1.aud: jburn1.aud
+					^SupportDir|Content/ra/v2/expand/jchrge1.aud: jchrge1.aud
+					^SupportDir|Content/ra/v2/expand/jcrisp1.aud: jcrisp1.aud
+					^SupportDir|Content/ra/v2/expand/jdance1.aud: jdance1.aud
+					^SupportDir|Content/ra/v2/expand/jjuice1.aud: jjuice1.aud
+					^SupportDir|Content/ra/v2/expand/jjump1.aud: jjump1.aud
+					^SupportDir|Content/ra/v2/expand/jlight1.aud: jlight1.aud
+					^SupportDir|Content/ra/v2/expand/jpower1.aud: jpower1.aud
+					^SupportDir|Content/ra/v2/expand/jshock1.aud: jshock1.aud
+					^SupportDir|Content/ra/v2/expand/jyes1.aud: jyes1.aud
+					^SupportDir|Content/ra/v2/expand/madchrg2.aud: madchrg2.aud
+					^SupportDir|Content/ra/v2/expand/madexplo.aud: madexplo.aud
+					^SupportDir|Content/ra/v2/expand/mboss1.aud: mboss1.aud
+					^SupportDir|Content/ra/v2/expand/mhear1.aud: mhear1.aud
+					^SupportDir|Content/ra/v2/expand/mhotdig1.aud: mhotdig1.aud
+					^SupportDir|Content/ra/v2/expand/mhowdy1.aud: mhowdy1.aud
+					^SupportDir|Content/ra/v2/expand/mhuh1.aud: mhuh1.aud
+					^SupportDir|Content/ra/v2/expand/mlaff1.aud: mlaff1.aud
+					^SupportDir|Content/ra/v2/expand/mrise1.aud: mrise1.aud
+					^SupportDir|Content/ra/v2/expand/mwrench1.aud: mwrench1.aud
+					^SupportDir|Content/ra/v2/expand/myeehaw1.aud: myeehaw1.aud
+					^SupportDir|Content/ra/v2/expand/myes1.aud: myes1.aud
+				Delete: ^SupportDir|Content/ra/v2/expand/sounds.mix
+		# Aftermath music (optional):
+		ContentPackage:
+			Name: music-aftermath
+			Actions:
+				ExtractMix: MAIN.MIX
+					^SupportDir|Content/ra/v2/expand/scores.mix: scores.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/expand/scores.mix
+					^SupportDir|Content/ra/v2/expand/await.aud: await.aud
+					^SupportDir|Content/ra/v2/expand/bog.aud: bog.aud
+					^SupportDir|Content/ra/v2/expand/float_v2.aud: float_v2.aud
+					^SupportDir|Content/ra/v2/expand/gloom.aud: gloom.aud
+					^SupportDir|Content/ra/v2/expand/grndwire.aud: grndwire.aud
+					^SupportDir|Content/ra/v2/expand/rpt.aud: rpt.aud
+					^SupportDir|Content/ra/v2/expand/search.aud: search.aud
+					^SupportDir|Content/ra/v2/expand/traction.aud: traction.aud
+					^SupportDir|Content/ra/v2/expand/wastelnd.aud: wastelnd.aud
+				Delete: ^SupportDir|Content/ra/v2/expand/scores.mix
diff --git a/mods/ra/installer/allies95.yaml b/mods/ra/installer/allies95.yaml
index 2183c83335..41dba559d1 100644
--- a/mods/ra/installer/allies95.yaml
+++ b/mods/ra/installer/allies95.yaml
@@ -5,72 +5,86 @@ allied: Red Alert 95 (Allied Disc, English)
 			Length: 4096
 		INSTALL/REDALERT.MIX: 0e58f4b54f44f6cd29fecf8cf379d33cf2d4caef
 	Install:
-		ExtractMix: INSTALL/REDALERT.MIX
-			^SupportDir|Content/ra/v2/hires.mix: hires.mix
-			^SupportDir|Content/ra/v2/local.mix: local.mix
-			^SupportDir|Content/ra/v2/lores.mix: lores.mix
-			^SupportDir|Content/ra/v2/speech.mix: speech.mix
-		ExtractMix: MAIN.MIX
-			^SupportDir|Content/ra/v2/conquer.mix: conquer.mix
-			^SupportDir|Content/ra/v2/general.mix: general.mix
-			^SupportDir|Content/ra/v2/interior.mix: interior.mix
-			^SupportDir|Content/ra/v2/scores.mix: scores.mix
-			^SupportDir|Content/ra/v2/snow.mix: snow.mix
-			^SupportDir|Content/ra/v2/sounds.mix: sounds.mix
-			^SupportDir|Content/ra/v2/russian.mix: russian.mix
-			^SupportDir|Content/ra/v2/allies.mix: allies.mix
-			^SupportDir|Content/ra/v2/temperat.mix: temperat.mix
-			^SupportDir|Content/ra/v2/movies1.mix: movies1.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/movies1.mix
-			^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
-			^SupportDir|Content/ra/v2/movies/aftrmath.vqa: aftrmath.vqa
-			^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
-			^SupportDir|Content/ra/v2/movies/ally10.vqa: ally10.vqa
-			^SupportDir|Content/ra/v2/movies/ally10b.vqa: ally10b.vqa
-			^SupportDir|Content/ra/v2/movies/ally11.vqa: ally11.vqa
-			^SupportDir|Content/ra/v2/movies/ally12.vqa: ally12.vqa
-			^SupportDir|Content/ra/v2/movies/ally14.vqa: ally14.vqa
-			^SupportDir|Content/ra/v2/movies/ally2.vqa: ally2.vqa
-			^SupportDir|Content/ra/v2/movies/ally4.vqa: ally4.vqa
-			^SupportDir|Content/ra/v2/movies/ally5.vqa: ally5.vqa
-			^SupportDir|Content/ra/v2/movies/ally6.vqa: ally6.vqa
-			^SupportDir|Content/ra/v2/movies/ally8.vqa: ally8.vqa
-			^SupportDir|Content/ra/v2/movies/ally9.vqa: ally9.vqa
-			^SupportDir|Content/ra/v2/movies/allyend.vqa: allyend.vqa
-			^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
-			^SupportDir|Content/ra/v2/movies/apcescpe.vqa: apcescpe.vqa
-			^SupportDir|Content/ra/v2/movies/assess.vqa: assess.vqa
-			^SupportDir|Content/ra/v2/movies/battle.vqa: battle.vqa
-			^SupportDir|Content/ra/v2/movies/binoc.vqa: binoc.vqa
-			^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
-			^SupportDir|Content/ra/v2/movies/brdgtilt.vqa: brdgtilt.vqa
-			^SupportDir|Content/ra/v2/movies/crontest.vqa: crontest.vqa
-			^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
-			^SupportDir|Content/ra/v2/movies/destroyr.vqa: destroyr.vqa
-			^SupportDir|Content/ra/v2/movies/dud.vqa: dud.vqa
-			^SupportDir|Content/ra/v2/movies/elevator.vqa: elevator.vqa
-			^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
-			^SupportDir|Content/ra/v2/movies/frozen.vqa: frozen.vqa
-			^SupportDir|Content/ra/v2/movies/grvestne.vqa: grvestne.vqa
-			^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/ra/v2/movies/masasslt.vqa: masasslt.vqa
-			^SupportDir|Content/ra/v2/movies/mcv.vqa: mcv.vqa
-			^SupportDir|Content/ra/v2/movies/mcv_land.vqa: mcv_land.vqa
-			^SupportDir|Content/ra/v2/movies/montpass.vqa: montpass.vqa
-			^SupportDir|Content/ra/v2/movies/oildrum.vqa: oildrum.vqa
-			^SupportDir|Content/ra/v2/movies/overrun.vqa: overrun.vqa
-			^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
-			^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
-			^SupportDir|Content/ra/v2/movies/shipsink.vqa: shipsink.vqa
-			^SupportDir|Content/ra/v2/movies/shorbom1.vqa: shorbom1.vqa
-			^SupportDir|Content/ra/v2/movies/shorbom2.vqa: shorbom2.vqa
-			^SupportDir|Content/ra/v2/movies/shorbomb.vqa: shorbomb.vqa
-			^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
-			^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
-			^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
-			^SupportDir|Content/ra/v2/movies/spy.vqa: spy.vqa
-			^SupportDir|Content/ra/v2/movies/tanya1.vqa: tanya1.vqa
-			^SupportDir|Content/ra/v2/movies/tanya2.vqa: tanya2.vqa
-			^SupportDir|Content/ra/v2/movies/toofar.vqa: toofar.vqa
-			^SupportDir|Content/ra/v2/movies/trinity.vqa: trinity.vqa
-		Delete: ^SupportDir|Content/ra/v2/movies1.mix
+		# Base game files:
+		ContentPackage:
+			Name: base
+			Actions:
+				ExtractMix: INSTALL/REDALERT.MIX
+					^SupportDir|Content/ra/v2/hires.mix: hires.mix
+					^SupportDir|Content/ra/v2/local.mix: local.mix
+					^SupportDir|Content/ra/v2/lores.mix: lores.mix
+					^SupportDir|Content/ra/v2/speech.mix: speech.mix
+				ExtractMix: MAIN.MIX
+					^SupportDir|Content/ra/v2/conquer.mix: conquer.mix
+					^SupportDir|Content/ra/v2/general.mix: general.mix # Is this one used? The FirstDecade and TUC installers are missing this!
+					^SupportDir|Content/ra/v2/interior.mix: interior.mix
+					^SupportDir|Content/ra/v2/snow.mix: snow.mix
+					^SupportDir|Content/ra/v2/sounds.mix: sounds.mix
+					^SupportDir|Content/ra/v2/russian.mix: russian.mix
+					^SupportDir|Content/ra/v2/allies.mix: allies.mix
+					^SupportDir|Content/ra/v2/temperat.mix: temperat.mix
+		# Base game music (optional):
+		ContentPackage:
+			Name: music
+			Actions:
+				ExtractMix: MAIN.MIX
+					^SupportDir|Content/ra/v2/scores.mix: scores.mix
+		# Allied campaign briefings (optional):
+		ContentPackage:
+			Name: movies-allied
+			Actions:
+				ExtractMix: MAIN.MIX
+					^SupportDir|Content/ra/v2/movies1.mix: movies1.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/movies1.mix
+					^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
+					^SupportDir|Content/ra/v2/movies/aftrmath.vqa: aftrmath.vqa
+					^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
+					^SupportDir|Content/ra/v2/movies/ally10.vqa: ally10.vqa
+					^SupportDir|Content/ra/v2/movies/ally10b.vqa: ally10b.vqa
+					^SupportDir|Content/ra/v2/movies/ally11.vqa: ally11.vqa
+					^SupportDir|Content/ra/v2/movies/ally12.vqa: ally12.vqa
+					^SupportDir|Content/ra/v2/movies/ally14.vqa: ally14.vqa
+					^SupportDir|Content/ra/v2/movies/ally2.vqa: ally2.vqa
+					^SupportDir|Content/ra/v2/movies/ally4.vqa: ally4.vqa
+					^SupportDir|Content/ra/v2/movies/ally5.vqa: ally5.vqa
+					^SupportDir|Content/ra/v2/movies/ally6.vqa: ally6.vqa
+					^SupportDir|Content/ra/v2/movies/ally8.vqa: ally8.vqa
+					^SupportDir|Content/ra/v2/movies/ally9.vqa: ally9.vqa
+					^SupportDir|Content/ra/v2/movies/allyend.vqa: allyend.vqa
+					^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
+					^SupportDir|Content/ra/v2/movies/apcescpe.vqa: apcescpe.vqa
+					^SupportDir|Content/ra/v2/movies/assess.vqa: assess.vqa
+					^SupportDir|Content/ra/v2/movies/battle.vqa: battle.vqa
+					^SupportDir|Content/ra/v2/movies/binoc.vqa: binoc.vqa
+					^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
+					^SupportDir|Content/ra/v2/movies/brdgtilt.vqa: brdgtilt.vqa
+					^SupportDir|Content/ra/v2/movies/crontest.vqa: crontest.vqa
+					^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
+					^SupportDir|Content/ra/v2/movies/destroyr.vqa: destroyr.vqa
+					^SupportDir|Content/ra/v2/movies/dud.vqa: dud.vqa
+					^SupportDir|Content/ra/v2/movies/elevator.vqa: elevator.vqa
+					^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
+					^SupportDir|Content/ra/v2/movies/frozen.vqa: frozen.vqa
+					^SupportDir|Content/ra/v2/movies/grvestne.vqa: grvestne.vqa
+					^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/ra/v2/movies/masasslt.vqa: masasslt.vqa
+					^SupportDir|Content/ra/v2/movies/mcv.vqa: mcv.vqa
+					^SupportDir|Content/ra/v2/movies/mcv_land.vqa: mcv_land.vqa
+					^SupportDir|Content/ra/v2/movies/montpass.vqa: montpass.vqa
+					^SupportDir|Content/ra/v2/movies/oildrum.vqa: oildrum.vqa
+					^SupportDir|Content/ra/v2/movies/overrun.vqa: overrun.vqa
+					^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
+					^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
+					^SupportDir|Content/ra/v2/movies/shipsink.vqa: shipsink.vqa
+					^SupportDir|Content/ra/v2/movies/shorbom1.vqa: shorbom1.vqa
+					^SupportDir|Content/ra/v2/movies/shorbom2.vqa: shorbom2.vqa
+					^SupportDir|Content/ra/v2/movies/shorbomb.vqa: shorbomb.vqa
+					^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
+					^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
+					^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
+					^SupportDir|Content/ra/v2/movies/spy.vqa: spy.vqa
+					^SupportDir|Content/ra/v2/movies/tanya1.vqa: tanya1.vqa
+					^SupportDir|Content/ra/v2/movies/tanya2.vqa: tanya2.vqa
+					^SupportDir|Content/ra/v2/movies/toofar.vqa: toofar.vqa
+					^SupportDir|Content/ra/v2/movies/trinity.vqa: trinity.vqa
+				Delete: ^SupportDir|Content/ra/v2/movies1.mix
diff --git a/mods/ra/installer/cnc95.yaml b/mods/ra/installer/cnc95.yaml
index d70756bbf9..8a3d1d78b2 100644
--- a/mods/ra/installer/cnc95.yaml
+++ b/mods/ra/installer/cnc95.yaml
@@ -3,5 +3,9 @@ cnc95: C&C Gold (GDI or Nod Disc, English)
 	IDFiles:
 		CONQUER.MIX: 833e02a09aae694659eb312d3838367f681d1b30
 	Install:
-		Copy: .
-			^SupportDir|Content/ra/v2/cnc/desert.mix: DESERT.MIX
+		# C&C Desert Tileset:
+		ContentPackage:
+			Name: cncdesert
+			Actions:
+				Copy: .
+					^SupportDir|Content/ra/v2/cnc/desert.mix: DESERT.MIX
diff --git a/mods/ra/installer/counterstrike.yaml b/mods/ra/installer/counterstrike.yaml
index 0cf670726a..48ce0ef2f2 100644
--- a/mods/ra/installer/counterstrike.yaml
+++ b/mods/ra/installer/counterstrike.yaml
@@ -4,15 +4,19 @@ counterstrike: Counterstrike Expansion Disc (English)
 		README.TXT: 0efe8087383f0b159a9633f891fb5f53c6097cd4
 		SETUP/INSTALL/CSTRIKE.RTP: fae8ba82db71574f6ecd8fb4ff4026fcb65d2adc
 	Install:
-		ExtractMix: MAIN.MIX
-			^SupportDir|Content/ra/v2/expand/scores.mix: scores.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/expand/scores.mix
-			^SupportDir|Content/ra/v2/expand/2nd_hand.aud: 2nd_hand.aud
-			^SupportDir|Content/ra/v2/expand/araziod.aud: araziod.aud
-			^SupportDir|Content/ra/v2/expand/backstab.aud: backstab.aud
-			^SupportDir|Content/ra/v2/expand/chaos2.aud: chaos2.aud
-			^SupportDir|Content/ra/v2/expand/shut_it.aud: shut_it.aud
-			^SupportDir|Content/ra/v2/expand/twinmix1.aud: twinmix1.aud
-			^SupportDir|Content/ra/v2/expand/under3.aud: under3.aud
-			^SupportDir|Content/ra/v2/expand/vr2.aud: vr2.aud
-		Delete: ^SupportDir|Content/ra/v2/expand/scores.mix
+		# Counterstrike music (optional):
+		ContentPackage:
+			Name: music-counterstrike
+			Actions:
+				ExtractMix: MAIN.MIX
+					^SupportDir|Content/ra/v2/expand/scores.mix: scores.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/expand/scores.mix
+					^SupportDir|Content/ra/v2/expand/2nd_hand.aud: 2nd_hand.aud
+					^SupportDir|Content/ra/v2/expand/araziod.aud: araziod.aud
+					^SupportDir|Content/ra/v2/expand/backstab.aud: backstab.aud
+					^SupportDir|Content/ra/v2/expand/chaos2.aud: chaos2.aud
+					^SupportDir|Content/ra/v2/expand/shut_it.aud: shut_it.aud
+					^SupportDir|Content/ra/v2/expand/twinmix1.aud: twinmix1.aud
+					^SupportDir|Content/ra/v2/expand/under3.aud: under3.aud
+					^SupportDir|Content/ra/v2/expand/vr2.aud: vr2.aud
+				Delete: ^SupportDir|Content/ra/v2/expand/scores.mix
diff --git a/mods/ra/installer/firstdecade.yaml b/mods/ra/installer/firstdecade.yaml
index c812c943cc..d83e077e38 100644
--- a/mods/ra/installer/firstdecade.yaml
+++ b/mods/ra/installer/firstdecade.yaml
@@ -3,170 +3,198 @@ tfd: C&C The First Decade (English)
 	IDFiles:
 		data1.hdr: bef3a08c3fc1b1caf28ca0dbb97c1f900005930e
 		data1.cab: 12ad6113a6890a1b4d5651a75378c963eaf513b9
+	# The First Decade doesn't include the Aftermath and Counterstrike music because someone in EA forgot to add them.
+	# Unless a patch is installed, but we probably don't want to deal with whether or not it is.
 	Install:
-		ExtractIscab: data1.hdr
-			Volumes:
-				2: data2.cab
-				3: data3.cab
-				4: data4.cab
-				5: data5.cab
-			Extract:
-				^SupportDir|Content/ra/v2/main.mix: Red Alert\\MAIN.MIX
-				^SupportDir|Content/ra/v2/redalert.mix: Red Alert\\REDALERT.MIX
-				^SupportDir|Content/ra/v2/expand/hires1.mix: Red Alert\\HIRES1.MIX
-				^SupportDir|Content/ra/v2/expand/lores1.mix: Red Alert\\LORES1.MIX
-				^SupportDir|Content/ra/v2/expand/expand2.mix: Red Alert\\EXPAND2.MIX
-				^SupportDir|Content/ra/v2/cnc/desert.mix: CnC\\DESERT.MIX
-		ExtractMix: ^SupportDir|Content/ra/v2/redalert.mix
-			^SupportDir|Content/ra/v2/hires.mix: hires.mix
-			^SupportDir|Content/ra/v2/local.mix: local.mix
-			^SupportDir|Content/ra/v2/lores.mix: lores.mix
-			^SupportDir|Content/ra/v2/speech.mix: speech.mix
-		Delete: ^SupportDir|Content/ra/v2/redalert.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/main.mix
-			^SupportDir|Content/ra/v2/interior.mix: interior.mix
-			^SupportDir|Content/ra/v2/conquer.mix: conquer.mix
-			^SupportDir|Content/ra/v2/allies.mix: allies.mix
-			^SupportDir|Content/ra/v2/temperat.mix: temperat.mix
-			^SupportDir|Content/ra/v2/sounds.mix: sounds.mix
-			^SupportDir|Content/ra/v2/snow.mix: snow.mix
-			^SupportDir|Content/ra/v2/scores.mix: scores.mix
-			^SupportDir|Content/ra/v2/russian.mix: russian.mix
-			^SupportDir|Content/ra/v2/movies1.mix: movies1.mix
-			^SupportDir|Content/ra/v2/movies2.mix: movies2.mix
-		Delete: ^SupportDir|Content/ra/v2/main.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/movies1.mix
-			^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
-			^SupportDir|Content/ra/v2/movies/aftrmath.vqa: aftrmath.vqa
-			^SupportDir|Content/ra/v2/movies/ally12.vqa: ally12.vqa
-			^SupportDir|Content/ra/v2/movies/ally14.vqa: ally14.vqa
-			^SupportDir|Content/ra/v2/movies/allyend.vqa: allyend.vqa
-			^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
-			^SupportDir|Content/ra/v2/movies/apcescpe.vqa: apcescpe.vqa
-			^SupportDir|Content/ra/v2/movies/assess.vqa: assess.vqa
-			^SupportDir|Content/ra/v2/movies/battle.vqa: battle.vqa
-			^SupportDir|Content/ra/v2/movies/binoc.vqa: binoc.vqa
-			^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
-			^SupportDir|Content/ra/v2/movies/brdgtilt.vqa: brdgtilt.vqa
-			^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
-			^SupportDir|Content/ra/v2/movies/crontest.vqa: crontest.vqa
-			^SupportDir|Content/ra/v2/movies/destroyr.vqa: destroyr.vqa
-			^SupportDir|Content/ra/v2/movies/dud.vqa: dud.vqa
-			^SupportDir|Content/ra/v2/movies/elevator.vqa: elevator.vqa
-			^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
-			^SupportDir|Content/ra/v2/movies/frozen.vqa: frozen.vqa
-			^SupportDir|Content/ra/v2/movies/grvestne.vqa: grvestne.vqa
-			^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/ra/v2/movies/masasslt.vqa: masasslt.vqa
-			^SupportDir|Content/ra/v2/movies/mcv.vqa: mcv.vqa
-			^SupportDir|Content/ra/v2/movies/mcv_land.vqa: mcv_land.vqa
-			^SupportDir|Content/ra/v2/movies/montpass.vqa: montpass.vqa
-			^SupportDir|Content/ra/v2/movies/oildrum.vqa: oildrum.vqa
-			^SupportDir|Content/ra/v2/movies/overrun.vqa: overrun.vqa
-			^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
-			^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
-			^SupportDir|Content/ra/v2/movies/shipsink.vqa: shipsink.vqa
-			^SupportDir|Content/ra/v2/movies/shorbom1.vqa: shorbom1.vqa
-			^SupportDir|Content/ra/v2/movies/shorbom2.vqa: shorbom2.vqa
-			^SupportDir|Content/ra/v2/movies/shorbomb.vqa: shorbomb.vqa
-			^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
-			^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
-			^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
-			^SupportDir|Content/ra/v2/movies/spy.vqa: spy.vqa
-			^SupportDir|Content/ra/v2/movies/tanya1.vqa: tanya1.vqa
-			^SupportDir|Content/ra/v2/movies/tanya2.vqa: tanya2.vqa
-			^SupportDir|Content/ra/v2/movies/toofar.vqa: toofar.vqa
-			^SupportDir|Content/ra/v2/movies/trinity.vqa: trinity.vqa
-			^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
-			^SupportDir|Content/ra/v2/movies/ally2.vqa: ally2.vqa
-			^SupportDir|Content/ra/v2/movies/ally4.vqa: ally4.vqa
-			^SupportDir|Content/ra/v2/movies/ally5.vqa: ally5.vqa
-			^SupportDir|Content/ra/v2/movies/ally6.vqa: ally6.vqa
-			^SupportDir|Content/ra/v2/movies/ally8.vqa: ally8.vqa
-			^SupportDir|Content/ra/v2/movies/ally9.vqa: ally9.vqa
-			^SupportDir|Content/ra/v2/movies/ally10.vqa: ally10.vqa
-			^SupportDir|Content/ra/v2/movies/ally10b.vqa: ally10b.vqa
-			^SupportDir|Content/ra/v2/movies/ally11.vqa: ally11.vqa
-		Delete: ^SupportDir|Content/ra/v2/movies1.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/movies2.mix
-			^SupportDir|Content/ra/v2/movies/double.vqa: double.vqa
-			^SupportDir|Content/ra/v2/movies/dpthchrg.vqa: dpthchrg.vqa
-			^SupportDir|Content/ra/v2/movies/execute.vqa: execute.vqa
-			^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
-			^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/ra/v2/movies/mcvbrdge.vqa: mcvbrdge.vqa
-			^SupportDir|Content/ra/v2/movies/mig.vqa: mig.vqa
-			^SupportDir|Content/ra/v2/movies/movingin.vqa: movingin.vqa
-			^SupportDir|Content/ra/v2/movies/mtnkfact.vqa: mtnkfact.vqa
-			^SupportDir|Content/ra/v2/movies/nukestok.vqa: nukestok.vqa
-			^SupportDir|Content/ra/v2/movies/onthprwl.vqa: onthprwl.vqa
-			^SupportDir|Content/ra/v2/movies/periscop.vqa: periscop.vqa
-			^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
-			^SupportDir|Content/ra/v2/movies/radrraid.vqa: radrraid.vqa
-			^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
-			^SupportDir|Content/ra/v2/movies/search.vqa: search.vqa
-			^SupportDir|Content/ra/v2/movies/sfrozen.vqa: sfrozen.vqa
-			^SupportDir|Content/ra/v2/movies/sitduck.vqa: sitduck.vqa
-			^SupportDir|Content/ra/v2/movies/slntsrvc.vqa: slntsrvc.vqa
-			^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
-			^SupportDir|Content/ra/v2/movies/snstrafe.vqa: snstrafe.vqa
-			^SupportDir|Content/ra/v2/movies/sovbatl.vqa: sovbatl.vqa
-			^SupportDir|Content/ra/v2/movies/sovcemet.vqa: sovcemet.vqa
-			^SupportDir|Content/ra/v2/movies/sovfinal.vqa: sovfinal.vqa
-			^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
-			^SupportDir|Content/ra/v2/movies/soviet2.vqa: soviet2.vqa
-			^SupportDir|Content/ra/v2/movies/soviet3.vqa: soviet3.vqa
-			^SupportDir|Content/ra/v2/movies/soviet4.vqa: soviet4.vqa
-			^SupportDir|Content/ra/v2/movies/soviet5.vqa: soviet5.vqa
-			^SupportDir|Content/ra/v2/movies/soviet6.vqa: soviet6.vqa
-			^SupportDir|Content/ra/v2/movies/soviet7.vqa: soviet7.vqa
-			^SupportDir|Content/ra/v2/movies/soviet8.vqa: soviet8.vqa
-			^SupportDir|Content/ra/v2/movies/soviet9.vqa: soviet9.vqa
-			^SupportDir|Content/ra/v2/movies/soviet10.vqa: soviet10.vqa
-			^SupportDir|Content/ra/v2/movies/soviet11.vqa: soviet11.vqa
-			^SupportDir|Content/ra/v2/movies/soviet12.vqa: soviet12.vqa
-			^SupportDir|Content/ra/v2/movies/soviet13.vqa: soviet13.vqa
-			^SupportDir|Content/ra/v2/movies/soviet14.vqa: soviet14.vqa
-			^SupportDir|Content/ra/v2/movies/sovmcv.vqa: sovmcv.vqa
-			^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
-			^SupportDir|Content/ra/v2/movies/spotter.vqa: spotter.vqa
-			^SupportDir|Content/ra/v2/movies/strafe.vqa: strafe.vqa
-			^SupportDir|Content/ra/v2/movies/take_off.vqa: take_off.vqa
-			^SupportDir|Content/ra/v2/movies/tesla.vqa: tesla.vqa
-			^SupportDir|Content/ra/v2/movies/v2rocket.vqa: v2rocket.vqa
-			^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
-			^SupportDir|Content/ra/v2/movies/airfield.vqa: airfield.vqa
-			^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
-			^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
-			^SupportDir|Content/ra/v2/movies/averted.vqa: averted.vqa
-			^SupportDir|Content/ra/v2/movies/beachead.vqa: beachead.vqa
-			^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
-			^SupportDir|Content/ra/v2/movies/bombrun.vqa: bombrun.vqa
-			^SupportDir|Content/ra/v2/movies/countdwn.vqa: countdwn.vqa
-			^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
-		Delete: ^SupportDir|Content/ra/v2/movies2.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/sounds.mix
-			^SupportDir|Content/ra/v2/expand/chrotnk1.aud: chrotnk1.aud
-			^SupportDir|Content/ra/v2/expand/fixit1.aud: fixit1.aud
-			^SupportDir|Content/ra/v2/expand/jburn1.aud: jburn1.aud
-			^SupportDir|Content/ra/v2/expand/jchrge1.aud: jchrge1.aud
-			^SupportDir|Content/ra/v2/expand/jcrisp1.aud: jcrisp1.aud
-			^SupportDir|Content/ra/v2/expand/jdance1.aud: jdance1.aud
-			^SupportDir|Content/ra/v2/expand/jjuice1.aud: jjuice1.aud
-			^SupportDir|Content/ra/v2/expand/jjump1.aud: jjump1.aud
-			^SupportDir|Content/ra/v2/expand/jlight1.aud: jlight1.aud
-			^SupportDir|Content/ra/v2/expand/jpower1.aud: jpower1.aud
-			^SupportDir|Content/ra/v2/expand/jshock1.aud: jshock1.aud
-			^SupportDir|Content/ra/v2/expand/jyes1.aud: jyes1.aud
-			^SupportDir|Content/ra/v2/expand/madchrg2.aud: madchrg2.aud
-			^SupportDir|Content/ra/v2/expand/madexplo.aud: madexplo.aud
-			^SupportDir|Content/ra/v2/expand/mboss1.aud: mboss1.aud
-			^SupportDir|Content/ra/v2/expand/mhear1.aud: mhear1.aud
-			^SupportDir|Content/ra/v2/expand/mhotdig1.aud: mhotdig1.aud
-			^SupportDir|Content/ra/v2/expand/mhowdy1.aud: mhowdy1.aud
-			^SupportDir|Content/ra/v2/expand/mhuh1.aud: mhuh1.aud
-			^SupportDir|Content/ra/v2/expand/mlaff1.aud: mlaff1.aud
-			^SupportDir|Content/ra/v2/expand/mrise1.aud: mrise1.aud
-			^SupportDir|Content/ra/v2/expand/mwrench1.aud: mwrench1.aud
-			^SupportDir|Content/ra/v2/expand/myeehaw1.aud: myeehaw1.aud
-			^SupportDir|Content/ra/v2/expand/myes1.aud: myes1.aud
+		BeforeInstall:
+			# This one step handles 3 packages - base (partially), aftermathbase (partially) and cncdesert.
+			ExtractIscab: data1.hdr
+				Volumes:
+					2: data2.cab
+					3: data3.cab
+					4: data4.cab
+					5: data5.cab
+				Extract:
+					^SupportDir|Content/ra/v2/main.mix: Red Alert\\MAIN.MIX
+					^SupportDir|Content/ra/v2/redalert.mix: Red Alert\\REDALERT.MIX
+					^SupportDir|Content/ra/v2/expand/hires1.mix: Red Alert\\HIRES1.MIX
+					^SupportDir|Content/ra/v2/expand/lores1.mix: Red Alert\\LORES1.MIX
+					^SupportDir|Content/ra/v2/expand/expand2.mix: Red Alert\\EXPAND2.MIX
+					^SupportDir|Content/ra/v2/cnc/desert.mix: CnC\\DESERT.MIX
+		# Base game files:
+		ContentPackage:
+			Name: base
+			Actions:
+				ExtractMix: ^SupportDir|Content/ra/v2/redalert.mix
+					^SupportDir|Content/ra/v2/hires.mix: hires.mix
+					^SupportDir|Content/ra/v2/local.mix: local.mix
+					^SupportDir|Content/ra/v2/lores.mix: lores.mix
+					^SupportDir|Content/ra/v2/speech.mix: speech.mix
+				Delete: ^SupportDir|Content/ra/v2/redalert.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/main.mix
+					^SupportDir|Content/ra/v2/interior.mix: interior.mix
+					^SupportDir|Content/ra/v2/conquer.mix: conquer.mix
+					^SupportDir|Content/ra/v2/allies.mix: allies.mix
+					^SupportDir|Content/ra/v2/temperat.mix: temperat.mix
+					^SupportDir|Content/ra/v2/sounds.mix: sounds.mix
+					^SupportDir|Content/ra/v2/snow.mix: snow.mix
+					^SupportDir|Content/ra/v2/russian.mix: russian.mix
+		# Base game music (optional):
+		ContentPackage:
+			Name: music
+			Actions:
+				ExtractMix: ^SupportDir|Content/ra/v2/main.mix
+					^SupportDir|Content/ra/v2/scores.mix: scores.mix
+		# Allied campaign briefings (optional):
+		ContentPackage:
+			Name: movies-allied
+			Actions:
+				ExtractMix: ^SupportDir|Content/ra/v2/main.mix
+					^SupportDir|Content/ra/v2/movies1.mix: movies1.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/movies1.mix
+					^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
+					^SupportDir|Content/ra/v2/movies/aftrmath.vqa: aftrmath.vqa
+					^SupportDir|Content/ra/v2/movies/ally12.vqa: ally12.vqa
+					^SupportDir|Content/ra/v2/movies/ally14.vqa: ally14.vqa
+					^SupportDir|Content/ra/v2/movies/allyend.vqa: allyend.vqa
+					^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
+					^SupportDir|Content/ra/v2/movies/apcescpe.vqa: apcescpe.vqa
+					^SupportDir|Content/ra/v2/movies/assess.vqa: assess.vqa
+					^SupportDir|Content/ra/v2/movies/battle.vqa: battle.vqa
+					^SupportDir|Content/ra/v2/movies/binoc.vqa: binoc.vqa
+					^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
+					^SupportDir|Content/ra/v2/movies/brdgtilt.vqa: brdgtilt.vqa
+					^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
+					^SupportDir|Content/ra/v2/movies/crontest.vqa: crontest.vqa
+					^SupportDir|Content/ra/v2/movies/destroyr.vqa: destroyr.vqa
+					^SupportDir|Content/ra/v2/movies/dud.vqa: dud.vqa
+					^SupportDir|Content/ra/v2/movies/elevator.vqa: elevator.vqa
+					^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
+					^SupportDir|Content/ra/v2/movies/frozen.vqa: frozen.vqa
+					^SupportDir|Content/ra/v2/movies/grvestne.vqa: grvestne.vqa
+					^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/ra/v2/movies/masasslt.vqa: masasslt.vqa
+					^SupportDir|Content/ra/v2/movies/mcv.vqa: mcv.vqa
+					^SupportDir|Content/ra/v2/movies/mcv_land.vqa: mcv_land.vqa
+					^SupportDir|Content/ra/v2/movies/montpass.vqa: montpass.vqa
+					^SupportDir|Content/ra/v2/movies/oildrum.vqa: oildrum.vqa
+					^SupportDir|Content/ra/v2/movies/overrun.vqa: overrun.vqa
+					^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
+					^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
+					^SupportDir|Content/ra/v2/movies/shipsink.vqa: shipsink.vqa
+					^SupportDir|Content/ra/v2/movies/shorbom1.vqa: shorbom1.vqa
+					^SupportDir|Content/ra/v2/movies/shorbom2.vqa: shorbom2.vqa
+					^SupportDir|Content/ra/v2/movies/shorbomb.vqa: shorbomb.vqa
+					^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
+					^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
+					^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
+					^SupportDir|Content/ra/v2/movies/spy.vqa: spy.vqa
+					^SupportDir|Content/ra/v2/movies/tanya1.vqa: tanya1.vqa
+					^SupportDir|Content/ra/v2/movies/tanya2.vqa: tanya2.vqa
+					^SupportDir|Content/ra/v2/movies/toofar.vqa: toofar.vqa
+					^SupportDir|Content/ra/v2/movies/trinity.vqa: trinity.vqa
+					^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
+					^SupportDir|Content/ra/v2/movies/ally2.vqa: ally2.vqa
+					^SupportDir|Content/ra/v2/movies/ally4.vqa: ally4.vqa
+					^SupportDir|Content/ra/v2/movies/ally5.vqa: ally5.vqa
+					^SupportDir|Content/ra/v2/movies/ally6.vqa: ally6.vqa
+					^SupportDir|Content/ra/v2/movies/ally8.vqa: ally8.vqa
+					^SupportDir|Content/ra/v2/movies/ally9.vqa: ally9.vqa
+					^SupportDir|Content/ra/v2/movies/ally10.vqa: ally10.vqa
+					^SupportDir|Content/ra/v2/movies/ally10b.vqa: ally10b.vqa
+					^SupportDir|Content/ra/v2/movies/ally11.vqa: ally11.vqa
+				Delete: ^SupportDir|Content/ra/v2/movies1.mix
+		# Soviet campaign briefings (optional):
+		ContentPackage:
+			Name: movies-soviet
+			Actions:
+				ExtractMix: ^SupportDir|Content/ra/v2/main.mix
+					^SupportDir|Content/ra/v2/movies2.mix: movies2.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/movies2.mix
+					^SupportDir|Content/ra/v2/movies/double.vqa: double.vqa
+					^SupportDir|Content/ra/v2/movies/dpthchrg.vqa: dpthchrg.vqa
+					^SupportDir|Content/ra/v2/movies/execute.vqa: execute.vqa
+					^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
+					^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/ra/v2/movies/mcvbrdge.vqa: mcvbrdge.vqa
+					^SupportDir|Content/ra/v2/movies/mig.vqa: mig.vqa
+					^SupportDir|Content/ra/v2/movies/movingin.vqa: movingin.vqa
+					^SupportDir|Content/ra/v2/movies/mtnkfact.vqa: mtnkfact.vqa
+					^SupportDir|Content/ra/v2/movies/nukestok.vqa: nukestok.vqa
+					^SupportDir|Content/ra/v2/movies/onthprwl.vqa: onthprwl.vqa
+					^SupportDir|Content/ra/v2/movies/periscop.vqa: periscop.vqa
+					^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
+					^SupportDir|Content/ra/v2/movies/radrraid.vqa: radrraid.vqa
+					^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
+					^SupportDir|Content/ra/v2/movies/search.vqa: search.vqa
+					^SupportDir|Content/ra/v2/movies/sfrozen.vqa: sfrozen.vqa
+					^SupportDir|Content/ra/v2/movies/sitduck.vqa: sitduck.vqa
+					^SupportDir|Content/ra/v2/movies/slntsrvc.vqa: slntsrvc.vqa
+					^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
+					^SupportDir|Content/ra/v2/movies/snstrafe.vqa: snstrafe.vqa
+					^SupportDir|Content/ra/v2/movies/sovbatl.vqa: sovbatl.vqa
+					^SupportDir|Content/ra/v2/movies/sovcemet.vqa: sovcemet.vqa
+					^SupportDir|Content/ra/v2/movies/sovfinal.vqa: sovfinal.vqa
+					^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
+					^SupportDir|Content/ra/v2/movies/soviet2.vqa: soviet2.vqa
+					^SupportDir|Content/ra/v2/movies/soviet3.vqa: soviet3.vqa
+					^SupportDir|Content/ra/v2/movies/soviet4.vqa: soviet4.vqa
+					^SupportDir|Content/ra/v2/movies/soviet5.vqa: soviet5.vqa
+					^SupportDir|Content/ra/v2/movies/soviet6.vqa: soviet6.vqa
+					^SupportDir|Content/ra/v2/movies/soviet7.vqa: soviet7.vqa
+					^SupportDir|Content/ra/v2/movies/soviet8.vqa: soviet8.vqa
+					^SupportDir|Content/ra/v2/movies/soviet9.vqa: soviet9.vqa
+					^SupportDir|Content/ra/v2/movies/soviet10.vqa: soviet10.vqa
+					^SupportDir|Content/ra/v2/movies/soviet11.vqa: soviet11.vqa
+					^SupportDir|Content/ra/v2/movies/soviet12.vqa: soviet12.vqa
+					^SupportDir|Content/ra/v2/movies/soviet13.vqa: soviet13.vqa
+					^SupportDir|Content/ra/v2/movies/soviet14.vqa: soviet14.vqa
+					^SupportDir|Content/ra/v2/movies/sovmcv.vqa: sovmcv.vqa
+					^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
+					^SupportDir|Content/ra/v2/movies/spotter.vqa: spotter.vqa
+					^SupportDir|Content/ra/v2/movies/strafe.vqa: strafe.vqa
+					^SupportDir|Content/ra/v2/movies/take_off.vqa: take_off.vqa
+					^SupportDir|Content/ra/v2/movies/tesla.vqa: tesla.vqa
+					^SupportDir|Content/ra/v2/movies/v2rocket.vqa: v2rocket.vqa
+					^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
+					^SupportDir|Content/ra/v2/movies/airfield.vqa: airfield.vqa
+					^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
+					^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
+					^SupportDir|Content/ra/v2/movies/averted.vqa: averted.vqa
+					^SupportDir|Content/ra/v2/movies/beachead.vqa: beachead.vqa
+					^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
+					^SupportDir|Content/ra/v2/movies/bombrun.vqa: bombrun.vqa
+					^SupportDir|Content/ra/v2/movies/countdwn.vqa: countdwn.vqa
+					^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
+				Delete: ^SupportDir|Content/ra/v2/movies2.mix
+		# Aftermath expansion files:
+		ContentPackage:
+			Name: aftermathbase
+			Actions:
+				ExtractMix: ^SupportDir|Content/ra/v2/sounds.mix
+					^SupportDir|Content/ra/v2/expand/chrotnk1.aud: chrotnk1.aud
+					^SupportDir|Content/ra/v2/expand/fixit1.aud: fixit1.aud
+					^SupportDir|Content/ra/v2/expand/jburn1.aud: jburn1.aud
+					^SupportDir|Content/ra/v2/expand/jchrge1.aud: jchrge1.aud
+					^SupportDir|Content/ra/v2/expand/jcrisp1.aud: jcrisp1.aud
+					^SupportDir|Content/ra/v2/expand/jdance1.aud: jdance1.aud
+					^SupportDir|Content/ra/v2/expand/jjuice1.aud: jjuice1.aud
+					^SupportDir|Content/ra/v2/expand/jjump1.aud: jjump1.aud
+					^SupportDir|Content/ra/v2/expand/jlight1.aud: jlight1.aud
+					^SupportDir|Content/ra/v2/expand/jpower1.aud: jpower1.aud
+					^SupportDir|Content/ra/v2/expand/jshock1.aud: jshock1.aud
+					^SupportDir|Content/ra/v2/expand/jyes1.aud: jyes1.aud
+					^SupportDir|Content/ra/v2/expand/madchrg2.aud: madchrg2.aud
+					^SupportDir|Content/ra/v2/expand/madexplo.aud: madexplo.aud
+					^SupportDir|Content/ra/v2/expand/mboss1.aud: mboss1.aud
+					^SupportDir|Content/ra/v2/expand/mhear1.aud: mhear1.aud
+					^SupportDir|Content/ra/v2/expand/mhotdig1.aud: mhotdig1.aud
+					^SupportDir|Content/ra/v2/expand/mhowdy1.aud: mhowdy1.aud
+					^SupportDir|Content/ra/v2/expand/mhuh1.aud: mhuh1.aud
+					^SupportDir|Content/ra/v2/expand/mlaff1.aud: mlaff1.aud
+					^SupportDir|Content/ra/v2/expand/mrise1.aud: mrise1.aud
+					^SupportDir|Content/ra/v2/expand/mwrench1.aud: mwrench1.aud
+					^SupportDir|Content/ra/v2/expand/myeehaw1.aud: myeehaw1.aud
+					^SupportDir|Content/ra/v2/expand/myes1.aud: myes1.aud
+		AfterInstall:
+			Delete: ^SupportDir|Content/ra/v2/main.mix
diff --git a/mods/ra/installer/origin.yaml b/mods/ra/installer/origin.yaml
index 413e88eb7d..f55b393ed8 100644
--- a/mods/ra/installer/origin.yaml
+++ b/mods/ra/installer/origin.yaml
@@ -6,178 +6,211 @@ ra-origin: C&C The Ultimate Collection (Origin version, English)
 	IDFiles:
 		REDALERT.MIX: 0e58f4b54f44f6cd29fecf8cf379d33cf2d4caef
 	Install:
-		Copy: .
-			^SupportDir|Content/ra/v2/expand/2nd_hand.aud: 2nd_hand.aud
-			^SupportDir|Content/ra/v2/expand/araziod.aud: araziod.aud
-			^SupportDir|Content/ra/v2/expand/await.aud: await.aud
-			^SupportDir|Content/ra/v2/expand/backstab.aud: backstab.aud
-			^SupportDir|Content/ra/v2/expand/bog.aud: bog.aud
-			^SupportDir|Content/ra/v2/expand/chaos2.aud: chaos2.aud
-			^SupportDir|Content/ra/v2/expand/float_v2.aud: float_v2.aud
-			^SupportDir|Content/ra/v2/expand/gloom.aud: gloom.aud
-			^SupportDir|Content/ra/v2/expand/grndwire.aud: grndwire.aud
-			^SupportDir|Content/ra/v2/expand/rpt.aud: rpt.aud
-			^SupportDir|Content/ra/v2/expand/search.aud: search.aud
-			^SupportDir|Content/ra/v2/expand/shut_it.aud: shut_it.aud
-			^SupportDir|Content/ra/v2/expand/traction.aud: traction.aud
-			^SupportDir|Content/ra/v2/expand/twinmix1.aud: twinmix1.aud
-			^SupportDir|Content/ra/v2/expand/under3.aud: under3.aud
-			^SupportDir|Content/ra/v2/expand/vr2.aud: vr2.aud
-			^SupportDir|Content/ra/v2/expand/wastelnd.aud: wastelnd.aud
-			^SupportDir|Content/ra/v2/expand/expand2.mix: EXPAND2.MIX
-			^SupportDir|Content/ra/v2/expand/hires1.mix: HIRES1.MIX
-			^SupportDir|Content/ra/v2/expand/lores1.mix: LORES1.MIX
-		ExtractMix: REDALERT.MIX
-			^SupportDir|Content/ra/v2/hires.mix: hires.mix
-			^SupportDir|Content/ra/v2/local.mix: local.mix
-			^SupportDir|Content/ra/v2/lores.mix: lores.mix
-			^SupportDir|Content/ra/v2/speech.mix: speech.mix
-		ExtractMix: MAIN.MIX
-			^SupportDir|Content/ra/v2/interior.mix: interior.mix
-			^SupportDir|Content/ra/v2/conquer.mix: conquer.mix
-			^SupportDir|Content/ra/v2/allies.mix: allies.mix
-			^SupportDir|Content/ra/v2/temperat.mix: temperat.mix
-			^SupportDir|Content/ra/v2/sounds.mix: sounds.mix
-			^SupportDir|Content/ra/v2/snow.mix: snow.mix
-			^SupportDir|Content/ra/v2/scores.mix: scores.mix
-			^SupportDir|Content/ra/v2/russian.mix: russian.mix
-			^SupportDir|Content/ra/v2/movies1.mix: movies1.mix
-			^SupportDir|Content/ra/v2/movies2.mix: movies2.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/movies1.mix
-			^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
-			^SupportDir|Content/ra/v2/movies/aftrmath.vqa: aftrmath.vqa
-			^SupportDir|Content/ra/v2/movies/ally12.vqa: ally12.vqa
-			^SupportDir|Content/ra/v2/movies/ally14.vqa: ally14.vqa
-			^SupportDir|Content/ra/v2/movies/allyend.vqa: allyend.vqa
-			^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
-			^SupportDir|Content/ra/v2/movies/apcescpe.vqa: apcescpe.vqa
-			^SupportDir|Content/ra/v2/movies/assess.vqa: assess.vqa
-			^SupportDir|Content/ra/v2/movies/battle.vqa: battle.vqa
-			^SupportDir|Content/ra/v2/movies/binoc.vqa: binoc.vqa
-			^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
-			^SupportDir|Content/ra/v2/movies/brdgtilt.vqa: brdgtilt.vqa
-			^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
-			^SupportDir|Content/ra/v2/movies/crontest.vqa: crontest.vqa
-			^SupportDir|Content/ra/v2/movies/destroyr.vqa: destroyr.vqa
-			^SupportDir|Content/ra/v2/movies/dud.vqa: dud.vqa
-			^SupportDir|Content/ra/v2/movies/elevator.vqa: elevator.vqa
-			^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
-			^SupportDir|Content/ra/v2/movies/frozen.vqa: frozen.vqa
-			^SupportDir|Content/ra/v2/movies/grvestne.vqa: grvestne.vqa
-			^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/ra/v2/movies/masasslt.vqa: masasslt.vqa
-			^SupportDir|Content/ra/v2/movies/mcv.vqa: mcv.vqa
-			^SupportDir|Content/ra/v2/movies/mcv_land.vqa: mcv_land.vqa
-			^SupportDir|Content/ra/v2/movies/montpass.vqa: montpass.vqa
-			^SupportDir|Content/ra/v2/movies/oildrum.vqa: oildrum.vqa
-			^SupportDir|Content/ra/v2/movies/overrun.vqa: overrun.vqa
-			^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
-			^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
-			^SupportDir|Content/ra/v2/movies/shipsink.vqa: shipsink.vqa
-			^SupportDir|Content/ra/v2/movies/shorbom1.vqa: shorbom1.vqa
-			^SupportDir|Content/ra/v2/movies/shorbom2.vqa: shorbom2.vqa
-			^SupportDir|Content/ra/v2/movies/shorbomb.vqa: shorbomb.vqa
-			^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
-			^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
-			^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
-			^SupportDir|Content/ra/v2/movies/spy.vqa: spy.vqa
-			^SupportDir|Content/ra/v2/movies/tanya1.vqa: tanya1.vqa
-			^SupportDir|Content/ra/v2/movies/tanya2.vqa: tanya2.vqa
-			^SupportDir|Content/ra/v2/movies/toofar.vqa: toofar.vqa
-			^SupportDir|Content/ra/v2/movies/trinity.vqa: trinity.vqa
-			^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
-			^SupportDir|Content/ra/v2/movies/ally2.vqa: ally2.vqa
-			^SupportDir|Content/ra/v2/movies/ally4.vqa: ally4.vqa
-			^SupportDir|Content/ra/v2/movies/ally5.vqa: ally5.vqa
-			^SupportDir|Content/ra/v2/movies/ally6.vqa: ally6.vqa
-			^SupportDir|Content/ra/v2/movies/ally8.vqa: ally8.vqa
-			^SupportDir|Content/ra/v2/movies/ally9.vqa: ally9.vqa
-			^SupportDir|Content/ra/v2/movies/ally10.vqa: ally10.vqa
-			^SupportDir|Content/ra/v2/movies/ally10b.vqa: ally10b.vqa
-			^SupportDir|Content/ra/v2/movies/ally11.vqa: ally11.vqa
-		Delete: ^SupportDir|Content/ra/v2/movies1.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/movies2.mix
-			^SupportDir|Content/ra/v2/movies/double.vqa: double.vqa
-			^SupportDir|Content/ra/v2/movies/dpthchrg.vqa: dpthchrg.vqa
-			^SupportDir|Content/ra/v2/movies/execute.vqa: execute.vqa
-			^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
-			^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/ra/v2/movies/mcvbrdge.vqa: mcvbrdge.vqa
-			^SupportDir|Content/ra/v2/movies/mig.vqa: mig.vqa
-			^SupportDir|Content/ra/v2/movies/movingin.vqa: movingin.vqa
-			^SupportDir|Content/ra/v2/movies/mtnkfact.vqa: mtnkfact.vqa
-			^SupportDir|Content/ra/v2/movies/nukestok.vqa: nukestok.vqa
-			^SupportDir|Content/ra/v2/movies/onthprwl.vqa: onthprwl.vqa
-			^SupportDir|Content/ra/v2/movies/periscop.vqa: periscop.vqa
-			^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
-			^SupportDir|Content/ra/v2/movies/radrraid.vqa: radrraid.vqa
-			^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
-			^SupportDir|Content/ra/v2/movies/search.vqa: search.vqa
-			^SupportDir|Content/ra/v2/movies/sfrozen.vqa: sfrozen.vqa
-			^SupportDir|Content/ra/v2/movies/sitduck.vqa: sitduck.vqa
-			^SupportDir|Content/ra/v2/movies/slntsrvc.vqa: slntsrvc.vqa
-			^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
-			^SupportDir|Content/ra/v2/movies/snstrafe.vqa: snstrafe.vqa
-			^SupportDir|Content/ra/v2/movies/sovbatl.vqa: sovbatl.vqa
-			^SupportDir|Content/ra/v2/movies/sovcemet.vqa: sovcemet.vqa
-			^SupportDir|Content/ra/v2/movies/sovfinal.vqa: sovfinal.vqa
-			^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
-			^SupportDir|Content/ra/v2/movies/soviet2.vqa: soviet2.vqa
-			^SupportDir|Content/ra/v2/movies/soviet3.vqa: soviet3.vqa
-			^SupportDir|Content/ra/v2/movies/soviet4.vqa: soviet4.vqa
-			^SupportDir|Content/ra/v2/movies/soviet5.vqa: soviet5.vqa
-			^SupportDir|Content/ra/v2/movies/soviet6.vqa: soviet6.vqa
-			^SupportDir|Content/ra/v2/movies/soviet7.vqa: soviet7.vqa
-			^SupportDir|Content/ra/v2/movies/soviet8.vqa: soviet8.vqa
-			^SupportDir|Content/ra/v2/movies/soviet9.vqa: soviet9.vqa
-			^SupportDir|Content/ra/v2/movies/soviet10.vqa: soviet10.vqa
-			^SupportDir|Content/ra/v2/movies/soviet11.vqa: soviet11.vqa
-			^SupportDir|Content/ra/v2/movies/soviet12.vqa: soviet12.vqa
-			^SupportDir|Content/ra/v2/movies/soviet13.vqa: soviet13.vqa
-			^SupportDir|Content/ra/v2/movies/soviet14.vqa: soviet14.vqa
-			^SupportDir|Content/ra/v2/movies/sovmcv.vqa: sovmcv.vqa
-			^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
-			^SupportDir|Content/ra/v2/movies/spotter.vqa: spotter.vqa
-			^SupportDir|Content/ra/v2/movies/strafe.vqa: strafe.vqa
-			^SupportDir|Content/ra/v2/movies/take_off.vqa: take_off.vqa
-			^SupportDir|Content/ra/v2/movies/tesla.vqa: tesla.vqa
-			^SupportDir|Content/ra/v2/movies/v2rocket.vqa: v2rocket.vqa
-			^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
-			^SupportDir|Content/ra/v2/movies/airfield.vqa: airfield.vqa
-			^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
-			^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
-			^SupportDir|Content/ra/v2/movies/averted.vqa: averted.vqa
-			^SupportDir|Content/ra/v2/movies/beachead.vqa: beachead.vqa
-			^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
-			^SupportDir|Content/ra/v2/movies/bombrun.vqa: bombrun.vqa
-			^SupportDir|Content/ra/v2/movies/countdwn.vqa: countdwn.vqa
-			^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
-		Delete: ^SupportDir|Content/ra/v2/movies2.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/sounds.mix
-			^SupportDir|Content/ra/v2/expand/chrotnk1.aud: chrotnk1.aud
-			^SupportDir|Content/ra/v2/expand/fixit1.aud: fixit1.aud
-			^SupportDir|Content/ra/v2/expand/jburn1.aud: jburn1.aud
-			^SupportDir|Content/ra/v2/expand/jchrge1.aud: jchrge1.aud
-			^SupportDir|Content/ra/v2/expand/jcrisp1.aud: jcrisp1.aud
-			^SupportDir|Content/ra/v2/expand/jdance1.aud: jdance1.aud
-			^SupportDir|Content/ra/v2/expand/jjuice1.aud: jjuice1.aud
-			^SupportDir|Content/ra/v2/expand/jjump1.aud: jjump1.aud
-			^SupportDir|Content/ra/v2/expand/jlight1.aud: jlight1.aud
-			^SupportDir|Content/ra/v2/expand/jpower1.aud: jpower1.aud
-			^SupportDir|Content/ra/v2/expand/jshock1.aud: jshock1.aud
-			^SupportDir|Content/ra/v2/expand/jyes1.aud: jyes1.aud
-			^SupportDir|Content/ra/v2/expand/madchrg2.aud: madchrg2.aud
-			^SupportDir|Content/ra/v2/expand/madexplo.aud: madexplo.aud
-			^SupportDir|Content/ra/v2/expand/mboss1.aud: mboss1.aud
-			^SupportDir|Content/ra/v2/expand/mhear1.aud: mhear1.aud
-			^SupportDir|Content/ra/v2/expand/mhotdig1.aud: mhotdig1.aud
-			^SupportDir|Content/ra/v2/expand/mhowdy1.aud: mhowdy1.aud
-			^SupportDir|Content/ra/v2/expand/mhuh1.aud: mhuh1.aud
-			^SupportDir|Content/ra/v2/expand/mlaff1.aud: mlaff1.aud
-			^SupportDir|Content/ra/v2/expand/mrise1.aud: mrise1.aud
-			^SupportDir|Content/ra/v2/expand/mwrench1.aud: mwrench1.aud
-			^SupportDir|Content/ra/v2/expand/myeehaw1.aud: myeehaw1.aud
-			^SupportDir|Content/ra/v2/expand/myes1.aud: myes1.aud
+		# Base game files:
+		ContentPackage:
+			Name: base
+			Actions:
+				ExtractMix: REDALERT.MIX
+					^SupportDir|Content/ra/v2/hires.mix: hires.mix
+					^SupportDir|Content/ra/v2/local.mix: local.mix
+					^SupportDir|Content/ra/v2/lores.mix: lores.mix
+					^SupportDir|Content/ra/v2/speech.mix: speech.mix
+				ExtractMix: MAIN.MIX
+					^SupportDir|Content/ra/v2/interior.mix: interior.mix
+					^SupportDir|Content/ra/v2/conquer.mix: conquer.mix
+					^SupportDir|Content/ra/v2/allies.mix: allies.mix
+					^SupportDir|Content/ra/v2/temperat.mix: temperat.mix
+					^SupportDir|Content/ra/v2/sounds.mix: sounds.mix
+					^SupportDir|Content/ra/v2/snow.mix: snow.mix
+					^SupportDir|Content/ra/v2/russian.mix: russian.mix
+		# Base game music (optional):
+		ContentPackage:
+			Name: music
+			Actions:
+				ExtractMix: MAIN.MIX
+					^SupportDir|Content/ra/v2/scores.mix: scores.mix
+		# Aftermath expansion files:
+		ContentPackage:
+			Name: aftermathbase
+			Actions:
+				Copy: .
+					^SupportDir|Content/ra/v2/expand/expand2.mix: EXPAND2.MIX
+					^SupportDir|Content/ra/v2/expand/hires1.mix: HIRES1.MIX
+					^SupportDir|Content/ra/v2/expand/lores1.mix: LORES1.MIX
+				ExtractMix: ^SupportDir|Content/ra/v2/sounds.mix
+					^SupportDir|Content/ra/v2/expand/chrotnk1.aud: chrotnk1.aud
+					^SupportDir|Content/ra/v2/expand/fixit1.aud: fixit1.aud
+					^SupportDir|Content/ra/v2/expand/jburn1.aud: jburn1.aud
+					^SupportDir|Content/ra/v2/expand/jchrge1.aud: jchrge1.aud
+					^SupportDir|Content/ra/v2/expand/jcrisp1.aud: jcrisp1.aud
+					^SupportDir|Content/ra/v2/expand/jdance1.aud: jdance1.aud
+					^SupportDir|Content/ra/v2/expand/jjuice1.aud: jjuice1.aud
+					^SupportDir|Content/ra/v2/expand/jjump1.aud: jjump1.aud
+					^SupportDir|Content/ra/v2/expand/jlight1.aud: jlight1.aud
+					^SupportDir|Content/ra/v2/expand/jpower1.aud: jpower1.aud
+					^SupportDir|Content/ra/v2/expand/jshock1.aud: jshock1.aud
+					^SupportDir|Content/ra/v2/expand/jyes1.aud: jyes1.aud
+					^SupportDir|Content/ra/v2/expand/madchrg2.aud: madchrg2.aud
+					^SupportDir|Content/ra/v2/expand/madexplo.aud: madexplo.aud
+					^SupportDir|Content/ra/v2/expand/mboss1.aud: mboss1.aud
+					^SupportDir|Content/ra/v2/expand/mhear1.aud: mhear1.aud
+					^SupportDir|Content/ra/v2/expand/mhotdig1.aud: mhotdig1.aud
+					^SupportDir|Content/ra/v2/expand/mhowdy1.aud: mhowdy1.aud
+					^SupportDir|Content/ra/v2/expand/mhuh1.aud: mhuh1.aud
+					^SupportDir|Content/ra/v2/expand/mlaff1.aud: mlaff1.aud
+					^SupportDir|Content/ra/v2/expand/mrise1.aud: mrise1.aud
+					^SupportDir|Content/ra/v2/expand/mwrench1.aud: mwrench1.aud
+					^SupportDir|Content/ra/v2/expand/myeehaw1.aud: myeehaw1.aud
+					^SupportDir|Content/ra/v2/expand/myes1.aud: myes1.aud
+		# Aftermath music (optional):
+		ContentPackage:
+			Name: music-aftermath
+			Actions:
+				Copy: .
+					^SupportDir|Content/ra/v2/expand/await.aud: await.aud
+					^SupportDir|Content/ra/v2/expand/bog.aud: bog.aud
+					^SupportDir|Content/ra/v2/expand/float_v2.aud: float_v2.aud
+					^SupportDir|Content/ra/v2/expand/gloom.aud: gloom.aud
+					^SupportDir|Content/ra/v2/expand/grndwire.aud: grndwire.aud
+					^SupportDir|Content/ra/v2/expand/rpt.aud: rpt.aud
+					^SupportDir|Content/ra/v2/expand/search.aud: search.aud
+					^SupportDir|Content/ra/v2/expand/traction.aud: traction.aud
+					^SupportDir|Content/ra/v2/expand/wastelnd.aud: wastelnd.aud
+		# Counterstrike music (optional):
+		ContentPackage:
+			Name: music-counterstrike
+			Actions:
+				Copy: .
+					^SupportDir|Content/ra/v2/expand/2nd_hand.aud: 2nd_hand.aud
+					^SupportDir|Content/ra/v2/expand/araziod.aud: araziod.aud
+					^SupportDir|Content/ra/v2/expand/backstab.aud: backstab.aud
+					^SupportDir|Content/ra/v2/expand/chaos2.aud: chaos2.aud
+					^SupportDir|Content/ra/v2/expand/shut_it.aud: shut_it.aud
+					^SupportDir|Content/ra/v2/expand/twinmix1.aud: twinmix1.aud
+					^SupportDir|Content/ra/v2/expand/under3.aud: under3.aud
+					^SupportDir|Content/ra/v2/expand/vr2.aud: vr2.aud
+		# Allied campaign briefings (optional):
+		ContentPackage:
+			Name: movies-allied
+			Actions:
+				ExtractMix: MAIN.MIX
+					^SupportDir|Content/ra/v2/movies1.mix: movies1.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/movies1.mix
+					^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
+					^SupportDir|Content/ra/v2/movies/aftrmath.vqa: aftrmath.vqa
+					^SupportDir|Content/ra/v2/movies/ally12.vqa: ally12.vqa
+					^SupportDir|Content/ra/v2/movies/ally14.vqa: ally14.vqa
+					^SupportDir|Content/ra/v2/movies/allyend.vqa: allyend.vqa
+					^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
+					^SupportDir|Content/ra/v2/movies/apcescpe.vqa: apcescpe.vqa
+					^SupportDir|Content/ra/v2/movies/assess.vqa: assess.vqa
+					^SupportDir|Content/ra/v2/movies/battle.vqa: battle.vqa
+					^SupportDir|Content/ra/v2/movies/binoc.vqa: binoc.vqa
+					^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
+					^SupportDir|Content/ra/v2/movies/brdgtilt.vqa: brdgtilt.vqa
+					^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
+					^SupportDir|Content/ra/v2/movies/crontest.vqa: crontest.vqa
+					^SupportDir|Content/ra/v2/movies/destroyr.vqa: destroyr.vqa
+					^SupportDir|Content/ra/v2/movies/dud.vqa: dud.vqa
+					^SupportDir|Content/ra/v2/movies/elevator.vqa: elevator.vqa
+					^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
+					^SupportDir|Content/ra/v2/movies/frozen.vqa: frozen.vqa
+					^SupportDir|Content/ra/v2/movies/grvestne.vqa: grvestne.vqa
+					^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/ra/v2/movies/masasslt.vqa: masasslt.vqa
+					^SupportDir|Content/ra/v2/movies/mcv.vqa: mcv.vqa
+					^SupportDir|Content/ra/v2/movies/mcv_land.vqa: mcv_land.vqa
+					^SupportDir|Content/ra/v2/movies/montpass.vqa: montpass.vqa
+					^SupportDir|Content/ra/v2/movies/oildrum.vqa: oildrum.vqa
+					^SupportDir|Content/ra/v2/movies/overrun.vqa: overrun.vqa
+					^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
+					^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
+					^SupportDir|Content/ra/v2/movies/shipsink.vqa: shipsink.vqa
+					^SupportDir|Content/ra/v2/movies/shorbom1.vqa: shorbom1.vqa
+					^SupportDir|Content/ra/v2/movies/shorbom2.vqa: shorbom2.vqa
+					^SupportDir|Content/ra/v2/movies/shorbomb.vqa: shorbomb.vqa
+					^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
+					^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
+					^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
+					^SupportDir|Content/ra/v2/movies/spy.vqa: spy.vqa
+					^SupportDir|Content/ra/v2/movies/tanya1.vqa: tanya1.vqa
+					^SupportDir|Content/ra/v2/movies/tanya2.vqa: tanya2.vqa
+					^SupportDir|Content/ra/v2/movies/toofar.vqa: toofar.vqa
+					^SupportDir|Content/ra/v2/movies/trinity.vqa: trinity.vqa
+					^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
+					^SupportDir|Content/ra/v2/movies/ally2.vqa: ally2.vqa
+					^SupportDir|Content/ra/v2/movies/ally4.vqa: ally4.vqa
+					^SupportDir|Content/ra/v2/movies/ally5.vqa: ally5.vqa
+					^SupportDir|Content/ra/v2/movies/ally6.vqa: ally6.vqa
+					^SupportDir|Content/ra/v2/movies/ally8.vqa: ally8.vqa
+					^SupportDir|Content/ra/v2/movies/ally9.vqa: ally9.vqa
+					^SupportDir|Content/ra/v2/movies/ally10.vqa: ally10.vqa
+					^SupportDir|Content/ra/v2/movies/ally10b.vqa: ally10b.vqa
+					^SupportDir|Content/ra/v2/movies/ally11.vqa: ally11.vqa
+				Delete: ^SupportDir|Content/ra/v2/movies1.mix
+		# Soviet campaign briefings (optional):
+		ContentPackage:
+			Name: movies-soviet
+			Actions:
+				ExtractMix: MAIN.MIX
+					^SupportDir|Content/ra/v2/movies2.mix: movies2.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/movies2.mix
+					^SupportDir|Content/ra/v2/movies/double.vqa: double.vqa
+					^SupportDir|Content/ra/v2/movies/dpthchrg.vqa: dpthchrg.vqa
+					^SupportDir|Content/ra/v2/movies/execute.vqa: execute.vqa
+					^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
+					^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/ra/v2/movies/mcvbrdge.vqa: mcvbrdge.vqa
+					^SupportDir|Content/ra/v2/movies/mig.vqa: mig.vqa
+					^SupportDir|Content/ra/v2/movies/movingin.vqa: movingin.vqa
+					^SupportDir|Content/ra/v2/movies/mtnkfact.vqa: mtnkfact.vqa
+					^SupportDir|Content/ra/v2/movies/nukestok.vqa: nukestok.vqa
+					^SupportDir|Content/ra/v2/movies/onthprwl.vqa: onthprwl.vqa
+					^SupportDir|Content/ra/v2/movies/periscop.vqa: periscop.vqa
+					^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
+					^SupportDir|Content/ra/v2/movies/radrraid.vqa: radrraid.vqa
+					^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
+					^SupportDir|Content/ra/v2/movies/search.vqa: search.vqa
+					^SupportDir|Content/ra/v2/movies/sfrozen.vqa: sfrozen.vqa
+					^SupportDir|Content/ra/v2/movies/sitduck.vqa: sitduck.vqa
+					^SupportDir|Content/ra/v2/movies/slntsrvc.vqa: slntsrvc.vqa
+					^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
+					^SupportDir|Content/ra/v2/movies/snstrafe.vqa: snstrafe.vqa
+					^SupportDir|Content/ra/v2/movies/sovbatl.vqa: sovbatl.vqa
+					^SupportDir|Content/ra/v2/movies/sovcemet.vqa: sovcemet.vqa
+					^SupportDir|Content/ra/v2/movies/sovfinal.vqa: sovfinal.vqa
+					^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
+					^SupportDir|Content/ra/v2/movies/soviet2.vqa: soviet2.vqa
+					^SupportDir|Content/ra/v2/movies/soviet3.vqa: soviet3.vqa
+					^SupportDir|Content/ra/v2/movies/soviet4.vqa: soviet4.vqa
+					^SupportDir|Content/ra/v2/movies/soviet5.vqa: soviet5.vqa
+					^SupportDir|Content/ra/v2/movies/soviet6.vqa: soviet6.vqa
+					^SupportDir|Content/ra/v2/movies/soviet7.vqa: soviet7.vqa
+					^SupportDir|Content/ra/v2/movies/soviet8.vqa: soviet8.vqa
+					^SupportDir|Content/ra/v2/movies/soviet9.vqa: soviet9.vqa
+					^SupportDir|Content/ra/v2/movies/soviet10.vqa: soviet10.vqa
+					^SupportDir|Content/ra/v2/movies/soviet11.vqa: soviet11.vqa
+					^SupportDir|Content/ra/v2/movies/soviet12.vqa: soviet12.vqa
+					^SupportDir|Content/ra/v2/movies/soviet13.vqa: soviet13.vqa
+					^SupportDir|Content/ra/v2/movies/soviet14.vqa: soviet14.vqa
+					^SupportDir|Content/ra/v2/movies/sovmcv.vqa: sovmcv.vqa
+					^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
+					^SupportDir|Content/ra/v2/movies/spotter.vqa: spotter.vqa
+					^SupportDir|Content/ra/v2/movies/strafe.vqa: strafe.vqa
+					^SupportDir|Content/ra/v2/movies/take_off.vqa: take_off.vqa
+					^SupportDir|Content/ra/v2/movies/tesla.vqa: tesla.vqa
+					^SupportDir|Content/ra/v2/movies/v2rocket.vqa: v2rocket.vqa
+					^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
+					^SupportDir|Content/ra/v2/movies/airfield.vqa: airfield.vqa
+					^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
+					^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
+					^SupportDir|Content/ra/v2/movies/averted.vqa: averted.vqa
+					^SupportDir|Content/ra/v2/movies/beachead.vqa: beachead.vqa
+					^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
+					^SupportDir|Content/ra/v2/movies/bombrun.vqa: bombrun.vqa
+					^SupportDir|Content/ra/v2/movies/countdwn.vqa: countdwn.vqa
+					^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
+				Delete: ^SupportDir|Content/ra/v2/movies2.mix
 
 cnc-origin: Command & Conquer (Origin version, English)
 	Type: RegistryDirectory
@@ -187,8 +220,12 @@ cnc-origin: Command & Conquer (Origin version, English)
 	IDFiles:
 		CONQUER.MIX: 833e02a09aae694659eb312d3838367f681d1b30
 	Install:
-		Copy: .
-			^SupportDir|Content/ra/v2/cnc/desert.mix: DESERT.MIX
+		# C&C Desert Tileset:
+		ContentPackage:
+			Name: cncdesert
+			Actions:
+				Copy: .
+					^SupportDir|Content/ra/v2/cnc/desert.mix: DESERT.MIX
 
 cncr-origin: C&C Remastered Collection (Origin version, English)
 	Type: RegistryDirectory
@@ -198,131 +235,163 @@ cncr-origin: C&C Remastered Collection (Origin version, English)
 	IDFiles:
 		Data/CNCDATA/RED_ALERT/CD1/REDALERT.MIX: 0e58f4b54f44f6cd29fecf8cf379d33cf2d4caef
 			Length: 4096
+	# The Remastered Collection doesn't include the RA Soviet CD unfortunately, so we can't install Soviet campaign briefings.
 	Install:
-		ExtractMix: Data/CNCDATA/RED_ALERT/CD1/REDALERT.MIX
-			^SupportDir|Content/ra/v2/hires.mix: hires.mix
-			^SupportDir|Content/ra/v2/local.mix: local.mix
-			^SupportDir|Content/ra/v2/lores.mix: lores.mix
-			^SupportDir|Content/ra/v2/speech.mix: speech.mix
-		ExtractMix: Data/CNCDATA/RED_ALERT/CD1/MAIN.MIX
-			^SupportDir|Content/ra/v2/conquer.mix: conquer.mix
-			^SupportDir|Content/ra/v2/general.mix: general.mix
-			^SupportDir|Content/ra/v2/interior.mix: interior.mix
-			^SupportDir|Content/ra/v2/scores.mix: scores.mix
-			^SupportDir|Content/ra/v2/snow.mix: snow.mix
-			^SupportDir|Content/ra/v2/sounds.mix: sounds.mix
-			^SupportDir|Content/ra/v2/russian.mix: russian.mix
-			^SupportDir|Content/ra/v2/allies.mix: allies.mix
-			^SupportDir|Content/ra/v2/temperat.mix: temperat.mix
-			^SupportDir|Content/ra/v2/movies1.mix: movies1.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/movies1.mix
-			^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
-			^SupportDir|Content/ra/v2/movies/aftrmath.vqa: aftrmath.vqa
-			^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
-			^SupportDir|Content/ra/v2/movies/ally10.vqa: ally10.vqa
-			^SupportDir|Content/ra/v2/movies/ally10b.vqa: ally10b.vqa
-			^SupportDir|Content/ra/v2/movies/ally11.vqa: ally11.vqa
-			^SupportDir|Content/ra/v2/movies/ally12.vqa: ally12.vqa
-			^SupportDir|Content/ra/v2/movies/ally14.vqa: ally14.vqa
-			^SupportDir|Content/ra/v2/movies/ally2.vqa: ally2.vqa
-			^SupportDir|Content/ra/v2/movies/ally4.vqa: ally4.vqa
-			^SupportDir|Content/ra/v2/movies/ally5.vqa: ally5.vqa
-			^SupportDir|Content/ra/v2/movies/ally6.vqa: ally6.vqa
-			^SupportDir|Content/ra/v2/movies/ally8.vqa: ally8.vqa
-			^SupportDir|Content/ra/v2/movies/ally9.vqa: ally9.vqa
-			^SupportDir|Content/ra/v2/movies/allyend.vqa: allyend.vqa
-			^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
-			^SupportDir|Content/ra/v2/movies/apcescpe.vqa: apcescpe.vqa
-			^SupportDir|Content/ra/v2/movies/assess.vqa: assess.vqa
-			^SupportDir|Content/ra/v2/movies/battle.vqa: battle.vqa
-			^SupportDir|Content/ra/v2/movies/binoc.vqa: binoc.vqa
-			^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
-			^SupportDir|Content/ra/v2/movies/brdgtilt.vqa: brdgtilt.vqa
-			^SupportDir|Content/ra/v2/movies/crontest.vqa: crontest.vqa
-			^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
-			^SupportDir|Content/ra/v2/movies/destroyr.vqa: destroyr.vqa
-			^SupportDir|Content/ra/v2/movies/dud.vqa: dud.vqa
-			^SupportDir|Content/ra/v2/movies/elevator.vqa: elevator.vqa
-			^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
-			^SupportDir|Content/ra/v2/movies/frozen.vqa: frozen.vqa
-			^SupportDir|Content/ra/v2/movies/grvestne.vqa: grvestne.vqa
-			^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/ra/v2/movies/masasslt.vqa: masasslt.vqa
-			^SupportDir|Content/ra/v2/movies/mcv.vqa: mcv.vqa
-			^SupportDir|Content/ra/v2/movies/mcv_land.vqa: mcv_land.vqa
-			^SupportDir|Content/ra/v2/movies/montpass.vqa: montpass.vqa
-			^SupportDir|Content/ra/v2/movies/oildrum.vqa: oildrum.vqa
-			^SupportDir|Content/ra/v2/movies/overrun.vqa: overrun.vqa
-			^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
-			^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
-			^SupportDir|Content/ra/v2/movies/shipsink.vqa: shipsink.vqa
-			^SupportDir|Content/ra/v2/movies/shorbom1.vqa: shorbom1.vqa
-			^SupportDir|Content/ra/v2/movies/shorbom2.vqa: shorbom2.vqa
-			^SupportDir|Content/ra/v2/movies/shorbomb.vqa: shorbomb.vqa
-			^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
-			^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
-			^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
-			^SupportDir|Content/ra/v2/movies/spy.vqa: spy.vqa
-			^SupportDir|Content/ra/v2/movies/tanya1.vqa: tanya1.vqa
-			^SupportDir|Content/ra/v2/movies/tanya2.vqa: tanya2.vqa
-			^SupportDir|Content/ra/v2/movies/toofar.vqa: toofar.vqa
-			^SupportDir|Content/ra/v2/movies/trinity.vqa: trinity.vqa
-		Delete: ^SupportDir|Content/ra/v2/movies1.mix
-		ExtractMix: Data/CNCDATA/RED_ALERT/COUNTERSTRIKE/MAIN.MIX
-			^SupportDir|Content/ra/v2/expand/scores.mix: scores.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/expand/scores.mix
-			^SupportDir|Content/ra/v2/expand/2nd_hand.aud: 2nd_hand.aud
-			^SupportDir|Content/ra/v2/expand/araziod.aud: araziod.aud
-			^SupportDir|Content/ra/v2/expand/backstab.aud: backstab.aud
-			^SupportDir|Content/ra/v2/expand/chaos2.aud: chaos2.aud
-			^SupportDir|Content/ra/v2/expand/shut_it.aud: shut_it.aud
-			^SupportDir|Content/ra/v2/expand/twinmix1.aud: twinmix1.aud
-			^SupportDir|Content/ra/v2/expand/under3.aud: under3.aud
-			^SupportDir|Content/ra/v2/expand/vr2.aud: vr2.aud
-		Delete: ^SupportDir|Content/ra/v2/expand/scores.mix
-		Copy: Data/CNCDATA/RED_ALERT/AFTERMATH
-			^SupportDir|Content/ra/v2/expand/expand2.mix: expand2.mix
-			^SupportDir|Content/ra/v2/expand/hires1.mix: hires1.mix
-			^SupportDir|Content/ra/v2/expand/lores1.mix: lores1.mix
-		ExtractMix: Data/CNCDATA/RED_ALERT/AFTERMATH/MAIN.MIX
-			^SupportDir|Content/ra/v2/expand/scores.mix: scores.mix
-			^SupportDir|Content/ra/v2/expand/sounds.mix: sounds.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/expand/scores.mix
-			^SupportDir|Content/ra/v2/expand/await.aud: await.aud
-			^SupportDir|Content/ra/v2/expand/bog.aud: bog.aud
-			^SupportDir|Content/ra/v2/expand/float_v2.aud: float_v2.aud
-			^SupportDir|Content/ra/v2/expand/gloom.aud: gloom.aud
-			^SupportDir|Content/ra/v2/expand/grndwire.aud: grndwire.aud
-			^SupportDir|Content/ra/v2/expand/rpt.aud: rpt.aud
-			^SupportDir|Content/ra/v2/expand/search.aud: search.aud
-			^SupportDir|Content/ra/v2/expand/traction.aud: traction.aud
-			^SupportDir|Content/ra/v2/expand/wastelnd.aud: wastelnd.aud
-		Delete: ^SupportDir|Content/ra/v2/expand/scores.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/expand/sounds.mix
-			^SupportDir|Content/ra/v2/expand/chrotnk1.aud: chrotnk1.aud
-			^SupportDir|Content/ra/v2/expand/fixit1.aud: fixit1.aud
-			^SupportDir|Content/ra/v2/expand/jburn1.aud: jburn1.aud
-			^SupportDir|Content/ra/v2/expand/jchrge1.aud: jchrge1.aud
-			^SupportDir|Content/ra/v2/expand/jcrisp1.aud: jcrisp1.aud
-			^SupportDir|Content/ra/v2/expand/jdance1.aud: jdance1.aud
-			^SupportDir|Content/ra/v2/expand/jjuice1.aud: jjuice1.aud
-			^SupportDir|Content/ra/v2/expand/jjump1.aud: jjump1.aud
-			^SupportDir|Content/ra/v2/expand/jlight1.aud: jlight1.aud
-			^SupportDir|Content/ra/v2/expand/jpower1.aud: jpower1.aud
-			^SupportDir|Content/ra/v2/expand/jshock1.aud: jshock1.aud
-			^SupportDir|Content/ra/v2/expand/jyes1.aud: jyes1.aud
-			^SupportDir|Content/ra/v2/expand/madchrg2.aud: madchrg2.aud
-			^SupportDir|Content/ra/v2/expand/madexplo.aud: madexplo.aud
-			^SupportDir|Content/ra/v2/expand/mboss1.aud: mboss1.aud
-			^SupportDir|Content/ra/v2/expand/mhear1.aud: mhear1.aud
-			^SupportDir|Content/ra/v2/expand/mhotdig1.aud: mhotdig1.aud
-			^SupportDir|Content/ra/v2/expand/mhowdy1.aud: mhowdy1.aud
-			^SupportDir|Content/ra/v2/expand/mhuh1.aud: mhuh1.aud
-			^SupportDir|Content/ra/v2/expand/mlaff1.aud: mlaff1.aud
-			^SupportDir|Content/ra/v2/expand/mrise1.aud: mrise1.aud
-			^SupportDir|Content/ra/v2/expand/mwrench1.aud: mwrench1.aud
-			^SupportDir|Content/ra/v2/expand/myeehaw1.aud: myeehaw1.aud
-			^SupportDir|Content/ra/v2/expand/myes1.aud: myes1.aud
-		Delete: ^SupportDir|Content/ra/v2/expand/sounds.mix
-		Copy: Data/CNCDATA/TIBERIAN_DAWN/CD1
-			^SupportDir|Content/ra/v2/cnc/desert.mix: DESERT.MIX
\ No newline at end of file
+		# Base game files:
+		ContentPackage:
+			Name: base
+			Actions:
+				ExtractMix: Data/CNCDATA/RED_ALERT/CD1/REDALERT.MIX
+					^SupportDir|Content/ra/v2/hires.mix: hires.mix
+					^SupportDir|Content/ra/v2/local.mix: local.mix
+					^SupportDir|Content/ra/v2/lores.mix: lores.mix
+					^SupportDir|Content/ra/v2/speech.mix: speech.mix
+				ExtractMix: Data/CNCDATA/RED_ALERT/CD1/MAIN.MIX
+					^SupportDir|Content/ra/v2/conquer.mix: conquer.mix
+					^SupportDir|Content/ra/v2/general.mix: general.mix
+					^SupportDir|Content/ra/v2/interior.mix: interior.mix
+					^SupportDir|Content/ra/v2/snow.mix: snow.mix
+					^SupportDir|Content/ra/v2/sounds.mix: sounds.mix
+					^SupportDir|Content/ra/v2/russian.mix: russian.mix
+					^SupportDir|Content/ra/v2/allies.mix: allies.mix
+					^SupportDir|Content/ra/v2/temperat.mix: temperat.mix
+		# Base game music (optional):
+		ContentPackage:
+			Name: music
+			Actions:
+				ExtractMix: Data/CNCDATA/RED_ALERT/CD1/MAIN.MIX
+					^SupportDir|Content/ra/v2/scores.mix: scores.mix
+		# Allied campaign briefings (optional):
+		ContentPackage:
+			Name: movies-allied
+			Actions:
+				ExtractMix: Data/CNCDATA/RED_ALERT/CD1/MAIN.MIX
+					^SupportDir|Content/ra/v2/movies1.mix: movies1.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/movies1.mix
+					^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
+					^SupportDir|Content/ra/v2/movies/aftrmath.vqa: aftrmath.vqa
+					^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
+					^SupportDir|Content/ra/v2/movies/ally10.vqa: ally10.vqa
+					^SupportDir|Content/ra/v2/movies/ally10b.vqa: ally10b.vqa
+					^SupportDir|Content/ra/v2/movies/ally11.vqa: ally11.vqa
+					^SupportDir|Content/ra/v2/movies/ally12.vqa: ally12.vqa
+					^SupportDir|Content/ra/v2/movies/ally14.vqa: ally14.vqa
+					^SupportDir|Content/ra/v2/movies/ally2.vqa: ally2.vqa
+					^SupportDir|Content/ra/v2/movies/ally4.vqa: ally4.vqa
+					^SupportDir|Content/ra/v2/movies/ally5.vqa: ally5.vqa
+					^SupportDir|Content/ra/v2/movies/ally6.vqa: ally6.vqa
+					^SupportDir|Content/ra/v2/movies/ally8.vqa: ally8.vqa
+					^SupportDir|Content/ra/v2/movies/ally9.vqa: ally9.vqa
+					^SupportDir|Content/ra/v2/movies/allyend.vqa: allyend.vqa
+					^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
+					^SupportDir|Content/ra/v2/movies/apcescpe.vqa: apcescpe.vqa
+					^SupportDir|Content/ra/v2/movies/assess.vqa: assess.vqa
+					^SupportDir|Content/ra/v2/movies/battle.vqa: battle.vqa
+					^SupportDir|Content/ra/v2/movies/binoc.vqa: binoc.vqa
+					^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
+					^SupportDir|Content/ra/v2/movies/brdgtilt.vqa: brdgtilt.vqa
+					^SupportDir|Content/ra/v2/movies/crontest.vqa: crontest.vqa
+					^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
+					^SupportDir|Content/ra/v2/movies/destroyr.vqa: destroyr.vqa
+					^SupportDir|Content/ra/v2/movies/dud.vqa: dud.vqa
+					^SupportDir|Content/ra/v2/movies/elevator.vqa: elevator.vqa
+					^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
+					^SupportDir|Content/ra/v2/movies/frozen.vqa: frozen.vqa
+					^SupportDir|Content/ra/v2/movies/grvestne.vqa: grvestne.vqa
+					^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/ra/v2/movies/masasslt.vqa: masasslt.vqa
+					^SupportDir|Content/ra/v2/movies/mcv.vqa: mcv.vqa
+					^SupportDir|Content/ra/v2/movies/mcv_land.vqa: mcv_land.vqa
+					^SupportDir|Content/ra/v2/movies/montpass.vqa: montpass.vqa
+					^SupportDir|Content/ra/v2/movies/oildrum.vqa: oildrum.vqa
+					^SupportDir|Content/ra/v2/movies/overrun.vqa: overrun.vqa
+					^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
+					^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
+					^SupportDir|Content/ra/v2/movies/shipsink.vqa: shipsink.vqa
+					^SupportDir|Content/ra/v2/movies/shorbom1.vqa: shorbom1.vqa
+					^SupportDir|Content/ra/v2/movies/shorbom2.vqa: shorbom2.vqa
+					^SupportDir|Content/ra/v2/movies/shorbomb.vqa: shorbomb.vqa
+					^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
+					^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
+					^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
+					^SupportDir|Content/ra/v2/movies/spy.vqa: spy.vqa
+					^SupportDir|Content/ra/v2/movies/tanya1.vqa: tanya1.vqa
+					^SupportDir|Content/ra/v2/movies/tanya2.vqa: tanya2.vqa
+					^SupportDir|Content/ra/v2/movies/toofar.vqa: toofar.vqa
+					^SupportDir|Content/ra/v2/movies/trinity.vqa: trinity.vqa
+				Delete: ^SupportDir|Content/ra/v2/movies1.mix
+		# Counterstrike music (optional):
+		ContentPackage:
+			Name: music-counterstrike
+			Actions:
+				ExtractMix: Data/CNCDATA/RED_ALERT/COUNTERSTRIKE/MAIN.MIX
+					^SupportDir|Content/ra/v2/expand/scores.mix: scores.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/expand/scores.mix
+					^SupportDir|Content/ra/v2/expand/2nd_hand.aud: 2nd_hand.aud
+					^SupportDir|Content/ra/v2/expand/araziod.aud: araziod.aud
+					^SupportDir|Content/ra/v2/expand/backstab.aud: backstab.aud
+					^SupportDir|Content/ra/v2/expand/chaos2.aud: chaos2.aud
+					^SupportDir|Content/ra/v2/expand/shut_it.aud: shut_it.aud
+					^SupportDir|Content/ra/v2/expand/twinmix1.aud: twinmix1.aud
+					^SupportDir|Content/ra/v2/expand/under3.aud: under3.aud
+					^SupportDir|Content/ra/v2/expand/vr2.aud: vr2.aud
+				Delete: ^SupportDir|Content/ra/v2/expand/scores.mix
+		# Aftermath expansion files:
+		ContentPackage:
+			Name: aftermathbase
+			Actions:
+				Copy: Data/CNCDATA/RED_ALERT/AFTERMATH
+					^SupportDir|Content/ra/v2/expand/expand2.mix: expand2.mix
+					^SupportDir|Content/ra/v2/expand/hires1.mix: hires1.mix
+					^SupportDir|Content/ra/v2/expand/lores1.mix: lores1.mix
+				ExtractMix: Data/CNCDATA/RED_ALERT/AFTERMATH/MAIN.MIX
+					^SupportDir|Content/ra/v2/expand/sounds.mix: sounds.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/expand/sounds.mix
+					^SupportDir|Content/ra/v2/expand/chrotnk1.aud: chrotnk1.aud
+					^SupportDir|Content/ra/v2/expand/fixit1.aud: fixit1.aud
+					^SupportDir|Content/ra/v2/expand/jburn1.aud: jburn1.aud
+					^SupportDir|Content/ra/v2/expand/jchrge1.aud: jchrge1.aud
+					^SupportDir|Content/ra/v2/expand/jcrisp1.aud: jcrisp1.aud
+					^SupportDir|Content/ra/v2/expand/jdance1.aud: jdance1.aud
+					^SupportDir|Content/ra/v2/expand/jjuice1.aud: jjuice1.aud
+					^SupportDir|Content/ra/v2/expand/jjump1.aud: jjump1.aud
+					^SupportDir|Content/ra/v2/expand/jlight1.aud: jlight1.aud
+					^SupportDir|Content/ra/v2/expand/jpower1.aud: jpower1.aud
+					^SupportDir|Content/ra/v2/expand/jshock1.aud: jshock1.aud
+					^SupportDir|Content/ra/v2/expand/jyes1.aud: jyes1.aud
+					^SupportDir|Content/ra/v2/expand/madchrg2.aud: madchrg2.aud
+					^SupportDir|Content/ra/v2/expand/madexplo.aud: madexplo.aud
+					^SupportDir|Content/ra/v2/expand/mboss1.aud: mboss1.aud
+					^SupportDir|Content/ra/v2/expand/mhear1.aud: mhear1.aud
+					^SupportDir|Content/ra/v2/expand/mhotdig1.aud: mhotdig1.aud
+					^SupportDir|Content/ra/v2/expand/mhowdy1.aud: mhowdy1.aud
+					^SupportDir|Content/ra/v2/expand/mhuh1.aud: mhuh1.aud
+					^SupportDir|Content/ra/v2/expand/mlaff1.aud: mlaff1.aud
+					^SupportDir|Content/ra/v2/expand/mrise1.aud: mrise1.aud
+					^SupportDir|Content/ra/v2/expand/mwrench1.aud: mwrench1.aud
+					^SupportDir|Content/ra/v2/expand/myeehaw1.aud: myeehaw1.aud
+					^SupportDir|Content/ra/v2/expand/myes1.aud: myes1.aud
+				Delete: ^SupportDir|Content/ra/v2/expand/sounds.mix
+		# Aftermath music (optional):
+		ContentPackage:
+			Name: music-aftermath
+			Actions:
+				ExtractMix: Data/CNCDATA/RED_ALERT/AFTERMATH/MAIN.MIX
+					^SupportDir|Content/ra/v2/expand/scores.mix: scores.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/expand/scores.mix
+					^SupportDir|Content/ra/v2/expand/await.aud: await.aud
+					^SupportDir|Content/ra/v2/expand/bog.aud: bog.aud
+					^SupportDir|Content/ra/v2/expand/float_v2.aud: float_v2.aud
+					^SupportDir|Content/ra/v2/expand/gloom.aud: gloom.aud
+					^SupportDir|Content/ra/v2/expand/grndwire.aud: grndwire.aud
+					^SupportDir|Content/ra/v2/expand/rpt.aud: rpt.aud
+					^SupportDir|Content/ra/v2/expand/search.aud: search.aud
+					^SupportDir|Content/ra/v2/expand/traction.aud: traction.aud
+					^SupportDir|Content/ra/v2/expand/wastelnd.aud: wastelnd.aud
+				Delete: ^SupportDir|Content/ra/v2/expand/scores.mix
+		# C&C Desert Tileset:
+		ContentPackage:
+			Name: cncdesert
+			Actions:
+				Copy: Data/CNCDATA/TIBERIAN_DAWN/CD1
+					^SupportDir|Content/ra/v2/cnc/desert.mix: DESERT.MIX
diff --git a/mods/ra/installer/soviet95.yaml b/mods/ra/installer/soviet95.yaml
index a8979bf5ab..6f2ae57406 100644
--- a/mods/ra/installer/soviet95.yaml
+++ b/mods/ra/installer/soviet95.yaml
@@ -5,76 +5,90 @@ soviet: Red Alert 95 (Soviet Disc, English)
 			Length: 4096
 		INSTALL/REDALERT.MIX: 0e58f4b54f44f6cd29fecf8cf379d33cf2d4caef
 	Install:
-		ExtractMix: INSTALL/REDALERT.MIX
-			^SupportDir|Content/ra/v2/hires.mix: hires.mix
-			^SupportDir|Content/ra/v2/local.mix: local.mix
-			^SupportDir|Content/ra/v2/lores.mix: lores.mix
-			^SupportDir|Content/ra/v2/speech.mix: speech.mix
-		ExtractMix: MAIN.MIX
-			^SupportDir|Content/ra/v2/conquer.mix: conquer.mix
-			^SupportDir|Content/ra/v2/general.mix: general.mix
-			^SupportDir|Content/ra/v2/interior.mix: interior.mix
-			^SupportDir|Content/ra/v2/scores.mix: scores.mix
-			^SupportDir|Content/ra/v2/snow.mix: snow.mix
-			^SupportDir|Content/ra/v2/russian.mix: russian.mix
-			^SupportDir|Content/ra/v2/allies.mix: allies.mix
-			^SupportDir|Content/ra/v2/sounds.mix: sounds.mix
-			^SupportDir|Content/ra/v2/temperat.mix: temperat.mix
-			^SupportDir|Content/ra/v2/movies2.mix: movies2.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/movies2.mix
-			^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
-			^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
-			^SupportDir|Content/ra/v2/movies/airfield.vqa: airfield.vqa
-			^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
-			^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
-			^SupportDir|Content/ra/v2/movies/averted.vqa: averted.vqa
-			^SupportDir|Content/ra/v2/movies/beachead.vqa: beachead.vqa
-			^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
-			^SupportDir|Content/ra/v2/movies/bombrun.vqa: bombrun.vqa
-			^SupportDir|Content/ra/v2/movies/countdwn.vqa: countdwn.vqa
-			^SupportDir|Content/ra/v2/movies/double.vqa: double.vqa
-			^SupportDir|Content/ra/v2/movies/dpthchrg.vqa: dpthchrg.vqa
-			^SupportDir|Content/ra/v2/movies/execute.vqa: execute.vqa
-			^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
-			^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/ra/v2/movies/mcvbrdge.vqa: mcvbrdge.vqa
-			^SupportDir|Content/ra/v2/movies/mig.vqa: mig.vqa
-			^SupportDir|Content/ra/v2/movies/movingin.vqa: movingin.vqa
-			^SupportDir|Content/ra/v2/movies/mtnkfact.vqa: mtnkfact.vqa
-			^SupportDir|Content/ra/v2/movies/nukestok.vqa: nukestok.vqa
-			^SupportDir|Content/ra/v2/movies/onthprwl.vqa: onthprwl.vqa
-			^SupportDir|Content/ra/v2/movies/periscop.vqa: periscop.vqa
-			^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
-			^SupportDir|Content/ra/v2/movies/radrraid.vqa: radrraid.vqa
-			^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
-			^SupportDir|Content/ra/v2/movies/search.vqa: search.vqa
-			^SupportDir|Content/ra/v2/movies/sfrozen.vqa: sfrozen.vqa
-			^SupportDir|Content/ra/v2/movies/sitduck.vqa: sitduck.vqa
-			^SupportDir|Content/ra/v2/movies/slntsrvc.vqa: slntsrvc.vqa
-			^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
-			^SupportDir|Content/ra/v2/movies/snstrafe.vqa: snstrafe.vqa
-			^SupportDir|Content/ra/v2/movies/sovbatl.vqa: sovbatl.vqa
-			^SupportDir|Content/ra/v2/movies/sovcemet.vqa: sovcemet.vqa
-			^SupportDir|Content/ra/v2/movies/sovfinal.vqa: sovfinal.vqa
-			^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
-			^SupportDir|Content/ra/v2/movies/soviet10.vqa: soviet10.vqa
-			^SupportDir|Content/ra/v2/movies/soviet11.vqa: soviet11.vqa
-			^SupportDir|Content/ra/v2/movies/soviet12.vqa: soviet12.vqa
-			^SupportDir|Content/ra/v2/movies/soviet13.vqa: soviet13.vqa
-			^SupportDir|Content/ra/v2/movies/soviet14.vqa: soviet14.vqa
-			^SupportDir|Content/ra/v2/movies/soviet2.vqa: soviet2.vqa
-			^SupportDir|Content/ra/v2/movies/soviet3.vqa: soviet3.vqa
-			^SupportDir|Content/ra/v2/movies/soviet4.vqa: soviet4.vqa
-			^SupportDir|Content/ra/v2/movies/soviet5.vqa: soviet5.vqa
-			^SupportDir|Content/ra/v2/movies/soviet6.vqa: soviet6.vqa
-			^SupportDir|Content/ra/v2/movies/soviet7.vqa: soviet7.vqa
-			^SupportDir|Content/ra/v2/movies/soviet8.vqa: soviet8.vqa
-			^SupportDir|Content/ra/v2/movies/soviet9.vqa: soviet9.vqa
-			^SupportDir|Content/ra/v2/movies/sovmcv.vqa: sovmcv.vqa
-			^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
-			^SupportDir|Content/ra/v2/movies/spotter.vqa: spotter.vqa
-			^SupportDir|Content/ra/v2/movies/strafe.vqa: strafe.vqa
-			^SupportDir|Content/ra/v2/movies/take_off.vqa: take_off.vqa
-			^SupportDir|Content/ra/v2/movies/tesla.vqa: tesla.vqa
-			^SupportDir|Content/ra/v2/movies/v2rocket.vqa: v2rocket.vqa
-		Delete: ^SupportDir|Content/ra/v2/movies2.mix
+		# Base game files:
+		ContentPackage:
+			Name: base
+			Actions:
+				ExtractMix: INSTALL/REDALERT.MIX
+					^SupportDir|Content/ra/v2/hires.mix: hires.mix
+					^SupportDir|Content/ra/v2/local.mix: local.mix
+					^SupportDir|Content/ra/v2/lores.mix: lores.mix
+					^SupportDir|Content/ra/v2/speech.mix: speech.mix
+				ExtractMix: MAIN.MIX
+					^SupportDir|Content/ra/v2/conquer.mix: conquer.mix
+					^SupportDir|Content/ra/v2/general.mix: general.mix # Is this one used? The FirstDecade and TUC installers are missing this!
+					^SupportDir|Content/ra/v2/interior.mix: interior.mix
+					^SupportDir|Content/ra/v2/snow.mix: snow.mix
+					^SupportDir|Content/ra/v2/russian.mix: russian.mix
+					^SupportDir|Content/ra/v2/allies.mix: allies.mix
+					^SupportDir|Content/ra/v2/sounds.mix: sounds.mix
+					^SupportDir|Content/ra/v2/temperat.mix: temperat.mix
+		# Base game music (optional):
+		ContentPackage:
+			Name: music
+			Actions:
+				ExtractMix: MAIN.MIX
+					^SupportDir|Content/ra/v2/scores.mix: scores.mix
+		# Soviet campaign briefings (optional):
+		ContentPackage:
+			Name: movies-soviet
+			Actions:
+				ExtractMix: MAIN.MIX
+					^SupportDir|Content/ra/v2/movies2.mix: movies2.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/movies2.mix
+					^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
+					^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
+					^SupportDir|Content/ra/v2/movies/airfield.vqa: airfield.vqa
+					^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
+					^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
+					^SupportDir|Content/ra/v2/movies/averted.vqa: averted.vqa
+					^SupportDir|Content/ra/v2/movies/beachead.vqa: beachead.vqa
+					^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
+					^SupportDir|Content/ra/v2/movies/bombrun.vqa: bombrun.vqa
+					^SupportDir|Content/ra/v2/movies/countdwn.vqa: countdwn.vqa
+					^SupportDir|Content/ra/v2/movies/double.vqa: double.vqa
+					^SupportDir|Content/ra/v2/movies/dpthchrg.vqa: dpthchrg.vqa
+					^SupportDir|Content/ra/v2/movies/execute.vqa: execute.vqa
+					^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
+					^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/ra/v2/movies/mcvbrdge.vqa: mcvbrdge.vqa
+					^SupportDir|Content/ra/v2/movies/mig.vqa: mig.vqa
+					^SupportDir|Content/ra/v2/movies/movingin.vqa: movingin.vqa
+					^SupportDir|Content/ra/v2/movies/mtnkfact.vqa: mtnkfact.vqa
+					^SupportDir|Content/ra/v2/movies/nukestok.vqa: nukestok.vqa
+					^SupportDir|Content/ra/v2/movies/onthprwl.vqa: onthprwl.vqa
+					^SupportDir|Content/ra/v2/movies/periscop.vqa: periscop.vqa
+					^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
+					^SupportDir|Content/ra/v2/movies/radrraid.vqa: radrraid.vqa
+					^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
+					^SupportDir|Content/ra/v2/movies/search.vqa: search.vqa
+					^SupportDir|Content/ra/v2/movies/sfrozen.vqa: sfrozen.vqa
+					^SupportDir|Content/ra/v2/movies/sitduck.vqa: sitduck.vqa
+					^SupportDir|Content/ra/v2/movies/slntsrvc.vqa: slntsrvc.vqa
+					^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
+					^SupportDir|Content/ra/v2/movies/snstrafe.vqa: snstrafe.vqa
+					^SupportDir|Content/ra/v2/movies/sovbatl.vqa: sovbatl.vqa
+					^SupportDir|Content/ra/v2/movies/sovcemet.vqa: sovcemet.vqa
+					^SupportDir|Content/ra/v2/movies/sovfinal.vqa: sovfinal.vqa
+					^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
+					^SupportDir|Content/ra/v2/movies/soviet10.vqa: soviet10.vqa
+					^SupportDir|Content/ra/v2/movies/soviet11.vqa: soviet11.vqa
+					^SupportDir|Content/ra/v2/movies/soviet12.vqa: soviet12.vqa
+					^SupportDir|Content/ra/v2/movies/soviet13.vqa: soviet13.vqa
+					^SupportDir|Content/ra/v2/movies/soviet14.vqa: soviet14.vqa
+					^SupportDir|Content/ra/v2/movies/soviet2.vqa: soviet2.vqa
+					^SupportDir|Content/ra/v2/movies/soviet3.vqa: soviet3.vqa
+					^SupportDir|Content/ra/v2/movies/soviet4.vqa: soviet4.vqa
+					^SupportDir|Content/ra/v2/movies/soviet5.vqa: soviet5.vqa
+					^SupportDir|Content/ra/v2/movies/soviet6.vqa: soviet6.vqa
+					^SupportDir|Content/ra/v2/movies/soviet7.vqa: soviet7.vqa
+					^SupportDir|Content/ra/v2/movies/soviet8.vqa: soviet8.vqa
+					^SupportDir|Content/ra/v2/movies/soviet9.vqa: soviet9.vqa
+					^SupportDir|Content/ra/v2/movies/sovmcv.vqa: sovmcv.vqa
+					^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
+					^SupportDir|Content/ra/v2/movies/spotter.vqa: spotter.vqa
+					^SupportDir|Content/ra/v2/movies/strafe.vqa: strafe.vqa
+					^SupportDir|Content/ra/v2/movies/take_off.vqa: take_off.vqa
+					^SupportDir|Content/ra/v2/movies/tesla.vqa: tesla.vqa
+					^SupportDir|Content/ra/v2/movies/v2rocket.vqa: v2rocket.vqa
+				Delete: ^SupportDir|Content/ra/v2/movies2.mix
diff --git a/mods/ra/installer/steam.yaml b/mods/ra/installer/steam.yaml
index 10afd78818..ea475a6361 100644
--- a/mods/ra/installer/steam.yaml
+++ b/mods/ra/installer/steam.yaml
@@ -4,131 +4,163 @@ cncr-steam: C&C Remastered Collection (Steam version, English)
 	IDFiles:
 		Data/CNCDATA/RED_ALERT/CD1/REDALERT.MIX: 0e58f4b54f44f6cd29fecf8cf379d33cf2d4caef
 			Length: 4096
+	# The Remastered Collection doesn't include the RA Soviet CD unfortunately, so we can't install Soviet campaign briefings.
 	Install:
-		ExtractMix: Data/CNCDATA/RED_ALERT/CD1/REDALERT.MIX
-			^SupportDir|Content/ra/v2/hires.mix: hires.mix
-			^SupportDir|Content/ra/v2/local.mix: local.mix
-			^SupportDir|Content/ra/v2/lores.mix: lores.mix
-			^SupportDir|Content/ra/v2/speech.mix: speech.mix
-		ExtractMix: Data/CNCDATA/RED_ALERT/CD1/MAIN.MIX
-			^SupportDir|Content/ra/v2/conquer.mix: conquer.mix
-			^SupportDir|Content/ra/v2/general.mix: general.mix
-			^SupportDir|Content/ra/v2/interior.mix: interior.mix
-			^SupportDir|Content/ra/v2/scores.mix: scores.mix
-			^SupportDir|Content/ra/v2/snow.mix: snow.mix
-			^SupportDir|Content/ra/v2/sounds.mix: sounds.mix
-			^SupportDir|Content/ra/v2/russian.mix: russian.mix
-			^SupportDir|Content/ra/v2/allies.mix: allies.mix
-			^SupportDir|Content/ra/v2/temperat.mix: temperat.mix
-			^SupportDir|Content/ra/v2/movies1.mix: movies1.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/movies1.mix
-			^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
-			^SupportDir|Content/ra/v2/movies/aftrmath.vqa: aftrmath.vqa
-			^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
-			^SupportDir|Content/ra/v2/movies/ally10.vqa: ally10.vqa
-			^SupportDir|Content/ra/v2/movies/ally10b.vqa: ally10b.vqa
-			^SupportDir|Content/ra/v2/movies/ally11.vqa: ally11.vqa
-			^SupportDir|Content/ra/v2/movies/ally12.vqa: ally12.vqa
-			^SupportDir|Content/ra/v2/movies/ally14.vqa: ally14.vqa
-			^SupportDir|Content/ra/v2/movies/ally2.vqa: ally2.vqa
-			^SupportDir|Content/ra/v2/movies/ally4.vqa: ally4.vqa
-			^SupportDir|Content/ra/v2/movies/ally5.vqa: ally5.vqa
-			^SupportDir|Content/ra/v2/movies/ally6.vqa: ally6.vqa
-			^SupportDir|Content/ra/v2/movies/ally8.vqa: ally8.vqa
-			^SupportDir|Content/ra/v2/movies/ally9.vqa: ally9.vqa
-			^SupportDir|Content/ra/v2/movies/allyend.vqa: allyend.vqa
-			^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
-			^SupportDir|Content/ra/v2/movies/apcescpe.vqa: apcescpe.vqa
-			^SupportDir|Content/ra/v2/movies/assess.vqa: assess.vqa
-			^SupportDir|Content/ra/v2/movies/battle.vqa: battle.vqa
-			^SupportDir|Content/ra/v2/movies/binoc.vqa: binoc.vqa
-			^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
-			^SupportDir|Content/ra/v2/movies/brdgtilt.vqa: brdgtilt.vqa
-			^SupportDir|Content/ra/v2/movies/crontest.vqa: crontest.vqa
-			^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
-			^SupportDir|Content/ra/v2/movies/destroyr.vqa: destroyr.vqa
-			^SupportDir|Content/ra/v2/movies/dud.vqa: dud.vqa
-			^SupportDir|Content/ra/v2/movies/elevator.vqa: elevator.vqa
-			^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
-			^SupportDir|Content/ra/v2/movies/frozen.vqa: frozen.vqa
-			^SupportDir|Content/ra/v2/movies/grvestne.vqa: grvestne.vqa
-			^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
-			^SupportDir|Content/ra/v2/movies/masasslt.vqa: masasslt.vqa
-			^SupportDir|Content/ra/v2/movies/mcv.vqa: mcv.vqa
-			^SupportDir|Content/ra/v2/movies/mcv_land.vqa: mcv_land.vqa
-			^SupportDir|Content/ra/v2/movies/montpass.vqa: montpass.vqa
-			^SupportDir|Content/ra/v2/movies/oildrum.vqa: oildrum.vqa
-			^SupportDir|Content/ra/v2/movies/overrun.vqa: overrun.vqa
-			^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
-			^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
-			^SupportDir|Content/ra/v2/movies/shipsink.vqa: shipsink.vqa
-			^SupportDir|Content/ra/v2/movies/shorbom1.vqa: shorbom1.vqa
-			^SupportDir|Content/ra/v2/movies/shorbom2.vqa: shorbom2.vqa
-			^SupportDir|Content/ra/v2/movies/shorbomb.vqa: shorbomb.vqa
-			^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
-			^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
-			^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
-			^SupportDir|Content/ra/v2/movies/spy.vqa: spy.vqa
-			^SupportDir|Content/ra/v2/movies/tanya1.vqa: tanya1.vqa
-			^SupportDir|Content/ra/v2/movies/tanya2.vqa: tanya2.vqa
-			^SupportDir|Content/ra/v2/movies/toofar.vqa: toofar.vqa
-			^SupportDir|Content/ra/v2/movies/trinity.vqa: trinity.vqa
-		Delete: ^SupportDir|Content/ra/v2/movies1.mix
-		ExtractMix: Data/CNCDATA/RED_ALERT/COUNTERSTRIKE/MAIN.MIX
-			^SupportDir|Content/ra/v2/expand/scores.mix: scores.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/expand/scores.mix
-			^SupportDir|Content/ra/v2/expand/2nd_hand.aud: 2nd_hand.aud
-			^SupportDir|Content/ra/v2/expand/araziod.aud: araziod.aud
-			^SupportDir|Content/ra/v2/expand/backstab.aud: backstab.aud
-			^SupportDir|Content/ra/v2/expand/chaos2.aud: chaos2.aud
-			^SupportDir|Content/ra/v2/expand/shut_it.aud: shut_it.aud
-			^SupportDir|Content/ra/v2/expand/twinmix1.aud: twinmix1.aud
-			^SupportDir|Content/ra/v2/expand/under3.aud: under3.aud
-			^SupportDir|Content/ra/v2/expand/vr2.aud: vr2.aud
-		Delete: ^SupportDir|Content/ra/v2/expand/scores.mix
-		Copy: Data/CNCDATA/RED_ALERT/AFTERMATH
-			^SupportDir|Content/ra/v2/expand/expand2.mix: expand2.mix
-			^SupportDir|Content/ra/v2/expand/hires1.mix: hires1.mix
-			^SupportDir|Content/ra/v2/expand/lores1.mix: lores1.mix
-		ExtractMix: Data/CNCDATA/RED_ALERT/AFTERMATH/MAIN.MIX
-			^SupportDir|Content/ra/v2/expand/scores.mix: scores.mix
-			^SupportDir|Content/ra/v2/expand/sounds.mix: sounds.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/expand/scores.mix
-			^SupportDir|Content/ra/v2/expand/await.aud: await.aud
-			^SupportDir|Content/ra/v2/expand/bog.aud: bog.aud
-			^SupportDir|Content/ra/v2/expand/float_v2.aud: float_v2.aud
-			^SupportDir|Content/ra/v2/expand/gloom.aud: gloom.aud
-			^SupportDir|Content/ra/v2/expand/grndwire.aud: grndwire.aud
-			^SupportDir|Content/ra/v2/expand/rpt.aud: rpt.aud
-			^SupportDir|Content/ra/v2/expand/search.aud: search.aud
-			^SupportDir|Content/ra/v2/expand/traction.aud: traction.aud
-			^SupportDir|Content/ra/v2/expand/wastelnd.aud: wastelnd.aud
-		Delete: ^SupportDir|Content/ra/v2/expand/scores.mix
-		ExtractMix: ^SupportDir|Content/ra/v2/expand/sounds.mix
-			^SupportDir|Content/ra/v2/expand/chrotnk1.aud: chrotnk1.aud
-			^SupportDir|Content/ra/v2/expand/fixit1.aud: fixit1.aud
-			^SupportDir|Content/ra/v2/expand/jburn1.aud: jburn1.aud
-			^SupportDir|Content/ra/v2/expand/jchrge1.aud: jchrge1.aud
-			^SupportDir|Content/ra/v2/expand/jcrisp1.aud: jcrisp1.aud
-			^SupportDir|Content/ra/v2/expand/jdance1.aud: jdance1.aud
-			^SupportDir|Content/ra/v2/expand/jjuice1.aud: jjuice1.aud
-			^SupportDir|Content/ra/v2/expand/jjump1.aud: jjump1.aud
-			^SupportDir|Content/ra/v2/expand/jlight1.aud: jlight1.aud
-			^SupportDir|Content/ra/v2/expand/jpower1.aud: jpower1.aud
-			^SupportDir|Content/ra/v2/expand/jshock1.aud: jshock1.aud
-			^SupportDir|Content/ra/v2/expand/jyes1.aud: jyes1.aud
-			^SupportDir|Content/ra/v2/expand/madchrg2.aud: madchrg2.aud
-			^SupportDir|Content/ra/v2/expand/madexplo.aud: madexplo.aud
-			^SupportDir|Content/ra/v2/expand/mboss1.aud: mboss1.aud
-			^SupportDir|Content/ra/v2/expand/mhear1.aud: mhear1.aud
-			^SupportDir|Content/ra/v2/expand/mhotdig1.aud: mhotdig1.aud
-			^SupportDir|Content/ra/v2/expand/mhowdy1.aud: mhowdy1.aud
-			^SupportDir|Content/ra/v2/expand/mhuh1.aud: mhuh1.aud
-			^SupportDir|Content/ra/v2/expand/mlaff1.aud: mlaff1.aud
-			^SupportDir|Content/ra/v2/expand/mrise1.aud: mrise1.aud
-			^SupportDir|Content/ra/v2/expand/mwrench1.aud: mwrench1.aud
-			^SupportDir|Content/ra/v2/expand/myeehaw1.aud: myeehaw1.aud
-			^SupportDir|Content/ra/v2/expand/myes1.aud: myes1.aud
-		Delete: ^SupportDir|Content/ra/v2/expand/sounds.mix
-		Copy: Data/CNCDATA/TIBERIAN_DAWN/CD1
-			^SupportDir|Content/ra/v2/cnc/desert.mix: DESERT.MIX
+		# Base game files:
+		ContentPackage:
+			Name: base
+			Actions:
+				ExtractMix: Data/CNCDATA/RED_ALERT/CD1/REDALERT.MIX
+					^SupportDir|Content/ra/v2/hires.mix: hires.mix
+					^SupportDir|Content/ra/v2/local.mix: local.mix
+					^SupportDir|Content/ra/v2/lores.mix: lores.mix
+					^SupportDir|Content/ra/v2/speech.mix: speech.mix
+				ExtractMix: Data/CNCDATA/RED_ALERT/CD1/MAIN.MIX
+					^SupportDir|Content/ra/v2/conquer.mix: conquer.mix
+					^SupportDir|Content/ra/v2/general.mix: general.mix # Is this one used? The FirstDecade and TUC installers are missing this!
+					^SupportDir|Content/ra/v2/interior.mix: interior.mix
+					^SupportDir|Content/ra/v2/snow.mix: snow.mix
+					^SupportDir|Content/ra/v2/sounds.mix: sounds.mix
+					^SupportDir|Content/ra/v2/russian.mix: russian.mix
+					^SupportDir|Content/ra/v2/allies.mix: allies.mix
+					^SupportDir|Content/ra/v2/temperat.mix: temperat.mix
+		# Base game music (optional):
+		ContentPackage:
+			Name: music
+			Actions:
+				ExtractMix: Data/CNCDATA/RED_ALERT/CD1/MAIN.MIX
+					^SupportDir|Content/ra/v2/scores.mix: scores.mix
+		# Allied campaign briefings (optional):
+		ContentPackage:
+			Name: movies-allied
+			Actions:
+				ExtractMix: Data/CNCDATA/RED_ALERT/CD1/MAIN.MIX
+					^SupportDir|Content/ra/v2/movies1.mix: movies1.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/movies1.mix
+					^SupportDir|Content/ra/v2/movies/aagun.vqa: aagun.vqa
+					^SupportDir|Content/ra/v2/movies/aftrmath.vqa: aftrmath.vqa
+					^SupportDir|Content/ra/v2/movies/ally1.vqa: ally1.vqa
+					^SupportDir|Content/ra/v2/movies/ally10.vqa: ally10.vqa
+					^SupportDir|Content/ra/v2/movies/ally10b.vqa: ally10b.vqa
+					^SupportDir|Content/ra/v2/movies/ally11.vqa: ally11.vqa
+					^SupportDir|Content/ra/v2/movies/ally12.vqa: ally12.vqa
+					^SupportDir|Content/ra/v2/movies/ally14.vqa: ally14.vqa
+					^SupportDir|Content/ra/v2/movies/ally2.vqa: ally2.vqa
+					^SupportDir|Content/ra/v2/movies/ally4.vqa: ally4.vqa
+					^SupportDir|Content/ra/v2/movies/ally5.vqa: ally5.vqa
+					^SupportDir|Content/ra/v2/movies/ally6.vqa: ally6.vqa
+					^SupportDir|Content/ra/v2/movies/ally8.vqa: ally8.vqa
+					^SupportDir|Content/ra/v2/movies/ally9.vqa: ally9.vqa
+					^SupportDir|Content/ra/v2/movies/allyend.vqa: allyend.vqa
+					^SupportDir|Content/ra/v2/movies/allymorf.vqa: allymorf.vqa
+					^SupportDir|Content/ra/v2/movies/apcescpe.vqa: apcescpe.vqa
+					^SupportDir|Content/ra/v2/movies/assess.vqa: assess.vqa
+					^SupportDir|Content/ra/v2/movies/battle.vqa: battle.vqa
+					^SupportDir|Content/ra/v2/movies/binoc.vqa: binoc.vqa
+					^SupportDir|Content/ra/v2/movies/bmap.vqa: bmap.vqa
+					^SupportDir|Content/ra/v2/movies/brdgtilt.vqa: brdgtilt.vqa
+					^SupportDir|Content/ra/v2/movies/crontest.vqa: crontest.vqa
+					^SupportDir|Content/ra/v2/movies/cronfail.vqa: cronfail.vqa
+					^SupportDir|Content/ra/v2/movies/destroyr.vqa: destroyr.vqa
+					^SupportDir|Content/ra/v2/movies/dud.vqa: dud.vqa
+					^SupportDir|Content/ra/v2/movies/elevator.vqa: elevator.vqa
+					^SupportDir|Content/ra/v2/movies/flare.vqa: flare.vqa
+					^SupportDir|Content/ra/v2/movies/frozen.vqa: frozen.vqa
+					^SupportDir|Content/ra/v2/movies/grvestne.vqa: grvestne.vqa
+					^SupportDir|Content/ra/v2/movies/landing.vqa: landing.vqa
+					^SupportDir|Content/ra/v2/movies/masasslt.vqa: masasslt.vqa
+					^SupportDir|Content/ra/v2/movies/mcv.vqa: mcv.vqa
+					^SupportDir|Content/ra/v2/movies/mcv_land.vqa: mcv_land.vqa
+					^SupportDir|Content/ra/v2/movies/montpass.vqa: montpass.vqa
+					^SupportDir|Content/ra/v2/movies/oildrum.vqa: oildrum.vqa
+					^SupportDir|Content/ra/v2/movies/overrun.vqa: overrun.vqa
+					^SupportDir|Content/ra/v2/movies/prolog.vqa: prolog.vqa
+					^SupportDir|Content/ra/v2/movies/redintro.vqa: redintro.vqa
+					^SupportDir|Content/ra/v2/movies/shipsink.vqa: shipsink.vqa
+					^SupportDir|Content/ra/v2/movies/shorbom1.vqa: shorbom1.vqa
+					^SupportDir|Content/ra/v2/movies/shorbom2.vqa: shorbom2.vqa
+					^SupportDir|Content/ra/v2/movies/shorbomb.vqa: shorbomb.vqa
+					^SupportDir|Content/ra/v2/movies/snowbomb.vqa: snowbomb.vqa
+					^SupportDir|Content/ra/v2/movies/soviet1.vqa: soviet1.vqa
+					^SupportDir|Content/ra/v2/movies/sovtstar.vqa: sovtstar.vqa
+					^SupportDir|Content/ra/v2/movies/spy.vqa: spy.vqa
+					^SupportDir|Content/ra/v2/movies/tanya1.vqa: tanya1.vqa
+					^SupportDir|Content/ra/v2/movies/tanya2.vqa: tanya2.vqa
+					^SupportDir|Content/ra/v2/movies/toofar.vqa: toofar.vqa
+					^SupportDir|Content/ra/v2/movies/trinity.vqa: trinity.vqa
+				Delete: ^SupportDir|Content/ra/v2/movies1.mix
+		# Counterstrike music (optional):
+		ContentPackage:
+			Name: music-counterstrike
+			Actions:
+				ExtractMix: Data/CNCDATA/RED_ALERT/COUNTERSTRIKE/MAIN.MIX
+					^SupportDir|Content/ra/v2/expand/scores.mix: scores.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/expand/scores.mix
+					^SupportDir|Content/ra/v2/expand/2nd_hand.aud: 2nd_hand.aud
+					^SupportDir|Content/ra/v2/expand/araziod.aud: araziod.aud
+					^SupportDir|Content/ra/v2/expand/backstab.aud: backstab.aud
+					^SupportDir|Content/ra/v2/expand/chaos2.aud: chaos2.aud
+					^SupportDir|Content/ra/v2/expand/shut_it.aud: shut_it.aud
+					^SupportDir|Content/ra/v2/expand/twinmix1.aud: twinmix1.aud
+					^SupportDir|Content/ra/v2/expand/under3.aud: under3.aud
+					^SupportDir|Content/ra/v2/expand/vr2.aud: vr2.aud
+				Delete: ^SupportDir|Content/ra/v2/expand/scores.mix
+		# Aftermath expansion files:
+		ContentPackage:
+			Name: aftermathbase
+			Actions:
+				Copy: Data/CNCDATA/RED_ALERT/AFTERMATH
+					^SupportDir|Content/ra/v2/expand/expand2.mix: expand2.mix
+					^SupportDir|Content/ra/v2/expand/hires1.mix: hires1.mix
+					^SupportDir|Content/ra/v2/expand/lores1.mix: lores1.mix
+				ExtractMix: Data/CNCDATA/RED_ALERT/AFTERMATH/MAIN.MIX
+					^SupportDir|Content/ra/v2/expand/sounds.mix: sounds.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/expand/sounds.mix
+					^SupportDir|Content/ra/v2/expand/chrotnk1.aud: chrotnk1.aud
+					^SupportDir|Content/ra/v2/expand/fixit1.aud: fixit1.aud
+					^SupportDir|Content/ra/v2/expand/jburn1.aud: jburn1.aud
+					^SupportDir|Content/ra/v2/expand/jchrge1.aud: jchrge1.aud
+					^SupportDir|Content/ra/v2/expand/jcrisp1.aud: jcrisp1.aud
+					^SupportDir|Content/ra/v2/expand/jdance1.aud: jdance1.aud
+					^SupportDir|Content/ra/v2/expand/jjuice1.aud: jjuice1.aud
+					^SupportDir|Content/ra/v2/expand/jjump1.aud: jjump1.aud
+					^SupportDir|Content/ra/v2/expand/jlight1.aud: jlight1.aud
+					^SupportDir|Content/ra/v2/expand/jpower1.aud: jpower1.aud
+					^SupportDir|Content/ra/v2/expand/jshock1.aud: jshock1.aud
+					^SupportDir|Content/ra/v2/expand/jyes1.aud: jyes1.aud
+					^SupportDir|Content/ra/v2/expand/madchrg2.aud: madchrg2.aud
+					^SupportDir|Content/ra/v2/expand/madexplo.aud: madexplo.aud
+					^SupportDir|Content/ra/v2/expand/mboss1.aud: mboss1.aud
+					^SupportDir|Content/ra/v2/expand/mhear1.aud: mhear1.aud
+					^SupportDir|Content/ra/v2/expand/mhotdig1.aud: mhotdig1.aud
+					^SupportDir|Content/ra/v2/expand/mhowdy1.aud: mhowdy1.aud
+					^SupportDir|Content/ra/v2/expand/mhuh1.aud: mhuh1.aud
+					^SupportDir|Content/ra/v2/expand/mlaff1.aud: mlaff1.aud
+					^SupportDir|Content/ra/v2/expand/mrise1.aud: mrise1.aud
+					^SupportDir|Content/ra/v2/expand/mwrench1.aud: mwrench1.aud
+					^SupportDir|Content/ra/v2/expand/myeehaw1.aud: myeehaw1.aud
+					^SupportDir|Content/ra/v2/expand/myes1.aud: myes1.aud
+				Delete: ^SupportDir|Content/ra/v2/expand/sounds.mix
+		# Aftermath music (optional):
+		ContentPackage:
+			Name: music-aftermath
+			Actions:
+				ExtractMix: Data/CNCDATA/RED_ALERT/AFTERMATH/MAIN.MIX
+					^SupportDir|Content/ra/v2/expand/scores.mix: scores.mix
+				ExtractMix: ^SupportDir|Content/ra/v2/expand/scores.mix
+					^SupportDir|Content/ra/v2/expand/await.aud: await.aud
+					^SupportDir|Content/ra/v2/expand/bog.aud: bog.aud
+					^SupportDir|Content/ra/v2/expand/float_v2.aud: float_v2.aud
+					^SupportDir|Content/ra/v2/expand/gloom.aud: gloom.aud
+					^SupportDir|Content/ra/v2/expand/grndwire.aud: grndwire.aud
+					^SupportDir|Content/ra/v2/expand/rpt.aud: rpt.aud
+					^SupportDir|Content/ra/v2/expand/search.aud: search.aud
+					^SupportDir|Content/ra/v2/expand/traction.aud: traction.aud
+					^SupportDir|Content/ra/v2/expand/wastelnd.aud: wastelnd.aud
+				Delete: ^SupportDir|Content/ra/v2/expand/scores.mix
+		# C&C Desert Tileset:
+		ContentPackage:
+			Name: cncdesert
+			Actions:
+				Copy: Data/CNCDATA/TIBERIAN_DAWN/CD1
+					^SupportDir|Content/ra/v2/cnc/desert.mix: DESERT.MIX
diff --git a/mods/ts/installer/firestorm.yaml b/mods/ts/installer/firestorm.yaml
index 7264b16f9f..0ed08aef8c 100644
--- a/mods/ts/installer/firestorm.yaml
+++ b/mods/ts/installer/firestorm.yaml
@@ -4,190 +4,198 @@ fstorm: Firestorm Expansion Disc (English)
 		Install/README.TXT: f2810b540fce8f3880250213ee08c57780d81c20
 		Install/Language.dll: 4df87c1a2289da57dd14d0a7299546f37357fcca
 	Install:
-		Copy: .
-			^SupportDir|Content/ts/firestorm/scores01.mix: scores01.mix
-		ExtractMix: Install/expand01.mix
-			^SupportDir|Content/ts/firestorm/m_emp.vxl: m_emp.vxl
-			^SupportDir|Content/ts/firestorm/mwar_nod.vxl: mwar_nod.vxl
-			^SupportDir|Content/ts/firestorm/djuggbar.vxl: djuggbar.vxl
-			^SupportDir|Content/ts/firestorm/sgen.vxl: sgen.vxl
-			^SupportDir|Content/ts/firestorm/m_emp.hva: m_emp.hva
-			^SupportDir|Content/ts/firestorm/mwar_nod.hva: mwar_nod.hva
-			^SupportDir|Content/ts/firestorm/djuggbar.hva: djuggbar.hva
-			^SupportDir|Content/ts/firestorm/sgen.hva: sgen.hva
-			^SupportDir|Content/ts/firestorm/c_kodiak.shp: c_kodiak.shp
-			^SupportDir|Content/ts/firestorm/k_light1.shp: k_light1.shp
-			^SupportDir|Content/ts/firestorm/k_light2.shp: k_light2.shp
-			^SupportDir|Content/ts/firestorm/mwarmk.shp: mwarmk.shp
-			^SupportDir|Content/ts/firestorm/mstlmk.shp: mstlmk.shp
-			^SupportDir|Content/ts/firestorm/defdmk.shp: defdmk.shp
-			^SupportDir|Content/ts/firestorm/coremk.shp: coremk.shp
-			^SupportDir|Content/ts/firestorm/ecache01.mix: ecache01.mix
-			^SupportDir|Content/ts/firestorm/e01sc01.mix: e01sc01.mix
-			^SupportDir|Content/ts/firestorm/e01sc02.mix: e01sc02.mix
-			^SupportDir|Content/ts/firestorm/e01vox01.mix: e01vox01.mix
-			^SupportDir|Content/ts/firestorm/e01vox02.mix: e01vox02.mix
-			^SupportDir|Content/ts/firestorm/sounds01.mix: sounds01.mix
-			^SupportDir|Content/ts/firestorm/isotemp.mix: isotemp.mix
-			^SupportDir|Content/ts/firestorm/temperat.mix: temperat.mix
-		ExtractMix: ^SupportDir|Content/ts/firestorm/isotemp.mix
-			^SupportDir|Content/ts/firestorm/blat01.tem: blat01.tem
-			^SupportDir|Content/ts/firestorm/blat01a.tem: blat01a.tem
-			^SupportDir|Content/ts/firestorm/blat02.tem: blat02.tem
-			^SupportDir|Content/ts/firestorm/blat02a.tem: blat02a.tem
-			^SupportDir|Content/ts/firestorm/blat03.tem: blat03.tem
-			^SupportDir|Content/ts/firestorm/blat03a.tem: blat03a.tem
-			^SupportDir|Content/ts/firestorm/blat04.tem: blat04.tem
-			^SupportDir|Content/ts/firestorm/blat04a.tem: blat04a.tem
-			^SupportDir|Content/ts/firestorm/blat05.tem: blat05.tem
-			^SupportDir|Content/ts/firestorm/blat05a.tem: blat05a.tem
-			^SupportDir|Content/ts/firestorm/blat06.tem: blat06.tem
-			^SupportDir|Content/ts/firestorm/blat06a.tem: blat06a.tem
-			^SupportDir|Content/ts/firestorm/blat07.tem: blat07.tem
-			^SupportDir|Content/ts/firestorm/blat07a.tem: blat07a.tem
-			^SupportDir|Content/ts/firestorm/blat08.tem: blat08.tem
-			^SupportDir|Content/ts/firestorm/blat08a.tem: blat08a.tem
-			^SupportDir|Content/ts/firestorm/blat09.tem: blat09.tem
-			^SupportDir|Content/ts/firestorm/blat09a.tem: blat09a.tem
-			^SupportDir|Content/ts/firestorm/blat10.tem: blat10.tem
-			^SupportDir|Content/ts/firestorm/blat10a.tem: blat10a.tem
-			^SupportDir|Content/ts/firestorm/blat11.tem: blat11.tem
-			^SupportDir|Content/ts/firestorm/blat11a.tem: blat11a.tem
-			^SupportDir|Content/ts/firestorm/blat12.tem: blat12.tem
-			^SupportDir|Content/ts/firestorm/blat12a.tem: blat12a.tem
-			^SupportDir|Content/ts/firestorm/blat13.tem: blat13.tem
-			^SupportDir|Content/ts/firestorm/blat13a.tem: blat13a.tem
-			^SupportDir|Content/ts/firestorm/blat14.tem: blat14.tem
-			^SupportDir|Content/ts/firestorm/blat14a.tem: blat14a.tem
-			^SupportDir|Content/ts/firestorm/blat15.tem: blat15.tem
-			^SupportDir|Content/ts/firestorm/blat15a.tem: blat15a.tem
-			^SupportDir|Content/ts/firestorm/blat16.tem: blat16.tem
-			^SupportDir|Content/ts/firestorm/blat16a.tem: blat16a.tem
-			^SupportDir|Content/ts/firestorm/blue01.tem: blue01.tem
-			^SupportDir|Content/ts/firestorm/blue01a.tem: blue01a.tem
-			^SupportDir|Content/ts/firestorm/blue01b.tem: blue01b.tem
-			^SupportDir|Content/ts/firestorm/blue01c.tem: blue01c.tem
-			^SupportDir|Content/ts/firestorm/blue01d.tem: blue01d.tem
-			^SupportDir|Content/ts/firestorm/blue01e.tem: blue01e.tem
-			^SupportDir|Content/ts/firestorm/blue01f.tem: blue01f.tem
-			^SupportDir|Content/ts/firestorm/blue01g.tem: blue01g.tem
-			^SupportDir|Content/ts/firestorm/ccliff01.tem: ccliff01.tem
-			^SupportDir|Content/ts/firestorm/ccliff02.tem: ccliff02.tem
-			^SupportDir|Content/ts/firestorm/ccliff03.tem: ccliff03.tem
-			^SupportDir|Content/ts/firestorm/ccliff04.tem: ccliff04.tem
-			^SupportDir|Content/ts/firestorm/ccliff05.tem: ccliff05.tem
-			^SupportDir|Content/ts/firestorm/ccliff06.tem: ccliff06.tem
-			^SupportDir|Content/ts/firestorm/crash01.tem: crash01.tem
-			^SupportDir|Content/ts/firestorm/crash02.tem: crash02.tem
-			^SupportDir|Content/ts/firestorm/crash03.tem: crash03.tem
-			^SupportDir|Content/ts/firestorm/crash04.tem: crash04.tem
-			^SupportDir|Content/ts/firestorm/crash05.tem: crash05.tem
-			^SupportDir|Content/ts/firestorm/crash06.tem: crash06.tem
-			^SupportDir|Content/ts/firestorm/crash07.tem: crash07.tem
-			^SupportDir|Content/ts/firestorm/crys01.tem: crys01.tem
-			^SupportDir|Content/ts/firestorm/crys01a.tem: crys01a.tem
-			^SupportDir|Content/ts/firestorm/crys01b.tem: crys01b.tem
-			^SupportDir|Content/ts/firestorm/crys01c.tem: crys01c.tem
-			^SupportDir|Content/ts/firestorm/crys01d.tem: crys01d.tem
-			^SupportDir|Content/ts/firestorm/crys01e.tem: crys01e.tem
-			^SupportDir|Content/ts/firestorm/crys01f.tem: crys01f.tem
-			^SupportDir|Content/ts/firestorm/crys01g.tem: crys01g.tem
-			^SupportDir|Content/ts/firestorm/cylat01.tem: cylat01.tem
-			^SupportDir|Content/ts/firestorm/cylat01a.tem: cylat01a.tem
-			^SupportDir|Content/ts/firestorm/cylat02.tem: cylat02.tem
-			^SupportDir|Content/ts/firestorm/cylat02a.tem: cylat02a.tem
-			^SupportDir|Content/ts/firestorm/cylat03.tem: cylat03.tem
-			^SupportDir|Content/ts/firestorm/cylat03a.tem: cylat03a.tem
-			^SupportDir|Content/ts/firestorm/cylat04.tem: cylat04.tem
-			^SupportDir|Content/ts/firestorm/cylat04a.tem: cylat04a.tem
-			^SupportDir|Content/ts/firestorm/cylat05.tem: cylat05.tem
-			^SupportDir|Content/ts/firestorm/cylat05a.tem: cylat05a.tem
-			^SupportDir|Content/ts/firestorm/cylat06.tem: cylat06.tem
-			^SupportDir|Content/ts/firestorm/cylat06a.tem: cylat06a.tem
-			^SupportDir|Content/ts/firestorm/cylat07.tem: cylat07.tem
-			^SupportDir|Content/ts/firestorm/cylat07a.tem: cylat07a.tem
-			^SupportDir|Content/ts/firestorm/cylat08.tem: cylat08.tem
-			^SupportDir|Content/ts/firestorm/cylat08a.tem: cylat08a.tem
-			^SupportDir|Content/ts/firestorm/cylat09.tem: cylat09.tem
-			^SupportDir|Content/ts/firestorm/cylat09a.tem: cylat09a.tem
-			^SupportDir|Content/ts/firestorm/cylat10.tem: cylat10.tem
-			^SupportDir|Content/ts/firestorm/cylat10a.tem: cylat10a.tem
-			^SupportDir|Content/ts/firestorm/cylat11.tem: cylat11.tem
-			^SupportDir|Content/ts/firestorm/cylat11a.tem: cylat11a.tem
-			^SupportDir|Content/ts/firestorm/cylat12.tem: cylat12.tem
-			^SupportDir|Content/ts/firestorm/cylat12a.tem: cylat12a.tem
-			^SupportDir|Content/ts/firestorm/cylat13.tem: cylat13.tem
-			^SupportDir|Content/ts/firestorm/cylat13a.tem: cylat13a.tem
-			^SupportDir|Content/ts/firestorm/cylat14.tem: cylat14.tem
-			^SupportDir|Content/ts/firestorm/cylat14a.tem: cylat14a.tem
-			^SupportDir|Content/ts/firestorm/cylat15.tem: cylat15.tem
-			^SupportDir|Content/ts/firestorm/cylat15a.tem: cylat15a.tem
-			^SupportDir|Content/ts/firestorm/cylat16.tem: cylat16.tem
-			^SupportDir|Content/ts/firestorm/cylat16a.tem: cylat16a.tem
-			^SupportDir|Content/ts/firestorm/slat01.tem: slat01.tem
-			^SupportDir|Content/ts/firestorm/slat01a.tem: slat01a.tem
-			^SupportDir|Content/ts/firestorm/slat02.tem: slat02.tem
-			^SupportDir|Content/ts/firestorm/slat02a.tem: slat02a.tem
-			^SupportDir|Content/ts/firestorm/slat03.tem: slat03.tem
-			^SupportDir|Content/ts/firestorm/slat03a.tem: slat03a.tem
-			^SupportDir|Content/ts/firestorm/slat04.tem: slat04.tem
-			^SupportDir|Content/ts/firestorm/slat04a.tem: slat04a.tem
-			^SupportDir|Content/ts/firestorm/slat05.tem: slat05.tem
-			^SupportDir|Content/ts/firestorm/slat05a.tem: slat05a.tem
-			^SupportDir|Content/ts/firestorm/slat06.tem: slat06.tem
-			^SupportDir|Content/ts/firestorm/slat06a.tem: slat06a.tem
-			^SupportDir|Content/ts/firestorm/slat07.tem: slat07.tem
-			^SupportDir|Content/ts/firestorm/slat07a.tem: slat07a.tem
-			^SupportDir|Content/ts/firestorm/slat08.tem: slat08.tem
-			^SupportDir|Content/ts/firestorm/slat08a.tem: slat08a.tem
-			^SupportDir|Content/ts/firestorm/slat09.tem: slat09.tem
-			^SupportDir|Content/ts/firestorm/slat09a.tem: slat09a.tem
-			^SupportDir|Content/ts/firestorm/slat10.tem: slat10.tem
-			^SupportDir|Content/ts/firestorm/slat10a.tem: slat10a.tem
-			^SupportDir|Content/ts/firestorm/slat11.tem: slat11.tem
-			^SupportDir|Content/ts/firestorm/slat11a.tem: slat11a.tem
-			^SupportDir|Content/ts/firestorm/slat12.tem: slat12.tem
-			^SupportDir|Content/ts/firestorm/slat12a.tem: slat12a.tem
-			^SupportDir|Content/ts/firestorm/slat13.tem: slat13.tem
-			^SupportDir|Content/ts/firestorm/slat13a.tem: slat13a.tem
-			^SupportDir|Content/ts/firestorm/slat14.tem: slat14.tem
-			^SupportDir|Content/ts/firestorm/slat14a.tem: slat14a.tem
-			^SupportDir|Content/ts/firestorm/slat15.tem: slat15.tem
-			^SupportDir|Content/ts/firestorm/slat15a.tem: slat15a.tem
-			^SupportDir|Content/ts/firestorm/slat16.tem: slat16.tem
-			^SupportDir|Content/ts/firestorm/slat16a.tem: slat16a.tem
-			^SupportDir|Content/ts/firestorm/swamp01.tem: swamp01.tem
-			^SupportDir|Content/ts/firestorm/swamp01a.tem: swamp01a.tem
-			^SupportDir|Content/ts/firestorm/swamp01b.tem: swamp01b.tem
-			^SupportDir|Content/ts/firestorm/swamp01c.tem: swamp01c.tem
-			^SupportDir|Content/ts/firestorm/swamp01d.tem: swamp01d.tem
-			^SupportDir|Content/ts/firestorm/swamp01e.tem: swamp01e.tem
-			^SupportDir|Content/ts/firestorm/swamp01f.tem: swamp01f.tem
-			^SupportDir|Content/ts/firestorm/swamp01g.tem: swamp01g.tem
-			^SupportDir|Content/ts/firestorm/swamp02.tem: swamp02.tem
-			^SupportDir|Content/ts/firestorm/swamp03.tem: swamp03.tem
-			^SupportDir|Content/ts/firestorm/swamp04.tem: swamp04.tem
-			^SupportDir|Content/ts/firestorm/swamp05.tem: swamp05.tem
-			^SupportDir|Content/ts/firestorm/swamp06.tem: swamp06.tem
-			^SupportDir|Content/ts/firestorm/swamp07.tem: swamp07.tem
-			^SupportDir|Content/ts/firestorm/swamp08.tem: swamp08.tem
-			^SupportDir|Content/ts/firestorm/swamp09.tem: swamp09.tem
-		Delete: ^SupportDir|Content/ts/firestorm/isotemp.mix
-		ExtractMix: ^SupportDir|Content/ts/firestorm/temperat.mix
-			^SupportDir|Content/ts/firestorm/fona01.tem: fona01.tem
-			^SupportDir|Content/ts/firestorm/fona02.tem: fona02.tem
-			^SupportDir|Content/ts/firestorm/fona03.tem: fona03.tem
-			^SupportDir|Content/ts/firestorm/fona04.tem: fona04.tem
-			^SupportDir|Content/ts/firestorm/fona05.tem: fona05.tem
-			^SupportDir|Content/ts/firestorm/fona06.tem: fona06.tem
-			^SupportDir|Content/ts/firestorm/fona07.tem: fona07.tem
-			^SupportDir|Content/ts/firestorm/fona08.tem: fona08.tem
-			^SupportDir|Content/ts/firestorm/fona09.tem: fona09.tem
-			^SupportDir|Content/ts/firestorm/fona10.tem: fona10.tem
-			^SupportDir|Content/ts/firestorm/fona11.tem: fona11.tem
-			^SupportDir|Content/ts/firestorm/fona12.tem: fona12.tem
-			^SupportDir|Content/ts/firestorm/fona13.tem: fona13.tem
-			^SupportDir|Content/ts/firestorm/fona14.tem: fona14.tem
-			^SupportDir|Content/ts/firestorm/fona15.tem: fona15.tem
-			^SupportDir|Content/ts/firestorm/bigblue3.tem: bigblue3.tem
-		Delete: ^SupportDir|Content/ts/firestorm/temperat.mix
+		# Firestorm expansion files:
+		ContentPackage:
+			Name: fstorm
+			Actions:
+				ExtractMix: Install/expand01.mix
+					^SupportDir|Content/ts/firestorm/m_emp.vxl: m_emp.vxl
+					^SupportDir|Content/ts/firestorm/mwar_nod.vxl: mwar_nod.vxl
+					^SupportDir|Content/ts/firestorm/djuggbar.vxl: djuggbar.vxl
+					^SupportDir|Content/ts/firestorm/sgen.vxl: sgen.vxl
+					^SupportDir|Content/ts/firestorm/m_emp.hva: m_emp.hva
+					^SupportDir|Content/ts/firestorm/mwar_nod.hva: mwar_nod.hva
+					^SupportDir|Content/ts/firestorm/djuggbar.hva: djuggbar.hva
+					^SupportDir|Content/ts/firestorm/sgen.hva: sgen.hva
+					^SupportDir|Content/ts/firestorm/c_kodiak.shp: c_kodiak.shp
+					^SupportDir|Content/ts/firestorm/k_light1.shp: k_light1.shp
+					^SupportDir|Content/ts/firestorm/k_light2.shp: k_light2.shp
+					^SupportDir|Content/ts/firestorm/mwarmk.shp: mwarmk.shp
+					^SupportDir|Content/ts/firestorm/mstlmk.shp: mstlmk.shp
+					^SupportDir|Content/ts/firestorm/defdmk.shp: defdmk.shp
+					^SupportDir|Content/ts/firestorm/coremk.shp: coremk.shp
+					^SupportDir|Content/ts/firestorm/ecache01.mix: ecache01.mix
+					^SupportDir|Content/ts/firestorm/e01sc01.mix: e01sc01.mix
+					^SupportDir|Content/ts/firestorm/e01sc02.mix: e01sc02.mix
+					^SupportDir|Content/ts/firestorm/e01vox01.mix: e01vox01.mix
+					^SupportDir|Content/ts/firestorm/e01vox02.mix: e01vox02.mix
+					^SupportDir|Content/ts/firestorm/sounds01.mix: sounds01.mix
+					^SupportDir|Content/ts/firestorm/isotemp.mix: isotemp.mix
+					^SupportDir|Content/ts/firestorm/temperat.mix: temperat.mix
+				ExtractMix: ^SupportDir|Content/ts/firestorm/isotemp.mix
+					^SupportDir|Content/ts/firestorm/blat01.tem: blat01.tem
+					^SupportDir|Content/ts/firestorm/blat01a.tem: blat01a.tem
+					^SupportDir|Content/ts/firestorm/blat02.tem: blat02.tem
+					^SupportDir|Content/ts/firestorm/blat02a.tem: blat02a.tem
+					^SupportDir|Content/ts/firestorm/blat03.tem: blat03.tem
+					^SupportDir|Content/ts/firestorm/blat03a.tem: blat03a.tem
+					^SupportDir|Content/ts/firestorm/blat04.tem: blat04.tem
+					^SupportDir|Content/ts/firestorm/blat04a.tem: blat04a.tem
+					^SupportDir|Content/ts/firestorm/blat05.tem: blat05.tem
+					^SupportDir|Content/ts/firestorm/blat05a.tem: blat05a.tem
+					^SupportDir|Content/ts/firestorm/blat06.tem: blat06.tem
+					^SupportDir|Content/ts/firestorm/blat06a.tem: blat06a.tem
+					^SupportDir|Content/ts/firestorm/blat07.tem: blat07.tem
+					^SupportDir|Content/ts/firestorm/blat07a.tem: blat07a.tem
+					^SupportDir|Content/ts/firestorm/blat08.tem: blat08.tem
+					^SupportDir|Content/ts/firestorm/blat08a.tem: blat08a.tem
+					^SupportDir|Content/ts/firestorm/blat09.tem: blat09.tem
+					^SupportDir|Content/ts/firestorm/blat09a.tem: blat09a.tem
+					^SupportDir|Content/ts/firestorm/blat10.tem: blat10.tem
+					^SupportDir|Content/ts/firestorm/blat10a.tem: blat10a.tem
+					^SupportDir|Content/ts/firestorm/blat11.tem: blat11.tem
+					^SupportDir|Content/ts/firestorm/blat11a.tem: blat11a.tem
+					^SupportDir|Content/ts/firestorm/blat12.tem: blat12.tem
+					^SupportDir|Content/ts/firestorm/blat12a.tem: blat12a.tem
+					^SupportDir|Content/ts/firestorm/blat13.tem: blat13.tem
+					^SupportDir|Content/ts/firestorm/blat13a.tem: blat13a.tem
+					^SupportDir|Content/ts/firestorm/blat14.tem: blat14.tem
+					^SupportDir|Content/ts/firestorm/blat14a.tem: blat14a.tem
+					^SupportDir|Content/ts/firestorm/blat15.tem: blat15.tem
+					^SupportDir|Content/ts/firestorm/blat15a.tem: blat15a.tem
+					^SupportDir|Content/ts/firestorm/blat16.tem: blat16.tem
+					^SupportDir|Content/ts/firestorm/blat16a.tem: blat16a.tem
+					^SupportDir|Content/ts/firestorm/blue01.tem: blue01.tem
+					^SupportDir|Content/ts/firestorm/blue01a.tem: blue01a.tem
+					^SupportDir|Content/ts/firestorm/blue01b.tem: blue01b.tem
+					^SupportDir|Content/ts/firestorm/blue01c.tem: blue01c.tem
+					^SupportDir|Content/ts/firestorm/blue01d.tem: blue01d.tem
+					^SupportDir|Content/ts/firestorm/blue01e.tem: blue01e.tem
+					^SupportDir|Content/ts/firestorm/blue01f.tem: blue01f.tem
+					^SupportDir|Content/ts/firestorm/blue01g.tem: blue01g.tem
+					^SupportDir|Content/ts/firestorm/ccliff01.tem: ccliff01.tem
+					^SupportDir|Content/ts/firestorm/ccliff02.tem: ccliff02.tem
+					^SupportDir|Content/ts/firestorm/ccliff03.tem: ccliff03.tem
+					^SupportDir|Content/ts/firestorm/ccliff04.tem: ccliff04.tem
+					^SupportDir|Content/ts/firestorm/ccliff05.tem: ccliff05.tem
+					^SupportDir|Content/ts/firestorm/ccliff06.tem: ccliff06.tem
+					^SupportDir|Content/ts/firestorm/crash01.tem: crash01.tem
+					^SupportDir|Content/ts/firestorm/crash02.tem: crash02.tem
+					^SupportDir|Content/ts/firestorm/crash03.tem: crash03.tem
+					^SupportDir|Content/ts/firestorm/crash04.tem: crash04.tem
+					^SupportDir|Content/ts/firestorm/crash05.tem: crash05.tem
+					^SupportDir|Content/ts/firestorm/crash06.tem: crash06.tem
+					^SupportDir|Content/ts/firestorm/crash07.tem: crash07.tem
+					^SupportDir|Content/ts/firestorm/crys01.tem: crys01.tem
+					^SupportDir|Content/ts/firestorm/crys01a.tem: crys01a.tem
+					^SupportDir|Content/ts/firestorm/crys01b.tem: crys01b.tem
+					^SupportDir|Content/ts/firestorm/crys01c.tem: crys01c.tem
+					^SupportDir|Content/ts/firestorm/crys01d.tem: crys01d.tem
+					^SupportDir|Content/ts/firestorm/crys01e.tem: crys01e.tem
+					^SupportDir|Content/ts/firestorm/crys01f.tem: crys01f.tem
+					^SupportDir|Content/ts/firestorm/crys01g.tem: crys01g.tem
+					^SupportDir|Content/ts/firestorm/cylat01.tem: cylat01.tem
+					^SupportDir|Content/ts/firestorm/cylat01a.tem: cylat01a.tem
+					^SupportDir|Content/ts/firestorm/cylat02.tem: cylat02.tem
+					^SupportDir|Content/ts/firestorm/cylat02a.tem: cylat02a.tem
+					^SupportDir|Content/ts/firestorm/cylat03.tem: cylat03.tem
+					^SupportDir|Content/ts/firestorm/cylat03a.tem: cylat03a.tem
+					^SupportDir|Content/ts/firestorm/cylat04.tem: cylat04.tem
+					^SupportDir|Content/ts/firestorm/cylat04a.tem: cylat04a.tem
+					^SupportDir|Content/ts/firestorm/cylat05.tem: cylat05.tem
+					^SupportDir|Content/ts/firestorm/cylat05a.tem: cylat05a.tem
+					^SupportDir|Content/ts/firestorm/cylat06.tem: cylat06.tem
+					^SupportDir|Content/ts/firestorm/cylat06a.tem: cylat06a.tem
+					^SupportDir|Content/ts/firestorm/cylat07.tem: cylat07.tem
+					^SupportDir|Content/ts/firestorm/cylat07a.tem: cylat07a.tem
+					^SupportDir|Content/ts/firestorm/cylat08.tem: cylat08.tem
+					^SupportDir|Content/ts/firestorm/cylat08a.tem: cylat08a.tem
+					^SupportDir|Content/ts/firestorm/cylat09.tem: cylat09.tem
+					^SupportDir|Content/ts/firestorm/cylat09a.tem: cylat09a.tem
+					^SupportDir|Content/ts/firestorm/cylat10.tem: cylat10.tem
+					^SupportDir|Content/ts/firestorm/cylat10a.tem: cylat10a.tem
+					^SupportDir|Content/ts/firestorm/cylat11.tem: cylat11.tem
+					^SupportDir|Content/ts/firestorm/cylat11a.tem: cylat11a.tem
+					^SupportDir|Content/ts/firestorm/cylat12.tem: cylat12.tem
+					^SupportDir|Content/ts/firestorm/cylat12a.tem: cylat12a.tem
+					^SupportDir|Content/ts/firestorm/cylat13.tem: cylat13.tem
+					^SupportDir|Content/ts/firestorm/cylat13a.tem: cylat13a.tem
+					^SupportDir|Content/ts/firestorm/cylat14.tem: cylat14.tem
+					^SupportDir|Content/ts/firestorm/cylat14a.tem: cylat14a.tem
+					^SupportDir|Content/ts/firestorm/cylat15.tem: cylat15.tem
+					^SupportDir|Content/ts/firestorm/cylat15a.tem: cylat15a.tem
+					^SupportDir|Content/ts/firestorm/cylat16.tem: cylat16.tem
+					^SupportDir|Content/ts/firestorm/cylat16a.tem: cylat16a.tem
+					^SupportDir|Content/ts/firestorm/slat01.tem: slat01.tem
+					^SupportDir|Content/ts/firestorm/slat01a.tem: slat01a.tem
+					^SupportDir|Content/ts/firestorm/slat02.tem: slat02.tem
+					^SupportDir|Content/ts/firestorm/slat02a.tem: slat02a.tem
+					^SupportDir|Content/ts/firestorm/slat03.tem: slat03.tem
+					^SupportDir|Content/ts/firestorm/slat03a.tem: slat03a.tem
+					^SupportDir|Content/ts/firestorm/slat04.tem: slat04.tem
+					^SupportDir|Content/ts/firestorm/slat04a.tem: slat04a.tem
+					^SupportDir|Content/ts/firestorm/slat05.tem: slat05.tem
+					^SupportDir|Content/ts/firestorm/slat05a.tem: slat05a.tem
+					^SupportDir|Content/ts/firestorm/slat06.tem: slat06.tem
+					^SupportDir|Content/ts/firestorm/slat06a.tem: slat06a.tem
+					^SupportDir|Content/ts/firestorm/slat07.tem: slat07.tem
+					^SupportDir|Content/ts/firestorm/slat07a.tem: slat07a.tem
+					^SupportDir|Content/ts/firestorm/slat08.tem: slat08.tem
+					^SupportDir|Content/ts/firestorm/slat08a.tem: slat08a.tem
+					^SupportDir|Content/ts/firestorm/slat09.tem: slat09.tem
+					^SupportDir|Content/ts/firestorm/slat09a.tem: slat09a.tem
+					^SupportDir|Content/ts/firestorm/slat10.tem: slat10.tem
+					^SupportDir|Content/ts/firestorm/slat10a.tem: slat10a.tem
+					^SupportDir|Content/ts/firestorm/slat11.tem: slat11.tem
+					^SupportDir|Content/ts/firestorm/slat11a.tem: slat11a.tem
+					^SupportDir|Content/ts/firestorm/slat12.tem: slat12.tem
+					^SupportDir|Content/ts/firestorm/slat12a.tem: slat12a.tem
+					^SupportDir|Content/ts/firestorm/slat13.tem: slat13.tem
+					^SupportDir|Content/ts/firestorm/slat13a.tem: slat13a.tem
+					^SupportDir|Content/ts/firestorm/slat14.tem: slat14.tem
+					^SupportDir|Content/ts/firestorm/slat14a.tem: slat14a.tem
+					^SupportDir|Content/ts/firestorm/slat15.tem: slat15.tem
+					^SupportDir|Content/ts/firestorm/slat15a.tem: slat15a.tem
+					^SupportDir|Content/ts/firestorm/slat16.tem: slat16.tem
+					^SupportDir|Content/ts/firestorm/slat16a.tem: slat16a.tem
+					^SupportDir|Content/ts/firestorm/swamp01.tem: swamp01.tem
+					^SupportDir|Content/ts/firestorm/swamp01a.tem: swamp01a.tem
+					^SupportDir|Content/ts/firestorm/swamp01b.tem: swamp01b.tem
+					^SupportDir|Content/ts/firestorm/swamp01c.tem: swamp01c.tem
+					^SupportDir|Content/ts/firestorm/swamp01d.tem: swamp01d.tem
+					^SupportDir|Content/ts/firestorm/swamp01e.tem: swamp01e.tem
+					^SupportDir|Content/ts/firestorm/swamp01f.tem: swamp01f.tem
+					^SupportDir|Content/ts/firestorm/swamp01g.tem: swamp01g.tem
+					^SupportDir|Content/ts/firestorm/swamp02.tem: swamp02.tem
+					^SupportDir|Content/ts/firestorm/swamp03.tem: swamp03.tem
+					^SupportDir|Content/ts/firestorm/swamp04.tem: swamp04.tem
+					^SupportDir|Content/ts/firestorm/swamp05.tem: swamp05.tem
+					^SupportDir|Content/ts/firestorm/swamp06.tem: swamp06.tem
+					^SupportDir|Content/ts/firestorm/swamp07.tem: swamp07.tem
+					^SupportDir|Content/ts/firestorm/swamp08.tem: swamp08.tem
+					^SupportDir|Content/ts/firestorm/swamp09.tem: swamp09.tem
+				Delete: ^SupportDir|Content/ts/firestorm/isotemp.mix
+				ExtractMix: ^SupportDir|Content/ts/firestorm/temperat.mix
+					^SupportDir|Content/ts/firestorm/fona01.tem: fona01.tem
+					^SupportDir|Content/ts/firestorm/fona02.tem: fona02.tem
+					^SupportDir|Content/ts/firestorm/fona03.tem: fona03.tem
+					^SupportDir|Content/ts/firestorm/fona04.tem: fona04.tem
+					^SupportDir|Content/ts/firestorm/fona05.tem: fona05.tem
+					^SupportDir|Content/ts/firestorm/fona06.tem: fona06.tem
+					^SupportDir|Content/ts/firestorm/fona07.tem: fona07.tem
+					^SupportDir|Content/ts/firestorm/fona08.tem: fona08.tem
+					^SupportDir|Content/ts/firestorm/fona09.tem: fona09.tem
+					^SupportDir|Content/ts/firestorm/fona10.tem: fona10.tem
+					^SupportDir|Content/ts/firestorm/fona11.tem: fona11.tem
+					^SupportDir|Content/ts/firestorm/fona12.tem: fona12.tem
+					^SupportDir|Content/ts/firestorm/fona13.tem: fona13.tem
+					^SupportDir|Content/ts/firestorm/fona14.tem: fona14.tem
+					^SupportDir|Content/ts/firestorm/fona15.tem: fona15.tem
+					^SupportDir|Content/ts/firestorm/bigblue3.tem: bigblue3.tem
+				Delete: ^SupportDir|Content/ts/firestorm/temperat.mix
+		# Firestorm expansion music (optional):
+		ContentPackage:
+			Name: fstorm-music
+			Actions:
+				Copy: .
+					^SupportDir|Content/ts/firestorm/scores01.mix: scores01.mix
diff --git a/mods/ts/installer/firstdecade.yaml b/mods/ts/installer/firstdecade.yaml
index deab188e7d..381a32ff0e 100644
--- a/mods/ts/installer/firstdecade.yaml
+++ b/mods/ts/installer/firstdecade.yaml
@@ -4,214 +4,242 @@ tfd: C&C The First Decade (English)
 		data1.hdr: bef3a08c3fc1b1caf28ca0dbb97c1f900005930e
 		data1.cab: 12ad6113a6890a1b4d5651a75378c963eaf513b9
 	Install:
-		ExtractIscab: data1.hdr
-			Volumes:
-				6: data6.cab
-				7: data7.cab
-			Extract:
-				^SupportDir|Content/ts/scores.mix: Tiberian Sun\SUN\SCORES.MIX
-				^SupportDir|Content/ts/tibsun.mix: Tiberian Sun\SUN\TIBSUN.MIX
-				^SupportDir|Content/ts/expand01.mix: Tiberian Sun\SUN\expand01.mix
-				^SupportDir|Content/ts/firestorm/scores01.mix: Tiberian Sun\SUN\scores01.mix
-		ExtractMix: ^SupportDir|Content/ts/tibsun.mix
-			^SupportDir|Content/ts/cache.mix: cache.mix
-			^SupportDir|Content/ts/conquer.mix: conquer.mix
-			^SupportDir|Content/ts/isosnow.mix: isosnow.mix
-			^SupportDir|Content/ts/isotemp.mix: isotemp.mix
-			^SupportDir|Content/ts/local.mix: local.mix
-			^SupportDir|Content/ts/sidec01.mix: sidec01.mix
-			^SupportDir|Content/ts/sidec02.mix: sidec02.mix
-			^SupportDir|Content/ts/snow.mix: snow.mix
-			^SupportDir|Content/ts/sno.mix: sno.mix
-			^SupportDir|Content/ts/sounds.mix: sounds.mix
-			^SupportDir|Content/ts/speech01.mix: speech01.mix
-			^SupportDir|Content/ts/speech02.mix: speech02.mix
-			^SupportDir|Content/ts/tem.mix: tem.mix
-			^SupportDir|Content/ts/temperat.mix: temperat.mix
-		Delete: ^SupportDir|Content/ts/tibsun.mix
-		ExtractMix: ^SupportDir|Content/ts/expand01.mix
-			^SupportDir|Content/ts/firestorm/m_emp.vxl: m_emp.vxl
-			^SupportDir|Content/ts/firestorm/mwar_nod.vxl: mwar_nod.vxl
-			^SupportDir|Content/ts/firestorm/djuggbar.vxl: djuggbar.vxl
-			^SupportDir|Content/ts/firestorm/sgen.vxl: sgen.vxl
-			^SupportDir|Content/ts/firestorm/m_emp.hva: m_emp.hva
-			^SupportDir|Content/ts/firestorm/mwar_nod.hva: mwar_nod.hva
-			^SupportDir|Content/ts/firestorm/djuggbar.hva: djuggbar.hva
-			^SupportDir|Content/ts/firestorm/sgen.hva: sgen.hva
-			^SupportDir|Content/ts/firestorm/c_kodiak.shp: c_kodiak.shp
-			^SupportDir|Content/ts/firestorm/k_light1.shp: k_light1.shp
-			^SupportDir|Content/ts/firestorm/k_light2.shp: k_light2.shp
-			^SupportDir|Content/ts/firestorm/mwarmk.shp: mwarmk.shp
-			^SupportDir|Content/ts/firestorm/mstlmk.shp: mstlmk.shp
-			^SupportDir|Content/ts/firestorm/defdmk.shp: defdmk.shp
-			^SupportDir|Content/ts/firestorm/coremk.shp: coremk.shp
-			^SupportDir|Content/ts/firestorm/ecache01.mix: ecache01.mix
-			^SupportDir|Content/ts/firestorm/e01sc01.mix: e01sc01.mix
-			^SupportDir|Content/ts/firestorm/e01sc02.mix: e01sc02.mix
-			^SupportDir|Content/ts/firestorm/e01vox01.mix: e01vox01.mix
-			^SupportDir|Content/ts/firestorm/e01vox02.mix: e01vox02.mix
-			^SupportDir|Content/ts/firestorm/sounds01.mix: sounds01.mix
-			^SupportDir|Content/ts/firestorm/isotemp.mix: isotemp.mix
-			^SupportDir|Content/ts/firestorm/temperat.mix: temperat.mix
-		Delete: ^SupportDir|Content/ts/expand01.mix
-		ExtractMix: ^SupportDir|Content/ts/firestorm/isotemp.mix
-			^SupportDir|Content/ts/firestorm/blat01.tem: blat01.tem
-			^SupportDir|Content/ts/firestorm/blat01a.tem: blat01a.tem
-			^SupportDir|Content/ts/firestorm/blat02.tem: blat02.tem
-			^SupportDir|Content/ts/firestorm/blat02a.tem: blat02a.tem
-			^SupportDir|Content/ts/firestorm/blat03.tem: blat03.tem
-			^SupportDir|Content/ts/firestorm/blat03a.tem: blat03a.tem
-			^SupportDir|Content/ts/firestorm/blat04.tem: blat04.tem
-			^SupportDir|Content/ts/firestorm/blat04a.tem: blat04a.tem
-			^SupportDir|Content/ts/firestorm/blat05.tem: blat05.tem
-			^SupportDir|Content/ts/firestorm/blat05a.tem: blat05a.tem
-			^SupportDir|Content/ts/firestorm/blat06.tem: blat06.tem
-			^SupportDir|Content/ts/firestorm/blat06a.tem: blat06a.tem
-			^SupportDir|Content/ts/firestorm/blat07.tem: blat07.tem
-			^SupportDir|Content/ts/firestorm/blat07a.tem: blat07a.tem
-			^SupportDir|Content/ts/firestorm/blat08.tem: blat08.tem
-			^SupportDir|Content/ts/firestorm/blat08a.tem: blat08a.tem
-			^SupportDir|Content/ts/firestorm/blat09.tem: blat09.tem
-			^SupportDir|Content/ts/firestorm/blat09a.tem: blat09a.tem
-			^SupportDir|Content/ts/firestorm/blat10.tem: blat10.tem
-			^SupportDir|Content/ts/firestorm/blat10a.tem: blat10a.tem
-			^SupportDir|Content/ts/firestorm/blat11.tem: blat11.tem
-			^SupportDir|Content/ts/firestorm/blat11a.tem: blat11a.tem
-			^SupportDir|Content/ts/firestorm/blat12.tem: blat12.tem
-			^SupportDir|Content/ts/firestorm/blat12a.tem: blat12a.tem
-			^SupportDir|Content/ts/firestorm/blat13.tem: blat13.tem
-			^SupportDir|Content/ts/firestorm/blat13a.tem: blat13a.tem
-			^SupportDir|Content/ts/firestorm/blat14.tem: blat14.tem
-			^SupportDir|Content/ts/firestorm/blat14a.tem: blat14a.tem
-			^SupportDir|Content/ts/firestorm/blat15.tem: blat15.tem
-			^SupportDir|Content/ts/firestorm/blat15a.tem: blat15a.tem
-			^SupportDir|Content/ts/firestorm/blat16.tem: blat16.tem
-			^SupportDir|Content/ts/firestorm/blat16a.tem: blat16a.tem
-			^SupportDir|Content/ts/firestorm/blue01.tem: blue01.tem
-			^SupportDir|Content/ts/firestorm/blue01a.tem: blue01a.tem
-			^SupportDir|Content/ts/firestorm/blue01b.tem: blue01b.tem
-			^SupportDir|Content/ts/firestorm/blue01c.tem: blue01c.tem
-			^SupportDir|Content/ts/firestorm/blue01d.tem: blue01d.tem
-			^SupportDir|Content/ts/firestorm/blue01e.tem: blue01e.tem
-			^SupportDir|Content/ts/firestorm/blue01f.tem: blue01f.tem
-			^SupportDir|Content/ts/firestorm/blue01g.tem: blue01g.tem
-			^SupportDir|Content/ts/firestorm/ccliff01.tem: ccliff01.tem
-			^SupportDir|Content/ts/firestorm/ccliff02.tem: ccliff02.tem
-			^SupportDir|Content/ts/firestorm/ccliff03.tem: ccliff03.tem
-			^SupportDir|Content/ts/firestorm/ccliff04.tem: ccliff04.tem
-			^SupportDir|Content/ts/firestorm/ccliff05.tem: ccliff05.tem
-			^SupportDir|Content/ts/firestorm/ccliff06.tem: ccliff06.tem
-			^SupportDir|Content/ts/firestorm/crash01.tem: crash01.tem
-			^SupportDir|Content/ts/firestorm/crash02.tem: crash02.tem
-			^SupportDir|Content/ts/firestorm/crash03.tem: crash03.tem
-			^SupportDir|Content/ts/firestorm/crash04.tem: crash04.tem
-			^SupportDir|Content/ts/firestorm/crash05.tem: crash05.tem
-			^SupportDir|Content/ts/firestorm/crash06.tem: crash06.tem
-			^SupportDir|Content/ts/firestorm/crash07.tem: crash07.tem
-			^SupportDir|Content/ts/firestorm/crys01.tem: crys01.tem
-			^SupportDir|Content/ts/firestorm/crys01a.tem: crys01a.tem
-			^SupportDir|Content/ts/firestorm/crys01b.tem: crys01b.tem
-			^SupportDir|Content/ts/firestorm/crys01c.tem: crys01c.tem
-			^SupportDir|Content/ts/firestorm/crys01d.tem: crys01d.tem
-			^SupportDir|Content/ts/firestorm/crys01e.tem: crys01e.tem
-			^SupportDir|Content/ts/firestorm/crys01f.tem: crys01f.tem
-			^SupportDir|Content/ts/firestorm/crys01g.tem: crys01g.tem
-			^SupportDir|Content/ts/firestorm/cylat01.tem: cylat01.tem
-			^SupportDir|Content/ts/firestorm/cylat01a.tem: cylat01a.tem
-			^SupportDir|Content/ts/firestorm/cylat02.tem: cylat02.tem
-			^SupportDir|Content/ts/firestorm/cylat02a.tem: cylat02a.tem
-			^SupportDir|Content/ts/firestorm/cylat03.tem: cylat03.tem
-			^SupportDir|Content/ts/firestorm/cylat03a.tem: cylat03a.tem
-			^SupportDir|Content/ts/firestorm/cylat04.tem: cylat04.tem
-			^SupportDir|Content/ts/firestorm/cylat04a.tem: cylat04a.tem
-			^SupportDir|Content/ts/firestorm/cylat05.tem: cylat05.tem
-			^SupportDir|Content/ts/firestorm/cylat05a.tem: cylat05a.tem
-			^SupportDir|Content/ts/firestorm/cylat06.tem: cylat06.tem
-			^SupportDir|Content/ts/firestorm/cylat06a.tem: cylat06a.tem
-			^SupportDir|Content/ts/firestorm/cylat07.tem: cylat07.tem
-			^SupportDir|Content/ts/firestorm/cylat07a.tem: cylat07a.tem
-			^SupportDir|Content/ts/firestorm/cylat08.tem: cylat08.tem
-			^SupportDir|Content/ts/firestorm/cylat08a.tem: cylat08a.tem
-			^SupportDir|Content/ts/firestorm/cylat09.tem: cylat09.tem
-			^SupportDir|Content/ts/firestorm/cylat09a.tem: cylat09a.tem
-			^SupportDir|Content/ts/firestorm/cylat10.tem: cylat10.tem
-			^SupportDir|Content/ts/firestorm/cylat10a.tem: cylat10a.tem
-			^SupportDir|Content/ts/firestorm/cylat11.tem: cylat11.tem
-			^SupportDir|Content/ts/firestorm/cylat11a.tem: cylat11a.tem
-			^SupportDir|Content/ts/firestorm/cylat12.tem: cylat12.tem
-			^SupportDir|Content/ts/firestorm/cylat12a.tem: cylat12a.tem
-			^SupportDir|Content/ts/firestorm/cylat13.tem: cylat13.tem
-			^SupportDir|Content/ts/firestorm/cylat13a.tem: cylat13a.tem
-			^SupportDir|Content/ts/firestorm/cylat14.tem: cylat14.tem
-			^SupportDir|Content/ts/firestorm/cylat14a.tem: cylat14a.tem
-			^SupportDir|Content/ts/firestorm/cylat15.tem: cylat15.tem
-			^SupportDir|Content/ts/firestorm/cylat15a.tem: cylat15a.tem
-			^SupportDir|Content/ts/firestorm/cylat16.tem: cylat16.tem
-			^SupportDir|Content/ts/firestorm/cylat16a.tem: cylat16a.tem
-			^SupportDir|Content/ts/firestorm/slat01.tem: slat01.tem
-			^SupportDir|Content/ts/firestorm/slat01a.tem: slat01a.tem
-			^SupportDir|Content/ts/firestorm/slat02.tem: slat02.tem
-			^SupportDir|Content/ts/firestorm/slat02a.tem: slat02a.tem
-			^SupportDir|Content/ts/firestorm/slat03.tem: slat03.tem
-			^SupportDir|Content/ts/firestorm/slat03a.tem: slat03a.tem
-			^SupportDir|Content/ts/firestorm/slat04.tem: slat04.tem
-			^SupportDir|Content/ts/firestorm/slat04a.tem: slat04a.tem
-			^SupportDir|Content/ts/firestorm/slat05.tem: slat05.tem
-			^SupportDir|Content/ts/firestorm/slat05a.tem: slat05a.tem
-			^SupportDir|Content/ts/firestorm/slat06.tem: slat06.tem
-			^SupportDir|Content/ts/firestorm/slat06a.tem: slat06a.tem
-			^SupportDir|Content/ts/firestorm/slat07.tem: slat07.tem
-			^SupportDir|Content/ts/firestorm/slat07a.tem: slat07a.tem
-			^SupportDir|Content/ts/firestorm/slat08.tem: slat08.tem
-			^SupportDir|Content/ts/firestorm/slat08a.tem: slat08a.tem
-			^SupportDir|Content/ts/firestorm/slat09.tem: slat09.tem
-			^SupportDir|Content/ts/firestorm/slat09a.tem: slat09a.tem
-			^SupportDir|Content/ts/firestorm/slat10.tem: slat10.tem
-			^SupportDir|Content/ts/firestorm/slat10a.tem: slat10a.tem
-			^SupportDir|Content/ts/firestorm/slat11.tem: slat11.tem
-			^SupportDir|Content/ts/firestorm/slat11a.tem: slat11a.tem
-			^SupportDir|Content/ts/firestorm/slat12.tem: slat12.tem
-			^SupportDir|Content/ts/firestorm/slat12a.tem: slat12a.tem
-			^SupportDir|Content/ts/firestorm/slat13.tem: slat13.tem
-			^SupportDir|Content/ts/firestorm/slat13a.tem: slat13a.tem
-			^SupportDir|Content/ts/firestorm/slat14.tem: slat14.tem
-			^SupportDir|Content/ts/firestorm/slat14a.tem: slat14a.tem
-			^SupportDir|Content/ts/firestorm/slat15.tem: slat15.tem
-			^SupportDir|Content/ts/firestorm/slat15a.tem: slat15a.tem
-			^SupportDir|Content/ts/firestorm/slat16.tem: slat16.tem
-			^SupportDir|Content/ts/firestorm/slat16a.tem: slat16a.tem
-			^SupportDir|Content/ts/firestorm/swamp01.tem: swamp01.tem
-			^SupportDir|Content/ts/firestorm/swamp01a.tem: swamp01a.tem
-			^SupportDir|Content/ts/firestorm/swamp01b.tem: swamp01b.tem
-			^SupportDir|Content/ts/firestorm/swamp01c.tem: swamp01c.tem
-			^SupportDir|Content/ts/firestorm/swamp01d.tem: swamp01d.tem
-			^SupportDir|Content/ts/firestorm/swamp01e.tem: swamp01e.tem
-			^SupportDir|Content/ts/firestorm/swamp01f.tem: swamp01f.tem
-			^SupportDir|Content/ts/firestorm/swamp01g.tem: swamp01g.tem
-			^SupportDir|Content/ts/firestorm/swamp02.tem: swamp02.tem
-			^SupportDir|Content/ts/firestorm/swamp03.tem: swamp03.tem
-			^SupportDir|Content/ts/firestorm/swamp04.tem: swamp04.tem
-			^SupportDir|Content/ts/firestorm/swamp05.tem: swamp05.tem
-			^SupportDir|Content/ts/firestorm/swamp06.tem: swamp06.tem
-			^SupportDir|Content/ts/firestorm/swamp07.tem: swamp07.tem
-			^SupportDir|Content/ts/firestorm/swamp08.tem: swamp08.tem
-			^SupportDir|Content/ts/firestorm/swamp09.tem: swamp09.tem
-		Delete: ^SupportDir|Content/ts/firestorm/isotemp.mix
-		ExtractMix: ^SupportDir|Content/ts/firestorm/temperat.mix
-			^SupportDir|Content/ts/firestorm/fona01.tem: fona01.tem
-			^SupportDir|Content/ts/firestorm/fona02.tem: fona02.tem
-			^SupportDir|Content/ts/firestorm/fona03.tem: fona03.tem
-			^SupportDir|Content/ts/firestorm/fona04.tem: fona04.tem
-			^SupportDir|Content/ts/firestorm/fona05.tem: fona05.tem
-			^SupportDir|Content/ts/firestorm/fona06.tem: fona06.tem
-			^SupportDir|Content/ts/firestorm/fona07.tem: fona07.tem
-			^SupportDir|Content/ts/firestorm/fona08.tem: fona08.tem
-			^SupportDir|Content/ts/firestorm/fona09.tem: fona09.tem
-			^SupportDir|Content/ts/firestorm/fona10.tem: fona10.tem
-			^SupportDir|Content/ts/firestorm/fona11.tem: fona11.tem
-			^SupportDir|Content/ts/firestorm/fona12.tem: fona12.tem
-			^SupportDir|Content/ts/firestorm/fona13.tem: fona13.tem
-			^SupportDir|Content/ts/firestorm/fona14.tem: fona14.tem
-			^SupportDir|Content/ts/firestorm/fona15.tem: fona15.tem
-			^SupportDir|Content/ts/firestorm/bigblue3.tem: bigblue3.tem
-		Delete: ^SupportDir|Content/ts/firestorm/temperat.mix
+		BeforeInstall:
+			# This one step sets up both required packages - tibsun and fstorm.
+			ExtractIscab: data1.hdr
+				Volumes:
+					6: data6.cab
+					7: data7.cab
+				Extract:
+					^SupportDir|Content/ts/tibsun.mix: Tiberian Sun\SUN\TIBSUN.MIX
+					^SupportDir|Content/ts/expand01.mix: Tiberian Sun\SUN\expand01.mix
+		# Base game files:
+		ContentPackage:
+			Name: tibsun
+			Actions:
+				ExtractMix: ^SupportDir|Content/ts/tibsun.mix
+					^SupportDir|Content/ts/cache.mix: cache.mix
+					^SupportDir|Content/ts/conquer.mix: conquer.mix
+					^SupportDir|Content/ts/isosnow.mix: isosnow.mix
+					^SupportDir|Content/ts/isotemp.mix: isotemp.mix
+					^SupportDir|Content/ts/local.mix: local.mix
+					^SupportDir|Content/ts/sidec01.mix: sidec01.mix
+					^SupportDir|Content/ts/sidec02.mix: sidec02.mix
+					^SupportDir|Content/ts/snow.mix: snow.mix
+					^SupportDir|Content/ts/sno.mix: sno.mix
+					^SupportDir|Content/ts/sounds.mix: sounds.mix
+					^SupportDir|Content/ts/speech01.mix: speech01.mix
+					^SupportDir|Content/ts/speech02.mix: speech02.mix
+					^SupportDir|Content/ts/tem.mix: tem.mix
+					^SupportDir|Content/ts/temperat.mix: temperat.mix
+				Delete: ^SupportDir|Content/ts/tibsun.mix
+		# Firestorm expansion files:
+		ContentPackage:
+			Name: fstorm
+			Actions:
+				ExtractMix: ^SupportDir|Content/ts/expand01.mix
+					^SupportDir|Content/ts/firestorm/m_emp.vxl: m_emp.vxl
+					^SupportDir|Content/ts/firestorm/mwar_nod.vxl: mwar_nod.vxl
+					^SupportDir|Content/ts/firestorm/djuggbar.vxl: djuggbar.vxl
+					^SupportDir|Content/ts/firestorm/sgen.vxl: sgen.vxl
+					^SupportDir|Content/ts/firestorm/m_emp.hva: m_emp.hva
+					^SupportDir|Content/ts/firestorm/mwar_nod.hva: mwar_nod.hva
+					^SupportDir|Content/ts/firestorm/djuggbar.hva: djuggbar.hva
+					^SupportDir|Content/ts/firestorm/sgen.hva: sgen.hva
+					^SupportDir|Content/ts/firestorm/c_kodiak.shp: c_kodiak.shp
+					^SupportDir|Content/ts/firestorm/k_light1.shp: k_light1.shp
+					^SupportDir|Content/ts/firestorm/k_light2.shp: k_light2.shp
+					^SupportDir|Content/ts/firestorm/mwarmk.shp: mwarmk.shp
+					^SupportDir|Content/ts/firestorm/mstlmk.shp: mstlmk.shp
+					^SupportDir|Content/ts/firestorm/defdmk.shp: defdmk.shp
+					^SupportDir|Content/ts/firestorm/coremk.shp: coremk.shp
+					^SupportDir|Content/ts/firestorm/ecache01.mix: ecache01.mix
+					^SupportDir|Content/ts/firestorm/e01sc01.mix: e01sc01.mix
+					^SupportDir|Content/ts/firestorm/e01sc02.mix: e01sc02.mix
+					^SupportDir|Content/ts/firestorm/e01vox01.mix: e01vox01.mix
+					^SupportDir|Content/ts/firestorm/e01vox02.mix: e01vox02.mix
+					^SupportDir|Content/ts/firestorm/sounds01.mix: sounds01.mix
+					^SupportDir|Content/ts/firestorm/isotemp.mix: isotemp.mix
+					^SupportDir|Content/ts/firestorm/temperat.mix: temperat.mix
+				Delete: ^SupportDir|Content/ts/expand01.mix
+				ExtractMix: ^SupportDir|Content/ts/firestorm/isotemp.mix
+					^SupportDir|Content/ts/firestorm/blat01.tem: blat01.tem
+					^SupportDir|Content/ts/firestorm/blat01a.tem: blat01a.tem
+					^SupportDir|Content/ts/firestorm/blat02.tem: blat02.tem
+					^SupportDir|Content/ts/firestorm/blat02a.tem: blat02a.tem
+					^SupportDir|Content/ts/firestorm/blat03.tem: blat03.tem
+					^SupportDir|Content/ts/firestorm/blat03a.tem: blat03a.tem
+					^SupportDir|Content/ts/firestorm/blat04.tem: blat04.tem
+					^SupportDir|Content/ts/firestorm/blat04a.tem: blat04a.tem
+					^SupportDir|Content/ts/firestorm/blat05.tem: blat05.tem
+					^SupportDir|Content/ts/firestorm/blat05a.tem: blat05a.tem
+					^SupportDir|Content/ts/firestorm/blat06.tem: blat06.tem
+					^SupportDir|Content/ts/firestorm/blat06a.tem: blat06a.tem
+					^SupportDir|Content/ts/firestorm/blat07.tem: blat07.tem
+					^SupportDir|Content/ts/firestorm/blat07a.tem: blat07a.tem
+					^SupportDir|Content/ts/firestorm/blat08.tem: blat08.tem
+					^SupportDir|Content/ts/firestorm/blat08a.tem: blat08a.tem
+					^SupportDir|Content/ts/firestorm/blat09.tem: blat09.tem
+					^SupportDir|Content/ts/firestorm/blat09a.tem: blat09a.tem
+					^SupportDir|Content/ts/firestorm/blat10.tem: blat10.tem
+					^SupportDir|Content/ts/firestorm/blat10a.tem: blat10a.tem
+					^SupportDir|Content/ts/firestorm/blat11.tem: blat11.tem
+					^SupportDir|Content/ts/firestorm/blat11a.tem: blat11a.tem
+					^SupportDir|Content/ts/firestorm/blat12.tem: blat12.tem
+					^SupportDir|Content/ts/firestorm/blat12a.tem: blat12a.tem
+					^SupportDir|Content/ts/firestorm/blat13.tem: blat13.tem
+					^SupportDir|Content/ts/firestorm/blat13a.tem: blat13a.tem
+					^SupportDir|Content/ts/firestorm/blat14.tem: blat14.tem
+					^SupportDir|Content/ts/firestorm/blat14a.tem: blat14a.tem
+					^SupportDir|Content/ts/firestorm/blat15.tem: blat15.tem
+					^SupportDir|Content/ts/firestorm/blat15a.tem: blat15a.tem
+					^SupportDir|Content/ts/firestorm/blat16.tem: blat16.tem
+					^SupportDir|Content/ts/firestorm/blat16a.tem: blat16a.tem
+					^SupportDir|Content/ts/firestorm/blue01.tem: blue01.tem
+					^SupportDir|Content/ts/firestorm/blue01a.tem: blue01a.tem
+					^SupportDir|Content/ts/firestorm/blue01b.tem: blue01b.tem
+					^SupportDir|Content/ts/firestorm/blue01c.tem: blue01c.tem
+					^SupportDir|Content/ts/firestorm/blue01d.tem: blue01d.tem
+					^SupportDir|Content/ts/firestorm/blue01e.tem: blue01e.tem
+					^SupportDir|Content/ts/firestorm/blue01f.tem: blue01f.tem
+					^SupportDir|Content/ts/firestorm/blue01g.tem: blue01g.tem
+					^SupportDir|Content/ts/firestorm/ccliff01.tem: ccliff01.tem
+					^SupportDir|Content/ts/firestorm/ccliff02.tem: ccliff02.tem
+					^SupportDir|Content/ts/firestorm/ccliff03.tem: ccliff03.tem
+					^SupportDir|Content/ts/firestorm/ccliff04.tem: ccliff04.tem
+					^SupportDir|Content/ts/firestorm/ccliff05.tem: ccliff05.tem
+					^SupportDir|Content/ts/firestorm/ccliff06.tem: ccliff06.tem
+					^SupportDir|Content/ts/firestorm/crash01.tem: crash01.tem
+					^SupportDir|Content/ts/firestorm/crash02.tem: crash02.tem
+					^SupportDir|Content/ts/firestorm/crash03.tem: crash03.tem
+					^SupportDir|Content/ts/firestorm/crash04.tem: crash04.tem
+					^SupportDir|Content/ts/firestorm/crash05.tem: crash05.tem
+					^SupportDir|Content/ts/firestorm/crash06.tem: crash06.tem
+					^SupportDir|Content/ts/firestorm/crash07.tem: crash07.tem
+					^SupportDir|Content/ts/firestorm/crys01.tem: crys01.tem
+					^SupportDir|Content/ts/firestorm/crys01a.tem: crys01a.tem
+					^SupportDir|Content/ts/firestorm/crys01b.tem: crys01b.tem
+					^SupportDir|Content/ts/firestorm/crys01c.tem: crys01c.tem
+					^SupportDir|Content/ts/firestorm/crys01d.tem: crys01d.tem
+					^SupportDir|Content/ts/firestorm/crys01e.tem: crys01e.tem
+					^SupportDir|Content/ts/firestorm/crys01f.tem: crys01f.tem
+					^SupportDir|Content/ts/firestorm/crys01g.tem: crys01g.tem
+					^SupportDir|Content/ts/firestorm/cylat01.tem: cylat01.tem
+					^SupportDir|Content/ts/firestorm/cylat01a.tem: cylat01a.tem
+					^SupportDir|Content/ts/firestorm/cylat02.tem: cylat02.tem
+					^SupportDir|Content/ts/firestorm/cylat02a.tem: cylat02a.tem
+					^SupportDir|Content/ts/firestorm/cylat03.tem: cylat03.tem
+					^SupportDir|Content/ts/firestorm/cylat03a.tem: cylat03a.tem
+					^SupportDir|Content/ts/firestorm/cylat04.tem: cylat04.tem
+					^SupportDir|Content/ts/firestorm/cylat04a.tem: cylat04a.tem
+					^SupportDir|Content/ts/firestorm/cylat05.tem: cylat05.tem
+					^SupportDir|Content/ts/firestorm/cylat05a.tem: cylat05a.tem
+					^SupportDir|Content/ts/firestorm/cylat06.tem: cylat06.tem
+					^SupportDir|Content/ts/firestorm/cylat06a.tem: cylat06a.tem
+					^SupportDir|Content/ts/firestorm/cylat07.tem: cylat07.tem
+					^SupportDir|Content/ts/firestorm/cylat07a.tem: cylat07a.tem
+					^SupportDir|Content/ts/firestorm/cylat08.tem: cylat08.tem
+					^SupportDir|Content/ts/firestorm/cylat08a.tem: cylat08a.tem
+					^SupportDir|Content/ts/firestorm/cylat09.tem: cylat09.tem
+					^SupportDir|Content/ts/firestorm/cylat09a.tem: cylat09a.tem
+					^SupportDir|Content/ts/firestorm/cylat10.tem: cylat10.tem
+					^SupportDir|Content/ts/firestorm/cylat10a.tem: cylat10a.tem
+					^SupportDir|Content/ts/firestorm/cylat11.tem: cylat11.tem
+					^SupportDir|Content/ts/firestorm/cylat11a.tem: cylat11a.tem
+					^SupportDir|Content/ts/firestorm/cylat12.tem: cylat12.tem
+					^SupportDir|Content/ts/firestorm/cylat12a.tem: cylat12a.tem
+					^SupportDir|Content/ts/firestorm/cylat13.tem: cylat13.tem
+					^SupportDir|Content/ts/firestorm/cylat13a.tem: cylat13a.tem
+					^SupportDir|Content/ts/firestorm/cylat14.tem: cylat14.tem
+					^SupportDir|Content/ts/firestorm/cylat14a.tem: cylat14a.tem
+					^SupportDir|Content/ts/firestorm/cylat15.tem: cylat15.tem
+					^SupportDir|Content/ts/firestorm/cylat15a.tem: cylat15a.tem
+					^SupportDir|Content/ts/firestorm/cylat16.tem: cylat16.tem
+					^SupportDir|Content/ts/firestorm/cylat16a.tem: cylat16a.tem
+					^SupportDir|Content/ts/firestorm/slat01.tem: slat01.tem
+					^SupportDir|Content/ts/firestorm/slat01a.tem: slat01a.tem
+					^SupportDir|Content/ts/firestorm/slat02.tem: slat02.tem
+					^SupportDir|Content/ts/firestorm/slat02a.tem: slat02a.tem
+					^SupportDir|Content/ts/firestorm/slat03.tem: slat03.tem
+					^SupportDir|Content/ts/firestorm/slat03a.tem: slat03a.tem
+					^SupportDir|Content/ts/firestorm/slat04.tem: slat04.tem
+					^SupportDir|Content/ts/firestorm/slat04a.tem: slat04a.tem
+					^SupportDir|Content/ts/firestorm/slat05.tem: slat05.tem
+					^SupportDir|Content/ts/firestorm/slat05a.tem: slat05a.tem
+					^SupportDir|Content/ts/firestorm/slat06.tem: slat06.tem
+					^SupportDir|Content/ts/firestorm/slat06a.tem: slat06a.tem
+					^SupportDir|Content/ts/firestorm/slat07.tem: slat07.tem
+					^SupportDir|Content/ts/firestorm/slat07a.tem: slat07a.tem
+					^SupportDir|Content/ts/firestorm/slat08.tem: slat08.tem
+					^SupportDir|Content/ts/firestorm/slat08a.tem: slat08a.tem
+					^SupportDir|Content/ts/firestorm/slat09.tem: slat09.tem
+					^SupportDir|Content/ts/firestorm/slat09a.tem: slat09a.tem
+					^SupportDir|Content/ts/firestorm/slat10.tem: slat10.tem
+					^SupportDir|Content/ts/firestorm/slat10a.tem: slat10a.tem
+					^SupportDir|Content/ts/firestorm/slat11.tem: slat11.tem
+					^SupportDir|Content/ts/firestorm/slat11a.tem: slat11a.tem
+					^SupportDir|Content/ts/firestorm/slat12.tem: slat12.tem
+					^SupportDir|Content/ts/firestorm/slat12a.tem: slat12a.tem
+					^SupportDir|Content/ts/firestorm/slat13.tem: slat13.tem
+					^SupportDir|Content/ts/firestorm/slat13a.tem: slat13a.tem
+					^SupportDir|Content/ts/firestorm/slat14.tem: slat14.tem
+					^SupportDir|Content/ts/firestorm/slat14a.tem: slat14a.tem
+					^SupportDir|Content/ts/firestorm/slat15.tem: slat15.tem
+					^SupportDir|Content/ts/firestorm/slat15a.tem: slat15a.tem
+					^SupportDir|Content/ts/firestorm/slat16.tem: slat16.tem
+					^SupportDir|Content/ts/firestorm/slat16a.tem: slat16a.tem
+					^SupportDir|Content/ts/firestorm/swamp01.tem: swamp01.tem
+					^SupportDir|Content/ts/firestorm/swamp01a.tem: swamp01a.tem
+					^SupportDir|Content/ts/firestorm/swamp01b.tem: swamp01b.tem
+					^SupportDir|Content/ts/firestorm/swamp01c.tem: swamp01c.tem
+					^SupportDir|Content/ts/firestorm/swamp01d.tem: swamp01d.tem
+					^SupportDir|Content/ts/firestorm/swamp01e.tem: swamp01e.tem
+					^SupportDir|Content/ts/firestorm/swamp01f.tem: swamp01f.tem
+					^SupportDir|Content/ts/firestorm/swamp01g.tem: swamp01g.tem
+					^SupportDir|Content/ts/firestorm/swamp02.tem: swamp02.tem
+					^SupportDir|Content/ts/firestorm/swamp03.tem: swamp03.tem
+					^SupportDir|Content/ts/firestorm/swamp04.tem: swamp04.tem
+					^SupportDir|Content/ts/firestorm/swamp05.tem: swamp05.tem
+					^SupportDir|Content/ts/firestorm/swamp06.tem: swamp06.tem
+					^SupportDir|Content/ts/firestorm/swamp07.tem: swamp07.tem
+					^SupportDir|Content/ts/firestorm/swamp08.tem: swamp08.tem
+					^SupportDir|Content/ts/firestorm/swamp09.tem: swamp09.tem
+				Delete: ^SupportDir|Content/ts/firestorm/isotemp.mix
+				ExtractMix: ^SupportDir|Content/ts/firestorm/temperat.mix
+					^SupportDir|Content/ts/firestorm/fona01.tem: fona01.tem
+					^SupportDir|Content/ts/firestorm/fona02.tem: fona02.tem
+					^SupportDir|Content/ts/firestorm/fona03.tem: fona03.tem
+					^SupportDir|Content/ts/firestorm/fona04.tem: fona04.tem
+					^SupportDir|Content/ts/firestorm/fona05.tem: fona05.tem
+					^SupportDir|Content/ts/firestorm/fona06.tem: fona06.tem
+					^SupportDir|Content/ts/firestorm/fona07.tem: fona07.tem
+					^SupportDir|Content/ts/firestorm/fona08.tem: fona08.tem
+					^SupportDir|Content/ts/firestorm/fona09.tem: fona09.tem
+					^SupportDir|Content/ts/firestorm/fona10.tem: fona10.tem
+					^SupportDir|Content/ts/firestorm/fona11.tem: fona11.tem
+					^SupportDir|Content/ts/firestorm/fona12.tem: fona12.tem
+					^SupportDir|Content/ts/firestorm/fona13.tem: fona13.tem
+					^SupportDir|Content/ts/firestorm/fona14.tem: fona14.tem
+					^SupportDir|Content/ts/firestorm/fona15.tem: fona15.tem
+					^SupportDir|Content/ts/firestorm/bigblue3.tem: bigblue3.tem
+				Delete: ^SupportDir|Content/ts/firestorm/temperat.mix
+		# Base game music (optional):
+		ContentPackage:
+			Name: tibsun-music
+			Actions:
+			ExtractIscab: data1.hdr
+				Volumes:
+					6: data6.cab
+					7: data7.cab
+				Extract:
+					^SupportDir|Content/ts/scores.mix: Tiberian Sun\SUN\SCORES.MIX
+		# Firestorm expansion music (optional):
+		ContentPackage:
+			Name: fstorm-music
+			Actions:
+			ExtractIscab: data1.hdr
+				Volumes:
+					6: data6.cab
+					7: data7.cab
+				Extract:
+					^SupportDir|Content/ts/firestorm/scores01.mix: Tiberian Sun\SUN\scores01.mix
diff --git a/mods/ts/installer/origin.yaml b/mods/ts/installer/origin.yaml
index f1aef00447..e0818533a1 100644
--- a/mods/ts/installer/origin.yaml
+++ b/mods/ts/installer/origin.yaml
@@ -6,206 +6,223 @@ origin: C&C The Ultimate Collection (Origin version, English)
 	IDFiles:
 		GDFBinary_en_US.dll: 4bb56a449bd0003e7ae67625d90a11ae169319d6
 	Install:
-		Copy: .
-			^SupportDir|Content/ts/scores.mix: SCORES.MIX
-			^SupportDir|Content/ts/firestorm/scores01.mix: scores01.mix
-		ExtractMix: TIBSUN.MIX
-			^SupportDir|Content/ts/cache.mix: cache.mix
-			^SupportDir|Content/ts/conquer.mix: conquer.mix
-			^SupportDir|Content/ts/isosnow.mix: isosnow.mix
-			^SupportDir|Content/ts/isotemp.mix: isotemp.mix
-			^SupportDir|Content/ts/local.mix: local.mix
-			^SupportDir|Content/ts/sidec01.mix: sidec01.mix
-			^SupportDir|Content/ts/sidec02.mix: sidec02.mix
-			^SupportDir|Content/ts/snow.mix: snow.mix
-			^SupportDir|Content/ts/sno.mix: sno.mix
-			^SupportDir|Content/ts/sounds.mix: sounds.mix
-			^SupportDir|Content/ts/speech01.mix: speech01.mix
-			^SupportDir|Content/ts/speech02.mix: speech02.mix
-			^SupportDir|Content/ts/tem.mix: tem.mix
-			^SupportDir|Content/ts/temperat.mix: temperat.mix
-		ExtractMix: expand01.mix
-			^SupportDir|Content/ts/firestorm/m_emp.vxl: m_emp.vxl
-			^SupportDir|Content/ts/firestorm/mwar_nod.vxl: mwar_nod.vxl
-			^SupportDir|Content/ts/firestorm/djuggbar.vxl: djuggbar.vxl
-			^SupportDir|Content/ts/firestorm/sgen.vxl: sgen.vxl
-			^SupportDir|Content/ts/firestorm/m_emp.hva: m_emp.hva
-			^SupportDir|Content/ts/firestorm/mwar_nod.hva: mwar_nod.hva
-			^SupportDir|Content/ts/firestorm/djuggbar.hva: djuggbar.hva
-			^SupportDir|Content/ts/firestorm/sgen.hva: sgen.hva
-			^SupportDir|Content/ts/firestorm/c_kodiak.shp: c_kodiak.shp
-			^SupportDir|Content/ts/firestorm/k_light1.shp: k_light1.shp
-			^SupportDir|Content/ts/firestorm/k_light2.shp: k_light2.shp
-			^SupportDir|Content/ts/firestorm/mwarmk.shp: mwarmk.shp
-			^SupportDir|Content/ts/firestorm/mstlmk.shp: mstlmk.shp
-			^SupportDir|Content/ts/firestorm/defdmk.shp: defdmk.shp
-			^SupportDir|Content/ts/firestorm/coremk.shp: coremk.shp
-			^SupportDir|Content/ts/firestorm/ecache01.mix: ecache01.mix
-			^SupportDir|Content/ts/firestorm/e01sc01.mix: e01sc01.mix
-			^SupportDir|Content/ts/firestorm/e01sc02.mix: e01sc02.mix
-			^SupportDir|Content/ts/firestorm/e01vox01.mix: e01vox01.mix
-			^SupportDir|Content/ts/firestorm/e01vox02.mix: e01vox02.mix
-			^SupportDir|Content/ts/firestorm/sounds01.mix: sounds01.mix
-			^SupportDir|Content/ts/firestorm/isotemp.mix: isotemp.mix
-			^SupportDir|Content/ts/firestorm/temperat.mix: temperat.mix
-		ExtractMix: ^SupportDir|Content/ts/firestorm/isotemp.mix
-			^SupportDir|Content/ts/firestorm/blat01.tem: blat01.tem
-			^SupportDir|Content/ts/firestorm/blat01a.tem: blat01a.tem
-			^SupportDir|Content/ts/firestorm/blat02.tem: blat02.tem
-			^SupportDir|Content/ts/firestorm/blat02a.tem: blat02a.tem
-			^SupportDir|Content/ts/firestorm/blat03.tem: blat03.tem
-			^SupportDir|Content/ts/firestorm/blat03a.tem: blat03a.tem
-			^SupportDir|Content/ts/firestorm/blat04.tem: blat04.tem
-			^SupportDir|Content/ts/firestorm/blat04a.tem: blat04a.tem
-			^SupportDir|Content/ts/firestorm/blat05.tem: blat05.tem
-			^SupportDir|Content/ts/firestorm/blat05a.tem: blat05a.tem
-			^SupportDir|Content/ts/firestorm/blat06.tem: blat06.tem
-			^SupportDir|Content/ts/firestorm/blat06a.tem: blat06a.tem
-			^SupportDir|Content/ts/firestorm/blat07.tem: blat07.tem
-			^SupportDir|Content/ts/firestorm/blat07a.tem: blat07a.tem
-			^SupportDir|Content/ts/firestorm/blat08.tem: blat08.tem
-			^SupportDir|Content/ts/firestorm/blat08a.tem: blat08a.tem
-			^SupportDir|Content/ts/firestorm/blat09.tem: blat09.tem
-			^SupportDir|Content/ts/firestorm/blat09a.tem: blat09a.tem
-			^SupportDir|Content/ts/firestorm/blat10.tem: blat10.tem
-			^SupportDir|Content/ts/firestorm/blat10a.tem: blat10a.tem
-			^SupportDir|Content/ts/firestorm/blat11.tem: blat11.tem
-			^SupportDir|Content/ts/firestorm/blat11a.tem: blat11a.tem
-			^SupportDir|Content/ts/firestorm/blat12.tem: blat12.tem
-			^SupportDir|Content/ts/firestorm/blat12a.tem: blat12a.tem
-			^SupportDir|Content/ts/firestorm/blat13.tem: blat13.tem
-			^SupportDir|Content/ts/firestorm/blat13a.tem: blat13a.tem
-			^SupportDir|Content/ts/firestorm/blat14.tem: blat14.tem
-			^SupportDir|Content/ts/firestorm/blat14a.tem: blat14a.tem
-			^SupportDir|Content/ts/firestorm/blat15.tem: blat15.tem
-			^SupportDir|Content/ts/firestorm/blat15a.tem: blat15a.tem
-			^SupportDir|Content/ts/firestorm/blat16.tem: blat16.tem
-			^SupportDir|Content/ts/firestorm/blat16a.tem: blat16a.tem
-			^SupportDir|Content/ts/firestorm/blue01.tem: blue01.tem
-			^SupportDir|Content/ts/firestorm/blue01a.tem: blue01a.tem
-			^SupportDir|Content/ts/firestorm/blue01b.tem: blue01b.tem
-			^SupportDir|Content/ts/firestorm/blue01c.tem: blue01c.tem
-			^SupportDir|Content/ts/firestorm/blue01d.tem: blue01d.tem
-			^SupportDir|Content/ts/firestorm/blue01e.tem: blue01e.tem
-			^SupportDir|Content/ts/firestorm/blue01f.tem: blue01f.tem
-			^SupportDir|Content/ts/firestorm/blue01g.tem: blue01g.tem
-			^SupportDir|Content/ts/firestorm/ccliff01.tem: ccliff01.tem
-			^SupportDir|Content/ts/firestorm/ccliff02.tem: ccliff02.tem
-			^SupportDir|Content/ts/firestorm/ccliff03.tem: ccliff03.tem
-			^SupportDir|Content/ts/firestorm/ccliff04.tem: ccliff04.tem
-			^SupportDir|Content/ts/firestorm/ccliff05.tem: ccliff05.tem
-			^SupportDir|Content/ts/firestorm/ccliff06.tem: ccliff06.tem
-			^SupportDir|Content/ts/firestorm/crash01.tem: crash01.tem
-			^SupportDir|Content/ts/firestorm/crash02.tem: crash02.tem
-			^SupportDir|Content/ts/firestorm/crash03.tem: crash03.tem
-			^SupportDir|Content/ts/firestorm/crash04.tem: crash04.tem
-			^SupportDir|Content/ts/firestorm/crash05.tem: crash05.tem
-			^SupportDir|Content/ts/firestorm/crash06.tem: crash06.tem
-			^SupportDir|Content/ts/firestorm/crash07.tem: crash07.tem
-			^SupportDir|Content/ts/firestorm/crys01.tem: crys01.tem
-			^SupportDir|Content/ts/firestorm/crys01a.tem: crys01a.tem
-			^SupportDir|Content/ts/firestorm/crys01b.tem: crys01b.tem
-			^SupportDir|Content/ts/firestorm/crys01c.tem: crys01c.tem
-			^SupportDir|Content/ts/firestorm/crys01d.tem: crys01d.tem
-			^SupportDir|Content/ts/firestorm/crys01e.tem: crys01e.tem
-			^SupportDir|Content/ts/firestorm/crys01f.tem: crys01f.tem
-			^SupportDir|Content/ts/firestorm/crys01g.tem: crys01g.tem
-			^SupportDir|Content/ts/firestorm/cylat01.tem: cylat01.tem
-			^SupportDir|Content/ts/firestorm/cylat01a.tem: cylat01a.tem
-			^SupportDir|Content/ts/firestorm/cylat02.tem: cylat02.tem
-			^SupportDir|Content/ts/firestorm/cylat02a.tem: cylat02a.tem
-			^SupportDir|Content/ts/firestorm/cylat03.tem: cylat03.tem
-			^SupportDir|Content/ts/firestorm/cylat03a.tem: cylat03a.tem
-			^SupportDir|Content/ts/firestorm/cylat04.tem: cylat04.tem
-			^SupportDir|Content/ts/firestorm/cylat04a.tem: cylat04a.tem
-			^SupportDir|Content/ts/firestorm/cylat05.tem: cylat05.tem
-			^SupportDir|Content/ts/firestorm/cylat05a.tem: cylat05a.tem
-			^SupportDir|Content/ts/firestorm/cylat06.tem: cylat06.tem
-			^SupportDir|Content/ts/firestorm/cylat06a.tem: cylat06a.tem
-			^SupportDir|Content/ts/firestorm/cylat07.tem: cylat07.tem
-			^SupportDir|Content/ts/firestorm/cylat07a.tem: cylat07a.tem
-			^SupportDir|Content/ts/firestorm/cylat08.tem: cylat08.tem
-			^SupportDir|Content/ts/firestorm/cylat08a.tem: cylat08a.tem
-			^SupportDir|Content/ts/firestorm/cylat09.tem: cylat09.tem
-			^SupportDir|Content/ts/firestorm/cylat09a.tem: cylat09a.tem
-			^SupportDir|Content/ts/firestorm/cylat10.tem: cylat10.tem
-			^SupportDir|Content/ts/firestorm/cylat10a.tem: cylat10a.tem
-			^SupportDir|Content/ts/firestorm/cylat11.tem: cylat11.tem
-			^SupportDir|Content/ts/firestorm/cylat11a.tem: cylat11a.tem
-			^SupportDir|Content/ts/firestorm/cylat12.tem: cylat12.tem
-			^SupportDir|Content/ts/firestorm/cylat12a.tem: cylat12a.tem
-			^SupportDir|Content/ts/firestorm/cylat13.tem: cylat13.tem
-			^SupportDir|Content/ts/firestorm/cylat13a.tem: cylat13a.tem
-			^SupportDir|Content/ts/firestorm/cylat14.tem: cylat14.tem
-			^SupportDir|Content/ts/firestorm/cylat14a.tem: cylat14a.tem
-			^SupportDir|Content/ts/firestorm/cylat15.tem: cylat15.tem
-			^SupportDir|Content/ts/firestorm/cylat15a.tem: cylat15a.tem
-			^SupportDir|Content/ts/firestorm/cylat16.tem: cylat16.tem
-			^SupportDir|Content/ts/firestorm/cylat16a.tem: cylat16a.tem
-			^SupportDir|Content/ts/firestorm/slat01.tem: slat01.tem
-			^SupportDir|Content/ts/firestorm/slat01a.tem: slat01a.tem
-			^SupportDir|Content/ts/firestorm/slat02.tem: slat02.tem
-			^SupportDir|Content/ts/firestorm/slat02a.tem: slat02a.tem
-			^SupportDir|Content/ts/firestorm/slat03.tem: slat03.tem
-			^SupportDir|Content/ts/firestorm/slat03a.tem: slat03a.tem
-			^SupportDir|Content/ts/firestorm/slat04.tem: slat04.tem
-			^SupportDir|Content/ts/firestorm/slat04a.tem: slat04a.tem
-			^SupportDir|Content/ts/firestorm/slat05.tem: slat05.tem
-			^SupportDir|Content/ts/firestorm/slat05a.tem: slat05a.tem
-			^SupportDir|Content/ts/firestorm/slat06.tem: slat06.tem
-			^SupportDir|Content/ts/firestorm/slat06a.tem: slat06a.tem
-			^SupportDir|Content/ts/firestorm/slat07.tem: slat07.tem
-			^SupportDir|Content/ts/firestorm/slat07a.tem: slat07a.tem
-			^SupportDir|Content/ts/firestorm/slat08.tem: slat08.tem
-			^SupportDir|Content/ts/firestorm/slat08a.tem: slat08a.tem
-			^SupportDir|Content/ts/firestorm/slat09.tem: slat09.tem
-			^SupportDir|Content/ts/firestorm/slat09a.tem: slat09a.tem
-			^SupportDir|Content/ts/firestorm/slat10.tem: slat10.tem
-			^SupportDir|Content/ts/firestorm/slat10a.tem: slat10a.tem
-			^SupportDir|Content/ts/firestorm/slat11.tem: slat11.tem
-			^SupportDir|Content/ts/firestorm/slat11a.tem: slat11a.tem
-			^SupportDir|Content/ts/firestorm/slat12.tem: slat12.tem
-			^SupportDir|Content/ts/firestorm/slat12a.tem: slat12a.tem
-			^SupportDir|Content/ts/firestorm/slat13.tem: slat13.tem
-			^SupportDir|Content/ts/firestorm/slat13a.tem: slat13a.tem
-			^SupportDir|Content/ts/firestorm/slat14.tem: slat14.tem
-			^SupportDir|Content/ts/firestorm/slat14a.tem: slat14a.tem
-			^SupportDir|Content/ts/firestorm/slat15.tem: slat15.tem
-			^SupportDir|Content/ts/firestorm/slat15a.tem: slat15a.tem
-			^SupportDir|Content/ts/firestorm/slat16.tem: slat16.tem
-			^SupportDir|Content/ts/firestorm/slat16a.tem: slat16a.tem
-			^SupportDir|Content/ts/firestorm/swamp01.tem: swamp01.tem
-			^SupportDir|Content/ts/firestorm/swamp01a.tem: swamp01a.tem
-			^SupportDir|Content/ts/firestorm/swamp01b.tem: swamp01b.tem
-			^SupportDir|Content/ts/firestorm/swamp01c.tem: swamp01c.tem
-			^SupportDir|Content/ts/firestorm/swamp01d.tem: swamp01d.tem
-			^SupportDir|Content/ts/firestorm/swamp01e.tem: swamp01e.tem
-			^SupportDir|Content/ts/firestorm/swamp01f.tem: swamp01f.tem
-			^SupportDir|Content/ts/firestorm/swamp01g.tem: swamp01g.tem
-			^SupportDir|Content/ts/firestorm/swamp02.tem: swamp02.tem
-			^SupportDir|Content/ts/firestorm/swamp03.tem: swamp03.tem
-			^SupportDir|Content/ts/firestorm/swamp04.tem: swamp04.tem
-			^SupportDir|Content/ts/firestorm/swamp05.tem: swamp05.tem
-			^SupportDir|Content/ts/firestorm/swamp06.tem: swamp06.tem
-			^SupportDir|Content/ts/firestorm/swamp07.tem: swamp07.tem
-			^SupportDir|Content/ts/firestorm/swamp08.tem: swamp08.tem
-			^SupportDir|Content/ts/firestorm/swamp09.tem: swamp09.tem
-		Delete: ^SupportDir|Content/ts/firestorm/isotemp.mix
-		ExtractMix: ^SupportDir|Content/ts/firestorm/temperat.mix
-			^SupportDir|Content/ts/firestorm/fona01.tem: fona01.tem
-			^SupportDir|Content/ts/firestorm/fona02.tem: fona02.tem
-			^SupportDir|Content/ts/firestorm/fona03.tem: fona03.tem
-			^SupportDir|Content/ts/firestorm/fona04.tem: fona04.tem
-			^SupportDir|Content/ts/firestorm/fona05.tem: fona05.tem
-			^SupportDir|Content/ts/firestorm/fona06.tem: fona06.tem
-			^SupportDir|Content/ts/firestorm/fona07.tem: fona07.tem
-			^SupportDir|Content/ts/firestorm/fona08.tem: fona08.tem
-			^SupportDir|Content/ts/firestorm/fona09.tem: fona09.tem
-			^SupportDir|Content/ts/firestorm/fona10.tem: fona10.tem
-			^SupportDir|Content/ts/firestorm/fona11.tem: fona11.tem
-			^SupportDir|Content/ts/firestorm/fona12.tem: fona12.tem
-			^SupportDir|Content/ts/firestorm/fona13.tem: fona13.tem
-			^SupportDir|Content/ts/firestorm/fona14.tem: fona14.tem
-			^SupportDir|Content/ts/firestorm/fona15.tem: fona15.tem
-			^SupportDir|Content/ts/firestorm/bigblue3.tem: bigblue3.tem
-		Delete: ^SupportDir|Content/ts/firestorm/temperat.mix
+		# Base game files:
+		ContentPackage:
+			Name: tibsun
+			Actions:
+				ExtractMix: TIBSUN.MIX
+					^SupportDir|Content/ts/cache.mix: cache.mix
+					^SupportDir|Content/ts/conquer.mix: conquer.mix
+					^SupportDir|Content/ts/isosnow.mix: isosnow.mix
+					^SupportDir|Content/ts/isotemp.mix: isotemp.mix
+					^SupportDir|Content/ts/local.mix: local.mix
+					^SupportDir|Content/ts/sidec01.mix: sidec01.mix
+					^SupportDir|Content/ts/sidec02.mix: sidec02.mix
+					^SupportDir|Content/ts/snow.mix: snow.mix
+					^SupportDir|Content/ts/sno.mix: sno.mix
+					^SupportDir|Content/ts/sounds.mix: sounds.mix
+					^SupportDir|Content/ts/speech01.mix: speech01.mix
+					^SupportDir|Content/ts/speech02.mix: speech02.mix
+					^SupportDir|Content/ts/tem.mix: tem.mix
+					^SupportDir|Content/ts/temperat.mix: temperat.mix
+		# Firestorm expansion files:
+		ContentPackage:
+			Name: fstorm
+			Actions:
+				ExtractMix: expand01.mix
+					^SupportDir|Content/ts/firestorm/m_emp.vxl: m_emp.vxl
+					^SupportDir|Content/ts/firestorm/mwar_nod.vxl: mwar_nod.vxl
+					^SupportDir|Content/ts/firestorm/djuggbar.vxl: djuggbar.vxl
+					^SupportDir|Content/ts/firestorm/sgen.vxl: sgen.vxl
+					^SupportDir|Content/ts/firestorm/m_emp.hva: m_emp.hva
+					^SupportDir|Content/ts/firestorm/mwar_nod.hva: mwar_nod.hva
+					^SupportDir|Content/ts/firestorm/djuggbar.hva: djuggbar.hva
+					^SupportDir|Content/ts/firestorm/sgen.hva: sgen.hva
+					^SupportDir|Content/ts/firestorm/c_kodiak.shp: c_kodiak.shp
+					^SupportDir|Content/ts/firestorm/k_light1.shp: k_light1.shp
+					^SupportDir|Content/ts/firestorm/k_light2.shp: k_light2.shp
+					^SupportDir|Content/ts/firestorm/mwarmk.shp: mwarmk.shp
+					^SupportDir|Content/ts/firestorm/mstlmk.shp: mstlmk.shp
+					^SupportDir|Content/ts/firestorm/defdmk.shp: defdmk.shp
+					^SupportDir|Content/ts/firestorm/coremk.shp: coremk.shp
+					^SupportDir|Content/ts/firestorm/ecache01.mix: ecache01.mix
+					^SupportDir|Content/ts/firestorm/e01sc01.mix: e01sc01.mix
+					^SupportDir|Content/ts/firestorm/e01sc02.mix: e01sc02.mix
+					^SupportDir|Content/ts/firestorm/e01vox01.mix: e01vox01.mix
+					^SupportDir|Content/ts/firestorm/e01vox02.mix: e01vox02.mix
+					^SupportDir|Content/ts/firestorm/sounds01.mix: sounds01.mix
+					^SupportDir|Content/ts/firestorm/isotemp.mix: isotemp.mix
+					^SupportDir|Content/ts/firestorm/temperat.mix: temperat.mix
+				ExtractMix: ^SupportDir|Content/ts/firestorm/isotemp.mix
+					^SupportDir|Content/ts/firestorm/blat01.tem: blat01.tem
+					^SupportDir|Content/ts/firestorm/blat01a.tem: blat01a.tem
+					^SupportDir|Content/ts/firestorm/blat02.tem: blat02.tem
+					^SupportDir|Content/ts/firestorm/blat02a.tem: blat02a.tem
+					^SupportDir|Content/ts/firestorm/blat03.tem: blat03.tem
+					^SupportDir|Content/ts/firestorm/blat03a.tem: blat03a.tem
+					^SupportDir|Content/ts/firestorm/blat04.tem: blat04.tem
+					^SupportDir|Content/ts/firestorm/blat04a.tem: blat04a.tem
+					^SupportDir|Content/ts/firestorm/blat05.tem: blat05.tem
+					^SupportDir|Content/ts/firestorm/blat05a.tem: blat05a.tem
+					^SupportDir|Content/ts/firestorm/blat06.tem: blat06.tem
+					^SupportDir|Content/ts/firestorm/blat06a.tem: blat06a.tem
+					^SupportDir|Content/ts/firestorm/blat07.tem: blat07.tem
+					^SupportDir|Content/ts/firestorm/blat07a.tem: blat07a.tem
+					^SupportDir|Content/ts/firestorm/blat08.tem: blat08.tem
+					^SupportDir|Content/ts/firestorm/blat08a.tem: blat08a.tem
+					^SupportDir|Content/ts/firestorm/blat09.tem: blat09.tem
+					^SupportDir|Content/ts/firestorm/blat09a.tem: blat09a.tem
+					^SupportDir|Content/ts/firestorm/blat10.tem: blat10.tem
+					^SupportDir|Content/ts/firestorm/blat10a.tem: blat10a.tem
+					^SupportDir|Content/ts/firestorm/blat11.tem: blat11.tem
+					^SupportDir|Content/ts/firestorm/blat11a.tem: blat11a.tem
+					^SupportDir|Content/ts/firestorm/blat12.tem: blat12.tem
+					^SupportDir|Content/ts/firestorm/blat12a.tem: blat12a.tem
+					^SupportDir|Content/ts/firestorm/blat13.tem: blat13.tem
+					^SupportDir|Content/ts/firestorm/blat13a.tem: blat13a.tem
+					^SupportDir|Content/ts/firestorm/blat14.tem: blat14.tem
+					^SupportDir|Content/ts/firestorm/blat14a.tem: blat14a.tem
+					^SupportDir|Content/ts/firestorm/blat15.tem: blat15.tem
+					^SupportDir|Content/ts/firestorm/blat15a.tem: blat15a.tem
+					^SupportDir|Content/ts/firestorm/blat16.tem: blat16.tem
+					^SupportDir|Content/ts/firestorm/blat16a.tem: blat16a.tem
+					^SupportDir|Content/ts/firestorm/blue01.tem: blue01.tem
+					^SupportDir|Content/ts/firestorm/blue01a.tem: blue01a.tem
+					^SupportDir|Content/ts/firestorm/blue01b.tem: blue01b.tem
+					^SupportDir|Content/ts/firestorm/blue01c.tem: blue01c.tem
+					^SupportDir|Content/ts/firestorm/blue01d.tem: blue01d.tem
+					^SupportDir|Content/ts/firestorm/blue01e.tem: blue01e.tem
+					^SupportDir|Content/ts/firestorm/blue01f.tem: blue01f.tem
+					^SupportDir|Content/ts/firestorm/blue01g.tem: blue01g.tem
+					^SupportDir|Content/ts/firestorm/ccliff01.tem: ccliff01.tem
+					^SupportDir|Content/ts/firestorm/ccliff02.tem: ccliff02.tem
+					^SupportDir|Content/ts/firestorm/ccliff03.tem: ccliff03.tem
+					^SupportDir|Content/ts/firestorm/ccliff04.tem: ccliff04.tem
+					^SupportDir|Content/ts/firestorm/ccliff05.tem: ccliff05.tem
+					^SupportDir|Content/ts/firestorm/ccliff06.tem: ccliff06.tem
+					^SupportDir|Content/ts/firestorm/crash01.tem: crash01.tem
+					^SupportDir|Content/ts/firestorm/crash02.tem: crash02.tem
+					^SupportDir|Content/ts/firestorm/crash03.tem: crash03.tem
+					^SupportDir|Content/ts/firestorm/crash04.tem: crash04.tem
+					^SupportDir|Content/ts/firestorm/crash05.tem: crash05.tem
+					^SupportDir|Content/ts/firestorm/crash06.tem: crash06.tem
+					^SupportDir|Content/ts/firestorm/crash07.tem: crash07.tem
+					^SupportDir|Content/ts/firestorm/crys01.tem: crys01.tem
+					^SupportDir|Content/ts/firestorm/crys01a.tem: crys01a.tem
+					^SupportDir|Content/ts/firestorm/crys01b.tem: crys01b.tem
+					^SupportDir|Content/ts/firestorm/crys01c.tem: crys01c.tem
+					^SupportDir|Content/ts/firestorm/crys01d.tem: crys01d.tem
+					^SupportDir|Content/ts/firestorm/crys01e.tem: crys01e.tem
+					^SupportDir|Content/ts/firestorm/crys01f.tem: crys01f.tem
+					^SupportDir|Content/ts/firestorm/crys01g.tem: crys01g.tem
+					^SupportDir|Content/ts/firestorm/cylat01.tem: cylat01.tem
+					^SupportDir|Content/ts/firestorm/cylat01a.tem: cylat01a.tem
+					^SupportDir|Content/ts/firestorm/cylat02.tem: cylat02.tem
+					^SupportDir|Content/ts/firestorm/cylat02a.tem: cylat02a.tem
+					^SupportDir|Content/ts/firestorm/cylat03.tem: cylat03.tem
+					^SupportDir|Content/ts/firestorm/cylat03a.tem: cylat03a.tem
+					^SupportDir|Content/ts/firestorm/cylat04.tem: cylat04.tem
+					^SupportDir|Content/ts/firestorm/cylat04a.tem: cylat04a.tem
+					^SupportDir|Content/ts/firestorm/cylat05.tem: cylat05.tem
+					^SupportDir|Content/ts/firestorm/cylat05a.tem: cylat05a.tem
+					^SupportDir|Content/ts/firestorm/cylat06.tem: cylat06.tem
+					^SupportDir|Content/ts/firestorm/cylat06a.tem: cylat06a.tem
+					^SupportDir|Content/ts/firestorm/cylat07.tem: cylat07.tem
+					^SupportDir|Content/ts/firestorm/cylat07a.tem: cylat07a.tem
+					^SupportDir|Content/ts/firestorm/cylat08.tem: cylat08.tem
+					^SupportDir|Content/ts/firestorm/cylat08a.tem: cylat08a.tem
+					^SupportDir|Content/ts/firestorm/cylat09.tem: cylat09.tem
+					^SupportDir|Content/ts/firestorm/cylat09a.tem: cylat09a.tem
+					^SupportDir|Content/ts/firestorm/cylat10.tem: cylat10.tem
+					^SupportDir|Content/ts/firestorm/cylat10a.tem: cylat10a.tem
+					^SupportDir|Content/ts/firestorm/cylat11.tem: cylat11.tem
+					^SupportDir|Content/ts/firestorm/cylat11a.tem: cylat11a.tem
+					^SupportDir|Content/ts/firestorm/cylat12.tem: cylat12.tem
+					^SupportDir|Content/ts/firestorm/cylat12a.tem: cylat12a.tem
+					^SupportDir|Content/ts/firestorm/cylat13.tem: cylat13.tem
+					^SupportDir|Content/ts/firestorm/cylat13a.tem: cylat13a.tem
+					^SupportDir|Content/ts/firestorm/cylat14.tem: cylat14.tem
+					^SupportDir|Content/ts/firestorm/cylat14a.tem: cylat14a.tem
+					^SupportDir|Content/ts/firestorm/cylat15.tem: cylat15.tem
+					^SupportDir|Content/ts/firestorm/cylat15a.tem: cylat15a.tem
+					^SupportDir|Content/ts/firestorm/cylat16.tem: cylat16.tem
+					^SupportDir|Content/ts/firestorm/cylat16a.tem: cylat16a.tem
+					^SupportDir|Content/ts/firestorm/slat01.tem: slat01.tem
+					^SupportDir|Content/ts/firestorm/slat01a.tem: slat01a.tem
+					^SupportDir|Content/ts/firestorm/slat02.tem: slat02.tem
+					^SupportDir|Content/ts/firestorm/slat02a.tem: slat02a.tem
+					^SupportDir|Content/ts/firestorm/slat03.tem: slat03.tem
+					^SupportDir|Content/ts/firestorm/slat03a.tem: slat03a.tem
+					^SupportDir|Content/ts/firestorm/slat04.tem: slat04.tem
+					^SupportDir|Content/ts/firestorm/slat04a.tem: slat04a.tem
+					^SupportDir|Content/ts/firestorm/slat05.tem: slat05.tem
+					^SupportDir|Content/ts/firestorm/slat05a.tem: slat05a.tem
+					^SupportDir|Content/ts/firestorm/slat06.tem: slat06.tem
+					^SupportDir|Content/ts/firestorm/slat06a.tem: slat06a.tem
+					^SupportDir|Content/ts/firestorm/slat07.tem: slat07.tem
+					^SupportDir|Content/ts/firestorm/slat07a.tem: slat07a.tem
+					^SupportDir|Content/ts/firestorm/slat08.tem: slat08.tem
+					^SupportDir|Content/ts/firestorm/slat08a.tem: slat08a.tem
+					^SupportDir|Content/ts/firestorm/slat09.tem: slat09.tem
+					^SupportDir|Content/ts/firestorm/slat09a.tem: slat09a.tem
+					^SupportDir|Content/ts/firestorm/slat10.tem: slat10.tem
+					^SupportDir|Content/ts/firestorm/slat10a.tem: slat10a.tem
+					^SupportDir|Content/ts/firestorm/slat11.tem: slat11.tem
+					^SupportDir|Content/ts/firestorm/slat11a.tem: slat11a.tem
+					^SupportDir|Content/ts/firestorm/slat12.tem: slat12.tem
+					^SupportDir|Content/ts/firestorm/slat12a.tem: slat12a.tem
+					^SupportDir|Content/ts/firestorm/slat13.tem: slat13.tem
+					^SupportDir|Content/ts/firestorm/slat13a.tem: slat13a.tem
+					^SupportDir|Content/ts/firestorm/slat14.tem: slat14.tem
+					^SupportDir|Content/ts/firestorm/slat14a.tem: slat14a.tem
+					^SupportDir|Content/ts/firestorm/slat15.tem: slat15.tem
+					^SupportDir|Content/ts/firestorm/slat15a.tem: slat15a.tem
+					^SupportDir|Content/ts/firestorm/slat16.tem: slat16.tem
+					^SupportDir|Content/ts/firestorm/slat16a.tem: slat16a.tem
+					^SupportDir|Content/ts/firestorm/swamp01.tem: swamp01.tem
+					^SupportDir|Content/ts/firestorm/swamp01a.tem: swamp01a.tem
+					^SupportDir|Content/ts/firestorm/swamp01b.tem: swamp01b.tem
+					^SupportDir|Content/ts/firestorm/swamp01c.tem: swamp01c.tem
+					^SupportDir|Content/ts/firestorm/swamp01d.tem: swamp01d.tem
+					^SupportDir|Content/ts/firestorm/swamp01e.tem: swamp01e.tem
+					^SupportDir|Content/ts/firestorm/swamp01f.tem: swamp01f.tem
+					^SupportDir|Content/ts/firestorm/swamp01g.tem: swamp01g.tem
+					^SupportDir|Content/ts/firestorm/swamp02.tem: swamp02.tem
+					^SupportDir|Content/ts/firestorm/swamp03.tem: swamp03.tem
+					^SupportDir|Content/ts/firestorm/swamp04.tem: swamp04.tem
+					^SupportDir|Content/ts/firestorm/swamp05.tem: swamp05.tem
+					^SupportDir|Content/ts/firestorm/swamp06.tem: swamp06.tem
+					^SupportDir|Content/ts/firestorm/swamp07.tem: swamp07.tem
+					^SupportDir|Content/ts/firestorm/swamp08.tem: swamp08.tem
+					^SupportDir|Content/ts/firestorm/swamp09.tem: swamp09.tem
+				Delete: ^SupportDir|Content/ts/firestorm/isotemp.mix
+				ExtractMix: ^SupportDir|Content/ts/firestorm/temperat.mix
+					^SupportDir|Content/ts/firestorm/fona01.tem: fona01.tem
+					^SupportDir|Content/ts/firestorm/fona02.tem: fona02.tem
+					^SupportDir|Content/ts/firestorm/fona03.tem: fona03.tem
+					^SupportDir|Content/ts/firestorm/fona04.tem: fona04.tem
+					^SupportDir|Content/ts/firestorm/fona05.tem: fona05.tem
+					^SupportDir|Content/ts/firestorm/fona06.tem: fona06.tem
+					^SupportDir|Content/ts/firestorm/fona07.tem: fona07.tem
+					^SupportDir|Content/ts/firestorm/fona08.tem: fona08.tem
+					^SupportDir|Content/ts/firestorm/fona09.tem: fona09.tem
+					^SupportDir|Content/ts/firestorm/fona10.tem: fona10.tem
+					^SupportDir|Content/ts/firestorm/fona11.tem: fona11.tem
+					^SupportDir|Content/ts/firestorm/fona12.tem: fona12.tem
+					^SupportDir|Content/ts/firestorm/fona13.tem: fona13.tem
+					^SupportDir|Content/ts/firestorm/fona14.tem: fona14.tem
+					^SupportDir|Content/ts/firestorm/fona15.tem: fona15.tem
+					^SupportDir|Content/ts/firestorm/bigblue3.tem: bigblue3.tem
+				Delete: ^SupportDir|Content/ts/firestorm/temperat.mix
+		# Base game music (optional):
+		ContentPackage:
+			Name: tibsun-music
+			Actions:
+				Copy: .
+					^SupportDir|Content/ts/scores.mix: SCORES.MIX
+		# Firestorm expansion music (optional):
+		ContentPackage:
+			Name: fstorm-music
+			Actions:
+				Copy: .
+					^SupportDir|Content/ts/firestorm/scores01.mix: scores01.mix
diff --git a/mods/ts/installer/tibsun.yaml b/mods/ts/installer/tibsun.yaml
index 500600afa4..4f3b1f87c8 100644
--- a/mods/ts/installer/tibsun.yaml
+++ b/mods/ts/installer/tibsun.yaml
@@ -4,20 +4,28 @@ tibsun: Tiberian Sun (GDI or Nod Disc, English)
 		README.TXT: 45745c4a0c888317ec900208a426472779c42bf7
 		AUTOPLAY.WAV: 2dfce5d00f98b641849c29942b651f4e98d30e30
 	Install:
-		Copy: .
-			^SupportDir|Content/ts/scores.mix: SCORES.MIX
-		ExtractMix: INSTALL/TIBSUN.MIX
-			^SupportDir|Content/ts/cache.mix: cache.mix
-			^SupportDir|Content/ts/conquer.mix: conquer.mix
-			^SupportDir|Content/ts/isosnow.mix: isosnow.mix
-			^SupportDir|Content/ts/isotemp.mix: isotemp.mix
-			^SupportDir|Content/ts/local.mix: local.mix
-			^SupportDir|Content/ts/sidec01.mix: sidec01.mix
-			^SupportDir|Content/ts/sidec02.mix: sidec02.mix
-			^SupportDir|Content/ts/snow.mix: snow.mix
-			^SupportDir|Content/ts/sno.mix: sno.mix
-			^SupportDir|Content/ts/sounds.mix: sounds.mix
-			^SupportDir|Content/ts/speech01.mix: speech01.mix
-			^SupportDir|Content/ts/speech02.mix: speech02.mix
-			^SupportDir|Content/ts/tem.mix: tem.mix
-			^SupportDir|Content/ts/temperat.mix: temperat.mix
+		# Base game files:
+		ContentPackage:
+			Name: tibsun
+			Actions:
+				ExtractMix: INSTALL/TIBSUN.MIX
+					^SupportDir|Content/ts/cache.mix: cache.mix
+					^SupportDir|Content/ts/conquer.mix: conquer.mix
+					^SupportDir|Content/ts/isosnow.mix: isosnow.mix
+					^SupportDir|Content/ts/isotemp.mix: isotemp.mix
+					^SupportDir|Content/ts/local.mix: local.mix
+					^SupportDir|Content/ts/sidec01.mix: sidec01.mix
+					^SupportDir|Content/ts/sidec02.mix: sidec02.mix
+					^SupportDir|Content/ts/snow.mix: snow.mix
+					^SupportDir|Content/ts/sno.mix: sno.mix
+					^SupportDir|Content/ts/sounds.mix: sounds.mix
+					^SupportDir|Content/ts/speech01.mix: speech01.mix
+					^SupportDir|Content/ts/speech02.mix: speech02.mix
+					^SupportDir|Content/ts/tem.mix: tem.mix
+					^SupportDir|Content/ts/temperat.mix: temperat.mix
+		# Base game music (optional):
+		ContentPackage:
+			Name: tibsun-music
+			Actions:
+				Copy: .
+					^SupportDir|Content/ts/scores.mix: SCORES.MIX