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/Modules/FPSGameplay/art/shapes/noshape.dts b/Templates/BaseGame/game/core/shapes/noshape.dts
similarity index 100%
rename from Templates/Modules/FPSGameplay/art/shapes/noshape.dts
rename to Templates/BaseGame/game/core/shapes/noshape.dts
diff --git a/Templates/Modules/FPSGameplay/art/shapes/noshape.mb b/Templates/BaseGame/game/core/shapes/noshape.mb
similarity index 100%
rename from Templates/Modules/FPSGameplay/art/shapes/noshape.mb
rename to Templates/BaseGame/game/core/shapes/noshape.mb
diff --git a/Templates/Modules/FPSGameplay/art/shapes/unit_capsule.dts b/Templates/BaseGame/game/tools/shapes/unit_capsule.dts
similarity index 100%
rename from Templates/Modules/FPSGameplay/art/shapes/unit_capsule.dts
rename to Templates/BaseGame/game/tools/shapes/unit_capsule.dts
diff --git a/Templates/Modules/FPSGameplay/art/shapes/unit_cube.dts b/Templates/BaseGame/game/tools/shapes/unit_cube.dts
similarity index 100%
rename from Templates/Modules/FPSGameplay/art/shapes/unit_cube.dts
rename to Templates/BaseGame/game/tools/shapes/unit_cube.dts
diff --git a/Templates/Modules/FPSGameplay/art/shapes/unit_sphere.dts b/Templates/BaseGame/game/tools/shapes/unit_sphere.dts
similarity index 100%
rename from Templates/Modules/FPSGameplay/art/shapes/unit_sphere.dts
rename to Templates/BaseGame/game/tools/shapes/unit_sphere.dts
diff --git a/Templates/Modules/FPSGameplay/art/shapes/materials.cs b/Templates/Modules/FPSGameplay/art/shapes/materials.cs
index 3e48872a7..c3620b36d 100644
--- a/Templates/Modules/FPSGameplay/art/shapes/materials.cs
+++ b/Templates/Modules/FPSGameplay/art/shapes/materials.cs
@@ -65,57 +65,3 @@ singleton Material(CameraMat)
 };
 
 //--- camera.dts MATERIALS END ---
-//--- 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;
-};
-
-//--- noshape.dts MATERIALS END ---
-
-//--- noshapetext.dae MATERIALS BEGIN ---
-singleton Material(noshapetext_lambert1)
-{
-   mapTo = "lambert1";
-
-	diffuseMap[0] = "";
-
-	diffuseColor[0] = "0.4 0.4 0.4 1";
-	specular[0] = "1 1 1 1";
-	specularPower[0] = 8;
-	pixelSpecular[0] = false;
-	emissive[0] = true;
-
-	doubleSided = false;
-	translucent = false;
-	translucentBlendOp = "None";
-};
-
-singleton Material(noshapetext_noshape_mat)
-{
-   mapTo = "noshape_mat";
-
-	diffuseMap[0] = "";
-
-	diffuseColor[0] = "0.4 0.3504 0.363784 0.33058";
-	specular[0] = "1 1 1 1";
-	specularPower[0] = 8;
-	pixelSpecular[0] = false;
-	emissive[0] = true;
-
-	doubleSided = false;
-	translucent = true;
-	translucentBlendOp = "None";
-};
-
-//--- noshapetext.dae MATERIALS END ---
\ No newline at end of file
diff --git a/Templates/Modules/spectatorGameplay/art/shapes/base-normal.png b/Templates/Modules/spectatorGameplay/art/shapes/base-normal.png
deleted file mode 100644
index 27ed35fcd..000000000
Binary files a/Templates/Modules/spectatorGameplay/art/shapes/base-normal.png and /dev/null differ
diff --git a/Templates/Modules/spectatorGameplay/art/shapes/base.png b/Templates/Modules/spectatorGameplay/art/shapes/base.png
deleted file mode 100644
index 34ac6baa2..000000000
Binary files a/Templates/Modules/spectatorGameplay/art/shapes/base.png and /dev/null differ
diff --git a/Templates/Modules/spectatorGameplay/art/shapes/lightray.png b/Templates/Modules/spectatorGameplay/art/shapes/lightray.png
deleted file mode 100644
index 1f3ed83ba..000000000
Binary files a/Templates/Modules/spectatorGameplay/art/shapes/lightray.png and /dev/null differ
diff --git a/Templates/Modules/spectatorGameplay/art/shapes/materials.cs b/Templates/Modules/spectatorGameplay/art/shapes/materials.cs
index f413f54b0..c3620b36d 100644
--- a/Templates/Modules/spectatorGameplay/art/shapes/materials.cs
+++ b/Templates/Modules/spectatorGameplay/art/shapes/materials.cs
@@ -65,97 +65,3 @@ singleton Material(CameraMat)
 };
 
 //--- camera.dts MATERIALS END ---
