From 276bfe68c61d8443671959f564eb743055e45de1 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Mar 2020 10:51:43 +0100
Subject: [PATCH 01/31] Upgraded to Electron 8.2.0

---
 app/builder-config-base.yaml      | 2 ++
 app/builder-config-raspi-pre.yaml | 1 -
 app/builder-config-raspi.yaml     | 1 -
 app/builder-config-x86_64.yaml    | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/builder-config-base.yaml b/app/builder-config-base.yaml
index 1a1e9fe8..a037a3f1 100644
--- a/app/builder-config-base.yaml
+++ b/app/builder-config-base.yaml
@@ -1,3 +1,4 @@
+electronVersion: 8.2.0
 directories:
   output: release-builds
   buildResources: app/resources
@@ -26,5 +27,6 @@ files:
       - '!**/app/installers${/*}'
       - '!**/hooks${/*}'
       - '!**/platforms${/*}'
+      - '!**/dist*${/*}'
       - '!**/release-builds${/*}'
       - '!src${/*}'
diff --git a/app/builder-config-raspi-pre.yaml b/app/builder-config-raspi-pre.yaml
index cfeb66f0..1ed62c8d 100644
--- a/app/builder-config-raspi-pre.yaml
+++ b/app/builder-config-raspi-pre.yaml
@@ -1,6 +1,5 @@
 extends: app/builder-config-base.yaml
 artifactName: ${name}-${os}-${arch}.${ext}
-electronVersion: 3.0.13
 linux:
   target:
     - target: deb
diff --git a/app/builder-config-raspi.yaml b/app/builder-config-raspi.yaml
index 15c0fe82..1f06fc2d 100644
--- a/app/builder-config-raspi.yaml
+++ b/app/builder-config-raspi.yaml
@@ -1,5 +1,4 @@
 extends: app/builder-config-base.yaml
-electronVersion: 3.0.13
 linux:
   target:
     - target: deb
diff --git a/app/builder-config-x86_64.yaml b/app/builder-config-x86_64.yaml
index 406fb7a5..ecfd3eaf 100644
--- a/app/builder-config-x86_64.yaml
+++ b/app/builder-config-x86_64.yaml
@@ -1,8 +1,8 @@
 extends: app/builder-config-base.yaml
-electronVersion: 4.1.5
 win:
   target:
     - NSIS
+    - portable
   icon: app/icons/win/icon.ico
 linux:
   target:

From 2f285814abe14da761fa5ff1bc6dae8230abb5f6 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Mar 2020 11:11:55 +0100
Subject: [PATCH 02/31] Removed portable build target

---
 app/builder-config-x86_64.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/builder-config-x86_64.yaml b/app/builder-config-x86_64.yaml
index ecfd3eaf..a1df4e14 100644
--- a/app/builder-config-x86_64.yaml
+++ b/app/builder-config-x86_64.yaml
@@ -2,7 +2,6 @@ extends: app/builder-config-base.yaml
 win:
   target:
     - NSIS
-    - portable
   icon: app/icons/win/icon.ico
 linux:
   target:

From c5976d64a78d70b7e3cbe423f622c75212e20f83 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Mar 2020 11:23:58 +0100
Subject: [PATCH 03/31] Fixed excluding dist-lite from electron builds

---
 app/builder-config-base.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/builder-config-base.yaml b/app/builder-config-base.yaml
index a037a3f1..eba2306d 100644
--- a/app/builder-config-base.yaml
+++ b/app/builder-config-base.yaml
@@ -27,6 +27,6 @@ files:
       - '!**/app/installers${/*}'
       - '!**/hooks${/*}'
       - '!**/platforms${/*}'
-      - '!**/dist*${/*}'
+      - '!**/dist-lite*${/*}'
       - '!**/release-builds${/*}'
       - '!src${/*}'

From 3c32dab014ef70175a3f33b72ba4e9b96c7cebfb Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Mar 2020 12:15:01 +0100
Subject: [PATCH 04/31] Removed fixed Electron version

---
 app/builder-config-base.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/builder-config-base.yaml b/app/builder-config-base.yaml
index eba2306d..d471a661 100644
--- a/app/builder-config-base.yaml
+++ b/app/builder-config-base.yaml
@@ -1,4 +1,3 @@
-electronVersion: 8.2.0
 directories:
   output: release-builds
   buildResources: app/resources

From 5fb1a887d953e3192da72dfb685879cab252a94d Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Mar 2020 12:16:32 +0100
Subject: [PATCH 05/31] Added auto-update download progress bar

---
 app/app.js        | 35 ++++++++++++++++++++++++++++++++++-
 package-lock.json | 13 ++++++++++---
 package.json      |  1 +
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/app/app.js b/app/app.js
index 3fc7e473..a94c22a7 100644
--- a/app/app.js
+++ b/app/app.js
@@ -4,6 +4,7 @@ const { dialog } = require("electron");
 const updater = require("electron-updater");
 const autoUpdater = updater.autoUpdater;
 const contextMenu = require("electron-context-menu");
+const ProgressBar = require("electron-progressbar");
 const path = require("path");
 
 // Attach settings store
@@ -26,12 +27,44 @@ autoUpdater.on("update-available", function(info) {
     },
     buttonIndex => {
       if (buttonIndex === 0) {
-        autoUpdater.downloadUpdate();
+        console.log("Downloading update selected");
+        handleDownloadUpdate();
       }
     }
   );
 });
 
