diff --git a/P3D/Content/Data/Scripts/furniture/barktown/yourroom/tv.dat b/P3D/Content/Data/Scripts/furniture/barktown/yourroom/tv.dat
index be7a5b2ac..b5c1e599c 100644
Binary files a/P3D/Content/Data/Scripts/furniture/barktown/yourroom/tv.dat and b/P3D/Content/Data/Scripts/furniture/barktown/yourroom/tv.dat differ
diff --git a/P3D/Content/Data/Scripts/ilex/shrine.dat b/P3D/Content/Data/Scripts/ilex/shrine.dat
index b5d54e62d..743bdee6d 100644
Binary files a/P3D/Content/Data/Scripts/ilex/shrine.dat and b/P3D/Content/Data/Scripts/ilex/shrine.dat differ
diff --git a/P3D/Content/Data/Scripts/mtsilver/red.dat b/P3D/Content/Data/Scripts/mtsilver/red.dat
index aacf4436a..67c6fcbeb 100644
Binary files a/P3D/Content/Data/Scripts/mtsilver/red.dat and b/P3D/Content/Data/Scripts/mtsilver/red.dat differ
diff --git a/P3D/Content/Data/Scripts/quest/tanoby/rock.dat b/P3D/Content/Data/Scripts/quest/tanoby/rock.dat
index e2bce8910..5eae1f6b9 100644
Binary files a/P3D/Content/Data/Scripts/quest/tanoby/rock.dat and b/P3D/Content/Data/Scripts/quest/tanoby/rock.dat differ
diff --git a/P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer b/P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer
index 3e39984cf..1e9c71df0 100644
Binary files a/P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer and b/P3D/Content/Data/Scripts/trainer/tohjo/Giovanni.trainer differ
diff --git a/P3D/Content/Data/maps/embtower/main.dat b/P3D/Content/Data/maps/embtower/main.dat
deleted file mode 100644
index 086f1ea1a..000000000
Binary files a/P3D/Content/Data/maps/embtower/main.dat and /dev/null differ
diff --git a/P3D/Content/Data/maps/routes/route22.dat b/P3D/Content/Data/maps/routes/route22.dat
index 5bff457d6..a6520139f 100644
Binary files a/P3D/Content/Data/maps/routes/route22.dat and b/P3D/Content/Data/maps/routes/route22.dat differ
diff --git a/P3D/Content/Data/maps/tohjofalls/hideout.dat b/P3D/Content/Data/maps/tohjofalls/hideout.dat
index 7ba0fc437..3ddb59176 100644
Binary files a/P3D/Content/Data/maps/tohjofalls/hideout.dat and b/P3D/Content/Data/maps/tohjofalls/hideout.dat differ
diff --git a/P3D/Content/Data/maps/yourroom.dat b/P3D/Content/Data/maps/yourroom.dat
index 98938c25c..3226c0f4f 100644
Binary files a/P3D/Content/Data/maps/yourroom.dat and b/P3D/Content/Data/maps/yourroom.dat differ
diff --git a/P3D/Content/Textures/EmbeddedTower.png b/P3D/Content/Textures/EmbeddedTower.png
deleted file mode 100644
index 395243860..000000000
Binary files a/P3D/Content/Textures/EmbeddedTower.png and /dev/null differ
diff --git a/P3D/Content/Textures/switch.png b/P3D/Content/Textures/switch.png
new file mode 100644
index 000000000..2046a5838
Binary files /dev/null and b/P3D/Content/Textures/switch.png differ
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index 76f5609c6..54bfbc51a 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -1624,9 +1624,6 @@
     <Content Include="Content\Data\maps\elmlab.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Data\maps\embtower\main.dat">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Data\maps\faraway\exterior.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -24766,9 +24763,6 @@
     <Content Include="Content\Textures\ecruteak.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Textures\EmbeddedTower.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Textures\Emblem\alph.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -25951,6 +25945,9 @@
     <Content Include="Content\Data\maps\structures\stairs\3\e.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\switch.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Pokemon3D.ico" />
     <Content Include="credits.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -27640,6 +27637,9 @@
       <Name>GameDevCommon</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Content\Data\maps\embtower\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <Import Condition=" '$(Configuration)' != 'DebugNoContent' Or '$(Configuration)' != 'ReleaseNoContent' " Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Content.Builder.targets" />
   <PropertyGroup>