diff --git a/samples/GLKitComplex/GLKitComplex-WinStore10.sln b/samples/GLKitComplex/GLKitComplex-WinStore10.sln
index 0c32e93c55..57c4e16503 100644
--- a/samples/GLKitComplex/GLKitComplex-WinStore10.sln
+++ b/samples/GLKitComplex/GLKitComplex-WinStore10.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.22823.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GLKitComplex", "GLKitComplex", "{4392AD3B-D2BC-4CF0-A913-6F9DD608BB35}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GLKitComplex", "GLKitComplex", "{45F79AFE-6302-462D-A3E5-8C903EC35E31}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLKitComplex", "GLKitComplex.vsimporter\GLKitComplex-WinStore10\GLKitComplex.vcxproj", "{410D5BA4-8604-4089-A80F-FDDA814BA272}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLKitComplex", "GLKitComplex.vsimporter\GLKitComplex-WinStore10\GLKitComplex.vcxproj", "{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -16,23 +16,23 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{410D5BA4-8604-4089-A80F-FDDA814BA272}.Debug|ARM.ActiveCfg = Debug|ARM
-		{410D5BA4-8604-4089-A80F-FDDA814BA272}.Debug|ARM.Build.0 = Debug|ARM
-		{410D5BA4-8604-4089-A80F-FDDA814BA272}.Debug|ARM.Deploy.0 = Debug|ARM
-		{410D5BA4-8604-4089-A80F-FDDA814BA272}.Debug|Win32.ActiveCfg = Debug|Win32
-		{410D5BA4-8604-4089-A80F-FDDA814BA272}.Debug|Win32.Build.0 = Debug|Win32
-		{410D5BA4-8604-4089-A80F-FDDA814BA272}.Debug|Win32.Deploy.0 = Debug|Win32
-		{410D5BA4-8604-4089-A80F-FDDA814BA272}.Release|ARM.ActiveCfg = Release|ARM
-		{410D5BA4-8604-4089-A80F-FDDA814BA272}.Release|ARM.Build.0 = Release|ARM
-		{410D5BA4-8604-4089-A80F-FDDA814BA272}.Release|ARM.Deploy.0 = Release|ARM
-		{410D5BA4-8604-4089-A80F-FDDA814BA272}.Release|Win32.ActiveCfg = Release|Win32
-		{410D5BA4-8604-4089-A80F-FDDA814BA272}.Release|Win32.Build.0 = Release|Win32
-		{410D5BA4-8604-4089-A80F-FDDA814BA272}.Release|Win32.Deploy.0 = Release|Win32
+		{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|ARM.ActiveCfg = Debug|ARM
+		{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|ARM.Build.0 = Debug|ARM
+		{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|ARM.Deploy.0 = Debug|ARM
+		{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|Win32.Build.0 = Debug|Win32
+		{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Debug|Win32.Deploy.0 = Debug|Win32
+		{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|ARM.ActiveCfg = Release|ARM
+		{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|ARM.Build.0 = Release|ARM
+		{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|ARM.Deploy.0 = Release|ARM
+		{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|Win32.ActiveCfg = Release|Win32
+		{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|Win32.Build.0 = Release|Win32
+		{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}.Release|Win32.Deploy.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{410D5BA4-8604-4089-A80F-FDDA814BA272} = {4392AD3B-D2BC-4CF0-A913-6F9DD608BB35}
+		{E45BBE1B-1E64-4C3C-9D81-433F9AB81749} = {45F79AFE-6302-462D-A3E5-8C903EC35E31}
 	EndGlobalSection
 EndGlobal
diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj
index 41252af4e0..a3144cbd48 100644
--- a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj
+++ b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM">
@@ -29,9 +29,9 @@
     <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
     <Keyword>IslandwoodProj</Keyword>
-    <ProjectGuid>{410D5BA4-8604-4089-A80F-FDDA814BA272}</ProjectGuid>
+    <ProjectGuid>{E45BBE1B-1E64-4C3C-9D81-433F9AB81749}</ProjectGuid>
     <RootNamespace>GLKitComplex</RootNamespace>
-    <WINOBJC_SDK_ROOT Condition="'$(WINOBJC_SDK_ROOT)' == ''">E:\island\github\henryfox\WinObjC</WINOBJC_SDK_ROOT>
+    <WINOBJC_SDK_ROOT Condition="'$(WINOBJC_SDK_ROOT)' == ''">..\..\..\..</WINOBJC_SDK_ROOT>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -180,18 +180,7 @@
       <SubType>Designer</SubType>
     </AppxManifest>
     <Xml Include="default.rd.xml" />
-    <None Include="..\..\GLKitComplex\Data\teapot_specular.pdn" />
     <None Include="GLKitComplex_TemporaryKey.pfx" />
-    <Image Include="..\..\GLKitComplex\Data\lobbyxneg.jpg" />
-    <Image Include="..\..\GLKitComplex\Data\lobbyxpos.jpg" />
-    <Image Include="..\..\GLKitComplex\Data\lobbyyneg.JPG" />
-    <Image Include="..\..\GLKitComplex\Data\lobbyypos.jpg" />
-    <Image Include="..\..\GLKitComplex\Data\lobbyzneg.JPG" />
-    <Image Include="..\..\GLKitComplex\Data\lobbyzpos.JPG" />
-    <Image Include="..\..\GLKitComplex\Data\seafloor.png" />
-    <Image Include="..\..\GLKitComplex\Data\teapot_decal.png" />
-    <Image Include="..\..\GLKitComplex\Data\teapot_emissive.png" />
-    <Image Include="..\..\GLKitComplex\Data\teapot_specular.png" />
     <Image Include="Assets\LockScreenLogo.scale-200.png" />
     <Image Include="Assets\SplashScreen.scale-200.png" />
     <Image Include="Assets\Square150x150Logo.scale-200.png" />
@@ -246,4 +235,4 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(WINOBJC_SDK_ROOT)\msvc\starboard.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj.filters b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj.filters
index f1467763b5..1430e276c7 100644
--- a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj.filters
+++ b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/GLKitComplex.vcxproj.filters
@@ -1,23 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Common">
-      <UniqueIdentifier>{e452b090-a068-4221-a05e-f0649ba75d97}</UniqueIdentifier>
+      <UniqueIdentifier>{6497114e-8c49-47cf-bd7e-2caaaef4b9b5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Assets">
-      <UniqueIdentifier>{d4bbe3f2-5cd8-41b6-bef6-2729d0ad2e4c}</UniqueIdentifier>
+      <UniqueIdentifier>{a8203dfd-e407-4106-a91f-45bb7976f98e}</UniqueIdentifier>
     </Filter>
     <Filter Include="GLKitComplex">
-      <UniqueIdentifier>{585835AD-D619-4861-AEFC-2F58379A2473}</UniqueIdentifier>
+      <UniqueIdentifier>{5BB4745A-5EB8-4F23-B063-F9C7E9E2B269}</UniqueIdentifier>
     </Filter>
     <Filter Include="GLKitComplex\Base">
-      <UniqueIdentifier>{6FFB3A7E-248B-4C70-A86C-2C9A9AAEA882}</UniqueIdentifier>
+      <UniqueIdentifier>{CB2B31F2-8729-4BD9-A7EC-DAAEC2F082AD}</UniqueIdentifier>
     </Filter>
     <Filter Include="Xcode Variable Files">
-      <UniqueIdentifier>{BB54DD1D-6523-48AD-B9A1-0522DD497CBA}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GLKitComplex\Data">
-      <UniqueIdentifier>{36fa405a-617e-49e9-91e7-160488f7794f}</UniqueIdentifier>
+      <UniqueIdentifier>{FE7114EF-5E09-4C55-8024-0F0F29E662B9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -86,52 +83,4 @@
       <Filter>Xcode Variable Files</Filter>
     </Text>
   </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="App.xaml.cpp" />
-    <ClCompile Include="pch.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="App.xaml.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="..\..\GLKitComplex\Data\teapot_specular.png">
-      <Filter>GLKitComplex\Data</Filter>
-    </Image>
-    <Image Include="..\..\GLKitComplex\Data\lobbyxneg.jpg">
-      <Filter>GLKitComplex\Data</Filter>
-    </Image>
-    <Image Include="..\..\GLKitComplex\Data\lobbyxpos.jpg">
-      <Filter>GLKitComplex\Data</Filter>
-    </Image>
-    <Image Include="..\..\GLKitComplex\Data\lobbyyneg.JPG">
-      <Filter>GLKitComplex\Data</Filter>
-    </Image>
-    <Image Include="..\..\GLKitComplex\Data\lobbyypos.jpg">
-      <Filter>GLKitComplex\Data</Filter>
-    </Image>
-    <Image Include="..\..\GLKitComplex\Data\lobbyzneg.JPG">
-      <Filter>GLKitComplex\Data</Filter>
-    </Image>
-    <Image Include="..\..\GLKitComplex\Data\lobbyzpos.JPG">
-      <Filter>GLKitComplex\Data</Filter>
-    </Image>
-    <Image Include="..\..\GLKitComplex\Data\seafloor.png">
-      <Filter>GLKitComplex\Data</Filter>
-    </Image>
-    <Image Include="..\..\GLKitComplex\Data\teapot_decal.png">
-      <Filter>GLKitComplex\Data</Filter>
-    </Image>
-    <Image Include="..\..\GLKitComplex\Data\teapot_emissive.png">
-      <Filter>GLKitComplex\Data</Filter>
-    </Image>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\GLKitComplex\Data\teapot_specular.pdn">
-      <Filter>GLKitComplex\Data</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/Package.appxmanifest b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/Package.appxmanifest
index fcc3b76fae..df3a52edf6 100644
--- a/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/Package.appxmanifest
+++ b/samples/GLKitComplex/GLKitComplex.vsimporter/GLKitComplex-WinStore10/Package.appxmanifest
@@ -7,11 +7,11 @@
   IgnorableNamespaces="uap mp">
 
   <Identity
-    Name="e39cf139-ba09-4d0e-b933-6a457eb8d053"
+    Name="fae08089-524b-48c3-aed4-86beeceefce4"
     Publisher="CN=islandwood"
     Version="1.0.0.0" />
 
-  <mp:PhoneIdentity PhoneProductId="e39cf139-ba09-4d0e-b933-6a457eb8d053" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <mp:PhoneIdentity PhoneProductId="fae08089-524b-48c3-aed4-86beeceefce4" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>GLKitComplex</DisplayName>
diff --git a/samples/HelloGLKit/HelloGLKit-WinStore10.sln b/samples/HelloGLKit/HelloGLKit-WinStore10.sln
index 0a15a007d5..4ccb6dc6a3 100644
--- a/samples/HelloGLKit/HelloGLKit-WinStore10.sln
+++ b/samples/HelloGLKit/HelloGLKit-WinStore10.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.22823.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HelloGLKit", "HelloGLKit", "{A767F7AA-295B-4223-831B-C1968F43F783}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HelloGLKit", "HelloGLKit", "{4E066E9E-322D-4859-B489-F3F29E0371BE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloGLKit", "HelloGLKit.vsimporter\HelloGLKit-WinStore10\HelloGLKit.vcxproj", "{3B3E53EF-8A11-41CF-A5CA-F0B9414BAF2E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloGLKit", "HelloGLKit.vsimporter\HelloGLKit-WinStore10\HelloGLKit.vcxproj", "{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -16,23 +16,23 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3B3E53EF-8A11-41CF-A5CA-F0B9414BAF2E}.Debug|ARM.ActiveCfg = Debug|ARM
-		{3B3E53EF-8A11-41CF-A5CA-F0B9414BAF2E}.Debug|ARM.Build.0 = Debug|ARM
-		{3B3E53EF-8A11-41CF-A5CA-F0B9414BAF2E}.Debug|ARM.Deploy.0 = Debug|ARM
-		{3B3E53EF-8A11-41CF-A5CA-F0B9414BAF2E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3B3E53EF-8A11-41CF-A5CA-F0B9414BAF2E}.Debug|Win32.Build.0 = Debug|Win32
-		{3B3E53EF-8A11-41CF-A5CA-F0B9414BAF2E}.Debug|Win32.Deploy.0 = Debug|Win32
-		{3B3E53EF-8A11-41CF-A5CA-F0B9414BAF2E}.Release|ARM.ActiveCfg = Release|ARM
-		{3B3E53EF-8A11-41CF-A5CA-F0B9414BAF2E}.Release|ARM.Build.0 = Release|ARM
-		{3B3E53EF-8A11-41CF-A5CA-F0B9414BAF2E}.Release|ARM.Deploy.0 = Release|ARM
-		{3B3E53EF-8A11-41CF-A5CA-F0B9414BAF2E}.Release|Win32.ActiveCfg = Release|Win32
-		{3B3E53EF-8A11-41CF-A5CA-F0B9414BAF2E}.Release|Win32.Build.0 = Release|Win32
-		{3B3E53EF-8A11-41CF-A5CA-F0B9414BAF2E}.Release|Win32.Deploy.0 = Release|Win32
+		{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Debug|ARM.ActiveCfg = Debug|ARM
+		{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Debug|ARM.Build.0 = Debug|ARM
+		{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Debug|ARM.Deploy.0 = Debug|ARM
+		{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Debug|Win32.Build.0 = Debug|Win32
+		{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Debug|Win32.Deploy.0 = Debug|Win32
+		{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Release|ARM.ActiveCfg = Release|ARM
+		{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Release|ARM.Build.0 = Release|ARM
+		{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Release|ARM.Deploy.0 = Release|ARM
+		{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Release|Win32.ActiveCfg = Release|Win32
+		{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Release|Win32.Build.0 = Release|Win32
+		{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}.Release|Win32.Deploy.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{3B3E53EF-8A11-41CF-A5CA-F0B9414BAF2E} = {A767F7AA-295B-4223-831B-C1968F43F783}
+		{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F} = {4E066E9E-322D-4859-B489-F3F29E0371BE}
 	EndGlobalSection
 EndGlobal
diff --git a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj
index b184b42e66..e6f6660992 100644
--- a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj
+++ b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj
@@ -29,9 +29,9 @@
     <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
     <Keyword>IslandwoodProj</Keyword>
-    <ProjectGuid>{3B3E53EF-8A11-41CF-A5CA-F0B9414BAF2E}</ProjectGuid>
+    <ProjectGuid>{B7ED0716-0B1E-4FE0-BE3E-870D2DA6F38F}</ProjectGuid>
     <RootNamespace>HelloGLKit</RootNamespace>
-    <WINOBJC_SDK_ROOT Condition="'$(WINOBJC_SDK_ROOT)' == ''">E:\island\github\henryfox\WinObjC</WINOBJC_SDK_ROOT>
+    <WINOBJC_SDK_ROOT Condition="'$(WINOBJC_SDK_ROOT)' == ''">..\..\..\..</WINOBJC_SDK_ROOT>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj.filters b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj.filters
index f3fbcb7347..688e1545e1 100644
--- a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj.filters
+++ b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/HelloGLKit.vcxproj.filters
@@ -2,19 +2,19 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Common">
-      <UniqueIdentifier>{b95acb62-21de-46c9-8b31-6a25f1b7d1be}</UniqueIdentifier>
+      <UniqueIdentifier>{fbe85872-bf7f-46b7-bc36-809357e69b23}</UniqueIdentifier>
     </Filter>
     <Filter Include="Assets">
-      <UniqueIdentifier>{7facfdba-44a7-4ef7-9eaa-fa752871577a}</UniqueIdentifier>
+      <UniqueIdentifier>{793e6d63-787c-4553-9053-43ee6a7ca670}</UniqueIdentifier>
     </Filter>
     <Filter Include="HelloGLKit">
-      <UniqueIdentifier>{FF57A703-885B-4563-83F0-52ED8DAFE9A3}</UniqueIdentifier>
+      <UniqueIdentifier>{C2D01774-9ACE-4399-8CB2-E1CC7625C369}</UniqueIdentifier>
     </Filter>
     <Filter Include="HelloGLKit\Base">
-      <UniqueIdentifier>{F52BCFC1-59D3-465E-850E-9014180C05C9}</UniqueIdentifier>
+      <UniqueIdentifier>{8B97283C-8B1F-4785-B872-1C984D2663B2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Xcode Variable Files">
-      <UniqueIdentifier>{D29E8AB9-9348-4343-9779-A96D4CB329A6}</UniqueIdentifier>
+      <UniqueIdentifier>{8F93AA9A-2C8C-4539-BC65-56CD7DBFB2CF}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/Package.appxmanifest b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/Package.appxmanifest
index 8bc4ba6899..87202cd6e1 100644
--- a/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/Package.appxmanifest
+++ b/samples/HelloGLKit/HelloGLKit.vsimporter/HelloGLKit-WinStore10/Package.appxmanifest
@@ -7,11 +7,11 @@
   IgnorableNamespaces="uap mp">
 
   <Identity
-    Name="bcdb9483-5672-463b-b8eb-fc9559d6a760"
+    Name="58008f8d-4ddc-4276-8a8b-4f60e951a6eb"
     Publisher="CN=islandwood"
     Version="1.0.0.0" />
 
-  <mp:PhoneIdentity PhoneProductId="bcdb9483-5672-463b-b8eb-fc9559d6a760" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <mp:PhoneIdentity PhoneProductId="58008f8d-4ddc-4276-8a8b-4f60e951a6eb" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>HelloGLKit</DisplayName>
diff --git a/samples/HelloOpenGL/HelloOpenGL-WinStore10.sln b/samples/HelloOpenGL/HelloOpenGL-WinStore10.sln
index d39a254dd6..4beebd27d9 100644
--- a/samples/HelloOpenGL/HelloOpenGL-WinStore10.sln
+++ b/samples/HelloOpenGL/HelloOpenGL-WinStore10.sln
@@ -2,9 +2,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.22823.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HelloOpenGL", "HelloOpenGL", "{6761F46B-2E44-4B62-AE46-70D81CE27171}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HelloOpenGL", "HelloOpenGL", "{5E800129-96C4-4AFB-AD4D-72F1ED6DB21E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloOpenGL", "HelloOpenGL.vsimporter\HelloOpenGL-WinStore10\HelloOpenGL.vcxproj", "{5F8B73C6-1253-4481-9567-A81321309725}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloOpenGL", "HelloOpenGL.vsimporter\HelloOpenGL-WinStore10\HelloOpenGL.vcxproj", "{5667C667-0E57-4F19-9091-01FA8737E20F}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
@@ -16,23 +16,23 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5F8B73C6-1253-4481-9567-A81321309725}.Debug|ARM.ActiveCfg = Debug|ARM
-		{5F8B73C6-1253-4481-9567-A81321309725}.Debug|ARM.Build.0 = Debug|ARM
-		{5F8B73C6-1253-4481-9567-A81321309725}.Debug|ARM.Deploy.0 = Debug|ARM
-		{5F8B73C6-1253-4481-9567-A81321309725}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5F8B73C6-1253-4481-9567-A81321309725}.Debug|Win32.Build.0 = Debug|Win32
-		{5F8B73C6-1253-4481-9567-A81321309725}.Debug|Win32.Deploy.0 = Debug|Win32
-		{5F8B73C6-1253-4481-9567-A81321309725}.Release|ARM.ActiveCfg = Release|ARM
-		{5F8B73C6-1253-4481-9567-A81321309725}.Release|ARM.Build.0 = Release|ARM
-		{5F8B73C6-1253-4481-9567-A81321309725}.Release|ARM.Deploy.0 = Release|ARM
-		{5F8B73C6-1253-4481-9567-A81321309725}.Release|Win32.ActiveCfg = Release|Win32
-		{5F8B73C6-1253-4481-9567-A81321309725}.Release|Win32.Build.0 = Release|Win32
-		{5F8B73C6-1253-4481-9567-A81321309725}.Release|Win32.Deploy.0 = Release|Win32
+		{5667C667-0E57-4F19-9091-01FA8737E20F}.Debug|ARM.ActiveCfg = Debug|ARM
+		{5667C667-0E57-4F19-9091-01FA8737E20F}.Debug|ARM.Build.0 = Debug|ARM
+		{5667C667-0E57-4F19-9091-01FA8737E20F}.Debug|ARM.Deploy.0 = Debug|ARM
+		{5667C667-0E57-4F19-9091-01FA8737E20F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5667C667-0E57-4F19-9091-01FA8737E20F}.Debug|Win32.Build.0 = Debug|Win32
+		{5667C667-0E57-4F19-9091-01FA8737E20F}.Debug|Win32.Deploy.0 = Debug|Win32
+		{5667C667-0E57-4F19-9091-01FA8737E20F}.Release|ARM.ActiveCfg = Release|ARM
+		{5667C667-0E57-4F19-9091-01FA8737E20F}.Release|ARM.Build.0 = Release|ARM
+		{5667C667-0E57-4F19-9091-01FA8737E20F}.Release|ARM.Deploy.0 = Release|ARM
+		{5667C667-0E57-4F19-9091-01FA8737E20F}.Release|Win32.ActiveCfg = Release|Win32
+		{5667C667-0E57-4F19-9091-01FA8737E20F}.Release|Win32.Build.0 = Release|Win32
+		{5667C667-0E57-4F19-9091-01FA8737E20F}.Release|Win32.Deploy.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{5F8B73C6-1253-4481-9567-A81321309725} = {6761F46B-2E44-4B62-AE46-70D81CE27171}
+		{5667C667-0E57-4F19-9091-01FA8737E20F} = {5E800129-96C4-4AFB-AD4D-72F1ED6DB21E}
 	EndGlobalSection
 EndGlobal
diff --git a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj
index f043df60dc..762d967bdd 100644
--- a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj
+++ b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj
@@ -29,9 +29,9 @@
     <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion>
     <Keyword>IslandwoodProj</Keyword>
-    <ProjectGuid>{5F8B73C6-1253-4481-9567-A81321309725}</ProjectGuid>
+    <ProjectGuid>{5667C667-0E57-4F19-9091-01FA8737E20F}</ProjectGuid>
     <RootNamespace>HelloOpenGL</RootNamespace>
-    <WINOBJC_SDK_ROOT Condition="'$(WINOBJC_SDK_ROOT)' == ''">E:\island\github\henryfox\WinObjC</WINOBJC_SDK_ROOT>
+    <WINOBJC_SDK_ROOT Condition="'$(WINOBJC_SDK_ROOT)' == ''">..\..\..\..</WINOBJC_SDK_ROOT>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
diff --git a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj.filters b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj.filters
index b450597989..5279cfcbc0 100644
--- a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj.filters
+++ b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/HelloOpenGL.vcxproj.filters
@@ -2,19 +2,19 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Common">
-      <UniqueIdentifier>{63547038-e170-4c8f-a5c9-bb43504ca018}</UniqueIdentifier>
+      <UniqueIdentifier>{60d15db9-65d6-4d10-a0d2-79a35a4ccbb4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Assets">
-      <UniqueIdentifier>{d15faabc-8076-41c6-8482-7320935f0f7a}</UniqueIdentifier>
+      <UniqueIdentifier>{9452999f-8c71-472d-a8c7-f642727a6f01}</UniqueIdentifier>
     </Filter>
     <Filter Include="HelloOpenGL">
-      <UniqueIdentifier>{2C160A26-1608-48C0-AD47-15F38B2F9775}</UniqueIdentifier>
+      <UniqueIdentifier>{EF64643C-2004-4E62-9C12-0A66B0216509}</UniqueIdentifier>
     </Filter>
     <Filter Include="HelloOpenGL\Base">
-      <UniqueIdentifier>{60AE8B8B-8B6F-43B5-BFC1-4D4B6E629566}</UniqueIdentifier>
+      <UniqueIdentifier>{59C38EDD-8B7E-4215-A946-0214EA2871E6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Xcode Variable Files">
-      <UniqueIdentifier>{D80695ED-2AB6-4407-B297-562EF4924994}</UniqueIdentifier>
+      <UniqueIdentifier>{268C280C-3AA2-4B60-AA20-FFF5F1217653}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/Package.appxmanifest b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/Package.appxmanifest
index 1f048b26d1..a22ff25bf2 100644
--- a/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/Package.appxmanifest
+++ b/samples/HelloOpenGL/HelloOpenGL.vsimporter/HelloOpenGL-WinStore10/Package.appxmanifest
@@ -7,11 +7,11 @@
   IgnorableNamespaces="uap mp">
 
   <Identity
-    Name="529fbfee-aab7-499d-8e5d-a41c0923ec6a"
+    Name="472e6724-e708-405a-859b-cffa71e8fbab"
     Publisher="CN=islandwood"
     Version="1.0.0.0" />
 
-  <mp:PhoneIdentity PhoneProductId="529fbfee-aab7-499d-8e5d-a41c0923ec6a" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <mp:PhoneIdentity PhoneProductId="472e6724-e708-405a-859b-cffa71e8fbab" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>HelloOpenGL</DisplayName>