+// Download, with a progress bar
+function handleDownloadUpdate() {
+  console.log("Downloading update");
+  var progressBar = new ProgressBar({
+    indeterminate: false,
+    text: "Downloading update...",
+    detail: "Please wait...",
+    browserWindow: {
+      webPreferences: {
+        nodeIntegration: true
+      }
+    }
+  });
+
+  progressBar.on("ready", function() {
+    autoUpdater.on("download-progress", function(info) {
+      progressBar.value = info.percent;
+      progressBar.detail = `${Math.floor(info.percent)}% ${info.bytesPerSecond /
+        1000}kb/s`;
+    });
+    autoUpdater.on("update-downloaded", function() {
+      progressBar.close();
+    });
+    autoUpdater.on("error", function() {
+      progressBar.close();
+    });
+    autoUpdater.downloadUpdate();
+  });
+}
+
+// Trigger update installation
 autoUpdater.on("update-downloaded", function(info) {
   sendStatusToWindow("Update downloaded." + info);
   dialog.showMessageBox(
diff --git a/package-lock.json b/package-lock.json
index bd07ec56..0c27f894 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "openflexure-ev",
-  "version": "2.0.0-beta.6",
+  "version": "2.1.0-alpha",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -7168,6 +7168,14 @@
       "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.1.0.tgz",
       "integrity": "sha512-Z1qA/1oHNowGtSBIcWk0pcLEqYT/j+13xUw/MYOrBUOL4X7VN0i0KCTf5SqyvMPmW5pSPKbo28wkxMxzZ20YnQ=="
     },
+    "electron-progressbar": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/electron-progressbar/-/electron-progressbar-1.2.0.tgz",
+      "integrity": "sha512-I89HaI61SF5wl8c4p62UU3RXhL0xByzl4XH/miwb1e/VNUtRj5WCe/wJ5pNikfC01+/4aAOlNsbmkfsvQjtW6Q==",
+      "requires": {
+        "extend": "^3.0.1"
+      }
+    },
     "electron-publish": {
       "version": "21.2.0",
       "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-21.2.0.tgz",
@@ -8018,8 +8026,7 @@
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "extend-shallow": {
       "version": "3.0.2",
diff --git a/package.json b/package.json
index d33bc597..bd1e65ae 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "about-window": "^1.13.2",
     "custom-electron-titlebar": "^3.2.2",
     "electron-context-menu": "^0.15.2",
+    "electron-progressbar": "^1.2.0",
     "electron-store": "^5.1.1",
     "electron-updater": "^4.2.2",
     "material-design-icons": "^3.0.1"

From dab186ee96b6c5c9d8a0bf0d483d970553cbf019 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Mar 2020 13:32:32 +0100
Subject: [PATCH 06/31] Removed card shadows

---
 src/assets/less/theme.less                                | 2 ++
 .../viewComponents/connectComponents/hostCard.vue         | 8 +++++++-
 .../viewComponents/galleryComponents/captureCard.vue      | 2 +-
 .../viewComponents/galleryComponents/scanCard.vue         | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/assets/less/theme.less b/src/assets/less/theme.less
index cab2ff1f..fc89bdeb 100644
--- a/src/assets/less/theme.less
+++ b/src/assets/less/theme.less
@@ -176,6 +176,8 @@
 .uk-card {
     border-radius: @paper-border-radius;
     border: 1px solid rgba(180, 180, 180, 0.25);
+    box-shadow: none;
+    -webkit-box-shabox-shadow: none;
 }
 
 .uk-card-media-top img {
diff --git a/src/components/viewComponents/connectComponents/hostCard.vue b/src/components/viewComponents/connectComponents/hostCard.vue
index d7f429a2..078c93a4 100644
--- a/src/components/viewComponents/connectComponents/hostCard.vue
+++ b/src/components/viewComponents/connectComponents/hostCard.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="hostCard uk-card uk-card-default uk-card-hover uk-padding-remove uk-width-medium"
+    class="hostCard uk-card uk-card-default uk-padding-remove uk-width-medium"
     :class="{ 'uk-card-secondary': $store.state.globalSettings.darkMode }"
   >
     <div class="uk-card-media-top">
@@ -32,6 +32,7 @@
           <div class="host-description">{{ hostname }}:{{ port }}</div>
         </div>
         <a
+          v-if="deletable"
           href="#"
           class="uk-icon uk-width-auto host-delete"
           @click="$emit('delete')"
@@ -70,6 +71,11 @@ export default {
     port: {
       type: Number,
       required: true
+    },
+    deletable: {
+      type: Boolean,
+      required: false,
+      default: true
     }
   },
 
diff --git a/src/components/viewComponents/galleryComponents/captureCard.vue b/src/components/viewComponents/galleryComponents/captureCard.vue
index 3bf5cd29..be3ccfdb 100644
--- a/src/components/viewComponents/galleryComponents/captureCard.vue
+++ b/src/components/viewComponents/galleryComponents/captureCard.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="capture-card uk-card uk-card-default uk-card-hover uk-padding-remove uk-width-medium"
+    class="capture-card uk-card uk-card-default uk-padding-remove uk-width-medium"
     :class="{ 'uk-card-secondary': $store.state.globalSettings.darkMode }"
   >
     <div class="uk-card-media-top">
diff --git a/src/components/viewComponents/galleryComponents/scanCard.vue b/src/components/viewComponents/galleryComponents/scanCard.vue
index 71dc493a..660a7f87 100644
--- a/src/components/viewComponents/galleryComponents/scanCard.vue
+++ b/src/components/viewComponents/galleryComponents/scanCard.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="capture-card uk-card uk-card-primary uk-card-hover uk-padding-remove uk-width-medium"
+    class="capture-card uk-card uk-card-primary uk-padding-remove uk-width-medium"
   >
     <div class="uk-card-media-top">
       <a href="#">

From f11b4cc264a0b25b65166d767f2c312965ac0468 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Mar 2020 13:32:44 +0100
Subject: [PATCH 07/31] Removed delete button for mDNS hosts

---
 src/components/viewComponents/connectDisplay.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/viewComponents/connectDisplay.vue b/src/components/viewComponents/connectDisplay.vue
index 6d7bead7..1cee2dcc 100644
--- a/src/components/viewComponents/connectDisplay.vue
+++ b/src/components/viewComponents/connectDisplay.vue
@@ -7,7 +7,7 @@
     >
       <div class="uk-width-auto">
         <div
-          class="uk-card uk-card-default uk-card-hover uk-padding-remove uk-width-medium connect-card-align-top"
+          class="uk-card uk-card-default uk-padding-remove uk-width-medium connect-card-align-top"
         >
           <div class="uk-card-body uk-padding-small">
             <form id="formConnectToHost" @submit.prevent="handleSubmit">

From 01207b42988501b9f1849574e4464efff7bedc5b Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Mar 2020 13:43:44 +0100
Subject: [PATCH 08/31] Minor camera settings layout improvements

---
 .../settingsComponents/cameraSettings.vue     | 59 +++++++++++--------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/src/components/viewComponents/settingsComponents/cameraSettings.vue b/src/components/viewComponents/settingsComponents/cameraSettings.vue
index caf62c7a..785cf04a 100644
--- a/src/components/viewComponents/settingsComponents/cameraSettings.vue
+++ b/src/components/viewComponents/settingsComponents/cameraSettings.vue
@@ -47,39 +47,48 @@
 
       <button
         type="submit"
-        class="uk-button uk-button-primary uk-form-small uk-float-right uk-margin-small uk-width-1-1"
+        class="uk-button uk-button-primary uk-form-small uk-margin-small uk-width-1-1"
       >
         Apply Settings
       </button>
-
-      <!--Show auto calibrate if default plugin is enabled-->
-      <div v-if="'recalibrate' in recalibrationLinks" class="uk-margin-small">
-        <taskSubmitter
-          :can-terminate="false"
-          :requires-confirmation="true"
-          :confirmation-message="
-            'Start recalibration? This may take a while, and the microscope will be locked during this time.'
-          "
-          :submit-url="recalibrationLinks.recalibrate.href"
-          :submit-label="'Auto-Calibrate'"
-          @response="onRecalibrateResponse"
-          @error="onRecalibrateError"
-        >
-        </taskSubmitter>
-      </div>
     </form>
-      
-    <div v-if="'flatten_lens_shading_table' in recalibrationLinks" class="uk-margin-small">
+
+    <hr />
+
+    <!--Show auto calibrate if default plugin is enabled-->
+    <div v-if="'recalibrate' in recalibrationLinks" class="uk-margin-small">
+      <taskSubmitter
+        :can-terminate="false"
+        :requires-confirmation="true"
+        :confirmation-message="
+          'Start recalibration? This may take a while, and the microscope will be locked during this time.'
+        "
+        :submit-url="recalibrationLinks.recalibrate.href"
+        :submit-label="'Auto-Calibrate'"
+        @response="onRecalibrateResponse"
+        @error="onRecalibrateError"
+      >
+      </taskSubmitter>
+    </div>
+
+    <div
+      v-if="'flatten_lens_shading_table' in recalibrationLinks"
+      class="uk-margin-small"
+    >
       <button
-        class="uk-button uk-button-danger uk-form-small uk-float-right uk-margin-small uk-margin-remove-bottom uk-width-1-1"
+        class="uk-button uk-button-danger uk-form-small uk-width-1-1"
         @click="flattenLensShadingTableRequest"
       >
         Disable flat-field correction
       </button>
     </div>
-    <div v-if="'delete_lens_shading_table' in recalibrationLinks" class="uk-margin-small uk-margin-remove-top">
+
+    <div
+      v-if="'delete_lens_shading_table' in recalibrationLinks"
+      class="uk-margin-small"
+    >
       <button
-        class="uk-button uk-button-danger uk-form-small uk-float-right uk-margin-small uk-width-1-1"
+        class="uk-button uk-button-danger uk-form-small uk-width-1-1"
         @click="deleteLensShadingTableRequest"
       >
         Adaptive flat-field correction
@@ -147,7 +156,7 @@ export default {
             // Get plugin action link
             this.recalibrationLinks = foundExtension.links;
           } else {
-            this.recalibrationLinks = {}
+            this.recalibrationLinks = {};
           }
         })
         .catch(error => {
@@ -194,10 +203,10 @@ export default {
     },
 
     flattenLensShadingTableRequest: function() {
-      axios.post(this.recalibrationLinks.flatten_lens_shading_table.href)
+      axios.post(this.recalibrationLinks.flatten_lens_shading_table.href);
     },
     deleteLensShadingTableRequest: function() {
-      axios.post(this.recalibrationLinks.delete_lens_shading_table.href)
+      axios.post(this.recalibrationLinks.delete_lens_shading_table.href);
     }
   }
 };

From 92af62c293cc4a001832072033b72b8d65796db1 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Mar 2020 14:20:29 +0100
Subject: [PATCH 09/31] Improved text contrast in light theme

---
 src/assets/less/theme.less | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/assets/less/theme.less b/src/assets/less/theme.less
index fc89bdeb..b154f7e9 100644
--- a/src/assets/less/theme.less
+++ b/src/assets/less/theme.less
@@ -8,6 +8,15 @@
 @import "./app.less";
 
 // Custom OpenFlexure theming
+
+//
+// Colors
+//
+
+@global-color:                                  #666;
+@global-emphasis-color:                         #333;
+@global-muted-color:                            #666;
+
 @global-primary-background: #C32280;
 
 @inverse-primary-muted-color: lighten(@global-primary-background, 15%);

From 08b29fa916d484b68d025b7427ffaa6109f29e69 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Mar 2020 14:48:23 +0100
Subject: [PATCH 10/31] Improved card and button contrast

---
 src/assets/less/theme.less | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/assets/less/theme.less b/src/assets/less/theme.less
index b154f7e9..11a03641 100644
--- a/src/assets/less/theme.less
+++ b/src/assets/less/theme.less
@@ -20,6 +20,9 @@
 @global-primary-background: #C32280;
 
 @inverse-primary-muted-color: lighten(@global-primary-background, 15%);
+@inverse-global-color: fade(@global-inverse-color, 80%);
+
+@global-border: #c5c5c5;
 
 // UIkit
 // ========================================================================
@@ -201,11 +204,16 @@
     border-top: 1px solid rgba(0, 0, 0, 0.075);
 }
 
+.uk-card-default {
+    color: @global-color;
+}
+
 .hook-inverse() {
 
     // Override background colour in dark mode
     .uk-card-default {
         background-color: #2a2a2a !important;
+        color: @inverse-global-color;
     }
 
     // Lighten on hover to show depth in dark mode
@@ -278,6 +286,11 @@ a:hover {
     border-radius: 2px;
 }
 
+.uk-button-default {
+    background-color: rgba(180, 180, 180, 0.10);
+    border-color: @global-border;
+}
+
 .uk-button-danger {
     background-color: transparent;
     color: #f0506e;

From 072b60080bfa9da7b780f9859c4ea24eeb04a3b7 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Mar 2020 14:58:27 +0100
Subject: [PATCH 11/31] Lightened global border

---
 src/assets/less/theme.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/less/theme.less b/src/assets/less/theme.less
index 11a03641..2bfa26b6 100644
--- a/src/assets/less/theme.less
+++ b/src/assets/less/theme.less
@@ -22,7 +22,7 @@
 @inverse-primary-muted-color: lighten(@global-primary-background, 15%);
 @inverse-global-color: fade(@global-inverse-color, 80%);
 
-@global-border: #c5c5c5;
+@global-border: #d5d5d5;
 
 // UIkit
 // ========================================================================

From 543c1f8ebbe5bc09522d743b3e8463012ce432fa Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Mar 2020 14:58:40 +0100
Subject: [PATCH 12/31] Fixed issue searching for links in 'null'

---
 .../viewComponents/settingsComponents/cameraSettings.vue      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/viewComponents/settingsComponents/cameraSettings.vue b/src/components/viewComponents/settingsComponents/cameraSettings.vue
index 785cf04a..38610f61 100644
--- a/src/components/viewComponents/settingsComponents/cameraSettings.vue
+++ b/src/components/viewComponents/settingsComponents/cameraSettings.vue
@@ -111,8 +111,8 @@ export default {
 
   data: function() {
     return {
-      settings: null,
-      recalibrationLinks: null,
+      settings: {},
+      recalibrationLinks: {},
       isCalibrating: false
     };
   },

From f037831f83b16c2c50aa35bbf1c44b57e18009ef Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Mar 2020 15:01:02 +0100
Subject: [PATCH 13/31] Fixed modal header border radius

---
 src/assets/less/theme.less | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/assets/less/theme.less b/src/assets/less/theme.less
index 2bfa26b6..7633ef3f 100644
--- a/src/assets/less/theme.less
+++ b/src/assets/less/theme.less
@@ -233,7 +233,11 @@
 }
 
 .uk-modal-footer {
-    border-radius: @paper-border-radius;
+    border-radius: 0 0 @paper-border-radius @paper-border-radius;
+}
+
+.uk-modal-header {
+    border-radius: @paper-border-radius @paper-border-radius 0 0;
 }
 
 /*

From c5fa0dec03bb051092c19958ec92835827dbfff8 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 30 Mar 2020 15:53:53 +0100
Subject: [PATCH 14/31] Added capture to global keyboard shortcuts

---
 src/App.vue                                   | 110 +++++++++++++++++-
 .../controlComponents/paneCapture.vue         |   4 +
 .../controlComponents/paneNavigate.vue        |  92 ++-------------
 .../viewComponents/streamDisplay.vue          |  16 +--
 4 files changed, 129 insertions(+), 93 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 4ec5e9c6..f26b3b97 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,6 +12,19 @@
 // Import components
 import panelLeft from "./components/panelLeft.vue";
 
+// Key Codes
+const keyCodes = {
+  pgup: 33,
+  pgdn: 34,
+  left: 37,
+  up: 38,
+  right: 39,
+  down: 40,
+  enter: 13,
+  esc: 27,
+  shift: 16
+};
+
 // Export main app
 export default {
   name: "App",
@@ -22,6 +35,7 @@ export default {
 
   data: function() {
     return {
+      keysDown: {},
       systemDark: undefined,
       themeObserver: undefined
     };
@@ -76,6 +90,10 @@ export default {
 
   created: function() {
     window.addEventListener("beforeunload", this.handleExit);
+    // Key events
+    window.addEventListener("keydown", this.keyDownMonitor);
+    window.addEventListener("keyup", this.keyUpMonitor);
+    window.addEventListener("wheel", this.wheelMonitor);
   },
 
   beforeDestroy: function() {
@@ -83,12 +101,102 @@ export default {
     if (this.themeObserver) {
       this.themeObserver.disconnect();
     }
+    // Remove key listeners
+    window.removeEventListener("keydown", this.keyDownMonitor);
+    window.removeEventListener("keyup", this.keyUpMonitor);
+    window.removeEventListener("wheel", this.wheelMonitor);
   },
 
   methods: {
     handleExit: function() {
       console.log("Triggered beforeunload");
       this.$root.$emit("globalTogglePreview", false);
+    },
+
+    // Handle global mouse wheel events to be associated with navigation
+    wheelMonitor: function(event) {
+      // Only capture scroll if the event target's parent contains the "scrollTarget" class
+      if (
+        event.target.parentNode.classList.contains("scrollTarget") ||
+        event.target.classList.contains("scrollTarget")
+      ) {
+        var z_rel = event.deltaY / 100;
+        // Emit a signal to move, acted on by panelNavigate.vue
+        this.$root.$emit("globalMoveStepEvent", 0, 0, z_rel, false);
+      }
+    },
+
+    // Handle global key press events to be associated with navigation
+    keyDownMonitor: function(event) {
+      this.keysDown[event.keyCode] = true; //Add key to array
+
+      // Convert keyCode dict into a list of key codes
+      var keyCodeList = Object.keys(keyCodes).map(function(key) {
+        return keyCodes[key];
+      });
+
+      if (
+        // If not inside an element we want to ignore
+        !(event.target instanceof HTMLInputElement) &&
+        !event.target.classList.contains("lightbox-link") &&
+        // If it's a recognised key
+        keyCodeList.includes(event.keyCode)
+      ) {
+        this.navigateKeyHandler(keyCodes);
+        this.captureKeyHandler(keyCodes);
+      }
+    },
+
+    keyUpMonitor: function(event) {
+      delete this.keysDown[event.keyCode]; //Remove key from array
+    },
+
+    navigateKeyHandler: function(keyCodes) {
+      const moveKeys = [
+        keyCodes.left,
+        keyCodes.right,
+        keyCodes.up,
+        keyCodes.down,
+        keyCodes.pgup,
+        keyCodes.pgdn
+      ];
+
+      if (
+        moveKeys.some(r => Object.keys(this.keysDown).includes(r.toString()))
+      ) {
+        // Calculate movement array
+        var x_rel = 0;
+        var y_rel = 0;
+        var z_rel = 0;
+        if (keyCodes.left in this.keysDown) {
+          x_rel = x_rel + 1;
+        }
+        if (keyCodes.right in this.keysDown) {
+          x_rel = x_rel - 1;
+        }
+        if (keyCodes.up in this.keysDown) {
+          y_rel = y_rel + 1;
+        }
+        if (keyCodes.down in this.keysDown) {
+          y_rel = y_rel - 1;
+        }
+        if (keyCodes.pgup in this.keysDown) {
+          z_rel = z_rel - 1;
+        }
+        if (keyCodes.pgdn in this.keysDown) {
+          z_rel = z_rel + 1;
+        }
+        // Make a position request
+        // Emit a signal to move, acted on by panelNavigate.vue
+        this.$root.$emit("globalMoveStepEvent", x_rel, y_rel, z_rel);
+      }
+    },
+
+    captureKeyHandler: function(keyCodes) {
+      if (keyCodes.shift in this.keysDown && keyCodes.enter in this.keysDown) {
+        console.log("Capturing");
+        this.$root.$emit("globalCaptureEvent");
+      }
     }
   }
 };
@@ -132,7 +240,7 @@ html {
   width: 300px;
   height: 100%;
   padding: 0;
-  background-color: rgba(180, 180, 180, 0.055);
+  background-color: rgba(180, 180, 180, 0.03);
   border-width: 0 1px 0 0;
   border-style: solid;
   border-color: rgba(180, 180, 180, 0.25);
diff --git a/src/components/controlComponents/paneCapture.vue b/src/components/controlComponents/paneCapture.vue
index ac549961..5b415c2b 100644
--- a/src/components/controlComponents/paneCapture.vue
+++ b/src/components/controlComponents/paneCapture.vue
@@ -382,6 +382,10 @@ export default {
   mounted() {
     this.updateScanUri();
     this.updateScanStepSize();
+    // A global signal listener to perform a capture action
+    this.$root.$on("globalCaptureEvent", () => {
+      this.handleCapture();
+    });
   },
 
   methods: {
diff --git a/src/components/controlComponents/paneNavigate.vue b/src/components/controlComponents/paneNavigate.vue
index 64b3c6af..ddec65da 100644
--- a/src/components/controlComponents/paneNavigate.vue
+++ b/src/components/controlComponents/paneNavigate.vue
@@ -156,18 +156,6 @@
 import axios from "axios";
 import taskSubmitter from "../genericComponents/taskSubmitter";
 
-// Key Codes
-const keyCodes = {
-  pgup: 33,
-  pgdn: 34,
-  left: 37,
-  up: 38,
-  right: 39,
-  down: 40,
-  enter: 13,
-  esc: 27
-};
-
 // Export main app
 export default {
   name: "PaneNavigate",
@@ -178,7 +166,6 @@ export default {
 
   data: function() {
     return {
-      keysDown: {},
       stepXy: 200,
       stepZz: 50,
       setPosition: null,
@@ -204,17 +191,19 @@ export default {
     }
   },
 
-  created: function() {
-    window.addEventListener("keydown", this.keyDownMonitor);
-    window.addEventListener("keyup", this.keyUpMonitor);
-    window.addEventListener("wheel", this.wheelMonitor);
-  },
-
   mounted() {
     // A global signal listener to perform a move action
     this.$root.$on("globalMoveEvent", (x, y, z, absolute) => {
       this.moveRequest(x, y, z, absolute);
     });
+    this.$root.$on("globalMoveStepEvent", (x_steps, y_steps, z_steps) => {
+      this.moveRequest(
+        x_steps * this.stepXy,
+        y_steps * this.stepXy,
+        z_steps * this.stepZz,
+        false
+      );
+    });
     // Update the current position in text boxes
     this.updatePosition();
     // Look for autofocus plugin
@@ -226,72 +215,7 @@ export default {
     this.$root.$off("globalMoveEvent");
   },
 
-  destroyed: function() {
-    window.removeEventListener("keydown", this.keyDownMonitor);
-    window.removeEventListener("keyup", this.keyUpMonitor);
-    window.removeEventListener("wheel", this.wheelMonitor);
-  },
-
   methods: {
-    // Handle global mouse wheel events to be associated with navigation
-    wheelMonitor: function(event) {
-      // Only capture scroll if the event target's parent contains the "scrollTarget" class
-      if (
-        event.target.parentNode.classList.contains("scrollTarget") ||
-        event.target.classList.contains("scrollTarget")
-      ) {
-        var z_rel = (event.deltaY / 100) * this.stepZz;
-        this.moveRequest(0, 0, z_rel, false);
-      }
-    },
-
-    // Handle global key press events to be associated with navigation
-    keyDownMonitor: function(event) {
-      this.keysDown[event.keyCode] = true; //Add key to array
-
-      // Convert keyCode dict into a list of key codes
-      var keyCodeList = Object.keys(keyCodes).map(function(key) {
-        return keyCodes[key];
-      });
-
-      if (
-        !(event.target instanceof HTMLInputElement) &&
-        !event.target.classList.contains("lightbox-link") &&
-        keyCodeList.includes(event.keyCode)
-      ) {
-        //console.log(this.keysDown)
-        // Calculate movement array
-        var x_rel = 0;
-        var y_rel = 0;
-        var z_rel = 0;
-        if (keyCodes.left in this.keysDown) {
-          x_rel = x_rel + this.stepXy;
-        }
-        if (keyCodes.right in this.keysDown) {
-          x_rel = x_rel - this.stepXy;
-        }
-        if (keyCodes.up in this.keysDown) {
-          y_rel = y_rel + this.stepXy;
-        }
-        if (keyCodes.down in this.keysDown) {
-          y_rel = y_rel - this.stepXy;
-        }
-        if (keyCodes.pgup in this.keysDown) {
-          z_rel = z_rel - this.stepZz;
-        }
-        if (keyCodes.pgdn in this.keysDown) {
-          z_rel = z_rel + this.stepZz;
-        }
-
-        // Make a position request
-        this.moveRequest(x_rel, y_rel, z_rel, false);
-      }
-    },
-
-    keyUpMonitor: function(event) {
-      delete this.keysDown[event.keyCode]; //Remove key from array
-    },
-
     handleSubmit: function() {
       this.moveRequest(
         this.setPosition.x,
diff --git a/src/components/viewComponents/streamDisplay.vue b/src/components/viewComponents/streamDisplay.vue
index bb914843..b4d2522d 100644
--- a/src/components/viewComponents/streamDisplay.vue
+++ b/src/components/viewComponents/streamDisplay.vue
@@ -108,6 +108,14 @@ export default {
   },
 
   methods: {
+    flashStream: function() {
+      // Run an animation that flashes the stream (for capture feedback)
+      let element = this.$refs.streamDisplay;
+      element.classList.remove("uk-animation-fade");
+      element.offsetHeight; /* trigger reflow */
+      element.classList.add("uk-animation-fade");
+    },
+
     clickMonitor: function(event) {
       // Calculate steps from event coordinates and store config FOV
       let xCoordinate = event.offsetX;
@@ -127,14 +135,6 @@ export default {
       this.$root.$emit("globalMoveEvent", xSteps, ySteps, 0, false);
     },
 
-    flashStream: function() {
-      // Run an animation that flashes the stream (for capture feedback)
-      let element = this.$refs.streamDisplay;
-      element.classList.remove("uk-animation-fade");
-      element.offsetHeight; /* trigger reflow */
-      element.classList.add("uk-animation-fade");
-    },
-
     handleResize: function() {
       // Only fires resize event after no resize in 500ms (prevents resize event spam)
       clearTimeout(this.resizeTimeoutId);

From e42835ff8c3fd669aad7799f061267ec869e8de0 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 10:18:00 +0100
Subject: [PATCH 15/31] Add default padding to web components

---
 src/components/pluginComponents/WebComponentLoader.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/pluginComponents/WebComponentLoader.vue b/src/components/pluginComponents/WebComponentLoader.vue
index f155617d..810a73af 100644
--- a/src/components/pluginComponents/WebComponentLoader.vue
+++ b/src/components/pluginComponents/WebComponentLoader.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="uk-padding-small">
     <div v-if="error" class="uk-padding-small uk-text-danger">
       <b>{{ error }}</b>
     </div>

From 50b70a3ea3aa1e3d7937a420694f85f898bb274d Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 10:20:37 +0100
Subject: [PATCH 16/31] Refactored panelLeft to appContent

---
 src/App.vue                                   |   6 +-
 .../{panelLeft.vue => appContent.vue}         |   0
 src/components/panelRight.vue                 | 170 ------------------
 3 files changed, 3 insertions(+), 173 deletions(-)
 rename src/components/{panelLeft.vue => appContent.vue} (100%)
 delete mode 100644 src/components/panelRight.vue

diff --git a/src/App.vue b/src/App.vue
index f26b3b97..b4e42681 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,13 +4,13 @@
     class="uk-height-1-1 uk-margin-remove uk-padding-remove"
     :class="handleTheme"
   >
-    <panelLeft />
+    <appContent />
   </div>
 </template>
 
 <script>
 // Import components
-import panelLeft from "./components/panelLeft.vue";
+import appContent from "./components/appContent.vue";
 
 // Key Codes
 const keyCodes = {
@@ -30,7 +30,7 @@ export default {
   name: "App",
 
   components: {
-    panelLeft
+    appContent
   },
 
   data: function() {
diff --git a/src/components/panelLeft.vue b/src/components/appContent.vue
similarity index 100%
rename from src/components/panelLeft.vue
rename to src/components/appContent.vue
diff --git a/src/components/panelRight.vue b/src/components/panelRight.vue
deleted file mode 100644
index 0627ed00..00000000
--- a/src/components/panelRight.vue
+++ /dev/null
@@ -1,170 +0,0 @@
-<template>
-  <!-- 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
-      id="tabContainer"
-      class="uk-flex-none uk-flex-center uk-margin-remove-bottom uk-text-center"
-      uk-tab="swiping: false"
-    >
-      <!-- Connect tab button -->
-      <li
-        v-show="!liteMode"
-        :class="[{ 'uk-active': currentTab == 'connect' }]"
-      >
-        <a href="#" uk-switcher-item="connect" @click="currentTab = 'connect'"
-          >Connect</a
-        >
-      </li>
-      <!-- Preview tab button -->
-      <li
-        :class="[
-          { 'uk-disabled': !$store.getters.ready },
-          { 'uk-active': currentTab == 'preview' }
-        ]"
-      >
-        <a href="#" uk-switcher-item="preview" @click="currentTab = 'preview'"
-          >Live</a
-        >
-      </li>
-      <!-- Gallery tab button -->
-      <li
-        :class="[
-          { 'uk-disabled': !$store.getters.ready },
-          { 'uk-active': currentTab == 'gallery' }
-        ]"
-      >
-        <a href="#" uk-switcher-item="gallery" @click="currentTab = 'gallery'"
-          >Gallery</a
-        >
-      </li>
-    </ul>
-    <ul
-      class="uk-flex uk-flex-1 uk-overflow-auto uk-margin-remove uk-padding-remove"
-    >
-      <!-- Connect tab -->
-      <div
-        v-show="currentTab == 'connect'"
-        id="connectDisplayTab"
-        class="uk-height-1-1 uk-width-1-1"
-      >
-        <connectDisplayLite v-if="liteMode" />
-        <connectDisplay v-else />
-      </div>
-      <!-- Preview tab -->
-      <div
-        v-if="$store.getters.ready"
-        v-show="currentTab == 'preview'"
-        id="streamDisplayTab"
-        class="uk-height-1-1 uk-width-1-1"
-      >
-        <streamDisplay />
-      </div>
-      <!-- Gallery tab -->
-      <div
-        v-if="$store.getters.ready"
-        v-show="currentTab == 'gallery'"
-        id="galleryDisplayTab"
-        class="uk-height-1-1 uk-width-1-1"
-      >
-        <galleryDisplay />
-      </div>
-    </ul>
-  </div>
-</template>
-
-<script>
-// Import basic UIkit
-import UIkit from "uikit";
-
-// Import components
-import connectDisplay from "./viewComponents/connectDisplay.vue";
-import connectDisplayLite from "./viewComponents/connectDisplayLite.vue";
-import streamDisplay from "./viewComponents/streamDisplay.vue";
-import galleryDisplay from "./viewComponents/galleryDisplay.vue";
-
-// Export main app
-export default {
-  name: "PanelRight",
-
-  components: {
-    connectDisplay,
-    connectDisplayLite,
-    streamDisplay,
-    galleryDisplay
-  },
-
-  data: function() {
-    return {
-      currentTab: "connect",
-      unwatchStoreFunction: null,
-      liteMode: process.env.VUE_APP_LITEMODE == "true" ? true : false
-    };
-  },
-
-  watch: {
-    currentTab: function(index) {
-      // If entering the gallery
-      if (index == "gallery") {
-        console.log("Gallery tab entered");
-        this.$root.$emit("globalUpdateCaptures");
-      }
-      // If entering the stream
-      if (index == "preview") {
-        console.log("Preview tab entered");
-        this.$root.$emit("globalTogglePreview", true);
-      }
-      // If leaving the stream
-      else {
-        console.log("Preview tab hidden");
-        this.$root.$emit("globalTogglePreview", false);
-      }
-    }
-  },
-
-  created: function() {
-    // Watch for host 'ready', then update status
-    this.unwatchStoreFunction = this.$store.watch(
-      (state, getters) => {
-        return getters.ready;
-      },
-      ready => {
-        if (ready) {
-          console.log("Right panel now ready");
-          this.currentTab = "preview";
-        } else {
-          console.log("Right panel now disabled");
-          this.currentTab = "connect";
-        }
-      }
-    );
-  },
-
-  beforeDestroy() {
-    // Then we call that function here to unwatch
-    if (this.unwatchStoreFunction) {
-      this.unwatchStoreFunction();
-      this.unwatchStoreFunction = null;
-    }
-  },
-
-  methods: {
-    switchTab: function(index) {
-      var switcherObj = UIkit.switcher("#tabContainer");
-      console.log(switcherObj);
-      console.log(switcherObj.toggles);
-      console.log(`Switching to ${index}`);
-      var a = switcherObj.show(index);
-      console.log(a);
-    }
-  }
-};
-</script>
-
-<style scoped lang="less">
-.uk-tab {
-  padding-left: 0;
-}
-</style>

From 72c30f71862d7675905ae8562cf982902517b222 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 12:20:08 +0100
Subject: [PATCH 17/31] Added guided tour on first start

---
 package-lock.json                             |  24 +++
 package.json                                  |   1 +
 src/App.vue                                   | 140 +++++++++++++++++-
 src/components/appContent.vue                 |  35 +++--
 .../genericComponents/tabContent.vue          |   4 +-
 src/components/genericComponents/tabIcon.vue  |   8 +-
 .../viewComponents/connectDisplay.vue         |  13 +-
 src/main.js                                   |  11 +-
 8 files changed, 210 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0c27f894..63b5f52a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10514,6 +10514,12 @@
         "verror": "1.10.0"
       }
     },
+    "jump.js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/jump.js/-/jump.js-1.0.2.tgz",
+      "integrity": "sha1-4GQbR/QKOPITnCX9oFAL8o5DAVo=",
+      "dev": true
+    },
     "kew": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
@@ -12314,6 +12320,12 @@
         "ts-pnp": "^1.1.6"
       }
     },
