diff --git a/ApplicationView/WindowsPlatformsFeatures.cs b/ApplicationView/WindowsPlatformsFeatures.cs
index 415fb80fe..3af7f4427 100644
--- a/ApplicationView/WindowsPlatformsFeatures.cs
+++ b/ApplicationView/WindowsPlatformsFeatures.cs
@@ -117,11 +117,14 @@ namespace MatterHackers.MatterControl
 		{
 			var commandLineArgs = Environment.GetCommandLineArgs();
 
+#if DEBUG
+			WinformsEventSink.AllowInspector = true;
+#endif
+
 			for (int currentCommandIndex = 0; currentCommandIndex < commandLineArgs.Length; currentCommandIndex++)
 			{
 				string command = commandLineArgs[currentCommandIndex];
-				string commandUpper = command.ToUpper();
-				switch (commandUpper)
+				switch (command.ToUpper())
 				{
 					case "FORCE_SOFTWARE_RENDERING":
 						GL.HardwareAvailable = false;
@@ -134,6 +137,10 @@ namespace MatterHackers.MatterControl
 					case "SHOW_MEMORY":
 						RootSystemWindow.ShowMemoryUsed = true;
 						break;
+
+					case "ALLOW_INSPECTOR":
+						WinformsEventSink.AllowInspector = true;
+						break;
 				}
 			}
 		}
diff --git a/MatterControl.csproj b/MatterControl.csproj
index b407664bd..e4218e639 100644
--- a/MatterControl.csproj
+++ b/MatterControl.csproj
@@ -302,10 +302,10 @@
     <Compile Include="Utilities\MarkdigAgg\Inlines\AggLiteralInlineRenderer.cs" />
     <Compile Include="Utilities\MarkdigAgg\AggParagraphRenderer.cs" />
     <Compile Include="Utilities\IGCodePostProcessor.cs" />
-    <Compile Include="Utilities\InspectForm.cs" Condition="'$(Configuration)' == 'Debug'">
+    <Compile Include="Utilities\InspectForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Utilities\InspectForm.Designer.cs" Condition="'$(Configuration)' == 'Debug'">
+    <Compile Include="Utilities\InspectForm.Designer.cs">
       <DependentUpon>InspectForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Library\ContentProviders\GCodeContentProvider.cs" />
@@ -624,7 +624,7 @@
     <EmbeddedResource Include="config.json">
       <LogicalName>config.json</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="Utilities\InspectForm.resx" Condition="'$(Configuration)' == 'Debug'">
+    <EmbeddedResource Include="Utilities\InspectForm.resx">
       <DependentUpon>InspectForm.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="App.config" />
diff --git a/RootSystemWindow.cs b/RootSystemWindow.cs
index 7ff20e15c..12095040f 100644
--- a/RootSystemWindow.cs
+++ b/RootSystemWindow.cs
@@ -130,9 +130,7 @@ namespace MatterHackers.MatterControl
 			{
 				Clipboard.SetSystemClipboard(new WindowsFormsClipboard());
 			}
-#endif
 
-#if DEBUG && !__ANDROID__
 			WinformsSystemWindow.InspectorCreator = (inspectingWindow) =>
 			{
 				if (inspectingWindow == this)
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 9d74cb8c8..758a7c2e5 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 9d74cb8c8f22ebd0c343dfda80306add8e052909
+Subproject commit 758a7c2e5dab2931994c67595bb7a2bed43fefa8