--- a/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml	Mon Jun 14 10:07:35 2010 -0500
+++ b/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml	Mon Jun 14 10:09:31 2010 -0500
@@ -6,34 +6,96 @@
    <extension
          point="org.eclipse.ui.activities">
 
-<!-- The following UI elements are from org.eclipse.cdt.launch -->
+<!-- The following UI elements are from org.eclipse.cdt.launch & org.eclipse.cdt.core -->
       <category
-            name="CDT - Launch UI"
-            description="CDT Launch UI Elements"
-            id="org.eclipse.cdt.launch.category">
+            name="CDT - C/C++ Standard Launch Configurations"
+            description="C/C++ Standard launch configurations provided by CDT"
+            id="org.eclipse.cdt.standard.category">
       </category>
+<!-- Create Process Configuration -->
       <activity
-            name="CDT - Launch UI"
-            description="CDT Launch UI"
-            id="org.eclipse.cdt.launch.activity">
+            name="CDT - C/C++ Standard Create Process Type"
+            description="Start new application optionally under control of the standard debugger"
+            id="org.eclipse.cdt.standard.launch.activityAppLaunch">
       </activity>
       <categoryActivityBinding
-            activityId="org.eclipse.cdt.launch.activity"
-            categoryId="org.eclipse.cdt.launch.category">
+            activityId="org.eclipse.cdt.standard.launch.activityAppLaunch"
+            categoryId="org.eclipse.cdt.standard.category">
       </categoryActivityBinding>
       <activityPatternBinding
-            activityId="org.eclipse.cdt.launch.activity"
+            activityId="org.eclipse.cdt.standard.launch.activityAppLaunch"
             isEqualityPattern="true"
             pattern="org.eclipse.cdt.launch/org.eclipse.cdt.cdi.launch.localCLaunch">
       </activityPatternBinding>
-       <activityPatternBinding
-            activityId="org.eclipse.cdt.launch.activity"
+     <activityPatternBinding
+           activityId="org.eclipse.cdt.standard.launch.activityAppLaunch"
+           isEqualityPattern="true"
+           pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.applicationLaunchType">
+      </activityPatternBinding>
+
+<!-- Multiple Launch Configuration -->
+      <activity
+            name="CDT - C/C++ Launch Group Type"
+            description="Launch several other configurations sequentially"
+            id="org.eclipse.cdt.standard.launch.activityGroupLaunch">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.standard.launch.activityGroupLaunch"
+            categoryId="org.eclipse.cdt.standard.category">
+      </categoryActivityBinding>
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.standard.launch.activityGroupLaunch"
             isEqualityPattern="true"
             pattern="org.eclipse.cdt.launch/org.eclipse.cdt.launch.launchGroup">
       </activityPatternBinding>
+<!-- Standard Postmortem Debugger -->
+      <activity
+            name="CDT - C/C++ Postmortem Debugger Type"
+            description="Load an application dump into the standard debugger"
+            id="org.eclipse.cdt.standard.launch.activityPostmortem">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.standard.launch.activityPostmortem"
+            categoryId="org.eclipse.cdt.standard.category">
+      </categoryActivityBinding>
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.standard.launch.activityPostmortem"
+            isEqualityPattern="true"
+            pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.postmortemLaunchType">
+      </activityPatternBinding>
+<!-- Standard Attach to Process -->
+      <activity
+            name="CDT - C/C++ Standard Attach to Process Type"
+            description="Attach standard debugger to a running program"
+            id="org.eclipse.cdt.standard.launch.activityAttach">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.standard.launch.activityAttach"
+            categoryId="org.eclipse.cdt.standard.category">
+      </categoryActivityBinding>
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.standard.launch.activityAttach"
+            isEqualityPattern="true"
+            pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.attachLaunchType">
+      </activityPatternBinding>
+<!-- Local C/C++ Application Shorcut -->
+      <activity
+            name="CDT - C/C++ Application Launch Shortcut"
+            description="Runs/Debugs a local C/C++ application from a shortcut"
+            id="org.eclipse.cdt.standard.launch.activityAppLaunchShortcut">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.standard.launch.activityAppLaunchShortcut"
+            categoryId="org.eclipse.cdt.standard.category">
+      </categoryActivityBinding>
+     <activityPatternBinding
+           activityId="org.eclipse.cdt.standard.launch.activityAppLaunchShortcut"
+           isEqualityPattern="true"
+           pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.localCShortcut">
+      </activityPatternBinding>
 <!-- -->
