--- a/core/com.nokia.carbide.win32.utils/plugin.xml	Wed Jun 30 14:00:29 2010 -0500
+++ b/core/com.nokia.carbide.win32.utils/plugin.xml	Wed Jun 30 15:34:24 2010 -0500
@@ -1,23 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
-  <extension 
-		point="org.eclipse.ui.popupMenus">
-		<objectContribution
-        	adaptable="true"
-        	id="com.nokia.carbide.win32.utils.contribution1"
-        	nameFilter="*"
-        	objectClass="org.eclipse.core.resources.IResource">
-     		<action
-           		class="com.nokia.carbide.internal.win32.utils.actions.WindowsOpenFileUtils"
-           		enablesFor="1"
-           		id="openInWindowsExplorer"
-           		label="Show in Explorer"/>
-     		<action
-           		class="com.nokia.carbide.internal.win32.utils.actions.WindowsOpenFileUtils"
-           		enablesFor="1"
-           		id="openInCmdPrompt"
-           		label="Open Command Window"/>
- 			</objectContribution>
+  <extension
+        point="org.eclipse.ui.commands">
+     <command
+           id="com.nokia.carbide.win32.utils.openInWindowsExplorer"
+           name="Show in Explorer">
+     </command>
+     <command
+           id="com.nokia.carbide.win32.utils.openInCmdPrompt"
+           name="Open Command Window">
+     </command>
+  </extension>
+  <extension
+        point="org.eclipse.ui.handlers">
+     <handler
+           class="com.nokia.carbide.internal.win32.utils.actions.OpenInExplorerHandler"
+           commandId="com.nokia.carbide.win32.utils.openInWindowsExplorer">
+     </handler>
+     <handler
+           class="com.nokia.carbide.internal.win32.utils.actions.OpenInCmdPromptHandler"
+           commandId="com.nokia.carbide.win32.utils.openInCmdPrompt">
+     </handler>
+  </extension>
+  <extension point="org.eclipse.core.expressions.definitions">
+      <definition id="com.nokia.carbide.win32.utils.singleResource">
+          <with variable="activeMenuSelection">
+             <count value="1"/>
+             <iterate ifEmpty="false">
+	            <adapt type="org.eclipse.core.resources.IResource"/>
+	         </iterate>
+          </with>
+      </definition>
+  </extension>
+  <extension
+        point="org.eclipse.ui.menus">
+     <menuContribution
+           locationURI="popup:org.eclipse.ui.popup.any?after=additions">
+        <command
+              commandId="com.nokia.carbide.win32.utils.openInWindowsExplorer"
+              style="push">
+           <visibleWhen
+                 checkEnabled="false">
+    			<reference definitionId="com.nokia.carbide.win32.utils.singleResource"/>
+           </visibleWhen>
+        </command>
+        <command
+              commandId="com.nokia.carbide.win32.utils.openInCmdPrompt"
+              style="push">
+           <visibleWhen
+                 checkEnabled="false">
+    			<reference definitionId="com.nokia.carbide.win32.utils.singleResource"/>
+           </visibleWhen>
+        </command>
+     </menuContribution>
   </extension>
 </plugin>