diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
index 53fee3daf..fd966763d 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
@@ -10,6 +10,8 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.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.eclipse.tm4e.core;bundle-version="0.1.0",
+ org.eclipse.tm4e.ui;bundle-version="0.1.0",
  org.eclipse.lsp4e;bundle-version="0.5.0",
  org.eclipse.lsp4j;bundle-version="0.4.0",
  org.eclipse.lsp4j.jsonrpc;bundle-version="0.4.0",
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
index 8a21cf74a..ddfa01d79 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
@@ -16,11 +16,13 @@
       </contentTypeMapping>
       <contentTypeMapping
             contentType="org.springframework.boot.ide.properties.application.properties"
-            id="org.eclipse.languageserver.languages.springboot">
+            id="org.eclipse.languageserver.languages.springboot"
+            languageId="spring-boot-properties">
       </contentTypeMapping>
       <contentTypeMapping
             contentType="org.springframework.boot.ide.properties.application.yml"
-            id="org.eclipse.languageserver.languages.springboot">
+            id="org.eclipse.languageserver.languages.springboot"
+            languageId="spring-boot-properties-yaml">
       </contentTypeMapping>
    </extension>
    
@@ -98,7 +100,7 @@
       </initializer>
    </extension>
    
-      <extension
+   <extension
          point="org.eclipse.ui.editors">
       <editorContentTypeBinding
             contentTypeId="org.springframework.boot.ide.properties.application.properties"