diff --git a/extras/features/com.jboss.jbds.git.feature/feature.xml b/extras/features/com.jboss.jbds.git.feature/feature.xml
index d1dc5f0..2211fe2 100644
--- a/extras/features/com.jboss.jbds.git.feature/feature.xml
+++ b/extras/features/com.jboss.jbds.git.feature/feature.xml
@@ -6,7 +6,7 @@
       provider-name="JBoss by Red Hat">
 
    <description>
-Contains eGit 1.1 and jGit 1.1, including Mylyn and GitHub integration (Selected).
+Contains Mylyn and GitHub integration (Selected).
 Features selected by Red Hat for use with JBoss Developer Studio. 
    </description>
 
@@ -22,8 +22,6 @@ Raleigh NC 27606 USA.
    </license>
    
    <requires>
-      <import feature="org.eclipse.egit" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.jgit" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.egit.mylyn" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.mylyn.github.feature" version="1.1.0" match="greaterOrEqual"/>
    </requires>
diff --git a/extras/site/site.xml b/extras/site/site.xml
index 9ab5309..0ce6cda 100644
--- a/extras/site/site.xml
+++ b/extras/site/site.xml
@@ -44,10 +44,6 @@ Features selected by Red Hat for use with JBoss Developer Studio.
 
 	<!-- JBDS 4.1 -->
 
-	<feature url="features/org.eclipse.egit_0.0.0.jar" id="org.eclipse.egit" version="0.0.0">
-	</feature>
-	<feature url="features/org.eclipse.jgit_0.0.0.jar" id="org.eclipse.jgit" version="0.0.0">
-	</feature>
 	<feature url="features/org.eclipse.egit.mylyn_0.0.0.jar" id="org.eclipse.egit.mylyn" version="0.0.0">
 	</feature>
 	<feature url="features/org.eclipse.mylyn.github.feature_0.0.0.jar" id="org.eclipse.mylyn.github.feature" version="0.0.0">
diff --git a/product/features/com.jboss.jbds.product.feature/feature.xml b/product/features/com.jboss.jbds.product.feature/feature.xml
index acb6b79..5af7313 100644
--- a/product/features/com.jboss.jbds.product.feature/feature.xml
+++ b/product/features/com.jboss.jbds.product.feature/feature.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.jboss.jbds.product.feature"
-      label="%featureName"
-      version="5.0.0.qualifier"
-      provider-name="%providerName"
-      plugin="com.jboss.jbds.product">
+<feature id="com.jboss.jbds.product.feature" label="%featureName" version="5.0.0.qualifier" provider-name="%providerName" plugin="com.jboss.jbds.product">
 
    <description url="http://www.redhat.com/developer_studio/Getting_Started_Single/">
       %description
@@ -23,29 +18,17 @@
       <discovery label="%updateExtrasSiteName" url="https://devstudio.jboss.com/updates/5.0/extras/"/>
    </url>
 
-   <includes
-         id="org.eclipse.platform"
-         version="0.0.0"/>
-
    <requires>
-      <import feature="org.jboss.tools.runtime.feature"/>
-      <import feature="org.jboss.ide.eclipse.as.feature"/>
-      <import feature="org.jboss.tools.jmx.feature"/>
-      <import feature="org.jboss.ide.eclipse.archives.feature"/>
-      <import feature="org.jboss.tools.richfaces.feature"/>
-      <import feature="org.jboss.ide.eclipse.freemarker.feature"/>
-      <import feature="org.hibernate.eclipse.feature"/>
-      <import feature="org.jboss.tools.struts.feature"/>
-      <import feature="org.jboss.tools.seam.feature"/>
-      <import feature="org.jboss.tools.cdi.feature"/>
-      <import feature="org.jboss.tools.cdi.seam.feature"/>
-      <import feature="org.jboss.tools.project.examples.feature"/>
-      <import feature="org.jboss.tools.ws.feature"/>
-      <import feature="org.jboss.tools.portlet.feature"/>
+		<import plugin="org.eclipse.jdt.doc.user" />
+		<import plugin="org.eclipse.jst.server.tomcat.core" version="1.1.202" match="compatible" />
+		<import plugin="org.eclipse.jst.server.tomcat.ui" version="1.1.200" match="compatible" />
+		<import plugin="org.eclipse.jst.server.websphere.core" version="1.0.302" match="compatible" />
+		<import plugin="org.eclipse.jst.server.generic.jonas" version="1.5.205" match="compatible" />
+		<import plugin="org.eclipse.jst.server.generic.oc4j" version="1.5.206" match="compatible" />
+
       <import feature="org.eclipse.cvs"/>
       <import feature="org.eclipse.help"/>
       <import feature="org.eclipse.jdt"/>
