diff --git a/.env.development.web b/.env.development.web
new file mode 100644
index 00000000..284c703f
--- /dev/null
+++ b/.env.development.web
@@ -0,0 +1,3 @@
+NODE_ENV=development
+VUE_APP_PLATFORM=web
+VUE_APP_TARGET=web
\ No newline at end of file
diff --git a/.env.production.app b/.env.production.app
new file mode 100644
index 00000000..f9fd3136
--- /dev/null
+++ b/.env.production.app
@@ -0,0 +1,3 @@
+NODE_ENV=production
+VUE_APP_PLATFORM=web
+VUE_APP_TARGET=electron-renderer
\ No newline at end of file
diff --git a/.env.production.web b/.env.production.web
new file mode 100644
index 00000000..e9a62687
--- /dev/null
+++ b/.env.production.web
@@ -0,0 +1,3 @@
+NODE_ENV=production
+VUE_APP_PLATFORM=web
+VUE_APP_TARGET=web
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index afc1c793..be92d222 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 node_modules
 /dist
+/app/dist
 /release-builds
 /installers/release-builds
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a571865..73d680d7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,5 @@
 stages:
   - build
-  - package
   - meta
 
 # Cache modules in between jobs
@@ -9,13 +8,13 @@ cache:
   paths:
   - node_modules/
 
-# Build basic webapp
+# Basic webapp build
 build:
   stage: build
   image: electronuserland/builder:wine
   script:
     - npm install
-    - npm run build
+    - npm run build:web
   artifacts:
     name: "build"
     paths:
@@ -25,20 +24,20 @@ build:
     - tags
     - web
 
-# Platform-specific Electron builds
+# Electron app build
 package:
-  stage: package
-  dependencies:
-    - build
+  stage: build
   image: electronuserland/builder:wine
-  retry: 2
   script:
+    - npm install
+    - npm run build:app
     - npm run release
