diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/.classpath b/eclipse-extensions/org.springframework.boot.ide.properties.editors/.classpath
deleted file mode 100644
index eca7bdba8..000000000
--- a/eclipse-extensions/org.springframework.boot.ide.properties.editors/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/.project b/eclipse-extensions/org.springframework.boot.ide.properties.editors/.project
deleted file mode 100644
index 6a21dced7..000000000
--- a/eclipse-extensions/org.springframework.boot.ide.properties.editors/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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
deleted file mode 100644
index 0c68a61dc..000000000
--- a/eclipse-extensions/org.springframework.boot.ide.properties.editors/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index bb2c70f5a..000000000
--- a/eclipse-extensions/org.springframework.boot.ide.properties.editors/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-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.ui.genericeditor;bundle-version="1.0.0",
- org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.jface.text;bundle-version="3.11.100",
- org.eclipse.jdt.ui;bundle-version="3.13.0",
- org.dadacoalition.yedit;bundle-version="1.0.20",
- org.eclipse.lsp4e;bundle-version="0.1.0"
-Import-Package: org.eclipse.jface.preference
diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/build.properties b/eclipse-extensions/org.springframework.boot.ide.properties.editors/build.properties
deleted file mode 100644
index e9863e281..000000000
--- a/eclipse-extensions/org.springframework.boot.ide.properties.editors/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index bec3136c7..000000000
--- a/eclipse-extensions/org.springframework.boot.ide.properties.editors/plugin.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?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.application.properties"
-            name="Spring Properties File"
-            priority="high">
-      </content-type>
-      <file-association
-            content-type="org.springframework.boot.ide.properties.application.properties"
-            file-names="application.properties,application-dev.properties">
-      </file-association>
-   </extension>
-   
-   <extension
-         point="org.eclipse.core.contenttype.contentTypes">
-      <content-type
-            base-type="org.eclipse.core.runtime.text"
-            default-charset="UTF-8"
-            id="org.springframework.boot.ide.properties.application.yml"
-            name="Spring Yaml Properties File"
-            priority="high">
-      </content-type>
-      <file-association
-            content-type="org.springframework.boot.ide.properties.application.yml"
-            file-names="application.yml,bootstrap.yml,application-dev.yml">
-      </file-association>
-   </extension>
-
-   <extension
-         point="org.eclipse.core.contenttype.contentTypes">
-      <content-type
-            base-type="org.eclipse.core.runtime.text"
-            default-charset="UTF-8"
-            id="org.springframework.boot.ide.manifest.yml"
-            name="Cloudfoundry Manifest"
-            priority="high">
-      </content-type>
-      <file-association
-            content-type="org.springframework.boot.ide.manifest.yml"
-            file-names="manifest.yml">
-      </file-association>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.editors">
-      <editorContentTypeBinding
-            contentTypeId="org.springframework.boot.ide.properties.application.properties"
-            editorId="org.eclipse.ui.genericeditor.GenericEditor">
-      </editorContentTypeBinding>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.editors">
-      <editorContentTypeBinding
-            contentTypeId="org.springframework.boot.ide.properties.application.yml"
-            editorId="org.eclipse.ui.genericeditor.GenericEditor">
-      </editorContentTypeBinding>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.editors">
-      <editorContentTypeBinding
-            contentTypeId="org.springframework.boot.ide.manifest.yml"
-            editorId="org.eclipse.ui.genericeditor.GenericEditor">
-      </editorContentTypeBinding>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.genericeditor.presentationReconcilers">
-      <presentationReconciler
-            class="org.springframework.boot.ide.properties.editors.SpringPropertiesPresentationReconciler"
-            contentType="org.springframework.boot.ide.properties.application.properties">
-      </presentationReconciler>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.genericeditor.presentationReconcilers">
-      <presentationReconciler
-            class="org.springframework.boot.ide.properties.editors.SpringYMLPresentationReconciler"
-            contentType="org.springframework.boot.ide.properties.application.yml">
-      </presentationReconciler>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.genericeditor.presentationReconcilers">
-      <presentationReconciler
-            class="org.springframework.boot.ide.properties.editors.SpringYMLPresentationReconciler"
-            contentType="org.springframework.boot.ide.manifest.yml">
-      </presentationReconciler>
-   </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
deleted file mode 100644
index 301934140..000000000
--- a/eclipse-extensions/org.springframework.boot.ide.properties.editors/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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
deleted file mode 100644
index 252bbbba7..000000000
--- a/eclipse-extensions/org.springframework.boot.ide.properties.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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
deleted file mode 100644
index 64f93a9f0..000000000
--- a/eclipse-extensions/org.springframework.boot.ide.properties.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 3133ebc7f..000000000
--- a/eclipse-extensions/org.springframework.boot.ide.properties.feature/feature.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.lsp4e"/>
-   </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
deleted file mode 100644
index 6782b3dc9..000000000
--- a/eclipse-extensions/org.springframework.boot.ide.properties.feature/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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>
diff --git a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server.feature/feature.xml b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server.feature/feature.xml
index ce72bbd8a..20ecc1020 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server.feature/feature.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.springframework.boot.ide.cloudfoundry.server.feature"
-      label="Spring Boot IDE Cloud Foundry Manifest Language Server Feature"
-      version="4.0.0.qualifier"
-      provider-name="Pivotal, Inc.">
+	id="org.springframework.boot.ide.cloudfoundry.server.feature"
+	label="Spring Boot IDE Cloud Foundry Manifest Language Server Feature"
+	version="4.0.0.qualifier"
+	provider-name="Pivotal, Inc.">
 