-<!-- The following UI elements are from org.eclipse.cdt.dsf.gdb -->
-      <category
+<!-- The following UI elements are from org.eclipse.cdt.dsf.gdb  NOT INCLUDED IN C3-->
+<!--      <category
             name="CDT - DSF GDB"
             description="CDT DSF GDB Elements"
             id="org.eclipse.cdt.dsf.gdb.category">
@@ -56,10 +118,10 @@
             activityId="org.eclipse.cdt.dsf.gdb.activity"
             isEqualityPattern="true"
             pattern="org.eclipse.cdt.dsf.gdb/org.eclipse.cdt.dsf.gdb.launch.remoteCLaunch">
-      </activityPatternBinding>
+      </activityPatternBinding>-->
 <!-- -->
-<!-- The following UI elements are from org.eclipse.cdt.debug.core -->
-      <category
+<!-- The following UI elements are from org.eclipse.cdt.debug.core MERGED ABOVE-->
+<!--      <category
             name="CDT - Core Debug Launch"
             description="CDT Core Debug Launch"
             id="org.eclipse.cdt.debug.core.category">
@@ -89,10 +151,10 @@
            activityId="org.eclipse.cdt.debug.core.activity"
            isEqualityPattern="true"
            pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.applicationLaunchType">
-      </activityPatternBinding>
+      </activityPatternBinding> -->
 <!-- -->
-<!-- The following UI elements are from org.eclipse.cdt.launch.remote -->
-      <category
+<!-- The following UI elements are from org.eclipse.cdt.launch.remote NOT IN C3-->
+<!--      <category
             name="CDT - Remote Launch"
             description="CDT Remote Launch Elements"
             id="org.eclipse.cdt.launch.remote.category">
@@ -110,10 +172,10 @@
            activityId="org.eclipse.cdt.launch.remote.activity"
            isEqualityPattern="true"
            pattern="org.eclipse.cdt.launch.remote/org.eclipse.rse.remotecdt.RemoteApplicationLaunch">
-      </activityPatternBinding>
+      </activityPatternBinding>-->
 <!-- -->
-<!-- The following UI elements are from org.eclipse.cdt.examples.dsf.pda -->
-      <category
+<!-- The following UI elements are from org.eclipse.cdt.examples.dsf.pda NOT IN C3-->
+<!--      <category
             name="CDT - DSF PDA"
             description="CDT DSF PDA Elements"
             id="org.eclipse.cdt.examples.dsf.pda.category">
@@ -131,71 +193,60 @@
            activityId="org.eclipse.cdt.examples.dsf.pda.activity"
            isEqualityPattern="true"
            pattern="org.eclipse.cdt.examples.dsf.pda/org.eclipse.cdt.examples.dsf.pda.launchType">
-      </activityPatternBinding>
+      </activityPatternBinding> -->
 <!-- -->
 <!-- The following UI elements are from org.eclipse.cdt.debug.ui -->
       <category
-            name="CDT - Debug UI"
-            description="CDT Debug UI Elements"
+            name="CDT - C/C++ Standard Debug UI"
+            description="CDT C/C++ Standard Debug UI"
             id="org.eclipse.cdt.debug.ui.category">
       </category>
-      <activity
-            name="CDT - Debugger Local C Shortcut"
-            description="CDT Local C Shortcut"
-            id="org.eclipse.cdt.debug.ui.activity1">
-      </activity>
+<!-- Debugger Types Preference Page -->
       <activity
             name="CDT - Debugger Types Preference Page"
             description="CDT Debugger types preference page"
-            id="org.eclipse.cdt.debug.ui.activity2">
+            id="org.eclipse.cdt.debug.ui.activityDebuggerTypesPref">
       </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.debug.ui.activityDebuggerTypesPref"
+            categoryId="org.eclipse.cdt.debug.ui.category">
+      </categoryActivityBinding>
+     <activityPatternBinding
+           activityId="org.eclipse.cdt.debug.ui.activityDebuggerTypesPref"
+           isEqualityPattern="true"
+           pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.DebuggerTypesPreferencePage">
+      </activityPatternBinding>
+<!-- Debugger Signals View -->
       <activity
             name="CDT - Debugger Signals View"
             description="CDT Debugger Signals View"