+    "popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+      "dev": true
+    },
     "portfinder": {
       "version": "1.0.25",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz",
@@ -16064,6 +16076,18 @@
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
+    "vue-tour": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/vue-tour/-/vue-tour-1.3.0.tgz",
+      "integrity": "sha512-hLXA8vCCWNNjvXwEbfOagcZfJMz1a9Xi7LTN5nb/Nqpuv8RKT25dS5/HJBvHEEh1EoYQNOwohx1YA6x+2KTQbQ==",
+      "dev": true,
+      "requires": {
+        "hash-sum": "^2.0.0",
+        "jump.js": "^1.0.2",
+        "popper.js": "^1.16.0",
+        "vue": "^2.6.10"
+      }
+    },
     "vuex": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.2.tgz",
diff --git a/package.json b/package.json
index bd1e65ae..b5a7c144 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "vue": "^2.6.11",
     "vue-plugin-load-script": "^1.2.0",
     "vue-template-compiler": "^2.6.11",
+    "vue-tour": "^1.3.0",
     "vuex": "^3.1.2"
   },
   "optionalDependencies": {
diff --git a/src/App.vue b/src/App.vue
index b4e42681..bb6f9510 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,7 +4,14 @@
     class="uk-height-1-1 uk-margin-remove uk-padding-remove"
     :class="handleTheme"
   >
+    <div id="tour-header"></div>
     <appContent />
+    <v-tour
+      name="guidedTour"
+      :steps="tourSteps"
+      :callbacks="tourCallbacks"
+      :options="{ highlight: true }"
+    ></v-tour>
   </div>
 </template>
 
@@ -37,7 +44,80 @@ export default {
     return {
       keysDown: {},
       systemDark: undefined,
-      themeObserver: undefined
+      themeObserver: undefined,
+      tourSteps: [
+        {
+          target: "#tour-header", // We're using document.querySelector() under the hood
+          header: {
+            title: "Welcome to OpenFlexure eV"
+          },
+          content: `Click Next to learn how to use OpenFlexure eV`,
+          params: {
+            placement: "bottom"
+          }
+        },
+        {
+          target: "#saved-connections-grid",
+          header: {
+            title: "Saved microscopes"
+          },
+          content: `Connect to your saved microscopes for faster access`
+        },
+        {
+          target: "#nearby-connections-grid",
+          header: {
+            title: "Nearby microscopes"
+          },
+          content: `Connect to microscopes found on your network`
+        },
+        {
+          target: "#new-connection-card",
+          header: {
+            title: "New connection"
+          },
+          content: `Connect locally if you're running on a microscope, \nor open a new remote connection to a microscope`
+        },
+        {
+          target: "#gallery-tab-icon",
+          header: {
+            title: "Capture gallery"
+          },
+          content: `View and download your microscope images from the gallery tab`
+        },
+        {
+          target: "#navigate-tab-icon",
+          header: {
+            title: "Navigate around your sample"
+          },
+          content: `Move your microscope stage and perform autofocus from the navigate tab`
+        },
+        {
+          target: "#capture-tab-icon",
+          header: {
+            title: "Capture microscope images"
+          },
+          content: `Take images and simple tile scans from the capture tab`
+        },
+        {
+          target: "#settings-tab-icon",
+          header: {
+            title: "Change settings"
+          },
+          content: `Change app and microscope settings, including microscope calibration, from the settings tab`
+        },
+        {
+          target: "#extension-tab-divider",
+          header: {
+            title: "Microscope extensions"
+          },
+          content: `Extensions installed on your microscope will appear below this line`
+        }
+      ],
+      tourCallbacks: {
+        onStop: () => {
+          this.setLocalStorageObj("completedTour", true);
+        }
+      }
     };
   },
 
@@ -86,6 +166,12 @@ export default {
         this.systemDark = false;
       }
     });
+    // Handle guided tour
+    // If the user has already completed or skipped the guided tour
+    var completedTour = this.getLocalStorageObj("completedTour") || false;
+    if (!completedTour) {
+      this.$tours["guidedTour"].start();
+    }
   },
 
   created: function() {
@@ -252,4 +338,56 @@ html {
   height: 100%;
   padding: 0;
 }
+
+// Style tour
+.v-tour__target--highlighted {
+  box-shadow: 0px 0px 180px 40px rgba(0, 0, 0, 0.4) !important;
+  border-radius: 5px;
+  opacity: 100%;
+}
+
+.v-step {
+  background: @global-primary-background !important;
+}
+
+.v-step__header {
+  background-color: darken(@global-primary-background, 15%) !important;
+}
+
+.v-step__button {
+  font-size: 0.9rem !important;
+}
+
+// Change step arrow colour
+// This is awful and hacky and makes me sad, but needs must
+.v-step .v-step__arrow {
+  border-color: darken(@global-primary-background, 15%) !important;
+  &--dark {
+    border-color: darken(@global-primary-background, 15%) !important;
+  }
+}
+
+.v-step[x-placement^="top"] .v-step__arrow {
+  border-left-color: transparent !important;
+  border-right-color: transparent !important;
+  border-bottom-color: transparent !important;
+}
+
+.v-step[x-placement^="bottom"] .v-step__arrow {
+  border-left-color: transparent !important;
+  border-right-color: transparent !important;
+  border-top-color: transparent !important;
+}
+
+.v-step[x-placement^="right"] .v-step__arrow {
+  border-left-color: transparent !important;
+  border-top-color: transparent !important;
+  border-bottom-color: transparent !important;
+}
+
+.v-step[x-placement^="left"] .v-step__arrow {
+  border-top-color: transparent !important;
+  border-right-color: transparent !important;
+  border-bottom-color: transparent !important;
+}
 </style>
diff --git a/src/components/appContent.vue b/src/components/appContent.vue
index fa3c79d9..1e53a2c4 100644
--- a/src/components/appContent.vue
+++ b/src/components/appContent.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    id="panel-left"
+    id="app-content"
     class="uk-margin-remove uk-padding-remove uk-height-1-1"
     uk-grid
   >
@@ -11,7 +11,8 @@
     >
       <tabIcon
         v-show="!liteMode"
-        id="connect"
+        id="connect-tab-icon"
+        tab-i-d="connect"
         :require-connection="false"
         :current-tab="currentTab"
         @set-tab="setTab"
@@ -19,7 +20,8 @@
         <i class="material-icons">bug_report</i>
       </tabIcon>
       <tabIcon
-        id="gallery"
+        id="gallery-tab-icon"
+        tab-i-d="gallery"
         :require-connection="true"
         :current-tab="currentTab"
         @set-tab="setTab"
@@ -30,7 +32,8 @@
       <hr />
 
       <tabIcon
-        id="navigate"
+        id="navigate-tab-icon"
+        tab-i-d="navigate"
         :require-connection="true"
         :current-tab="currentTab"
         @set-tab="setTab"
@@ -38,7 +41,8 @@
         <i class="material-icons">gamepad</i>
       </tabIcon>
       <tabIcon
-        id="capture"
+        id="capture-tab-icon"
+        tab-i-d="capture"
         :require-connection="true"
         :current-tab="currentTab"
         @set-tab="setTab"
@@ -46,7 +50,8 @@
         <i class="material-icons">camera_alt</i>
       </tabIcon>
       <tabIcon
-        id="settings"
+        id="settings-tab-icon"
+        tab-i-d="settings"
         :require-connection="false"
         :current-tab="currentTab"
         @set-tab="setTab"
@@ -54,12 +59,12 @@
         <i class="material-icons">settings</i>
       </tabIcon>
 
-      <hr />
+      <hr id="extension-tab-divider" />
 
       <tabIcon
         v-for="plugin in pluginsGuiList"
-        :id="plugin.id"
         :key="plugin.id"
+        :tab-i-d="plugin.id"
         :title="plugin.title"
         :require-connection="plugin.requiresConnection"
         :current-tab="currentTab"
@@ -76,35 +81,35 @@
       class="uk-padding-remove uk-height-1-1 uk-width-expand"
     >
       <tabContent
-        id="connect"
+        tab-i-d="connect"
         :require-connection="false"
         :current-tab="currentTab"
       >
         <connectContent />
       </tabContent>
       <tabContent
-        id="gallery"
+        tab-i-d="gallery"
         :require-connection="false"
         :current-tab="currentTab"
       >
         <galleryContent />
       </tabContent>
       <tabContent
-        id="navigate"
+        tab-i-d="navigate"
         :require-connection="true"
         :current-tab="currentTab"
       >
         <navigateContent />
       </tabContent>
       <tabContent
-        id="capture"
+        tab-i-d="capture"
         :require-connection="true"
         :current-tab="currentTab"
       >
         <captureContent />
       </tabContent>
       <tabContent
-        id="settings"
+        tab-i-d="settings"
         :require-connection="false"
         :current-tab="currentTab"
       >
@@ -113,8 +118,8 @@
 
       <tabContent
         v-for="plugin in pluginsGuiList"
-        :id="plugin.id"
         :key="plugin.id"
+        :tab-i-d="plugin.id"
         :require-connection="plugin.requiresConnection"
         :current-tab="currentTab"
       >
@@ -204,6 +209,8 @@ export default {
     );
   },
 
