diff --git a/README.md b/README.md
index 21141c2a..c0e996fa 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ First up, make sure that node >=4.x.x and npm >=3.x.x are installed on your syst
 git clone git@github.com:UltimateHackingKeyboard/agent.git
 cd agent
 npm install
-npm run dev
+npm run server:web
 ```
 
 At this point, webpack dev server should expose Agent at `localhost:8080`
diff --git a/electron/src/electron-main.ts b/electron/src/electron-main.ts
index 26639646..4dd8c802 100644
--- a/electron/src/electron-main.ts
+++ b/electron/src/electron-main.ts
@@ -21,7 +21,9 @@ function createWindow() {
 
     const indexPath = path.resolve(__dirname, './index.html');
     // and load the index.html of the app.
-    win.loadURL(`file://${indexPath}`);
+    const url = process.argv[2] && process.argv[2].startsWith('--url=') ? process.argv[2].substring(6) : `file://${indexPath}`;
+
+    win.loadURL(url);
 
     win.on('page-title-updated', (event) => {
         event.preventDefault();
diff --git a/package.json b/package.json
index caf826dd..78257094 100644
--- a/package.json
+++ b/package.json
@@ -63,9 +63,9 @@
   },
   "scripts": {
     "postinstall": "run-p build:usb \"symlink -- -i\" ",
-    "tslint": "tslint \"electron/**/*.ts\" \"web/**/*.ts\" \"shared/**/*.ts\" \"test-serializer/**/*.ts\"",
-    "stylelint": "stylelint \"electron/**/*.scss\" \"web/**/*.scss\" \"shared/**/*.scss\" --syntax scss",
-    "lint": "run-s -scn tslint stylelint",
+    "lint": "run-s -scn lint:ts lint:style",
+    "lint:ts": "tslint \"electron/**/*.ts\" \"web/**/*.ts\" \"shared/**/*.ts\" \"test-serializer/**/*.ts\"",
+    "lint:style": "stylelint \"electron/**/*.scss\" \"web/**/*.scss\" \"shared/**/*.scss\" --syntax scss",
     "build": "run-p build:web build:electron",
     "build:web": "webpack --config \"web/src/webpack.config.js\"",
     "build:electron": "run-s -scn build:electron:main build:electron:app",
@@ -73,8 +73,10 @@
     "build:electron:app": "webpack --config \"electron/src/webpack.config.js\"",
     "build:usb": "electron-rebuild -w usb -p",
     "build:test": "webpack --config \"test-serializer/webpack.config.js\"",
-    "dev": "webpack-dev-server --config \"web/src/webpack.config.js\" --content-base \"./web/dist\"",
-    "electron": "electron electron/dist/electron-main.js",
+    "server:web": "webpack-dev-server --config \"web/src/webpack.config.js\" --content-base \"./web/dist\"",
+    "server:electron": "webpack-dev-server --config \"electron/src/webpack.config.js\" --content-base \"./electron/dist\" --port 8081",
+    "electron:dev": "electron electron/dist/electron-main.js --url=http://localhost:8081",
+    "electron:prod": "electron electron/dist/electron-main.js",
     "symlink": "node ./tools/symlinker"
   }
 }