diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml
index b4c4fd00d6..9224d242fd 100644
--- a/mods/ts/mod.yaml
+++ b/mods/ts/mod.yaml
@@ -1,4 +1,4 @@
-Metadata:
+ Metadata:
 	Title: Tiberian Sun
 	Description: Developer stub, not yet ready for release!
 	Version: {DEV_VERSION}
@@ -189,20 +189,6 @@ LoadScreen: LogoStripeLoadScreen
 	Image: ts|uibits/loadscreen.png
 	Text: Updating EVA installation..., Changing perspective...
 
-ContentInstaller:
-	TestFiles: ^Content/ts/cache.mix, ^Content/ts/conquer.mix, ^Content/ts/isosnow.mix, ^Content/ts/isotemp.mix, ^Content/ts/local.mix, ^Content/ts/sidec01.mix, ^Content/ts/sidec02.mix, ^Content/ts/sno.mix, ^Content/ts/snow.mix, ^Content/ts/sounds.mix, ^Content/ts/speech01.mix, ^Content/ts/tem.mix, ^Content/ts/temperat.mix
-	PackageMirrorList: http://www.openra.net/packages/ts-mirrors.txt
-	DiskTestFiles: MULTI.MIX, INSTALL/TIBSUN.MIX
-	CopyFilesFromCD:
-		.: INSTALL/TIBSUN.MIX, SCORES.MIX, MULTI.MIX
-	PackageToExtractFromCD: INSTALL/TIBSUN.MIX
-	ExtractFilesFromCD:
-		.: cache.mix, conquer.mix, isosnow.mix, isotemp.mix, local.mix, sidec01.mix, sidec02.mix, sno.mix, snow.mix, sounds.mix, speech01.mix, tem.mix, temperat.mix
-	ShippedSoundtracks: 2
-	MusicPackageMirrorList: http://www.openra.net/packages/ts-music-mirrors.txt
-	InstallShieldCABFilePackageIds: 332
-	InstallShieldCABFileIds: 323, 364
-
 ServerTraits:
 	LobbyCommands
 	PlayerPinger
@@ -272,3 +258,141 @@ GameSpeeds:
 		OrderLatency: 6
 
 ColorValidator:
