--- a/Tools__NewSystemBrowser.st	Wed Nov 02 12:45:01 2016 +0100
+++ b/Tools__NewSystemBrowser.st	Wed Nov 02 12:49:12 2016 +0100
@@ -6462,6 +6462,50 @@
     "Modified: / 27-11-2014 / 06:56:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+categoryDebugMenu
+    "This resource specification was automatically generated
+     by the MenuEditor of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the MenuEditor may not be able to read the specification."
+
+
+    "
+     MenuEditor new openOnClass:Tools::NewSystemBrowser andSelector:#categoryMenuWithoutFind
+     (Menu new fromLiteralArrayEncoding:(Tools::NewSystemBrowser categoryMenuWithoutFind)) startUp
+    "
+
+    <resource: #menu>
+
+    ^
+     #(Menu
+              (
+               (MenuItem
+                  enabled: hasCategorySelectedAndInstrumentingCompilerExistsHolder
+                  label: 'Recompile all Classes (without Instrumentation)'
+                  itemValue: categoryMenuRecompile
+                  showBusyCursorWhilePerforming: true
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  enabled: hasCategorySelectedAndInstrumentingCompilerExistsHolder
+                  label: 'Recompile all Classes with Instrumentation'
+                  itemValue: categoryMenuRecompileInstrumented
+                  showBusyCursorWhilePerforming: true
+                )
+               (MenuItem
+                  enabled: hasAnyClassWithCoverageInfoSelected
+                  label: 'Clear Coverage Info (Categorywide)'
+                  itemValue: categoryMenuClearCoverageInfo
+                )
+               )
+              nil
+              nil
+            )
+!
+
 categoryMenu
     ^ self categoryMenuWithoutFind
 
@@ -6770,7 +6814,7 @@
 
     <resource: #menu>
 
-    ^
+    ^ 
      #(Menu
         (
          (MenuItem
@@ -6816,29 +6860,9 @@
           )
          (MenuItem
             label: 'Debug'
-            submenu:
-           (Menu
-              (
-               (MenuItem
-                  enabled: hasCategorySelectedHolder
-                  label: 'Recompile all Classes (without Instrumentation)'
-                  itemValue: categoryMenuRecompile
-                  showBusyCursorWhilePerforming: true
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  enabled: hasCategorySelectedAndInstrumentingCompilerExistsHolder
-                  label: 'Recompile all Classes with Instrumentation'
-                  itemValue: categoryMenuRecompileInstrumented
-                  showBusyCursorWhilePerforming: true
-                )
-               )
-              nil
-              nil
-            )
-          )
+            submenuChannel: categoryDebugMenu
+          )
+
          (MenuItem
             label: 'Special'
             submenuChannel: categorySpecialMenu
@@ -6871,7 +6895,7 @@
 
     <resource: #menu>
 
-    ^
+    ^ 
      #(Menu
         (
          (MenuItem
@@ -6914,29 +6938,9 @@
           )
          (MenuItem
             label: 'Debug'
-            submenu:
-           (Menu
-              (
-               (MenuItem
-                  enabled: hasCategorySelectedAndInstrumentingCompilerExistsHolder
-                  label: 'Recompile all Classes (without Instrumentation)'
-                  itemValue: categoryMenuRecompile
-                  showBusyCursorWhilePerforming: true
-                )
-               (MenuItem
-                  label: '-'
-                )
-               (MenuItem
-                  enabled: hasCategorySelectedAndInstrumentingCompilerExistsHolder
-                  label: 'Recompile all Classes with Instrumentation'
-                  itemValue: categoryMenuRecompileInstrumented
-                  showBusyCursorWhilePerforming: true
-                )
-               )
-              nil
-              nil
-            )
-          )
+            submenuChannel: categoryDebugMenu
+          )
+
          (MenuItem
             label: 'Special'
             submenuChannel: categorySpecialMenu
@@ -21023,9 +21027,13 @@
 
     selected := self selectedClasses value.
     selected isEmptyOrNil ifTrue:[
-        selected := self selectedCategoryClasses
-    ].
-    selected size > 0 ifTrue:[
+        navigationState isProjectBrowser ifTrue:[
+            selected := self selectedProjectClasses
+        ] ifFalse:[    
+            selected := self selectedCategoryClasses
+        ].
+    ].
+    selected notEmptyOrNil ifTrue:[
         selected do:[ :cls |
             cls instAndClassMethodsDo:[:m | m isInstrumented ifTrue:[^ true]].
         ].
@@ -39231,6 +39239,20 @@
 
 !NewSystemBrowser methodsFor:'menu actions-debug'!
 
+categoryMenuClearCoverageInfo
+    "clear coverage information for classes in selected categories"
+
+    self withWaitCursorDo:[
+        self selectedCategoryClassesDo:[:cls |
+            InstrumentationInfo allInfosOfClass:cls do:[:info |
+                info cleanInfoWithChange:false
+            ]
+        ].
+    ].
+    environment changed:#coverageInfo.
+    self showCoverageInformation changed.   "/ to force update
+!
+
 classMenuClearCoverageInfo
     "clear coverage information for selected classes"