+    - shopt -s extglob
     - mv ./release-builds/*.AppImage .
     - mv ./release-builds/*.deb .
     - mv ./release-builds/*.exe .
     - mv ./release-builds/*.exe.blockmap .
-    - mv ./release-builds/latest*.yml .
+    - mv ./release-builds/?(beta*.yml|latest*.yml) .
   artifacts:
     name: "dist"
     paths:
@@ -47,6 +46,7 @@ package:
       - "*.exe"
       - "*.exe.blockmap"
       - "latest*.yml"
+      - "beta*.yml"
   only:
     - stable
     - tags
@@ -74,6 +74,4 @@ meta:choco:
       - tools/chocolateyInstall.ps1
       - ./*.nupkg
   only:
-    - stable
     - tags
-    - web
diff --git a/app/app.js b/app/app.js
index d1fe5162..34c5c85a 100644
--- a/app/app.js
+++ b/app/app.js
@@ -6,6 +6,9 @@ const autoUpdater = updater.autoUpdater;
 const contextMenu = require('electron-context-menu')
 const path = require('path')
 
+// Attach settings store
+const { store } = require('./store')
+
 // Auto upadater 
 autoUpdater.autoDownload = false;
 
@@ -14,9 +17,7 @@ autoUpdater.setFeedURL({
     url: "https://gitlab.com/openflexure/openflexure-microscope-jsclient/-/jobs/artifacts/stable/raw?job=package"
 });
 
-autoUpdater.on('checking-for-update', function () {
-    sendStatusToWindow('Checking for update...');
-});
+autoUpdater.on('checking-for-update', function () {});
 
 autoUpdater.on('update-available', function (info) {
   sendStatusToWindow('Update available.' + info)
@@ -70,56 +71,76 @@ const app = electron.app
 const BrowserWindow = electron.BrowserWindow
 
 // Set the window content
-let url = `file://${path.join(__dirname, '../dist/index.html')}`
+let url = `file://${path.join(__dirname, '/dist/index.html')}`
 let mainWindow
 
 // Set the application menu
 require('./menu.js')
 
+// Handle redrawing the mainWindow
+let recreatingWindowInProgress = false;
+
+function toggleCustomTitleBar () {
+  // Mark window as being recreated, to prevent stopping the application
+  recreatingWindowInProgress = true
+
+  // Invert the drawCustomTitleBar setting
+  store.set('drawCustomTitleBar', !store.get('drawCustomTitleBar'))
+
+  // Destroy old window
+  mainWindow.destroy()
+  // Create new window
+  createWindow()
+
+  // Mark window as no longer being recreated
+  recreatingWindowInProgress = false
+}
+
 function createWindow() {
   // Create the browser window.
   mainWindow = new BrowserWindow({
+    frame: !store.get('drawCustomTitleBar'),
     width: 1124, 
     height: 800,
     icon: path.join(__dirname, '/icons/png/64x64.png')
   })
 
+  // Make a context menu
   contextMenu({
     showCopyImageAddress: true,
     showSaveImageAs: true,
     showInspectElement: false,
   });
 
+  // Load window contents
   mainWindow.loadURL(url)
+
+  // Check for updates
   autoUpdater.checkForUpdates();
 
   // Emitted when the window is closed.
   mainWindow.on('closed', function() {
-    // Dereference the window object, usually you would store windows
-    // in an array if your app supports multi windows, this is the time
-    // when you should delete the corresponding element.
-    mainWindow = null
+    mainWindow = null  // Dereference the window object
   })
 }
 
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
-app.on('ready', createWindow)
+app.on('ready', () => {
+  createWindow()
+})
 
 // Quit when all windows are closed.
 app.on('window-all-closed', function() {
-  // On OS X it is common for applications and their menu bar
-  // to stay active until the user quits explicitly with Cmd + Q
-  if (process.platform !== 'darwin') {
+  if ((process.platform !== 'darwin') && recreatingWindowInProgress != true) {
     app.quit()
   }
 })
 
 app.on('activate', function() {
-  // On OS X it's common to re-create a window in the app when the
-  // dock icon is clicked and there are no other windows open.
   if (mainWindow === null) {
     createWindow()
   }
-})
\ No newline at end of file
+})
+
+// Export toggleCustomTitleBar for use in ./menu.js
+module.exports.toggleCustomTitleBar = toggleCustomTitleBar
\ No newline at end of file
diff --git a/app/make-nupkg.sh b/app/make-nupkg.sh
index 5c01e136..f52ec90c 100644
--- a/app/make-nupkg.sh
+++ b/app/make-nupkg.sh
@@ -41,7 +41,7 @@ echo "Nupkg version: $version"
 
 # Build installer URL
 pipelineURL="$CI_PROJECT_URL/-/jobs/artifacts/$CI_COMMIT_REF_NAME/raw"
-instURL="$pipelineURL/openflexure-ev-win.exe?job=package:win32"
+instURL="$pipelineURL/openflexure-ev-win.exe?job=package"
 nuspecURL="$CI_JOB_URL/artifacts/browse"
 
 echo "$instURL"
diff --git a/app/menu.js b/app/menu.js
index 950e8f42..f8d54ab6 100644
--- a/app/menu.js
+++ b/app/menu.js
@@ -1,10 +1,13 @@
-const { app, Menu } = require('electron')
+const { app, shell, Menu } = require('electron')
 const updater = require("electron-updater");
 const autoUpdater = updater.autoUpdater;
 const path = require('path')
 
 const openAboutWindow = require('about-window').default
 
+const main = require('./app')
+const { store } = require('./store')
+
 const template = [
   {
     label: 'Edit',
@@ -26,7 +29,16 @@ const template = [
       { role: 'forcereload' },
       { role: 'toggledevtools' },
       { type: 'separator' },
-      { role: 'togglefullscreen' }
+      { role: 'togglefullscreen' },
+      { type: 'separator' },
+      {
+        type: 'checkbox',
+        checked: store.get('drawCustomTitleBar'),
+        label: 'Custom titlebar',
+        click () {
+          main.toggleCustomTitleBar()
+        }
+      }
     ]
   },
   {
@@ -50,6 +62,13 @@ const template = [
           })
         }
       },
+      {
+        label: 'Homepage',
+        click () {
+          shell.openExternal('https://openflexure.org')
+        }
+      },
+      { type: 'separator' },
       {
         label: 'Check for Updates',
         click () {
diff --git a/app/store.js b/app/store.js
new file mode 100644
index 00000000..bd1a8b95
--- /dev/null
+++ b/app/store.js
@@ -0,0 +1,9 @@
+const Store = require('electron-store');
+const store = new Store();
+
+if (store.has('drawCustomTitleBar') !== true) {
+  // Default to false if on MacOS, otherwise true
+  store.set('drawCustomTitleBar', (process.platform !== 'darwin') ? true : false)
+}
+
+module.exports.store = store
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index ded0d3f8..fba0969b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "openflexure-ev",
-  "version": "0.2.5",
+  "version": "1.1.0-beta.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -850,6 +850,12 @@
       "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
       "dev": true
     },
+    "@sindresorhus/is": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+      "dev": true
+    },
     "@soda/friendly-errors-webpack-plugin": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz",
@@ -903,6 +909,21 @@
         }
       }
     },
+    "@szmarczak/http-timer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
+      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+      "dev": true,
+      "requires": {
+        "defer-to-connect": "^1.0.1"
+      }
+    },
+    "@types/debug": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.4.tgz",
+      "integrity": "sha512-D9MyoQFI7iP5VdpEyPZyjjqIJ8Y8EDNQFIFVLOmeg1rI1xiHOChyUPMPRUVfqFCerxfE+yS3vMyj37F6IdtOoQ==",
+      "dev": true
+    },
     "@types/events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
@@ -1487,7 +1508,6 @@
       "version": "6.10.0",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
       "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
-      "dev": true,
       "requires": {
         "fast-deep-equal": "^2.0.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -1514,12 +1534,25 @@
       "dev": true
     },
     "ansi-align": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
-      "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
+      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
       "dev": true,
       "requires": {
-        "string-width": "^2.0.0"
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        }
       }
     },
     "ansi-colors": {
@@ -1581,49 +1614,91 @@
       }
     },
     "app-builder-bin": {
-      "version": "2.6.6",
-      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.6.6.tgz",
-      "integrity": "sha512-G0Ee6xkbxV+fvM/7xXWIgSDjWAD4E/d/aNbxerq/TVsCyBIau/0VPmrEqBMyZv0NbTwLDW5aF/yHG+0ZEY77kA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.0.1.tgz",
+      "integrity": "sha512-eSC1ZxQIGuvhXKB9m7rRwTbou522FbQuc95XoqOMqMjf50//So1IjNPFOzXd6SDHcMx7f5SYEW5AYSs1Pwovtw==",
       "dev": true
     },
     "app-builder-lib": {
-      "version": "20.40.2",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.40.2.tgz",
-      "integrity": "sha512-SAbfua8+L3pFbQp3QFpKV0PzHJPJqepROeX/FPrfdL02zxlw+BVOe6KfC3+UV6XUombWvVPG+SwG956vfIx/Cw==",
+      "version": "21.0.1",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-21.0.1.tgz",
+      "integrity": "sha512-B6dr9Wg75uUDisAk5bqLRbWMx5H5iZc0ikjMZEoo9tVQRHnbkCM5O9BPIlVWDjz2qIkQyVr4jCY/Ll9gbMExyg==",
       "dev": true,
       "requires": {
         "7zip-bin": "~4.1.0",
-        "app-builder-bin": "2.6.6",
+        "app-builder-bin": "3.0.1",
         "async-exit-hook": "^2.0.1",
-        "bluebird-lst": "^1.0.7",
-        "builder-util": "9.7.1",
-        "builder-util-runtime": "8.2.1",
+        "bluebird-lst": "^1.0.9",
+        "builder-util": "10.2.0",
+        "builder-util-runtime": "8.2.5",
         "chromium-pickle-js": "^0.2.0",
         "debug": "^4.1.1",
-        "ejs": "^2.6.1",
+        "ejs": "^2.6.2",
         "electron-osx-sign": "0.4.11",
-        "electron-publish": "20.40.0",
-        "fs-extra-p": "^7.0.1",
+        "electron-publish": "21.0.1",
+        "fs-extra-p": "^8.0.2",
         "hosted-git-info": "^2.7.1",
         "is-ci": "^2.0.0",
-        "isbinaryfile": "^4.0.0",
-        "js-yaml": "^3.13.0",
+        "isbinaryfile": "^4.0.1",
+        "js-yaml": "^3.13.1",
         "lazy-val": "^1.0.4",
         "minimatch": "^3.0.4",
         "normalize-package-data": "^2.5.0",
         "plist": "^3.0.1",
-        "read-config-file": "3.2.2",
+        "read-config-file": "3.3.0",
         "sanitize-filename": "^1.6.1",
-        "semver": "^6.0.0",
-        "temp-file": "^3.3.2"
+        "semver": "^6.1.2",
+        "temp-file": "^3.3.3"
       },
       "dependencies": {
+        "bluebird": {
+          "version": "3.5.5",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+          "dev": true
+        },
+        "bluebird-lst": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz",
+          "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5"
+          }
+        },
         "ci-info": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
           "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
           "dev": true
         },
+        "ejs": {
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.2.tgz",
+          "integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==",
+          "dev": true
+        },
+        "fs-extra": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz",
+          "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "fs-extra-p": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-8.0.2.tgz",
+          "integrity": "sha512-dpWboLA/OlyuqGQdsTjC2PKNkise3O4ptcMpXoyfeM/VXrthkEape3I+drWLI0JAW46r1D3eb6QBSPkSyXPXzA==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.9",
+            "fs-extra": "^8.0.1"
+          }
+        },
         "is-ci": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
@@ -1634,9 +1709,9 @@
           }
         },
         "semver": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
-          "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==",
+          "version": "6.1.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.2.tgz",
+          "integrity": "sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==",
           "dev": true
         }
       }
@@ -2159,24 +2234,36 @@
       "dev": true
     },
     "boxen": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
-      "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-3.2.0.tgz",
+      "integrity": "sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A==",
       "dev": true,
       "requires": {
-        "ansi-align": "^2.0.0",
-        "camelcase": "^4.0.0",
-        "chalk": "^2.0.1",
-        "cli-boxes": "^1.0.0",
-        "string-width": "^2.0.0",
+        "ansi-align": "^3.0.0",
+        "camelcase": "^5.3.1",
+        "chalk": "^2.4.2",
+        "cli-boxes": "^2.2.0",
+        "string-width": "^3.0.0",
         "term-size": "^1.2.0",
+        "type-fest": "^0.3.0",
         "widest-line": "^2.0.0"
       },
       "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "type-fest": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
+          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
           "dev": true
         }
       }
@@ -2359,31 +2446,68 @@
       "dev": true
     },
     "builder-util": {
-      "version": "9.7.1",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-9.7.1.tgz",
-      "integrity": "sha512-txpzYIeuHFjrOQWPTJDvhJYisIVGJdSG9ppccE+y7agT0YNhBlVHGnd8+HgFTajYE34xzB5zf1/zxiiDqSKSpA==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-10.2.0.tgz",
+      "integrity": "sha512-9x+RpqKl50VnestgFa+0r9atMq7NUF0b719W8NSzRg/WOrPI9z3oJiLJv0L+JOSzLiu80Fu97kvEb/1l3+/9TQ==",
       "dev": true,
       "requires": {
         "7zip-bin": "~4.1.0",
-        "app-builder-bin": "2.6.6",
-        "bluebird-lst": "^1.0.7",
-        "builder-util-runtime": "^8.2.1",
+        "@types/debug": "^4.1.4",
+        "app-builder-bin": "3.0.1",
+        "bluebird-lst": "^1.0.9",
+        "builder-util-runtime": "^8.2.5",
         "chalk": "^2.4.2",
         "debug": "^4.1.1",
-        "fs-extra-p": "^7.0.1",
+        "fs-extra-p": "^8.0.2",
         "is-ci": "^2.0.0",
-        "js-yaml": "^3.13.0",
-        "source-map-support": "^0.5.11",
+        "js-yaml": "^3.13.1",
+        "source-map-support": "^0.5.12",
         "stat-mode": "^0.3.0",
-        "temp-file": "^3.3.2"
+        "temp-file": "^3.3.3"
       },
       "dependencies": {
+        "bluebird": {
+          "version": "3.5.5",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+          "dev": true
+        },
+        "bluebird-lst": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz",
+          "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5"
+          }
+        },
         "ci-info": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
           "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
           "dev": true
         },
+        "fs-extra": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz",
+          "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "fs-extra-p": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-8.0.2.tgz",
+          "integrity": "sha512-dpWboLA/OlyuqGQdsTjC2PKNkise3O4ptcMpXoyfeM/VXrthkEape3I+drWLI0JAW46r1D3eb6QBSPkSyXPXzA==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.9",
+            "fs-extra": "^8.0.1"
+          }
+        },
         "is-ci": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
@@ -2396,15 +2520,53 @@
       }
     },
     "builder-util-runtime": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.1.tgz",
-      "integrity": "sha512-2TkeTcI9bDlK5azRZSJJNxhAgW1DK+JY3jHK0UWPxgJcan4GZSVDNNO3sXntNxrp+JAdPHMF14rzNd/G53lvqw==",
+      "version": "8.2.5",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.5.tgz",
+      "integrity": "sha512-YILT+YUlxrE3yNB6mDC1tF+Q24mr1LSYdjP5U861jbBeDZfvy1/VPDzW3boMVrDtzYnDnvkYrzLJnoh6TXA75w==",
       "dev": true,
       "requires": {
-        "bluebird-lst": "^1.0.7",
+        "bluebird-lst": "^1.0.9",
         "debug": "^4.1.1",
-        "fs-extra-p": "^7.0.1",
+        "fs-extra-p": "^8.0.2",
         "sax": "^1.2.4"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.5.5",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+          "dev": true
+        },
+        "bluebird-lst": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz",
+          "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5"
+          }
+        },
+        "fs-extra": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz",
+          "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "fs-extra-p": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-8.0.2.tgz",
+          "integrity": "sha512-dpWboLA/OlyuqGQdsTjC2PKNkise3O4ptcMpXoyfeM/VXrthkEape3I+drWLI0JAW46r1D3eb6QBSPkSyXPXzA==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.9",
+            "fs-extra": "^8.0.1"
+          }
+        }
       }
     },
     "builtin-status-codes": {
@@ -2484,6 +2646,44 @@
         }
       }
     },
+    "cacheable-request": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
+      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+      "dev": true,
+      "requires": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^3.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^4.1.0",
+        "responselike": "^1.0.2"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
+          "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "lowercase-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+          "dev": true
+        },
+        "normalize-url": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.3.0.tgz",
+          "integrity": "sha512-0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ==",
+          "dev": true
+        }
+      }
+    },
     "call-me-maybe": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
@@ -2566,12 +2766,6 @@
       "integrity": "sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==",
       "dev": true
     },
-    "capture-stack-trace": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
-      "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==",
-      "dev": true
-    },
     "case-sensitive-paths-webpack-plugin": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz",
@@ -2704,9 +2898,9 @@
       }
     },
     "cli-boxes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
-      "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz",
+      "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==",
       "dev": true
     },
     "cli-cursor": {
@@ -2793,6 +2987,15 @@
       "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
       "dev": true
     },
+    "clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
     "coa": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
@@ -2944,10 +3147,109 @@
         "typedarray": "^0.0.6"
       }
     },
+    "conf": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/conf/-/conf-4.1.0.tgz",
+      "integrity": "sha512-/G++SsVVt4MkKYZ1E+XdNEyCYghM7e7SSgx4PA55lQrmJjUY1APGGfz42YX9YpRkhLFvlhkJ5S341FWsufZZ5w==",
+      "requires": {
+        "ajv": "^6.10.0",
+        "dot-prop": "^5.0.0",
+        "env-paths": "^2.2.0",
+        "json-schema-typed": "^7.0.0",
+        "make-dir": "^3.0.0",
+        "pkg-up": "^3.0.1",
+        "write-file-atomic": "^3.0.0"
+      },
+      "dependencies": {
+        "dot-prop": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.0.0.tgz",
+          "integrity": "sha512-RTmaF2jx3nOBO2GvtFqjnDLycjFUMqt+2pwRx7JVYa81lDauoj9aNkyrJI2ikR58FbBIchiIlRiGG+muLJ4oHQ==",
+          "requires": {
+            "is-obj": "^1.0.0"
+          }
+        },
+        "env-paths": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz",
+          "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA=="
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "make-dir": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz",
+          "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==",
+          "requires": {
+            "semver": "^6.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        },
+        "pkg-up": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+          "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
+          "requires": {
+            "find-up": "^3.0.0"
+          }
+        },
+        "semver": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz",
+          "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ=="
+        },
+        "write-file-atomic": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.0.tgz",
+          "integrity": "sha512-EIgkf60l2oWsffja2Sf2AL384dx328c0B+cIYPTQq5q2rOYuDV00/iPFBOUiDKKwKMOhkymH8AidPaRvzfxY+Q==",
+          "requires": {
+            "imurmurhash": "^0.1.4",
+            "is-typedarray": "^1.0.0",
+            "signal-exit": "^3.0.2",
+            "typedarray-to-buffer": "^3.1.5"
+          }
+        }
+      }
+    },
     "configstore": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
-      "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz",
+      "integrity": "sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==",
       "dev": true,
       "requires": {
         "dot-prop": "^4.1.0",
@@ -3239,15 +3541,6 @@
         "elliptic": "^6.0.0"
       }
     },
-    "create-error-class": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
-      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
-      "dev": true,
-      "requires": {
-        "capture-stack-trace": "^1.0.0"
-      }
-    },
     "create-hash": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
@@ -3643,6 +3936,11 @@
         "array-find-index": "^1.0.1"
       }
     },
+    "custom-electron-titlebar": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/custom-electron-titlebar/-/custom-electron-titlebar-3.0.8.tgz",
+      "integrity": "sha512-VFyV3y5DVcVhGXx1yo16gwNFusbivGQUGTf7ANBA2Hho2tsWvxoVc03rJ908qWqy/yPA0++qSw7AJqjaHimwRA=="
+    },
     "cyclist": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
@@ -3690,6 +3988,15 @@
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true
     },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "dev": true,
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
     "deep-equal": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
@@ -3727,6 +4034,12 @@
         "clone": "^1.0.2"
       }
     },
+    "defer-to-connect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz",
+      "integrity": "sha512-k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw==",
+      "dev": true
+    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -3870,19 +4183,57 @@
       }
     },
     "dmg-builder": {
-      "version": "6.6.1",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.6.1.tgz",
-      "integrity": "sha512-aIbpQG3es+gHTFtsBQE4fmSYVM60yewxJZsN6FhkAmAmNaoO45bEQNJZsRX0YE49+imiSC92mJmFAEP6iKE0Tg==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.8.0.tgz",
+      "integrity": "sha512-YKPcGSpUc8L5HhZhzB2IlPm0kYCwDw4pCfOuXROjUR/EWACnUUIcYZ1suL4/AX26xAcBkh/FP1phPCzOjYy5rA==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "~20.40.0",
-        "bluebird-lst": "^1.0.7",
-        "builder-util": "~9.7.1",
-        "fs-extra-p": "^7.0.1",
+        "app-builder-lib": "~21.0.0",
+        "bluebird-lst": "^1.0.9",
+        "builder-util": "~10.2.0",
+        "fs-extra-p": "^8.0.2",
         "iconv-lite": "^0.4.24",
-        "js-yaml": "^3.13.0",
+        "js-yaml": "^3.13.1",
         "parse-color": "^1.0.0",
         "sanitize-filename": "^1.6.1"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.5.5",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+          "dev": true
+        },
+        "bluebird-lst": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz",
+          "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5"
+          }
+        },
+        "fs-extra": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz",
+          "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "fs-extra-p": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-8.0.2.tgz",
+          "integrity": "sha512-dpWboLA/OlyuqGQdsTjC2PKNkise3O4ptcMpXoyfeM/VXrthkEape3I+drWLI0JAW46r1D3eb6QBSPkSyXPXzA==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.9",
+            "fs-extra": "^8.0.1"
+          }
+        }
       }
     },
     "dns-equal": {
@@ -4053,32 +4404,77 @@
       }
     },
     "electron-builder": {
-      "version": "20.40.2",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.40.2.tgz",
-      "integrity": "sha512-hnnBzyLXna+WpmT4MIoWVdRli43q09yqKOgzPJj0KrOoJZ7TIoY1aYSPvSg8VL5rSuTgdAWGL4rYd9zcq3YXMQ==",
+      "version": "21.0.1",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-21.0.1.tgz",
+      "integrity": "sha512-QDY9XO3FrphEbknsSlvocYt0uWx8uP8cgI53ODvsRST+ykbckINlncGmK1KsPE8UHpYT9Ati0BYp1+2zo+ysQA==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "20.40.2",
-        "bluebird-lst": "^1.0.7",
-        "builder-util": "9.7.1",
-        "builder-util-runtime": "8.2.1",
+        "app-builder-lib": "21.0.1",
+        "bluebird-lst": "^1.0.9",
+        "builder-util": "10.2.0",
+        "builder-util-runtime": "8.2.5",
         "chalk": "^2.4.2",
-        "dmg-builder": "6.6.1",
-        "fs-extra-p": "^7.0.1",
+        "dmg-builder": "6.8.0",
+        "fs-extra-p": "^8.0.2",
         "is-ci": "^2.0.0",
         "lazy-val": "^1.0.4",
-        "read-config-file": "3.2.2",
+        "read-config-file": "3.3.0",
         "sanitize-filename": "^1.6.1",
-        "update-notifier": "^2.5.0",
-        "yargs": "^13.2.2"
+        "update-notifier": "^3.0.0",
+        "yargs": "^13.2.4"
       },
       "dependencies": {
+        "bluebird": {
+          "version": "3.5.5",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+          "dev": true
+        },
+        "bluebird-lst": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz",
+          "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5"
+          }
+        },
         "ci-info": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
           "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
           "dev": true
         },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "fs-extra": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz",
+          "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "fs-extra-p": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-8.0.2.tgz",
+          "integrity": "sha512-dpWboLA/OlyuqGQdsTjC2PKNkise3O4ptcMpXoyfeM/VXrthkEape3I+drWLI0JAW46r1D3eb6QBSPkSyXPXzA==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.9",
+            "fs-extra": "^8.0.1"
+          }
+        },
         "is-ci": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
@@ -4087,6 +4483,70 @@
           "requires": {
             "ci-info": "^2.0.0"
           }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "yargs": {
+          "version": "13.2.4",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
+          "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
+          "dev": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "os-locale": "^3.1.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.0"
+          }
         }
       }
     },
@@ -4194,18 +4654,78 @@
       }
     },
     "electron-publish": {
-      "version": "20.40.0",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.40.0.tgz",
-      "integrity": "sha512-mkjtsIgftRszuT/8do8TszmddokDnu254OyTeL8nE780o/A8t68oXHZzvlTJ4AQ8uBOYrA87JDO/BFCWjnVArA==",
+      "version": "21.0.1",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-21.0.1.tgz",
+      "integrity": "sha512-zCD/O9/Ei6uWfGvRW6iPxAAdq2tgXawRyWH2eMjk8uuwHk6gtAh3IOjKzyUHHBW4Tcu53+GLLPZnqxoiRNw38A==",
       "dev": true,
       "requires": {
-        "bluebird-lst": "^1.0.7",
-        "builder-util": "~9.7.1",
-        "builder-util-runtime": "^8.2.1",
+        "bluebird-lst": "^1.0.9",
+        "builder-util": "~10.2.0",
+        "builder-util-runtime": "^8.2.5",
         "chalk": "^2.4.2",
-        "fs-extra-p": "^7.0.1",
+        "fs-extra-p": "^8.0.2",
         "lazy-val": "^1.0.4",
-        "mime": "^2.4.1"
+        "mime": "^2.4.4"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.5.5",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+          "dev": true
+        },
+        "bluebird-lst": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz",
+          "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5"
+          }
+        },
+        "fs-extra": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz",
+          "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "fs-extra-p": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-8.0.2.tgz",
+          "integrity": "sha512-dpWboLA/OlyuqGQdsTjC2PKNkise3O4ptcMpXoyfeM/VXrthkEape3I+drWLI0JAW46r1D3eb6QBSPkSyXPXzA==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.9",
+            "fs-extra": "^8.0.1"
+          }
+        },
+        "mime": {
+          "version": "2.4.4",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+          "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+          "dev": true
+        }
+      }
+    },
+    "electron-store": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/electron-store/-/electron-store-3.2.0.tgz",
+      "integrity": "sha512-+goKW06sPo8KyPd9ctozRQGjctJ+M4qDpZ0Dx02X08AMf6lSlHQRmYHMYbKXpVpoq4y250wRfEHNxtP72HbfVQ==",
+      "requires": {
+        "conf": "^4.0.1",
+        "type-fest": "^0.3.1"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
+          "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="
+        }
       }
     },
     "electron-to-chromium": {
@@ -4745,8 +5265,7 @@
     "fast-deep-equal": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
     },
     "fast-glob": {
       "version": "2.2.6",
@@ -4765,8 +5284,7 @@
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
     },
     "fastparse": {
       "version": "1.1.2",
@@ -5070,7 +5588,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5091,12 +5610,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5111,17 +5632,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5238,7 +5762,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5250,6 +5775,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5264,6 +5790,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5271,12 +5798,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5295,6 +5824,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5375,7 +5905,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5387,6 +5918,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5472,7 +6004,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5508,6 +6041,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5527,6 +6061,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5570,12 +6105,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -5702,30 +6239,22 @@
       }
     },
     "got": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
-      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
       "dev": true,
       "requires": {
-        "create-error-class": "^3.0.0",
+        "@sindresorhus/is": "^0.14.0",
+        "@szmarczak/http-timer": "^1.1.2",
+        "cacheable-request": "^6.0.0",
+        "decompress-response": "^3.3.0",
         "duplexer3": "^0.1.4",
-        "get-stream": "^3.0.0",
-        "is-redirect": "^1.0.0",
-        "is-retry-allowed": "^1.0.0",
-        "is-stream": "^1.0.0",
-        "lowercase-keys": "^1.0.0",
-        "safe-buffer": "^5.0.1",
-        "timed-out": "^4.0.0",
-        "unzip-response": "^2.0.1",
-        "url-parse-lax": "^1.0.0"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-          "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-          "dev": true
-        }
+        "get-stream": "^4.1.0",
+        "lowercase-keys": "^1.0.1",
+        "mimic-response": "^1.0.1",
+        "p-cancelable": "^1.0.0",
+        "to-readable-stream": "^1.0.0",
+        "url-parse-lax": "^3.0.0"
       }
     },
     "graceful-fs": {
@@ -5834,6 +6363,12 @@
         }
       }
     },
+    "has-yarn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
+      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
+      "dev": true
+    },
     "hash-base": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
@@ -6040,6 +6575,12 @@
         }
       }
     },
+    "http-cache-semantics": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz",
+      "integrity": "sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew==",
+      "dev": true
+    },
     "http-deceiver": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
@@ -6218,8 +6759,7 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
     },
     "indent-string": {
       "version": "2.1.0",
@@ -6512,9 +7052,9 @@
       }
     },
     "is-npm": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
-      "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-3.0.0.tgz",
+      "integrity": "sha512-wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA==",
       "dev": true
     },
     "is-number": {
@@ -6540,8 +7080,7 @@
     "is-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-      "dev": true
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
     },
     "is-path-cwd": {
       "version": "2.1.0",
@@ -6587,12 +7126,6 @@
       "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
       "optional": true
     },
-    "is-redirect": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
-      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
-      "dev": true
-    },
     "is-regex": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
@@ -6608,12 +7141,6 @@
       "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
       "dev": true
     },
-    "is-retry-allowed": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
-      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=",
-      "dev": true
-    },
     "is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
@@ -6641,8 +7168,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-utf8": {
       "version": "0.2.1",
@@ -6662,6 +7188,12 @@
       "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
       "dev": true
     },
+    "is-yarn-global": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
+      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
+      "dev": true
+    },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -6669,9 +7201,9 @@
       "dev": true
     },
     "isbinaryfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.0.tgz",
-      "integrity": "sha512-RBtmso6l2mCaEsUvXngMTIjg3oheXo0MgYzzfT6sk44RYggPnm9fT+cQJAmzRnJIxPHXg9FZglqDJGW28dvcqA==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.1.tgz",
+      "integrity": "sha512-bvJxbNWm72dy/1+qeBm9F8wUM4siDnlzid7NN5Ib4nQcc0tNIx/YWgEih1ZRHXr8xVbpGk1ccLlA9gOSlyx3gw==",
       "dev": true
     },
     "isemail": {
@@ -6766,6 +7298,12 @@
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
+    "json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+      "dev": true
+    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -6781,8 +7319,12 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "json-schema-typed": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.0.tgz",
+      "integrity": "sha512-ikVqF4dlAgRvAb3MDAgDQRtB/GIC8+iq+z5bczPh9bUT7bAZCdGfGCypJHBquzZNoxebql1UgPxWbImnvkSuJg=="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
@@ -6831,6 +7373,15 @@
         "verror": "1.10.0"
       }
     },
+    "keyv": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+      "dev": true,
+      "requires": {
+        "json-buffer": "3.0.0"
+      }
+    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -6844,12 +7395,12 @@
       "dev": true
     },
     "latest-version": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
-      "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
+      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
       "dev": true,
       "requires": {
-        "package-json": "^4.0.0"
+        "package-json": "^6.3.0"
       }
     },
     "launch-editor": {
@@ -7170,6 +7721,11 @@
         "object-visit": "^1.0.0"
       }
     },
+    "material-design-icons": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/material-design-icons/-/material-design-icons-3.0.1.tgz",
+      "integrity": "sha1-mnHEh0chjrylHlGmbaaCA4zct78="
+    },
     "md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@@ -7331,6 +7887,12 @@
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
       "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
     },
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
+      "dev": true
+    },
     "mini-css-extract-plugin": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz",
@@ -7935,6 +8497,12 @@
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "optional": true
     },
+    "p-cancelable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
+      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
+      "dev": true
+    },
     "p-defer": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
@@ -7984,15 +8552,23 @@
       "dev": true
     },
     "package-json": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
-      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.4.0.tgz",
+      "integrity": "sha512-bd1T8OBG7hcvMd9c/udgv6u5v9wISP3Oyl9Cm7Weop8EFwrtcQDnS2sb6zhwqus2WslSr5wSTIPiTTpxxmPm7Q==",
       "dev": true,
       "requires": {
-        "got": "^6.7.1",
-        "registry-auth-token": "^3.0.1",
-        "registry-url": "^3.0.3",
-        "semver": "^5.1.0"
+        "got": "^9.6.0",
+        "registry-auth-token": "^3.4.0",
+        "registry-url": "^5.0.0",
+        "semver": "^6.1.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.1.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.2.tgz",
+          "integrity": "sha512-z4PqiCpomGtWj8633oeAdXm1Kn1W++3T8epkZYnwiVgIYIJ0QHszhInYSJTYxebByQH7KVCEAn8R9duzZW2PhQ==",
+          "dev": true
+        }
       }
     },
     "pako": {
@@ -9039,8 +9615,7 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "pupa": {
       "version": "1.0.0",
@@ -9149,33 +9724,63 @@
       }
     },
     "read-config-file": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.2.2.tgz",
-      "integrity": "sha512-PuFpMgZF01VB0ydH1dfitAxCP/fh+qnfbA9cYNIPoxPbz0SMngsrafCtaHDWfER7MwlDz4fmrNBhPkakxxFpTg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.3.0.tgz",
+      "integrity": "sha512-VzA1UVvNwEYQi9wGVa7Cji/E6YNr3VwbPXUcHed00cYoZsqg1kYcMnHgIx8nt0NQjFz/ai/8n8Xq0rmHD153Gg==",
       "dev": true,
       "requires": {
-        "ajv": "^6.9.2",
+        "ajv": "^6.10.0",
         "ajv-keywords": "^3.4.0",
-        "bluebird-lst": "^1.0.7",
-        "dotenv": "^6.2.0",
-        "dotenv-expand": "^4.2.0",
-        "fs-extra-p": "^7.0.1",
-        "js-yaml": "^3.12.1",
+        "bluebird-lst": "^1.0.9",
+        "dotenv": "^8.0.0",
+        "dotenv-expand": "^5.1.0",
+        "fs-extra-p": "^8.0.2",
+        "js-yaml": "^3.13.1",
         "json5": "^2.1.0",
         "lazy-val": "^1.0.4"
       },
       "dependencies": {
-        "dotenv": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
-          "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+        "bluebird": {
+          "version": "3.5.5",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
           "dev": true
         },
-        "dotenv-expand": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-4.2.0.tgz",
-          "integrity": "sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU=",
+        "bluebird-lst": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz",
+          "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5"
+          }
+        },
+        "dotenv": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.0.0.tgz",
+          "integrity": "sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg==",
           "dev": true
+        },
+        "fs-extra": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz",
+          "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "fs-extra-p": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-8.0.2.tgz",
+          "integrity": "sha512-dpWboLA/OlyuqGQdsTjC2PKNkise3O4ptcMpXoyfeM/VXrthkEape3I+drWLI0JAW46r1D3eb6QBSPkSyXPXzA==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.9",
+            "fs-extra": "^8.0.1"
+          }
         }
       }
     },
@@ -9368,12 +9973,12 @@
       }
     },
     "registry-url": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
-      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
+      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
       "dev": true,
       "requires": {
-        "rc": "^1.0.1"
+        "rc": "^1.2.8"
       }
     },
     "regjsgen": {
@@ -9592,6 +10197,15 @@
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "dev": true
     },
+    "responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "dev": true,
+      "requires": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
     "restore-cursor": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
@@ -10611,14 +11225,52 @@
       "dev": true
     },
     "temp-file": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.3.2.tgz",
-      "integrity": "sha512-FGKccAW0Mux9hC/2bdUIe4bJRv4OyVo4RpVcuplFird1V/YoplIFbnPZjfzbJSf/qNvRZIRB9/4n/RkI0GziuQ==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.3.3.tgz",
+      "integrity": "sha512-ErWJ0vfZwkozaH7dn/5QtYdrGwy6fWID0GG3PEzNb9Vmt6urL4mQ3lKz7NWVi1/kmZsWQzgjTL7/P4mwGx5jqg==",
       "dev": true,
       "requires": {
         "async-exit-hook": "^2.0.1",
-        "bluebird-lst": "^1.0.6",
-        "fs-extra-p": "^7.0.0"
+        "bluebird-lst": "^1.0.9",
+        "fs-extra-p": "^8.0.2"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.5.5",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
+          "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
+          "dev": true
+        },
+        "bluebird-lst": {
+          "version": "1.0.9",
+          "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz",
+          "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==",
+          "dev": true,
+          "requires": {
+            "bluebird": "^3.5.5"
+          }
+        },
+        "fs-extra": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz",
+          "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "fs-extra-p": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-8.0.2.tgz",
+          "integrity": "sha512-dpWboLA/OlyuqGQdsTjC2PKNkise3O4ptcMpXoyfeM/VXrthkEape3I+drWLI0JAW46r1D3eb6QBSPkSyXPXzA==",
+          "dev": true,
+          "requires": {
+            "bluebird-lst": "^1.0.9",
+            "fs-extra": "^8.0.1"
+          }
+        }
       }
     },
     "term-size": {
@@ -10791,12 +11443,6 @@
       "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==",
       "dev": true
     },
-    "timed-out": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
-      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=",
-      "dev": true
-    },
     "timers-browserify": {
       "version": "2.0.10",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
@@ -10853,6 +11499,12 @@
         }
       }
     },
+    "to-readable-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
+      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==",
+      "dev": true
+    },
     "to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
@@ -10983,6 +11635,14 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
+    "typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "requires": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
     "uglify-js": {
       "version": "3.4.10",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
@@ -11181,12 +11841,6 @@
         "path-exists": "^3.0.0"
       }
     },
-    "unzip-response": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
-      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=",
-      "dev": true
-    },
     "upath": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
@@ -11194,21 +11848,40 @@
       "dev": true
     },
     "update-notifier": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
-      "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-3.0.0.tgz",
+      "integrity": "sha512-6Xe3oF2bvuoj4YECUc52yxVs94yWrxwqHbzyveDktTS1WhnlTRpNcQMxUshcB7nRVGi1jEXiqL5cW1S5WSyzKg==",
       "dev": true,
       "requires": {
-        "boxen": "^1.2.1",
+        "boxen": "^3.0.0",
         "chalk": "^2.0.1",
-        "configstore": "^3.0.0",
+        "configstore": "^4.0.0",
+        "has-yarn": "^2.1.0",
         "import-lazy": "^2.1.0",
-        "is-ci": "^1.0.10",
+        "is-ci": "^2.0.0",
         "is-installed-globally": "^0.1.0",
-        "is-npm": "^1.0.0",
-        "latest-version": "^3.0.0",
+        "is-npm": "^3.0.0",
+        "is-yarn-global": "^0.3.0",
+        "latest-version": "^5.0.0",
         "semver-diff": "^2.0.0",
         "xdg-basedir": "^3.0.0"
+      },
+      "dependencies": {
+        "ci-info": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+          "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+          "dev": true
+        },
+        "is-ci": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+          "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^2.0.0"
+          }
+        }
       }
     },
     "upper-case": {
@@ -11221,7 +11894,6 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -11285,20 +11957,12 @@
       }
     },
     "url-parse-lax": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
       "dev": true,
       "requires": {
-        "prepend-http": "^1.0.1"
-      },
-      "dependencies": {
-        "prepend-http": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-          "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
-          "dev": true
-        }
+        "prepend-http": "^2.0.0"
       }
     },
     "use": {
@@ -11901,9 +12565,9 @@
       "dev": true
     },
     "write-file-atomic": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.2.tgz",
-      "integrity": "sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
+      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.11",
diff --git a/package.json b/package.json
index 964ee06a..d57b9dee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openflexure-ev",
-  "version": "0.2.6",
+  "version": "1.1.0",
   "private": true,
   "description": "An electron-based user client for the OpenFlexure Microscope Server",
   "author": "OpenFlexure <contact@openflexure.org> (https://www.openflexure.org)",
@@ -11,21 +11,24 @@
   "license": "GNU General Public License v3.0 ",
   "main": "./app/app.js",
   "scripts": {
-    "release": "electron-builder --linux --config app/builder-config-raspi.yaml & electron-builder --win --linux --config app/builder-config-x86_64.yaml",
+    "build:web": "vue-cli-service build --mode production.web",
+    "build:app": "vue-cli-service build --mode production.app",
+    "serve": "vue-cli-service serve  --mode development.web",
+    "start": "npm run build:app && electron app/app.js",
     "dist:linux": "electron-builder --linux --config app/builder-config-x86_64.yaml",
     "dist:raspi": "electron-builder --linux --config app/builder-config-raspi.yaml",
     "dist:win": "electron-builder --win --config app/builder-config-x86_64.yaml",
     "dist:dmg": "electron-builder --mac --config app/builder-config-x86_64.yaml",
     "dist:appx": "electron-builder --win --config app/builder-config-appx.yaml",
-    "build": "vue-cli-service build",
-    "electron:run": "electron .",
-    "electron:dev": "electron app/app.dev.js",
-    "serve": "vue-cli-service serve"
+    "release": "electron-builder --linux --config app/builder-config-raspi.yaml & electron-builder --win --linux --config app/builder-config-x86_64.yaml"
   },
   "dependencies": {
     "about-window": "^1.12.1",
+    "custom-electron-titlebar": "^3.0.8",
     "electron-context-menu": "^0.11.0",
-    "electron-updater": "^4.0.6"
+    "electron-store": "^3.2.0",
+    "electron-updater": "^4.0.6",
+    "material-design-icons": "^3.0.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.3.0",
@@ -33,10 +36,10 @@
     "axios": "^0.18.0",
     "css-loader": "^2.1.1",
     "electron": "^4.1.4",
-    "electron-builder": "^20.39.0",
+    "electron-builder": "^21.0.1",
     "less": "^3.9.0",
     "less-loader": "^4.1.0",
-    "uikit": "3.1.1",
+    "uikit": "^3.1.1",
     "vue": "^2.5.21",
     "vue-template-compiler": "^2.6.10",
     "vuex": "^3.0.1"
diff --git a/public/titleicon.svg b/public/titleicon.svg
new file mode 100644
index 00000000..f88a3088
--- /dev/null
+++ b/public/titleicon.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 90 56" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;">
+    <g transform="matrix(1,0,0,1,-30.245,-47.0254)">
+        <g id="path3773" transform="matrix(0.12596,0,0,0.12596,28.1368,19.1335)">
+            <path d="M212.85,344.652C234.052,276.913 297.347,227.702 372.047,227.702C446.747,227.702 510.042,276.913 531.245,344.652L531.245,344.652L531.246,344.656C531.789,346.391 532.304,348.138 532.791,349.896C556.452,421.618 655.593,393.868 655.593,393.868L721.09,563.056L472.356,659.347L430.306,550.728L430.129,550.794L406.853,490.142C408.621,489.464 410.361,488.736 412.072,487.962C419.736,484.232 426.404,480.109 432.198,475.703C447.995,463.209 459.586,446.041 465.257,426.69C473.38,395.32 463.384,366.691 463.101,365.891C449.309,328.959 413.54,302.366 372.047,302.366C330.554,302.366 294.785,328.959 280.994,365.891C280.711,366.689 270.714,395.319 278.838,426.69C284.509,446.041 296.099,463.209 311.897,475.703C317.69,480.109 324.359,484.232 332.023,487.962C333.734,488.736 335.474,489.464 337.242,490.142L337.166,490.34C337.166,490.34 313.965,550.794 313.965,550.794L313.788,550.728L271.739,659.347L23.004,563.056L88.501,393.868C88.501,393.868 187.642,421.618 211.303,349.896C211.79,348.138 212.306,346.391 212.849,344.656L212.85,344.652L212.85,344.652Z" style="fill:white;fill-rule:nonzero;stroke:white;stroke-width:12.54px;"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/App.vue b/src/App.vue
index 96649f36..6a7a658b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,82 +1,41 @@
 <template>
   <div id="app" v-bind:class="handleTheme">
+
+    <!-- Grid managing whole app -->
     <div uk-grid class="uk-height-1-1 uk-margin-remove uk-padding-remove" margin=0>
-      <div id="sidebar-container" v-bind:class="{ 'overlay-panel': this.window.width<850 }" class="uk-padding-remove uk-first-column uk-inline uk-height-1-1">
-        <div id="overlay-toggle">
-          <a href="" class="uk-icon-button uk-box-shadow-small uk-box-shadow-hover-medium action-btn-outline" uk-icon="menu" uk-toggle="target: #left-panel-container; animation: uk-animation-slide-left-small, uk-animation-slide-left-small" ></a>
-        </div>
-        <div id="left-panel-container" class="uk-padding-remove uk-card uk-card-default uk-width-auto uk-height-1-1" v-bind:class="{ 'uk-card-secondary': $store.state.globalSettings.darkMode }">
-          <panelLeft/>
-        </div>
-      </div>
-      <div id="main-panel-container" class="uk-padding-remove uk-height-1-1 uk-width-expand">
-        <panelDisplay/>
-      </div>
+      <panelLeft/>
+      <panelRight/>
     </div>
+
   </div>
 </template>
 
 <script>
 // Import axios for HTTP requests
 import axios from 'axios'
-// Import basic UIkit
-import UIkit from 'uikit';
 
 // Import components
 import panelLeft from './components/panelLeft.vue'
-import panelDisplay from './components/panelDisplay.vue'
+import panelRight from './components/panelRight.vue'
 
 // Export main app
 export default {
   name: 'app',
 
   components: {
-    panelLeft,
-    panelDisplay
+    panelRight,
+    panelLeft
   },
 
   data: function () {
-    return {
-      window: {
-        width: 0,
-        height: 0
-      }
-    }  
+    return {}  
   },
 
   created: function () {
-    var context = this
-
-    function handleSidebarEvent(context, event){
-      if (event.target.id == 'left-panel-container') {
-        console.log("Sidebar hidden")
-        context.$root.$emit('globalResizePreview')
-      }
-    }
-
-    UIkit.util.on(document, 'hidden', '#left-panel-container', function (e) {
-      handleSidebarEvent(context, e)
-    })
-    UIkit.util.on(document, 'shown', '#left-panel-container', function (e) {
-      handleSidebarEvent(context, e)
-    })
-
-    window.addEventListener('resize', this.handleResize)
-    this.handleResize();
-
     window.addEventListener('beforeunload', this.handleExit)
   },
 
-  beforeDestroy: function () {
-    window.removeEventListener('resize', this.handleResize)
-  },
-
   methods: {
-    handleResize: function(event) {
-      this.window.width = window.innerWidth;
-      this.window.height = window.innerHeight;
-    },
-
     handleExit: function(event) {
       console.log("Triggered beforeunload")
       this.$root.$emit('globalTogglePreview', false)
@@ -114,38 +73,9 @@ body, html {
   overflow-x: hidden;
 }
 
-.overlay-panel {
-  position: fixed;
-  z-index: 99;
-}
-
-#overlay-toggle {
-    width: 0px;
-    height: 30px;
-    z-index: 999;
-    position: absolute;
-    right: -20px;
-    top: 24px;
-}
-
-.action-btn-outline {
-  border: 1px solid lightgray;
-}
-
-.uk-light .uk-icon-button {
-  background-color: rgb(52, 52, 52);
-}
-.uk-light .uk-icon-button:hover, .uk-light .uk-icon-button:focus {
-  background-color: rgb(70, 70, 70);
-}
-
-.uk-light .uk-card-default {
-  background: #222
-}
-
 .uk-disabled {
-    pointer-events: none;
-    opacity: 0.5;
+  pointer-events: none;
+  opacity: 0.4;
 }
 
 </style>
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
deleted file mode 100644
index f3d2503f..00000000
Binary files a/src/assets/images/logo.png and /dev/null differ
diff --git a/src/assets/less/app.less b/src/assets/less/app.less
new file mode 100644
index 00000000..008ee44f
--- /dev/null
+++ b/src/assets/less/app.less
@@ -0,0 +1,17 @@
+// Theming specific to the electron app
+
+.menubar-menu-container {
+    box-shadow: 0.5px 1px 4px 0px rgba(0,0,0,0.3) !important;
+}
+
+.menubar-menu-container > * {
+    box-shadow: none !important; 
+}
+
+.menubar-menu-container .action-menu-item, .menubar-menu-container .action-label {
+    cursor: default
+}
+
+.menubar-menu-container a:hover {
+    text-decoration: none;
+}
\ No newline at end of file
diff --git a/src/assets/less/theme.less b/src/assets/less/theme.less
index 96eae129..32280710 100644
--- a/src/assets/less/theme.less
+++ b/src/assets/less/theme.less
@@ -4,9 +4,14 @@
 // Highlight.js
 @import "./highlight.less";
 
+// Electron app theming
+@import "./app.less";
+
 // Custom OpenFlexure theming
 @global-primary-background: #C32280;
 
+@inverse-primary-muted-color: lighten(@global-primary-background, 15%);
+
 // UIkit
 // ========================================================================
 
@@ -120,6 +125,10 @@
 @inverse-global-color:                          fade(@global-inverse-color, 80%);
 @inverse-global-muted-color:                    fade(@global-inverse-color, 60%);
 
+//
+// Paper
+//
+@paper-border-radius:                           4px;
 
 
 /* ========================================================================
@@ -134,103 +143,14 @@
 @sidebar-right-left-xl:  60px;
 
 
-/* HTML
- ========================================================================== */
 