+  mounted: function() {},
+
   beforeDestroy() {
     // Then we call that function here to unwatch
     if (this.unwatchStoreFunction) {
diff --git a/src/components/genericComponents/tabContent.vue b/src/components/genericComponents/tabContent.vue
index 1b09d514..394cd846 100644
--- a/src/components/genericComponents/tabContent.vue
+++ b/src/components/genericComponents/tabContent.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     v-if="!(requireConnection && !$store.getters.ready)"
-    :hidden="currentTab != id"
+    :hidden="currentTab != tabID"
     class="uk-width-expand uk-height-1-1"
   >
     <div class="section-content"><slot></slot></div>
@@ -13,7 +13,7 @@ export default {
   name: "TabContent",
 
   props: {
-    id: {
+    tabID: {
       type: String,
       required: true
     },
diff --git a/src/components/genericComponents/tabIcon.vue b/src/components/genericComponents/tabIcon.vue
index 37e893ab..b1d6ed0a 100644
--- a/src/components/genericComponents/tabIcon.vue
+++ b/src/components/genericComponents/tabIcon.vue
@@ -18,7 +18,7 @@ export default {
   name: "TabIcon",
 
   props: {
-    id: {
+    tabID: {
       type: String,
       required: true
     },
@@ -45,7 +45,7 @@ export default {
         return this.title;
       } else {
         // Get the last section of a fully qualified name
-        var topName = this.id.split(".").pop();
+        var topName = this.tabID.split(".").pop();
         // Make first character uppercase, then add the rest of the string
         return topName.charAt(0).toUpperCase() + topName.slice(1);
       }
@@ -57,7 +57,7 @@ export default {
 
     classObject: function() {
       return {
-        "tabicon-active": this.currentTab == this.id,
+        "tabicon-active": this.currentTab == this.tabID,
         "uk-disabled": this.requireConnection && !this.$store.getters.ready
       };
     }
@@ -65,7 +65,7 @@ export default {
 
   methods: {
     setThisTab(event) {
-      this.$emit("set-tab", event, this.id);
+      this.$emit("set-tab", event, this.tabID);
       if (this.clickCallback) {
         this.clickCallback();
       }
diff --git a/src/components/viewComponents/connectDisplay.vue b/src/components/viewComponents/connectDisplay.vue
index 1cee2dcc..076b7194 100644
--- a/src/components/viewComponents/connectDisplay.vue
+++ b/src/components/viewComponents/connectDisplay.vue
@@ -7,6 +7,7 @@
     >
       <div class="uk-width-auto">
         <div
+          id="new-connection-card"
           class="uk-card uk-card-default uk-padding-remove uk-width-medium connect-card-align-top"
         >
           <div class="uk-card-body uk-padding-small">
@@ -97,7 +98,11 @@
           <li class="uk-open">
             <a class="uk-accordion-title" href="#">Saved devices</a>
             <div class="uk-accordion-content">
-              <div class="uk-grid-medium uk-grid-match uk-margin-top" uk-grid>
+              <div
+                id="saved-connections-grid"
+                class="uk-grid-medium uk-grid-match uk-margin-top"
+                uk-grid
+              >
                 <div v-for="host in savedHosts" :key="host.name">
                   <hostCard
                     :name="host.name"
@@ -114,7 +119,11 @@
           <li class="uk-open">
             <a class="uk-accordion-title" href="#">Nearby devices</a>
             <div class="uk-accordion-content">
-              <div class="uk-grid-medium uk-grid-match uk-margin-top" uk-grid>
+              <div
+                id="nearby-connections-grid"
+                class="uk-grid-medium uk-grid-match uk-margin-top"
+                uk-grid
+              >
                 <div v-for="host in foundHostArray" :key="host.name">
                   <hostCard
                     :name="host.name"
diff --git a/src/main.js b/src/main.js
index d768db37..1562a7dc 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,16 +1,21 @@
 import Vue from "vue";
 import App from "./App.vue";
 import store from "./store";
-
 import UIkit from "uikit";
+import VueTour from "vue-tour";
+import LoadScript from "vue-plugin-load-script";
+
+require("vue-tour/dist/vue-tour.css");
 
 // Import MD icons
 import "material-design-icons/iconfont/material-icons.css";
 
-// Import load-script module
-import LoadScript from "vue-plugin-load-script";
+// Use load-script module
 Vue.use(LoadScript);
 
+// Use vue-tour module
+Vue.use(VueTour);
+
 Vue.config.productionTip = false;
 
 Vue.mixin({

From 1d5e97bce7ad55c18541dde6a6039e6e0b9487cf Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 13:07:18 +0100
Subject: [PATCH 18/31] Keyboard shortcut to restart tour

---
 src/App.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index bb6f9510..07839c59 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -29,7 +29,8 @@ const keyCodes = {
   down: 40,
   enter: 13,
   esc: 27,
-  shift: 16
+  shift: 16,
+  t: 84
 };
 
 // Export main app
@@ -230,6 +231,7 @@ export default {
       ) {
         this.navigateKeyHandler(keyCodes);
         this.captureKeyHandler(keyCodes);
+        this.letterKeyHandler(keyCodes);
       }
     },
 
@@ -283,6 +285,12 @@ export default {
         console.log("Capturing");
         this.$root.$emit("globalCaptureEvent");
       }
+    },
+
+    letterKeyHandler: function(keyCodes) {
+      if (keyCodes.shift in this.keysDown && keyCodes.t in this.keysDown) {
+        this.$tours["guidedTour"].start();
+      }
     }
   }
 };

From e5943df1080a29363bd8ad1f706ec2bcfad4bbb2 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 14:13:19 +0100
Subject: [PATCH 19/31] Tweaked tour highlight style

---
 src/App.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 07839c59..cc116c60 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -349,7 +349,8 @@ html {
 
 // Style tour
 .v-tour__target--highlighted {
-  box-shadow: 0px 0px 180px 40px rgba(0, 0, 0, 0.4) !important;
+  box-shadow: 0px 40px 160px 20px rgba(0, 0, 0, 0.5),
+    0px 0px 0px 4px rgba(128, 128, 128, 0.5) !important;
   border-radius: 5px;
   opacity: 100%;
 }

From 33848fb1f5cf912e29ce4e83361354fcb810981e Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 14:15:48 +0100
Subject: [PATCH 20/31] Ignore all clicks during tour

---
 src/App.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/App.vue b/src/App.vue
index cc116c60..d245d03e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -353,6 +353,7 @@ html {
     0px 0px 0px 4px rgba(128, 128, 128, 0.5) !important;
   border-radius: 5px;
   opacity: 100%;
+  pointer-events: none;
 }
 
 .v-step {

From a8bdea5b5b71667386573a87ccff796f961aa33b Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 14:31:22 +0100
Subject: [PATCH 21/31] Only show nearby if running electron

---
 src/App.vue                                   | 127 ++++++++++--------
 .../viewComponents/connectDisplay.vue         |  17 +--
 2 files changed, 77 insertions(+), 67 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index d245d03e..94e34c04 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -16,6 +16,7 @@
 </template>
 
 <script>
+import isElectron from "./modules/isElectron";
 // Import components
 import appContent from "./components/appContent.vue";
 
@@ -46,7 +47,43 @@ export default {
       keysDown: {},
       systemDark: undefined,
       themeObserver: undefined,
-      tourSteps: [
+      liteMode: process.env.VUE_APP_LITEMODE == "true" ? true : false,
+      isElectron: isElectron(),
+      tourCallbacks: {
+        onStop: () => {
+          this.setLocalStorageObj("completedTour", true);
+        }
+      }
+    };
+  },
+
+  computed: {
+    isSystemDark: function() {
+      if (
+        window.matchMedia &&
+        window.matchMedia("(prefers-color-scheme: dark)").matches
+      ) {
+        return true;
+      } else {
+        return false;
+      }
+    },
+    handleTheme: function() {
+      var isDark = false;
+      if (this.$store.state.globalSettings.appTheme == "dark") {
+        isDark = true;
+      } else if (this.$store.state.globalSettings.appTheme == "system") {
+        if (this.systemDark) {
+          isDark = true;
+        }
+      }
+      return {
+        "uk-light": isDark,
+        "uk-background-secondary": isDark
+      };
+    },
+    tourSteps: function() {
+      return [
         {
           target: "#tour-header", // We're using document.querySelector() under the hood
           header: {
@@ -57,27 +94,39 @@ export default {
             placement: "bottom"
           }
         },
-        {
-          target: "#saved-connections-grid",
-          header: {
-            title: "Saved microscopes"
-          },
-          content: `Connect to your saved microscopes for faster access`
-        },
-        {
-          target: "#nearby-connections-grid",
-          header: {
-            title: "Nearby microscopes"
-          },
-          content: `Connect to microscopes found on your network`
-        },
-        {
-          target: "#new-connection-card",
-          header: {
-            title: "New connection"
-          },
-          content: `Connect locally if you're running on a microscope, \nor open a new remote connection to a microscope`
-        },
+        ...(!this.liteMode
+          ? [
+              {
+                target: "#saved-connections-grid",
+                header: {
+                  title: "Saved microscopes"
+                },
+                content: `Connect to your saved microscopes for faster access`
+              }
+            ]
+          : []),
+        ...(this.isElectron && !this.liteMode
+          ? [
+              {
+                target: "#nearby-connections-grid",
+                header: {
+                  title: "Nearby microscopes"
+                },
+                content: `Connect to microscopes found on your network`
+              }
+            ]
+          : []),
+        ...(!this.liteMode
+          ? [
+              {
+                target: "#new-connection-card",
+                header: {
+                  title: "New connection"
+                },
+                content: `Connect locally if you're running on a microscope, \nor open a new remote connection to a microscope`
+              }
+            ]
+          : []),
         {
           target: "#gallery-tab-icon",
           header: {
@@ -113,39 +162,7 @@ export default {
           },
           content: `Extensions installed on your microscope will appear below this line`
         }
-      ],
-      tourCallbacks: {
-        onStop: () => {
-          this.setLocalStorageObj("completedTour", true);
-        }
-      }
-    };
-  },
-
-  computed: {
-    isSystemDark: function() {
-      if (
-        window.matchMedia &&
-        window.matchMedia("(prefers-color-scheme: dark)").matches
-      ) {
-        return true;
-      } else {
-        return false;
-      }
-    },
-    handleTheme: function() {
-      var isDark = false;
-      if (this.$store.state.globalSettings.appTheme == "dark") {
-        isDark = true;
-      } else if (this.$store.state.globalSettings.appTheme == "system") {
-        if (this.systemDark) {
-          isDark = true;
-        }
-      }
-      return {
-        "uk-light": isDark,
-        "uk-background-secondary": isDark
-      };
+      ];
     }
   },
 
diff --git a/src/components/viewComponents/connectDisplay.vue b/src/components/viewComponents/connectDisplay.vue
index 076b7194..fc2f41d6 100644
--- a/src/components/viewComponents/connectDisplay.vue
+++ b/src/components/viewComponents/connectDisplay.vue
@@ -95,14 +95,10 @@
 
       <div class="uk-width-expand">
         <ul uk-accordion="multiple: true; animation: false">
-          <li class="uk-open">
+          <li id="saved-connections-grid" class="uk-open">
             <a class="uk-accordion-title" href="#">Saved devices</a>
             <div class="uk-accordion-content">
-              <div
-                id="saved-connections-grid"
-                class="uk-grid-medium uk-grid-match uk-margin-top"
-                uk-grid
-              >
+              <div class="uk-grid-medium uk-grid-match uk-margin-top" uk-grid>
                 <div v-for="host in savedHosts" :key="host.name">
                   <hostCard
                     :name="host.name"
@@ -116,14 +112,10 @@
             </div>
           </li>
 
-          <li class="uk-open">
+          <li v-show="isElectron" id="nearby-connections-grid" class="uk-open">
             <a class="uk-accordion-title" href="#">Nearby devices</a>
             <div class="uk-accordion-content">
-              <div
-                id="nearby-connections-grid"
-                class="uk-grid-medium uk-grid-match uk-margin-top"
-                uk-grid
-              >
+              <div class="uk-grid-medium uk-grid-match uk-margin-top" uk-grid>
                 <div v-for="host in foundHostArray" :key="host.name">
                   <hostCard
                     :name="host.name"
@@ -163,6 +155,7 @@ export default {
 
   data: function() {
     return {
+      isElectron: isElectron(),
       localMode: true,
       hostname: "",
       port: 5000,

From 79620b4d9c4fc2355fa5ffb5cbc14ba8e3911c7d Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 14:32:58 +0100
Subject: [PATCH 22/31] Show mDNS devices first if running electron

---
 src/App.vue                                   | 22 ++++++------
 .../viewComponents/connectDisplay.vue         | 34 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 94e34c04..534c20e4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -94,17 +94,6 @@ export default {
             placement: "bottom"
           }
         },
-        ...(!this.liteMode
-          ? [
-              {
-                target: "#saved-connections-grid",
-                header: {
-                  title: "Saved microscopes"
-                },
-                content: `Connect to your saved microscopes for faster access`
-              }
-            ]
-          : []),
         ...(this.isElectron && !this.liteMode
           ? [
               {
@@ -116,6 +105,17 @@ export default {
               }
             ]
           : []),
+        ...(!this.liteMode
+          ? [
+              {
+                target: "#saved-connections-grid",
+                header: {
+                  title: "Saved microscopes"
+                },
+                content: `Connect to your saved microscopes for faster access`
+              }
+            ]
+          : []),
         ...(!this.liteMode
           ? [
               {
diff --git a/src/components/viewComponents/connectDisplay.vue b/src/components/viewComponents/connectDisplay.vue
index fc2f41d6..5062f36e 100644
--- a/src/components/viewComponents/connectDisplay.vue
+++ b/src/components/viewComponents/connectDisplay.vue
@@ -95,23 +95,6 @@
 
       <div class="uk-width-expand">
         <ul uk-accordion="multiple: true; animation: false">
-          <li id="saved-connections-grid" class="uk-open">
-            <a class="uk-accordion-title" href="#">Saved devices</a>
-            <div class="uk-accordion-content">
-              <div class="uk-grid-medium uk-grid-match uk-margin-top" uk-grid>
-                <div v-for="host in savedHosts" :key="host.name">
-                  <hostCard
-                    :name="host.name"
-                    :hostname="host.hostname"
-                    :port="host.port"
-                    @connect="handleConnectButton(host)"
-                    @delete="delSavedHost(host)"
-                  ></hostCard>
-                </div>
-              </div>
-            </div>
-          </li>
-
           <li v-show="isElectron" id="nearby-connections-grid" class="uk-open">
             <a class="uk-accordion-title" href="#">Nearby devices</a>
             <div class="uk-accordion-content">
@@ -128,6 +111,23 @@
               </div>
             </div>
           </li>
+
+          <li id="saved-connections-grid" class="uk-open">
+            <a class="uk-accordion-title" href="#">Saved devices</a>
+            <div class="uk-accordion-content">
+              <div class="uk-grid-medium uk-grid-match uk-margin-top" uk-grid>
+                <div v-for="host in savedHosts" :key="host.name">
+                  <hostCard
+                    :name="host.name"
+                    :hostname="host.hostname"
+                    :port="host.port"
+                    @connect="handleConnectButton(host)"
+                    @delete="delSavedHost(host)"
+                  ></hostCard>
+                </div>
+              </div>
+            </div>
+          </li>
         </ul>
       </div>
     </div>

From e98282db639b0d4e9bf321ce42596afffdaa8e51 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 14:35:00 +0100
Subject: [PATCH 23/31] Fixed disabling pointer events

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 534c20e4..a95310ba 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -370,7 +370,7 @@ html {
     0px 0px 0px 4px rgba(128, 128, 128, 0.5) !important;
   border-radius: 5px;
   opacity: 100%;
-  pointer-events: none;
+  pointer-events: none !important;
 }
 
 .v-step {

From 5aa92efed21657872498d4ec9b203ced7bd10be2 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 14:36:28 +0100
Subject: [PATCH 24/31] Minor tour style improvements

---
 src/App.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index a95310ba..72ce41ea 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -378,7 +378,7 @@ html {
 }
 
 .v-step__header {
-  background-color: darken(@global-primary-background, 15%) !important;
+  background-color: darken(@global-primary-background, 7%) !important;
 }
 
 .v-step__button {
@@ -388,9 +388,9 @@ html {
 // Change step arrow colour
 // This is awful and hacky and makes me sad, but needs must
 .v-step .v-step__arrow {
-  border-color: darken(@global-primary-background, 15%) !important;
+  border-color: darken(@global-primary-background, 7%) !important;
   &--dark {
-    border-color: darken(@global-primary-background, 15%) !important;
+    border-color: darken(@global-primary-background, 7%) !important;
   }
 }
 

From 5f7d683cd1e3e7178bbc72afcdd6ea2b788490a4 Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 14:50:04 +0100
Subject: [PATCH 25/31] Force tour opacity override

---
 src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 72ce41ea..0e94bbc1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -369,7 +369,7 @@ html {
   box-shadow: 0px 40px 160px 20px rgba(0, 0, 0, 0.5),
     0px 0px 0px 4px rgba(128, 128, 128, 0.5) !important;
   border-radius: 5px;
-  opacity: 100%;
+  opacity: 100% !important;
   pointer-events: none !important;
 }
 

From bd6343a753edf97d69241dfe510b86792275f38d Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 14:50:10 +0100
Subject: [PATCH 26/31] Bigger default window

---
 app/app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/app.js b/app/app.js
index a94c22a7..17611117 100644
--- a/app/app.js
+++ b/app/app.js
@@ -143,8 +143,8 @@ function createWindow() {
   // Create the browser window.
   mainWindow = new BrowserWindow({
     frame: !store.get("drawCustomTitleBar"),
-    width: 1124,
-    height: 800,
+    width: 1200,
+    height: 900,
     icon: path.join(__dirname, "/icons/png/64x64.png"),
     webPreferences: {
       nodeIntegration: true

From ca1560a00fafdf97c37775a0abe64d42d827d81c Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 14:52:33 +0100
Subject: [PATCH 27/31] Audit fix

---
 package-lock.json | 767 +++++++++++++++++++++++++++-------------------
 1 file changed, 456 insertions(+), 311 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 63b5f52a..f0e0cbb8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2202,13 +2202,13 @@
       }
     },
     "@jimp/bmp": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.9.3.tgz",
-      "integrity": "sha512-wXZYccgGQAsIK8DZX0wZE3gbSd2mL2+eheSJMts6I5hQjxhVRZd1Gwu425nUQGzfKCOgKYTW0nLv7/8OoOTTkw==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.9.8.tgz",
+      "integrity": "sha512-CZYQPEC3iUBMuaGWrtIG+GKNl93q/PkdudrCKJR/B96dfNngsmoosEm3LuFgJHEcJIfvnJkNqKw74l+zEiqCbg==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "bmp-js": "^0.1.0",
         "core-js": "^3.4.1"
       },
@@ -2222,29 +2222,29 @@
       }
     },
     "@jimp/core": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.9.3.tgz",
-      "integrity": "sha512-kB9lvst1QhgYOC963SAuPgv+DdVfxTProphrSffAAoo5eLeQab/Ca3ZUeX1E/SnLSr+NGVnNCd8c9gyuKDiENg==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/core/-/core-0.9.8.tgz",
+      "integrity": "sha512-N4GCjcXb0QwR5GBABDK2xQ3cKyaF7LlCYeJEG9mV7G/ynBoRqJe4JA6YKU9Ww9imGkci/4A594nQo8tUIqdcBw==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "any-base": "^1.1.0",
         "buffer": "^5.2.0",
         "core-js": "^3.4.1",
         "exif-parser": "^0.1.12",
         "file-type": "^9.0.0",
         "load-bmfont": "^1.3.1",
-        "mkdirp": "0.5.1",
+        "mkdirp": "^0.5.1",
         "phin": "^2.9.1",
         "pixelmatch": "^4.0.2",
         "tinycolor2": "^1.4.1"
       },
       "dependencies": {
         "buffer": {
-          "version": "5.4.3",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz",
-          "integrity": "sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz",
+          "integrity": "sha512-9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww==",
           "dev": true,
           "requires": {
             "base64-js": "^1.0.2",
@@ -2260,13 +2260,13 @@
       }
     },
     "@jimp/custom": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.9.3.tgz",
-      "integrity": "sha512-2E7yabQMeqjcK8+ZFu3Ja5cWyrB0zv/pmzNSDg/BBPJ59HE0fj/qcERAz6VklcjHUYRUfmE5uODsb+4DE0o/YQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/custom/-/custom-0.9.8.tgz",
+      "integrity": "sha512-1UpJjI7fhX02BWLJ/KEqPwkHH60eNkCNeD6hEd+IZdTwLXfZCfFiM5BVlpgiZYZJSsVoRiAL4ne2Q5mCiKPKyw==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/core": "^0.9.3",
+        "@jimp/core": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2279,13 +2279,13 @@
       }
     },
     "@jimp/gif": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.9.3.tgz",
-      "integrity": "sha512-DshKgMQ8lXorI/xTRyeRkZqZ3JqgnL2aGYAhx0SkAunyHgXji27chmrOGj/6KVDBucrDf/6mSexnSoUDnlWrfA==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/gif/-/gif-0.9.8.tgz",
+      "integrity": "sha512-LEbfpcO1sBJIQCJHchZjNlyNxzPjZQQ4X32klpQHZJG58n9FvL7Uuh1rpkrJRbqv3cU3P0ENNtTrsBDxsYwcfA==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1",
         "omggif": "^1.0.9"
       },
@@ -2299,13 +2299,13 @@
       }
     },
     "@jimp/jpeg": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.9.3.tgz",
-      "integrity": "sha512-AJzcTJXfN9BHtpzAbICwR3+GoH0pSr6OYXbAS6yuKwz+xVn9UHrEjQb74CIzIRqrT/VWcIKg29cMQxgokzWY7w==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.9.8.tgz",
+      "integrity": "sha512-5u29SUzbZ32ZMmOaz3gO0hXatwSCnsvEAXRCKZoPPgbsPoyFAiZKVxjfLzjkeQF6awkvJ8hZni5chM15SNMg+g==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1",
         "jpeg-js": "^0.3.4"
       },
@@ -2319,13 +2319,13 @@
       }
     },
     "@jimp/plugin-blit": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.9.3.tgz",
-      "integrity": "sha512-+UxCsJ3XkRSdpigpTBJ9WkdwUc3OtBlhVZdU6OL6M9ldume5Gj3rTyWvMCqytOK1tZ/+7HmxoWe4IWX31hz9qA==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.9.8.tgz",
+      "integrity": "sha512-6xTDomxJybhBcby1IUVaPydZFhxf+V0DRgfDlVK81kR9kSCoshJpzWqDuWrMqjNEPspPE7jRQwHMs0FdU7mVwQ==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2338,13 +2338,32 @@
       }
     },
     "@jimp/plugin-blur": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.9.3.tgz",
-      "integrity": "sha512-RADcYjZ5vbk5ZrUiK7qv0G4xOpHtu19HWVVX9JTDbm4VByWTxPboVKlgiYLA6l+IxIXNtEqDclsADIM0s9FQhA==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.9.8.tgz",
+      "integrity": "sha512-dqbxuNFBRbmt35iIRacdgma7nlXklmPThsKcGWNTDmqb/hniK5IC+0xSPzBV4qMI2fLGP39LWHqqDZ0xDz14dA==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
+        "core-js": "^3.4.1"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.6.4",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+          "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+          "dev": true
+        }
+      }
+    },
+    "@jimp/plugin-circle": {
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.9.8.tgz",
+      "integrity": "sha512-+UStXUPCzPqzTixLC8eVqcFcEa6TS+BEM/6/hyM11TDb9sbiMGeUtgpwZP/euR5H5gfpAQDA1Ppzqhh5fuMDlw==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.7.2",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2357,13 +2376,13 @@
       }
     },
     "@jimp/plugin-color": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.9.3.tgz",
-      "integrity": "sha512-gHDA5GVx4/R4fitEACKmWH7hNy0aU48MZWYRxmATvuqY39KidJ0fjwp+brQ3Ivgb35AgFVc2jQYc3U/JXv4RxQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.9.8.tgz",
+      "integrity": "sha512-SDHxOQsJHpt75hk6+sSlCPc2B3UJlXosFW+iLZ11xX1Qr0IdDtbfYlIoPmjKQFIDUNzqLSue/z7sKQ1OMZr/QA==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1",
         "tinycolor2": "^1.4.1"
       },
@@ -2377,13 +2396,13 @@
       }
     },
     "@jimp/plugin-contain": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.9.3.tgz",
-      "integrity": "sha512-vdYAtp65LNDT/hMctow5o0a/SbD41/y7Z9AO7MGsfUIK92Woq90SNTWx7JplDl4HSZGrqaBONnfiEhRiYlDrdg==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.9.8.tgz",
+      "integrity": "sha512-oK52CPt7efozuLYCML7qOmpFeDt3zpU8qq8UZlnjsDs15reU6L8EiUbwYpJvzoEnEOh1ZqamB8F/gymViEO5og==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2396,13 +2415,13 @@
       }
     },
     "@jimp/plugin-cover": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.9.3.tgz",
-      "integrity": "sha512-yOwsvakgyS2/C4iZF1a1wg63QKfYvqb2d6k+rgY/0vaAe44JtEx+Gbg+7iOt4EaMm5BDlxRwmcA2Q8Pef8TvAQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.9.8.tgz",
+      "integrity": "sha512-nnamtHzMrNd5j5HRSPd1VzpZ8v9YYtUJPtvCdHOOiIjqG72jxJ2kTBlsS3oG5XS64h/2MJwpl/fmmMs1Tj1CmQ==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2415,13 +2434,13 @@
       }
     },
     "@jimp/plugin-crop": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.9.3.tgz",
