diff --git a/source/Cosmos.VS.DebugEngine/Guids.cs b/source/Cosmos.VS.DebugEngine/Guids.cs
index 452f5c6b7..0d4de6660 100644
--- a/source/Cosmos.VS.DebugEngine/Guids.cs
+++ b/source/Cosmos.VS.DebugEngine/Guids.cs
@@ -1,17 +1,14 @@
-// Guids.cs
-// MUST match guids.h - There is no such file???? I think its referencing old VS2005 style, but vsct is used now instead.
-
-using System;
+using System;
 
 namespace Cosmos.VS.DebugEngine
 {
     static class Guids
     {
-        public const string guidPackageString = "A82B45E9-2A89-43BD-925D-C7F0EDD212AA";
-        public const string guidDebugEngineString = "DC8503AB-7EE6-456C-A209-66C690D9F6F4";
-        public const string guidDebugEngineCmdSetString = "94EBFC49-EC0F-4BD3-B3FF-D3AADB8DAC9F";
+        public const string guidPackageString = "a82b45e9-2a89-43bd-925d-c7f0edd212aa";
+        public const string guidDebugEngineString = "dc8503ab-7ee6-456c-a209-66c690d9f6f4";
+        public const string guidDebugEngineCmdSetString = "94ebfc49-ec0f-4bd3-b3ff-d3aadb8dac9f";
 
         public static readonly Guid DebugEngineGuid = new Guid(guidDebugEngineString);
         public static readonly Guid DebugEngineCmdSetGuid = new Guid(guidDebugEngineCmdSetString);
     }
-}
\ No newline at end of file
+}
diff --git a/source/Cosmos.VS.ProjectSystem/Guids.cs b/source/Cosmos.VS.ProjectSystem/Guids.cs
index d149b3ac7..ea3431e50 100644
--- a/source/Cosmos.VS.ProjectSystem/Guids.cs
+++ b/source/Cosmos.VS.ProjectSystem/Guids.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Cosmos.VS.ProjectSystem
 {
@@ -10,8 +6,8 @@ namespace Cosmos.VS.ProjectSystem
     {
         public const string guidCosmosProjectPkgString = "4cae44ed-88b9-4b7c-822b-b040f18fcee3";
         public const string guidCosmosProjectCmdSetString = "c119efe0-fb56-44a1-b9f0-31247afb207f";
-        public const string guidCosmosProjectFactoryString = "471EC4BB-E47E-4229-A789-D1F5F83B52D4";
-        public const string guidPropPageEnvironmentString = "08C09552-8DD6-4b59-B901-51EBD5D564A6";
+        public const string guidCosmosProjectFactoryString = "471ec4bb-e47e-4229-a789-d1f5f83b52d4";
+        public const string guidPropPageEnvironmentString = "08c09552-8dd6-4b59-b901-51ebd5d564a6";
         public const string guidCosmosPropertyPageString = "d33a2d29-c4fd-4e12-a510-4c01a14d63e1";
 
         public static readonly Guid guidCosmosProjectCmdSet = new Guid(guidCosmosProjectCmdSetString);
diff --git a/source/Cosmos.VS.Windows/CosmosWindowsPackage.cs b/source/Cosmos.VS.Windows/CosmosWindowsPackage.cs
index 952405842..6a62b8357 100644
--- a/source/Cosmos.VS.Windows/CosmosWindowsPackage.cs
+++ b/source/Cosmos.VS.Windows/CosmosWindowsPackage.cs
@@ -1,16 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.Design;
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Windows;
 using System.Windows.Threading;
+using Microsoft.VisualStudio.Shell;
+
 using Cosmos.Debug.Common;
 using Cosmos.Debug.DebugConnectors;
-using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.Interop;
 
 namespace Cosmos.VS.Windows
 {
diff --git a/source/Cosmos.VS.Windows/Guids.cs b/source/Cosmos.VS.Windows/Guids.cs
index a7c6e361f..6c5e2b3b6 100644
--- a/source/Cosmos.VS.Windows/Guids.cs
+++ b/source/Cosmos.VS.Windows/Guids.cs
@@ -1,23 +1,21 @@
-// Guids.cs
-// MUST match guids.h - There is no such file???? I think its referencing old VS2005 style, but vsct is used now instead.
-using System;
+using System;
 
 namespace Cosmos.VS.Windows
 {
     static class Guids
     {
-        public const string PackageGuidString = "A82B45E9-2A89-43BD-925D-C7F0EDD212AA";
-        public const string CosmosMenuGuidString = "5C177460-F057-4AC1-8B7F-D1685C915E3D";
-        public const string AsmToolbarGuidString = "1A98FB64-8FC8-4D24-95E4-E507700BA23C";
-        public const string IDEToolbarGuidString = "425C500B-AB24-44B0-812A-74ECA127E6A1";
-        public const string ImagesGuidString = "AA9D88D9-ACD2-4F2C-AB40-92887BDCE774";
+        public const string PackageGuidString = "2084f89a-967c-4f7d-a3f8-217c3fa8ee66";
+        public const string CosmosMenuGuidString = "5c177460-f057-4ac1-8b7f-d1685c915e3d";
+        public const string AsmToolbarGuidString = "1a98fb64-8fc8-4d24-95e4-e507700ba23c";
+        public const string IDEToolbarGuidString = "425c500b-ab24-44b0-812a-74eca127e6a1";
+        public const string ImagesGuidString = "aa9d88d9-acd2-4f2c-ab40-92887bdce774";
 
-        public const string AsmToolbarCmdSetString = "A875EA24-689A-4EAB-B9C2-DAC3EACB9501";
-        public const string CosmosMenuCmdSetString = "3247C3E4-34B8-4DB0-8748-AD62495A5222";
-        public const string IDEToolbarCmdSetString = "3D4B3F35-36E7-4CEA-8ACC-D9601E45C0B5";
+        public const string AsmToolbarCmdSetString = "a875ea24-689a-4eab-b9c2-dac3eacb9501";
+        public const string CosmosMenuCmdSetString = "3247c3e4-34b8-4db0-8748-ad62495a5222";
+        public const string IDEToolbarCmdSetString = "3d4b3f35-36e7-4cea-8acc-d9601e45c0b5";
 
         public static readonly Guid CosmosMenuCmdSetGuid = new Guid(CosmosMenuCmdSetString);
         public static readonly Guid AsmToolbarCmdSetGuid = new Guid(AsmToolbarCmdSetString);
         public static readonly Guid IDEToolbarCmdSetGuid = new Guid(IDEToolbarCmdSetString);
     }
-}
\ No newline at end of file
+}
diff --git a/source/Cosmos.VS.Windows/VSPackage.vsct b/source/Cosmos.VS.Windows/VSPackage.vsct
index 467b68abb..64ad6a78a 100644
--- a/source/Cosmos.VS.Windows/VSPackage.vsct
+++ b/source/Cosmos.VS.Windows/VSPackage.vsct
@@ -83,7 +83,7 @@
     </Bitmaps>
   </Commands>
   <Symbols>
-    <GuidSymbol name="guidVSPackage" value="{A82B45E9-2A89-43BD-925D-C7F0EDD212AA}" />
+    <GuidSymbol name="guidVSPackage" value="{2084F89A-967C-4F7D-A3F8-217C3FA8EE66}" />
 
     <GuidSymbol name="guidCosmosMenu" value="{5C177460-F057-4AC1-8B7F-D1685C915E3D}">
       <IDSymbol name="TopLevelMenu" value="0x1020" />