diff --git a/.gitmodules b/.gitmodules
index f1a2701..4a70de7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "MonoGame"]
 	path = MonoGame
-	url = https://github.com/Ellpeck/MonoGame
+	url = https://github.com/MonoGame/MonoGame
diff --git a/Contentless.sln b/Contentless.sln
index e07d337..06ce45b 100644
--- a/Contentless.sln
+++ b/Contentless.sln
@@ -2,10 +2,12 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contentless", "Contentless\Contentless.csproj", "{A5C68D51-B404-44C9-8DD8-BAD4FD62A82D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.Content.Pipeline.Windows", "MonoGame\MonoGame.Framework.Content.Pipeline\MonoGame.Framework.Content.Pipeline.Windows.csproj", "{B950DE10-AC5D-4BD9-B817-51247C4A732D}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.Content.Pipeline", "MonoGame\MonoGame.Framework.Content.Pipeline\MonoGame.Framework.Content.Pipeline.csproj", "{A0BF6B94-5CF3-4456-AFEA-D956CF2AB92D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.DesktopGL", "MonoGame\MonoGame.Framework\MonoGame.Framework.DesktopGL.csproj", "{A8CFF376-58A8-41BB-8615-5232BB2B21EF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -16,13 +18,17 @@ Global
 		{A5C68D51-B404-44C9-8DD8-BAD4FD62A82D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A5C68D51-B404-44C9-8DD8-BAD4FD62A82D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A5C68D51-B404-44C9-8DD8-BAD4FD62A82D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B950DE10-AC5D-4BD9-B817-51247C4A732D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B950DE10-AC5D-4BD9-B817-51247C4A732D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B950DE10-AC5D-4BD9-B817-51247C4A732D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B950DE10-AC5D-4BD9-B817-51247C4A732D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{58716AA9-5BCE-42C5-A0E7-D8B23C0488BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0BF6B94-5CF3-4456-AFEA-D956CF2AB92D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0BF6B94-5CF3-4456-AFEA-D956CF2AB92D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0BF6B94-5CF3-4456-AFEA-D956CF2AB92D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0BF6B94-5CF3-4456-AFEA-D956CF2AB92D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8CFF376-58A8-41BB-8615-5232BB2B21EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8CFF376-58A8-41BB-8615-5232BB2B21EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8CFF376-58A8-41BB-8615-5232BB2B21EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8CFF376-58A8-41BB-8615-5232BB2B21EF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/Contentless/Contentless.csproj b/Contentless/Contentless.csproj
index 7939d0f..7d2427d 100644
--- a/Contentless/Contentless.csproj
+++ b/Contentless/Contentless.csproj
@@ -10,7 +10,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\MonoGame\MonoGame.Framework.Content.Pipeline\MonoGame.Framework.Content.Pipeline.Windows.csproj">
+        <ProjectReference Include="..\MonoGame\MonoGame.Framework.Content.Pipeline\MonoGame.Framework.Content.Pipeline.csproj">
+            <PrivateAssets>All</PrivateAssets>
+        </ProjectReference>
+        <ProjectReference Include="..\MonoGame\MonoGame.Framework\MonoGame.Framework.DesktopGL.csproj">
             <PrivateAssets>All</PrivateAssets>
         </ProjectReference>
     </ItemGroup>
diff --git a/Contentless/Contentless.nuspec b/Contentless/Contentless.nuspec
index 0bdbc8c..c1970fc 100644
--- a/Contentless/Contentless.nuspec
+++ b/Contentless/Contentless.nuspec
@@ -9,7 +9,6 @@
         <projectUrl>https://github.com/Ellpeck/Contentless</projectUrl>
         <licenseUrl>https://github.com/Ellpeck/Contentless/blob/master/LICENSE</licenseUrl>
         <repository type="git" url="https://github.com/Ellpeck/Contentless"/>
-        <readme>README.md</readme>
     </metadata>
     <files>
         <file src="../README.md" target="README.md"/>
diff --git a/MonoGame b/MonoGame
index 133ef7c..661de69 160000
--- a/MonoGame
+++ b/MonoGame
@@ -1 +1 @@
-Subproject commit 133ef7c79d1e13152c543986e4335b6e01740ec4
+Subproject commit 661de69369ecf0f4e078551b81836586bf6c2c67
diff --git a/Test/Content/Content.mgcb b/Test/Content/Content.mgcb
index 15e9825..d2c32d2 100644
--- a/Test/Content/Content.mgcb
+++ b/Test/Content/Content.mgcb
@@ -55,3 +55,8 @@
 /processor:TiledMapTilesetProcessor
 /build:Tiled/Tileset.tsx
 
+#begin Textures/Exclude.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/build:Textures/Exclude.png
+