-      <import plugin="org.eclipse.jdt.doc.user"/>
       <import feature="org.eclipse.rse"/>
       <import feature="org.eclipse.tm.terminal"/>
       <import feature="org.eclipse.datatools.modelbase.feature"/>
@@ -76,45 +59,41 @@
       <import feature="org.eclipse.jst.ws.cxf.feature"/>
       <import feature="org.eclipse.jst.ws.jaxws.dom.feature"/>
       <import feature="org.eclipse.platform" version="3.6.0" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.tomcat.core" version="1.1.202" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.tomcat.ui" version="1.1.200" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.websphere.core" version="1.0.302" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.generic.jonas" version="1.5.205" match="compatible"/>
-      <import plugin="org.eclipse.jst.server.generic.oc4j" version="1.5.206" match="compatible"/>
-      <import feature="org.jboss.tools.runtime.core.feature"/>
       <import feature="org.eclipse.equinox.p2.core.feature"/>
+		<import feature="org.eclipse.jgit" />
+		<import feature="org.eclipse.egit" />
+
+		<import feature="org.hibernate.eclipse.feature" />
+		<import feature="org.jboss.ide.eclipse.as.feature" />
+		<import feature="org.jboss.ide.eclipse.archives.feature" />
+		<import feature="org.jboss.ide.eclipse.freemarker.feature" />
+		<import feature="org.jboss.tools.runtime.feature" />
+		<import feature="org.jboss.tools.jmx.feature" />
+		<import feature="org.jboss.tools.richfaces.feature" />
+		<import feature="org.jboss.tools.struts.feature" />
+		<import feature="org.jboss.tools.seam.feature" />
+		<import feature="org.jboss.tools.cdi.feature" />
+		<import feature="org.jboss.tools.cdi.seam.feature" />
+		<import feature="org.jboss.tools.project.examples.feature" />
+		<import feature="org.jboss.tools.ws.feature" />
+		<import feature="org.jboss.tools.portlet.feature" />
+		<import feature="org.jboss.tools.runtime.core.feature" />
       <import feature="org.jboss.tools.runtime.seam.detector.feature"/>
       <import feature="org.jboss.tools.runtime.as.detector.feature"/>
       <import feature="org.jboss.tools.central.feature"/>
       <import feature="org.jboss.tools.forge.feature"/>
+		<import feature="org.jboss.tools.vpe.browsersim.feature" />
+		<import feature="org.jboss.tools.openshift.express.feature" />
+		<import feature="org.jboss.tools.openshift.egit.integration.feature" />
    </requires>
    
-   <includes id="com.jboss.jbds.m2e.feature" version="0.0.0"/>
-
-   <plugin
-         id="com.jboss.jbds.product"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="com.jboss.jbds.project.examples"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
+	<includes id="org.eclipse.platform" version="0.0.0" />
 
-   <plugin
-         id="com.jboss.jbds.usage.branding"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+	<includes id="com.jboss.jbds.m2e.feature" version="0.0.0" />
 
-   <plugin
-         id="com.jboss.jbds.central"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+	<plugin id="com.jboss.jbds.product" download-size="0" install-size="0" version="0.0.0" />
+	<plugin id="com.jboss.jbds.project.examples" download-size="0" install-size="0" version="0.0.0" />
+	<plugin id="com.jboss.jbds.usage.branding" download-size="0" install-size="0" version="0.0.0" unpack="false" />
+	<plugin id="com.jboss.jbds.central" download-size="0" install-size="0" version="0.0.0" unpack="false" />
 
 </feature>
diff --git a/product/features/com.jboss.jbds/com.jboss.jbds.product b/product/features/com.jboss.jbds/com.jboss.jbds.product
index fa73798..5ef55f1 100644
--- a/product/features/com.jboss.jbds/com.jboss.jbds.product
+++ b/product/features/com.jboss.jbds/com.jboss.jbds.product
@@ -104,6 +104,9 @@ JBoss by Red Hat - Initial implementation.
       <feature id="org.jboss.tools.portlet.feature"/>
       <feature id="org.jboss.tools.central.feature"/>
       <feature id="org.jboss.tools.forge.feature"/>
+      <feature id="org.jboss.tools.vpe.browsersim.feature"/>
+      <feature id="org.jboss.tools.openshift.express.feature"/>
+      <feature id="org.jboss.tools.openshift.egit.integration.feature"/>
    </features>
 
 </product>
