--- a/core/com.nokia.carbide.cpp/plugin.properties	Wed May 19 10:09:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.properties	Wed May 19 14:34:54 2010 -0500
@@ -16,4 +16,12 @@
 theme.name.carbide = Carbide
 
 carbcPreference.common=carbide symbian cpp cplusplus
-carbcPreference.diagnostics=diagnostic logs
\ No newline at end of file
+carbcPreference.diagnostics=diagnostic logs
+
+PreferencePages.Capabilities = Capabilities
+PreferencePages.Capabilities.activityName = &Capabilities
+PreferencePages.Capabilities.categoryName = &Capabilities
+PreferencePages.Capabilities.activityPromptButton = &Prompt when enabling capabilities
+PreferencePages.Capabilities.activityPromptButtonTooltip = Prompt when a feature is first used that requires enablement of capabilities
+PreferencePages.Capabilities.captionMessage = Capabilities allow you to enable or disable various product components.  These capabilities are grouped according to a set of predefined categories.
+

--- a/core/com.nokia.carbide.cpp/plugin.xml	Wed May 19 10:09:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp/plugin.xml	Wed May 19 14:34:54 2010 -0500
@@ -570,4 +570,20 @@
     </keyword>
  </extension>
 
+   <extension
+         point="org.eclipse.ui.preferencePages">
+	  <page            
+            category="org.eclipse.ui.preferencePages.Workbench"
+            name="%PreferencePages.Capabilities"
+            id="org.eclipse.sdk.capabilities">
+            <class class="org.eclipse.ui.activities.ActivityCategoryPreferencePage">
+                <parameter name="allowAdvanced" value="true"/>
+                <parameter name="captionMessage" value="%PreferencePages.Capabilities.captionMessage" />
+            	<parameter name="activityName" value="%PreferencePages.Capabilities.activityName" />
+                <parameter name="categoryName" value="%PreferencePages.Capabilities.categoryName" />
+            	<parameter name="activityPromptButton" value="%PreferencePages.Capabilities.activityPromptButton"/>
+            	<parameter name="activityPromptButtonTooltip" value="%PreferencePages.Capabilities.activityPromptButtonTooltip"/>
+            </class>
+      </page>   
+   </extension>
 </plugin>

--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java	Wed May 19 10:09:01 2010 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java	Wed May 19 14:34:54 2010 -0500
@@ -16,6 +16,10 @@
 */
 package com.nokia.carbide.cpp;
 
+import java.util.Collections;
+import java.util.Hashtable;
+import java.util.Map;
+
 import org.eclipse.ui.plugin.*;
 import org.eclipse.equinox.p2.ui.Policy;
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -46,7 +50,8 @@
 		super.start(context);
 		Policy policy = new Policy();
 		policy.setRestartPolicy(Policy.RESTART_POLICY_PROMPT);
-		policyRegistration = context.registerService(Policy.class.getName(), policy, null);
+		Map<String, Integer> map = Collections.singletonMap("service.ranking", 100);
+		policyRegistration = context.registerService(Policy.class.getName(), policy, new Hashtable<Object, Object>(map));
 	}
 
 	/**