diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index c6e3992..0000000
--- a/.editorconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = lf
-indent_style = space
-indent_size = 2
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{py,sublime-project}]
-indent_size = 4
-
-[*.md]
-trim_trailing_whitespace = false
-indent_size = 4
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 73469f8..5d257d7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,29 @@
 {
-  "vsicons.presets.angular": false,
+  "editor.tabSize": 2,
+  "editor.insertSpaces": true,
+  "files.exclude": {
+    "**/.git": true,
+    "**/.svn": true,
+    "**/.hg": true,
+    "**/CVS": true,
+    "**/.DS_Store": true,
+    "node_modules": true,
+    "**/*.js": {
+      "when": "$(basename).ts"
+    }
+  },
   "files.associations": {
     "*.template": "json"
+  },
+  "html.format.preserveNewLines": true,
+  "files.trimTrailingWhitespace": true,
+  "[python]": {
+    "editor.tabSize": 4
+  },
+  "[markdown]": {
+    "diffEditor.ignoreTrimWhitespace": false,
+    "editor.tabSize": 4,
+    "editor.wordWrap": "on",
+    "editor.quickSuggestions": false
   }
 }
\ No newline at end of file