-   <requires>
-      <import plugin="org.eclipse.lsp4e"/>
-   </requires>
+	<requires>
+		<import plugin="org.eclipse.ui.genericeditor"/>
+		<import plugin="org.eclipse.lsp4e"/>
+	</requires>
 
-   <plugin
-         id="org.springframework.boot.ide.cloudfoundry.server"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+	<plugin
+		id="org.springframework.boot.ide.cloudfoundry.server"
+		download-size="0"
+		install-size="0"
+		version="0.0.0"
+		unpack="false">
+	</plugin>
 
 </feature>
diff --git a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/META-INF/MANIFEST.MF
index d442fc27e..2677abc67 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/META-INF/MANIFEST.MF
@@ -6,5 +6,10 @@ Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
  org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.lsp4e;bundle-version="0.1.0"
-Import-Package: org.osgi.framework
+ org.eclipse.lsp4e;bundle-version="0.1.0",
+ org.eclipse.ui.genericeditor;bundle-version="1.0.0",
+ org.eclipse.jface.text;bundle-version="3.11.100",
+ org.eclipse.jdt.ui;bundle-version="3.13.0",
+ org.dadacoalition.yedit;bundle-version="1.0.18"
+Import-Package: org.eclipse.jface.preference,
+ org.osgi.framework
diff --git a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/plugin.xml b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/plugin.xml
index 2f17eb347..1d912b315 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/plugin.xml
+++ b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/plugin.xml
@@ -2,6 +2,37 @@
 <?eclipse version="3.4"?>
 <plugin>
 
+   <extension
+         point="org.eclipse.core.contenttype.contentTypes">
+      <content-type
+            base-type="org.eclipse.core.runtime.text"
+            default-charset="UTF-8"
+            id="org.springframework.boot.ide.manifest.yml"
+            name="Cloudfoundry Manifest"
+            priority="high">
+      </content-type>
+      <file-association
+            content-type="org.springframework.boot.ide.manifest.yml"
+            file-names="manifest.yml">
+      </file-association>
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.editors">
+      <editorContentTypeBinding
+            contentTypeId="org.springframework.boot.ide.manifest.yml"
+            editorId="org.eclipse.ui.genericeditor.GenericEditor">
+      </editorContentTypeBinding>
+   </extension>
+
+   <extension
+         point="org.eclipse.ui.genericeditor.presentationReconcilers">
+      <presentationReconciler
+            class="org.springframework.boot.ide.cloudfoundry.server.CloudFoundryYMLPresentationReconciler"
+            contentType="org.springframework.boot.ide.manifest.yml">
+      </presentationReconciler>
+   </extension>
+
    <extension
          point="org.eclipse.lsp4e.languageServer">
       <server