-            id="org.eclipse.cdt.debug.ui.activity3">
+            id="org.eclipse.cdt.debug.ui.activitySignalsView">
       </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.debug.ui.activitySignalsView"
+            categoryId="org.eclipse.cdt.debug.ui.category">
+      </categoryActivityBinding>
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.debug.ui.activitySignalsView"
+            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.SignalsView">
+      </activityPatternBinding>
+<!-- Debugger Add Breakpoint Event Action -->
       <activity
             name="CDT - Debugger Add Breakpoint Event Action"
             description="CDT Debugger Add Breakpoint Event Action"
-            id="org.eclipse.cdt.debug.ui.activity4">
+            id="org.eclipse.cdt.debug.ui.activityAddBreakpointEvent">
       </activity>
       <categoryActivityBinding
-            activityId="org.eclipse.cdt.debug.ui.activity1"
-            categoryId="org.eclipse.cdt.debug.ui.cdtCategory">
-      </categoryActivityBinding>
-      <categoryActivityBinding
-            activityId="org.eclipse.cdt.debug.ui.activity2"
-            categoryId="org.eclipse.cdt.debug.ui.cdtCategory">
-      </categoryActivityBinding>
-      <categoryActivityBinding
-            activityId="org.eclipse.cdt.debug.ui.activity3"
-            categoryId="org.eclipse.cdt.debug.ui.cdtCategory">
-      </categoryActivityBinding>
-      <categoryActivityBinding
-            activityId="org.eclipse.cdt.debug.ui.activity4"
-            categoryId="org.eclipse.cdt.debug.ui.cdtCategory">
+            activityId="org.eclipse.cdt.debug.ui.activityAddBreakpointEvent"
+            categoryId="org.eclipse.cdt.debug.ui.category">
       </categoryActivityBinding>
-     <activityPatternBinding
-           activityId="org.eclipse.cdt.debug.ui.activity1"
-           isEqualityPattern="true"
-           pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.localCShortcut">
-      </activityPatternBinding>
-     <activityPatternBinding
-           activityId="org.eclipse.cdt.debug.ui.activity2"
-           isEqualityPattern="true"
-           pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.DebuggerTypesPreferencePage">
-      </activityPatternBinding>
       <activityPatternBinding
-            activityId="org.eclipse.cdt.debug.ui.activity3"
-            pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.SignalsView">
-      </activityPatternBinding>
-      <activityPatternBinding
-            activityId="org.eclipse.cdt.debug.ui.activity4"
+            activityId="org.eclipse.cdt.debug.ui.activityAddBreakpointEvent"
             pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.internal.ui.actions.AddEventBreakpointActionDelegate">
       </activityPatternBinding>
 <!-- -->
-<!-- The following UI elements are from org.eclipse.cdt.debug.gdbjtag.core -->
-      <category
+<!-- The following UI elements are from org.eclipse.cdt.debug.gdbjtag.core NOT IN C3-->
+<!--      <category
             name="CDT - GDB JTAG Debug UI"
             description="CDT GDB JTAG Debug UI Elements"
             id="org.eclipse.cdt.debug.gdbjtag.core.category">
@@ -213,17 +264,17 @@
            activityId="org.eclipse.cdt.debug.gdbjtag.core.activity"
            isEqualityPattern="true"
            pattern="org.eclipse.cdt.debug.gdbjtag.core/org.eclipse.cdt.debug.gdbjtag.launchConfigurationType">
-      </activityPatternBinding>
+      </activityPatternBinding> -->
 <!-- -->
 <!-- The following UI elements are from org.eclipse.cdt.managedbuilder.ui -->
       <category
-            name="CDT - Managed Builder UI"
-            description="CDT Managed Builder UI Elements"
+            name="CDT - C/C++ Managed Builder UI"
+            description="All preferences, actions, wizards supplied by the Managed Builder CDT plug-ins"
             id="org.eclipse.cdt.managedbuilder.ui.category">
       </category>
       <activity
-            name="CDT - Managed Builder UI"
-            description="CDT Managed Builder UI Elements"
+            name="CDT - C/C++ Managed Builder UI"
+            description="All preferences, actions, wizards supplied by the Managed Builder CDT plug-ins"
             id="org.eclipse.cdt.managedbuilder.ui.activity">
       </activity>
       <categoryActivityBinding