-      "integrity": "sha512-kqMXSyY8hrfo0idr6qY2USOWPrNqpDWs+D6Vwa+kV6SGJhj3rMTIcptQDaamIETSxbjkE8rwUu3K4Q5UD69D7w==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.9.8.tgz",
+      "integrity": "sha512-Nv/6AIp4aJmbSIH2uiIqm+kSoShKM8eaX2fyrUTj811kio0hwD3f/vIxrWebvAqwDZjAFIAmMufFoFCVg6caoQ==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2434,13 +2453,13 @@
       }
     },
     "@jimp/plugin-displace": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.9.3.tgz",
-      "integrity": "sha512-0AdwxYRWDmJ2wIRIj2RR3sRmNjMhcy5Kwt9Jbi/RRnzxkRScZAiyzkNZhBul23EM7ClfjrUrZufuUvRMHxZRDw==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.9.8.tgz",
+      "integrity": "sha512-0OgPjkOVa2xdbqI8P6gBKX/UK36RbaYVrFyXL8Jy9oNF69+LYWyTskuCu9YbGxzlCVjY/JFqQOvrKDbxgMYAKA==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2453,13 +2472,32 @@
       }
     },
     "@jimp/plugin-dither": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.9.3.tgz",
-      "integrity": "sha512-8OE+Xak9xepiCwSV+oAsb/gupTnttG3aDKxtpSZjwHebnr+k1VG8NgICbMSFATTVJqqZ18oj6LC+5726qHUJ9w==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.9.8.tgz",
+      "integrity": "sha512-jGM/4ByniZJnmV2fv8hKwyyydXZe/YzvgBcnB8XxzCq8kVR3Imcn+qnd2PEPZzIPKOTH4Cig/zo9Vk9Bs+m5FQ==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
+        "core-js": "^3.4.1"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.6.4",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+          "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+          "dev": true
+        }
+      }
+    },
+    "@jimp/plugin-fisheye": {
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.9.8.tgz",
+      "integrity": "sha512-VnsalrD05f4pxG1msjnkwIFi5QveOqRm4y7VkoZKNX+iqs4TvRnH5+HpBnfdMzX/RXBi+Lf/kpTtuZgbOu/QWw==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.7.2",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2472,13 +2510,13 @@
       }
     },
     "@jimp/plugin-flip": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.9.3.tgz",
-      "integrity": "sha512-w+lzE1ZF/UOjB8qJdeIm+dLQtOK1obZwGYdCIbgxZxw4SfkkjAftJdY8o8RNOXhHDZqGu+cYQZbMKP1zcoNkyQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.9.8.tgz",
+      "integrity": "sha512-XbiZ4OfHD6woc0f6Sk7XxB6a7IyMjTRQ4pNU7APjaNxsl3L6qZC8qfCQphWVe3DHx7f3y7jEiPMvNnqRDP1xgA==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2491,13 +2529,13 @@
       }
     },
     "@jimp/plugin-gaussian": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.9.3.tgz",
-      "integrity": "sha512-RPrWwzlZsbWC2opSgeyWt30JU9Uwg1+GwBnoNpEMLKeqm0Dv6snASASa4zVtviGWAIq//p3Jrap7g57hKqL0Cg==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.9.8.tgz",
+      "integrity": "sha512-ZBl5RA6+4XAD+mtqLfiG7u+qd8W5yqq3RBNca8eFqUSVo1v+eB2tzeLel0CWfVC/z6cw93Awm/nVnm6/CL2Oew==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2510,13 +2548,13 @@
       }
     },
     "@jimp/plugin-invert": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.9.3.tgz",
-      "integrity": "sha512-0lRsh7IPkzyYqExrZDT50h38xdlB/+KrdiDcuxWwWyIlKauLMR0kInjwf8sPeb3elPLeETmze7uwPAxrIAtsGQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.9.8.tgz",
+      "integrity": "sha512-ESploqCoF6qUv5IWhVLaO5fEcrYZEsAWPFflh6ROiD2mmFKQxfeK+vHnk3IDLHtUwWTkAZQNbk89BVq7xvaNpQ==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2529,13 +2567,13 @@
       }
     },
     "@jimp/plugin-mask": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.9.3.tgz",
-      "integrity": "sha512-nZ0J62Hly9JtMZctlSDVgnTd8Fg2XGikzAYilSTCjzIRtbXL5Be/qSAZrMfLD3CZ8exTxdlEGRkEJI3RZKXYCw==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.9.8.tgz",
+      "integrity": "sha512-zSvEisTV4iGsBReitEdnQuGJq9/1xB5mPATadYZmIlp8r5HpD72HQb0WdEtb51/pu9Odt8KAxUf0ASg/PRVUiQ==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2548,13 +2586,13 @@
       }
     },
     "@jimp/plugin-normalize": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.9.3.tgz",
-      "integrity": "sha512-0IvgTt4R15QJnoCHvvqlK56zOtCsQV7Mkx757kdNah8uyPGjadTcFBuqCaOMK943X36IIv+o7Ix7yvNUJZt4aw==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.9.8.tgz",
+      "integrity": "sha512-dPFBfwTa67K1tRw1leCidQT25R3ozrTUUOpO4jcGFHqXvBTWaR8sML1qxdfOBWs164mE5YpfdTvu6MM/junvCg==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2567,13 +2605,13 @@
       }
     },
     "@jimp/plugin-print": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.9.3.tgz",
-      "integrity": "sha512-pV6oX5Bhe9O/dbgrotz46Bv6u1M+/n9G0kRUunDjwzXrvON5raBFEJHQDPcTXiqPT25Gc9Ba4/Akfo/Zl6+wgQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.9.8.tgz",
+      "integrity": "sha512-nLLPv1/faehRsOjecXXUb6kzhRcZzImO55XuFZ0c90ZyoiHm4UFREwO5sKxHGvpLXS6RnkhvSav4+IWD2qGbEQ==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1",
         "load-bmfont": "^1.4.0"
       },
@@ -2587,13 +2625,13 @@
       }
     },
     "@jimp/plugin-resize": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.9.3.tgz",
-      "integrity": "sha512-YzqVE8QoDIZpVuI52v+WejwEjEEiJfNFviQfprfm5af7uSSseZgDw1sJ0koqAu+liMSY+Ewp79v2SDrKoJKqtg==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.9.8.tgz",
+      "integrity": "sha512-L80NZ+HKsiKFyeDc6AfneC4+5XACrdL2vnyAVfAAsb3pmamgT/jDInWvvGhyI0Y76vx2w6XikplzEznW/QQvWg==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2606,13 +2644,13 @@
       }
     },
     "@jimp/plugin-rotate": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.9.3.tgz",
