diff --git a/.editorconfig b/.editorconfig
index ebe51d3bf..61451791d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,4 +9,7 @@ indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = false
-insert_final_newline = false
\ No newline at end of file
+insert_final_newline = false
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.prettierignore b/.prettierignore
index 6fd9eace2..0028aeb88 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,2 +1,6 @@
 *.min.*
 docker-compose.yml
+dist
+node_modules
+coverage
+build
\ No newline at end of file
diff --git a/.prettierrc b/.prettierrc
index 4a5248993..5b3a50abb 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,23 +1,18 @@
 {
-  "trailingComma": "es5",
-  "tabWidth": 2,
+  "arrowParens": "avoid",
+  "bracketSpacing": true,
+  "htmlWhitespaceSensitivity": "strict",
+  "insertPragma": false,
+  "jsxBracketSameLine": false,
+  "jsxSingleQuote": false,
+  "printWidth": 120,
+  "proseWrap": "preserve",
+  "quoteProps": "as-needed",
+  "requirePragma": false,
   "semi": true,
   "singleQuote": true,
-  "printWidth": 80,
-  "jsxBracketSameLine": true,
-  "arrowParens": "always",
-  "overrides": [
-    {
-      "files": ["**/*.html"],
-      "options": {
-        "printWidth": 320
-      }
-    },
-    {
-      "files": ["**/langs/**/*.js"],
-      "options": {
-        "printWidth": 320
-      }
-    }
-  ]
+  "tabWidth": 2,
+  "trailingComma": "all",
+  "useTabs": false,
+  "overrides": []
 }
diff --git a/.prettierrc.json b/.prettierrc.json
deleted file mode 100644
index 142763c2f..000000000
--- a/.prettierrc.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "arrowParens": "avoid",
-  "bracketSpacing": true,
-  "htmlWhitespaceSensitivity": "css",
-  "insertPragma": false,
-  "jsxBracketSameLine": false,
-  "jsxSingleQuote": false,
-  "printWidth": 100,
-  "proseWrap": "preserve",
-  "quoteProps": "as-needed",
-  "requirePragma": false,
-  "semi": false,
-  "singleQuote": true,
-  "tabWidth": 2,
-  "trailingComma": "all",
-  "useTabs": false
-}
\ No newline at end of file