@@ -287,13 +338,13 @@
 <!-- -->
 <!-- The following UI elements are from org.eclipse.cdt.make.ui -->
       <category
-            name="CDT - Make UI"
-            description="CDT Make UI Elements"
+            name="CDT - C/C++ Make UI"
+            description="CDT C/C++ Make UI Elements"
             id="org.eclipse.cdt.make.ui.category">
       </category>
       <activity
-            name="CDT - Make UI"
-            description="CDT Make UI Elements"
+            name="CDT - C/C++ Build Make Targets Preference Page"
+            description="CDT C/C++ Build Make Targets Preference Page"
             id="org.eclipse.cdt.make.ui.activity">
       </activity>
       <categoryActivityBinding
@@ -305,154 +356,202 @@
             pattern="org.eclipse.cdt.make.ui/org.eclipse.cdt.make.ui.preferences.MakePreferencePage">
       </activityPatternBinding>
 <!-- -->
-<!-- The following UI elements are from org.eclipse.cdt.ui -->
+<!-- The following UI elements are from org.eclipse.cdt.ui dealing with C/C++ projects -->
       <category
-            name="CDT - UI"
-            description="CDT UI Elements"
+            name="CDT - C/C++ Standard Project Actions"
+            description="CDT C/C++ Standard Project Creation and Modification Actions"
             id="org.eclipse.cdt.ui.category">
       </category>
-      <activity
-            name="CDT - UI for New* Wizards"
-            description="CDT UI for New* Wizards"
-            id="org.eclipse.cdt.ui.activity">
-      </activity>
+<!-- Project settings import/export -->
       <activity
-            name="CDT - Project Settings Actions"
-            description="CDT Project settings import and export actions"
-            id="org.eclipse.cdt.ui.activity2">
-      </activity>
-      <activity
-            name="CDT - Import Executable Action"
-            description="CDT Import executable action"
-            id="org.eclipse.cdt.ui.activity3">
+            name="CDT - Project Settings Wizards"
+            description="CDT C/C++ Standard project settings import and export wizards"
+            id="org.eclipse.cdt.ui.activityProjectSettings">
       </activity>
       <categoryActivityBinding
-            activityId="org.eclipse.cdt.ui.activity"
+            activityId="org.eclipse.cdt.ui.activityProjectSettings"
             categoryId="org.eclipse.cdt.ui.category">
       </categoryActivityBinding>
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.ui.activityProjectSettings"
+            pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.projectSettingsImportWizard">
+      </activityPatternBinding>
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.ui.activityProjectSettings"
+            pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.projectSettingsExportWizard">
+      </activityPatternBinding>
+<!-- Import Executable action -->      
+      <activity
+            name="CDT - C/C++ Import Executable Wizard"
+            description="CDT C/C++ import executable wizard"
+            id="org.eclipse.cdt.ui.activityImportExecutable">
+      </activity>
       <categoryActivityBinding
-            activityId="org.eclipse.cdt.ui.activity2"
+            activityId="org.eclipse.cdt.ui.activityImportExecutable"
             categoryId="org.eclipse.cdt.ui.category">
       </categoryActivityBinding>
+      <activityPatternBinding
+            activityId="org.eclipse.cdt.ui.activityImportExecutable"
+            pattern=".*ImportExecutableWizard">
+      </activityPatternBinding>
+<!-- New C/C++ Project wizards -->
+      <activity
+            name="CDT - New C/C++ Project Wizards"
+            description="CDT New C and New C++ project wizards"
+            id="org.eclipse.cdt.ui.activityNewProject">
+      </activity>
       <categoryActivityBinding
-            activityId="org.eclipse.cdt.ui.activity3"
+            activityId="org.eclipse.cdt.ui.activityNewProject"
             categoryId="org.eclipse.cdt.ui.category">
       </categoryActivityBinding>
       <activityPatternBinding
-            activityId="org.eclipse.cdt.ui.activity"
+            activityId="org.eclipse.cdt.ui.activityNewProject"
             pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.wizards.NewCWizard1">
       </activityPatternBinding>
       <activityPatternBinding
-            activityId="org.eclipse.cdt.ui.activity"
+            activityId="org.eclipse.cdt.ui.activityNewProject"
             pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.wizards.NewCWizard2">
       </activityPatternBinding>
       <activityPatternBinding
