diff --git a/EditorConfig.sublime-syntax b/EditorConfig.sublime-syntax
deleted file mode 100644
index 5d5238b..0000000
--- a/EditorConfig.sublime-syntax
+++ /dev/null
@@ -1,87 +0,0 @@
-%YAML 1.2
----
-# https://www.sublimetext.com/docs/syntax.html
-# https://editorconfig-specification.readthedocs.io/#file-format
-name: EditorConfig
-scope: source.ini.editorconfig
-
-file_extensions:
-  - .editorconfig
-
-contexts:
-  main:
-    - include: Packages/INI/INI.sublime-syntax#comment
-    - include: section
-    - include: mapping
-
-  section:
-    - match: \[
-      scope: meta.section.ini punctuation.definition.section.begin.ini
-      push:
-        - meta_content_scope: meta.section.ini entity.name.section.ini
-        - match: \]
-          scope: meta.section.ini punctuation.definition.section.end.ini
-          pop: true
-        - match: \\\S
-          scope: constant.character.escape.ini
-        - match: /
-          scope: punctuation.separator.slash.ini
-        - include: glob-expression
-        - include: eol-pop
-
-  # https://editorconfig-specification.readthedocs.io/#glob-expressions
-  glob-expression:
-    - match: '[*?]'
-      scope: constant.character.wildcard.ini
-    - match: (\[)(!)?\w+(\])
-      scope: meta.set.ini
-      captures:
-        1: punctuation.section.brackets.begin.ini
-        2: keyword.operator.logical.ini
-        3: punctuation.section.brackets.end.ini
-    - match: \{
-      scope: punctuation.section.braces.begin.ini
-      push:
-        - meta_scope: meta.set.ini
-        - match: \}
-          scope: punctuation.section.braces.end.ini
-          pop: true
-        - match: \,
-          scope: punctuation.separator.sequence.ini
-        - match: \.\.
-          scope: punctuation.separator.range.ini
-        - include: eol-pop
-
-  # https://editorconfig-specification.readthedocs.io/#supported-pairs
-  mapping:
-    - match: (?=\S)
-      push:
-        - meta_content_scope: meta.mapping.key.ini
-        - match: (?=\s*=)
-          set:
-            - - meta_content_scope: meta.mapping.ini
-              - match: (?=\S)
-                set:
-                  - Packages/INI/INI.sublime-syntax#mapping-value-meta
-                  - mapping-value
-              - include: eol-pop
-            - - match: =
-                scope: punctuation.separator.key-value.ini
-                pop: true
-        - match: \b(?:indent_style|indent_size|tab_width|end_of_line|charset|trim_trailing_whitespace|insert_final_newline|root)\b
-          scope: variable.language.ini
-        - include: Packages/INI/INI.sublime-syntax#string
-        - include: eol-pop
-
-  mapping-value:
-    - match: \b(?i:tab|space|lf|cr(?:lf)?|latin1|utf-8(?:-bom)?|utf-16[bl]e)\b
-      scope: support.constant.ini
-    - match: \b(?i:true|false)\b
-      scope: constant.language.ini
-    - include: Packages/INI/INI.sublime-syntax#number
-    - include: Packages/INI/INI.sublime-syntax#string
-    - include: eol-pop
-
-  eol-pop:
-    - match: $|(?=\s+[;#])
-      pop: true
diff --git a/EditorConfigKeys.sublime-completions b/EditorConfigKeys.sublime-completions
deleted file mode 100644
index f3e01d3..0000000
--- a/EditorConfigKeys.sublime-completions
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "scope": "source.ini.editorconfig meta.mapping.key",
-    "completions":
-    [
-        { "trigger": "indent_style\tkey", "contents": "indent_style = ${0:tab}", "kind": ["snippet", "k", "Key"] },
-        { "trigger": "indent_size\tkey", "contents": "indent_size = ${0:4}", "kind": ["snippet", "k", "Key"] },
-        { "trigger": "tab_width\tkey", "contents": "tab_width = ${0:4}", "kind": ["snippet", "k", "Key"] },
-        { "trigger": "end_of_line\tkey", "contents": "end_of_line = ${0:lf}", "kind": ["snippet", "k", "Key"] },
-        { "trigger": "charset\tkey", "contents": "charset = ${0:utf-8}", "kind": ["snippet", "k", "Key"] },
-        { "trigger": "trim_trailing_whitespace\tkey", "contents": "trim_trailing_whitespace = ${0:true}", "kind": ["snippet", "k", "Key"] },
-        { "trigger": "insert_final_newline\tkey", "contents": "insert_final_newline = ${0:true}", "kind": ["snippet", "k", "Key"] },
-        { "trigger": "root\tkey", "contents": "root = ${0:true}", "kind": ["snippet", "k", "Key"] }
-    ]
-}
diff --git a/EditorConfigValues.sublime-completions b/EditorConfigValues.sublime-completions
deleted file mode 100644
index 6358bf4..0000000
--- a/EditorConfigValues.sublime-completions
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "scope": "source.ini.editorconfig meta.mapping.value",
-    "completions":
-    [
-        { "trigger": "true\tvalue", "contents": "true", "kind": ["variable", "v", "Value"] },
-        { "trigger": "false\tvalue", "contents": "false", "kind": ["variable", "v", "Value"] },
-        { "trigger": "tab\tvalue", "contents": "tab", "kind": ["variable", "v", "Value"] },
-        { "trigger": "space\tvalue", "contents": "space", "kind": ["variable", "v", "Value"] },
-        { "trigger": "lf\tvalue", "contents": "lf", "kind": ["variable", "v", "Value"] },
-        { "trigger": "cr\tvalue", "contents": "cr", "kind": ["variable", "v", "Value"] },
-        { "trigger": "crlf\tvalue", "contents": "crlf", "kind": ["variable", "v", "Value"] },
-        { "trigger": "latin1\tvalue", "contents": "latin1", "kind": ["variable", "v", "Value"] },
-        { "trigger": "utf-8\tvalue", "contents": "utf-8", "kind": ["variable", "v", "Value"] },
-        { "trigger": "utf-8-bom\tvalue", "contents": "utf-8-bom", "kind": ["variable", "v", "Value"] },
-        { "trigger": "utf-16be\tvalue", "contents": "utf-16be", "kind": ["variable", "v", "Value"] },
-        { "trigger": "utf-16le\tvalue", "contents": "utf-16le", "kind": ["variable", "v", "Value"] }
-    ]
-}
diff --git a/INI.sublime-syntax b/INI.sublime-syntax
index 3053a2e..34b63d2 100644
--- a/INI.sublime-syntax
+++ b/INI.sublime-syntax
@@ -23,6 +23,7 @@ hidden_file_extensions:
   - vlcrc
   - .buckconfig
   - .coveragerc
+  - .editorconfig
   - .flake8
   - .flowconfig
   - .hgrc