diff --git a/Cosmos.sln b/Cosmos.sln
index 6915760d2..dae34840d 100644
--- a/Cosmos.sln
+++ b/Cosmos.sln
@@ -161,11 +161,11 @@ Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "GuessKernelBoot", "Demos\Gu
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core.Memory.Test", "Tests\Cosmos.Core.Memory.Test\Cosmos.Core.Memory.Test.csproj", "{408E5ACC-EA9A-41E8-AA95-514C5F47BD34}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cosmos Graphic Subsystem", "Cosmos Graphic Subsystem", "{A9D558E8-B0C7-4FF6-99D8-CB2BC6FEB7C7}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CosmosGraphicSubsystem", "CosmosGraphicSubsystem", "{A9D558E8-B0C7-4FF6-99D8-CB2BC6FEB7C7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos Graphic Subsystem", "Demos\Cosmos Graphic Subsystem\Cosmos Graphic Subsystem.csproj", "{49F2C01D-D2C5-4564-810B-1AE92236C5C1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CosmosGraphicSubsystem", "Demos\CosmosGraphicSubsystem\CosmosGraphicSubsystem.csproj", "{49F2C01D-D2C5-4564-810B-1AE92236C5C1}"
 EndProject
-Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "Cosmos Graphic SubsystemBoot", "Demos\Cosmos Graphic Subsystem\Cosmos Graphic SubsystemBoot.Cosmos", "{79D68062-46C5-466D-9289-C033F7348485}"
+Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "CosmosGraphicSubsystemBoot", "Demos\CosmosGraphicSubsystem\CosmosGraphicSubsystemBoot.Cosmos", "{79D68062-46C5-466D-9289-C033F7348485}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Core_Asm", "source\Cosmos.Core_Asm\Cosmos.Core_Asm.csproj", "{B7077A34-D7F0-4422-BE7C-65DF26C65489}"
 EndProject
diff --git a/Demos/Cosmos Graphic Subsystem/Cosmos Graphic Subsystem.csproj b/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj
similarity index 88%
rename from Demos/Cosmos Graphic Subsystem/Cosmos Graphic Subsystem.csproj
rename to Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj
index ea3ee692d..5bf9756d3 100644
--- a/Demos/Cosmos Graphic Subsystem/Cosmos Graphic Subsystem.csproj	
+++ b/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystem.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="Cosmos Graphic SubsystemBoot.Cosmos" />
+    <None Remove="CosmosGraphicSubsystemBoot.Cosmos" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Demos/Cosmos Graphic Subsystem/Cosmos Graphic SubsystemBoot.Cosmos b/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystemBoot.Cosmos
similarity index 79%
rename from Demos/Cosmos Graphic Subsystem/Cosmos Graphic SubsystemBoot.Cosmos
rename to Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystemBoot.Cosmos
index d4cab3767..730dd2ec8 100644
--- a/Demos/Cosmos Graphic Subsystem/Cosmos Graphic SubsystemBoot.Cosmos	
+++ b/Demos/CosmosGraphicSubsystem/CosmosGraphicSubsystemBoot.Cosmos
@@ -47,6 +47,21 @@
     <Bochs_OutputPath>bin\Debug\net462\</Bochs_OutputPath>
     <Bochs_EnableGDB>False</Bochs_EnableGDB>
     <Bochs_StartCosmosGDB>False</Bochs_StartCosmosGDB>
+    <USB_StackCorruptionDetectionEnabled>True</USB_StackCorruptionDetectionEnabled>
+    <USB_StackCorruptionDetectionLevel>MethodFooters</USB_StackCorruptionDetectionLevel>
+    <USB_Description>Makes a USB device such as a flash drive or external hard disk bootable.</USB_Description>
+    <USB_Deployment>USB</USB_Deployment>
+    <USB_Launch>None</USB_Launch>
+    <USB_DebugEnabled>False</USB_DebugEnabled>
+    <USB_DebugMode>Source</USB_DebugMode>
+    <USB_IgnoreDebugStubAttribute>False</USB_IgnoreDebugStubAttribute>
+    <USB_CosmosDebugPort>Serial: COM1</USB_CosmosDebugPort>
+    <USB_VisualStudioDebugPort>Pipe: Cosmos\Serial</USB_VisualStudioDebugPort>
+    <USB_PxeInterface>192.168.0.8</USB_PxeInterface>
+    <USB_OutputPath>bin\Debug\net462\</USB_OutputPath>
+    <USB_EnableGDB>False</USB_EnableGDB>
+    <USB_StartCosmosGDB>False</USB_StartCosmosGDB>
+    <Name>CosmosGraphicSubsystemBoot</Name>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="*" />
@@ -73,11 +88,11 @@
       <Project>{9431ff1f-ad75-4a1e-b38a-46e0f109411d}</Project>
       <Private>True</Private>
     </ProjectReference>
-    <ProjectReference Include="..\Cosmos Graphic Subsystem\Cosmos Graphic Subsystem.csproj">
-      <Name>Cosmos Graphic Subsystem</Name>
+    <ProjectReference Include="..\CosmosGraphicSubsystem\CosmosGraphicSubsystem.csproj">
+      <Name>CosmosGraphicSubsystem</Name>
       <Project>{49f2c01d-d2c5-4564-810b-1ae92236c5c1}</Project>
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(AppData)\Cosmos User Kit\Build\VSIP\Cosmos.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Demos/Cosmos Graphic Subsystem/Kernel.cs b/Demos/CosmosGraphicSubsystem/Kernel.cs
similarity index 100%
rename from Demos/Cosmos Graphic Subsystem/Kernel.cs
rename to Demos/CosmosGraphicSubsystem/Kernel.cs
diff --git a/Demos/Guess/GuessKernelBoot.Cosmos b/Demos/Guess/GuessKernelBoot.Cosmos
index 79cefad24..e1461a10c 100644
--- a/Demos/Guess/GuessKernelBoot.Cosmos
+++ b/Demos/Guess/GuessKernelBoot.Cosmos
@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.Net.Sdk">
+<Project Sdk="Microsoft.Net.Sdk">
   <PropertyGroup>
     <TargetFramework>net462</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <BinFormat>elf</BinFormat>
-    <DebugEnabled>True</DebugEnabled>
+    <DebugEnabled>False</DebugEnabled>
     <DebugMode>Source</DebugMode>
     <TraceMode>User</TraceMode>
     <EnableGDB>False</EnableGDB>
@@ -18,6 +18,35 @@
     <Launch>VMware</Launch>
     <Profile>VMware</Profile>
     <Description>Use VMware Player or Workstation to deploy and debug.</Description>
+    <PxeInterface>192.168.0.8</PxeInterface>
+    <VMware_StackCorruptionDetectionEnabled>True</VMware_StackCorruptionDetectionEnabled>
+    <VMware_StackCorruptionDetectionLevel>MethodFooters</VMware_StackCorruptionDetectionLevel>
+    <VMware_Description>Use VMware Player or Workstation to deploy and debug.</VMware_Description>
+    <VMware_Deployment>ISO</VMware_Deployment>
+    <VMware_Launch>VMware</VMware_Launch>
+    <VMware_DebugEnabled>False</VMware_DebugEnabled>
+    <VMware_DebugMode>Source</VMware_DebugMode>
+    <VMware_IgnoreDebugStubAttribute>False</VMware_IgnoreDebugStubAttribute>
+    <VMware_CosmosDebugPort>Serial: COM1</VMware_CosmosDebugPort>
+    <VMware_VisualStudioDebugPort>Pipe: Cosmos\Serial</VMware_VisualStudioDebugPort>
+    <VMware_PxeInterface>192.168.0.8</VMware_PxeInterface>
+    <VMware_OutputPath>bin\Debug\net462\</VMware_OutputPath>
+    <VMware_EnableGDB>False</VMware_EnableGDB>
+    <VMware_StartCosmosGDB>False</VMware_StartCosmosGDB>
+    <Bochs_StackCorruptionDetectionEnabled>True</Bochs_StackCorruptionDetectionEnabled>
+    <Bochs_StackCorruptionDetectionLevel>MethodFooters</Bochs_StackCorruptionDetectionLevel>
+    <Bochs_Description>Use Bochs emulator to deploy and debug.</Bochs_Description>
+    <Bochs_Deployment>ISO</Bochs_Deployment>
+    <Bochs_Launch>Bochs</Bochs_Launch>
+    <Bochs_DebugEnabled>True</Bochs_DebugEnabled>
+    <Bochs_DebugMode>Source</Bochs_DebugMode>
+    <Bochs_IgnoreDebugStubAttribute>False</Bochs_IgnoreDebugStubAttribute>
+    <Bochs_CosmosDebugPort>Serial: COM1</Bochs_CosmosDebugPort>
+    <Bochs_VisualStudioDebugPort>Pipe: Cosmos\Serial</Bochs_VisualStudioDebugPort>
+    <Bochs_PxeInterface>192.168.0.8</Bochs_PxeInterface>
+    <Bochs_OutputPath>bin\Debug\net462\</Bochs_OutputPath>
+    <Bochs_EnableGDB>False</Bochs_EnableGDB>
+    <Bochs_StartCosmosGDB>False</Bochs_StartCosmosGDB>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="*" />
@@ -30,4 +59,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(AppData)\Cosmos User Kit\Build\VSIP\Cosmos.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Kernel.sln b/Kernel.sln
index 3c55186b7..d605c3703 100644
--- a/Kernel.sln
+++ b/Kernel.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+VisualStudioVersion = 15.0.26430.13
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Kernel", "Kernel", "{9A923E6F-FF63-4F02-A4EA-C2D44F9323FD}"
 EndProject
@@ -32,11 +32,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GuessKernel", "Demos\Guess\
 EndProject
 Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "GuessKernelBoot", "Demos\Guess\GuessKernelBoot.Cosmos", "{77DD08F5-0751-4EFC-B222-78F9F06E1F7C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cosmos Graphic Subsystem", "Cosmos Graphic Subsystem", "{A9D558E8-B0C7-4FF6-99D8-CB2BC6FEB7C7}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CosmosGraphicSubsystem", "CosmosGraphicSubsystem", "{A9D558E8-B0C7-4FF6-99D8-CB2BC6FEB7C7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos Graphic Subsystem", "Demos\Cosmos Graphic Subsystem\Cosmos Graphic Subsystem.csproj", "{49F2C01D-D2C5-4564-810B-1AE92236C5C1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CosmosGraphicSubsystem", "Demos\CosmosGraphicSubsystem\CosmosGraphicSubsystem.csproj", "{49F2C01D-D2C5-4564-810B-1AE92236C5C1}"
 EndProject
-Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "Cosmos Graphic SubsystemBoot", "Demos\Cosmos Graphic Subsystem\Cosmos Graphic SubsystemBoot.Cosmos", "{79D68062-46C5-466D-9289-C033F7348485}"
+Project("{471EC4BB-E47E-4229-A789-D1F5F83B52D4}") = "CosmosGraphicSubsystemBoot", "Demos\CosmosGraphicSubsystem\CosmosGraphicSubsystemBoot.Cosmos", "{79D68062-46C5-466D-9289-C033F7348485}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cosmos.Debug.Kernel", "source\Cosmos.Debug.Kernel\Cosmos.Debug.Kernel.csproj", "{94DBCFC7-B5D2-4148-BE18-D76654C379E2}"
 EndProject