-      "integrity": "sha512-kADY2pI3/yMyHbuyvKB4nqPoKf8DPQBU1b4zz2K7SxcwKh1krFf4Fa9mmhhDLoFwuNSy0SPb1JCMUO4BtFCFLA==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.9.8.tgz",
+      "integrity": "sha512-bpqzQheISYnBXKyU1lIj46uR7mRs0UhgEREWK70HnvFJSlRshdcoNMIrKamyrJeFdJrkYPSfR/a6D0d5zsWf1Q==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2625,13 +2663,51 @@
       }
     },
     "@jimp/plugin-scale": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.9.3.tgz",
-      "integrity": "sha512-vZaiL5Qc+WrgGEfUe4Y0vG+qbT6pe2TW68/mu124E1tKVcZjHKZUeFN0Wr/hP2myN6nqTYj0/sord2OS/04JpA==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.9.8.tgz",
+      "integrity": "sha512-QU3ZS4Lre8nN66U9dKCOC4FNfaOh/QJFYUmQPKpPS924oYbtnm4OlmsdfpK2hVMSVVyVOis8M+xpA1rDBnIp7w==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
+        "core-js": "^3.4.1"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.6.4",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+          "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+          "dev": true
+        }
+      }
+    },
+    "@jimp/plugin-shadow": {
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.9.8.tgz",
+      "integrity": "sha512-t/pE+QS3r1ZUxGIQNmwWDI3c5+/hLU+gxXD+C3EEC47/qk3gTBHpj/xDdGQBoObdT/HRjR048vC2BgBfzjj2hg==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.7.2",
+        "@jimp/utils": "^0.9.8",
+        "core-js": "^3.4.1"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.6.4",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+          "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
+          "dev": true
+        }
+      }
+    },
+    "@jimp/plugin-threshold": {
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.9.8.tgz",
+      "integrity": "sha512-WWmC3lnIwOTPvkKu55w4DUY8Ehlzf3nU98bY0QtIzkqxkAOZU5m+lvgC/JxO5FyGiA57j9FLMIf0LsWkjARj7g==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.7.2",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1"
       },
       "dependencies": {
@@ -2644,29 +2720,33 @@
       }
     },
     "@jimp/plugins": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.9.3.tgz",
-      "integrity": "sha512-KYCSgFGoZBNC0224X5yUnMHCZnCdUVrsu2Yo67o3XZfUgDjO81J+vdzZ0twpPQ6qLLVAP+nQ8hkRV/QzEUstMw==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.9.8.tgz",
+      "integrity": "sha512-tD+cxS9SuEZaQ1hhAkNKw9TkUAqfoBAhdWPBrEZDr/GvGPrvJR4pYmmpSYhc5IZmMbXfQayHTTGqjj8D18bToA==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/plugin-blit": "^0.9.3",
-        "@jimp/plugin-blur": "^0.9.3",
-        "@jimp/plugin-color": "^0.9.3",
-        "@jimp/plugin-contain": "^0.9.3",
-        "@jimp/plugin-cover": "^0.9.3",
-        "@jimp/plugin-crop": "^0.9.3",
-        "@jimp/plugin-displace": "^0.9.3",
-        "@jimp/plugin-dither": "^0.9.3",
-        "@jimp/plugin-flip": "^0.9.3",
-        "@jimp/plugin-gaussian": "^0.9.3",
-        "@jimp/plugin-invert": "^0.9.3",
-        "@jimp/plugin-mask": "^0.9.3",
-        "@jimp/plugin-normalize": "^0.9.3",
-        "@jimp/plugin-print": "^0.9.3",
-        "@jimp/plugin-resize": "^0.9.3",
-        "@jimp/plugin-rotate": "^0.9.3",
-        "@jimp/plugin-scale": "^0.9.3",
+        "@jimp/plugin-blit": "^0.9.8",
+        "@jimp/plugin-blur": "^0.9.8",
+        "@jimp/plugin-circle": "^0.9.8",
+        "@jimp/plugin-color": "^0.9.8",
+        "@jimp/plugin-contain": "^0.9.8",
+        "@jimp/plugin-cover": "^0.9.8",
+        "@jimp/plugin-crop": "^0.9.8",
+        "@jimp/plugin-displace": "^0.9.8",
+        "@jimp/plugin-dither": "^0.9.8",
+        "@jimp/plugin-fisheye": "^0.9.8",
+        "@jimp/plugin-flip": "^0.9.8",
+        "@jimp/plugin-gaussian": "^0.9.8",
+        "@jimp/plugin-invert": "^0.9.8",
+        "@jimp/plugin-mask": "^0.9.8",
+        "@jimp/plugin-normalize": "^0.9.8",
+        "@jimp/plugin-print": "^0.9.8",
+        "@jimp/plugin-resize": "^0.9.8",
+        "@jimp/plugin-rotate": "^0.9.8",
+        "@jimp/plugin-scale": "^0.9.8",
+        "@jimp/plugin-shadow": "^0.9.8",
+        "@jimp/plugin-threshold": "^0.9.8",
         "core-js": "^3.4.1",
         "timm": "^1.6.1"
       },
@@ -2680,13 +2760,13 @@
       }
     },
     "@jimp/png": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.9.3.tgz",
-      "integrity": "sha512-LJXUemDTSbTGAGEp9hNQH0uTRSB8gYeE6FsfT3M00oZincu6/WzDzl0P8E95rMjNxZqAihdTyOP3+kcrbbqX+w==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/png/-/png-0.9.8.tgz",
+      "integrity": "sha512-9CqR8d40zQCDhbnXHqcwkAMnvlV0vk9xSyE6LHjkYHS7x18Unsz5txQdsaEkEcXxCrOQSoWyITfLezlrWXRJAA==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/utils": "^0.9.3",
+        "@jimp/utils": "^0.9.8",
         "core-js": "^3.4.1",
         "pngjs": "^3.3.3"
       },
@@ -2700,9 +2780,9 @@
       }
     },
     "@jimp/tiff": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.9.3.tgz",
-      "integrity": "sha512-w9H6dT+GDHN//Srsv27JhRn7R2byzUahOGfFw7KpIn95jg0ogcxjKTo/RAGQC56sr4U092e4Npl7E85Lt934WQ==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.9.8.tgz",
+      "integrity": "sha512-eMxcpJivJqMByn2dZxUHLeh6qvVs5J/52kBF3TFa3C922OJ97D9l1C1h0WKUCBqFMWzMYapQQ4vwnLgpJ5tkow==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
@@ -2719,17 +2799,17 @@
       }
     },
     "@jimp/types": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.9.3.tgz",
-      "integrity": "sha512-hUJKoT2IhnbO/trxNWzN19n8g+p7aKbM1R+71n4wMZnD41PzrVtz+sBBCdB+JCjBJs/i7fJt4d9z0i3Xe8m7Zw==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/types/-/types-0.9.8.tgz",
+      "integrity": "sha512-H5y/uqt0lqJ/ZN8pWqFG+pv8jPAppMKkTMByuC8YBIjWSsornwv44hjiWl93sbYhduLZY8ubz/CbX9jH2X6EwA==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/bmp": "^0.9.3",
-        "@jimp/gif": "^0.9.3",
-        "@jimp/jpeg": "^0.9.3",
-        "@jimp/png": "^0.9.3",
-        "@jimp/tiff": "^0.9.3",
+        "@jimp/bmp": "^0.9.8",
+        "@jimp/gif": "^0.9.8",
+        "@jimp/jpeg": "^0.9.8",
+        "@jimp/png": "^0.9.8",
+        "@jimp/tiff": "^0.9.8",
         "core-js": "^3.4.1",
         "timm": "^1.6.1"
       },
@@ -2743,9 +2823,9 @@
       }
     },
     "@jimp/utils": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.9.3.tgz",
-      "integrity": "sha512-9D2Of6BcjYONtl77YfmU2y5aRMLe0/O2e2aQvfCxdNwD33jRdwNdN4i3m73dpiClNquApIjL4nYGhTixA4UstA==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/@jimp/utils/-/utils-0.9.8.tgz",
+      "integrity": "sha512-UK0Fu0eevQlpRXq5ff4o/71HJlpX9wJMddJjMYg9vUqCCl8ZnumRAljfShHFhGyO+Vc9IzN6dd8Y5JZZTp1KOw==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
@@ -3520,178 +3600,177 @@
       "dev": true
     },
     "@webassemblyjs/ast": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
+      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5"
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
+      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
       "dev": true
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
+      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
       "dev": true
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
+      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
       "dev": true
     },
     "@webassemblyjs/helper-code-frame": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
+      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/wast-printer": "1.8.5"
+        "@webassemblyjs/wast-printer": "1.9.0"
       }
     },
     "@webassemblyjs/helper-fsm": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
+      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
       "dev": true
     },
     "@webassemblyjs/helper-module-context": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
+      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "mamacro": "^0.0.3"
+        "@webassemblyjs/ast": "1.9.0"
       }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
+      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
       "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
+      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
+      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
       "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
+      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
       "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
+      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
       "dev": true
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
+      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/helper-wasm-section": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-opt": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "@webassemblyjs/wast-printer": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/helper-wasm-section": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-opt": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "@webassemblyjs/wast-printer": "1.9.0"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
+      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
+      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
+      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
       }
     },
     "@webassemblyjs/wast-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
+      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-code-frame": "1.8.5",
-        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-code-frame": "1.9.0",
+        "@webassemblyjs/helper-fsm": "1.9.0",
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
+      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5",
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -4258,15 +4337,78 @@
       }
     },
     "babel-loader": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
-      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
+      "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
       "dev": true,
       "requires": {
-        "find-cache-dir": "^2.0.0",
-        "loader-utils": "^1.0.2",
-        "mkdirp": "^0.5.1",
-        "pify": "^4.0.1"
+        "find-cache-dir": "^2.1.0",
+        "loader-utils": "^1.4.0",
+        "mkdirp": "^0.5.3",
+        "pify": "^4.0.1",
+        "schema-utils": "^2.6.5"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
+          "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+          "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
+          "dev": true
+        },
+        "emojis-list": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+          "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+          "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+          "dev": true
+        },
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        },
+        "schema-utils": {
+          "version": "2.6.5",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz",
+          "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.12.0",
+            "ajv-keywords": "^3.4.1"
+          }
+        }
       }
     },
     "babel-plugin-dynamic-import-node": {
@@ -4667,6 +4809,12 @@
         "isarray": "^1.0.0"
       }
     },
+    "buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
+    },
     "buffer-equal": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz",
@@ -6813,9 +6961,9 @@
       }
     },
     "dom-walk": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz",
-      "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
+      "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==",
       "dev": true
     },
     "domain-browser": {
@@ -7789,9 +7937,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
-          "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
+          "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
           "dev": true
         }
       }
@@ -8125,15 +8273,15 @@
       }
     },
     "extract-zip": {
-      "version": "1.6.7",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
-      "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
+      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
       "dev": true,
       "requires": {
-        "concat-stream": "1.6.2",
-        "debug": "2.6.9",
-        "mkdirp": "0.5.1",
-        "yauzl": "2.4.1"
+        "concat-stream": "^1.6.2",
+        "debug": "^2.6.9",
+        "mkdirp": "^0.5.4",
+        "yauzl": "^2.10.0"
       },
       "dependencies": {
         "debug": {
@@ -8206,9 +8354,9 @@
       }
     },
     "fd-slicer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
-      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
       "dev": true,
       "requires": {
         "pend": "~1.2.0"
@@ -8593,12 +8741,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"
@@ -8618,7 +8768,8 @@
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
@@ -8766,6 +8917,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -10364,15 +10516,15 @@
       }
     },
     "jimp": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.9.3.tgz",
-      "integrity": "sha512-dIxvT1OMRkd3+B18XUhJ5WZ2Dw7Hp8mvjaTqfi945zZ7fga6LT22h3NLYDorHHAiy9z30KjfNnOgpBoxrdjDZg==",
+      "version": "0.9.8",
+      "resolved": "https://registry.npmjs.org/jimp/-/jimp-0.9.8.tgz",
+      "integrity": "sha512-DHN4apKMwLIvD/TKO9tFfPuankNuVK98vCwHm/Jv9z5cJnrd38xhi+4I7IAGmDU3jIDlrEVhzTkFH1Ymv5yTQQ==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.7.2",
-        "@jimp/custom": "^0.9.3",
-        "@jimp/plugins": "^0.9.3",
-        "@jimp/types": "^0.9.3",
+        "@jimp/custom": "^0.9.8",
+        "@jimp/plugins": "^0.9.8",
+        "@jimp/types": "^0.9.8",
         "core-js": "^3.4.1",
         "regenerator-runtime": "^0.13.3"
       },
@@ -10386,9 +10538,9 @@
       }
     },
     "jpeg-js": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.3.6.tgz",
-      "integrity": "sha512-MUj2XlMB8kpe+8DJUGH/3UJm4XpI8XEgZQ+CiHDeyrGoKPdW/8FJv6ku+3UiYm5Fz3CWaL+iXmD8Q4Ap6aC1Jw==",
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.3.7.tgz",
+      "integrity": "sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==",
       "dev": true
     },
     "js-levenshtein": {
@@ -10542,9 +10694,9 @@
       "dev": true
     },
     "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
     "klaw": {
@@ -10900,12 +11052,6 @@
         "semver": "^5.6.0"
       }
     },
-    "mamacro": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
-      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
-      "dev": true
-    },
     "map-age-cleaner": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -11211,9 +11357,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "dev": true
     },
     "minipass": {
@@ -11300,20 +11446,12 @@
       }
     },
     "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
       "dev": true,
       "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
+        "minimist": "^1.2.5"
       }
     },
     "modify-filename": {
@@ -16095,12 +16233,12 @@
       "dev": true
     },
     "watchpack": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz",
+      "integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==",
       "dev": true,
       "requires": {
-        "chokidar": "^2.0.2",
+        "chokidar": "^2.1.8",
         "graceful-fs": "^4.1.2",
         "neo-async": "^2.5.0"
       }
@@ -16124,15 +16262,15 @@
       }
     },
     "webpack": {
-      "version": "4.41.5",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.5.tgz",
-      "integrity": "sha512-wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw==",
+      "version": "4.42.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz",
+      "integrity": "sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/wasm-edit": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/wasm-edit": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
         "acorn": "^6.2.1",
         "ajv": "^6.10.2",
         "ajv-keywords": "^3.4.1",
@@ -16144,7 +16282,7 @@
         "loader-utils": "^1.2.3",
         "memory-fs": "^0.4.1",
         "micromatch": "^3.1.10",
-        "mkdirp": "^0.5.1",
+        "mkdirp": "^0.5.3",
         "neo-async": "^2.6.1",
         "node-libs-browser": "^2.2.1",
         "schema-utils": "^1.0.0",
@@ -16155,12 +16293,12 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+          "version": "6.12.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
+          "integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "^2.0.1",
+            "fast-deep-equal": "^3.1.1",
             "fast-json-stable-stringify": "^2.0.0",
             "json-schema-traverse": "^0.4.1",
             "uri-js": "^4.2.2"
@@ -16171,17 +16309,23 @@
           "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
           "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
           "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+          "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+          "dev": true
         }
       }
     },
     "webpack-bundle-analyzer": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.0.tgz",
-      "integrity": "sha512-orUfvVYEfBMDXgEKAKVvab5iQ2wXneIEorGNsyuOyVYpjYrI7CUOhhXNDd3huMwQ3vNNWWlGP+hzflMFYNzi2g==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.1.tgz",
+      "integrity": "sha512-Nfd8HDwfSx1xBwC+P8QMGvHAOITxNBSvu/J/mCJvOwv+G4VWkU7zir9SSenTtyCi0LnVtmsc7G5SZo1uV+bxRw==",
       "dev": true,
       "requires": {
-        "acorn": "^6.0.7",
-        "acorn-walk": "^6.1.1",
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1",
         "bfj": "^6.1.1",
         "chalk": "^2.4.1",
         "commander": "^2.18.0",
@@ -16195,10 +16339,10 @@
         "ws": "^6.0.0"
       },
       "dependencies": {
-        "acorn-walk": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
-          "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
+        "acorn": {
+          "version": "7.1.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
+          "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
           "dev": true
         }
       }