-            activityId="org.eclipse.cdt.ui.activity"
+            activityId="org.eclipse.cdt.ui.activityNewProject"
             pattern="org\.eclipse\.cdt.*/.*NewProjectDropDown">
       </activityPatternBinding>
+<!-- New Type Wizard -->
+      <activity
+            name="CDT - New C++ Class Drop Down"
+            description="CDT New C++ class drop down"
+            id="org.eclipse.cdt.ui.activityNewType">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.ui.activityNewType"
+            categoryId="org.eclipse.cdt.ui.category">
+      </categoryActivityBinding>
       <activityPatternBinding
-            activityId="org.eclipse.cdt.ui.activity"
+            activityId="org.eclipse.cdt.ui.activityNewType"
             pattern="org\.eclipse\.cdt.*/.*NewTypeDropDown">
       </activityPatternBinding>
+<!-- New File Wizard -->
+      <activity
+            name="CDT - New C/C++ File Drop Down"
+            description="CDT New C/C++ source file drop down"
+            id="org.eclipse.cdt.ui.activityNewFile">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.ui.activityNewFile"
+            categoryId="org.eclipse.cdt.ui.category">
+      </categoryActivityBinding>
       <activityPatternBinding
-            activityId="org.eclipse.cdt.ui.activity"
+            activityId="org.eclipse.cdt.ui.activityNewFile"
             pattern="org\.eclipse\.cdt.*/.*NewFileDropDown">
       </activityPatternBinding>
-      <activityPatternBinding
-            activityId="org.eclipse.cdt.ui.activity"
-            pattern="org\.eclipse\.cdt.*/.*NewFolderDropDown">
-      </activityPatternBinding>
+<!-- New Folder Wizard -->
+      <activity
+            name="CDT - New C/C++ Folder Drop Down"
+            description="CDT New C/C++ source folder drop down"
+            id="org.eclipse.cdt.ui.activityNewFolder">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.cdt.ui.activityNewFolder"
+            categoryId="org.eclipse.cdt.ui.category">
+      </categoryActivityBinding>
       <activityPatternBinding
-            activityId="org.eclipse.cdt.ui.activity2"
-            pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.projectSettingsImportWizard">
-      </activityPatternBinding>
-      <activityPatternBinding
-            activityId="org.eclipse.cdt.ui.activity2"
-            pattern="org.eclipse.cdt.ui/org.eclipse.cdt.ui.projectSettingsExportWizard">
-      </activityPatternBinding>      
-      <activityPatternBinding
-            activityId="org.eclipse.cdt.ui.activity3"
-            pattern=".*ImportExecutableWizard">
+            activityId="org.eclipse.cdt.ui.activityNewFolder"
+            pattern="org\.eclipse\.cdt.*/.*NewFolderDropDown">
       </activityPatternBinding>
 <!-- -->
 <!-- The following UI elements are from org.eclipse.debug.ui -->
       <category
-            name="Platform Debug UI"
-            description="Platform Debug UI Elements"
+            name="Platform Debug Actions"
+            description="Debugger actions supplied by the Eclipse Platform"
             id="org.eclipse.debug.ui.category">
       </category>
+<!-- Terminate, remove, relaunch actions -->
       <activity
-            name="Platform Debug UI"
-            description="Platform Debug UI Elements"
-            id="org.eclipse.debug.ui.activity">
+            name="Debugger Terminate/Launch"
+            description="Relaunch, terminate and relaunch, terminate and remove, terminate all actions"
+            id="org.eclipse.debug.ui.activityTerminateLaunch">
       </activity>
       <categoryActivityBinding
-            activityId="org.eclipse.debug.ui.activity"
+            activityId="org.eclipse.debug.ui.activityTerminateLaunch"
             categoryId="org.eclipse.debug.ui.category">
       </categoryActivityBinding>
       <activityPatternBinding
-            activityId="org.eclipse.debug.ui.activity"
+            activityId="org.eclipse.debug.ui.activityTerminateLaunch"
             pattern="org\.eclipse\.debug.*/.*relaunch">
       </activityPatternBinding>
- 
-      <activityPatternBinding
-            activityId="org.eclipse.debug.ui.activity"
+       <activityPatternBinding
+            activityId="org.eclipse.debug.ui.activityTerminateLaunch"
             pattern="org\.eclipse\.debug.*/.*TerminateAndRelaunch">
       </activityPatternBinding>