diff --git a/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryYMLPresentationReconciler.java b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryYMLPresentationReconciler.java
new file mode 100644
index 000000000..b6e0fb6c6
--- /dev/null
+++ b/eclipse-language-servers/org.springframework.boot.ide.cloudfoundry.server/src/org/springframework/boot/ide/cloudfoundry/server/CloudFoundryYMLPresentationReconciler.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Pivotal, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Pivotal, Inc. - initial API and implementation
+ *******************************************************************************/
+package org.springframework.boot.ide.cloudfoundry.server;
+
+import org.dadacoalition.yedit.editor.ColorManager;
+import org.dadacoalition.yedit.editor.YEditDamageRepairer;
+import org.dadacoalition.yedit.editor.scanner.YAMLScanner;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.presentation.PresentationReconciler;
+import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
+import org.eclipse.jface.text.rules.ITokenScanner;
+
+/**
+ * @author Martin Lippert
+ */
+public class CloudFoundryYMLPresentationReconciler extends PresentationReconciler {
+	
+	public CloudFoundryYMLPresentationReconciler() {
+		
+		ColorManager colorManager = new ColorManager();
+		ITokenScanner yamlScanner = new YAMLScanner( colorManager );
+		DefaultDamagerRepairer dr = new YEditDamageRepairer(yamlScanner);
+
+		this.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
+		this.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);			
+	}
+
+}
diff --git a/eclipse-language-servers/org.springframework.boot.ide.properties.servers.feature/feature.xml b/eclipse-language-servers/org.springframework.boot.ide.properties.servers.feature/feature.xml
index 0bb23464f..291e4be72 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.properties.servers.feature/feature.xml
+++ b/eclipse-language-servers/org.springframework.boot.ide.properties.servers.feature/feature.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.springframework.boot.ide.properties.servers.feature"
-      label="Spring Boot IDE Property Editing Language Server Feature"
-      version="4.0.0.qualifier"
-      provider-name="Pivotal, Inc.">
+	id="org.springframework.boot.ide.properties.servers.feature"
+	label="Spring Boot IDE Property Editing Language Server Feature"
+	version="4.0.0.qualifier"
+	provider-name="Pivotal, Inc.">
 
-   <requires>
-      <import plugin="org.eclipse.lsp4e"/>
-   </requires>
+	<requires>
+		<import plugin="org.eclipse.ui.genericeditor"/>
+		<import plugin="org.eclipse.lsp4e"/>
+	</requires>
 
-   <plugin
-         id="org.springframework.boot.ide.properties.servers"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+	<plugin
+		id="org.springframework.boot.ide.properties.servers"
+		download-size="0"
+		install-size="0"
+		version="0.0.0"
+		unpack="false">
+	</plugin>
 
 </feature>
diff --git a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/META-INF/MANIFEST.MF
index 64aa38349..5ddd9b338 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/META-INF/MANIFEST.MF
@@ -6,5 +6,10 @@ Bundle-Version: 4.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
  org.eclipse.core.runtime;bundle-version="3.12.0",
- org.eclipse.lsp4e;bundle-version="0.1.0"
-Import-Package: org.osgi.framework
+ org.eclipse.lsp4e;bundle-version="0.1.0",
+ org.eclipse.ui.genericeditor;bundle-version="1.0.0",
+ org.eclipse.jface.text;bundle-version="3.11.100",
+ org.eclipse.jdt.ui;bundle-version="3.13.0",
+ org.dadacoalition.yedit;bundle-version="1.0.18"
+Import-Package: org.eclipse.jface.preference,
+ org.osgi.framework
diff --git a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/plugin.xml b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/plugin.xml
index ea0dc52f9..145e65fe9 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.properties.servers/plugin.xml
+++ b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/plugin.xml
@@ -2,6 +2,68 @@
 <?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.application.properties"
+            name="Spring Properties File"
+            priority="high">
+      </content-type>
+      <file-association
+            content-type="org.springframework.boot.ide.properties.application.properties"
+            file-names="application.properties,application-dev.properties">
+      </file-association>
+   </extension>
+   
+   <extension
+         point="org.eclipse.core.contenttype.contentTypes">
+      <content-type
+            base-type="org.eclipse.core.runtime.text"
+            default-charset="UTF-8"
+            id="org.springframework.boot.ide.properties.application.yml"
+            name="Spring Yaml Properties File"
+            priority="high">
+      </content-type>
+      <file-association
+            content-type="org.springframework.boot.ide.properties.application.yml"
+            file-names="application.yml,bootstrap.yml,application-dev.yml">
+      </file-association>
+   </extension>
+
+   <extension
+         point="org.eclipse.ui.editors">
+      <editorContentTypeBinding
+            contentTypeId="org.springframework.boot.ide.properties.application.properties"
+            editorId="org.eclipse.ui.genericeditor.GenericEditor">
+      </editorContentTypeBinding>
+   </extension>
+
+   <extension
+         point="org.eclipse.ui.editors">
+      <editorContentTypeBinding
+            contentTypeId="org.springframework.boot.ide.properties.application.yml"
+            editorId="org.eclipse.ui.genericeditor.GenericEditor">
+      </editorContentTypeBinding>
+   </extension>
+
+   <extension
+         point="org.eclipse.ui.genericeditor.presentationReconcilers">
+      <presentationReconciler
+            class="org.springframework.boot.ide.properties.servers.SpringPropertiesPresentationReconciler"
+            contentType="org.springframework.boot.ide.properties.application.properties">
+      </presentationReconciler>
+   </extension>
+
+   <extension
+         point="org.eclipse.ui.genericeditor.presentationReconcilers">
+      <presentationReconciler
+            class="org.springframework.boot.ide.properties.servers.SpringYMLPresentationReconciler"
+            contentType="org.springframework.boot.ide.properties.application.yml">
+      </presentationReconciler>
+   </extension>
+
    <extension
          point="org.eclipse.lsp4e.languageServer">
       <server
diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/src/org/springframework/boot/ide/properties/editors/SpringPropertiesPresentationReconciler.java b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/src/org/springframework/boot/ide/properties/servers/SpringPropertiesPresentationReconciler.java
similarity index 97%
rename from eclipse-extensions/org.springframework.boot.ide.properties.editors/src/org/springframework/boot/ide/properties/editors/SpringPropertiesPresentationReconciler.java
rename to eclipse-language-servers/org.springframework.boot.ide.properties.servers/src/org/springframework/boot/ide/properties/servers/SpringPropertiesPresentationReconciler.java
index 4f74da2c4..6cfdffd15 100644
--- a/eclipse-extensions/org.springframework.boot.ide.properties.editors/src/org/springframework/boot/ide/properties/editors/SpringPropertiesPresentationReconciler.java
+++ b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/src/org/springframework/boot/ide/properties/servers/SpringPropertiesPresentationReconciler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Pivotal, Inc. - initial API and implementation
  *******************************************************************************/
-package org.springframework.boot.ide.properties.editors;
+package org.springframework.boot.ide.properties.servers;
 
 import org.eclipse.jdt.internal.ui.JavaPlugin;
 import org.eclipse.jdt.internal.ui.propertiesfileeditor.IPropertiesFilePartitions;
diff --git a/eclipse-extensions/org.springframework.boot.ide.properties.editors/src/org/springframework/boot/ide/properties/editors/SpringYMLPresentationReconciler.java b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/src/org/springframework/boot/ide/properties/servers/SpringYMLPresentationReconciler.java
similarity index 96%
rename from eclipse-extensions/org.springframework.boot.ide.properties.editors/src/org/springframework/boot/ide/properties/editors/SpringYMLPresentationReconciler.java
rename to eclipse-language-servers/org.springframework.boot.ide.properties.servers/src/org/springframework/boot/ide/properties/servers/SpringYMLPresentationReconciler.java
index c4d8729f0..1cbeb07ed 100644
--- a/eclipse-extensions/org.springframework.boot.ide.properties.editors/src/org/springframework/boot/ide/properties/editors/SpringYMLPresentationReconciler.java
+++ b/eclipse-language-servers/org.springframework.boot.ide.properties.servers/src/org/springframework/boot/ide/properties/servers/SpringYMLPresentationReconciler.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Pivotal, Inc. - initial API and implementation
  *******************************************************************************/
-package org.springframework.boot.ide.properties.editors;
+package org.springframework.boot.ide.properties.servers;
 
 import org.dadacoalition.yedit.editor.ColorManager;
 import org.dadacoalition.yedit.editor.YEditDamageRepairer;
diff --git a/eclipse-language-servers/org.springframework.boot.ide.servers.repository/category.xml b/eclipse-language-servers/org.springframework.boot.ide.servers.repository/category.xml
index df0cbd386..f8c478b4a 100644
--- a/eclipse-language-servers/org.springframework.boot.ide.servers.repository/category.xml
+++ b/eclipse-language-servers/org.springframework.boot.ide.servers.repository/category.xml
@@ -16,4 +16,8 @@
      <category name="deps"/>
    </bundle>
 
+   <bundle id="org.dadacoalition.yedit">
+     <category name="deps"/>
+   </bundle>
+
 </site>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index c0248d776..a0719cc49 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -91,6 +91,11 @@
 					<layout>p2</layout>
 					<url>http://download.eclipse.org/lsp4e/snapshots/</url>
 				</repository>
+				<repository>
+					<id>yedit</id>
+					<layout>p2</layout>
+					<url>http://dist.springsource.com/release/TOOLS/third-party/yedit</url>
+				</repository>
 			</repositories>
 		</profile>