diff --git a/.prettierrc.js b/.prettierrc.js
index b28ecb7..542614c 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -3,9 +3,16 @@ module.exports = {
   bracketSameLine: true,
   singleQuote: true,
   jsxSingleQuote: true,
-  trailingComma: "es5",
+  trailingComma: 'es5',
   semi: true,
   printWidth: 110,
-  arrowParens: "always",
-  importOrderSeparation: true,
+  arrowParens: 'always',
+  overrides: [
+    {
+      files: ['tsconfig.json', 'jsconfig.json'],
+      options: {
+        parser: 'jsonc',
+      },
+    },
+  ],
 };
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index cac0e10..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "editor.formatOnSave": true
-}
\ No newline at end of file
diff --git a/app.json b/app.json
index 5dfa4f4..1501d69 100644
--- a/app.json
+++ b/app.json
@@ -3,15 +3,7 @@
   "description": "Mock SAML is a free SAML 2.0 Identity Provider for testing SAML SSO integrations.",
   "repository": "https://github.com/boxyhq/mock-saml",
   "logo": "https://boxyhq.com/img/logo.png",
-  "keywords": [
-    "saml",
-    "saml2",
-    "saml-idp",
-    "mock-saml-idp",
-    "test-saml",
-    "saml-testing",
-    "fake-saml-idp"
-  ],
+  "keywords": ["saml", "saml2", "saml-idp", "mock-saml-idp", "test-saml", "saml-testing", "fake-saml-idp"],
   "env": {
     "APP_URL": {
       "description": "Public root URL of the Mock SAML installation. Replace <HEROKU_APP_NAME> with 'App name' from above.",
@@ -33,4 +25,4 @@
     }
   },
   "success_url": "/"
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index b42388a..52dcd36 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,8 @@
     "build": "next build",
     "start": "next start -p 4000",
     "lint": "next lint",
+    "check-format": "prettier --check .",
+    "format": "prettier --write .",
     "release": "git checkout release && git merge origin/main && release-it && git checkout main && git merge origin/release && git push origin main"
   },
   "dependencies": {
diff --git a/postcss.config.js b/postcss.config.js
index 33ad091..12a703d 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -3,4 +3,4 @@ module.exports = {
     tailwindcss: {},
     autoprefixer: {},
   },
-}
+};
diff --git a/tsconfig.json b/tsconfig.json
index cdde52e..563b596 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,8 +14,8 @@
     "isolatedModules": true,
     "jsx": "preserve",
     "incremental": true,
-    "baseUrl": "."
+    "baseUrl": ".",
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules"],
 }