@@ -16842,12 +16986,13 @@
       }
     },
     "yauzl": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
-      "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
       "dev": true,
       "requires": {
-        "fd-slicer": "~1.0.1"
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
       }
     }
   }

From 1d05f0d6d410a6bb7c7d81b2ce1cf2b3a38d333f Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 14:56:06 +0100
Subject: [PATCH 28/31] Update dependencies

---
 package-lock.json | 490 ++++++++++++++++++++++++++++++----------------
 package.json      |  12 +-
 2 files changed, 329 insertions(+), 173 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f0e0cbb8..23d14438 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2915,6 +2915,12 @@
         }
       }
     },
+    "@soda/get-current-script": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@soda/get-current-script/-/get-current-script-1.0.0.tgz",
+      "integrity": "sha512-9GvTek+7cVw7r+L7TNGOG1astZJWXz2h5q4BqMXl28KN+24iSCm1xo+RhZOZvwdT3bzNe9hD7riJc/lBoO7mgg==",
+      "dev": true
+    },
     "@szmarczak/http-timer": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
@@ -2959,9 +2965,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "13.7.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.7.1.tgz",
-      "integrity": "sha512-Zq8gcQGmn4txQEJeiXo/KiLpon8TzAl0kmKH4zdWctPj05nWwp1ClMdAVEloqrQKfaC48PNLdgN/aVaLqUrluA=="
+      "version": "13.11.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.11.0.tgz",
+      "integrity": "sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ=="
     },
     "@types/normalize-package-data": {
       "version": "2.4.0",
@@ -3082,9 +3088,9 @@
       }
     },
     "@vue/cli-overlay": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.2.3.tgz",
-      "integrity": "sha512-V51eS7NIsK/rv19oK0+B5Yl/VNWCJTTkjibreIXDknOLSH3MKTOJamUI1BEYo5FOXBWw+7DLmaNF3XKemQ5Y/w==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.3.0.tgz",
+      "integrity": "sha512-PWMPx2emRZR0tZmICXjFMkZflhWMorx5SnOguLzewuhayKR05tDCUxSydoy9Synre/d35mHAr3/iRc49uiLKuQ==",
       "dev": true
     },
     "@vue/cli-plugin-babel": {
@@ -3101,18 +3107,18 @@
       }
     },
     "@vue/cli-plugin-router": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.2.3.tgz",
-      "integrity": "sha512-RGtgFQCTMS1X1wtFt752RMgr/LlF9cfpH37MkwjhF2wpnyTp+hkKl/09QORAKW91I8iFpZFH7xZKMBS3r1WbCw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.3.0.tgz",
+      "integrity": "sha512-HBoJFWWcCkG7r0EvWMS6PcYBZ26SgcK2jjQh37WzeA2hNHlqfMfYMPSjz0sdqxIDUAga0P2Rbo/VpNQ38FJUWg==",
       "dev": true,
       "requires": {
-        "@vue/cli-shared-utils": "^4.2.3"
+        "@vue/cli-shared-utils": "^4.3.0"
       },
       "dependencies": {
         "@vue/cli-shared-utils": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.2.3.tgz",
-          "integrity": "sha512-GCoTB6vMZsi9z/Bmn8/C9IlnUw8eeHONOGE+48TJkZyulftVFhlwVWjTFp5GuDAlwpTWarHchW9IoVu3pIIGfA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.3.0.tgz",
+          "integrity": "sha512-iGWoYvPZvsJqIeXfaJcf5LgsaiqyYSnXEHkW+52ELfniw6NZAr1mdn4vPzppAElhFd87TY3rq0DFXP8UBr+/6w==",
           "dev": true,
           "requires": {
             "@hapi/joi": "^15.0.1",
@@ -3124,7 +3130,7 @@
             "open": "^6.3.0",
             "ora": "^3.4.0",
             "read-pkg": "^5.1.1",
-            "request": "^2.87.0",
+            "request": "^2.88.2",
             "request-promise-native": "^1.0.8",
             "semver": "^6.1.0",
             "strip-ansi": "^6.0.0"
@@ -3136,6 +3142,34 @@
           "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
           "dev": true
         },
+        "request": {
+          "version": "2.88.2",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+          "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.8.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.6",
+            "extend": "~3.0.2",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.2",
+            "har-validator": "~5.1.3",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.19",
+            "oauth-sign": "~0.9.0",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.2",
+            "safe-buffer": "^5.1.2",
+            "tough-cookie": "~2.5.0",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.3.2"
+          }
+        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -3150,44 +3184,54 @@
           "requires": {
             "ansi-regex": "^5.0.0"
           }
+        },
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+          "dev": true,
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
         }
       }
     },
     "@vue/cli-plugin-vuex": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.2.3.tgz",
-      "integrity": "sha512-7M4CaoAD4W/GdiDI4+Gh2tATPFBnb/u7bCiLLDsuL9ztypv7l3p4cu43zkDpTCCuufkZFYtZwysOAY8SbGqOjg==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.3.0.tgz",
+      "integrity": "sha512-d1yHZHhNyWogyQpsXmBHDiLSyhBccFhqlC/IoTwsbu7X8TBawWrllm1N6wAgdmllQBHIJXlm/6Nk91XjECub7w==",
       "dev": true
     },
     "@vue/cli-service": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.2.3.tgz",
-      "integrity": "sha512-eSsmrt7nIZInmEvVW5x7eQLdEywBin79nKduB2PgYx0Me82wRfKDa8JpkCM6jZV0AxIuaF7N4RkPOtlkrBKX9Q==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.3.0.tgz",
+      "integrity": "sha512-dNy5FGIareDMTjwoYsZ5Zs74A5FIsAJgyjXVZkd4DwPsnDay27dRObMUi8/hY8AI7ssZ2Jg/HhUhoiyE6dIbKw==",
       "dev": true,
       "requires": {
         "@intervolga/optimize-cssnano-plugin": "^1.0.5",
         "@soda/friendly-errors-webpack-plugin": "^1.7.1",
-        "@vue/cli-overlay": "^4.2.3",
-        "@vue/cli-plugin-router": "^4.2.3",
-        "@vue/cli-plugin-vuex": "^4.2.3",
-        "@vue/cli-shared-utils": "^4.2.3",
+        "@soda/get-current-script": "^1.0.0",
+        "@vue/cli-overlay": "^4.3.0",
+        "@vue/cli-plugin-router": "^4.3.0",
+        "@vue/cli-plugin-vuex": "^4.3.0",
+        "@vue/cli-shared-utils": "^4.3.0",
         "@vue/component-compiler-utils": "^3.0.2",
         "@vue/preload-webpack-plugin": "^1.1.0",
         "@vue/web-component-wrapper": "^1.2.0",
         "acorn": "^7.1.0",
-        "acorn-walk": "^7.0.0",
+        "acorn-walk": "^7.1.1",
         "address": "^1.1.2",
-        "autoprefixer": "^9.7.4",
-        "browserslist": "^4.8.6",
+        "autoprefixer": "^9.7.5",
+        "browserslist": "^4.11.1",
         "cache-loader": "^4.1.0",
         "case-sensitive-paths-webpack-plugin": "^2.3.0",
         "cli-highlight": "^2.1.4",
-        "clipboardy": "^2.1.0",
+        "clipboardy": "^2.3.0",
         "cliui": "^6.0.0",
         "copy-webpack-plugin": "^5.1.1",
         "css-loader": "^3.4.2",
         "cssnano": "^4.1.10",
-        "current-script-polyfill": "^1.0.0",
         "debug": "^4.1.1",
         "default-gateway": "^5.0.5",
         "dotenv": "^8.2.0",
@@ -3202,27 +3246,27 @@
         "lodash.mapvalues": "^4.6.0",
         "lodash.transform": "^4.6.0",
         "mini-css-extract-plugin": "^0.9.0",
-        "minimist": "^1.2.0",
-        "pnp-webpack-plugin": "^1.6.0",
+        "minimist": "^1.2.5",
+        "pnp-webpack-plugin": "^1.6.4",
         "portfinder": "^1.0.25",
         "postcss-loader": "^3.0.0",
         "ssri": "^7.1.0",
-        "terser-webpack-plugin": "^2.3.4",
+        "terser-webpack-plugin": "^2.3.5",
         "thread-loader": "^2.1.3",
         "url-loader": "^2.2.0",
-        "vue-loader": "^15.8.3",
+        "vue-loader": "^15.9.1",
         "vue-style-loader": "^4.1.2",
         "webpack": "^4.0.0",
-        "webpack-bundle-analyzer": "^3.6.0",
-        "webpack-chain": "^6.3.1",
-        "webpack-dev-server": "^3.10.2",
+        "webpack-bundle-analyzer": "^3.6.1",
+        "webpack-chain": "^6.4.0",
+        "webpack-dev-server": "^3.10.3",
         "webpack-merge": "^4.2.2"
       },
       "dependencies": {
         "@vue/cli-shared-utils": {
-          "version": "4.2.3",
-          "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.2.3.tgz",
-          "integrity": "sha512-GCoTB6vMZsi9z/Bmn8/C9IlnUw8eeHONOGE+48TJkZyulftVFhlwVWjTFp5GuDAlwpTWarHchW9IoVu3pIIGfA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.3.0.tgz",
+          "integrity": "sha512-iGWoYvPZvsJqIeXfaJcf5LgsaiqyYSnXEHkW+52ELfniw6NZAr1mdn4vPzppAElhFd87TY3rq0DFXP8UBr+/6w==",
           "dev": true,
           "requires": {
             "@hapi/joi": "^15.0.1",
@@ -3234,7 +3278,7 @@
             "open": "^6.3.0",
             "ora": "^3.4.0",
             "read-pkg": "^5.1.1",
-            "request": "^2.87.0",
+            "request": "^2.88.2",
             "request-promise-native": "^1.0.8",
             "semver": "^6.1.0",
             "strip-ansi": "^6.0.0"
@@ -3271,14 +3315,15 @@
           "dev": true
         },
         "browserslist": {
-          "version": "4.9.1",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz",
-          "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==",
+          "version": "4.11.1",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz",
+          "integrity": "sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==",
           "dev": true,
           "requires": {
-            "caniuse-lite": "^1.0.30001030",
-            "electron-to-chromium": "^1.3.363",
-            "node-releases": "^1.1.50"
+            "caniuse-lite": "^1.0.30001038",
+            "electron-to-chromium": "^1.3.390",
+            "node-releases": "^1.1.53",
+            "pkg-up": "^2.0.0"
           }
         },
         "cacache": {
@@ -3308,9 +3353,9 @@
           }
         },
         "caniuse-lite": {
-          "version": "1.0.30001031",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001031.tgz",
-          "integrity": "sha512-DpAP5a1NGRLgYfaNCaXIRyGARi+3tJA2quZXNNA1Du26VyVkqvy2tznNu5ANyN1Y5aX44QDotZSVSUSi2uMGjg==",
+          "version": "1.0.30001039",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz",
+          "integrity": "sha512-SezbWCTT34eyFoWHgx8UWso7YtvtM7oosmFoXbCkdC6qJzRfBTeTgE9REtKtiuKXuMwWTZEvdnFNGAyVMorv8Q==",
           "dev": true
         },
         "cliui": {
@@ -3325,9 +3370,9 @@
           }
         },
         "electron-to-chromium": {
-          "version": "1.3.366",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.366.tgz",
-          "integrity": "sha512-MWtwlJaX/MqAH4V7j4pFasq2O4OIH7MltGTEVvzyeuUW+CPYsx+fuVg/MSBrTL4PzZjHidOixaELNy75/XFK1g==",
+          "version": "1.3.397",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.397.tgz",
+          "integrity": "sha512-zcUd1p/7yzTSdWkCTrqGvbnEOASy96d0RJL/lc5BDJoO23Z3G/VHd0yIPbguDU9n8QNUTCigLO7oEdtOb7fp2A==",
           "dev": true
         },
         "emoji-regex": {
@@ -3343,9 +3388,9 @@
           "dev": true
         },
         "find-cache-dir": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.0.tgz",
-          "integrity": "sha512-PtXtQb7IrD8O+h6Cq1dbpJH5NzD8+9keN1zZ0YlpDzl1PwXEJEBj6u1Xa92t1Hwluoozd9TNKul5Hi2iqpsWwg==",
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+          "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
           "dev": true,
           "requires": {
             "commondir": "^1.0.1",
@@ -3394,18 +3439,15 @@
           }
         },
         "node-releases": {
-          "version": "1.1.50",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz",
-          "integrity": "sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==",
-          "dev": true,
-          "requires": {
-            "semver": "^6.3.0"
-          }
+          "version": "1.1.53",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz",
+          "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==",
+          "dev": true
         },
         "p-limit": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -3441,13 +3483,41 @@
             "find-up": "^4.0.0"
           }
         },
-        "schema-utils": {
-          "version": "2.6.4",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
-          "integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
+        "request": {
+          "version": "2.88.2",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+          "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
           "dev": true,
           "requires": {
-            "ajv": "^6.10.2",
+            "aws-sign2": "~0.7.0",
+            "aws4": "^1.8.0",
+            "caseless": "~0.12.0",
+            "combined-stream": "~1.0.6",
+            "extend": "~3.0.2",
+            "forever-agent": "~0.6.1",
+            "form-data": "~2.3.2",
+            "har-validator": "~5.1.3",
+            "http-signature": "~1.2.0",
+            "is-typedarray": "~1.0.0",
+            "isstream": "~0.1.2",
+            "json-stringify-safe": "~5.0.1",
+            "mime-types": "~2.1.19",
+            "oauth-sign": "~0.9.0",
+            "performance-now": "^2.1.0",
+            "qs": "~6.5.2",
+            "safe-buffer": "^5.1.2",
+            "tough-cookie": "~2.5.0",
+            "tunnel-agent": "^0.6.0",
+            "uuid": "^3.3.2"
+          }
+        },
+        "schema-utils": {
+          "version": "2.6.5",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz",
+          "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.12.0",
             "ajv-keywords": "^3.4.1"
           }
         },
@@ -3509,6 +3579,16 @@
             "terser": "^4.4.3",
             "webpack-sources": "^1.4.3"
           }
+        },
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+          "dev": true,
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
         }
       }
     },
@@ -4250,18 +4330,76 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "9.7.4",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.4.tgz",
-      "integrity": "sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==",
+      "version": "9.7.5",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.5.tgz",
+      "integrity": "sha512-URo6Zvt7VYifomeAfJlMFnYDhow1rk2bufwkbamPEAtQFcL11moLk4PnR7n9vlu7M+BkXAZkHFA0mIcY7tjQFg==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.8.3",
-        "caniuse-lite": "^1.0.30001020",
+        "browserslist": "^4.11.0",
+        "caniuse-lite": "^1.0.30001036",
         "chalk": "^2.4.2",
         "normalize-range": "^0.1.2",
         "num2fraction": "^1.2.2",
-        "postcss": "^7.0.26",
-        "postcss-value-parser": "^4.0.2"
+        "postcss": "^7.0.27",
+        "postcss-value-parser": "^4.0.3"
+      },
+      "dependencies": {
+        "browserslist": {
+          "version": "4.11.1",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz",
+          "integrity": "sha512-DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "^1.0.30001038",
+            "electron-to-chromium": "^1.3.390",
+            "node-releases": "^1.1.53",
+            "pkg-up": "^2.0.0"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001039",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001039.tgz",
+          "integrity": "sha512-SezbWCTT34eyFoWHgx8UWso7YtvtM7oosmFoXbCkdC6qJzRfBTeTgE9REtKtiuKXuMwWTZEvdnFNGAyVMorv8Q==",
+          "dev": true
+        },
+        "electron-to-chromium": {
+          "version": "1.3.397",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.397.tgz",
+          "integrity": "sha512-zcUd1p/7yzTSdWkCTrqGvbnEOASy96d0RJL/lc5BDJoO23Z3G/VHd0yIPbguDU9n8QNUTCigLO7oEdtOb7fp2A==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.53",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz",
+          "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.27",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz",
+          "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "aws-sign2": {
@@ -5032,9 +5170,9 @@
           "dev": true
         },
         "find-cache-dir": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.0.tgz",
-          "integrity": "sha512-PtXtQb7IrD8O+h6Cq1dbpJH5NzD8+9keN1zZ0YlpDzl1PwXEJEBj6u1Xa92t1Hwluoozd9TNKul5Hi2iqpsWwg==",
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+          "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
           "dev": true,
           "requires": {
             "commondir": "^1.0.1",
@@ -5071,9 +5209,9 @@
           }
         },
         "p-limit": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -5110,12 +5248,12 @@
           }
         },
         "schema-utils": {
-          "version": "2.6.4",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
-          "integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
+          "version": "2.6.5",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz",
+          "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==",
           "dev": true,
           "requires": {
-            "ajv": "^6.10.2",
+            "ajv": "^6.12.0",
             "ajv-keywords": "^3.4.1"
           }
         },