+
+ModContent:
+	InstallPromptMessage: Tiberian Sun requires artwork and audio from the original game.\n\nQuick Install will automatically download this content (without music\nor videos) from a mirror of the 2012 Tiberian Sun freeware release.\n\nAdvanced Install includes options for downloading the music and for\ncopying the videos and other content from an original game disc.
+	QuickDownload: basefiles
+	HeaderMessage: The original game content may be copied from an original game disc,\nor downloaded from an online mirror of the 2012 freeware release.
+	Packages:
+		base: Base Game Files
+			TestFiles: ^Content/ts/cache.mix, ^Content/ts/conquer.mix, ^Content/ts/isosnow.mix, ^Content/ts/isotemp.mix, ^Content/ts/local.mix, ^Content/ts/sidec01.mix, ^Content/ts/sidec02.mix, ^Content/ts/sno.mix, ^Content/ts/snow.mix, ^Content/ts/sounds.mix, ^Content/ts/speech01.mix, ^Content/ts/tem.mix, ^Content/ts/temperat.mix
+			Discs: tibsun, tibsun-linux
+			Required: true
+			Download: basefiles
+		music: Base Game Music
+			TestFiles: ^Content/ts/scores.mix
+			Discs: tibsun, tibsun-linux
+			Download: music
+	Downloads:
+		basefiles: Base Freeware Content
+			MirrorList: http://www.openra.net/packages/ts-mirrors.txt
+			Extract:
+				^Content/ts/cache.mix: cache.mix
+				^Content/ts/conquer.mix: conquer.mix
+				^Content/ts/isosnow.mix: isosnow.mix
+				^Content/ts/isotemp.mix: isotemp.mix
+				^Content/ts/local.mix: local.mix
+				^Content/ts/sidec01.mix: sidec01.mix
+				^Content/ts/sidec02.mix: sidec02.mix
+				^Content/ts/sno.mix: sno.mix
+				^Content/ts/snow.mix: snow.mix
+				^Content/ts/sounds.mix: sounds.mix
+				^Content/ts/speech01.mix: speech01.mix
+				^Content/ts/speech02.mix: speech02.mix
+				^Content/ts/tem.mix: tem.mix
+				^Content/ts/temperat.mix: temperat.mix
+		music: Freeware Music
+			MirrorList: http://www.openra.net/packages/ts-music-mirrors.txt
+			Extract:
+				^Content/ts/scores.mix: scores.mix
+	Discs:
+		tibsun: Tiberan Sun (GDI or Nod Disc, English)
+			IDFiles:
+				README.TXT: 45745c4a0c888317ec900208a426472779c42bf7
+				AUTOPLAY.WAV: 2dfce5d00f98b641849c29942b651f4e98d30e30
+			Install:
+				copy: .
+					^Content/ts/scores.mix: SCORES.MIX
+				extract-raw: INSTALL/TIBSUN.MIX
+					^Content/ts/cache.mix:
+						Offset: 300
+						Length: 169176
+					^Content/ts/conquer.mix:
+						Offset: 169484
+						Length: 5700088
+					^Content/ts/isosnow.mix:
+						Offset: 5869580
+						Length: 7624750
+					^Content/ts/isotemp.mix:
+						Offset: 13494332
+						Length: 8617646
+					^Content/ts/local.mix:
+						Offset: 22111980
+						Length: 18044736
+					^Content/ts/sidec01.mix:
+						Offset: 40156716
+						Length: 998476
+					^Content/ts/sidec02.mix:
+						Offset: 41155196
+						Length: 1039996
+					^Content/ts/snow.mix:
+						Offset: 56104508
+						Length: 2087806
+					^Content/ts/sno.mix:
+						Offset: 58192316
+						Length: 7826
+					^Content/ts/sounds.mix:
+						Offset: 58200156
+						Length: 3224136
+					^Content/ts/speech01.mix:
+						Offset: 61424300
+						Length: 6028236
+					^Content/ts/speech02.mix:
+						Offset: 67452540
+						Length: 5596628
+					^Content/ts/tem.mix:
+						Offset: 73049180
+						Length: 7746
+					^Content/ts/temperat.mix:
+						Offset: 73056940
+						Length: 2037606
+		tibsun-linux: Tiberan Sun (GDI or Nod Disc, English)
+			IDFiles:
+				readme.txt: 45745c4a0c888317ec900208a426472779c42bf7
+				autoplay.wav: 2dfce5d00f98b641849c29942b651f4e98d30e30
+			Install:
+				copy: .
+					^Content/ts/scores.mix: scores.mix
+				extract-raw: install/tibsun.mix
+					^Content/ts/cache.mix:
+						Offset: 300
+						Length: 169176
+					^Content/ts/conquer.mix:
+						Offset: 169484
+						Length: 5700088
+					^Content/ts/isosnow.mix:
+						Offset: 5869580
+						Length: 7624750
+					^Content/ts/isotemp.mix:
+						Offset: 13494332
+						Length: 8617646
+					^Content/ts/local.mix:
+						Offset: 22111980
+						Length: 18044736
+					^Content/ts/sidec01.mix:
+						Offset: 40156716
+						Length: 998476
+					^Content/ts/sidec02.mix:
+						Offset: 41155196
+						Length: 1039996
+					^Content/ts/snow.mix:
+						Offset: 56104508
+						Length: 2087806
+					^Content/ts/sno.mix:
+						Offset: 58192316
+						Length: 7826
+					^Content/ts/sounds.mix:
+						Offset: 58200156
+						Length: 3224136
+					^Content/ts/speech01.mix:
+						Offset: 61424300
+						Length: 6028236
+					^Content/ts/speech02.mix:
+						Offset: 67452540
+						Length: 5596628
+					^Content/ts/tem.mix:
+						Offset: 73049180
+						Length: 7746
+					^Content/ts/temperat.mix:
+						Offset: 73056940
+						Length: 2037606