diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..0bd9d653
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,11 @@
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+trim_trailing_whitespace = true
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
diff --git a/.electron-vue/dev-runner.js b/.electron-vue/dev-runner.js
index f274a314..474e0934 100644
--- a/.electron-vue/dev-runner.js
+++ b/.electron-vue/dev-runner.js
@@ -73,7 +73,7 @@ function startRenderer () {
       }
     )
 
-    server.listen(9080)
+    server.listen(9091)
   })
 }
 
@@ -114,7 +114,12 @@ function startMain () {
 }
 
 function startElectron () {
-  electronProcess = spawn(electron, ['--inspect=5858', path.join(__dirname, '../dist/electron/main.js')])
+  electronProcess = spawn(electron, [
+    '--inspect=5861',
+    '--remote-debugging-port=8315',
+    '--nolazy',
+    path.join(__dirname, '../dist/electron/main.js')
+  ])
 
   electronProcess.stdout.on('data', data => {
     electronLog(data, 'blue')
diff --git a/.electron-vue/webpack.main.config.js b/.electron-vue/webpack.main.config.js
index e790f016..6907ed30 100644
--- a/.electron-vue/webpack.main.config.js
+++ b/.electron-vue/webpack.main.config.js
@@ -62,6 +62,11 @@ const mainConfig = {
   target: 'electron-main'
 }
 
+// Fix debugger breakpoints
+if (!proMode && process.env.MARKTEXT_BUILD_VSCODE_DEBUG) {
+  mainConfig.devtool = '#inline-source-map'
+}
+
 /**
  * Adjust mainConfig for development settings
  */
diff --git a/.electron-vue/webpack.renderer.config.js b/.electron-vue/webpack.renderer.config.js
index b4a9056b..d58652b1 100644
--- a/.electron-vue/webpack.renderer.config.js
+++ b/.electron-vue/webpack.renderer.config.js
@@ -191,6 +191,11 @@ if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test' &&
   )
 }
 
+// Fix debugger breakpoints
+if (!proMode && process.env.MARKTEXT_BUILD_VSCODE_DEBUG) {
+  rendererConfig.devtool = '#inline-source-map'
+}
+
 /**
  * Adjust rendererConfig for production settings
  */
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 71e2acba..e9c6d961 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,35 +1,49 @@
 {
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
     {
       "type": "node",
       "request": "launch",
-      "name": "Marktext: Main",
+      "name": "Launch Mark Text",
       "program": "${workspaceFolder}/.electron-vue/dev-runner.js",
-      "windows": {
-        "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
-      }
+      "env": {
+        "NODE_ENV": "development",
+        "MARKTEXT_BUILD_VSCODE_DEBUG": "1"
+      },
+      "outFiles": [
+        "${workspaceFolder}/dist/electron/main.js"
+      ]
     },
     {
-      "name": "Marktext: Renderer",
+      "type": "node",
+      "request": "attach",
+      "name": "Attach to Main Process",
+      "port": 5861,
+      "timeout": 60000,
+      "sourceMaps": true,
+      "outFiles": [
+        "${workspaceFolder}/dist/electron/main.js"
+      ]
+    },
+    {
+      "name": "Attach to Renderer Process",
       "type": "chrome",
       "request": "attach",
       "port": 8315,
+      "sourceMaps": true,
       "webRoot": "${workspaceFolder}/src",
-      "timeout": 30000,
-      "urlFilter": "localhost:*"
+      "timeout": 60000,
+      "urlFilter": "http://localhost:9091"
     }
   ],
   "compounds": [
     {
-      "name": "Marktext: All",
+      "name": "Debug Mark Text",
       "configurations": [
-        "Marktext: Main",
-        "Marktext: Renderer"
+        "Launch Mark Text",
+        "Attach to Main Process",
+        "Attach to Renderer Process"
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100755
index 00000000..d35f1bbd
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,20 @@
+{
+  "editor.insertSpaces": true,
+  "editor.tabSize": 2,
+  "editor.trimAutoWhitespace": true,
+  "files.eol": "\n",
+  "files.insertFinalNewline": true,
+
+  "search.exclude": {
+    "**/.git": true,
+    "**/build": true,
+    "**/node_modules": true,
+    "**/dist": true
+  },
+  "files.watcherExclude": {
+    "**/.git": true,
+    "**/build": true,
+    "**/node_modules": true,
+    "**/dist": true
+  }
+}
diff --git a/doc/DEBUGGING.md b/doc/DEBUGGING.md
new file mode 100755
index 00000000..ea87c06f
--- /dev/null
+++ b/doc/DEBUGGING.md
@@ -0,0 +1,13 @@
+# Debugging
+
+## Using Visual Studio Code
+
+The most simplest way is to debug using the `Debug Mark Text` configuration. You can set breakpoints and use the `debugger` statement.
+
+**Prerequisites:**
+
+- [Debugger for Chrome](https://marketplace.visualstudio.com/itemdetails?itemName=msjsdiag.debugger-for-chrome)
+
+## Using Chrome Developer Tools
+
+You can use the built-in developer tools via `View -> Toggle Developer Tools` in debug mode or connect via `chrome://inspect` using port `5861` for the main process and `8315` for the renderer process (`npm run dev`).
diff --git a/src/main/app.js b/src/main/app.js
index 43fdd8ec..17063a54 100644
--- a/src/main/app.js
+++ b/src/main/app.js
@@ -18,11 +18,6 @@ class App {
       app.commandLine.appendSwitch('enable-experimental-web-platform-features', 'true')
     }
 
-    // Enable vscode chrome extension debugger connection
-    if (process.env.NODE_ENV === 'development') {
-      app.commandLine.appendSwitch('remote-debugging-port', '8315')
-    }
-
     app.on('open-file', this.openFile)
 
     app.on('ready', this.ready)
diff --git a/src/main/window.js b/src/main/window.js
index f8719389..0358d8c5 100644
--- a/src/main/window.js
+++ b/src/main/window.js
@@ -168,7 +168,7 @@ class AppWindow {
     }
 
     const winURL = process.env.NODE_ENV === 'development'
-      ? `http://localhost:9080`
+      ? `http://localhost:9091`
       : `file://${__dirname}/index.html`
 
     win.loadURL(winURL)