diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
index 40cc2636e..dd641ce3f 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
@@ -77,11 +77,10 @@ openFile</programArgs>
       <feature id="net.mihai-nita.ansicon" installMode="root"/>
 
       <feature id="org.springsource.ide.eclipse.commons.quicksearch.feature" installMode="root"/>
-      <feature id="org.springframework.ide.eclipse.boot.feature" installMode="root"/>
       <feature id="org.springframework.ide.eclipse.boot.dash.feature" installMode="root"/>
 
       <feature id="org.springframework.boot.ide.branding.feature" installMode="root"/>
-<!--      <feature id="org.springframework.boot.ide.main.feature" installMode="root"/> -->
+      <feature id="org.springframework.boot.ide.main.feature" installMode="root"/>
 
 <!--     <feature id="org.springframework.tooling.properties.ls.feature" installMode="root"/> -->
       <feature id="org.springframework.tooling.boot.java.ls.feature" installMode="root"/>
diff --git a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml b/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
index 119e99c6f..1ce096e82 100644
--- a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
@@ -22,30 +22,30 @@
 	<category-def name="Integrations / Spring IDE" label="Integrations / Spring IDE" />
 	<category-def name="Resources / Spring IDE" label="Resources / Spring IDE" />
 
-<!--	<feature
+	<feature
 		id="org.springframework.boot.ide.main.feature" version="0.0.0">
 		<category name="Extensions / Spring IDE" />
-	</feature> -->
+	</feature>
 
-	<feature
+<!--	<feature
 		id="org.springframework.ide.eclipse.boot.feature" version="0.0.0">
 		<category name="Extensions / Spring IDE" />
-	</feature>
+	</feature> -->
 
 	<feature
 		id="org.springframework.ide.eclipse.boot.dash.feature" version="0.0.0">
 		<category name="Extensions / Spring IDE" />
 	</feature>
 
-<!--	<feature
+	<feature
 		id="org.springframework.boot.ide.main.feature.source" version="0.0.0">
 		<category name="Resources / Spring IDE" />
-	</feature> -->
+	</feature>
 
-	<feature
+<!--	<feature
 		id="org.springframework.ide.eclipse.boot.feature.source" version="0.0.0">
 		<category name="Resources / Spring IDE" />
-	</feature>
+	</feature> -->
 
 	<feature
 		id="org.springframework.ide.eclipse.boot.dash.feature.source" version="0.0.0">
diff --git a/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
index bc8ca7ac8..854743011 100644
--- a/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
+++ b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
@@ -33,6 +33,20 @@
           version="0.0.0"
           unpack="false"/>
 
+    <plugin
+          id="org.springframework.ide.eclipse.boot.properties.editor"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+
+    <plugin
+          id="org.springframework.ide.eclipse.boot.properties.editor.yaml"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+
     <plugin
           id="org.springframework.ide.eclipse.boot.wizard"
           download-size="0"
@@ -48,17 +62,24 @@
           unpack="false"/>
 
     <plugin
-          id="org.springframework.ide.eclipse.imports"
+          id="org.springframework.ide.eclipse.editor.support"
           download-size="0"
           install-size="0"
           version="0.0.0"
           unpack="false"/>
 
     <plugin
-          id="org.springframework.ide.eclipse.buildship20"
+          id="org.springframework.ide.eclipse.imports"
           download-size="0"
           install-size="0"
           version="0.0.0"
           unpack="false"/>
          
+    <plugin
+          id="org.springframework.ide.eclipse.buildship20"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+
 </feature>