diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..1014ba78
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 00000000..4ca62dee
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,3 @@
+src/renderer/apple-hls*
+build/*
+src/renderer/lib/*
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 00000000..d2fc8cf6
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1 @@
+bracketSameLine: true
diff --git a/package.json b/package.json
index e287f02f..647a7e4a 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "msft": "yarn build && electron-builder -c msft-package.json",
     "mstest": "yarn build && electron-builder -c msft-test.json",
     "postinstall": "electron-builder install-app-deps",
-    "circle:script": "node resources/circle"
+    "prettier": "npx prettier --write '**/*.{js,json,ts}'"
   },
   "dependencies": {
     "@sentry/electron": "^3.0.7",