diff --git a/Engine/source/T3D/shapeImage.cpp b/Engine/source/T3D/shapeImage.cpp
index e616d6fae..3e19c58bc 100644
--- a/Engine/source/T3D/shapeImage.cpp
+++ b/Engine/source/T3D/shapeImage.cpp
@@ -189,7 +189,7 @@ ShapeBaseImageData::ShapeBaseImageData()
    lightRadius = 10.f;
    lightBrightness = 1.0f;
 
-   shapeName = "core/art/shapes/noshape.dts";
+   shapeName = "core/shapes/noshape.dts";
    shapeNameFP = "";
    imageAnimPrefix = "";
    imageAnimPrefixFP = "";
diff --git a/Engine/source/ts/tsShapeConstruct.cpp b/Engine/source/ts/tsShapeConstruct.cpp
index c77802895..cefb769f7 100644
--- a/Engine/source/ts/tsShapeConstruct.cpp
+++ b/Engine/source/ts/tsShapeConstruct.cpp
@@ -74,9 +74,9 @@ EndImplementEnumType;
 
 //-----------------------------------------------------------------------------
 
-String TSShapeConstructor::smCapsuleShapePath("core/art/shapes/unit_capsule.dts");
-String TSShapeConstructor::smCubeShapePath("core/art/shapes/unit_cube.dts");
-String TSShapeConstructor::smSphereShapePath("core/art/shapes/unit_sphere.dts");
+String TSShapeConstructor::smCapsuleShapePath("tools/shapes/unit_capsule.dts");
+String TSShapeConstructor::smCubeShapePath("tools/shapes/unit_cube.dts");
+String TSShapeConstructor::smSphereShapePath("tools/shapes/unit_sphere.dts");
 
 ResourceRegisterPostLoadSignal< TSShape > TSShapeConstructor::_smAutoLoad( &TSShapeConstructor::_onTSShapeLoaded );
 ResourceRegisterUnloadSignal< TSShape > TSShapeConstructor::_smAutoUnload( &TSShapeConstructor::_onTSShapeUnloaded );
diff --git a/Templates/BaseGame/game/core/shapes/materials.cs b/Templates/BaseGame/game/core/shapes/materials.cs
new file mode 100644
index 000000000..2911ca4d2
--- /dev/null
+++ b/Templates/BaseGame/game/core/shapes/materials.cs
@@ -0,0 +1,16 @@
+//--- noshape.dts MATERIALS BEGIN ---
+singleton Material(noshape_NoShape)
+{
+    mapTo = "NoShape";
+
+    diffuseMap[0] = "";
+    diffuseColor[0] = "0.8 0.003067 0 .8";
+    emissive[0] = 0;
+    doubleSided = false;
+    translucent = 1;
+    translucentBlendOp = "LerpAlpha";
+    castShadows = false;
+    materialTag0 = "WorldEditor";
+};
+
+//--- noshape.dts MATERIALS END ---
diff --git a/Templates/BaseGame/game/core/shapes/noshape.dts b/Templates/BaseGame/game/core/shapes/noshape.dts
new file mode 100644
index 000000000..a7a64cf10
Binary files /dev/null and b/Templates/BaseGame/game/core/shapes/noshape.dts differ
diff --git a/Templates/BaseGame/game/core/shapes/noshape.mb b/Templates/BaseGame/game/core/shapes/noshape.mb
new file mode 100644
index 000000000..24330c1db
Binary files /dev/null and b/Templates/BaseGame/game/core/shapes/noshape.mb differ
diff --git a/Templates/BaseGame/game/tools/shapes/unit_capsule.dts b/Templates/BaseGame/game/tools/shapes/unit_capsule.dts
new file mode 100644
index 000000000..bc9483fac
Binary files /dev/null and b/Templates/BaseGame/game/tools/shapes/unit_capsule.dts differ
diff --git a/Templates/BaseGame/game/tools/shapes/unit_cube.dts b/Templates/BaseGame/game/tools/shapes/unit_cube.dts
new file mode 100644
index 000000000..feee7cf94
Binary files /dev/null and b/Templates/BaseGame/game/tools/shapes/unit_cube.dts differ
diff --git a/Templates/BaseGame/game/tools/shapes/unit_sphere.dts b/Templates/BaseGame/game/tools/shapes/unit_sphere.dts
new file mode 100644
index 000000000..4d435438e
Binary files /dev/null and b/Templates/BaseGame/game/tools/shapes/unit_sphere.dts differ