diff --git a/atom-extensions/atom-spring-boot/.travis.yml b/atom-extensions/atom-spring-boot/.travis.yml
new file mode 100644
index 000000000..b7f7d0e84
--- /dev/null
+++ b/atom-extensions/atom-spring-boot/.travis.yml
@@ -0,0 +1,15 @@
+language: objective-c
+
+notifications:
+  email:
+    on_success: never
+    on_failure: change
+
+script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh'
+
+git:
+  depth: 10
+
+branches:
+  only:
+    - master
\ No newline at end of file
diff --git a/atom-extensions/atom-spring-boot/appveyor.yml b/atom-extensions/atom-spring-boot/appveyor.yml
new file mode 100644
index 000000000..9fa4278db
--- /dev/null
+++ b/atom-extensions/atom-spring-boot/appveyor.yml
@@ -0,0 +1,27 @@
+version: "{build}"
+
+platform: x64
+
+branches:
+    only:
+      - master
+
+clone_depth: 10
+
+skip_tags: true
+
+environment:
+  APM_TEST_PACKAGES:
+
+  matrix:
+  - ATOM_CHANNEL: stable
+  - ATOM_CHANNEL: beta
+
+install:
+  - ps: Install-Product node 6
+
+build_script:
+  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/atom/ci/master/build-package.ps1'))
+
+test: off
+deploy: off
\ No newline at end of file
diff --git a/atom-extensions/atom-spring-boot/coffeelint.json b/atom-extensions/atom-spring-boot/coffeelint.json
new file mode 100644
index 000000000..d6c3236aa
--- /dev/null
+++ b/atom-extensions/atom-spring-boot/coffeelint.json
@@ -0,0 +1,37 @@
+{
+  "max_line_length": {
+    "level": "ignore"
+  },
+  "no_empty_param_list": {
+    "level": "error"
+  },
+  "arrow_spacing": {
+    "level": "error"
+  },
+  "no_interpolation_in_single_quotes": {
+    "level": "error"
+  },
+  "no_debugger": {
+    "level": "error"
+  },
+  "prefer_english_operator": {
+    "level": "error"
+  },
+  "colon_assignment_spacing": {
+    "spacing": {
+      "left": 0,
+      "right": 1
+    },
+    "level": "error"
+  },
+  "braces_spacing": {
+    "spaces": 0,
+    "level": "error"
+  },
+  "spacing_after_comma": {
+    "level": "error"
+  },
+  "no_stand_alone_at": {
+    "level": "error"
+  }
+}
\ No newline at end of file
diff --git a/atom-extensions/atom-spring-boot/grammars/boot-properties-yaml.cson b/atom-extensions/atom-spring-boot/grammars/boot-properties-yaml.cson
new file mode 100644
index 000000000..f4bbd68c0
--- /dev/null
+++ b/atom-extensions/atom-spring-boot/grammars/boot-properties-yaml.cson
@@ -0,0 +1,8 @@
+'scopeName': 'source.boot-properties-yaml'
+'name': 'Spring-Boot-Properties-YAML'
+'fileTypes': [
+  'application.yml'
+]
+'patterns': [
+  { 'include': 'source.yaml' }
+]
\ No newline at end of file
diff --git a/atom-extensions/atom-spring-boot/grammars/boot-properties.cson b/atom-extensions/atom-spring-boot/grammars/boot-properties.cson
new file mode 100644
index 000000000..18b873b83
--- /dev/null
+++ b/atom-extensions/atom-spring-boot/grammars/boot-properties.cson
@@ -0,0 +1,8 @@
+'scopeName': 'source.boot-properties'
+'name': 'Spring-Boot-Properties'
+'fileTypes': [
+  'application.properties'
+]
+'patterns': [
+  { 'include': 'source.java-properties' }
+]
diff --git a/atom-extensions/atom-spring-boot/lib/main.js b/atom-extensions/atom-spring-boot/lib/main.js
index aebf3dfed..be9e2527d 100644
--- a/atom-extensions/atom-spring-boot/lib/main.js
+++ b/atom-extensions/atom-spring-boot/lib/main.js
@@ -28,7 +28,7 @@ class SpringBootLanguageClient extends JavaProcessLanguageClient {
     }
 
     getGrammarScopes() {
-        return ['source.java'];
+        return ['source.java', 'source.boot-properties', 'source.boot-properties-yaml'];
     }
 
     getLanguageName() {
@@ -41,7 +41,7 @@ class SpringBootLanguageClient extends JavaProcessLanguageClient {
 
     activate() {
         require('atom-package-deps')
-            .install('boot-java')
+            .install('spring-boot')
             .then(() => console.debug('All dependencies installed, good to go'));
         super.activate();
     }
diff --git a/atom-extensions/atom-spring-boot/package.json b/atom-extensions/atom-spring-boot/package.json
index 28a6312ac..ac89ccd9e 100644
--- a/atom-extensions/atom-spring-boot/package.json
+++ b/atom-extensions/atom-spring-boot/package.json
@@ -10,6 +10,8 @@
     "atom": ">=1.21.0"
   },
   "files": [
+    "grammars/",
+    "settings/",
     "lib/",
     "server/",
     "styles/",
diff --git a/atom-extensions/atom-spring-boot/properties.json b/atom-extensions/atom-spring-boot/properties.json
index 0856b1e4d..83143d55e 100644
--- a/atom-extensions/atom-spring-boot/properties.json
+++ b/atom-extensions/atom-spring-boot/properties.json
@@ -1,3 +1,3 @@
 {
-    "jarUrl": "https://s3-us-west-1.amazonaws.com/s3-test.spring.io/sts4/fatjars/snapshots/boot-java-language-server-0.0.10-201711061741.jar"
+    "jarUrl": "https://s3-us-west-1.amazonaws.com/s3-test.spring.io/sts4/fatjars/snapshots/spring-boot-language-server-0.1.4-201802212000.jar"
 }
diff --git a/atom-extensions/atom-spring-boot/settings/language-boot-properties-yaml.cson b/atom-extensions/atom-spring-boot/settings/language-boot-properties-yaml.cson
new file mode 100644
index 000000000..fddef6740
--- /dev/null
+++ b/atom-extensions/atom-spring-boot/settings/language-boot-properties-yaml.cson
@@ -0,0 +1,8 @@
+'.source.boot-properties-yaml':
+  'editor':
+    'autoIndentOnPaste': false
+    'commentStart': '# '
+    'foldEndPattern': '^\\s*$|^\\s*\\}|^\\s*\\]|^\\s*\\)'
+    'increaseIndentPattern': '^\\s*.*(:|-) ?(&\\w+)?(\\{[^}"\']*|\\([^)"\']*)?$'
+    'decreaseIndentPattern': '^\\s+\\}$'
+'tabType': 'soft'
\ No newline at end of file