diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..ca023888
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,31 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+max_line_length = 127
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.java]
+indent_size = 4
+max_line_length = 100
+
+[*.py]
+indent_size = 2
+
+[*.gradle]
+indent_size = 4
+
+[*.html]
+indent_size = 2
+insert_final_newline = false
+trim_trailing_whitespace = false
+
+[*.js]
+indent_size = 2
+
+[*.yaml]
+insert_final_newline = false
+trim_trailing_whitespace = false
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 34f41eb4..8a2d7e4c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,76 +1,13 @@
 {
-  "java.compile.nullAnalysis.mode": "automatic",
-  "files.eol": "auto",
-  "java.configuration.updateBuildConfiguration": "interactive",
-  "black-formatter.args": [
-    "--line-length",
-    "127"
-  ],
-  "flake8.args": [
-    "--max-line-length",
-    "127"
-  ],
-  "[java]": {
-    "editor.tabSize": 4,
-    "editor.detectIndentation": false,
-    "editor.rulers": [
-      127
-    ],
-    "editor.defaultFormatter": "josevseb.google-java-format-for-vs-code"
-  },
-  "[python]": {
-    "editor.tabSize": 2,
-    "editor.detectIndentation": false,
-    "editor.rulers": [
-      127
-    ]
-  },
-  "[gradle-build]": {
-    "editor.tabSize": 4,
-    "editor.detectIndentation": false,
-    "editor.rulers": [
-      127
-    ]
-  },
-  "[gradle]": {
-    "editor.tabSize": 4,
-    "editor.detectIndentation": false,
-    "editor.rulers": [
-      127
-    ]
-  },
-  "[html]": {
-    "editor.tabSize": 2,
-    "editor.rulers": [
-      127
-    ],
-    "files.trimFinalNewlines": false,
-    "files.insertFinalNewline": false
-  },
-  "[javascript]": {
-    "editor.tabSize": 2,
-    "editor.rulers": [
-      127
-    ]
-  },
-  "[yaml]": {
-    "files.trimFinalNewlines": false,
-    "files.insertFinalNewline": false
-  },
-  "files.insertFinalNewline": true,
-  "files.trimFinalNewlines": true,
-  "files.trimTrailingWhitespace": true,
-  "files.autoSave": "onFocusChange",
-  "files.autoSaveWhenNoErrors": true,
-  "diffEditor.maxComputationTime": 0,
   "editor.wordSegmenterLocales": "",
   "editor.guides.bracketPairs": "active",
   "editor.guides.bracketPairsHorizontal": "active",
-  "editor.indentSize": "tabSize",
-  "editor.stickyScroll.enabled": false,
-  "editor.minimap.enabled": false,
-  "editor.formatOnSave": true,
-  "editor.insertSpaces": true,
+  "cSpell.enabled": false,
+  "[java]": {
+    "editor.defaultFormatter": "josevseb.google-java-format-for-vs-code"
+  },
+  "java.compile.nullAnalysis.mode": "automatic",
+  "java.configuration.updateBuildConfiguration": "interactive",
   "java.format.enabled": true,
   "java.format.settings.profile": "GoogleStyle",
   "java.format.settings.google.version": "1.25.2",
@@ -144,5 +81,4 @@
   "spring.initializr.defaultLanguage": "Java",
   "spring.initializr.defaultGroupId": "stirling.software.SPDF",
   "spring.initializr.defaultArtifactId": "SPDF",
-  "cSpell.enabled": false,
-}
+}
\ No newline at end of file