diff --git a/product/site/site.xml b/product/site/site.xml
index ad2ce53..aac09d5 100644
--- a/product/site/site.xml
+++ b/product/site/site.xml
@@ -2,6 +2,11 @@
 <site>
 	<description>JBoss Developer Studio 5.0 Updates</description>
 
+	<!-- PLEASE NOTE!
+		When updating this file, please be sure that it parses as valid XML before committing it.
+		To test, just run `mvn clean install` in this folder. 
+	-->
+
 	<!-- only in JBDS -->
 	<feature url="features/com.jboss.jbds.product.feature_0.0.0.jar" id="com.jboss.jbds.product.feature" version="0.0.0" patch="false">
 		<category name="AbridgedTools" />
@@ -9,24 +14,41 @@
 
 	<feature url="features/org.jboss.tools.central.feature_0.0.0.jar" id="org.jboss.tools.central.feature" version="0.0.0">
 		<category name="AbridgedTools"/>
+		<category name="GeneralTools" />
+	</feature>
+	<!-- only in JBT
+	<feature url="features/org.jboss.tools.community.central.feature_0.0.0.jar" id="org.jboss.tools.community.central.feature" version="0.0.0">
+		<category name="AbridgedTools" />
+		<category name="GeneralTools"/>
 	</feature>
+	-->
 	<feature url="features/org.jboss.tools.central.discovery.feature_0.0.0.jar" id="org.jboss.tools.central.discovery.feature" version="0.0.0">
 	</feature>
-
 	<feature url="features/org.jboss.tools.richfaces.feature_0.0.0.jar" id="org.jboss.tools.richfaces.feature" version="0.0.0">
 		<category name="AbridgedTools"/>
 		<category name="WebTools"/>
 	</feature>
-	<!-- include but do not categorize in JBDS -->
+	<feature url="features/org.jboss.tools.vpe.browsersim.feature_0.0.0.jar" id="org.jboss.tools.vpe.browsersim.feature" version="0.0.0">
+		<category name="AbridgedTools" />
+		<category name="WebTools" />
+	</feature>
 	<feature url="features/org.jboss.tools.jst.feature_0.0.0.jar" id="org.jboss.tools.jst.feature" version="0.0.0">
+		<category name="AbridgedTools" />
+		<category name="WebTools" />
 	</feature>
 	<feature url="features/org.jboss.tools.vpe.feature_0.0.0.jar" id="org.jboss.tools.vpe.feature" version="0.0.0">
+		<category name="AbridgedTools" />
+		<category name="WebTools" />
 	</feature>
 	<feature url="features/org.jboss.tools.jsf.feature_0.0.0.jar" id="org.jboss.tools.jsf.feature" version="0.0.0">
+		<category name="AbridgedTools" />
+		<category name="WebTools" />
 	</feature>
 	<!-- include but do not categorize -->
-	<feature url="features/org.jboss.tools.xulrunner.feature_0.0.0.jar" id="org.jboss.tools.xulrunner.feature" version="0.0.0"></feature>
-	<feature url="features/org.mozilla.xulrunner.feature_0.0.0.jar" id="org.mozilla.xulrunner.feature" version="0.0.0"></feature>
+	<feature url="features/org.jboss.tools.xulrunner.feature_0.0.0.jar" id="org.jboss.tools.xulrunner.feature" version="0.0.0">
+	</feature>
+	<feature url="features/org.mozilla.xulrunner.feature_0.0.0.jar" id="org.mozilla.xulrunner.feature" version="0.0.0">
+	</feature>
 
 	<feature url="features/org.jboss.tools.seam.feature_0.0.0.jar" id="org.jboss.tools.seam.feature" version="0.0.0">
 		<category name="AbridgedTools"/>
@@ -50,12 +72,19 @@
 		<category name="AbridgedTools"/>
 		<category name="WebTools"/>
 	</feature>
-	<!-- only in JBT
-	<feature url="features/org.jboss.ide.eclipse.as.server.egit.integration.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.server.egit.integration.feature" version="0.0.0">
+	<feature url="features/org.jboss.tools.openshift.express.feature_0.0.0.jar" id="org.jboss.tools.openshift.express.feature" version="0.0.0">
 		<category name="AbridgedTools" />
-		<category name="WebTools" />
+		<category name="CloudTools" />
+	</feature>
+	<feature url="features/org.jboss.tools.openshift.egit.integration.feature_0.0.0.jar" id="org.jboss.tools.openshift.egit.integration.feature" version="0.0.0">
+		<category name="AbridgedTools" />
+		<category name="CloudTools" />
+	</feature>
+	<!-- only in JBDS -->
+	<feature url="features/org.eclipse.egit_0.0.0.jar" id="org.eclipse.egit" version="0.0.0">
+	</feature>
+	<feature url="features/org.eclipse.jgit_0.0.0.jar" id="org.eclipse.jgit" version="0.0.0">
 	</feature>
