diff --git a/.editorconfig b/.editorconfig
index 8dfe89a4b842778f0f3b048fdb2b594fc247f4ea..fb962263021acb12f193d2151c7a033d54f53b0a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,26 +1,16 @@
-# editorconfig.org
-root=true
+root = true
 
 [*]
-charset=utf-8
-end_of_line=lf
-indent_size=4
-indent_style=space
-insert_final_newline=true
-tab_width=4
-trim_trailing_whitespace=true
-
-[*.{js,yml,json,ts}]
-indent_size=2
-tab_width=2
-
-[*.{js,yml,json,ts}.twig]
-indent_size=2
-tab_width=2
-
-[Makefile]
-indent_style=tab
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
 
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false
+
+[*.{json,yml}]
+indent_size = 2
diff --git a/.eslintrc.js b/.eslintrc.js
index e80a21fba01fcb6c95cc7b364043ddf7c168aaee..3dfa57723a5b7626addfc3190a46f66ae123120c 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,15 +1,14 @@
 module.exports = {
-  parser: "@typescript-eslint/parser",
-  parserOptions: {
-    ecmaVersion: 2020,
-    sourceType: "module",
-  },
-  extends: [
-    "plugin:@typescript-eslint/recommended",
-    "prettier/@typescript-eslint",
-    // Doit rester en dernier :
-    "plugin:prettier/recommended"
-  ],
-  rules: {
-  }
+    parser: '@typescript-eslint/parser',
+    parserOptions: {
+        ecmaVersion: 2018,
+        sourceType: 'module',
+    },
+    extends: [
+        'plugin:@typescript-eslint/recommended',
+        'prettier/@typescript-eslint',
+        // Doit rester en dernier :
+        'plugin:prettier/recommended',
+    ],
+    rules: {},
 };
diff --git a/.prettierrc.js b/.prettierrc.js
index 2c66e64e9b6b35ae5adf1683ca8363879f334d15..fa56f365aab81654bab2a99618fb6b49f1fe3b14 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -1,7 +1,5 @@
 module.exports = {
-  semi: true,
-  trailingComma: "all",
-  singleQuote: true,
-  printWidth: 120,
-  tabWidth: 4
+    semi: true,
+    trailingComma: 'all',
+    singleQuote: true,
 };
diff --git a/composer.json b/composer.json
index 7ae60469c7a51217b7d1cb102cc0482fec0dcdab..8b13e70141d326953a8b9afe3379561391af8999 100644
--- a/composer.json
+++ b/composer.json
@@ -87,10 +87,14 @@
     "test:generate": "@php tests/Fixtures/console ng-model:generate -o output >/dev/null"
   },
   "autoload": {
-        "psr-4": { "Irstea\\NgModelGeneratorBundle\\": "src/php/" }
+    "psr-4": {
+      "Irstea\\NgModelGeneratorBundle\\": "src/php/"
+    }
   },
   "autoload-dev": {
-        "psr-4": { "Irstea\\NgModelGeneratorBundle\\Tests\\": "tests/" }
+    "psr-4": {
+      "Irstea\\NgModelGeneratorBundle\\Tests\\": "tests/"
+    }
   },
   "config": {
     "sort-packages": true,