-
       <activityPatternBinding
-            activityId="org.eclipse.debug.ui.activity"
+            activityId="org.eclipse.debug.ui.activityTerminateLaunch"
             pattern="org\.eclipse\.debug.*/.*terminateAndRemove">
       </activityPatternBinding>
-
       <activityPatternBinding
-            activityId="org.eclipse.debug.ui.activity"
+            activityId="org.eclipse.debug.ui.activityTerminateLaunch"
             pattern="org\.eclipse\.debug.*/.*terminateAll">
       </activityPatternBinding>
-
+<!-- Step filters actions -->
+      <activity
+            name="Debugger Filtered Stepping"
+            description="Stepping with filtering actions"
+            id="org.eclipse.debug.ui.activityStepFilters">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.debug.ui.activityStepFilters"
+            categoryId="org.eclipse.debug.ui.category">
+      </categoryActivityBinding>
       <activityPatternBinding
-            activityId="org.eclipse.debug.ui.activity"
+            activityId="org.eclipse.debug.ui.activityStepFilters"
             pattern="org\.eclipse\.debug.*/.*stepWithFilters">
       </activityPatternBinding>
-
       <activityPatternBinding
-            activityId="org.eclipse.debug.ui.activity"
+            activityId="org.eclipse.debug.ui.activityStepFilters"
             pattern="org\.eclipse\.debug.*/.*toggleStepFilters">
       </activityPatternBinding>
-
       <activityPatternBinding
-            activityId="org.eclipse.debug.ui.activity"
+            activityId="org.eclipse.debug.ui.activityStepFilters"
             pattern="org\.eclipse\.debug.*/.*ToggleStepFilters">
       </activityPatternBinding>
 <!-- -->
 <!-- The following UI elements are from org.eclipse.ui.ide -->
       <category
-            name="Platform IDE UI"
-            description="Platform IDE UI Elements"
+            name="Platform Build Actions"
+            description="Build project actions supplied by the Eclipse Platform"
             id="org.eclipse.ui.ide.category">
       </category>
+<!-- Build Automatically -->
       <activity
-            name="Platform IDE UI"
-            description="Platform IDE UI Elements"
-            id="org.eclipse.ui.ide.activity">
+            name="Build Automatically Action"
+            description="Build all projects automatically action"
+            id="org.eclipse.ui.ide.activityBuildAuto">
       </activity>
       <categoryActivityBinding
-            activityId="org.eclipse.ui.ide.activity"
+            activityId="org.eclipse.ui.ide.activityBuildAuto"
             categoryId="org.eclipse.ui.ide.category">
       </categoryActivityBinding>
       <activityPatternBinding
-            activityId="org.eclipse.ui.ide.activity"
+            activityId="org.eclipse.ui.ide.activityBuildAuto"
             pattern="org.eclipse.ui.project.buildAutomatically">
       </activityPatternBinding>
-
+<!-- Build All Action -->
+      <activity
+            name="Build All Action"
+            description="Build all projects action"
+            id="org.eclipse.ui.ide.activityBuildAll">
+      </activity>
+      <categoryActivityBinding
+            activityId="org.eclipse.ui.ide.activityBuildAll"
+            categoryId="org.eclipse.ui.ide.category">
+      </categoryActivityBinding>
       <activityPatternBinding
-            activityId="org.eclipse.ui.ide.activity"
+            activityId="org.eclipse.ui.ide.activityBuildAll"
             pattern="org.eclipse.ui.project.buildAll">
       </activityPatternBinding>
 <!-- -->
   
-<!-- The following UI elements are from org.eclipse.cdt.debug.mi.ui -->
-      <category
+<!-- The following UI elements are from org.eclipse.cdt.debug.mi.ui NOT IN C3-->
+<!--      <category
             name="CDT - MI Debug UI"
             description="CDT - MI Debug UI Elements"
             id="org.eclipse.cdt.debug.mi.ui.category">
@@ -469,7 +568,7 @@
       <activityPatternBinding
             activityId="org.eclipse.cdt.debug.mi.ui.activity"
             pattern="org.eclipse.cdt.debug.mi.ui/org.eclipse.cdt.debug.mi.ui.MIPreferencePage">
-      </activityPatternBinding>
+      </activityPatternBinding> -->
 <!-- -->
    </extension>