-/*
- * Force vertical scrollbar
- * 1. `overflow-x` has to be on the `body` element for Safari to prevent horizontal scrolling on touch
-      This causes a random bug showing a vertical scrollbar in combination with some fonts like `Poppins`
-      This is why `overflow-y` must also be set to `hidden`
- */
-
-html { overflow-y: scroll; }
-
-/* 1 */
-body { overflow: hidden; }
-
-
-/* Documentation Sidebars
- ========================================================================== */
-
-/*
- * Sidebar Left
- */
-
-.tm-sidebar-left {
-    position: fixed;
-    top: @navbar-nav-item-height;
-    bottom: 0;
-    box-sizing: border-box;
-    width: @sidebar-left-width !important;
-    padding: 40px 40px 60px 40px;
-    border-right: 1px @global-border solid;
-    overflow: auto;
-}
-
-/*
- * Sidebar Right
- */
-
-.tm-sidebar-right {
-    position: absolute;
-    top: 0;
-    left: ~'calc(100% + @{sidebar-right-left})';
-    width: @sidebar-right-width;
-}
-
-/* Tablet landscape and bigger */
-@media (min-width: @breakpoint-medium) {
-
-    .tm-sidebar-left + .tm-main { padding-left: @sidebar-left-width; }
-
-}
-
-/* Desktop and bigger */
-@media (min-width: @breakpoint-large) {
-
-    .tm-sidebar-right { left: ~'calc(100% + @{sidebar-right-left})'; }
-
-    .tm-sidebar-left + .tm-main { padding-left: @sidebar-left-width - (@sidebar-right-width + @sidebar-right-left); }
-
-}
-
-/* Large screen and bigger */
-@media (min-width: 1400px) {
-
-    .tm-sidebar-left {
-        width: @sidebar-left-width-xl !important;
-        padding: 45px 45px 60px 45px;
-    }
-
-    .tm-sidebar-right { left: ~'calc(100% + @{sidebar-right-left-xl})'; }
-
-    .tm-sidebar-left + .tm-main { padding-left: @sidebar-left-width-xl - (@sidebar-right-width + @sidebar-right-left-xl); }
-
-}
-
-
-/* UIkit modifier
+/* UIkit modifiers
  ========================================================================== */
 
 /*
  * Navbar
  */
 