-//--- 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;
-};
-
-//--- noshape.dts MATERIALS END ---
-
-//--- noshapetext.dae MATERIALS BEGIN ---
-singleton Material(noshapetext_lambert1)
-{
-   mapTo = "lambert1";
-
-	diffuseMap[0] = "";
-
-	diffuseColor[0] = "0.4 0.4 0.4 1";
-	specular[0] = "1 1 1 1";
-	specularPower[0] = 8;
-	pixelSpecular[0] = false;
-	emissive[0] = true;
-
-	doubleSided = false;
-	translucent = false;
-	translucentBlendOp = "None";
-};
-
-singleton Material(noshapetext_noshape_mat)
-{
-   mapTo = "noshape_mat";
-
-	diffuseMap[0] = "";
-
-	diffuseColor[0] = "0.4 0.3504 0.363784 0.33058";
-	specular[0] = "1 1 1 1";
-	specularPower[0] = 8;
-	pixelSpecular[0] = false;
-	emissive[0] = true;
-
-	doubleSided = false;
-	translucent = true;
-	translucentBlendOp = "None";
-};
-
-//--- noshapetext.dae MATERIALS END ---
-
-//--- portal MATERIALS BEGIN ---
-
-singleton Material(portal5_portal_top)
-{
-   mapTo = "portal_top";
-
-	diffuseMap[0] = "top";
-   normalMap[0]  = "top-normal";
-
-   diffuseColor[0] = "0.4 0.4 0.4 1";
-	specular[0] = "0.5 0.5 0.5 1";
-	specularPower[0] = 2;
-	pixelSpecular[0] = false;
-	emissive[0] = true;
-
-	doubleSided = false;
-	translucent = false;
-	translucentBlendOp = "None";
-};
-
-singleton Material(portal5_portal_lightray)
-{
-   mapTo = "portal_lightray";
-
-	diffuseMap[0] = "lightray";
-
-	diffuseColor[0] = "0.4 0.4 0.4 0.64462";
-	specular[0] = "0.5 0.5 0.5 1";
-	specularPower[0] = 2;
-	pixelSpecular[0] = false;
-	emissive[0] = true;
-
-	doubleSided = 1;
-	translucent = true;
-	translucentBlendOp = "AddAlpha";
-   castShadows = "0";
-};
-//--- portal MATERIALS END ---
-
diff --git a/Templates/Modules/spectatorGameplay/art/shapes/noshape.dts b/Templates/Modules/spectatorGameplay/art/shapes/noshape.dts
deleted file mode 100644
index a7a64cf10..000000000
Binary files a/Templates/Modules/spectatorGameplay/art/shapes/noshape.dts and /dev/null differ
diff --git a/Templates/Modules/spectatorGameplay/art/shapes/noshape.mb b/Templates/Modules/spectatorGameplay/art/shapes/noshape.mb
deleted file mode 100644
index 24330c1db..000000000
Binary files a/Templates/Modules/spectatorGameplay/art/shapes/noshape.mb and /dev/null differ
diff --git a/Templates/Modules/spectatorGameplay/art/shapes/portal.dts b/Templates/Modules/spectatorGameplay/art/shapes/portal.dts
deleted file mode 100644
index edbd851c7..000000000
Binary files a/Templates/Modules/spectatorGameplay/art/shapes/portal.dts and /dev/null differ
diff --git a/Templates/Modules/spectatorGameplay/art/shapes/top-normal.png b/Templates/Modules/spectatorGameplay/art/shapes/top-normal.png
deleted file mode 100644
index 30e35fedb..000000000
Binary files a/Templates/Modules/spectatorGameplay/art/shapes/top-normal.png and /dev/null differ
diff --git a/Templates/Modules/spectatorGameplay/art/shapes/top.png b/Templates/Modules/spectatorGameplay/art/shapes/top.png
deleted file mode 100644
index 0ceb304da..000000000
Binary files a/Templates/Modules/spectatorGameplay/art/shapes/top.png and /dev/null differ
diff --git a/Templates/Modules/spectatorGameplay/art/shapes/unit_capsule.dts b/Templates/Modules/spectatorGameplay/art/shapes/unit_capsule.dts
deleted file mode 100644
index bc9483fac..000000000
Binary files a/Templates/Modules/spectatorGameplay/art/shapes/unit_capsule.dts and /dev/null differ
diff --git a/Templates/Modules/spectatorGameplay/art/shapes/unit_cube.dts b/Templates/Modules/spectatorGameplay/art/shapes/unit_cube.dts
deleted file mode 100644
index feee7cf94..000000000
Binary files a/Templates/Modules/spectatorGameplay/art/shapes/unit_cube.dts and /dev/null differ
diff --git a/Templates/Modules/spectatorGameplay/art/shapes/unit_sphere.dts b/Templates/Modules/spectatorGameplay/art/shapes/unit_sphere.dts
deleted file mode 100644
index 4d435438e..000000000
Binary files a/Templates/Modules/spectatorGameplay/art/shapes/unit_sphere.dts and /dev/null differ