diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..5179009b3
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[html]
+indent_size = 2
diff --git a/.vscode/settings.json b/.vscode/settings.json
index caeacfe05..9bbdc984c 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -6,6 +6,6 @@
   },
   "cSpell.words": [
     "SAML",
-    "pyazo"
+    "passbook"
   ]
-}
\ No newline at end of file
+}