diff --git a/OpenRA.Game/Graphics/SpriteLoader.cs b/OpenRA.Game/Graphics/SpriteLoader.cs
index ff14eca590..8d2035d0b7 100644
--- a/OpenRA.Game/Graphics/SpriteLoader.cs
+++ b/OpenRA.Game/Graphics/SpriteLoader.cs
@@ -19,7 +19,9 @@ namespace OpenRA.Graphics
 		public SpriteLoader(string[] exts, SheetBuilder sheetBuilder)
 		{
 			SheetBuilder = sheetBuilder;
-			this.exts = exts;
+
+			// Include extension-less version
+			this.exts = exts.Append("").ToArray();
 			sprites = new Cache<string, Sprite[]>(LoadSprites);
 		}
 
diff --git a/OpenRA.Game/ModData.cs b/OpenRA.Game/ModData.cs
index 1414d405de..48ae466e28 100755
--- a/OpenRA.Game/ModData.cs
+++ b/OpenRA.Game/ModData.cs
@@ -75,7 +75,7 @@ namespace OpenRA
 			ChromeMetrics.Initialize(Manifest.ChromeMetrics);
 			ChromeProvider.Initialize(Manifest.Chrome);
 			SheetBuilder = new SheetBuilder(SheetType.Indexed);
-			SpriteLoader = new SpriteLoader(new string[] { ".shp" }, SheetBuilder);
+			SpriteLoader = new SpriteLoader(new string[0], SheetBuilder);
 			VoxelLoader = new VoxelLoader();
 			CursorProvider.Initialize(Manifest.Cursors);
 		}
diff --git a/mods/cnc/cursors.yaml b/mods/cnc/cursors.yaml
index cad78974c9..b5e237e8ba 100644
--- a/mods/cnc/cursors.yaml
+++ b/mods/cnc/cursors.yaml
@@ -4,7 +4,7 @@
 
 
 Cursors:
-	mouse2: cursor
+	mouse2.shp: cursor
 		scroll-t:
 			start:1
 		scroll-tr:
@@ -114,7 +114,7 @@ Cursors:
 			start:154
 			length:24
 
-	mouse4:cursor
+	mouse4.shp:cursor
 		move:
 			start:0
 			length:8
@@ -125,7 +125,7 @@ Cursors:
 			start:0
 			length: 8
 
-	attackmove:cursor
+	attackmove.shp:cursor
 		attackmove:
 			start:0
 			length:8
@@ -138,7 +138,7 @@ Cursors:
 			start:13
 			length:1
 
-	mouse3: cursor2
+	mouse3.shp: cursor2
 		enter-blocked:
 			start:212
 			length:1
@@ -170,7 +170,7 @@ Cursors:
 			start:213
 			length:1
 
-	nopower: cursor
+	nopower.shp: cursor
 		powerdown-blocked:
 			start:0
 			length: 1
diff --git a/mods/d2k/cursors.yaml b/mods/d2k/cursors.yaml
index f3d920dcb8..758cd367ec 100644
--- a/mods/d2k/cursors.yaml
+++ b/mods/d2k/cursors.yaml
@@ -2,10 +2,10 @@ ShadowIndex: 1
 
 Palettes:
 	cursor: cursor.pal
-	mouse.r8: d2k.pal
+	mouse: d2k.pal
 
 Cursors:
-	mouse.r8: mouse.r8
+	mouse.r8: mouse
 		scroll-t:
 			start:112
 			x: 24
@@ -252,7 +252,7 @@ Cursors:
 			x: 24
 			y: 24
 
-	nopower: cursor
+	nopower.shp: cursor
 		powerdown-blocked:
 			start:0
 			length: 1
diff --git a/mods/ra/cursors.yaml b/mods/ra/cursors.yaml
index 0e3e4c0347..929db975b1 100644
--- a/mods/ra/cursors.yaml
+++ b/mods/ra/cursors.yaml
@@ -2,7 +2,7 @@
 	cursor: cursor.pal
 
 Cursors:
-	mouse: cursor
+	mouse.shp: cursor
 		scroll-t:
 			start:1
 		scroll-tr:
@@ -163,7 +163,7 @@ Cursors:
 			start:148
 			length: 12
 
-	nopower: cursor
+	nopower.shp: cursor
 		powerdown-blocked:
 			start:0
 			length: 1
diff --git a/mods/ts/cursors.yaml b/mods/ts/cursors.yaml
index 6ae5c78658..dcd50bde72 100644
--- a/mods/ts/cursors.yaml
+++ b/mods/ts/cursors.yaml
@@ -2,7 +2,7 @@
 	cursor: mousepal.pal
 
 Cursors:
-	mouse: cursor
+	mouse.shp: cursor
 		scroll-t: #TODO
 			start: 2
 		scroll-tr: #TODO