@@ -5513,9 +5651,9 @@
       "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
     },
     "clipboardy": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.2.0.tgz",
-      "integrity": "sha512-9ry9nC3VFULNmoEIqvuRwCIQ9M7wjnm4O+yvk7xkmhR+7FAUWaeX751oeYJbORg0h0zmqW1EVDoZK8f7yapwbg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz",
+      "integrity": "sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==",
       "dev": true,
       "requires": {
         "arch": "^2.1.1",
@@ -6025,9 +6163,9 @@
           }
         },
         "p-limit": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -6411,20 +6549,38 @@
       "dev": true
     },
     "csso": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.2.tgz",
-      "integrity": "sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
+      "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
       "dev": true,
       "requires": {
-        "css-tree": "1.0.0-alpha.37"
+        "css-tree": "1.0.0-alpha.39"
+      },
+      "dependencies": {
+        "css-tree": {
+          "version": "1.0.0-alpha.39",
+          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
+          "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
+          "dev": true,
+          "requires": {
+            "mdn-data": "2.0.6",
+            "source-map": "^0.6.1"
+          }
+        },
+        "mdn-data": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
+          "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
-    "current-script-polyfill": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/current-script-polyfill/-/current-script-polyfill-1.0.0.tgz",
-      "integrity": "sha1-8xz35PPiGLBybnOMqSoC00iO9hU=",
-      "dev": true
-    },
     "currently-unhandled": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
@@ -6546,9 +6702,9 @@
       },
       "dependencies": {
         "cross-spawn": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz",
-          "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==",
+          "version": "7.0.2",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz",
+          "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==",
           "dev": true,
           "requires": {
             "path-key": "^3.1.0",
@@ -7402,12 +7558,12 @@
       "dev": true
     },
     "electron-updater": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.2.2.tgz",
-      "integrity": "sha512-e/OZhr5tLW0GcgmpR5wD0ImxgKMa8pPoNWRcwRyMzTL9pGej7+ORp0t9DtI5ZBHUbObIoEbrk+6EDGUGtJf+aA==",
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.2.5.tgz",
+      "integrity": "sha512-ir8SI3capF5pN4LTQY79bP7oqiBKjgtdDW378xVId5VcGUZ+Toei2j+fgx1mq3y4Qg19z4HqLxEZ9FqMD0T0RA==",
       "requires": {
         "@types/semver": "^7.1.0",
-        "builder-util-runtime": "8.6.0",
+        "builder-util-runtime": "8.6.2",
         "fs-extra": "^8.1.0",
         "js-yaml": "^3.13.1",
         "lazy-val": "^1.0.4",
@@ -7417,9 +7573,9 @@
       },
       "dependencies": {
         "builder-util-runtime": {
-          "version": "8.6.0",
-          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.6.0.tgz",
-          "integrity": "sha512-WTDhTUVrm7zkFyd6Qn7AXgmWifjpZ/fYnEdV3XCOIDMNNb/KPddBTbQ8bUlxxVeuOYlhGpcLUypG+4USdGL1ww==",
+          "version": "8.6.2",
+          "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.6.2.tgz",
+          "integrity": "sha512-9QnIBISfhgQ2BxtRLidVqf/v5HD73vSKZDllpUmGd2L6VORGQk7cZAPmPtw4HQM3gPBelyVJ5yIjMNZ8xjmd1A==",
           "requires": {
             "debug": "^4.1.1",
             "sax": "^1.2.4"
@@ -7864,9 +8020,9 @@
       }
     },
     "eslint-config-prettier": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz",
-      "integrity": "sha512-AtndijGte1rPILInUdHjvKEGbIV06NuvPrqlIEaEaWtbtvJh464mDeyGMdZEQMsGvC0ZVkiex1fSNcC4HAbRGg==",
+      "version": "6.10.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.10.1.tgz",
+      "integrity": "sha512-svTy6zh1ecQojvpbJSgH3aei/Rt7C6i090l5f2WQ4aB05lYHeZIR1qL4wZyyILTbtmnbHP5Yn8MrsOJMGa8RkQ==",
       "dev": true,
       "requires": {
         "get-stdin": "^6.0.0"
@@ -7890,9 +8046,9 @@
       }
     },
     "eslint-plugin-vue": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.2.1.tgz",
-      "integrity": "sha512-MiIDOotoWseIfLIfGeDzF6sDvHkVvGd2JgkvjyHtN3q4RoxdAXrAMuI3SXTOKatljgacKwpNAYShmcKZa4yZzw==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz",
+      "integrity": "sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==",
       "dev": true,
       "requires": {
         "natural-compare": "^1.4.0",
@@ -8421,12 +8577,12 @@
           "dev": true
         },
         "schema-utils": {
-          "version": "2.6.4",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
-          "integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
+          "version": "2.6.5",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz",
+          "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==",
           "dev": true,
           "requires": {
-            "ajv": "^6.10.2",
+            "ajv": "^6.12.0",
             "ajv-keywords": "^3.4.1"
           }
         }
@@ -8589,9 +8745,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.10.0.tgz",
-      "integrity": "sha512-4eyLK6s6lH32nOvLLwlIOnr9zrL8Sm+OvW4pVTJNoXeGzYIkHVf+pADQi+OJ0E67hiuSLezPVPyBcIZO50TmmQ==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz",
+      "integrity": "sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==",
       "dev": true,
       "requires": {
         "debug": "^3.0.0"
@@ -9435,9 +9591,9 @@
       }
     },
     "handle-thing": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
-      "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
       "dev": true
     },
     "har-schema": {
@@ -10489,9 +10645,9 @@
       "dev": true
     },
     "jest-worker": {
-      "version": "25.1.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.1.0.tgz",
-      "integrity": "sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg==",
+      "version": "25.2.6",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.2.6.tgz",
+      "integrity": "sha512-FJn9XDUSxcOR4cwDzRfL1z56rUofNTFs539FGASpd50RHdb6EVkhxQqktodW2mI49l+W3H+tFJDotCHUQF6dmA==",
       "dev": true,
       "requires": {
         "merge-stream": "^2.0.0",
@@ -14641,9 +14797,9 @@
       "dev": true
     },
     "spdy": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz",
-      "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
       "dev": true,
       "requires": {
         "debug": "^4.1.0",
@@ -15583,9 +15739,9 @@
       "dev": true
     },
     "ts-pnp": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.6.tgz",
-      "integrity": "sha512-CrG5GqAAzMT7144Cl+UIFP7mz/iIhiy+xQ6GGcnjTezhALT02uPMRw7tgDSESgB5MsfKt55+GPWw4ir1kVtMIQ==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
+      "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
       "dev": true
     },
     "tslib": {
@@ -15678,9 +15834,9 @@
       }
     },
     "uikit": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.3.3.tgz",
-      "integrity": "sha512-YCrjTpti3cVTNjCXo0zeu7Kd/1nWJwIo4YRmLSVJ+MC/FdzWQgmfvby5rXR5TxEETnPamazrFtclPWJQya8W1g==",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.3.7.tgz",
+      "integrity": "sha512-vY7chSjBpu3hgFHFbl/Cr2cUodoEew69uPPQl2E0WcK6UkG2DYhgV0XNDMNLpeGGfrw6C+H9cW89I7Gq7N8Ylw==",
       "dev": true
     },
     "unicode-canonical-property-names-ecmascript": {
@@ -15945,12 +16101,12 @@
           "dev": true
         },
         "schema-utils": {
-          "version": "2.6.4",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
-          "integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
+          "version": "2.6.5",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz",
+          "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==",
           "dev": true,
           "requires": {
-            "ajv": "^6.10.2",
+            "ajv": "^6.12.0",
             "ajv-keywords": "^3.4.1"
           }
         }
@@ -16032,9 +16188,9 @@
       },
       "dependencies": {
         "es-abstract": {
-          "version": "1.17.4",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-          "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+          "version": "1.17.5",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+          "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
           "dev": true,
           "requires": {
             "es-to-primitive": "^1.2.1",
@@ -16154,9 +16310,9 @@
       "dev": true
     },
     "vue-loader": {
-      "version": "15.9.0",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.0.tgz",
-      "integrity": "sha512-FeDHvTSpwyLeF7LIV1PYkvqUQgTJ8UmOxhSlCyRSxaXCKk+M6NF4tDQsLsPPNeDPyR7TfRQ8MLg6v+8PsDV9xQ==",
+      "version": "15.9.1",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.1.tgz",
+      "integrity": "sha512-IaPU2KOPjs/QjMlxFs/TiTtQUSbftQ7lsAvoxe21rtcQohsMhx+1AltXCNhZIpIn46PtODiAgz+o8RbMpKtmJw==",
       "dev": true,
       "requires": {
         "@vue/component-compiler-utils": "^3.1.0",
@@ -16227,9 +16383,9 @@
       }
     },
     "vuex": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.2.tgz",
-      "integrity": "sha512-ha3jNLJqNhhrAemDXcmMJMKf1Zu4sybMPr9KxJIuOpVcsDQlTBYLLladav2U+g1AvdYDG5Gs0xBTb0M5pXXYFQ==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.3.tgz",
+      "integrity": "sha512-k8vZqNMSNMgKelVZAPYw5MNb2xWSmVgCKtYKAptvm9YtZiOXnRXFWu//Y9zQNORTrm3dNj1n/WaZZI26tIX6Mw==",
       "dev": true
     },
     "watchpack": {
@@ -16486,9 +16642,9 @@
           }
         },
         "p-limit": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -16857,9 +17013,9 @@
       "dev": true
     },
     "yargs": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz",
-      "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==",
+      "version": "15.3.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
+      "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
       "dev": true,
       "requires": {
         "cliui": "^6.0.0",
@@ -16872,7 +17028,7 @@
         "string-width": "^4.2.0",
         "which-module": "^2.0.0",
         "y18n": "^4.0.0",
-        "yargs-parser": "^16.1.0"
+        "yargs-parser": "^18.1.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -16924,9 +17080,9 @@
           }
         },
         "p-limit": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
-          "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -16976,9 +17132,9 @@
       }
     },
     "yargs-parser": {
-      "version": "16.1.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz",
-      "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==",
+      "version": "18.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz",
+      "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==",
       "dev": true,
       "requires": {
         "camelcase": "^5.0.0",
diff --git a/package.json b/package.json
index b5a7c144..468684e3 100644
--- a/package.json
+++ b/package.json
@@ -32,12 +32,12 @@
     "electron-context-menu": "^0.15.2",
     "electron-progressbar": "^1.2.0",
     "electron-store": "^5.1.1",
-    "electron-updater": "^4.2.2",
+    "electron-updater": "^4.2.5",
     "material-design-icons": "^3.0.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.12.1",
-    "@vue/cli-service": "^4.2.3",
+    "@vue/cli-service": "^4.3.0",
     "axios": "^0.19.2",
     "babel-eslint": "^10.1.0",
     "css-loader": "^3.4.2",
@@ -45,18 +45,18 @@
     "electron-builder": "^21.2.0",
     "electron-icon-builder": "^1.0.2",
     "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.0",
+    "eslint-config-prettier": "^6.10.1",
     "eslint-plugin-prettier": "^3.1.2",
-    "eslint-plugin-vue": "^6.2.1",
+    "eslint-plugin-vue": "^6.2.2",
     "less": "^3.11.1",
     "less-loader": "^5.0.0",
     "mdns-js": "^1.0.3",
-    "uikit": "^3.3.3",
+    "uikit": "^3.3.7",
     "vue": "^2.6.11",
     "vue-plugin-load-script": "^1.2.0",
     "vue-template-compiler": "^2.6.11",
     "vue-tour": "^1.3.0",
-    "vuex": "^3.1.2"
+    "vuex": "^3.1.3"
   },
   "optionalDependencies": {
     "electron-windows-store": "^2.1.0"

From 1a8b4be3aedd0337f6bf4e60f4c970e4c313321e Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 14:56:50 +0100
Subject: [PATCH 29/31] Updated audit fix

---
 package-lock.json | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 23d14438..dadc29a7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3882,9 +3882,9 @@
       }
     },
     "acorn": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
-      "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+      "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
       "dev": true
     },
     "acorn-jsx": {
@@ -8897,14 +8897,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -8924,8 +8922,7 @@
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
@@ -9073,7 +9070,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }

From 3c7cd43e38b0c37f2d2b076a9d05be76b4a9d65a Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 15:01:08 +0100
Subject: [PATCH 30/31] Switched to alt for letter keycombos (avoid conflict
 with capitalisation)

---
 src/App.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 0e94bbc1..57ff93e2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -31,6 +31,7 @@ const keyCodes = {
   enter: 13,
   esc: 27,
   shift: 16,
+  alt: 18,
   t: 84
 };
 
@@ -305,7 +306,7 @@ export default {
     },
 
     letterKeyHandler: function(keyCodes) {
-      if (keyCodes.shift in this.keysDown && keyCodes.t in this.keysDown) {
+      if (keyCodes.alt in this.keysDown && keyCodes.t in this.keysDown) {
         this.$tours["guidedTour"].start();
       }
     }

From 62e9b49baeab6d6ba38ca3cd3a0e7c91b9cf030e Mon Sep 17 00:00:00 2001
From: Joel Collins <joel@jtcollins.net>
Date: Mon, 6 Apr 2020 15:15:10 +0100
Subject: [PATCH 31/31] Rearranged connect panel

---
 src/App.vue                                   | 24 +++++++++----------
 .../viewComponents/connectDisplay.vue         |  8 ++-----
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 57ff93e2..d146b4b1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -95,6 +95,17 @@ export default {
             placement: "bottom"
           }
         },
+        ...(!this.liteMode
+          ? [
+              {
+                target: "#new-connection-card",
+                header: {
+                  title: "New connection"
+                },
+                content: `Connect locally if you're running on a microscope, \nor open a new remote connection to a microscope`
+              }
+            ]
+          : []),
         ...(this.isElectron && !this.liteMode
           ? [
               {
@@ -117,17 +128,6 @@ export default {
               }
             ]
           : []),
-        ...(!this.liteMode
-          ? [
-              {
-                target: "#new-connection-card",
-                header: {
-                  title: "New connection"
-                },
-                content: `Connect locally if you're running on a microscope, \nor open a new remote connection to a microscope`
-              }
-            ]
-          : []),
         {
           target: "#gallery-tab-icon",
           header: {
@@ -367,7 +367,7 @@ html {
 
 // Style tour
 .v-tour__target--highlighted {
-  box-shadow: 0px 40px 160px 20px rgba(0, 0, 0, 0.5),
+  box-shadow: 0px 40px 200px 30px rgba(0, 0, 0, 0.5),
     0px 0px 0px 4px rgba(128, 128, 128, 0.5) !important;
   border-radius: 5px;
   opacity: 100% !important;
diff --git a/src/components/viewComponents/connectDisplay.vue b/src/components/viewComponents/connectDisplay.vue
index 5062f36e..40063aaa 100644
--- a/src/components/viewComponents/connectDisplay.vue
+++ b/src/components/viewComponents/connectDisplay.vue
@@ -2,7 +2,7 @@
   <div class="connectDisplay uk-padding uk-padding-remove-left">
     <div
       uk-grid
-      class="uk-height-1-1 uk-margin-remove uk-padding-remove"
+      class="uk-height-1-1 uk-margin-remove uk-padding-remove uk-flex-column"
       margin="0"
     >
       <div class="uk-width-auto">
@@ -409,8 +409,4 @@ export default {
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped lang="less">
-.connect-card-align-top {
-  margin-top: 52px;
-}
-</style>
+<style scoped lang="less"></style>