diff --git a/.prettierrc b/.prettierrc
index c3ff9895fd..12a9f62263 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,5 +1,5 @@
 {
-  "printWidth": 80,
+  "printWidth": 120,
   "tabWidth": 2,
   "singleQuote": true,
   "trailingComma": "none",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ea936d6990..b19f85b201 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -11,9 +11,6 @@
     "**/out": true
   },
   "typescript.tsdk": "./node_modules/typescript/lib",
-  "editor.tabSize": 2,
-  "editor.formatOnSave": true,
-  "rewrap.wrappingColumn": 80,
   "eslint.workingDirectories": [
     "./packages/salesforcedx-apex-replay-debugger",
     "./packages/salesforcedx-vscode-visualforce",
@@ -34,5 +31,25 @@
     "./packages/salesforcedx-vscode-lightning",
     "./packages/salesforcedx-sobjects-faux-generator"
   ],
-  "files.insertFinalNewline": true
+  "editor.tabSize": 2,
+  "editor.insertSpaces": true,
+  "editor.detectIndentation": true,
+  "files.trimTrailingWhitespace": true,
+  "files.insertFinalNewline": true,
+  "files.trimFinalNewlines": true,
+  "editor.formatOnSave": true,
+  "eslint.enable": true,
+  "eslint.run": "onSave",
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "always"
+  },
+  "prettier.singleQuote": true,
+  "prettier.trailingComma": "none",
+  "prettier.tabWidth": 2,
+  "prettier.useTabs": false,
+  "prettier.printWidth": 120,
+  "prettier.arrowParens": "avoid",
+  "editor.rulers": [
+    120
+  ]
 }