diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml b/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml
index 80c0ad7..f341cb0 100644
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml
+++ b/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml
@@ -26,38 +26,42 @@
    <requires>
       <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
       <import plugin="org.eclipse.gef" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.wst.sse.ui" version="1.0.101"/>
       <import plugin="org.eclipse.jst.jsp.core" version="1.1.0"/>
       <import plugin="org.eclipse.jst.jsp.ui" version="1.1.0"/>
-      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.ui" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.j2ee" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.j2ee.web" version="1.1.0" match="compatible"/>
       <import plugin="org.eclipse.jst.pagedesigner.jsp.core" version="1.0.0" match="compatible"/>
       <import plugin="org.eclipse.jst.jsf.common.ui" version="1.0.0" match="compatible"/>
+      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.jdt.ui" version="3.2.0" match="compatible"/>
       <import plugin="org.eclipse.jst.jsf.common" version="1.0.0" match="compatible"/>
       <import plugin="org.eclipse.jst.jsf.core" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.html.ui" version="1.0.100" match="compatible"/>
-      <import plugin="org.eclipse.wst.css.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.html.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.xml.ui" version="1.0.100" match="compatible"/>
-      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.jdt.core" version="3.2.0" match="compatible"/>
       <import plugin="javax.servlet" version="2.4.0" match="compatible"/>
       <import plugin="org.apache.commons.el" version="1.0.0" match="compatible"/>
       <import plugin="javax.servlet.jsp" version="2.0.0" match="compatible"/>
       <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.jsf.facesconfig" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.pagedesigner" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.ui" version="1.1.0" match="equivalent"/>
+      <import plugin="org.eclipse.wst.common.uriresolver" version="1.1.0" match="equivalent"/>
+      <import plugin="org.eclipse.jst.j2ee" version="1.1.0" match="equivalent"/>
+      <import plugin="org.eclipse.jst.j2ee.web" version="1.1.0" match="equivalent"/>
+      <import plugin="org.eclipse.wst.html.ui" version="1.0.100" match="equivalent"/>
+      <import plugin="org.eclipse.wst.css.core" version="1.1.0" match="equivalent"/>
+      <import plugin="org.eclipse.wst.html.core" version="1.1.0" match="equivalent"/>
+      <import plugin="org.eclipse.wst.xml.ui" version="1.0.100" match="equivalent"/>
+      <import plugin="org.eclipse.wst.xml.core" version="1.1.0" match="equivalent"/>
+      <import plugin="org.eclipse.wst.sse.core" version="1.1.0" match="equivalent"/>
+      <import plugin="org.eclipse.jst.jsf.facesconfig" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.jst.pagedesigner" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.jst.pagedesigner.jsp.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.wst.common.modulecore" version="1.1.0" match="equivalent"/>
+      <import plugin="org.eclipse.jst.jsf.common.ui" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.jst.jsf.core" version="1.1.0" match="compatible"/>
+      <import plugin="org.eclipse.jst.jsf.common" version="1.1.0" match="compatible"/>
    </requires>
 
    <plugin