diff --git a/source2/InstallCleaner/Program.cs b/source2/InstallCleaner/Program.cs
index 7449d627e..fba2213d2 100644
--- a/source2/InstallCleaner/Program.cs
+++ b/source2/InstallCleaner/Program.cs
@@ -13,7 +13,8 @@ namespace InstallCleaner
         {
 					try{
             CleanupUserKitInstallDir();
-            CleanupOldTemplates_Shell();
+            CleanupOldTemplates_Shell_x86();
+            CleanupOldTemplates_Shell_x64();
             CleanupOldTemplates_Express();
             } catch(Exception E){
 							Console.WriteLine(E.ToString());
@@ -25,7 +26,7 @@ namespace InstallCleaner
         /// <summary>
         /// Removes any old cosmos templates in "Microsoft Visual Studio 9.0\Common7\IDE\ProjectTemplates"
         /// </summary>
-        private static void CleanupOldTemplates_Shell()
+        private static void CleanupOldTemplates_Shell_x86()
         {
             using (var xReg = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\VisualStudio\9.0", false))
             {
@@ -48,6 +49,29 @@ namespace InstallCleaner
             }
         }
 
+
+        /// <summary>
+        /// Removes any old cosmos templates in "Microsoft Visual Studio 9.0\Common7\IDE\ProjectTemplates"
+        /// </summary>
+        private static void CleanupOldTemplates_Shell_x64() {
+            //Registry.LocalMachine.
+            using (var xReg = Registry.LocalMachine.OpenSubKey(@"Software\Wow6432\Microsoft\VisualStudio\9.0", false,)) {
+                if (xReg == null) {
+                    // shouldn't even happen, but better safe than sorry:
+                    return;
+                }
+                var xInstallDir = xReg.GetValue("InstallDir") as string;
+                if (xInstallDir == null) {
+                    return;
+                }
+                var xCosmosDir = Path.Combine(xInstallDir, @"ProjectTemplates\Cosmos");
+
+                if (Directory.Exists(xCosmosDir)) {
+                    Directory.Delete(xCosmosDir, true);
+                }
+            }
+        }
+
         /// <summary>
         /// Removes any old cosmos templates in user template directories, most likely in My Documents. Implement for each language.
         /// </summary>
diff --git a/source2/Users/Kudzu/Breakpoints/Breakpoints.cgdb b/source2/Users/Kudzu/Breakpoints/Breakpoints.cgdb
index 953dccb20..3db927fce 100644
--- a/source2/Users/Kudzu/Breakpoints/Breakpoints.cgdb
+++ b/source2/Users/Kudzu/Breakpoints/Breakpoints.cgdb
@@ -1,10 +1,7 @@
 <?xml version="1.0" standalone="yes"?>
 <SettingsDS xmlns="http://tempuri.org/SettingsDS.xsd">
   <Breakpoint>
-    <Label>*0x00583BA1</Label>
-  </Breakpoint>
-  <Breakpoint>
-    <Label>__AFTER__ALL__ISR__HANDLER__STUBS__</Label>
+    <Label>__ISR_HANDLER_21</Label>
   </Breakpoint>
   <Window>
     <Name>FormCallStack</Name>