diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
index df10e9d523..c3b170274d 100644
--- a/OpenRA.Game/Game.cs
+++ b/OpenRA.Game/Game.cs
@@ -281,6 +281,7 @@ namespace OpenRA
 			Sound.Initialize();
 
 			ModData = new ModData(mod, !Settings.Server.Dedicated);
+			ModData.MountFiles();
 			ModData.InitializeLoaders();
 			if (!Settings.Server.Dedicated)
 				Renderer.InitializeFonts(ModData.Manifest);
diff --git a/OpenRA.Game/ModData.cs b/OpenRA.Game/ModData.cs
index 4042318503..fa4713552d 100644
--- a/OpenRA.Game/ModData.cs
+++ b/OpenRA.Game/ModData.cs
@@ -74,11 +74,6 @@ namespace OpenRA
 			SpriteSequenceLoader = (ISpriteSequenceLoader)ctor.Invoke(new[] { this });
 			SpriteSequenceLoader.OnMissingSpriteError = s => Log.Write("debug", s);
 
-			// HACK: Mount only local folders so we have a half-working environment for the asset installer
-			GlobalFileSystem.UnmountAll();
-			foreach (var dir in Manifest.Folders)
-				GlobalFileSystem.Mount(dir);
-
 			defaultRules = Exts.Lazy(() => RulesetCache.Load());
 
 			initialThreadId = System.Threading.Thread.CurrentThread.ManagedThreadId;
@@ -92,6 +87,11 @@ namespace OpenRA
 				LoadScreen.Display();
 		}
 
+		public void MountFiles()
+		{
+			GlobalFileSystem.LoadFromManifest(Manifest);
+		}
+
 		public void InitializeLoaders()
 		{
 			// all this manipulation of static crap here is nasty and breaks
diff --git a/mods/cnc/bits/cursor.pal b/mods/cnc/bits/cursor.pal
deleted file mode 100644
index 3b29c55f5a..0000000000
Binary files a/mods/cnc/bits/cursor.pal and /dev/null differ
diff --git a/mods/cnc/cursors.yaml b/mods/cnc/cursors.yaml
index dcbbeb31c9..4775bc298e 100644
--- a/mods/cnc/cursors.yaml
+++ b/mods/cnc/cursors.yaml
@@ -1,5 +1,5 @@
 Palettes:
-	cursor: cursor.pal
+	cursor: temperat.pal
 
 Cursors:
 	mouse2.shp: cursor
diff --git a/mods/d2k/bits/d2k.pal b/mods/d2k/bits/d2k.pal
deleted file mode 100644
index 01b5babc5f..0000000000
Binary files a/mods/d2k/bits/d2k.pal and /dev/null differ
diff --git a/mods/d2k/cursors.yaml b/mods/d2k/cursors.yaml
index da02732873..e19615a4f4 100644
--- a/mods/d2k/cursors.yaml
+++ b/mods/d2k/cursors.yaml
@@ -1,7 +1,7 @@
 ShadowIndex: 1
 
 Palettes:
-	mouse: d2k.pal
+	mouse: PALETTE.BIN
 
 Cursors:
 	MOUSE.R8: mouse
diff --git a/mods/d2k/rules/palettes.yaml b/mods/d2k/rules/palettes.yaml
index 1644f153b1..97517ec828 100644
--- a/mods/d2k/rules/palettes.yaml
+++ b/mods/d2k/rules/palettes.yaml
@@ -3,21 +3,21 @@
 		Name: terrain
 	PaletteFromFile@d2k:
 		Name: d2k
-		Filename: d2k.pal
+		Filename: PALETTE.BIN
 		ShadowIndex: 1
 	PaletteFromFile@chrome:
 		Name: chrome
-		Filename: d2k.pal
+		Filename: PALETTE.BIN
 		ShadowIndex: 3
 		AllowModifiers: false
 	PaletteFromFile@effect:
 		Name: effect
-		Filename: d2k.pal
+		Filename: PALETTE.BIN
 		ShadowIndex: 4
 		AllowModifiers: false
 	PaletteFromFile@colorpicker:
 		Name: colorpicker
-		Filename: d2k.pal
+		Filename: PALETTE.BIN
 		ShadowIndex: 4
 		AllowModifiers: false
 	PaletteFromRGBA@shadow:
diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml
index 03d636ecca..129c29ae96 100644
--- a/mods/d2k/tilesets/arrakis.yaml
+++ b/mods/d2k/tilesets/arrakis.yaml
@@ -2,7 +2,7 @@ General:
 	Name: Arrakis
 	Id: ARRAKIS
 	SheetSize: 1024
-	Palette: d2k.pal
+	Palette: PALETTE.BIN
 	EditorTemplateOrder: Basic, Dune, Sand-Detail, Brick, Sand-Cliff, Sand-Smooth, Cliff-Type-Changer, Rock-Sand-Smooth, Rock-Detail, Rock-Cliff, Rock-Cliff-Rock, Rotten-Base, Dead-Worm, Ice, Ice-Detail, Rock-Cliff-Sand, Sand-Platform, Unidentified
 	IgnoreTileSpriteOffsets: True
 
diff --git a/mods/ra/bits/cursor.pal b/mods/ra/bits/cursor.pal
deleted file mode 100644
index bb63fcdd50..0000000000
Binary files a/mods/ra/bits/cursor.pal and /dev/null differ
diff --git a/mods/ra/bits/mouse.shp b/mods/ra/bits/mouse.shp
deleted file mode 100644
index 8c51c4f90e..0000000000
Binary files a/mods/ra/bits/mouse.shp and /dev/null differ
diff --git a/mods/ra/cursors.yaml b/mods/ra/cursors.yaml
index 815e6a04f1..5c33364c8e 100644
--- a/mods/ra/cursors.yaml
+++ b/mods/ra/cursors.yaml
@@ -1,5 +1,5 @@
 Palettes:
-	cursor: cursor.pal
+	cursor: temperat.pal
 
 Cursors:
 	mouse.shp: cursor
diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml
index 4d1c8226fe..cb03bf1675 100644
--- a/mods/ra/mod.yaml
+++ b/mods/ra/mod.yaml
@@ -207,7 +207,7 @@ MapGrid:
 
 SupportsMapsFrom: ra
 
-SpriteFormats: ShpTD, TmpRA, TmpTD, ShpTS
+SpriteFormats: ShpD2, ShpTD, TmpRA, TmpTD, ShpTS
 
 SpriteSequenceFormat: TilesetSpecificSpriteSequence
 	TilesetExtensions:
diff --git a/mods/ts/bits/mouse.shp b/mods/ts/bits/mouse.shp
deleted file mode 100644
index 89c794cae6..0000000000
Binary files a/mods/ts/bits/mouse.shp and /dev/null differ
diff --git a/mods/ts/bits/mousepal.pal b/mods/ts/bits/mousepal.pal
deleted file mode 100644
index 4c2c99c30c..0000000000
Binary files a/mods/ts/bits/mousepal.pal and /dev/null differ