-	-->
 	<feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0">
 		<category name="AbridgedTools"/>
 		<category name="GeneralTools"/>
@@ -88,14 +117,14 @@
 		<category name="AbridgedTools"/>
 		<category name="WebTools"/>
 	</feature>
-	<feature url="features/org.jboss.tools.project.examples.feature_0.0.0.jar" id="org.jboss.tools.project.examples.feature" version="0.0.0">
-		<category name="AbridgedTools"/>
-		<category name="GeneralTools"/>
-	</feature>
 	<feature url="features/org.jboss.tools.forge.feature_0.0.0.jar" id="org.jboss.tools.forge.feature" version="0.0.0">
 		<category name="AbridgedTools"/>
 		<category name="WebTools" />
 	</feature>
+	<feature url="features/org.jboss.tools.project.examples.feature_0.0.0.jar" id="org.jboss.tools.project.examples.feature" version="0.0.0">
+		<category name="AbridgedTools" />
+		<category name="GeneralTools" />
+	</feature>
 
 	<!-- only in JBT 
 	<feature url="features/org.jboss.tools.community.project.examples.feature_0.0.0.jar" id="org.jboss.tools.community.project.examples.feature" version="0.0.0">
@@ -106,6 +135,12 @@
 		<category name="ReportTools" />
 	</feature>
 	-->
+
+	<!-- only in JBDS -->
+	<feature url="features/com.jboss.jbds.m2e.feature_0.0.0.jar" id="com.jboss.jbds.m2e.feature" version="0.0.0">
+		<category name="AbridgedTools"/>
+		<category name="MavenTools" />
+	</feature>
 	<feature url="features/org.eclipse.m2e.feature_0.0.0.jar" id="org.eclipse.m2e.feature" version="0.0.0">
 	</feature>
 	<feature url="features/org.maven.ide.eclipse.wtp.feature_0.0.0.jar" id="org.maven.ide.eclipse.wtp.feature" version="0.0.0">
@@ -144,57 +179,57 @@
 		<category name="AbridgedTools"/>
 		<category name="MavenTools" />
 	</feature>
-	<feature url="features/com.jboss.jbds.m2e.feature_0.0.0.jar" id="com.jboss.jbds.m2e.feature" version="0.0.0">
-		<category name="AbridgedTools"/>
+	<!-- ONLY on JBDS Extras for now
+	<feature url="features/org.jboss.tools.maven.jbosspackaging.feature_0.0.0.jar" id="org.jboss.tools.maven.jbosspackaging.feature" version="0.0.0">
 		<category name="MavenTools" />
 	</feature>
-	
-	<!-- only in JBT 
-	<feature url="features/org.jboss.tools.deltacloud.feature_0.0.0.jar" id="org.jboss.tools.deltacloud.feature" version="0.0.0">
-		<category name="CloudTools" />
-	</feature>
 	-->
-	<!--
+	
+	<!-- only on JBT
 	<feature url="features/org.jboss.tools.gwt.feature_0.0.0.jar" id="org.jboss.tools.gwt.feature" version="0.0.0">
 		<category name="GeneralTools" />
 	</feature>
-	-->
-	<!--
 	<feature url="features/org.jboss.tools.common.jdt.feature_0.0.0.jar" id="org.jboss.tools.common.jdt.feature" version="0.0.0">
 		<category name="AbridgedTools" />
+                <category name="GeneralTools"/>
 	</feature>
 	<feature url="features/org.jboss.tools.common.mylyn.feature_0.0.0.jar" id="org.jboss.tools.common.mylyn.feature" version="0.0.0">
 		<category name="AbridgedTools" />
+		<category name="GeneralTools"/>
 	</feature>
 	-->
 	<!-- include but do not categorize -->