-.tm-navbar-container:not(.uk-navbar-transparent) {
-    background: linear-gradient(to left, #28a5f5, @global-primary-background);
-}
-
-.tm-navbar-container .uk-navbar-nav > li > a,
-.tm-navbar-container .uk-navbar-item:not(.uk-logo),
-.tm-navbar-container .uk-navbar-toggle {
-    height: 70px;
-    font-size: 13px;
-}
-
-// Color Mode
-.tm-navbar-container:not(.uk-navbar-transparent):extend(.uk-light all) {}
-
 // Line Mode
 @navbar-nav-item-line-margin-vertical:          20px;
 @navbar-nav-item-line-margin-horizontal:        @navbar-nav-item-padding-horizontal;
@@ -238,271 +158,115 @@ body { overflow: hidden; }
 @navbar-nav-item-line-background:               currentColor;
 @navbar-nav-item-line-transition-duration:      0.3s;
 
-.tm-navbar-container .uk-navbar-nav > li > a {
-    position: relative;
-
-    &::before {
-        content: '';
-        display: block;
-        position: absolute;
-        left: @navbar-nav-item-line-margin-horizontal;
-        right: ~'calc(102% - @{navbar-nav-item-line-margin-horizontal})';
-        bottom: @navbar-nav-item-line-margin-vertical;
-        height: @navbar-nav-item-line-height;
-        background-color: @navbar-nav-item-line-background;
-        transition: @navbar-nav-item-line-transition-duration ease-in-out;
-        transition-property: right;
-    }
-}
-
-.tm-navbar-container .uk-navbar-nav > li > a:hover::before { right: @navbar-nav-item-line-margin-horizontal; }
-
-/*
- * Nav
- */
-
-.tm-nav > li.uk-active > a { position: relative; }
-
-.tm-nav > li.uk-active > a:before {
-    content: "";
-    position: absolute;
-    top: 15px;
-    left: -25px;
-    width: 15px;
-    border-top: 1px solid @global-primary-background;
-}
-
-.tm-nav .uk-nav-header {
-    padding: 8px 0;
-    border-bottom: 1px solid @global-border;
+.uk-navbar-dropdown.uk-open {
+    border-radius: @paper-border-radius;
 }
 
 /*
- * Subnav
+ * Cards
  */
 
-/* Tablet landscape and bigger */
-@media (min-width: @breakpoint-medium) {
-
-    .tm-subnav { margin-left: -50px; }
-    .tm-subnav > * { padding-left: 50px; }
-
+.uk-card {
+    border-radius: @paper-border-radius;
 }
 
-.tm-subnav > * > :first-child { text-transform: capitalize; }
-
-/*
- * Label (Changelog()
- */
-
-.tm-label-changelog {
-    width: 80px;
-    margin-top: 3px;
+.uk-card-media-top img {
+    border-radius: @paper-border-radius @paper-border-radius 0 0;
 }
 
-/*
- * Button
- */
- .uk-button {
-    border-radius: 2px;
- }
+.uk-card-default .uk-card-footer {
+    border-top: 1px solid  rgba(180, 180, 180, 0.25);
+}
 
-.tm-button-default,
-.tm-button-primary { border-radius: 500px; }
-
-.tm-button-default {}
-
-.tm-button-large { line-height: 48px; }
-
-.tm-button-primary {}
+.uk-card-primary .uk-card-footer {
+    border-top: 1px solid  rgba(0, 0, 0, 0.075);
+}
 
 .hook-inverse() {
-
-    .tm-button-default {
-        color: @inverse-global-color;
-        border-color: @inverse-global-muted-color;
+    // Override background colour in dark mode
+    .uk-card-default {
+        background-color: #2a2a2a !important;
     }
 
-    .tm-button-primary {
-        background: #fff !important;
-        color: @global-primary-background !important;
+    // Lighten on hover to show depth in dark mode
+    .uk-card-default:hover {
+        transition: background-color @animation-fast-duration ease;
+        background-color: #333 !important;
     }
-
-    .tm-button-primary:hover { box-shadow: 0 10px 40px rgba(30,135,240,1); }
-
 }
 
-/*
- * Section
- */
-
-.tm-section-primary {
-    background: linear-gradient(to left top, #28a5f5, @global-primary-background) 0 0 no-repeat;
-}
-
-.tm-section-intro {
-    background: linear-gradient(to left top, #28a5f5, @global-primary-background) 0 0 no-repeat,
-                #fff;
-    background-size: 100% 75%;
-}
-
-/*
- * Heading
- */
-
-.tm-h4,
-.tm-h5,
-.tm-h6 {
-    font-family: Montserrat;
-    font-weight: 600;
-    text-transform: uppercase;
-    letter-spacing: 2px;
-    color: @global-muted-color;
-}
-
-.tm-h4 { font-size: 14px; }
-.tm-h5 { font-size: 12px; }
-.tm-h6 { font-size: 11px; }
-
-.hook-inverse() {
-
-    .tm-h4,
-    .tm-h5,
-    .tm-h6 { color: rgba(255, 255, 255, 0.7); }
-
-}
-
-/*
- * Text
- */
-
-.tm-text-large { font-size: 18px; }
-
-/*
- * Box shadow
- */
-
-.tm-box-shadow-medium {
-    box-shadow: 2px 12px 35px rgba(0,0,0,0.1),
-                0 1px 6px rgba(0,0,0,0.05);
-}
-
-.tm-box-shadow-large {
-    box-shadow: -40px 40px 160px 0 rgba(0,0,0,0.08),
-                -8px 8px 15px 0 rgba(120,120,120,0.04),
-                3px 3px 30px 0 rgba(0,0,0,0.04);
-}
-
-.tm-box-shadow-modal { box-shadow: 3px 3px 40px 0 rgba(0,0,0,0.06); }
-
-/*
- * Overlay
- */
-
-.tm-overlay-default { background: fade(@global-background, 50%); }
-
 /*
  * Modal
  */
-
-.tm-modal-dialog { background: @global-muted-background; }
-
-.tm-modal-header { padding: 20px 30px; }
-.tm-modal-body { padding: 0; }
-
-/* Phone landscape and bigger */
-@media (min-width: @breakpoint-small) {
-
-    .tm-modal-header { padding: 25px 50px; }
-    .tm-modal-body { padding: 0 50px; }
-
+.uk-modal-dialoge {
+    border-radius: @paper-border-radius;
+    box-shadow: 0 14px 25px rgba(0, 0, 0, 0.16);
+    transition: 0.3s ease !important;
 }
 
-/* Desktop and bigger */
-@media (min-width: @breakpoint-xlarge) {
-
-    .tm-modal-header { padding: 50px 120px; }
-    .tm-modal-body { padding: 0 120px; }
-
-}
-
-.tm-modal-close-full {
-    background: transparent;
-    padding: 30px;
-}
-
-/* Phone landscape and bigger */
-@media (min-width: @breakpoint-small) {
-
-    .tm-modal-close-full { padding: @global-medium-margin; }
-
-}
-
-/* Utilities
- ========================================================================== */
-
 /*
- * Heading fragment
+ * Notifications
  */
-
-.tm-heading-fragment > a {
-    color: inherit;
-    text-decoration: none;
+.uk-notification-message {
+    border-radius: @paper-border-radius;
+    box-shadow: 0 14px 25px rgba(0, 0, 0, 0.16);
 }
 
-/* Phone landscape and bigger */
-@media (min-width: @breakpoint-small) {
+.uk-notification-message-danger {
+    border: 1px solid @notification-message-danger-color
+}
 
-    h2.tm-heading-fragment > a:before {
-        content: "#";
-        position: absolute;
-        width: 25px;
-        margin-left: -25px;
-        color: @global-muted-color;
+.uk-notification-message-warning {
+    border: 1px solid @notification-message-warning-color
+}
+
+.uk-notification-message-success {
+    border: 1px solid @notification-message-success-color
+}
+
+/*
+ * Links
+ */
+.uk-link, .uk-button-link {
+    color: @global-muted-color;
+}
+
+.uk-link:hover, .uk-button-link:hover, a:hover {
+    color: @global-primary-background;
+}
+
+.hook-inverse() {
+    .uk-link:hover, .uk-button-link:hover, a:hover {
+        color: @inverse-primary-muted-color;
+    }
+}
+
+/*
+ * Buttons
+ */
+.uk-button {
+    border-radius: 2px;
+}
+
+.uk-button-danger {
+    background-color: transparent;
+    color: #f0506e;
+    border: 1px solid #f0506e;
+}
+
+.hook-inverse() {
+    .uk-button-primary{
+        background-color: rgba(180, 180, 180, 0.15);
+        color: @inverse-primary-muted-color;
+        border-color: @inverse-primary-muted-color;
     }
 
-}
-
-
-/* Reset container for docs
- ========================================================================== */
-
-.tm-main .uk-container {
-    padding-left: @container-padding-horizontal;
-    padding-right: @container-padding-horizontal;
-}
-
-/* Phone landscape and bigger */
-@media (min-width: @breakpoint-small) {
-
-    .tm-main .uk-container {
-        padding-left: @container-padding-horizontal-s;
-        padding-right: @container-padding-horizontal-s;
+    .uk-button-primary:hover {
+        background-color: @inverse-primary-muted-color;
+        color: #fff;
     }
-
 }
 
-/* Tablet landscape and bigger */
-@media (min-width: @breakpoint-medium) {
-
-    .tm-main .uk-container {
-        padding-left: @container-padding-horizontal-m;
-        padding-right: @container-padding-horizontal-m;
-    }
-
-}
-
-
-/* Pro
- ========================================================================== */
-
-/* Desktop and bigger */
-@media (min-width: @breakpoint-large) {
-    .tm-intro-text { margin-top: 30px; }
-}
-
-/* Large screen and bigger */
-@media (min-width: @breakpoint-xlarge) {
-    .tm-intro-text { margin-top: 90px; }
-    .tm-intro-image { margin-right: -75px; }
-}
+.uk-icon-button, .uk-icon-button:hover {
+    text-decoration: none
+}
\ No newline at end of file
diff --git a/src/components/paneCapture.vue b/src/components/controlComponents/paneCapture.vue
similarity index 77%
rename from src/components/paneCapture.vue
rename to src/components/controlComponents/paneCapture.vue
index 47f2aa6b..f047231f 100644
--- a/src/components/paneCapture.vue
+++ b/src/components/controlComponents/paneCapture.vue
@@ -42,20 +42,7 @@
         <a class="uk-accordion-title" href="#">Metadata</a>
         <div class="uk-accordion-content">
 
-          <form @submit.prevent="handleMetadataSubmit">
-            <div class="uk-margin-small uk-grid-small" uk-grid>
-              <div class="uk-margin-remove-top uk-width-2-5"><input v-model="newMetadata.key" class="uk-input uk-form-width-small uk-form-small" type="text" name="flavor" placeholder="Key"></div>
-              <div class="uk-margin-remove-top uk-width-2-5"><input v-model="newMetadata.value" class="uk-input uk-form-width-small uk-form-small" type="text" name="flavor" placeholder="Value"></div>
-              <div class="uk-margin-remove-top uk-width-1-5"><button class="uk-button uk-button-default uk-form-small uk-float-right" uk-icon="plus"></button></div>
-            </div>
-          </form>
-
-          <div v-for="(value, key) in customMetadata" :key="key" class="uk-width-1-1 uk-margin-small uk-margin-remove-left uk-margin-remove-right" uk-grid>
-            <div class="uk-margin-remove-top uk-padding-remove uk-width-expand"><b>{{ key }}: </b>{{ value }}</div>
-            <div class="uk-margin-remove-top uk-padding-remove uk-width-auto">
-              <a href="#" v-on:click="delMetadataKey(key)" class="uk-icon-link" uk-icon="trash"></a>
-            </div>
-          </div>
+          <keyvalList v-model="metadata"/>
 
         </div>
       </li>
@@ -63,16 +50,7 @@
       <li>
         <a class="uk-accordion-title" href="#">Tags</a>
         <div class="uk-accordion-content">
-
-          <form @submit.prevent="handleTagSubmit">
-            <div class="uk-margin-small uk-grid-small" uk-grid>
-              <div class="uk-margin-remove-top uk-width-4-5"><input v-model="newTag" class="uk-input uk-form-width-small uk-form-small" type="text" name="flavor" placeholder="Tag"></div>
-              <div class="uk-margin-remove-top uk-width-1-5"><button class="uk-button uk-button-default uk-form-small uk-float-right" uk-icon="plus"></button></div>
-            </div>
-          </form>
-
-          <span v-for="tag in tags" :key="tag" v-on:click="delTag(tag)" class="uk-label uk-margin-small-right deletable-label"> {{ tag }} </span>
-
+          <tagList v-model="tags"/>
         </div>
       </li>
 
@@ -176,10 +154,19 @@
 <script>
 import axios from 'axios'
 
+import tagList from "../fieldComponents/tagList"
+import keyvalList from "../fieldComponents/keyvalList"
+
 // Export main app
 export default {
   name: 'paneCapture',
 
+  components: {
+    tagList,
+    keyvalList
+  },
+
+
   data: function () {
     return {
       filename: '',
@@ -203,42 +190,14 @@ export default {
         z: 5
       },
       resizeDims: [640, 480],
-      newTag: "",
       tags: [],
-      customMetadata: {
-        Client: "openflexure.vue"
-      },
-      newMetadata: {
-        key: "",
-        value: ""
+      metadata: {
+        Client: `${process.env.PACKAGE.name}.${process.env.PACKAGE.version}`
       }
     }
   },
 
   methods: {
-    handleMetadataSubmit: function () {
-      console.log("Adding metadata");
-      this.customMetadata[this.newMetadata.key] = this.newMetadata.value
-      this.newMetadata.key = "";
-      this.newMetadata.value = "";
-    },
-
-    delMetadataKey: function (key) {
-      this.$delete(this.customMetadata, key)
-    },
-
-    handleTagSubmit: function () {
-      this.tags.push(this.newTag)
-      this.newTag = "";
-    },
-
-    delTag: function (tag) {
-      console.log(tag)
-      var index = this.tags.indexOf(tag);
-      if (index > -1) {
-        this.tags.splice(index, 1);
-      }
-    },
 
     handleCapture: function() {
       var payload = this.basePayload
@@ -336,7 +295,7 @@ export default {
       }
 
       // Additional metadata
-      payload.metadata = this.customMetadata
+      payload.metadata = this.metadata
       payload.tags = this.tags
 
       // Attach notes
diff --git a/src/components/paneConnect.vue b/src/components/controlComponents/paneConnect.vue
similarity index 78%
rename from src/components/paneConnect.vue
rename to src/components/controlComponents/paneConnect.vue
index e50be8f5..9eb1e0ca 100644
--- a/src/components/paneConnect.vue
+++ b/src/components/controlComponents/paneConnect.vue
@@ -2,8 +2,6 @@
 <div class="host-input">
   <div class="uk-margin">
 
-    <h3>Connect</h3>
-
     <form @submit.prevent="handleSubmit">
       <div class="uk-form-controls uk-margin">
         <label><input class="uk-radio" type="radio" name="radio_local" v-model="computedLocalMode" v-bind:value="true"> Connect locally</label><br>
@@ -12,7 +10,7 @@
 
       <div v-if="!localMode">
         <div class="uk-inline uk-width-1-1">
-          <span class="uk-form-icon" uk-icon="icon: server"></span>
+          <span class="uk-form-icon"><i class="material-icons">dns</i></span>
           <input v-model="hostname" v-bind:class="IpFormClasses" class="uk-input uk-form-small" type="text" placeholder="Hostname or IP address">
         </div>
       </div>
@@ -23,10 +21,11 @@
           <div class="uk-accordion-content">
             <label class="uk-form-label" for="form-stacked-text">Port</label>
             <div class="uk-form-controls">
-              <input v-model="computedPort" class="uk-input uk-form-width-medium uk-form-small" id="form-stacked-text" type="number" value=5000>
+              <input v-model="computedPort" class="uk-input uk-form-small" id="form-stacked-text" type="number" value=5000>
             </div>
           </div>
         </li>
+
         <li>
           <a class="uk-accordion-title" href="#">Status</a>
           <div class="uk-accordion-content">
@@ -35,29 +34,35 @@
               <p><b>Base URI:</b> {{ $store.getters.uri }}</p>
               <p v-if="$store.state.apiConfig.name"><b>Device name:</b> {{ $store.state.apiConfig.name }}</p>
             </div>
-
             <div v-else-if="$store.state.waiting"><div uk-spinner></div></div>
             <div v-else-if="$store.state.error"><b>Error:</b> {{ $store.state.error }}</div>
             <div v-else>No active connection</div>
           </div>
         </li>
+
         <li v-if="!localMode" class="uk-open">
           <a class="uk-accordion-title" href="#">Saved hosts</a>
           <div class="uk-accordion-content">
             <button v-if="$store.getters.ready" v-on:click="saveHost()" class="uk-button uk-button-default uk-form-small uk-margin-small uk-width-1-1">Save Current</button>
-
-            <div v-for="host in savedHosts" :key="host.name" class="uk-margin-small uk-margin-remove-left uk-margin-remove-right uk-grid">
-              <a href="#" v-on:click="autofillHost(host)" class="uk-icon-link uk-padding-remove uk-width-expand"><b>{{ host.name }}</b> ({{ host.hostname }}:{{ host.port }})</a> 
-              <a href="#" v-on:click="delSavedHost(host)" class="uk-icon-link uk-width-auto" uk-icon="trash"></a> 
+            <div v-for="host in savedHosts" :key="host.name" class="uk-margin-small uk-margin-remove-left uk-margin-remove-right uk-flex uk-flex-middle">
+              <a href="#" v-on:click="autofillHost(host)" class="uk-link uk-padding-remove uk-width-expand host-description"><b>{{ host.name }}</b> ({{ host.hostname }}:{{ host.port }})</a> 
+              <a href="#" v-on:click="delSavedHost(host)" class="uk-icon uk-width-auto host-delete"><i class="material-icons">delete</i></a> 
             </div>
           </div>
         </li>
+
       </ul>
 
       <button class="uk-button uk-button-primary uk-form-small uk-float-right uk-margin uk-margin-remove-top uk-width-1-1">Connect</button>
-
     </form>
 
+  <button 
+    v-if="$store.getters.ready" 
+    v-on:click="$store.commit('resetState')" 
+    class="uk-button uk-button-danger uk-form-small uk-float-right uk-margin uk-margin-remove-top uk-width-1-1">
+    Disconnect
+  </button>
+
   </div>
 
 </div>
@@ -122,6 +127,29 @@ export default {
       this.$store.dispatch('firstConnect')
       .then (() => {
         console.log("Connected!")
+        this.checkServerVersion()
+      })
+      .catch(error => {
+        this.modalError(error) // Let mixin handle error
+      })
+    },
+
+    checkServerVersion: function () {
+      this.$store.dispatch('updateState')
+      .then (() => {
+        var clientVersion = process.env.PACKAGE.version
+        var clientVersionMajor = clientVersion.substring(0, 3)
+        console.log(clientVersionMajor)
+
+        var serverVersion = this.$store.state.apiState.version
+        if (serverVersion != undefined) {
+          var serverVersionMajor = serverVersion.substring(0, 3)
+        }
+        console.log(serverVersionMajor)
+
+        if ((serverVersion == undefined) || (serverVersionMajor != clientVersionMajor)) {
+          this.modalDialog("Version mismatch", "Client and microscope versions do not match. Consider updating your microscope software. Some functionality may currently be broken.", status='warning')
+        }
       })
       .catch(error => {
         this.modalError(error) // Let mixin handle error
@@ -132,7 +160,7 @@ export default {
       this.$store.commit("changeSetting", ['trackWindow', state]);
       this.$store.commit("changeSetting", ['disableStream', state]);
       this.$store.commit("changeSetting", ['autoGpuPreview', state]);
-      this.$root.$emit('globalTogglePreview', state)
+      //this.$root.$emit('globalTogglePreview', state)
     },
 
     autofillHost: function (host) {
@@ -217,4 +245,14 @@ export default {
 .host-input {
   text-align: left;
 }
+
+.host-description {
+  text-overflow: ellipsis;
+  overflow: hidden;
+}
+
+.host-delete {
+  padding: 0 2px 0 10px;
+}
+
 </style>
diff --git a/src/components/paneNavigate.vue b/src/components/controlComponents/paneNavigate.vue
similarity index 90%
rename from src/components/paneNavigate.vue
rename to src/components/controlComponents/paneNavigate.vue
index 90c61252..11d1314a 100644
--- a/src/components/paneNavigate.vue
+++ b/src/components/controlComponents/paneNavigate.vue
@@ -64,26 +64,23 @@
 
     <li class="uk-open">
       <a class="uk-accordion-title" href="#">Autofocus</a>
-      <div class="uk-text-center uk-container" v-if="isAutofocusing">
-        <div class="center-spinner" uk-spinner></div>
-      </div>
-      <div class="uk-accordion-content" v-else>
+      <div class="uk-accordion-content">
 
-          <div class="uk-grid-small uk-child-width-1-3" uk-grid>
-
-            <div>
-              <button v-on:click="runFastAutofocus(2000, 300);" class="uk-button uk-button-default uk-form-small uk-float-right uk-width-1-1">Fast</button>
-            </div>
-
-            <div>
-              <button v-on:click="runAutofocus([-60,-30,0,30,60]);" class="uk-button uk-button-default uk-form-small uk-float-right uk-width-1-1">Medium</button>
-            </div>
-
-            <div>
-              <button v-on:click="runAutofocus([-20,-10,0,10,20]);" class="uk-button uk-button-default uk-form-small uk-float-right uk-width-1-1">Fine</button>
-            </div>
+        <div v-if="isAutofocusing">
+          <progressBar/>
+        </div>
 
+        <div class="uk-grid-small uk-child-width-1-3" v-bind:hidden="isAutofocusing" uk-grid>
+          <div>
+            <button v-on:click="runFastAutofocus(2000, 300);" class="uk-button uk-button-default uk-form-small uk-float-right uk-width-1-1">Fast</button>
           </div>
+          <div>
+            <button v-on:click="runAutofocus([-60,-30,0,30,60]);" class="uk-button uk-button-default uk-form-small uk-float-right uk-width-1-1">Medium</button>
+          </div>
+          <div>
+            <button v-on:click="runAutofocus([-20,-10,0,10,20]);" class="uk-button uk-button-default uk-form-small uk-float-right uk-width-1-1">Fine</button>
+          </div>
+        </div>
 
       </div>
     </li>
@@ -94,6 +91,7 @@
 
 <script>
 import axios from 'axios'
+import progressBar from "../genericComponents/progressBar"
 
 // Key Codes
 const keyCodes = {
@@ -111,6 +109,10 @@ const keyCodes = {
 export default {
   name: 'paneNavigate',
 
+  components: {
+    progressBar
+  },
+
   data: function () {
     return {
       keysDown: {},
diff --git a/src/components/panePlugins.vue b/src/components/controlComponents/panePlugins.vue
similarity index 100%
rename from src/components/panePlugins.vue
rename to src/components/controlComponents/panePlugins.vue
diff --git a/src/components/paneSettings.vue b/src/components/controlComponents/paneSettings.vue
similarity index 73%
rename from src/components/paneSettings.vue
rename to src/components/controlComponents/paneSettings.vue
index c0c6e9ce..f24b80cb 100644
--- a/src/components/paneSettings.vue
+++ b/src/components/controlComponents/paneSettings.vue
@@ -1,7 +1,6 @@
 <template>
   <div id="paneSettings">
     
-    <h3>Settings</h3>
     <appSettings/>
 
     <ul uk-accordion="multiple: true">
@@ -26,10 +25,10 @@
 </template>
 
 <script>
-import streamSettings from './paneSettingsComponents/streamSettings.vue'
-import microscopeSettings from './paneSettingsComponents/microscopeSettings.vue'
-import cameraSettings from './paneSettingsComponents/cameraSettings.vue'
-import appSettings from './paneSettingsComponents/appSettings.vue'
+import streamSettings from './settingsComponents/streamSettings.vue'
+import microscopeSettings from './settingsComponents/microscopeSettings.vue'
+import cameraSettings from './settingsComponents/cameraSettings.vue'
+import appSettings from './settingsComponents/appSettings.vue'
 
 // Export main app
 export default {
diff --git a/src/components/paneSettingsComponents/appSettings.vue b/src/components/controlComponents/settingsComponents/appSettings.vue
similarity index 100%
rename from src/components/paneSettingsComponents/appSettings.vue
rename to src/components/controlComponents/settingsComponents/appSettings.vue
diff --git a/src/components/paneSettingsComponents/cameraSettings.vue b/src/components/controlComponents/settingsComponents/cameraSettings.vue
similarity index 66%
rename from src/components/paneSettingsComponents/cameraSettings.vue
rename to src/components/controlComponents/settingsComponents/cameraSettings.vue
index 7367c555..b8127113 100644
--- a/src/components/paneSettingsComponents/cameraSettings.vue
+++ b/src/components/controlComponents/settingsComponents/cameraSettings.vue
@@ -4,30 +4,31 @@
       <div>
         <label class="uk-form-label" for="form-stacked-text">Exposure time</label>
         <div class="uk-form-controls">
-          <input v-model="shutterSpeed" class="uk-input uk-form-small" type="number">
+          <input v-model="displayShutterSpeed" class="uk-input uk-form-small" type="number">
         </div>
       </div>
 
       <div>
         <label class="uk-form-label" for="form-stacked-text">Analogue gain</label>
         <div class="uk-form-controls">
-          <input v-model="analogGain" class="uk-input uk-form-small" type="number">
+          <input v-model="displayAnalogGain" class="uk-input uk-form-small" type="number" step="0.01">
         </div>
       </div>
 
       <div>
         <label class="uk-form-label" for="form-stacked-text">Digital gain</label>
         <div class="uk-form-controls">
-          <input v-model="digitalGain" class="uk-input uk-form-small" type="number">
+          <input v-model="displayDigitalGain" class="uk-input uk-form-small" type="number" step="0.01">
         </div>
       </div>
 
     <button type="submit" class="uk-button uk-button-primary uk-form-small uk-float-right uk-margin-small uk-width-1-1">Apply Settings</button>
     
-    <div class="uk-text-center uk-container" v-if="isCalibrating">
-      <div class="center-spinner" uk-spinner></div>
+    <div v-if="isCalibrating">
+      <progressBar/>
     </div>
-    <div v-else>
+
+    <div v-bind:hidden="isCalibrating">
       <button type="button" v-on:click="recalibrateConfirm()" class="uk-button uk-button-default uk-form-small uk-float-right uk-margin-small uk-width-1-1">Auto-Calibrate</button>
     </div>
 
@@ -40,35 +41,42 @@
 
 <script>
 import axios from 'axios'
+import progressBar from "../../genericComponents/progressBar"
 
 // Export main app
 export default {
   name: 'microscopeSettings',
 
+  components: {
+    progressBar
+  },
+
   data: function () {
     return {
-      shutterSpeed: this.$store.state.apiConfig.picamera_settings.shutter_speed,
-      analogGain: this.$store.state.apiConfig.picamera_settings.analog_gain,
-      digitalGain: this.$store.state.apiConfig.picamera_settings.digital_gain,
+      shutterSpeed: this.$store.state.apiConfig.camera_settings.picamera_settings.shutter_speed,
+      analogGain: this.$store.state.apiConfig.camera_settings.picamera_settings.analog_gain,
+      digitalGain: this.$store.state.apiConfig.camera_settings.picamera_settings.digital_gain,
       isCalibrating: false
     }
   },
 
   methods: {
     updateInputValues: function () {
-      this.shutterSpeed = this.$store.state.apiConfig.picamera_settings.shutter_speed
-      this.digitalGain = this.$store.state.apiConfig.picamera_settings.digital_gain
-      this.analogGain = this.$store.state.apiConfig.picamera_settings.analog_gain
+      this.shutterSpeed = this.$store.state.apiConfig.camera_settings.picamera_settings.shutter_speed
+      this.digitalGain = this.$store.state.apiConfig.camera_settings.picamera_settings.digital_gain
+      this.analogGain = this.$store.state.apiConfig.camera_settings.picamera_settings.analog_gain
     },
 
     applyConfigRequest: function() {
       console.log("Applying config to the microscope")
-      var payload = {picamera_settings:{}}
+      var payload = {
+        picamera_settings: {}
+      }
 
       //if (this.shutterSpeed != this.$store.state.apiConfig.picamera_settings.shutter_speed) {
-      payload.picamera_settings.shutter_speed = this.shutterSpeed
-      payload.picamera_settings.analog_gain = this.analogGain
-      payload.picamera_settings.digital_gain = this.digitalGain
+      payload.camera_settings.picamera_settings.shutter_speed = this.shutterSpeed
+      payload.camera_settings.picamera_settings.analog_gain = this.analogGain
+      payload.camera_settings.picamera_settings.digital_gain = this.digitalGain
       //};
 
       // Send request
@@ -119,6 +127,15 @@ export default {
   },
 
   computed: {
+    displayDigitalGain: function () {
+      return Number(this.digitalGain).toFixed(2)
+    },
+    displayAnalogGain: function () {
+      return Number(this.analogGain).toFixed(2)
+    },
+    displayShutterSpeed: function () {
+      return (this.shutterSpeed != 0) ? this.shutterSpeed : "auto"
+    },
     recalibrateApiUri: function () {
       return this.$store.getters.uri + "/plugin/default/camera_calibration/recalibrate"
     },
diff --git a/src/components/paneSettingsComponents/microscopeSettings.vue b/src/components/controlComponents/settingsComponents/microscopeSettings.vue
similarity index 86%
rename from src/components/paneSettingsComponents/microscopeSettings.vue
rename to src/components/controlComponents/settingsComponents/microscopeSettings.vue
index c6cf8972..282f8a75 100644
--- a/src/components/paneSettingsComponents/microscopeSettings.vue
+++ b/src/components/controlComponents/settingsComponents/microscopeSettings.vue
@@ -52,27 +52,31 @@ export default {
   data: function () {
     return {
       microscopeName: this.$store.state.apiConfig.name,
-      stageBacklash: this.$store.state.apiConfig.backlash
+      stageBacklash: this.$store.state.apiConfig.stage_settings.backlash
     }
   },
 
   methods: {
     updateInputValues: function () {
       this.microscopeName = this.$store.state.apiConfig.name;
-      this.stageBacklash = this.$store.state.apiConfig.backlash
+      this.stageBacklash = this.$store.state.apiConfig.stage_settings.backlash
     },
 
     applyConfigRequest: function() {
-      var payload = {}
+      var payload = {
+        stage_settings: {}
+      }
 
       if (this.microscopeName != this.$store.state.apiConfig.name) {
         payload.name = this.microscopeName
       };
 
-      if (this.stageBacklash != this.$store.state.apiConfig.backlash) {
-        payload.backlash = this.stageBacklash
+      if (this.stageBacklash != this.$store.state.apiConfig.stage_settings.backlash) {
+        payload.stage_settings.backlash = this.stageBacklash
       }
 
+      console.log(payload)
+
       // Send request to update config
       axios.post(this.configApiUri, payload)
         .then(response => { 
diff --git a/src/components/paneSettingsComponents/streamSettings.vue b/src/components/controlComponents/settingsComponents/streamSettings.vue
similarity index 100%
rename from src/components/paneSettingsComponents/streamSettings.vue
rename to src/components/controlComponents/settingsComponents/streamSettings.vue
diff --git a/src/components/fieldComponents/checkList.vue b/src/components/fieldComponents/checkList.vue
new file mode 100644
index 00000000..acd26e39
--- /dev/null
+++ b/src/components/fieldComponents/checkList.vue
@@ -0,0 +1,52 @@
+<template>
+  <div>
+    <label>{{label}}</label>
+
+    <div class="uk-form-controls">
+
+      <div v-for="option in options" :key="option">
+        <label>
+          <input class="uk-checkbox" type="checkbox" v-bind:value="option" v-bind:checked="(value && value.includes(option))" @change="updateValue($event.target)"> 
+          {{ option }}
+        </label>
+      </div>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'checkList',
+
+  props: [
+    'options', 
+    'name', 
+    'label',
+    'value'
+  ],
+
+  methods: {
+    updateValue(target) {
+      var newSelected = this.value != null ? [...this.value] : []  // Clone value array
+
+      if (target.checked) {
+        if (!newSelected.includes(target.value)) {
+          newSelected.push(target.value)
+        }
+      }
+      else {
+        if (newSelected.includes(target.value)) {
+          var newSelected = newSelected.filter(function(value, index, arr){
+              return value != target.value;
+          })
+        }
+      }
+      this.$emit('input', newSelected)
+    }
+  }
+}
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/components/fieldComponents/htmlBlock.vue b/src/components/fieldComponents/htmlBlock.vue
new file mode 100644
index 00000000..2b4906c0
--- /dev/null
+++ b/src/components/fieldComponents/htmlBlock.vue
@@ -0,0 +1,19 @@
+<template>
+  <div>
+    <p v-html="content"></p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'htmlBlock',
+
+  props: [ 
+    'label', 
+    'name',
+    'content'
+  ]
+}
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/components/fieldComponents/keyvalList.vue b/src/components/fieldComponents/keyvalList.vue
new file mode 100644
index 00000000..c72e7f84
--- /dev/null
+++ b/src/components/fieldComponents/keyvalList.vue
@@ -0,0 +1,84 @@
+<template>
+  <div>
+    <form @submit.prevent="handleMetadataSubmit">
+      <div class="uk-margin-remove uk-flex uk-flex-middle">
+        <div class="uk-margin-remove-top uk-padding-remove uk-grid-small uk-width-expand" uk-grid>
+          <div class="uk-margin-remove uk-width-1-2"><input v-model="newMetadata.key" class="uk-input uk-form-width-small uk-form-small" type="text" name="flavor" placeholder="Key"></div>
+          <div class="uk-margin-remove uk-width-1-2"><input v-model="newMetadata.value" class="uk-input uk-form-width-small uk-form-small" type="text" name="flavor" placeholder="Value"></div>
+        </div>
+        
+        <a href="#" v-on:click="handleMetadataSubmit()" class="uk-icon uk-margin-left"><i class="material-icons">add_circle</i></a>
+
+      </div>
+    </form>
+
+    <div v-for="(val, key) in value" :key="key" class="uk-width-1-1 uk-margin-small uk-margin-remove-left uk-margin-remove-right uk-flex uk-flex-middle">
+      <div class="uk-margin-remove-top uk-padding-remove uk-width-expand">
+        <labelInput :label="key" :value="value[key]" @input="value[key]=$event"/> 
+      </div>
+      <a href="#" v-on:click="delMetadataKey(key)" class="uk-icon uk-width-auto"><i class="material-icons">delete</i></a>
+    </div>
+  
+  </div>
+</template>
+
+<script>
+import labelInput from "../fieldComponents/labelInput"
+
+export default {
+  name: 'keyvalList',
+
+  components: {
+    labelInput
+  },
+
+  data: function () {
+    return {
+      newMetadata: {
+        key: "",
+        value: ""
+      }
+    }
+  },
+
+  props: [
+    'value'
+  ],
+
+  methods: {
+    handleMetadataSubmit: function () {
+      var newSelected = {}
+
+      if (this.value != null) {
+        Object.assign(newSelected, this.value)
+      }
+
+      newSelected[this.newMetadata.key] = this.newMetadata.value
+      this.newMetadata.key = "";
+      this.newMetadata.value = "";
+
+      this.$emit('input', newSelected)
+    },
+
+    delMetadataKey: function (key) {
+      var newSelected = {}
+
+      if (this.value != null) {
+        Object.assign(newSelected, this.value)
+      }
+
+      this.$delete(newSelected, key)
+
+      this.$emit('input', newSelected)
+    },
+
+    modifyValue: function (e, v) {
+      console.log(e)
+      console.log(v)
+    }
+
+  }
+}
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/components/fieldComponents/labelInput.vue b/src/components/fieldComponents/labelInput.vue
new file mode 100644
index 00000000..0011d572
--- /dev/null
+++ b/src/components/fieldComponents/labelInput.vue
@@ -0,0 +1,58 @@
+<template>
+  <div>
+    <label class="uk-form-label uk-text-bold">{{label}}</label>
+
+    <div @click="setEditing(true)" uk-tooltip="title: Click to edit value; delay: 250">
+
+      <div v-show="editing == false">
+        <label> {{value}} </label>
+      </div>
+
+      <input
+        v-show="editing == true"
+        class="uk-input uk-form-small"
+        type="text"
+        v-bind:name="name"
+        v-bind:value="value"
+        ref="textinput"
+        v-on:blur= "setEditing(false)"
+        @keyup.enter = "setEditing(false)"
+        @input="$emit('input', $event.target.value)"
+        autofocus
+      >
+    </div>
+
+
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'labelInput',
+
+  data: function () {
+    return {
+      editing: false
+    }
+  },
+
+  props: [
+    'name',
+    'label',
+    'value'
+  ],
+
+  methods: {
+    setEditing(editing) {
+      this.editing = editing
+      if (editing == true) {
+        this.$nextTick(() => this.$refs.textinput.focus())
+      }
+    }
+  },
+
+}
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/components/fieldComponents/numberInput.vue b/src/components/fieldComponents/numberInput.vue
new file mode 100644
index 00000000..57961726
--- /dev/null
+++ b/src/components/fieldComponents/numberInput.vue
@@ -0,0 +1,33 @@
+<template>
+  <div>
+    <label class="uk-form-label">{{label}}</label>
+
+    <input 
+      class="uk-input uk-form-small"
+      type="number"
+      :name="name"
+      :value="value"
+      @input="$emit('input', $event.target.value)"
+      :placeholder="placeholder"
+    >
+
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: 'numberInput',
+
+  props: [
+    'placeholder', 
+    'label', 
+    'name', 
+    'value'
+  ]
+
+}
+
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/components/fieldComponents/radioList.vue b/src/components/fieldComponents/radioList.vue
new file mode 100644
index 00000000..67b8dcb6
--- /dev/null
+++ b/src/components/fieldComponents/radioList.vue
@@ -0,0 +1,29 @@
+<template>
+  <div>
+    <label>{{label}}</label>
+
+    <div class="uk-form-controls">
+
+      <div v-for="option in options" :key="option">
+        <label><input class="uk-radio" type="radio" :name="name" :value="option" :checked="value==option" @input="$emit('input', $event.target.value)"> {{ option }}</label>
+      </div>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'radioList',
+
+  props: [
+    'options', 
+    'name', 
+    'label',
+    'value'
+  ]
+}
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/components/fieldComponents/selectList.vue b/src/components/fieldComponents/selectList.vue
new file mode 100644
index 00000000..6009767c
--- /dev/null
+++ b/src/components/fieldComponents/selectList.vue
@@ -0,0 +1,33 @@
+<template>
+  <div>
+    <label class="uk-form-label">{{label}}</label>
+
+    <select
+      class="uk-select uk-form-small"
+      :multiple="multi"
+      :value="value"
+      @input="$emit('input', $event.target.value)"
+    >
+      <option v-for="option in options" :key="option">
+        {{option}}
+      </option>
+
+    </select>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'selectList',
+
+  props: [
+    'multi', 
+    'options', 
+    'name', 
+    'label',
+    'value'
+  ]
+}
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/components/fieldComponents/tagList.vue b/src/components/fieldComponents/tagList.vue
new file mode 100644
index 00000000..59f27534
--- /dev/null
+++ b/src/components/fieldComponents/tagList.vue
@@ -0,0 +1,63 @@
+<template>
+  <div>
+
+    <form @submit.prevent="handleTagSubmit">
+      <div class="uk-margin-small uk-flex uk-flex-middle">
+
+        <div class="uk-margin-remove-top uk-width-expand">
+          <div class="uk-inline uk-width-1-1">
+            <span class="uk-form-icon"><i class="material-icons">label</i></span>
+            <input v-model="newTag" class="uk-input uk-form-small" type="text" name="flavor" placeholder="Tag">
+          </div>
+        </div>
+
+        <a href="#" v-on:click="handleTagSubmit()" class="uk-icon uk-margin-left"><i class="material-icons">add_circle</i></a>
+      </div>
+    </form>
+
+    <span v-for="tag in value" :key="tag" v-on:click="delTag(tag)" class="uk-label uk-margin-small-right deletable-label"> {{ tag }} </span>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'tagList',
+
+  data: function () {
+    return {
+      newTag: ""
+    }
+  },
+
+  props: [
+    'value'
+  ],
+
+  methods: {
+    handleTagSubmit: function () {
+      var newSelected = this.value != null ? [...this.value] : []  // Clone value array
+
+      newSelected.push(this.newTag)
+      this.newTag = "";
+
+      this.$emit('input', newSelected)
+    },
+
+    delTag: function (tag) {
+      var newSelected = this.value != null ? [...this.value] : []  // Clone value array
+
+      if (newSelected.includes(tag)) {
+        var newSelected = newSelected.filter(function(value, index, arr){
+            return value != tag;
+        })
+      }
+
+      this.$emit('input', newSelected)
+    }
+
+  }
+}
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/components/fieldComponents/textInput.vue b/src/components/fieldComponents/textInput.vue
new file mode 100644
index 00000000..b001f18d
--- /dev/null
+++ b/src/components/fieldComponents/textInput.vue
@@ -0,0 +1,30 @@
+<template>
+  <div>
+    <label class="uk-form-label">{{label}}</label>
+
+    <input 
+      class="uk-input uk-form-small"
+      type="text"
+      v-bind:name="name"
+      v-bind:value="value"
+      v-bind:placeholder="placeholder"
+      @input="$emit('input',$event.target.value)"
+    >
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'textInput',
+
+  props: [
+    'placeholder', 
+    'label', 
+    'name',
+    'value'
+  ]
+}
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/components/genericComponents/progressBar.vue b/src/components/genericComponents/progressBar.vue
new file mode 100644
index 00000000..6cd3e95d
--- /dev/null
+++ b/src/components/genericComponents/progressBar.vue
@@ -0,0 +1,142 @@
+<template>
+<div class="progress uk-margin-top uk-margin-horizontal-remove uk-padding-remove">
+  <div class="indeterminate"></div>
+</div>
+</template>
+
+<script>
+
+export default {
+  name: 'progressBar',
+
+  props: {},
+
+  methods: {
+    setThisTab(event, value) {
+      this.$emit('set-tab', event, this.id);
+    }
+  },
+
+  computed: {
+    tooltipOptions: function () {
+      var title = this.id.charAt(0).toUpperCase() + this.id.slice(1);
+      return `pos: right; title: ${title}; delay: 500`
+    },
+
+    classObject: function () {
+      return {
+        'tabicon-active': this.currentTab == this.id,
+        'uk-disabled': (this.requireConnection && !this.$store.getters.ready)
+      }
+    }
+
+  }
+}
+
+</script>
+
+<style lang="less" scoped>
+@import "../../assets/less/theme.less";
+
+.progress {
+  position: relative;
+  height: 5px;
+  display: block;
+  width: 100%;
+  background-color: rgba(180, 180, 180, 0.15);
+  border-radius: 2px;
+  background-clip: padding-box;
+  margin: 0.5rem 0 1rem 0;
+  overflow: hidden; 
+}
+
+.progress .determinate {
+  position: absolute;
+  background-color: inherit;
+  top: 0;
+  bottom: 0;
+  transition: width .3s linear; 
+}
+
+.progress .indeterminate, .progress .determinate {
+  background-color: @global-primary-background; 
+}
+
+.hook-inverse() {
+    .progress .indeterminate, .progress .determinate{
+        background-color: @inverse-primary-muted-color;
+    }
+}
+
+.progress .indeterminate:before {
+  content: '';
+  position: absolute;
+  background-color: inherit;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  will-change: left, right;
+  -webkit-animation: indeterminate 2.1s cubic-bezier(0.65, 0.815, 0.735, 0.395) infinite;
+          animation: indeterminate 2.1s cubic-bezier(0.65, 0.815, 0.735, 0.395) infinite; 
+}
+
+.progress .indeterminate:after {
+  content: '';
+  position: absolute;
+  background-color: inherit;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  will-change: left, right;
+  -webkit-animation: indeterminate-short 2.1s cubic-bezier(0.165, 0.84, 0.44, 1) infinite;
+          animation: indeterminate-short 2.1s cubic-bezier(0.165, 0.84, 0.44, 1) infinite;
+  -webkit-animation-delay: 1.15s;
+          animation-delay: 1.15s; 
+}
+
+@-webkit-keyframes indeterminate {
+  0% {
+    left: -35%;
+    right: 100%; }
+  60% {
+    left: 100%;
+    right: -90%; }
+  100% {
+    left: 100%;
+    right: -90%; } 
+}
+@keyframes indeterminate {
+  0% {
+    left: -35%;
+    right: 100%; }
+  60% {
+    left: 100%;
+    right: -90%; }
+  100% {
+    left: 100%;
+    right: -90%; } 
+}
+@-webkit-keyframes indeterminate-short {
+  0% {
+    left: -200%;
+    right: 100%; }
+  60% {
+    left: 107%;
+    right: -8%; }
+  100% {
+    left: 107%;
+    right: -8%; } 
+}
+@keyframes indeterminate-short {
+  0% {
+    left: -200%;
+    right: 100%; }
+  60% {
+    left: 107%;
+    right: -8%; }
+  100% {
+    left: 107%;
+    right: -8%; } 
+}
+
+</style>
\ No newline at end of file
diff --git a/src/components/genericComponents/tabContent.vue b/src/components/genericComponents/tabContent.vue
new file mode 100644
index 00000000..bcdef3d7
--- /dev/null
+++ b/src/components/genericComponents/tabContent.vue
@@ -0,0 +1,46 @@
+<template>
+  
+  <div 
+    v-if="!(this.requireConnection && !this.$store.getters.ready)"
+    v-bind:hidden="currentTab!=id" 
+    class="uk-width-expand"
+  >
+    <div class="section-heading">{{ id }}</div>
+    <div class="section-content"><slot></slot></div>
+    
+  </div>
+
+</template>
+
+<script>
+
+export default {
+  name: 'tabContent',
+
+  props: {
+    id: String,
+    currentTab: String,
+    requireConnection: Boolean,
+  },
+
+  methods: {},
+  computed: {}
+}
+
+</script>
+
+<style lang="less" scoped>
+
+.section-heading {
+  display: block;
+  font-size: 12px;
+  text-transform: uppercase;
+  line-height: 20px;
+  cursor: default;
+}
+
+.section-content, .section-heading {
+  padding: 9px 10px;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/components/genericComponents/tabIcon.vue b/src/components/genericComponents/tabIcon.vue
new file mode 100644
index 00000000..0c0bbc18
--- /dev/null
+++ b/src/components/genericComponents/tabIcon.vue
@@ -0,0 +1,62 @@
+<template>
+  <a 
+    href="#" 
+    class="uk-link"
+    :class="classObject" 
+    :uk-tooltip="tooltipOptions"
+    @click="setThisTab">
+    <slot></slot>
+  </a>
+
+</template>
+
+<script>
+
+export default {
+  name: 'tabIcon',
+
+  props: {
+    id: String,
+    currentTab: String,
+    requireConnection: Boolean
+  },
+
+  methods: {
+    setThisTab(event, value) {
+      this.$emit('set-tab', event, this.id);
+    }
+  },
+
+  computed: {
+    tooltipOptions: function () {
+      var title = this.id.charAt(0).toUpperCase() + this.id.slice(1);
+      return `pos: right; title: ${title}; delay: 500`
+    },
+
+    classObject: function () {
+      return {
+        'tabicon-active': this.currentTab == this.id,
+        'uk-disabled': (this.requireConnection && !this.$store.getters.ready)
+      }
+    }
+
+  }
+}
+
+</script>
+
+<style lang="less" scoped>
+// Custom UIkit CSS modifications
+@import "../../assets/less/theme.less";
+
+.tabicon-active {
+  color: @global-primary-background !important;
+}
+
+.hook-inverse() {
+    .tabicon-active {
+        color: @inverse-primary-muted-color !important;
+    }
+}
+
+</style>
\ No newline at end of file
diff --git a/src/components/panelLeft.vue b/src/components/panelLeft.vue
index 9cb3b72f..1249b12c 100644
--- a/src/components/panelLeft.vue
+++ b/src/components/panelLeft.vue
@@ -1,59 +1,160 @@
 <template>
-  <div id="panelLeft" class="uk-flex uk-flex-column uk-margin-remove uk-padding-remove uk-height-1-1">
-    <ul class="uk-flex-none uk-flex-center uk-margin-remove-top uk-margin-remove-bottom" uk-tab="swiping: false">
-      <li><a href="#" uk-switcher-item="connect" uk-icon="server" uk-tooltip="Connect"></a></li>
-      <li v-bind:class="disableIfDisconnected"><a href="#" uk-switcher-item="navigate" uk-icon="location" uk-tooltip="Navigate"></a></li>
-      <li v-bind:class="disableIfDisconnected"><a href="#" uk-switcher-item="capture" uk-icon="camera" uk-tooltip="Capture"></a></li>
-      <li v-bind:class="disableIfDisconnected"><a href="#" uk-switcher-item="plugins" uk-icon="git-fork" uk-tooltip="Plugins"></a></li>
-      <li><a href="#" uk-switcher-item="settings" uk-icon="settings" uk-tooltip="Settings"></a></li>
-    </ul>
-    <ul class="uk-switcher uk-padding-small uk-flex uk-flex-1 panel-content">
-      <li class="uk-width-expand"><paneConnect/></li>
-      <li class="uk-width-expand"><div v-if="$store.getters.ready"><paneNavigate/></div></li>
-      <li class="uk-width-expand"><div v-if="$store.getters.ready"><paneCapture/></div></li>
-      <li class="uk-width-expand"><div v-if="$store.getters.ready"><panePlugins/></div></li>
-      <li class="uk-width-expand"><paneSettings/></li>
-    </ul>
+  <div id="panel-left" class="uk-margin-remove uk-padding-remove uk-height-1-1" uk-grid>
+
+    <!-- Vertical tab bar -->
+    <div id="switcher-left" class="uk-flex uk-flex-column uk-padding-remove uk-width-auto uk-height-1-1">
+      <tabIcon id="connect" :requireConnection="false" :currentTab="currentTab" @set-tab="setTab">
+        <i class="material-icons">settings_ethernet</i>
+      </tabIcon>
+      <tabIcon id="navigate" :requireConnection="true" :currentTab="currentTab" @set-tab="setTab">
+        <i class="material-icons">gamepad</i>  
+      </tabIcon>
+      <tabIcon id="capture" :requireConnection="true" :currentTab="currentTab" @set-tab="setTab">
+        <i class="material-icons">camera_alt</i>
+      </tabIcon>
+      <tabIcon id="settings" :requireConnection="false" :currentTab="currentTab" @set-tab="setTab">
+        <i class="material-icons">settings</i>  
+      </tabIcon>
+
+      <hr>
+
+      <tabIcon v-for="plugin in $store.state.apiPlugins" @set-tab="setTab"
+        :key="plugin.id" 
+        :id="plugin.id" 
+        :requireConnection="plugin.requiresConnection" 
+        :currentTab="currentTab">
+        <i class="material-icons">{{ plugin.icon || "extension" }}</i> 
+      </tabIcon>
+
+    </div>
+
+    <!-- Corresponding vertical tab content -->
+    <div v-bind:hidden="!showControlBar" id="container-left" class="uk-padding-remove uk-height-1-1 uk-width-expand">
+      <div id="component-left" class="uk-padding-remove uk-flex uk-flex-1 panel-content">
+        <tabContent id="connect" :requireConnection="false" :currentTab="currentTab">
+          <paneConnect/>
+        </tabContent>
+        <tabContent id="navigate" :requireConnection="true" :currentTab="currentTab">
+          <paneNavigate/>
+        </tabContent>
+        <tabContent id="capture" :requireConnection="true" :currentTab="currentTab">
+          <paneCapture/>
+        </tabContent>
+        <tabContent id="settings" :requireConnection="false" :currentTab="currentTab">
+          <paneSettings/>
+        </tabContent>
+
+        <tabContent v-for="plugin in $store.state.apiPlugins" 
+          :key="plugin.id" 
+          :id="plugin.id" 
+          :requireConnection="plugin.requiresConnection" 
+          :currentTab="currentTab">
+
+          <div class="uk-flex uk-flex-column" v-for="form in plugin.forms" :key="`${form.route}/${form.name}`.replace(/\s+/g, '-').toLowerCase()" >
+            <JsonForm 
+              :name="form.name"
+              :route="form.route"
+              :isTask="form.isTask"
+              :submitLabel="form.submitLabel"
+              :selfUpdate="form.selfUpdate"
+              :schema="form.schema"/>
+            <hr>
+          </div>
+
+        </tabContent>
+  
+      </div>
+    </div>
+
   </div>
+
 </template>
 
 <script>
-// Import components
-import paneConnect from './paneConnect.vue'
-import paneNavigate from './paneNavigate.vue'
-import paneCapture from './paneCapture.vue'
-import panePlugins from './panePlugins.vue'
-import paneSettings from './paneSettings.vue'
+// Import axios for HTTP requests
+import axios from 'axios'
+
+// Import generic components
+import tabIcon from './genericComponents/tabIcon'
+import tabContent from './genericComponents/tabContent'
+
+// Import pane components
+import paneConnect from './controlComponents/paneConnect'
+import paneNavigate from './controlComponents/paneNavigate'
+import paneCapture from './controlComponents/paneCapture'
+import paneSettings from './controlComponents/paneSettings'
+
+// Import plugin components
+import JsonForm from './pluginComponents/JsonForm'
 
 // Export main app
 export default {
   name: 'panelLeft',
 
   components: {
+    tabIcon,
+    tabContent,
     paneConnect,
     paneNavigate,
     paneCapture,
-    panePlugins,
-    paneSettings
+    paneSettings,
+    JsonForm
+  },
+
+  data: function () {
+    return {
+      currentTab: 'connect',
+      showControlBar: true
+    }  
+  },
+
+  methods: {
+    setTab: function(event, tab) {
+      if (this.currentTab == tab) {
+        this.showControlBar = !this.showControlBar
+        this.currentTab = 'none'
+      }
+      else {
+        this.showControlBar = true
+        this.currentTab = tab
+      }
+    },
+
   },
 
   computed: {
-    disableIfDisconnected: function () {
-      return {
-        'uk-disabled': !this.$store.getters.ready
-      }
-    }
+    pluginApiUri: function () {
+      return this.$store.getters.uri + "/plugin"
+    },
   }
 
 }
 </script>
 
-<style lang="less">
-.uk-tab {
-    padding-left: 0;
-}
-.panel-content {
+<style scoped lang="less">
+
+#component-left {
   width: 300px;
-  overflow: auto;
 }
+
+#container-left {
+  overflow: hidden auto;
+  background-color: rgba(180, 180, 180, 0.025);
+}
+
+#container-left, #switcher-left {
+  border-width: 0 1px 0 0;
+  border-style: solid;
+  border-color: rgba(180, 180, 180, 0.25)
+}
+
+#switcher-left a{
+  padding: 10px 16px;
+}
+
+#switcher-left{
+  background-color: rgba(180, 180, 180, 0.1);
+  padding-top: 2px !important;
+}
+
 </style>
diff --git a/src/components/panelDisplay.vue b/src/components/panelRight.vue
similarity index 56%
rename from src/components/panelDisplay.vue
rename to src/components/panelRight.vue
index 66b705af..f3db8871 100644
--- a/src/components/panelDisplay.vue
+++ b/src/components/panelRight.vue
@@ -1,30 +1,34 @@
 <template>
-  <div id="panelDisplay" class="uk-flex uk-flex-column uk-margin-remove uk-padding-remove uk-height-1-1">
+  <!-- Tabbed panel for gallery and live views -->
+  <div id="panel-right" class="uk-flex uk-flex-column uk-margin-remove uk-padding-remove uk-width-expand uk-height-1-1">
     <ul class="uk-flex-none uk-flex-center uk-margin-remove-bottom uk-text-center" uk-tab="swiping: false">
-      <li><a href="#" uk-switcher-item="preview" uk-icon="play-circle" uk-tooltip="Live"></a></li>
-      <li v-bind:class="{'uk-disabled': !this.$store.getters.ready}"><a href="#" uk-switcher-item="gallery" uk-icon="image" uk-tooltip="Captures"></a></li>
+        <li><a href="#" uk-switcher-item="preview">Live</a></li>
+        <li v-bind:class="{'uk-disabled': !this.$store.getters.ready}"><a href="#" uk-switcher-item="gallery">Gallery</a></li>
     </ul>
     <ul class="uk-switcher uk-flex uk-flex-1">
-      <li class="uk-height-1-1 uk-width-1-1 clickableTab" id="streamDisplayTab"><streamDisplay/></li>
-      <li class="uk-height-1-1 uk-width-1-1 uk-overflow-auto" id="galleryDisplayTab"><galleryDisplay/></li>
+        <li class="uk-height-1-1 uk-width-1-1 clickableTab" id="streamDisplayTab"><streamDisplay/></li>
+        <li class="uk-height-1-1 uk-width-1-1 uk-overflow-auto" id="galleryDisplayTab"><galleryDisplay/></li>
     </ul>
   </div>
 </template>
 
 <script>
+// Import axios for HTTP requests
+import axios from 'axios'
+// Import basic UIkit
 import UIkit from 'uikit';
 
 // Import components
-import streamDisplay from './paneDisplayComponents/streamDisplay.vue'
-import galleryDisplay from './paneDisplayComponents/galleryDisplay.vue'
+import streamDisplay from './viewComponents/streamDisplay.vue'
+import galleryDisplay from './viewComponents/galleryDisplay.vue'
 
 // Export main app
 export default {
-  name: 'panelDisplay',
+  name: 'panelRight',
 
   components: {
     streamDisplay,
-    galleryDisplay
+    galleryDisplay,
   },
 
   mounted() {
@@ -54,4 +58,9 @@ export default {
 </script>
 
 <style scoped lang="less">
+
+.uk-tab {
+  padding-left: 0;
+}
+
 </style>
diff --git a/src/components/pluginComponents/JsonForm.vue b/src/components/pluginComponents/JsonForm.vue
new file mode 100644
index 00000000..1364419c
--- /dev/null
+++ b/src/components/pluginComponents/JsonForm.vue
@@ -0,0 +1,233 @@
+<template>
+  <div>
+
+    <div class="uk-flex">
+      <div class="uk-text-bold uk-text-uppercase uk-width-expand">{{ name }}</div>
+      <a href="#" v-if="selfUpdate" v-on:click="getFormData()" class="uk-icon uk-width-auto"><i class="material-icons">cached</i></a>
+    </div>
+
+    <form @submit.prevent="submitForm" class="uk-form-stacked">
+
+      <div v-for="(field, index) in schema" :key="index"> 
+        <div v-if="Array.isArray(field)" class="uk-grid-small uk-width-1-1 uk-child-width-expand" uk-grid>
+          <div v-for="(subfield, subindex) in field" :key="subindex"> 
+            <component
+              :is="subfield.fieldType"
+              v-model="formData[subfield.name]"
+              v-bind="subfield">
+            </component>
+          </div>
+        </div>
+        
+        <component
+          :is="field.fieldType"
+          v-model="formData[field.name]"
+          v-bind="field">
+        </component>
+      </div>
+
+      <div v-if="taskRunning">
+        <progressBar/>
+      </div>
+
+      <button v-bind:hidden="taskRunning" class="uk-button uk-button-primary uk-form-small uk-float-right uk-margin-small uk-width-1-1">{{ submitLabel }}</button>
+
+    </form>
+
+  </div>
+
+</template>
+
+<script>
+import axios from 'axios'
+
+import numberInput from "../fieldComponents/numberInput"
+import selectList from "../fieldComponents/selectList"
+import textInput from "../fieldComponents/textInput"
+import htmlBlock from "../fieldComponents/htmlBlock"
+import radioList from "../fieldComponents/radioList"
+import checkList from "../fieldComponents/checkList"
+import tagList from "../fieldComponents/tagList"
+import keyvalList from "../fieldComponents/keyvalList"
+
+import progressBar from "../genericComponents/progressBar"
+
+export default {
+  name: 'JsonForm',
+
+  components: { 
+    numberInput, 
+    selectList, 
+    textInput,
+    htmlBlock,
+    radioList,
+    checkList,
+    tagList,
+    keyvalList,
+    progressBar
+  },
+
+  props: {
+    'name': {
+      type: String,
+      required: false,
+      default: "Plugin"
+    },
+    'schema': {
+      type: Array,
+      required: true
+    },
+    'route': {
+      type: String,
+      required: true
+    },
+    'isTask': {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    'submitLabel': {
+      type: String,
+      required: false,
+      default: "Submit"
+    },
+    'selfUpdate': {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+  },
+
+  data: function () {
+    return {
+      formData: {},
+      taskRunning: false
+    }
+  },
+
+  created() {
+    this.initialiseFormData()
+
+    if (this.selfUpdate) {
+      this.getFormData()
+    }
+  },
+
+  methods: {
+    initialiseFormData() {
+      /* 
+      This function initialises the form data.
+      Limitations in Vue mean that newly created formData properties are not reactive.
+      GETting formData values from the server creates the properties, but the form components
+      don't get updated because of this limitation.
+      Here, we step through the form schema, and properly create reactive properties for each component.
+      */
+      for (const field of this.schema) {
+        if (Array.isArray(field)) {
+          for (const subfield of field) {
+          console.log(subfield.name)
+          this.$set(this.formData, subfield.name, null)
+          }
+        }
+        else {
+          console.log(field.name)
+          this.$set(this.formData, field.name, null)
+        }
+        
+      }
+    },
+
+    updateForm(fieldName, value) {
+      this.$set(this.formData, fieldName, value);
+      this.$emit('input', this.formData)
+    },
+
+    submitForm() {
+      if (this.isTask == true) {
+        this.newLongRequest(this.formData)
+      }
+      else {
+        this.newQuickRequest(this.formData)
+      }
+    },
+
+    getFormData: function() {
+      // Send a quick request
+      axios.get(this.submitApiUri)
+        .then(response => { 
+          console.log(response.data)
+          Object.assign(this.formData, response.data)
+        })
+        .catch(error => {
+          this.modalError(error) // Let mixin handle error
+        })
+    },
+
+    newQuickRequest: function(params) {
+      console.log(this.submitApiUri)
+      console.log(params)
+      // Send a quick request
+      axios.post(this.submitApiUri, params)
+        .then(response => { 
+          // Do something with the response
+          console.log(response)
+          // Update the form data if we're self-updating
+          if (this.selfUpdate) {
+            this.getFormData()
+          }
+        })
+        .catch(error => {
+          this.modalError(error) // Let mixin handle error
+        })
+    },
+
+    newLongRequest: function(params) {
+        this.taskRunning = true
+        axios.post(this.submitApiUri, params)
+        .then(response => { 
+          console.log("Task ID: " + response.data.id)
+          // Start the store polling TaskId for success
+          return this.$store.dispatch('pollTask', [response.data.id, null, null])
+        })
+        .then(response => {
+          // Do something with the response
+          console.log(response)
+        })
+        .catch(error => {
+          this.modalError(error) // Let mixin handle error
+        })
+        .finally(() => {
+          console.log("Cleaning up after task.")
+          this.taskRunning = false
+          // Update the form data if we're self-updating
+          if (this.selfUpdate) {
+            this.getFormData()
+          }
+        })
+    },
+
+  },
+
+  computed: {
+    pluginApiUri: function () {
+      return this.$store.getters.uri + "/plugin"
+    },
+
+    submitApiUri: function () {
+      return this.pluginApiUri + this.route
+    },
+
+  }
+
+}
+</script>
+
+<style scoped>
+.flex-container {
+  display: flex;
+}
+
+.flex-container > div {
+  flex-basis: 100%
+}
+</style>
\ No newline at end of file
diff --git a/src/components/paneDisplayComponents/galleryComponents/captureCard.vue b/src/components/viewComponents/galleryComponents/captureCard.vue
similarity index 96%
rename from src/components/paneDisplayComponents/galleryComponents/captureCard.vue
rename to src/components/viewComponents/galleryComponents/captureCard.vue
index 36731b3c..041d1fc5 100644
--- a/src/components/paneDisplayComponents/galleryComponents/captureCard.vue
+++ b/src/components/viewComponents/galleryComponents/captureCard.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="captureCard uk-card uk-card-default uk-card-hover uk-padding-remove uk-width-medium uk-margin-right" v-bind:class="{ 'uk-card-secondary': $store.state.globalSettings.darkMode }">
+	<div class="captureCard uk-card uk-card-default uk-card-hover uk-padding-remove uk-width-medium" v-bind:class="{ 'uk-card-secondary': $store.state.globalSettings.darkMode }">
 
     <div class="uk-card-media-top">
         
@@ -13,7 +13,9 @@
       <div class="uk-width-1-1 uk-margin-small uk-margin-remove-left uk-margin-remove-right" uk-grid>
         <div class="uk-margin-remove-top uk-padding-remove uk-width-expand">{{ metadata.filename }}</div>
         <div class="uk-margin-remove-top uk-padding-remove uk-width-auto">
-          <a href="#" v-on:click="delCaptureConfirm()" class="uk-icon-link" uk-icon="trash"></a>
+          <a href="#" v-on:click="delCaptureConfirm()" class="uk-icon">
+            <i class="material-icons">delete</i>
+          </a>
         </div>
       </div>
 
@@ -59,7 +61,7 @@
       <form class="uk-modal-dialog uk-modal-body uk-margin-auto-vertical" v-bind:class="{ 'uk-light uk-background-secondary': $store.state.globalSettings.darkMode }" @submit.prevent="handleTagSubmit">
 
           <div class="uk-inline">
-            <span class="uk-form-icon" uk-icon="icon: tag"></span>
+            <span class="uk-form-icon"><i class="material-icons">label</i></span>
             <input v-model="newtag" class="uk-input uk-form-width-medium uk-form-small" type="text" name="tagname" placeholder="tag">
 
             <button class="uk-button uk-button-default uk-margin-left uk-form-small uk-modal-close" type="button">Cancel</button>
diff --git a/src/components/paneDisplayComponents/galleryComponents/scanCard.vue b/src/components/viewComponents/galleryComponents/scanCard.vue
similarity index 98%
rename from src/components/paneDisplayComponents/galleryComponents/scanCard.vue
rename to src/components/viewComponents/galleryComponents/scanCard.vue
index c0182177..e4f8761c 100644
--- a/src/components/paneDisplayComponents/galleryComponents/scanCard.vue
+++ b/src/components/viewComponents/galleryComponents/scanCard.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="captureCard uk-card uk-card-primary uk-card-hover uk-padding-remove uk-width-medium uk-margin-right">
+	<div class="captureCard uk-card uk-card-primary uk-card-hover uk-padding-remove uk-width-medium">
 
     <div class="uk-card-media-top">
 
diff --git a/src/components/paneDisplayComponents/galleryDisplay.vue b/src/components/viewComponents/galleryDisplay.vue
similarity index 91%
rename from src/components/paneDisplayComponents/galleryDisplay.vue
rename to src/components/viewComponents/galleryDisplay.vue
index 277886b7..9eac6205 100644
--- a/src/components/paneDisplayComponents/galleryDisplay.vue
+++ b/src/components/viewComponents/galleryDisplay.vue
@@ -4,8 +4,8 @@
     <nav class="uk-navbar-container uk-navbar-transparent navbar" uk-navbar="mode: click">
         <div class="uk-navbar-left uk-padding-remove-top uk-padding-remove-bottom">
             <ul class="uk-navbar-nav">
-              <li v-bind:class="[sortDescending ? 'uk-active' : '']"><a v-on:click="sortDescending=true;" class="uk-icon-link" href="#" uk-icon="icon: arrow-down"></a></li>
-              <li v-bind:class="[!sortDescending ? 'uk-active' : '']"><a v-on:click="sortDescending=false;" class="uk-icon-link" href="#" uk-icon="icon: arrow-up"></a></li>
+              <li v-bind:class="[sortDescending ? 'uk-active' : '']"><a v-on:click="sortDescending=true;" class="uk-icon" href="#"><i class="material-icons">keyboard_arrow_down</i></a></li>
+              <li v-bind:class="[!sortDescending ? 'uk-active' : '']"><a v-on:click="sortDescending=false;" class="uk-icon" href="#"><i class="material-icons">keyboard_arrow_up</i></a></li>
               <li>
                 <a href="#">Filter</a>
                 <div class="uk-navbar-dropdown" v-bind:class="{ 'uk-light uk-background-secondary': $store.state.globalSettings.darkMode }">
@@ -25,14 +25,16 @@
 
     <div v-if="$store.getters.ready" class="uk-padding-remove-top" uk-lightbox="toggle: .lightbox-link">
 
-      <div v-if="(galleryFolder)" class="uk-padding uk-padding-remove-right uk-padding-remove-bottom">
-        <a href="#" v-on:click="galleryFolder=''" class="uk-icon-button" uk-icon="arrow-left"></a> 
-        <h3 class="uk-inline uk-float-right uk-margin-remove"><b>SCAN</b> {{ allScans[galleryFolder].metadata.filename }}</h3>
+      <div v-if="(galleryFolder)" class="uk-flex uk-flex-middle uk-padding uk-padding-remove-horizontal uk-padding-remove-bottom">
+        <a href="#" v-on:click="galleryFolder=''" class="uk-icon uk-margin-remove"><i class="material-icons">arrow_back</i></a>
+        <div class="uk-margin-left">
+          <h3 class="uk-margin-remove uk-margin-left"><b>SCAN</b> {{ allScans[galleryFolder].metadata.filename }}</h3>
+        </div>
       </div>
 
-      <div class="uk-grid-medium uk-padding uk-padding-remove-right uk-grid-match" uk-grid>
+      <div class="uk-grid-medium uk-grid-match uk-margin-top" uk-grid>
         
-        <div v-for="item in sortedItems" :key="item.metadata.id" class="uk-remove-padding-remove-left" >
+        <div v-for="item in sortedItems" :key="item.metadata.id">
           <scanCard 
             v-if="'isScan' in item"
             :metadata="item.metadata"
diff --git a/src/components/paneDisplayComponents/streamDisplay.vue b/src/components/viewComponents/streamDisplay.vue
similarity index 65%
rename from src/components/paneDisplayComponents/streamDisplay.vue
rename to src/components/viewComponents/streamDisplay.vue
index 8ccbb654..342caf7d 100644
--- a/src/components/paneDisplayComponents/streamDisplay.vue
+++ b/src/components/viewComponents/streamDisplay.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="streamDisplay uk-width-1-1 uk-height-1-1 scrollTarget" id="streamDisplay" ref="streamDisplay">
+	<div ref="streamDisplay" class="stream-display uk-width-1-1 uk-height-1-1 scrollTarget" id="stream-display">
 
 		<img class="uk-align-center uk-margin-remove-bottom" v-on:dblclick="clickmonitor" v-if="showStream" v-bind:src="streamImgUri" alt="Stream">
 
@@ -23,33 +23,37 @@ import axios from 'axios'
 
 // Export main app
 export default {
-  name: 'streamDisplay',
+  name: 'stream-display',
 
   data: function () {
     return {
 			displaySize: [0, 0],
 			displayPosition: [0, 0],
 			GpuPreviewActive: false,
-      resizeTeimoutId: setTimeout(this.doneResizing, 500)
+			resizeTimeoutId: setTimeout(this.doneResizing, 500)
     }
   },
 
   mounted() {
-		// A global signal listener to change the GPU preview state
-    this.$root.$on('globalResizePreview', (state) => {
-			this.handleDoneResize()
-		})
     // A global signal listener to change the GPU preview state
     this.$root.$on('globalTogglePreview', (state) => {
 			console.log(`Toggling preview to ${state}`)
 			this.previewRequest(state)
 		})
+
+		// Mutation observer
+		this.sizeObserver = new ResizeObserver(entries => {
+			this.handleResize()  // For any element attached to the observer, run handleResize() on change
+			entries.forEach(entry => {})  // Optional: Run something per entry
+		});
+		// Fetch streamDisplay by ref
+		const streamDisplayElement = this.$refs.streamDisplay.parentNode;
+		// Attach streamDisplay to the size observer
+		this.sizeObserver.observe(streamDisplayElement);
+
 	},
 
 	created: function () {
-		// Add resize listener
-		window.addEventListener('resize', this.handleResize);
-		
 		// Watch for host 'ready'
 		this.$store.watch(
 			(state)=>{
@@ -57,29 +61,27 @@ export default {
 			},
 			(newValue, oldValue)=>{
 				// 'ready' changed, so do something
-				console.log(oldValue)
-				console.log(newValue)
 				this.previewRequest(this.$store.state.globalSettings.autoGpuPreview)
 			}
 		)
 	},
 
 	beforeDestroy: function () {
-		// Remove resize listener
-		window.removeEventListener('resize', this.handleResize)
+		// Disconnect the size observer
+		this.sizeObserver.disconnect()
 	},
 
   methods: {
     clickmonitor: function(event) {
 			// Calculate steps from event coordinates and store config FOV
-			var xCoordinate = event.offsetX;
-			var yCoordinate = event.offsetY;
+			let xCoordinate = event.offsetX;
+			let yCoordinate = event.offsetY;
 
-			var xRelative = (0.5*event.target.offsetWidth - xCoordinate)/event.target.offsetWidth;
-			var yRelative = (0.5*event.target.offsetHeight - yCoordinate)/event.target.offsetHeight;
+			let xRelative = (0.5*event.target.offsetWidth - xCoordinate)/event.target.offsetWidth;
+			let yRelative = (0.5*event.target.offsetHeight - yCoordinate)/event.target.offsetHeight;
 
-			var xSteps = xRelative * this.$store.state.apiConfig.fov[0];
-			var ySteps = yRelative * this.$store.state.apiConfig.fov[1];
+			let xSteps = xRelative * this.$store.state.apiConfig.fov[0];
+			let ySteps = yRelative * this.$store.state.apiConfig.fov[1];
 
 			// Emit a signal to move, acted on by panelNavigate.vue
 			this.$root.$emit('globalMoveEvent', xSteps, ySteps, 0, false)
@@ -87,12 +89,13 @@ export default {
 		
 		handleResize: function(event) {
 			// Only fires resize event after no resize in 500ms (prevents resize event spam)
-			clearTimeout(this.resizeTeimoutId);
-			this.resizeTeimoutId = setTimeout(this.handleDoneResize, 500)
+			clearTimeout(this.resizeTimeoutId);
+			this.resizeTimeoutId = setTimeout(this.handleDoneResize, 250)
 		},
 
 		handleDoneResize: function() {
 			// Recalculate size
+			console.log("Recalculating frame size")
 			this.recalculateSize();
 			if (this.$store.state.globalSettings.autoGpuPreview == true && this.GpuPreviewActive == true) {
 				// Reload preview
@@ -101,23 +104,24 @@ export default {
 		},
 
 		recalculateSize: function () {
-			console.log("Recalculating window dimensions...")
-			// Stacking parentNode is a hacky fix
-			// For some reason, when switching tabs, width was always half what it should be,
-			// until the size was recalculated at some later time. Probably something to do
-			// with tab transition. This parentNode stuff instead reads the size of the tab
-			// container, irrespective of WHICH tab is selected. It's nasty, but works.
-			let element = this.$refs.streamDisplay.parentNode.parentNode;
+			let element = this.$refs.streamDisplay.parentNode;
+			let bound = element.getBoundingClientRect()
 
-			let size = [element.clientWidth, element.clientHeight];
+			let elementSize = [bound.width, bound.height]
 
-			let elem_pos = [element.getBoundingClientRect().left, element.getBoundingClientRect().top];
-			let wind_pos = [window.screenX, window.screenY];
-			let navHeight = window.outerHeight - window.innerHeight;
-			let position = [Math.max(0, wind_pos[0] + elem_pos[0]), Math.max(0, wind_pos[1] + elem_pos[1] + navHeight)];
+			let elementPositionOnWindow = [bound.left, bound.top]
+			let windowPositionOnDisplay = [window.screenX, window.screenY]
+			let windowChromeHeight = window.outerHeight - window.innerHeight
+			let elementPositionOnDisplay = [
+				Math.max(0, windowPositionOnDisplay[0] + elementPositionOnWindow[0]), 
+				Math.max(0, windowPositionOnDisplay[1] + elementPositionOnWindow[1] + windowChromeHeight)
+			]
 
-			this.displaySize = size;
-			this.displayPosition = position;
+			this.displaySize = elementSize
+			this.displayPosition = elementPositionOnDisplay
+
+			console.log(`Size: ${this.displaySize}`)
+			console.log(`Position: ${this.displayPosition}`)
 		},
 
     previewRequest: function(state) {
@@ -147,7 +151,7 @@ export default {
 					}
 				}
 				else {
-					var letpayload = {}
+					var payload = {}
 				}
 
 				// Send preview request
@@ -182,13 +186,13 @@ export default {
 </script>
 
 <style scoped lang="less">
-.streamDisplay img {
+.stream-display img {
 	height: 100%;
 	text-align: center;
 	object-fit: contain
 }
 
-.streamDisplay {
+.stream-display {
 	width: 100%;
 	height: 100%;
 }
diff --git a/src/main.app.js b/src/main.app.js
new file mode 100644
index 00000000..27d2b187
--- /dev/null
+++ b/src/main.app.js
@@ -0,0 +1,15 @@
+// Load settings store from main process
+const { store } = require('electron').remote.require('./store')
+
+// Load extra modules we'll be using
+const { Titlebar, Color } = require('custom-electron-titlebar');
+
+// Only show custom menubar if current window has no frame
+if (store.get('drawCustomTitleBar') == true) {
+    new Titlebar({
+        backgroundColor: Color.fromHex('#c5247f'),
+        icon: './titleicon.svg'
+    });
+}
+
+console.log("Loaded main.app.js for electron-renderer functionality")
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 1c494b89..a4e4129b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,9 +3,9 @@ import App from './App.vue'
 import store from './store'
 
 import UIkit from 'uikit';
-// Import UIkit icon set
-import Icons from 'uikit/dist/js/uikit-icons';
-UIkit.use(Icons);
+
+// Import MD icons
+import 'material-design-icons/iconfont/material-icons.css'
 
 Vue.config.productionTip = false
 
@@ -36,8 +36,20 @@ Vue.mixin({
       return new Promise(showModal)
     },
 
-    modalNotify: function(message) {
-      UIkit.notification({message: message, status: 'success'})
+    modalNotify: function(message, status = 'success') {
+      UIkit.notification({message: message, status: status})
+    },
+
+    modalDialog: function(title, message) {
+      UIkit.modal.dialog(`
+        <button class="uk-modal-close-default" type="button" uk-close></button>
+        <div class="uk-modal-header">
+          <h2 class="uk-modal-title">${title}</h2>
+        </div>
+        <div class="uk-modal-body">
+          <p>${message}</p>
+        </div>
+      `);
     },
 
     modalError: function(error) {
@@ -66,7 +78,7 @@ Vue.mixin({
         console.log(errormsg)
       }
       this.$store.commit('setError', errormsg);
-      UIkit.notification({message: `<span uk-icon=\'icon: warning\'></span> ${errormsg}`, status: 'danger'})
+      UIkit.notification({message: `${errormsg}`, status: 'danger'})
     },
 
     getLocalStorageObj: function(keyName) {
diff --git a/src/store.js b/src/store.js
index 5197cfb1..88c03ee6 100644
--- a/src/store.js
+++ b/src/store.js
@@ -15,6 +15,7 @@ export default new Vuex.Store({
     error: '',
     apiConfig: {},
     apiState: {},
+    apiPlugins: [],
     globalSettings: {
       disableStream: false,
       autoGpuPreview: false,
@@ -38,6 +39,9 @@ export default new Vuex.Store({
     commitState(state, stateData) {
       state.apiState = stateData;
     },
+    commitPlugins(state, pluginData) {
+      state.apiPlugins = pluginData;
+    },
     changeSetting(state, [key, value]) {
       state.globalSettings[key] = value;
     },
@@ -47,6 +51,7 @@ export default new Vuex.Store({
       state.error = null
       state.apiConfig = {}
       state.apiState = {}
+      state.apiPlugins = []
     },
     setConnected(state) {
       state.waiting = false
@@ -72,6 +77,9 @@ export default new Vuex.Store({
         .then (() => {
           context.dispatch('updateState')
         })
+        .then (() => {
+          context.dispatch('updatePlugins')
+        })
         .then (() => {
           resolve()
         })
@@ -116,6 +124,25 @@ export default new Vuex.Store({
       return new Promise(sendRequest)
     },
 
+    updatePlugins(context, uri=`${context.getters.uri}/plugin`) {
+      context.commit('changeWaiting', true)
+  
+      var sendRequest = function(resolve, reject) {
+        axios.get(uri)
+        .then(response => { 
+          console.log("PLUGINS")
+          console.log(response.data)
+          context.commit('commitPlugins', response.data)
+          context.commit('setConnected')
+          resolve()
+        })
+        .catch(error => {
+          reject(new Error(error))
+        })
+      }
+      return new Promise(sendRequest)
+    },
+
     pollTask(context, [taskId, timeout, interval]) {
       var endTime = Number(new Date()) + (timeout*1000 || 30000);
       interval = interval*1000 || 500;
@@ -128,7 +155,7 @@ export default new Vuex.Store({
           var result = response.data.status
           // If the task ends with success
           if(result == 'success') {
-              resolve(response.data.return)
+            resolve(response.data)
           }
           // If task ends with an error
           else if (result == 'error') {
@@ -136,7 +163,7 @@ export default new Vuex.Store({
           }
           // If the condition isn't met but the timeout hasn't elapsed, go again
           else if (Number(new Date()) < endTime) {
-              setTimeout(checkCondition, interval, resolve, reject)
+            setTimeout(checkCondition, interval, resolve, reject)
           }
           // Didn't match and too much time, reject!
           else {
diff --git a/vue.config.js b/vue.config.js
index ad3386d1..4e2ec2e3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,3 +1,24 @@
+var webpack = require('webpack');
+
 module.exports = {
+  configureWebpack: config => {
+    config.target = process.env.VUE_APP_TARGET || 'web',
+    config.entry = (process.env.VUE_APP_TARGET == 'electron-renderer') 
+    ? {
+      main: './src/main.js',
+      app: './src/main.app.js'
+    }
+    :{
+      main: './src/main.js',
+    },
+    config.plugins.push(
+      new webpack.DefinePlugin({
+        'process.env': {
+          PACKAGE: JSON.stringify(require('./package.json'))
+        }
+      })
+    )
+  },
+  outputDir: (process.env.VUE_APP_TARGET == 'electron-renderer') ? './app/dist' : './dist',
   publicPath: ''
 }
\ No newline at end of file