diff --git a/.editorconfig b/.editorconfig
index da39e359..d11a440d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,8 +1,12 @@
-# editorconfig.org
+# https://editorconfig.org/
 root = true
 
 [*]
-indent_style = tab
-indent_size = 4
-end_of_line = lf
 charset = utf-8
+end_of_line = lf
+indent_style = tab
+trim_trailing_whitespace = true
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
diff --git a/README.md b/README.md
index 4d63f2e6..e8719df8 100644
--- a/README.md
+++ b/README.md
@@ -6,17 +6,17 @@ Language server for Odin. This project is still in early development.
 
 ## Table Of Contents
 
--   [Installation](#installation)
-    -   [Configuration](#Configuration)
--   [Features](#features)
--   [Clients](#clients)
-    -   [Vs Code](#vs-code)
-    -   [Sublime](#sublime)
-    -   [Vim](#vim)
-    -   [Neovim](#neovim)
-    -   [Emacs](#emacs)
-    -   [Helix](#helix)
-    -   [Micro](#micro)
+- [Installation](#installation)
+  - [Configuration](#Configuration)
+- [Features](#features)
+- [Clients](#clients)
+  - [Vs Code](#vs-code)
+  - [Sublime](#sublime)
+  - [Vim](#vim)
+  - [Neovim](#neovim)
+  - [Emacs](#emacs)
+  - [Helix](#helix)
+  - [Micro](#micro)
 
 ## Installation
 
@@ -34,11 +34,10 @@ cd ols
 
 In order for the language server to index your files, it must know about your collections.
 
-To do that you can either configure ols via an ``ols.json`` file (it should be located at the root of your workspace).
+To do that you can either configure ols via an `ols.json` file (it should be located at the root of your workspace).
 
 Or you can provide the configuration via your editor of choice.
 
-
 Example of `ols.json`:
 
 ```json
@@ -87,8 +86,7 @@ Example:
 {
 	"$schema": "https://raw.githubusercontent.com/DanielGavin/ols/master/misc/odinfmt.schema.json",
 	"character_width": 80,
-	"tabs": true,
-	"tabs_width": 4
+	"tabs": true
 }
 ```
 
@@ -110,12 +108,12 @@ Options:
 
 Support Language server features:
 
--   Completion
--   Go to definition
--   Semantic tokens(really unstable and unfinished)
--   Document symbols
--   Signature help
--   Hover
+- Completion
+- Go to definition
+- Semantic tokens(really unstable and unfinished)
+- Document symbols
+- Signature help
+- Hover
 
 ## Clients
 
diff --git a/odinfmt.json b/odinfmt.json
index d9f6c509..241f04e1 100644
--- a/odinfmt.json
+++ b/odinfmt.json
@@ -1,5 +1,4 @@
 {
 	"character_width": 80,
-	"tabs": true,
-	"tabs_width": 4
-}
\ No newline at end of file
+	"tabs": true
+}