diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e46/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e47/category.xml
similarity index 100%
rename from eclipse-distribution/org.springframework.boot.ide.product.e46/category.xml
rename to eclipse-distribution/org.springframework.boot.ide.product.e47/category.xml
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e46/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
similarity index 98%
rename from eclipse-distribution/org.springframework.boot.ide.product.e46/org.springframework.boot.ide.product
rename to eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
index 12fe406b7..92ed4df34 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e46/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
@@ -85,6 +85,8 @@ openFile</programArgs>
       <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.properties.feature" installMode="root"/>
+
    </features>
 
    <configurations>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e46/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml
similarity index 100%
rename from eclipse-distribution/org.springframework.boot.ide.product.e46/pom.xml
rename to eclipse-distribution/org.springframework.boot.ide.product.e47/pom.xml
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 024c61c43..be12fee8a 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -28,6 +28,9 @@
 
 	<modules>
 		<module>org.springframework.boot.ide.branding</module>
+
+		<module>../eclipse-extensions/org.springframework.boot.ide.properties.editors</module>
+		<module>../eclipse-extensions/org.springframework.boot.ide.properties.feature</module>
 	</modules>
 
 	<properties>
@@ -56,26 +59,26 @@
 
 	<profiles>
 		<profile>
-			<id>e46</id>
+			<id>e47</id>
 			<properties>
-				<dist.target>e4.6</dist.target>
-				<dist.target.major>e4.6</dist.target.major>
-				<dist.platform.name>Neon</dist.platform.name>
-				<dist.platform.name.long>Neon (4.6)</dist.platform.name.long>
-				<dist.platform.id>neon</dist.platform.id>
-				<dist.platform.version>4.6</dist.platform.version>
-				<package.qualifierPrefix>e46</package.qualifierPrefix>
+				<dist.target>e4.7</dist.target>
+				<dist.target.major>e4.7</dist.target.major>
+				<dist.platform.name>Oxygen</dist.platform.name>
+				<dist.platform.name.long>Oxygen (4.7)</dist.platform.name.long>
+				<dist.platform.id>oxygen</dist.platform.id>
+				<dist.platform.version>4.7</dist.platform.version>
+				<package.qualifierPrefix>e47</package.qualifierPrefix>
 			</properties>
 			<repositories>
 				<repository>
-					<id>neon</id>
+					<id>oxygen</id>
 					<layout>p2</layout>
-					<url>http://download.eclipse.org/releases/neon/</url>
+					<url>http://download.eclipse.org/releases/oxygen/</url>
 				</repository>
 				<repository>
 					<id>staging</id>
 					<layout>p2</layout>
-					<url>http://download.eclipse.org/staging/neon/</url>
+					<url>http://download.eclipse.org/staging/oxygen/</url>
 				</repository>
 				<repository>
 					<id>orbit</id>
@@ -114,7 +117,7 @@
 				</repository>
 			</repositories>
 			<modules>
-				<module>org.springframework.boot.ide.product.e46</module>
+				<module>org.springframework.boot.ide.product.e47</module>
 			</modules>
 		</profile>
 
diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/.project b/eclipse-extensions/org.springframework.boot.ide.properties.editors/.project
new file mode 100644
index 000000000..6a21dced7
--- /dev/null
+++ b/eclipse-extensions/org.springframework.boot.ide.properties.editors/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.springframework.boot.ide.properties.editors</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/.settings/org.eclipse.jdt.core.prefs b/eclipse-extensions/org.springframework.boot.ide.properties.editors/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..0c68a61dc
--- /dev/null
+++ b/eclipse-extensions/org.springframework.boot.ide.properties.editors/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.boot.ide.properties.editors/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..bc52abefd
--- /dev/null
+++ b/eclipse-extensions/org.springframework.boot.ide.properties.editors/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Spring Boot IDE LSP-based Property Editors
+Bundle-SymbolicName: org.springframework.boot.ide.properties.editors;singleton:=true
+Bundle-Version: 4.0.0.qualifier
+Bundle-Vendor: Pivotal, Inc.
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.languageserver;bundle-version="0.1.0",
+ org.eclipse.ui.genericeditor;bundle-version="1.0.0",
+ org.eclipse.core.runtime;bundle-version="3.12.0"
diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/build.properties b/eclipse-extensions/org.springframework.boot.ide.properties.editors/build.properties
new file mode 100644
index 000000000..e9863e281
--- /dev/null
+++ b/eclipse-extensions/org.springframework.boot.ide.properties.editors/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml
diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/plugin.xml b/eclipse-extensions/org.springframework.boot.ide.properties.editors/plugin.xml
new file mode 100644
index 000000000..0d5b5632d
--- /dev/null
+++ b/eclipse-extensions/org.springframework.boot.ide.properties.editors/plugin.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+   <extension
+         point="org.eclipse.core.contenttype.contentTypes">
+      <content-type
+            base-type="org.eclipse.jdt.core.javaProperties"
+            default-charset="ISO-8859-1"
+            id="org.springframework.boot.ide.properties.applicationProperties"
+            name="Spring Properties File"
+            priority="high">
+      </content-type>
+      <file-association
+            content-type="org.springframework.boot.ide.properties.applicationProperties"
+            file-names="application.properties,application-dev.properties">
+      </file-association>
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.editors">
+      <editorContentTypeBinding
+            contentTypeId="org.springframework.boot.ide.properties.applicationProperties"
+            editorId="org.eclipse.ui.genericeditor.GenericEditor">
+      </editorContentTypeBinding>
+   </extension>
+
+</plugin>
diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/pom.xml b/eclipse-extensions/org.springframework.boot.ide.properties.editors/pom.xml
new file mode 100644
index 000000000..301934140
--- /dev/null
+++ b/eclipse-extensions/org.springframework.boot.ide.properties.editors/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.springframework.boot.ide</groupId>
+		<artifactId>org.springframework.boot.ide</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+  <artifactId>org.springframework.boot.ide.properties.editors</artifactId>
+  <packaging>eclipse-plugin</packaging>
+
+  <name>org.springframework.boot.ide.properties.editors</name>
+
+  <build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>second-generate-p2-metadata</id>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+						<phase>verify</phase>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+  </build>
+</project>
diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.feature/.project b/eclipse-extensions/org.springframework.boot.ide.properties.feature/.project
new file mode 100644
index 000000000..252bbbba7
--- /dev/null
+++ b/eclipse-extensions/org.springframework.boot.ide.properties.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.springframework.boot.ide.properties.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.feature/build.properties b/eclipse-extensions/org.springframework.boot.ide.properties.feature/build.properties
new file mode 100644
index 000000000..64f93a9f0
--- /dev/null
+++ b/eclipse-extensions/org.springframework.boot.ide.properties.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.feature/feature.xml b/eclipse-extensions/org.springframework.boot.ide.properties.feature/feature.xml
new file mode 100644
index 000000000..9fe509c23
--- /dev/null
+++ b/eclipse-extensions/org.springframework.boot.ide.properties.feature/feature.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.springframework.boot.ide.properties.feature"
+      label="Spring Boot IDE Property Editing Feature"
+      version="4.0.0.qualifier"
+      provider-name="Pivotal, Inc.">
+
+   <requires>
+      <import plugin="org.eclipse.ui.genericeditor"/>
+      <import plugin="org.eclipse.languageserver"/>
+   </requires>
+
+   <plugin
+         id="org.springframework.boot.ide.properties.editors"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.feature/pom.xml b/eclipse-extensions/org.springframework.boot.ide.properties.feature/pom.xml
new file mode 100644
index 000000000..6782b3dc9
--- /dev/null
+++ b/eclipse-extensions/org.springframework.boot.ide.properties.feature/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot.ide</groupId>
+		<artifactId>org.springframework.boot.ide</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	
+	<artifactId>org.springframework.boot.ide.properties.feature</artifactId>
+	<packaging>eclipse-feature</packaging>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-p2-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<executions>
+					<execution>
+						<id>second-generate-p2-metadata</id>
+						<goals>
+							<goal>p2-metadata</goal>
+						</goals>
+						<phase>verify</phase>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+		
+	  
+</project>