-	<feature url="features/org.jboss.tools.common.feature_0.0.0.jar" id="org.jboss.tools.common.feature" version="0.0.0"></feature>
-	<feature url="features/org.jboss.tools.common.core.feature_0.0.0.jar" id="org.jboss.tools.common.core.feature" version="0.0.0"></feature>
-	<feature url="features/org.jboss.tools.common.text.ext.feature_0.0.0.jar" id="org.jboss.tools.common.text.ext.feature" version="0.0.0"></feature>
-	<feature url="features/org.jboss.tools.common.ui.feature_0.0.0.jar" id="org.jboss.tools.common.ui.feature" version="0.0.0"></feature>
-	<feature url="features/org.jboss.tools.common.verification.feature_0.0.0.jar" id="org.jboss.tools.common.verification.feature" version="0.0.0"></feature>
+	<feature url="features/org.jboss.tools.common.feature_0.0.0.jar" id="org.jboss.tools.common.feature" version="0.0.0">
+	</feature>
+	<feature url="features/org.jboss.tools.common.core.feature_0.0.0.jar" id="org.jboss.tools.common.core.feature" version="0.0.0">
+	</feature>
+	<feature url="features/org.jboss.tools.common.text.ext.feature_0.0.0.jar" id="org.jboss.tools.common.text.ext.feature" version="0.0.0">
+	</feature>
+	<feature url="features/org.jboss.tools.common.ui.feature_0.0.0.jar" id="org.jboss.tools.common.ui.feature" version="0.0.0">
+	</feature>
+	<feature url="features/org.jboss.tools.common.verification.feature_0.0.0.jar" id="org.jboss.tools.common.verification.feature" version="0.0.0">
+	</feature>
 	
 	<feature url="features/org.jboss.tools.runtime.feature_0.0.0.jar" id="org.jboss.tools.runtime.feature" version="0.0.0">
 		<category name="AbridgedTools" />
 	</feature>
-	
 	<feature url="features/org.jboss.tools.runtime.core.feature_0.0.0.jar" id="org.jboss.tools.runtime.core.feature" version="0.0.0">
 		<category name="AbridgedTools" />
 	</feature>
-
 	<feature url="features/org.jboss.tools.runtime.as.detector.feature_0.0.0.jar" id="org.jboss.tools.runtime.as.detector.feature" version="0.0.0">
 		<category name="AbridgedTools"/>
+		<category name="WebTools" />
 	</feature>
-
 	<feature url="features/org.jboss.tools.runtime.seam.detector.feature_0.0.0.jar" id="org.jboss.tools.runtime.seam.detector.feature" version="0.0.0">
 		<category name="AbridgedTools"/>
+		<category name="WebTools" />
 	</feature>
 
 	<feature url="features/org.jboss.tools.usage.feature_0.0.0.jar" id="org.jboss.tools.usage.feature" version="0.0.0">
 		<category name="AbridgedTools" />
+		<category name="GeneralTools"/>
 	</feature>
 
-	<!-- categories - see also ../../../common/aggregateRepos.*.properties -->
 	<category-def name="AbridgedTools" label="Abridged JBoss Developer Studio 5.0">
 		<description>Contains most of the JBoss Developer Studio features.
                         Excluded are those related to integration with 3rd party
@@ -222,15 +257,15 @@
 		<description>Plugins related to Maven and m2eclipse support. Use these
 			to enable use of Maven.</description>
 	</category-def>
+	<category-def name="CloudTools" label="JBoss Cloud Development Tools">
+		<description>Tools for Cloud Development.
+		</description>
+	</category-def>
 	<!-- Only in JBT 
 	<category-def name="ReportTools" label="JBoss Business Intelligence, Reporting and Charting">
 		<description>Business Intelligence, Reporting and Charting. Use these
 			if you plan to integrate Hibernate or Seam with Eclipse BIRT.
 		</description>
 	</category-def>
-	<category-def name="CloudTools" label="JBoss Cloud Development Tools">
-		<description>Tools for Cloud Development.
-		</description>
-	</category-def>
 	-->
 </site>
diff --git a/releng/org.jboss.ide.eclipse.releng/builders/jbds-all-package/jbds-all.product b/releng/org.jboss.ide.eclipse.releng/builders/jbds-all-package/jbds-all.product
index fa73798..5ef55f1 100644
--- a/releng/org.jboss.ide.eclipse.releng/builders/jbds-all-package/jbds-all.product
+++ b/releng/org.jboss.ide.eclipse.releng/builders/jbds-all-package/jbds-all.product
@@ -104,6 +104,9 @@ JBoss by Red Hat - Initial implementation.
       <feature id="org.jboss.tools.portlet.feature"/>
       <feature id="org.jboss.tools.central.feature"/>
       <feature id="org.jboss.tools.forge.feature"/>
+      <feature id="org.jboss.tools.vpe.browsersim.feature"/>
+      <feature id="org.jboss.tools.openshift.express.feature"/>
+      <feature id="org.jboss.tools.openshift.egit.integration.feature"/>
    </features>
 
 </product>