diff --git a/Beocreate2/beo-extensions/channels/menu.html b/Beocreate2/beo-extensions/channels/menu.html
index 7ab84c99..3e08a420 100644
--- a/Beocreate2/beo-extensions/channels/menu.html
+++ b/Beocreate2/beo-extensions/channels/menu.html
@@ -85,7 +85,7 @@ <h2 class="show-when-daisy-chained">Master speaker</h2>
 					</div>
 				</div>
 				
-				<div class="show-when-daisy-chained" id="channels-daisy-chained-container">
+				<div class="show-when-daisy-chained hidden" id="channels-daisy-chained-container">
 					<h2>Slave speaker</h2>
 					<p>Only speaker role can be updated to the slave speaker.</p>
 					<div class="channels-slave-channel-item">
diff --git a/Beocreate2/beo-extensions/daisy-chain/menu.html b/Beocreate2/beo-extensions/daisy-chain/menu.html
index 1ca5e3ee..6fcfc1e4 100644
--- a/Beocreate2/beo-extensions/daisy-chain/menu.html
+++ b/Beocreate2/beo-extensions/daisy-chain/menu.html
@@ -1,4 +1,4 @@
-<div class="menu-screen" id="daisy-chain" data-icon="speaker-pair.svg" data-context="sound/advanced" data-menu-class="advanced-adjustment" data-menu-value-class="daisy-chain-status-text" data-stylesheet="daisy-chain.css" data-menu-title="Chaining" data-built-in="1" data-enable-with="Beocreate 4-Channel Amplifier">
+<div class="menu-screen" id="daisy-chain" data-icon="speaker-pair.svg" data-context="sound/advanced" data-menu-class="advanced-adjustment" data-menu-value-class="daisy-chain-status-text" data-stylesheet="daisy-chain.css" data-menu-title="Chaining" data-built-in="1">
 	
 	<header>
 		<div class="back-button master"></div>
diff --git a/Beocreate2/beo-extensions/daisy-chain/package.json b/Beocreate2/beo-extensions/daisy-chain/package.json
index a015443b..ef09c61d 100644
--- a/Beocreate2/beo-extensions/daisy-chain/package.json
+++ b/Beocreate2/beo-extensions/daisy-chain/package.json
@@ -22,5 +22,8 @@
     "url": "https://github.com/bang-olufsen/create/issues"
   },
   "homepage": "https://github.com/bang-olufsen/create#readme",
+  "beocreate": {
+  	"enableWith": ["Beocreate 4-Channel Amplifier"]
+  },
   "dependencies": {}
 }
diff --git a/Beocreate2/beo-extensions/dsp-programs/index.js b/Beocreate2/beo-extensions/dsp-programs/index.js
index 3f634028..21cb2948 100644
--- a/Beocreate2/beo-extensions/dsp-programs/index.js
+++ b/Beocreate2/beo-extensions/dsp-programs/index.js
@@ -705,20 +705,38 @@ var _ = require('underscore');
 	}
 	
 	function amplifierMute(mute) {
-		
-		if (mute) {
-			if (!settings.noGPIOMute) {
-				execSync("gpio mode 2 out");
-				execSync("gpio write 2 1");
-				if (debug) console.log("Muted amplifier through GPIO.");
-				beo.bus.emit("dsp", {header: "amplifierMuted"});
+		if (!settings.noGPIOMute) {
+			try {
+				pigpioRunning = !isNaN(execSync("pigs t", {encoding: "utf8"}).trim());
+			} catch (error) {
+				console.error("PiGPIO is not running.");
+				pigpioRunning = false;
 			}
-		} else {
-			if (!settings.noGPIOMute) {
-				execSync("gpio write 2 0");
-				execSync("gpio mode 2 in");
-				if (debug) console.log("Unmuted amplifier through GPIO.");
+			if (pigpioRunning) {
+				if (mute) {
+					
+					try {
+						//execSync("gpio mode 2 out");
+						//execSync("gpio write 2 1");
+						execSync("pigs m 27 w w 27 1");
+						if (debug) console.log("Muted amplifier through GPIO.");
+						beo.bus.emit("dsp", {header: "amplifierMuted"});
+					} catch (error) {
+						console.error("Could not mute amplifier:", error);
+					}
+				} else {
+					try {
+						//execSync("gpio write 2 0");
+						//execSync("gpio mode 2 in");
+						execSync("pigs w 27 0 m 27 r");
+						if (debug) console.log("Unmuted amplifier through GPIO.");
+					} catch (error) {
+						console.error("Could not unmute amplifier:", error);
+					}
+					beo.bus.emit("dsp", {header: "amplifierUnmuted"});
+				}
 			}
+		} else if (!mute) {
 			beo.bus.emit("dsp", {header: "amplifierUnmuted"});
 		}
 	}
diff --git a/Beocreate2/beo-extensions/dsp-programs/package.json b/Beocreate2/beo-extensions/dsp-programs/package.json
index 07e5f3d5..d47d880c 100644
--- a/Beocreate2/beo-extensions/dsp-programs/package.json
+++ b/Beocreate2/beo-extensions/dsp-programs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@beocreate/dsp-programs",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "DSP program manager for Beocreate sound systems",
   "main": "index.js",
   "scripts": {
diff --git a/Beocreate2/beo-extensions/equaliser/equaliser-client.js b/Beocreate2/beo-extensions/equaliser/equaliser-client.js
index 231a6d55..1a3331c7 100644
--- a/Beocreate2/beo-extensions/equaliser/equaliser-client.js
+++ b/Beocreate2/beo-extensions/equaliser/equaliser-client.js
@@ -75,6 +75,12 @@ const mathPI = Math.PI;
 $(document).on("equaliser", function(event, data) {
 	
 	if (data.header == "previews" && data.content.filterResponses) {
+		if (data.content.Fs) {
+			Fs = data.content.Fs;
+			eqPreviewGraphSpeaker.setOptions({Fs: Fs});
+			eqPreviewGraphSoundDesign.setOptions({Fs: Fs});
+			eqGraph.setOptions({Fs: Fs});
+		}
 		eqPreviewGraphSpeaker.store([0], {data: data.content.filterResponses.a.master, colour: 0});
 		eqPreviewGraphSpeaker.store([1], {data: data.content.filterResponses.b.master, colour: 1});
 		eqPreviewGraphSpeaker.store([2], {data: data.content.filterResponses.c.master, colour: 2});
@@ -86,7 +92,11 @@ $(document).on("equaliser", function(event, data) {
 	
 	if (data.header == "settings") {
 		
-		if (data.content.Fs) Fs = data.content.Fs;
+		if (data.content.Fs) {
+			Fs = data.content.Fs;
+			eqGraph.setOptions({Fs: Fs});
+		}
+			
 		
 		if (data.content.canControl) canControlEqualiser = data.content.canControl;
 		
diff --git a/Beocreate2/beo-extensions/equaliser/index.js b/Beocreate2/beo-extensions/equaliser/index.js
index 52cdc63c..ac46a794 100644
--- a/Beocreate2/beo-extensions/equaliser/index.js
+++ b/Beocreate2/beo-extensions/equaliser/index.js
@@ -118,7 +118,7 @@ var _ = beo.underscore;
 		}
 		
 		if (event.header == "getPreviews") {
-			beo.sendToUI("equaliser", {header: "previews", content: {filterResponses: filterResponses}});
+			beo.sendToUI("equaliser", {header: "previews", content: {filterResponses: filterResponses, Fs: Fs}});
 		}
 		
 		if (event.header == "getSettings") {
@@ -354,6 +354,7 @@ var _ = beo.underscore;
 				metadata = event.content.metadata;
 				if (metadata.sampleRate) {
 					Fs = parseInt(metadata.sampleRate.value[0]);
+					console.log("Sampling rate of "+Fs+" Hz specified in the DSP program.");
 					for (var c = 0; c < 4; c++) {
 						channel = "abcd".charAt(c);
 						applyAllFiltersFromSettings(channel, true);
diff --git a/Beocreate2/beo-extensions/mpd/index.js b/Beocreate2/beo-extensions/mpd/index.js
index 9de7394d..3fa67ed6 100644
--- a/Beocreate2/beo-extensions/mpd/index.js
+++ b/Beocreate2/beo-extensions/mpd/index.js
@@ -23,6 +23,9 @@ var path = require("path");
 var fs = require("fs");
 var mpdAPI = require("mpd-api");
 var mpdCmd = mpdAPI.mpd;
+const util = require('util');
+const execPromise = util.promisify(exec);
+const dnssd = require("dnssd2"); // for service discovery.
 
 var debug = beo.debug;
 
@@ -30,7 +33,7 @@ var version = require("./package.json").version;
 
 
 var defaultSettings = {
-	coverNames: ["artwork", "folder", "cover", "front", "albumart"],
+	coverNames: ["cover", "artwork", "folder", "front", "albumart"],
 	mpdSocketPath: "/var/run/mpd/socket"
 };
 var settings = JSON.parse(JSON.stringify(defaultSettings));
@@ -40,9 +43,10 @@ var sources = null;
 var mpdEnabled = false;
 
 var client;
-var netClient;
+var connected = false;
 
 var libraryPath = null;
+var cache = {};
 
 beo.bus.on('general', function(event) {
 	
@@ -74,28 +78,7 @@ beo.bus.on('general', function(event) {
 				});
 				
 				if (mpdEnabled) {
-					mpdAPI.connect({path: settings.mpdSocketPath})
-					.then(res => {
-						client = res;
-						if (debug >= 2) console.log("Connected to Music Player Daemon.");
-						client.api.reflection.config().then(config => {
-							if (config.music_directory) {
-								libraryPath = config.music_directory;
-								// Create a route for serving album covers (and ONLY album covers):
-								beo.expressServer.use('/mpd/covers/', (req, res, next) => {
-									if (!req.url.match(/^.*\.(png|jpg|jpeg)$/ig)) return res.status(403).end('403 Forbidden');
-									next();
-								});
-								beo.expressServer.use("/mpd/covers/", express.static(libraryPath));
-							}
-						})
-						.catch(error => {
-							console.error("Couldn't get MPD music library path:", error);
-						});
-					})
-					.catch(error => {
-						console.error("Failed to connect to Music Player Daemon:", error);
-					});
+					connectMPD();
 				}
 			});
 		}
@@ -106,12 +89,24 @@ beo.bus.on('general', function(event) {
 	if (event.header == "activatedExtension") {
 		if (event.content.extension == "mpd") {
 			beo.bus.emit("ui", {target: "mpd", header: "mpdSettings", content: {mpdEnabled: mpdEnabled}});
+			listStorage().then(storageList => {
+				beo.sendToUI("mpd", "mountedStorage", {storage: storageList});
+			}).catch({
+				// Error listing storage.
+			});
+			
 		}
 	}
 });
 
 beo.bus.on('mpd', function(event) {
 	
+	if (event.header == "settings") {
+		if (event.content.settings) {
+			settings = Object.assign(settings, event.content.settings);
+		}
+	}
+	
 	if (event.header == "mpdEnabled") {
 		
 		if (event.content.enabled != undefined) {
@@ -154,6 +149,29 @@ beo.bus.on('mpd', function(event) {
 			});
 		}
 	}
+	
+	if (event.header == "update") {
+		force = (event.content && (event.content.force || (event.content.extra && event.content.extra == "covers"))) ? true : false;
+		updateCache(force);
+	}
+	
+	
+	if (event.header == "getNASShares") {
+		getNASShares(event.content).then(results => {
+			beo.sendToUI("mpd", "shares", results);
+		}).catch({
+			// Error listing shares.
+		});
+	}
+	
+	if (event.header == "addNAS") {
+		console.log(event.content.share, event.content.path, cachedNASDetails);
+	}
+	
+	if (event.header == "cancelNASAdd") {
+		cachedNASDetails = {};
+	}
+	
 });
 
 
@@ -176,6 +194,7 @@ function setMPDStatus(enabled, callback) {
 				mpdEnabled = true;
 				if (debug) console.log("MPD enabled.");
 				callback(true);
+				connectMPD();
 			} else {
 				mpdEnabled = false;
 				callback(false, true);
@@ -206,62 +225,213 @@ function determineChildSource(data) {
 	}
 }
 
+firstConnect = true;
+async function connectMPD() {
+	try {
+		client = await mpdAPI.connect({path: settings.mpdSocketPath});
+		if (debug >= 2) console.log("Connected to Music Player Daemon.");
+		if (firstConnect) {
+			try {
+				config = await client.api.reflection.config();
+				if (config.music_directory) {
+					libraryPath = config.music_directory;
+					// Create a route for serving album covers (and ONLY album covers):
+					beo.expressServer.use('/mpd/covers/', (req, res, next) => {
+						if (!req.url.match(/^.*\.(png|jpg|jpeg)$/ig)) return res.status(403).end('403 Forbidden');
+						next();
+					});
+					beo.expressServer.use("/mpd/covers/", express.static(libraryPath));
+					if (fs.existsSync(libraryPath+"/beo-cache.json")) {
+						try {
+							cache = JSON.parse(fs.readFileSync(libraryPath+"/beo-cache.json", "utf8"));
+						} catch (error) {
+							cache = {};
+						}
+					}
+					firstConnect = false;
+					updateCache();
+				} else {
+					console.error("MPD music library path is not available. Can't build a cache.");
+				}
+			} catch(error) {
+				console.error("Couldn't get MPD music library path:", error);
+			}
+		}
+	} catch(error) {
+		client = null;
+		console.error("Failed to connect to Music Player Daemon:", error);
+	}
+}
+
+
+updatingCache = false;
+async function updateCache(force = false) {
+	if (!client) await connectMPD();
+	if (client && !updatingCache) {
+		try {
+			status = await client.api.status.get();
+			stats = await client.api.status.stats();
+			if (status.updating_db && debug) console.log("MPD is currently updating its database, album cache will not be built at this time.");
+			if (cache.lastUpdate == stats.db_update && !force && debug) console.log("MPD album cache appears to be up to date.");
+			if ((!cache.lastUpdate || cache.lastUpdate != stats.db_update || force) && !status.updating_db) {
+				// Start updating cache.
+				updatingCache = true;
+				if (beo.extensions.music && beo.extensions.music.setLibraryUpdateStatus) beo.extensions.music.setLibraryUpdateStatus("mpd", true);
+				if (debug) console.log("Updating MPD album cache.");
+				newCache = {
+					data: {},
+					lastUpdate: stats.db_update
+				};
+				createTiny = (beo.extensions["beosound-5"]) ? true : false;
+				try {
+					mpdAlbums = await client.api.db.list("album", null, "albumartist");
+		
+					for (artist in mpdAlbums) {
+						newCache.data[mpdAlbums[artist].albumartist] = [];
+						if (mpdAlbums[artist].album) {
+							for (album in mpdAlbums[artist].album) {
+								// Get a song from the album to get album art and other data.
+								try {
+									addAlbum = true;
+									track = [];
+									track = await client.api.db.find('((album == "'+escapeString(mpdAlbums[artist].album[album].album)+'") AND (albumartist == "'+escapeString(mpdAlbums[artist].albumartist)+'"))', 'window', '0:1');
+									newAlbum = {
+										name: mpdAlbums[artist].album[album].album, 
+										artist: mpdAlbums[artist].albumartist, 
+										date: null, 
+										provider: "mpd",
+										img: null
+									};
+									if (track[0]) {
+										if (track[0].date) newAlbum.date = track[0].date.toString().substring(0,4);
+										cover = await getCover(track[0].file, createTiny);
+										if (cover.error != null) { // Cover fetching had errors, likely due to folder not existing.
+											addAlbum = false;
+										} else {
+											newAlbum.img = cover.img;
+											newAlbum.thumbnail = cover.thumbnail;
+											newAlbum.tinyThumbnail = cover.tiny;
+										}
+									}
+									if (addAlbum) {
+										newCache.data[mpdAlbums[artist].albumartist].push(newAlbum);
+										if (debug > 1) console.log("Album '"+mpdAlbums[artist].album[album].album+"' from artist '"+mpdAlbums[artist].albumartist+"' was added to the MPD cache.");
+									}
+								} catch (error) {
+									console.error("Could not fetch data for album at index "+album+" from artist at index "+artist+".", error);
+								}
+							}
+						} else {
+							console.error("No album items for artist '"+artist+"'. This is probably an MPD (-API) glitch.");
+						}
+						newCache.data[mpdAlbums[artist].albumartist].sort(function(a, b) {
+							if (a.date && b.date) {
+								if (a.date >= b.date) {
+									return 1;
+								} else if (a.date < b.date) {
+									return -1;
+								}
+							} else {
+								return 0;
+							}
+						});
+					}
+					
+					cache = Object.assign({}, newCache);
+					fs.writeFileSync(libraryPath+"/beo-cache.json", JSON.stringify(cache));
+					if (debug) console.log("MPD album cache update has finished.");
+					if (beo.extensions.music && beo.extensions.music.setLibraryUpdateStatus) beo.extensions.music.setLibraryUpdateStatus("mpd", false);
+				} catch (error) {
+					console.error("Couldn't update MPD album cache:", error);
+					if (error.code == "ENOTCONNECTED") client = null;
+				}
+				updatingCache = false;
+				if ((albumsRequested || artistsRequested) &&
+					beo.extensions.music &&
+					beo.extensions.music.returnMusic) {
+						if (albumsRequested) {
+							if (debug) console.log("Sending updated list of albums from MPD.");
+							albums = [];
+							for (artist in cache.data) {
+								albums = albums.concat(cache.data[artist]);
+							}
+							beo.extensions.music.returnMusic("mpd", "albums", albums, null);
+						}
+						if (artistsRequested) {
+							if (debug) console.log("Sending updated list of artists from MPD.");
+							mpdAlbums = await client.api.db.list("album", null, "albumartist");
+							artists = [];
+							for (artist in mpdAlbums) {
+								artists.push({artist: mpdAlbums[artist].albumartist, albumLength: mpdAlbums[artist].album.length, provider: "mpd"})
+							}
+							beo.extensions.music.returnMusic("mpd", "artists", artists, null);
+						}
+				}
+				//albumsRequested = false;
+				//artistsRequested = false;
+			}
+		} catch (error) {
+			console.error("Couldn't update MPD album cache:", error);
+			if (error.code == "ENOTCONNECTED") client = null;
+		}
+	}
+}
+
+var albumsRequested = false;
+var artistsRequested = false;
 
 async function getMusic(type, context, noArt = false) {
 	
+	if (!client) await connectMPD();
 	if (client) {
 		switch (type) {
 			case "albums":
+				
 				if (context && context.artist) {
-					mpdAlbums = await client.api.db.list("album", '(albumartist == "'+escapeString(context.artist)+'")', "albumartist");
+					if (cache.data[context.artist]) {
+						return cache.data[context.artist];
+					} else {
+						return [];
+					}
+	
 				} else {
-					mpdAlbums = await client.api.db.list("album", null, "albumartist");
-				}
-				albums = [];
-				for (artist in mpdAlbums) {
-					for (album in mpdAlbums[artist].album) {
-						
-						// Get a song from the album to get album art and other data.
-						track = [];
-						try {
-							track = await client.api.db.find('((album == "'+escapeString(mpdAlbums[artist].album[album].album)+'") AND (albumartist == "'+escapeString(mpdAlbums[artist].albumartist)+'"))', 'window', '0:1');
-						} catch (error) {
-							console.error('Error getting track with filter ((album == "'+escapeString(mpdAlbums[artist].album[album].album)+'") AND (albumartist == "'+escapeString(mpdAlbums[artist].albumartist)+'"))', error);
-						}
-						album = {
-							name: mpdAlbums[artist].album[album].album, 
-							artist: mpdAlbums[artist].albumartist, 
-							date: null, 
-							provider: "mpd"
-						};
-						if (track[0]) {
-							if (track[0].date) album.date = track[0].date;
-							album.img = await getCover(track[0].file);
-						}
-						albums.push(album);
+					albums = [];
+					albumsRequested = true;
+					for (artist in cache.data) {
+						albums = albums.concat(cache.data[artist]);
 					}
+					return albums;
 				}
-				return albums;
 				break;
 			case "album":
 				if (context && context.artist && context.album) {
 					mpdTracks = [];
-					album = {discs: 1, 
-							name: context.album, 
+					album = {name: context.album, 
 							time: 0,
 							artist: context.artist, 
 							date: null, 
-							tracks: [], 
+							tracks: [],
+							discs: [],
 							provider: "mpd"
 					};
-					mpdTracks = await client.api.db.find("((album == '"+escapeString(context.album)+"') AND (albumartist == '"+escapeString(context.artist)+"'))");
+					try {
+						mpdTracks = await client.api.db.find("((album == '"+escapeString(context.album)+"') AND (albumartist == '"+escapeString(context.artist)+"'))", 'sort', 'track');
+					} catch (error) {
+						if (error.code == "ENOTCONNECTED") client = null;
+						console.error("Could not get album from MPD:", error);
+					}
 					for (track in mpdTracks) {
 						if (!album.date && mpdTracks[track].date) album.date = mpdTracks[track].date;
 						if (track == 0 && !noArt) {
-							album.img = await getCover(mpdTracks[track].file);
+							cover = await getCover(mpdTracks[track].file);
+							if (!cover.error) {
+								album.img = cover.img;
+								album.thumbnail = cover.thumbnail;
+								album.tinyThumbnail = cover.thumbnail;
+							}
 						}
 						trackData = {
-							id: track,
+							disc: 1,
 							path: mpdTracks[track].file,
 							number: mpdTracks[track].track,
 							artist: mpdTracks[track].artist,
@@ -272,22 +442,47 @@ async function getMusic(type, context, noArt = false) {
 						album.time += mpdTracks[track].time;
 						if (mpdTracks[track].disc) {
 							trackData.disc = mpdTracks[track].disc;
-							if (mpdTracks[track].disc > album.discs) album.discs = mpdTracks[track].disc;
 						}
 						album.tracks.push(trackData);
 					}
+					// Sort tracks on multi-disc albums.
+					album.tracks.sort(function(a, b) {
+						if (a.disc && b.disc) {
+							if (a.disc >= b.disc) {
+								return 1;
+							} else if (a.disc < b.disc) {
+								return -1;
+							}
+						} else {
+							return 0;
+						}
+					});
+					for (t in album.tracks) {
+						album.tracks[t].id = t;
+						if (!album.discs[album.tracks[t].disc - 1]) {
+							album.discs[album.tracks[t].disc - 1] = [];
+						}
+						album.discs[album.tracks[t].disc - 1].push(album.tracks[t]);
+					}
 					return album;
 				} else {
 					return false;
 				}
 				break;
 			case "artists":
-				mpdAlbums = await client.api.db.list("album", null, "albumartist");
-				artists = [];
-				for (artist in mpdAlbums) {
-					artists.push({artist: mpdAlbums[artist].albumartist, albumLength: mpdAlbums[artist].album.length, provider: "mpd"})
+				try {
+					artistsRequested = true;
+					mpdAlbums = await client.api.db.list("album", null, "albumartist");
+					artists = [];
+					for (artist in mpdAlbums) {
+						artists.push({artist: mpdAlbums[artist].albumartist, albumLength: mpdAlbums[artist].album.length, provider: "mpd"})
+					}
+					return artists;
+				} catch (error) {
+					if (error.code == "ENOTCONNECTED") client = null;
+					console.error("Could not get artists from MPD:", error);
+					return false
 				}
-				return artists;
 				break;
 			case "search":
 				id = 0;
@@ -297,25 +492,69 @@ async function getMusic(type, context, noArt = false) {
 				albums = [];
 				escapedString = escapeString(context.searchString);
 				mpdTracks = [];
-				mpdTracks = await client.api.db.search("(title contains '"+escapedString+"')");
-				mpdTracks = mpdTracks.concat(await client.api.db.search("(artist contains '"+escapedString+"')"));
-				mpdTracks = mpdTracks.concat(await client.api.db.search("(album contains '"+escapedString+"')"));
-				for (track in mpdTracks) {
-					if (trackPaths.indexOf(mpdTracks[track].file) == -1) {
-						trackPaths.push(mpdTracks[track].file);
-						trackData = {
-							id: id,
-							path: mpdTracks[track].file,
-							artist: mpdTracks[track].artist,
-							name: mpdTracks[track].title,
-							time: mpdTracks[track].time,
-							provider: "mpd"
+				try {
+					mpdTracks = await client.api.db.search("(title contains '"+escapedString+"')");
+					mpdTracks = mpdTracks.concat(await client.api.db.search("(artist contains '"+escapedString+"')"));
+					mpdTracks = mpdTracks.concat(await client.api.db.search("(album contains '"+escapedString+"')"));
+					for (track in mpdTracks) {
+						if (trackPaths.indexOf(mpdTracks[track].file) == -1) {
+							trackPaths.push(mpdTracks[track].file);
+							trackData = {
+								id: id,
+								path: mpdTracks[track].file,
+								artist: mpdTracks[track].artist,
+								name: mpdTracks[track].title,
+								time: mpdTracks[track].time,
+								provider: "mpd"
+							}
+							id++;
+							tracks.push(trackData);
+							albumFound = false;
+							for (a in albums) {
+								if (albums[a].artist == mpdTracks[track].albumartist &&
+									albums[a].name == mpdTracks[track].album) {
+									albumFound = true;
+									break;
+								}
+							}
+							if (!albumFound) {
+								album = {
+									name: mpdTracks[track].album, 
+									artist: (mpdTracks[track].albumartist) ? mpdTracks[track].albumartist : mpdTracks[track].artist, 
+									date: null, 
+									provider: "mpd"
+								};
+								if (mpdTracks[track].date) album.date = mpdTracks[track].date;
+								if (!noArt) {
+									cover = await getCover(mpdTracks[track].file);
+									if (!cover.error) {
+										album.img = cover.img;
+										album.thumbnail = cover.thumbnail;
+										album.tinyThumbnail = cover.thumbnail;
+									}
+								}
+								albums.push(album);
+								
+								artistFound = false;
+								theArtist = (mpdTracks[track].albumartist) ? mpdTracks[track].albumartist : mpdTracks[track].artist;
+								for (ar in artists) {
+									if (artists[ar].artist == theArtist) {
+										artistFound = true;
+										break;
+									}
+								}
+								if (!artistFound) {
+									artists.push({artist: theArtist, provider: "mpd"});
+								}
+							}
 						}
-						id++;
-						tracks.push(trackData);
 					}
+					return {tracks: tracks, artists: artists, albums: albums};
+				} catch (error) {
+					if (error.code == "ENOTCONNECTED") client = null;
+					console.error("Could not get search results from MPD:", error);
+					return false;
 				}
-				return {tracks: tracks, artists: artists, albums: albums};
 				break;
 		}
 	} else {
@@ -324,21 +563,28 @@ async function getMusic(type, context, noArt = false) {
 }
 
 async function playMusic(index, type, context) {
+	if (!client) await connectMPD();
 	if (client && 
 		index != undefined && 
 		type && 
 		context) {
 		content = await getMusic(type, context, true);
 		if (content.tracks) {
-			await client.api.queue.clear();
-			queueCommands = [];
-			content.tracks.forEach(track => {
-				queueCommands.push(client.api.queue.addid(track.path));
-			});
-			
-			newQueue = await Promise.all(queueCommands);
-			await client.api.playback.playid(newQueue[index]);
-		return true;
+			try {
+				await client.api.queue.clear();
+				queueCommands = [];
+				content.tracks.forEach(track => {
+					queueCommands.push(client.api.queue.addid(track.path));
+				});
+				
+				newQueue = await Promise.all(queueCommands);
+				await client.api.playback.playid(newQueue[index]);
+				return true;
+			} catch (error) {
+				if (error.code == "ENOTCONNECTED") client = null;
+				console.error("Could not get start playback with MPD:", error);
+				return false;
+			}
 		} else {
 			return false;
 		}
@@ -346,24 +592,56 @@ async function playMusic(index, type, context) {
 }
 
 
-async function getCover(trackPath) {
+async function getCover(trackPath, createTiny = false) {
 	// If cover exists on the file system, return its path.
 	if (libraryPath) {
 		albumPath = path.dirname(trackPath);
-		files = fs.readdirSync(libraryPath+"/"+albumPath);
-		for (file in files) {
-			if (path.extname(files[file]).match(/\.(jpg|jpeg|png)$/ig)) {
-				// Is image file.
-				if (settings.coverNames.indexOf(path.basename(files[file], path.extname(files[file])).toLowerCase()) != -1) {
-					encoded = ("/mpd/covers/"+encodeURIComponent(albumPath).replace(/[!'()*]/g, escape)+"/"+files[file]);
-					return encoded; //, escapeStringLight(encoded)];
+		
+		try {
+			files = fs.readdirSync(libraryPath+"/"+albumPath);
+			img = null;
+			thumbnail = null;
+			tiny = null;
+			for (file in files) {
+				if (path.extname(files[file]).match(/\.(jpg|jpeg|png)$/ig)) {
+					// Is image file.
+					if (!img && settings.coverNames.indexOf(path.basename(files[file], path.extname(files[file])).toLowerCase()) != -1) {
+						img = files[file];
+					}
+					if (files[file] == "cover-thumb.jpg") thumbnail = "cover-thumb.jpg";
+					if (files[file] == "cover-tiny.jpg") tiny = "cover-tiny.jpg";
+				}
+			}
+			if (!tiny && 
+				img &&
+				createTiny) {
+				try {
+					if (debug) console.log("Creating tiny album artwork for '"+albumPath+"'...");
+					await execPromise("convert \""+libraryPath+"/"+albumPath+"/"+img+"\" -resize 100x100\\> \""+libraryPath+"/"+albumPath+"/cover-tiny.jpg\"");
+					tiny = "cover-tiny.jpg";
+				} catch (error) {
+					console.log("Error creating tiny album cover:", error);
 				}
 			}
+			if (img || thumbnail || tiny) {
+				encodedAlbumPath = encodeURIComponent(albumPath).replace(/[!'()*]/g, escape);
+				return {error: null, 
+						img: ((img) ? "/mpd/covers/"+encodedAlbumPath+"/"+img : null), 
+						thumbnail: ((thumbnail) ? "/mpd/covers/"+encodedAlbumPath+"/"+thumbnail : null),
+						tiny: ((tiny) ? "/mpd/covers/"+encodedAlbumPath+"/"+tiny : null)
+					};
+			} else {
+				return {error: null};
+			}
+			
+			
+		} catch (error) {
+			// The track/album probably doesn't exist on the file system.
+			console.error(error);
+			return {error: 404};
 		}
-		// If we've gotten this far, there was no cover. Try to extract it from the file and put it onto the folder, then return its path.
-		// This feature is not yet available in MPD.
 	}
-	return null;
+	return {error: 503};
 }
 
 
@@ -373,6 +651,122 @@ function escapeString(string) {
 }
 
 
+var storageList = [];
+async function listStorage() {
+	startDiscovery();
+	storageList = [];
+	
+	// List mounted USB storage.
+	try {
+		storageUSB = await execPromise("mount | awk '/dev/sd && "+libraryPath+"'");
+		storageUSB = storageUSB.stdout.trim().split("\n");
+		for (s in storageUSB) {
+			storageList.push({name: storageUSB[s].substring(storageUSB[s].lastIndexOf("/")+1).split(" type ")[0], kind: "USB", id: null});
+		}
+	} catch (error) {
+		console.error("Couldn't get a list of USB storage:", error);
+	}
+	
+	// List configured NAS destinations.
+	try {
+		storageNAS = fs.readFileSync("/etc/smbmounts.conf", "utf8").split('\n');
+		for (s in storageNAS) {
+			nasItem = storageNAS[s].trim().split(";");
+			if (nasItem[0].charAt(0) != "#") { // Not a comment.
+				nasAddress = nasItem[0].substr(2).split("/")[0];
+				nasName = nasAddress;
+				for (n in discoveredNAS) {
+					if (nasAddress == discoveredNAS[n].addresses[0] ||
+						discoveredNAS[n].hostname.indexOf(nasAddress) != -1) {
+						nasName = discoveredNAS[n].name;
+					}
+				}
+				storageList.push({
+					kind: "NAS",
+					id: nasItem[0], 
+					name: nasName,
+					address: nasAddress,
+					path: nasItem[0].substr(2).split("/").slice(1).join("/")
+				});
+			}
+		}
+	} catch (error) {
+		console.log("Couldn't get a list of configured NAS storage:", error);
+	}
+	
+	return storageList;
+}
+
+
+// Discover NAS storage.
+
+var browser = null;
+var discoveryStopDelay = null;
+var discoveredNAS = {};
+
+function startDiscovery() {
+	discoveredNAS = {};
+	beo.sendToUI("mpd", "discoveredNAS", {storage: {}});
+	if (!browser) {
+		browser = new dnssd.Browser(dnssd.tcp('smb'));
+		
+		browser.on('serviceUp', service => discoveryEvent("up", service));
+		browser.on('serviceDown', service => discoveryEvent("down", service));
+		browser.on('serviceChanged', service => discoveryEvent("changed", service));
+		browser.on('error', error => console.log("dnssd error: ", error));
+	} else {
+		browser.stop();
+	}
+	browser.start();
+	clearTimeout(discoveryStopDelay);
+	discoveryStopDelay = setTimeout(function() {
+		stopDiscovery();
+	}, 60000);
+}
+
+function stopDiscovery() {
+	if (browser) browser.stop();
+}
+
+function discoveryEvent(event, service) {
+	if (event == "up") {
+		discoveredNAS[service.name] = {name: service.name, hostname: service.host, addresses: service.addresses};
+		var namesUpdated = false;
+		for (s in storageList) {
+			if (storageList[s].kind == "NAS") {
+				if ((storageList[s].address == service.addresses[0] ||
+					service.host.indexOf(storageList[s].address) != -1) &&
+					storageList[s].name != service.name) {
+					storageList[s].name = service.name;
+					namesUpdated = true;
+				}
+			}
+		}
+		if (namesUpdated) beo.sendToUI("mpd", "mountedStorage", {storage: storageList});
+	} else if (event == "down") {
+		delete discoveredNAS[service.name];
+	}
+	beo.sendToUI("mpd", "discoveredNAS", {storage: discoveredNAS});
+}
+
+var cachedNASDetails = {};
+async function getNASShares(details) {
+	shareList = [];
+	if (details.server && details.username && details.password != undefined) {
+		cachedNASDetails = JSON.parse(JSON.stringify(details));
+		try {
+			sharesRaw = await execPromise("smbclient -N -L "+details.server.addresses[0]+" --user="+details.username+"%"+details.password+" -g | grep 'Disk|'");
+			sharesRaw = sharesRaw.stdout.trim().split("\n");
+			for (s in sharesRaw) {
+				shareList.push(sharesRaw[s].slice(5, -1));
+			}
+		} catch (error) {
+			console.error("Couldn't get a list of SMB shares:", error);
+		}
+	}
+	return {server: details.server, shares: shareList};
+}
+
 	
 module.exports = {
 	version: version,
diff --git a/Beocreate2/beo-extensions/mpd/package-lock.json b/Beocreate2/beo-extensions/mpd/package-lock.json
index 375cb3d8..97866676 100644
--- a/Beocreate2/beo-extensions/mpd/package-lock.json
+++ b/Beocreate2/beo-extensions/mpd/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@beocreate/mpd",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/Beocreate2/beo-extensions/mpd/package.json b/Beocreate2/beo-extensions/mpd/package.json
index 6e30c13a..cbed96a3 100644
--- a/Beocreate2/beo-extensions/mpd/package.json
+++ b/Beocreate2/beo-extensions/mpd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@beocreate/mpd",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Control for MPD in BeoCreate systems",
   "main": "index.js",
   "scripts": {
diff --git a/Beocreate2/beo-extensions/now-playing/now-playing-client.js b/Beocreate2/beo-extensions/now-playing/now-playing-client.js
index 88147bb4..be3b848d 100644
--- a/Beocreate2/beo-extensions/now-playing/now-playing-client.js
+++ b/Beocreate2/beo-extensions/now-playing/now-playing-client.js
@@ -392,7 +392,7 @@ function loadArtwork(url, port, testExternal) {
 			pictureInTargetView = $(".artwork-img-"+hiddenArtworkView).attr("src");
 			$(".artwork-img-"+hiddenArtworkView).attr("src", src);
 			if (!testExternal) {
-				console.log("Loading artwork to view "+hiddenArtworkView.toUpperCase()+"...");
+				console.log("Loading artwork to view "+hiddenArtworkView.toUpperCase()+" ("+src+")...");
 			} else {
 				console.log("Loading external artwork to view "+hiddenArtworkView.toUpperCase()+" to compare...");
 			}
diff --git a/Beocreate2/beo-extensions/privacy/index.js b/Beocreate2/beo-extensions/privacy/index.js
index b65e4791..63b4466a 100644
--- a/Beocreate2/beo-extensions/privacy/index.js
+++ b/Beocreate2/beo-extensions/privacy/index.js
@@ -79,26 +79,11 @@ var fs = require("fs");
 					}
 				}
 
-				
-				if (audioControl) {
-					configuration = audioControl.getSettings();
-					if (configuration.privacy) {
-						inferredSettings.externalMetadata = (!configuration.privacy.external_metadata ||
-							(!configuration.privacy.external_metadata.comment &&
-							configuration.privacy.external_metadata.value == "1")) ? true : false;
-					} else {
-						inferredSettings.externalMetadata = true;
-					}
-				}
-				
-				exec("systemctl is-active --quiet pushdata.timer").on('exit', function(code) {
-					if (code == 0) {
-						inferredSettings.usageData = true;
-					} else {
-						inferredSettings.usageData = false;
-					}
+				getPrivacySetting("externalMetadata");
+				getPrivacySetting("usageData").then(function() {
 					beo.sendToUI("privacy", {header: "privacySettings", content: {settings: inferredSettings, descriptions: descriptions}});
 				});
+				
 			}
 		}
 	});
@@ -118,8 +103,8 @@ var fs = require("fs");
 			if (event.content.setting) {
 				if (event.content.setting == "externalMetadata" && audioControl) {
 					beo.sendToUI("privacy", {header: "updatingSettings"});
-					inferredSettings.externalMetadata = (!inferredSsettings.externalMetadata) ? true : false;
-					enabled = (settings.externalMetadata) ? "1" : "0";
+					inferredSettings.externalMetadata = (!inferredSettings.externalMetadata) ? true : false;
+					enabled = (inferredSettings.externalMetadata) ? "1" : "0";
 					audioControl.configure([{section: "privacy", option: "external_metadata", value: enabled}], true, function() {
 						beo.sendToUI("privacy", {header: "privacySettings", content: {settings: inferredSettings}});
 					});
@@ -151,7 +136,52 @@ var fs = require("fs");
 	
 	
 	
+	function getPrivacySetting(setting) {
+		switch (setting) {
+			case "externalMetadata":
+				if (audioControl) {
+					configuration = audioControl.getSettings();
+					if (configuration.privacy) {
+						inferredSettings.externalMetadata = (!configuration.privacy.external_metadata ||
+							(!configuration.privacy.external_metadata.comment &&
+							configuration.privacy.external_metadata.value == "1")) ? true : false;
+						return inferredSettings.externalMetadata;
+					} else {
+						inferredSettings.externalMetadata = true;
+						return true;
+					}
+				} else {
+					return false;
+				}
+				break;
+			case "usageData":
+				return new Promise(function(resolve, reject) {
+					try {
+						exec("systemctl is-active --quiet pushdata.timer").on('exit', function(code) {
+							if (code == 0) {
+								inferredSettings.usageData = true;
+								resolve(true);
+							} else {
+								inferredSettings.usageData = false;
+								resolve(false);
+							}
+						});
+					} catch (error) {
+						reject(false);
+					}
+				});
+				break;
+			default:
+				return null;
+				break;
+		}
+	}
+	
+	
+	
+	
 module.exports = {
-	version: version
+	version: version,
+	getPrivacySetting: getPrivacySetting
 };
 
diff --git a/Beocreate2/beo-extensions/product-information/index.js b/Beocreate2/beo-extensions/product-information/index.js
index 101c3f13..980a6684 100644
--- a/Beocreate2/beo-extensions/product-information/index.js
+++ b/Beocreate2/beo-extensions/product-information/index.js
@@ -559,7 +559,11 @@ var fs = require("fs");
 			}
 			
 			if (fromURL) {
-				download(fromURL, imageDirectory, null, function(success, err) {
+				download(fromURL, imageDirectory)
+				.then(file => {
+					downloadProductImage(queue, callback, downloaded, failed);
+				})
+				.catch(error => {
 					downloadProductImage(queue, callback, downloaded, failed);
 				});
 			}
@@ -573,13 +577,6 @@ var fs = require("fs");
 	}
 	
 	
-	function restAPI(header, extra, callback) {
-		if (header == "discovery") {
-			callback({name: systemName.ui, serviceType: "beocreate", advertisePort: beo.systemConfiguration.port, txtRecord: {"type": settings.modelID, "typeui": settings.modelName, "id": systemID, "image": currentProductImage, "status": systemStatus}});
-		} else {
-			callback(null);
-		}
-	}
 	
 beo.expressServer.get("/product-information/discovery", function (req, res) {
 
diff --git a/Beocreate2/beo-extensions/shairport-sync/index.js b/Beocreate2/beo-extensions/shairport-sync/index.js
index 539aeb12..24ccfdab 100644
--- a/Beocreate2/beo-extensions/shairport-sync/index.js
+++ b/Beocreate2/beo-extensions/shairport-sync/index.js
@@ -482,7 +482,7 @@ var fetch = require("node-fetch"); // for sending HTTP requests to the DACP serv
 	// DACP SERVICE DISCOVERY
 	
 	
-	browser = null;
+	var browser = null;
 	
 	function startDiscovery() {
 		browser = new dnssd.Browser(dnssd.tcp('dacp'));
diff --git a/Beocreate2/beo-extensions/sound/sound-client.js b/Beocreate2/beo-extensions/sound/sound-client.js
index 33a71cb9..e9b273b6 100644
--- a/Beocreate2/beo-extensions/sound/sound-client.js
+++ b/Beocreate2/beo-extensions/sound/sound-client.js
@@ -118,7 +118,7 @@ $(".master-volume-slider").slider({
 	max: 100,
 	value: 0,
 	slide: function( event, ui ) {	
-		beo.send({target: "sound", header: "setVolume", content: ui.value});
+		beo.sendToProduct("sound", "setVolume", ui.value);
 	},
 	start: function(event, ui) {
 		adjustingSystemVolume = true;
diff --git a/Beocreate2/beo-extensions/sources/index.js b/Beocreate2/beo-extensions/sources/index.js
index d451a387..22a88b52 100644
--- a/Beocreate2/beo-extensions/sources/index.js
+++ b/Beocreate2/beo-extensions/sources/index.js
@@ -19,817 +19,828 @@ SOFTWARE.*/
 var fetch = require("node-fetch");
 var exec = require("child_process").exec;
 
-	var debug = beo.debug;
-	
-	var version = require("./package.json").version;
-	
-	
-	var allSources = {};
-	var currentSource = null;
-	var focusedSource = null;
-	
-	var enabledHifiberrySources = 0;
-	
-	var startableSources = {}; // Different sources may hold multiple "sub-sources" (connected devices, physical media) that can be started.
+var debug = beo.debug;
+
+var version = require("./package.json").version;
+
+
+var allSources = {};
+var currentSource = null;
+var focusedSource = null;
+
+var enabledHifiberrySources = 0;
+
+var startableSources = {}; // Different sources may hold multiple "sub-sources" (connected devices, physical media) that can be started.
+
+var focusIndex = 0; // Increment and assign to each source, so that it's known which one activated latest.
+var defaultSettings = {
+		"port": 81, // HiFiBerry API port.
+		"aliases": {},
+		"sourceOrder": []
+};
+var settings = JSON.parse(JSON.stringify(defaultSettings));
+
+var defaultAliases = {
+	cd: {name: "CD", icon: "cd.svg"},
+	phono: {name: "Phono", icon: "beogram.svg"},
+	tape: {name: "Tape", icon: "tape.svg"},
+	tv: {name: "Television", icon: "tv.svg"},
+	computer: {name: "Computer", icon: "computer.svg"}
+}
+
+
+
+beo.bus.on('general', function(event) {
+	// See documentation on how to use beo.bus.
+	// GENERAL channel broadcasts events that concern the whole system.
 	
-	var focusIndex = 0; // Increment and assign to each source, so that it's known which one activated latest.
-	var defaultSettings = {
-			"port": 81, // HiFiBerry API port.
-			"aliases": {},
-			"sourceOrder": []
-	};
-	var settings = JSON.parse(JSON.stringify(defaultSettings));
+	//console.dir(event);
 	
-	var defaultAliases = {
-		cd: {name: "CD", icon: "cd.svg"},
-		phono: {name: "Phono", icon: "beogram.svg"},
-		tape: {name: "Tape", icon: "tape.svg"},
-		tv: {name: "Television", icon: "tv.svg"},
-		computer: {name: "Computer", icon: "computer.svg"}
+	if (event.header == "startup") {
+		
+		
 	}
 	
 	
-	
-	beo.bus.on('general', function(event) {
-		// See documentation on how to use beo.bus.
-		// GENERAL channel broadcasts events that concern the whole system.
-		
-		//console.dir(event);
-		
-		if (event.header == "startup") {
-			
-			
-		}
-		
-		
-		if (event.header == "activatedExtension") {
-			if (event.content.extension == "sources") {
-				if (!checkingEnabled) checkEnabled();
-			}
+	if (event.header == "activatedExtension") {
+		if (event.content.extension == "sources") {
+			if (!checkingEnabled) checkEnabled();
 		}
-	});
+	}
+});
+
+
+beo.bus.on("sources", function(event) {
 	
 	
-	beo.bus.on("sources", function(event) {
-		
+	switch (event.header) {
+		case "settings":
 		
-		switch (event.header) {
-			case "settings":
-			
-				if (event.content.settings) {
-					settings = Object.assign(settings, event.content.settings);
-				}
-				break;
-			case "getSources":
-				beo.bus.emit("ui", {target: "sources", header: "sources", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource, sourceOrder: settings.sourceOrder}});
-				break;
-			case "getDefaultAliases":
-				beo.bus.emit("ui", {target: "sources", header: "defaultAliases", content: {aliases: defaultAliases}});
-				break;
-			case "arrangeSources":
-				if (event.content.sourceOrder) {
-					settings.sourceOrder = event.content.sourceOrder;
-					if (debug) console.log("Source order is now: "+settings.sourceOrder.join(", ")+".");
-					beo.saveSettings("sources", settings);
-					beo.sendToUI("sources", {header: "sources", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource, sourceOrder: settings.sourceOrder}});
-				}
-				break;
-			case "setAlias":
-				if (event.content.extension) {
-					if (event.content.alias) {
-						if (event.content.defaultAlias) {
-							if (defaultAliases[event.content.alias]) {
-								setSourceOptions(event.content.extension, {alias: defaultAliases[event.content.alias]});
-							} else {
-								setSourceOptions(event.content.extension, {alias: false});
-							}
+			if (event.content.settings) {
+				settings = Object.assign(settings, event.content.settings);
+			}
+			break;
+		case "getSources":
+			beo.bus.emit("ui", {target: "sources", header: "sources", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource, sourceOrder: settings.sourceOrder}});
+			break;
+		case "getDefaultAliases":
+			beo.bus.emit("ui", {target: "sources", header: "defaultAliases", content: {aliases: defaultAliases}});
+			break;
+		case "arrangeSources":
+			if (event.content.sourceOrder) {
+				settings.sourceOrder = event.content.sourceOrder;
+				if (debug) console.log("Source order is now: "+settings.sourceOrder.join(", ")+".");
+				beo.saveSettings("sources", settings);
+				beo.sendToUI("sources", {header: "sources", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource, sourceOrder: settings.sourceOrder}});
+			}
+			break;
+		case "setAlias":
+			if (event.content.extension) {
+				if (event.content.alias) {
+					if (event.content.defaultAlias) {
+						if (defaultAliases[event.content.alias]) {
+							setSourceOptions(event.content.extension, {alias: defaultAliases[event.content.alias]});
 						} else {
-							setSourceOptions(event.content.extension, {alias: {name: event.content.alias, icon: null}});
+							setSourceOptions(event.content.extension, {alias: false});
 						}
 					} else {
-						setSourceOptions(event.content.extension, {alias: false});
+						setSourceOptions(event.content.extension, {alias: {name: event.content.alias, icon: null}});
 					}
+				} else {
+					setSourceOptions(event.content.extension, {alias: false});
 				}
-				break;
-			case "startableSources":
-				if (event.content.sources && event.content.extension) {
-					for (source in startableSources) {
-						if (startableSources[source].extension == event.content.extension) {
-							if (!event.content.sources[source]) delete startableSources[source];
-						}
-					}
-					for (source in event.content.sources) {
-						startableSources[source] = event.content.sources[source];
-						startableSources[source].extension = event.content.extension;
+			}
+			break;
+		case "startableSources":
+			if (event.content.sources && event.content.extension) {
+				for (source in startableSources) {
+					if (startableSources[source].extension == event.content.extension) {
+						if (!event.content.sources[source]) delete startableSources[source];
 					}
-					beo.bus.emit("ui", {target: "sources", header: "startableSources", content: startableSources});
 				}
-				break;
-			case "startSource":
-				if (event.content.sourceID) {
-					extension = event.content.sourceID;
-					if (allSources[extension].parentSource) extension = allSources[extension].parentSource;
-					if (allSources[extension].startable) {
-						beo.sendToUI("sources", {header: "starting", content: {extension: extension}});
-						if (allSources[extension].usesHifiberryControl) {
-							if (allSources[extension].aka) {
-								sourceName = allSources[extension].aka[0];
-							} else {
-								sourceName = extension;
-							}
-							audioControl("start", sourceName, function(success) {
-								if (!success) {
-									beo.bus.emit(extension, {header: "start"});
-								}
-							});
+				for (source in event.content.sources) {
+					startableSources[source] = event.content.sources[source];
+					startableSources[source].extension = event.content.extension;
+				}
+				beo.bus.emit("ui", {target: "sources", header: "startableSources", content: startableSources});
+			}
+			break;
+		case "startSource":
+			if (event.content.sourceID) {
+				extension = event.content.sourceID;
+				if (allSources[extension].parentSource) extension = allSources[extension].parentSource;
+				if (allSources[extension].startable) {
+					beo.sendToUI("sources", {header: "starting", content: {extension: extension}});
+					if (allSources[extension].usesHifiberryControl) {
+						if (allSources[extension].aka) {
+							sourceName = allSources[extension].aka[0];
 						} else {
-							beo.bus.emit(extension, {header: "start"});
+							sourceName = extension;
 						}
-					}
-				}
-				break;
-			case "setSourceVolume":
-				if (currentSource && event.content.percentage != undefined) {
-					beo.bus.emit(currentSource, {header: "setVolume", content: {percentage: event.content.percentage}});
-				}
-				break;
-			case "metadata": // Metadata from AudioControl.
-				if (event.content) {
-					processAudioControlMetadata(event.content.body);
-				}
-				break;
-			case "getMetadata":
-				audioControlGet("metadata");
-				break;
-			case "transport":
-				transport(event.content.action);
-				break;
-			case "toggleLove":
-				if (focusedSource && allSources[focusedSource].canLove) {
-					if (!allSources[focusedSource].metadata.loved) {
-						love = true;
-					} else {
-						love = false;
-					}
-					if (allSources[focusedSource].usesHifiberryControl) {
-						action = (love) ? "love" : "unlove";
-						
-						audioControl(action, null, function(success) {
-							if (success) {
-								allSources[focusedSource].metadata.loved = love;
-								beo.bus.emit("sources", {header: "metadataChanged", content: {metadata: allSources[focusedSource].metadata, extension: focusedSource}});
+						audioControl("start", sourceName, function(success) {
+							if (!success) {
+								beo.bus.emit(extension, {header: "start"});
 							}
 						});
+					} else {
+						beo.bus.emit(extension, {header: "start"});
 					}
 				}
-				break;
-		}
-	});
-	
-	
-	// HIFIBERRY AUDIOCONTROL INTEGRATION
-	
-	
-	function audioControlGet(dataType, callback) {
-		switch (dataType) {
-			case "metadata":
-				endpoint = "/api/track/metadata";
-				processor = processAudioControlMetadata;
-				break;
-			case "status":
-				endpoint = "/api/player/status";
-				processor = processAudioControlStatus;
-				break;
-		}
-		if (endpoint && processor) {
-			fetch("http://127.0.1.1:"+settings.port+endpoint).then(res => {
-				if (res.status == 200) {
-					res.json().then(json => {
-						processor(json);
-						if (callback) callback(true);
-					});
+			}
+			break;
+		case "setSourceVolume":
+			if (currentSource && event.content.percentage != undefined) {
+				beo.bus.emit(currentSource, {header: "setVolume", content: {percentage: event.content.percentage}});
+			}
+			break;
+		case "metadata": // Metadata from AudioControl.
+			if (event.content) {
+				processAudioControlMetadata(event.content.body);
+			}
+			break;
+		case "getMetadata":
+			audioControlGet("metadata");
+			break;
+		case "transport":
+			transport(event.content.action);
+			break;
+		case "toggleLove":
+			if (focusedSource && allSources[focusedSource].canLove) {
+				if (!allSources[focusedSource].metadata.loved) {
+					love = true;
 				} else {
-					// No content.
-					if (debug) console.log("Error retrieving data from AudioControl:", res.status, res.statusText, res.text);
-					if (callback) callback(false);
+					love = false;
 				}
-			});
-		}
+				if (allSources[focusedSource].usesHifiberryControl) {
+					action = (love) ? "love" : "unlove";
+					
+					audioControl(action, null, function(success) {
+						if (success) {
+							allSources[focusedSource].metadata.loved = love;
+							beo.bus.emit("sources", {header: "metadataChanged", content: {metadata: allSources[focusedSource].metadata, extension: focusedSource}});
+						}
+					});
+				}
+			}
+			break;
 	}
+});
 
 
-	function audioControl(operation, extra, callback) {
-		switch (operation) {
-			case "playPause":
-			case "play":
-			case "pause":
-			case "stop":
-			case "next":
-			case "previous":
-				endpoint = "/api/player/"+operation.toLowerCase();
-				break;
-			case "start":
-				endpoint = "/api/player/activate/"+extra;
-				break;
-			case "love":
-			case "unlove":
-				endpoint = "/api/track/"+operation.toLowerCase();
-				break;
-		}
-		if (endpoint) {
-			fetch("http://127.0.1.1:"+settings.port+endpoint, {method: "post"}).then(res => {
-				if (res.status == 200) {
+// HIFIBERRY AUDIOCONTROL INTEGRATION
+
+
+function audioControlGet(dataType, callback) {
+	switch (dataType) {
+		case "metadata":
+			endpoint = "/api/track/metadata";
+			processor = processAudioControlMetadata;
+			break;
+		case "status":
+			endpoint = "/api/player/status";
+			processor = processAudioControlStatus;
+			break;
+	}
+	if (endpoint && processor) {
+		fetch("http://127.0.1.1:"+settings.port+endpoint).then(res => {
+			if (res.status == 200) {
+				res.json().then(json => {
+					processor(json);
 					if (callback) callback(true);
-				} else {
-					if (debug) console.log("Could not send HiFiBerry control command: " + res.status, res.statusText);
-					if (callback) callback(false, res.statusText);
-				}
-			});
-		}
+				});
+			} else {
+				// No content.
+				if (debug) console.log("Error retrieving data from AudioControl:", res.status, res.statusText, res.text);
+				if (callback) callback(false);
+			}
+		});
 	}
-	
-	
-	
-	audioControlLastUpdated = null;
-	sourceCheckTimeout = null;
-	
-	function processAudioControlStatus(overview) {
-		if (overview.players && overview.last_updated) {
-			audioControlLastUpdated = overview.last_updated;
-			for (var i = 0; i < overview.players.length; i++) {
-				// Go through each source, see their status and update accordingly.
-				[extension, childSource] = matchAudioControlSourceToExtension(overview.players[i].name, overview.players[i]);
-				if (extension) {
-					allSources[extension].childSource = childSource;
-					if (childSource && allSources[childSource]) allSources[childSource].parentSource = extension;
-					if (overview.players[i].state == "unknown") overview.players[i].state = "stopped";
-					
-					if (allSources[extension].playerState != overview.players[i].state) {
-						allSources[extension].playerState = overview.players[i].state;
-						
-						if (overview.players[i].state == "playing") {
-							sourceActivated(extension);
-						} else {
-							if (allSources[extension].active) sourceDeactivated(extension, overview.players[i].state);
-						}
-						
-						beo.bus.emit("sources", {header: "playerStateChanged", content: {state: allSources[extension].playerState, extension: extension}});
-						
-						
-						if (overview.players[i].state != "paused" && extension != currentAudioControlSource) {
-							// This is not the current AudioControl source but because it is paused, check again after 15 seconds to see if it has changed.
-							clearTimeout(sourceCheckTimeout);
-							sourceCheckTimeout = setTimeout(function() {
-								audioControlGet("status");
-							}, 15000);
-						}
-					}
+}
+
+
+function audioControl(operation, extra, callback) {
+	switch (operation) {
+		case "playPause":
+		case "play":
+		case "pause":
+		case "stop":
+		case "next":
+		case "previous":
+			endpoint = "/api/player/"+operation.toLowerCase();
+			break;
+		case "start":
+			endpoint = "/api/player/activate/"+extra;
+			break;
+		case "love":
+		case "unlove":
+			endpoint = "/api/track/"+operation.toLowerCase();
+			break;
+	}
+	if (endpoint) {
+		fetch("http://127.0.1.1:"+settings.port+endpoint, {method: "post"}).then(res => {
+			if (res.status == 200) {
+				if (callback) callback(true);
+			} else {
+				if (debug) console.log("Could not send HiFiBerry control command: " + res.status, res.statusText);
+				if (callback) callback(false, res.statusText);
+			}
+		});
+	}
+}
+
+
+
+audioControlLastUpdated = null;
+sourceCheckTimeout = null;
+
+function processAudioControlStatus(overview) {
+	if (overview.players && overview.last_updated) {
+		audioControlLastUpdated = overview.last_updated;
+		for (var i = 0; i < overview.players.length; i++) {
+			// Go through each source, see their status and update accordingly.
+			[extension, childSource] = matchAudioControlSourceToExtension(overview.players[i].name, overview.players[i]);
+			if (extension) {
+				allSources[extension].childSource = childSource;
+				if (childSource && allSources[childSource]) allSources[childSource].parentSource = extension;
+				if (overview.players[i].state == "unknown") overview.players[i].state = "stopped";
+				
+				if (allSources[extension].playerState != overview.players[i].state) {
+					allSources[extension].playerState = overview.players[i].state;
 					
-					if (overview.players[i].supported_commands) {
-						if (allSources[extension].allowChangingTransportControls) {
-							allSources[extension].transportControls = overview.players[i].supported_commands;
-						}
-						if (overview.players[i].supported_commands.indexOf("play") != -1) {
-							allSources[extension].startable = true;
-						} else {
-							allSources[extension].startable = false;
-						}
+					if (overview.players[i].state == "playing") {
+						sourceActivated(extension);
 					} else {
-						allSources[extension].startable = false;
+						if (allSources[extension].active) sourceDeactivated(extension, overview.players[i].state);
 					}
 					
-					if (extension == "bluetooth") {
-						allSources[extension].aliasInNowPlaying = overview.players[i].name;
-					}
+					beo.bus.emit("sources", {header: "playerStateChanged", content: {state: allSources[extension].playerState, extension: extension}});
+					
 					
-					if (!allSources[extension].metadata.title) {
-						if (overview.players[i].title) allSources[extension].metadata.title = overview.players[i].title;
-						if (overview.players[i].artist) allSources[extension].metadata.artist = overview.players[i].artist;
+					if (overview.players[i].state != "paused" && extension != currentAudioControlSource) {
+						// This is not the current AudioControl source but because it is paused, check again after 15 seconds to see if it has changed.
+						clearTimeout(sourceCheckTimeout);
+						sourceCheckTimeout = setTimeout(function() {
+							audioControlGet("status");
+						}, 15000);
 					}
 				}
-			}
-		}
-	}
-	
-	var currentAudioControlSource = null;
-	
-	function processAudioControlMetadata(metadata) {
-
-		[extension, childSource] = matchAudioControlSourceToExtension(metadata.playerName, metadata);
-		if (extension) {
-			if (allSources[extension].childSource && allSources[extension].childSource != childSource) {
-				sourceDeactivated(allSources[extension].childSource, "stopped");
-				allSources[allSources[extension].childSource].parentSource = null;
-			}
-			allSources[extension].childSource = childSource;
-			if (childSource && allSources[childSource]) allSources[childSource].parentSource = extension;
-			if (metadata.playerState == "unknown") metadata.playerState = "stopped";
-			
-			if (!focusedSource) {
-				if (childSource && allSources[childSource]) {
-					focusedSource = childSource;
-				} else if (!allSources[extension].backgroundService) {
-					focusedSource = extension;
+				
+				if (overview.players[i].supported_commands) {
+					if (allSources[extension].allowChangingTransportControls) {
+						allSources[extension].transportControls = overview.players[i].supported_commands;
+					}
+					if (overview.players[i].supported_commands.indexOf("play") != -1) {
+						allSources[extension].startable = true;
+					} else {
+						allSources[extension].startable = false;
+					}
+				} else {
+					allSources[extension].startable = false;
 				}
-			}
-			
-			if (extension == "bluetooth") {
-				allSources[extension].aliasInNowPlaying = metadata.playerName;
-			}
-			
-			metadataChanged = false;
-			playerStateChanged = false;
-			
-			if (metadata.title != allSources[extension].metadata.title ||
-				metadata.artist != allSources[extension].metadata.artist ||
-				metadata.albumTitle != allSources[extension].metadata.album ||
-				metadata.artUrl != allSources[extension].metadata.picture||
-				metadata.externalArtUrl != allSources[extension].metadata.externalPicture) {
-				// Metadata updated.
-				allSources[extension].metadata.title = metadata.title;
-				allSources[extension].metadata.artist = metadata.artist;
-				allSources[extension].metadata.album = metadata.albumTitle;
-				allSources[extension].metadata.loved = metadata.loved;
-				allSources[extension].metadata.picture = metadata.artUrl;
-				allSources[extension].metadata.externalPicture = metadata.externalArtUrl;
-				allSources[extension].metadata.picturePort = settings.port;
-				allSources[extension].metadata.uri = metadata.streamUrl;
-				//beo.bus.emit("sources", {header: "metadataChanged", content: {metadata: allSources[extension].metadata, extension: extension}});
-				metadataChanged = true;
-				// "Love track" support.
-				if (allSources[extension].canLove != metadata.loveSupported) {
-					setSourceOptions(extension, {canLove: metadata.loveSupported});
+				
+				if (extension == "bluetooth") {
+					allSources[extension].aliasInNowPlaying = overview.players[i].name;
 				}
 				
-				if (childSource && allSources[childSource]) {
-					allSources[childSource].metadata = JSON.parse(JSON.stringify(allSources[extension].metadata));
-					if (allSources[childSource].canLove != metadata.loveSupported) {
-						setSourceOptions(childSource, {canLove: metadata.loveSupported});
-					}
+				if (!allSources[extension].metadata.title) {
+					if (overview.players[i].title) allSources[extension].metadata.title = overview.players[i].title;
+					if (overview.players[i].artist) allSources[extension].metadata.artist = overview.players[i].artist;
 				}
 			}
-			
-			if (metadata.playerState != allSources[extension].playerState ||
-				(childSource && allSources[childSource] && allSources[childSource].playerState != metadata.playerState)) {
-				// Player state updated _for this source_.
-				allSources[extension].playerState = metadata.playerState;
-				if (childSource && allSources[childSource]) {
-					allSources[childSource].playerState = metadata.playerState;
-				}
+		}
+	}
+}
 
-				if (metadata.playerState == "playing") {
-					sourceActivated((childSource && allSources[childSource]) ? childSource : extension);
-				} else {
-					sourceDeactivated((childSource && allSources[childSource]) ? childSource : extension);
-				}
-				
-				//beo.bus.emit("sources", {header: "playerStateChanged", content: {state: allSources[extension].playerState, extension: extension}});
-				playerStateChanged = true;
+var currentAudioControlSource = null;
+
+function processAudioControlMetadata(metadata) {
+
+	[extension, childSource] = matchAudioControlSourceToExtension(metadata.playerName, metadata);
+	if (extension) {
+		if (allSources[extension].childSource && allSources[extension].childSource != childSource) {
+			sourceDeactivated(allSources[extension].childSource, "stopped");
+			allSources[allSources[extension].childSource].parentSource = null;
+		}
+		allSources[extension].childSource = childSource;
+		if (childSource && allSources[childSource]) allSources[childSource].parentSource = extension;
+		if (metadata.playerState == "unknown") metadata.playerState = "stopped";
+		
+		if (!focusedSource) {
+			if (childSource && allSources[childSource]) {
+				focusedSource = childSource;
+			} else if (!allSources[extension].backgroundService) {
+				focusedSource = extension;
 			}
-			
-			if (metadataChanged && !playerStateChanged) { // If player state has changed, this info will be sent by the function that keeps track of active sources. If only metadata changes, send it here.
-				beo.bus.emit("sources", {header: "sourcesChanged", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource}});
-				beo.sendToUI("sources", "sources", {sources: allSources, currentSource: currentSource, focusedSource: focusedSource});
+		}
+		
+		if (extension == "bluetooth") {
+			allSources[extension].aliasInNowPlaying = metadata.playerName;
+		}
+		
+		metadataChanged = false;
+		playerStateChanged = false;
+		
+		if (metadata.title != allSources[extension].metadata.title ||
+			metadata.artist != allSources[extension].metadata.artist ||
+			metadata.albumTitle != allSources[extension].metadata.album ||
+			metadata.artUrl != allSources[extension].metadata.picture ||
+			metadata.externalArtUrl != allSources[extension].metadata.externalPicture ||
+			metadata.loved != allSources[extension].metadata.loved) {
+			// Metadata updated.
+			allSources[extension].metadata.title = metadata.title;
+			allSources[extension].metadata.artist = metadata.artist;
+			allSources[extension].metadata.album = metadata.albumTitle;
+			allSources[extension].metadata.loved = metadata.loved;
+			allSources[extension].metadata.picture = metadata.artUrl;
+			allSources[extension].metadata.externalPicture = metadata.externalArtUrl;
+			allSources[extension].metadata.picturePort = settings.port;
+			allSources[extension].metadata.uri = metadata.streamUrl;
+			//beo.bus.emit("sources", {header: "metadataChanged", content: {metadata: allSources[extension].metadata, extension: extension}});
+			metadataChanged = true;
+			// "Love track" support.
+			if (allSources[extension].canLove != metadata.loveSupported) {
+				setSourceOptions(extension, {canLove: metadata.loveSupported});
 			}
 			
-			if (extension != currentAudioControlSource) {
-				// If the active source indicated in AudioControl metadata changes, there won't be status updates for the previous source. Read it manually.
-				currentAudioControlSource = extension;
-				setTimeout(function() {
-					audioControlGet("status");
-				}, 2000);
+			if (childSource && allSources[childSource]) {
+				allSources[childSource].metadata = JSON.parse(JSON.stringify(allSources[extension].metadata));
+				if (allSources[childSource].canLove != metadata.loveSupported) {
+					setSourceOptions(childSource, {canLove: metadata.loveSupported});
+				}
 			}
 		}
-	}
-	
-	function matchAudioControlSourceToExtension(acSource, data = null) {
-		// Determine which extension this belongs to.
-		extension = null;
-		childSource = null;
-		if (acSource) {
-			if (allSources[acSource.toLowerCase()]) {
-				extension = acSource.toLowerCase();
-				if (allSources[extension].determineChildSource) {
-					childSource = allSources[extension].determineChildSource(data);
-				}
+		
+		if (metadata.playerState != allSources[extension].playerState ||
+			(childSource && allSources[childSource] && allSources[childSource].playerState != metadata.playerState)) {
+			// Player state updated _for this source_.
+			allSources[extension].playerState = metadata.playerState;
+			if (childSource && allSources[childSource]) {
+				allSources[childSource].playerState = metadata.playerState;
+			}
+
+			if (metadata.playerState == "playing") {
+				sourceActivated((childSource && allSources[childSource]) ? childSource : extension);
 			} else {
-				for (source in allSources) {
-					if (allSources[source].aka && allSources[source].aka.indexOf(acSource) != -1) {
-						extension = source;
-						if (allSources[extension].determineChildSource) {
-							childSource = allSources[extension].determineChildSource(data);
-						}
-						break;
-					}
-				}
-				if (!extension) extension = "bluetooth"; // Bluetooth sources can have various names.
+				sourceDeactivated((childSource && allSources[childSource]) ? childSource : extension);
 			}
+			
+			//beo.bus.emit("sources", {header: "playerStateChanged", content: {state: allSources[extension].playerState, extension: extension}});
+			playerStateChanged = true;
+		}
+		
+		if (metadataChanged && !playerStateChanged) { // If player state has changed, this info will be sent by the function that keeps track of active sources. If only metadata changes, send it here.
+			beo.bus.emit("sources", {header: "sourcesChanged", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource}});
+			beo.sendToUI("sources", "sources", {sources: allSources, currentSource: currentSource, focusedSource: focusedSource});
+		}
+		
+		if (extension != currentAudioControlSource) {
+			// If the active source indicated in AudioControl metadata changes, there won't be status updates for the previous source. Read it manually.
+			currentAudioControlSource = extension;
+			setTimeout(function() {
+				audioControlGet("status");
+			}, 2000);
 		}
-		return [extension, childSource];
 	}
-	
-	
-	// TRANSPORT
-	
-	function transport(action, overrideHifiberry = false) {
-		if (focusedSource) {
-			if (allSources[focusedSource].parentSource) {
-				controlSource = allSources[focusedSource].parentSource;
-			} else {
-				controlSource = focusedSource;
+}
+
+function matchAudioControlSourceToExtension(acSource, data = null) {
+	// Determine which extension this belongs to.
+	extension = null;
+	childSource = null;
+	if (acSource) {
+		if (allSources[acSource.toLowerCase()]) {
+			extension = acSource.toLowerCase();
+			if (allSources[extension].determineChildSource) {
+				childSource = allSources[extension].determineChildSource(data);
 			}
-			if (allSources[controlSource].transportControls) {
-				if (allSources[controlSource].usesHifiberryControl && !overrideHifiberry) {
-					audioControl(action, null, function(success) {
-						if (!success) {
-							transport(action, true);
-						}
-					});
-				} else {
-					switch (action) {
-						case "playPause":
-						case "play":
-						case "pause":
-						case "stop":
-						case "next":
-						case "previous":
-							beo.bus.emit(controlSource, {header: "transport", content: {action: action}});
-							break;
+		} else {
+			for (source in allSources) {
+				if (allSources[source].aka && allSources[source].aka.indexOf(acSource) != -1) {
+					extension = source;
+					if (allSources[extension].determineChildSource) {
+						childSource = allSources[extension].determineChildSource(data);
 					}
+					break;
 				}
 			}
+			if (!extension) extension = "bluetooth"; // Bluetooth sources can have various names.
 		}
 	}
-	
-	
-	// KEEP TRACK OF SOURCES
-	
-	
-	function sourceActivated(extension, playerState) {
-		if (allSources[extension] && 
-			allSources[extension].enabled && 
-			!allSources[extension].backgroundService) {
-			if (allSources[extension].focusIndex)  {
-				// Source reactivates, recalculate activation indexes.
-				reactivatedSourceFocusIndex = allSources[extension].focusIndex;
-				allSources[extension].focusIndex = 0;
-				focusIndex--;
-				
-				for (source in allSources) {
-					if (allSources[source].focusIndex > reactivatedSourceFocusIndex) {
-						allSources[source].focusIndex--;
+	return [extension, childSource];
+}
+
+
+// TRANSPORT
+
+function transport(action, overrideHifiberry = false) {
+	if (focusedSource) {
+		if (allSources[focusedSource].parentSource) {
+			controlSource = allSources[focusedSource].parentSource;
+		} else {
+			controlSource = focusedSource;
+		}
+		if (allSources[controlSource].transportControls) {
+			if (allSources[controlSource].usesHifiberryControl && !overrideHifiberry) {
+				audioControl(action, null, function(success) {
+					if (!success) {
+						transport(action, true);
 					}
+				});
+			} else {
+				switch (action) {
+					case "playPause":
+					case "play":
+					case "pause":
+					case "stop":
+					case "next":
+					case "previous":
+						beo.bus.emit(controlSource, {header: "transport", content: {action: action}});
+						break;
 				}
 			}
-			focusIndex++;
-			allSources[extension].active = true;
-			allSources[extension].focusIndex = focusIndex;
+		}
+	}
+}
+
+
+// KEEP TRACK OF SOURCES
+
+
+function sourceActivated(extension, playerState) {
+	if (allSources[extension] && 
+		allSources[extension].enabled && 
+		!allSources[extension].backgroundService) {
+		if (allSources[extension].focusIndex)  {
+			// Source reactivates, recalculate activation indexes.
+			reactivatedSourceFocusIndex = allSources[extension].focusIndex;
+			allSources[extension].focusIndex = 0;
+			focusIndex--;
 			
-			// Stop currently active sources, if the source demands it.
-			if (allSources[extension].stopOthers) {
-				if (allSources[currentSource] && 
-					allSources[currentSource].usesHifiberryControl && 
-					!allSources[extension].usesHifiberryControl) {
-					if (!allSources[extension].parentSource || !allSources[allSources[extension].parentSource].usesHifiberryControl) {
-						// If the new source isn't part of AudioControl, stop other AudioControl sources manually.
-						if (debug) console.log("Pausing sources under HiFiBerry control...");
-						audioControl("pause");
-					}
-				}
-				for (source in allSources) {
-					if (source != extension && 
-						allSources[source].active) {
-						if (!allSources[source].usesHifiberryControl) {
-							// Stop all other non-AudioControl sources.
-							beo.bus.emit(source, {header: "stop", content: {reason: "sourceActivated"}});
-						}
-					}
+			for (source in allSources) {
+				if (allSources[source].focusIndex > reactivatedSourceFocusIndex) {
+					allSources[source].focusIndex--;
 				}
 			}
-			if (playerState) {
-				allSources[extension].playerState = playerState;
-			}
-			
-			fromStandby = (currentSource == null);
-			
-			determineCurrentSource();
-			if (debug) {
-				childMsg = (allSources[extension].parentSource) ? " (as child source of '"+allSources[extension].parentSource+"')" : "";
-				console.log("Source '"+extension+"' has activated"+childMsg+".");
-			}
-			
-			if (beo.extensions.interact) beo.extensions.interact.runTrigger("sources", "sourceActivated", {source: extension, fromStandby: fromStandby});
-	
 		}
-	}
-	
-	function sourceDeactivated(extension, playerState) {
-		if (allSources[extension] && allSources[extension].active) {
-			allSources[extension].active = false;
-			if (!allSources[extension].transportControls && Object.keys(allSources[extension].metadata).length == 0) {
-				// Remove the focus index from the source if it has no metadata and transport controls.
-				deactivatedSourceFocusIndex = allSources[extension].focusIndex;
-				allSources[extension].focusIndex = 0;
-				focusIndex--;
-				
-				for (source in allSources) {
-					if (allSources[source].focusIndex > deactivatedSourceFocusIndex) {
-						allSources[source].focusIndex--;
-					}
+		focusIndex++;
+		allSources[extension].active = true;
+		allSources[extension].focusIndex = focusIndex;
+		
+		// Stop currently active sources, if the source demands it.
+		if (allSources[extension].stopOthers) {
+			if (allSources[currentSource] && 
+				allSources[currentSource].usesHifiberryControl && 
+				!allSources[extension].usesHifiberryControl) {
+				if (!allSources[extension].parentSource || !allSources[allSources[extension].parentSource].usesHifiberryControl) {
+					// If the new source isn't part of AudioControl, stop other AudioControl sources manually.
+					if (debug) console.log("Pausing sources under HiFiBerry control...");
+					audioControl("pause");
 				}
 			}
-			
-			if (playerState) {
-				allSources[extension].playerState = playerState;
-				//beo.bus.emit("sources", {header: "playerStateChanged", content: {state: playerState, extension: extension}});
+			for (source in allSources) {
+				if (source != extension && 
+					allSources[source].active) {
+					if (!allSources[source].usesHifiberryControl) {
+						// Stop all other non-AudioControl sources.
+						beo.bus.emit(source, {header: "stop", content: {reason: "sourceActivated"}});
+					}
+				}
 			}
-			
-			determineCurrentSource();
-			if (debug) console.log("Source '"+extension+"' has deactivated.");
-			
-			if (beo.extensions.interact) beo.extensions.interact.runTrigger("sources", "sourceDeactivated", {source: extension, toStandby: (currentSource == null)});
+		}
+		if (playerState) {
+			allSources[extension].playerState = playerState;
+		}
+		
+		fromStandby = (currentSource == null);
 		
+		determineCurrentSource();
+		if (debug) {
+			childMsg = (allSources[extension].parentSource) ? " (as child source of '"+allSources[extension].parentSource+"')" : "";
+			console.log("Source '"+extension+"' has activated"+childMsg+".");
 		}
+		
+		if (beo.extensions.interact) beo.extensions.interact.runTrigger("sources", "sourceActivated", {source: extension, fromStandby: fromStandby});
+
 	}
-	
-	function determineCurrentSource() {
-		activeSourceCount = 0;
-		latestSource = null;
-		highestFocusIndex = 0;
-		focusedSource = null;
-		newSource = null;
-		for (source in allSources) {
-			if (allSources[source].focusIndex > highestFocusIndex) {
-				highestFocusIndex = allSources[source].focusIndex;
-				focusedSource = source;
-				if (allSources[source].active) {
-					newSource = source;
-					activeSourceCount++;
+}
+
+function sourceDeactivated(extension, playerState) {
+	if (allSources[extension] && allSources[extension].active) {
+		allSources[extension].active = false;
+		if (!allSources[extension].transportControls && Object.keys(allSources[extension].metadata).length == 0) {
+			// Remove the focus index from the source if it has no metadata and transport controls.
+			deactivatedSourceFocusIndex = allSources[extension].focusIndex;
+			allSources[extension].focusIndex = 0;
+			focusIndex--;
+			
+			for (source in allSources) {
+				if (allSources[source].focusIndex > deactivatedSourceFocusIndex) {
+					allSources[source].focusIndex--;
 				}
 			}
 		}
-		if (activeSourceCount == 0) {
-			if (currentSource != null) {
-				currentSource = null;
-			}
-		} else {
-			if (newSource != currentSource) {
-				currentSource = newSource;
-			}
+		
+		if (playerState) {
+			allSources[extension].playerState = playerState;
+			//beo.bus.emit("sources", {header: "playerStateChanged", content: {state: playerState, extension: extension}});
 		}
 		
-		beo.bus.emit("sources", {header: "sourcesChanged", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource}});
-		beo.sendToUI("sources", {header: "sources", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource}});
-		logSourceStatus();
-	}
+		determineCurrentSource();
+		if (debug) console.log("Source '"+extension+"' has deactivated.");
+		
+		if (beo.extensions.interact) beo.extensions.interact.runTrigger("sources", "sourceDeactivated", {source: extension, toStandby: (currentSource == null)});
 	
-	function logSourceStatus() {
-		if (debug >= 2) {
-			message = "Sources: [play: "+currentSource+"] [focus: "+focusedSource+"]\n";
-			for (source in allSources) {
-				message += "["+source+"] active: "+allSources[source].active;
-				if (allSources[source].active) message += " ("+allSources[source].focusIndex+". to activate)";
-				message += ", state: "+allSources[source].playerState;
-				if (allSources[source].metadata.title && allSources[source].metadata.artist) message += ", track: "+allSources[source].metadata.title+" - "+allSources[source].metadata.artist;
-				message += "\n";
+	}
+}
+
+function determineCurrentSource() {
+	activeSourceCount = 0;
+	latestSource = null;
+	highestFocusIndex = 0;
+	focusedSource = null;
+	newSource = null;
+	for (source in allSources) {
+		if (allSources[source].focusIndex > highestFocusIndex) {
+			highestFocusIndex = allSources[source].focusIndex;
+			focusedSource = source;
+			if (allSources[source].active) {
+				newSource = source;
+				activeSourceCount++;
 			}
 		}
 	}
+	if (activeSourceCount == 0) {
+		if (currentSource != null) {
+			currentSource = null;
+		}
+	} else {
+		if (newSource != currentSource) {
+			currentSource = newSource;
+		}
+	}
 	
-	
-	function setMetadata(extension, metadata) {
-		
+	beo.bus.emit("sources", {header: "sourcesChanged", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource}});
+	beo.sendToUI("sources", {header: "sources", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource}});
+	logSourceStatus();
+}
+
+function logSourceStatus() {
+	if (debug >= 2) {
+		message = "Sources: [play: "+currentSource+"] [focus: "+focusedSource+"]\n";
+		for (source in allSources) {
+			message += "["+source+"] active: "+allSources[source].active;
+			if (allSources[source].active) message += " ("+allSources[source].focusIndex+". to activate)";
+			message += ", state: "+allSources[source].playerState;
+			if (allSources[source].metadata.title && allSources[source].metadata.artist) message += ", track: "+allSources[source].metadata.title+" - "+allSources[source].metadata.artist;
+			message += "\n";
+		}
 	}
+}
+
+
+function setMetadata(extension, metadata) {
 	
-	var sourceRegistrationTimeout;
-	var sourcesRegistered = false;
-	function setSourceOptions(extension, options, noUpdate) {
-
-		if (beo.extensions[extension]) {
-			sourceAdded = false;
-			if (!allSources[extension]) {
-				sourceAdded = true;
-				allSources[extension] = {
-					active: false,
-					enabled: false,
-					playerState: "stopped",
-					stopOthers: true,
-					transportControls: false,
-					allowChangingTransportControls: true,
-					usesHifiberryControl: false,
-					canLove: false,
-					startable: false,
-					metadata: {},
-					alias: null,
-					aliasInNowPlaying: null,
-					determineChildSource: false,
-					childSources: [],
-					backgroundService: false
-				};
-				if (debug) console.log("Registering source '"+extension+"'...");
+}
+
+var sourceRegistrationTimeout;
+var sourcesRegistered = false;
+function setSourceOptions(extension, options, noUpdate) {
+
+	if (beo.extensions[extension]) {
+		sourceAdded = false;
+		if (!allSources[extension]) {
+			sourceAdded = true;
+			allSources[extension] = {
+				active: false,
+				enabled: false,
+				playerState: "stopped",
+				stopOthers: true,
+				transportControls: false,
+				allowChangingTransportControls: true,
+				usesHifiberryControl: false,
+				canLove: false,
+				startable: false,
+				metadata: {},
+				alias: null,
+				aliasInNowPlaying: null,
+				determineChildSource: false,
+				childSources: [],
+				backgroundService: false
+			};
+			if (debug) console.log("Registering source '"+extension+"'...");
+		}
+		
+		if (options.enabled != undefined) allSources[extension].enabled = (options.enabled) ? true : false;
+		if (options.transportControls != undefined) {
+			if (options.transportControls == true) {
+				allSources[extension].transportControls = ["play", "pause", "next", "previous"];
+			} else if (options.transportControls == false) {
+				allSources[extension].transportControls = false;
+			} else {
+				allSources[extension].transportControls = options.transportControls;
 			}
-			
-			if (options.enabled != undefined) allSources[extension].enabled = (options.enabled) ? true : false;
-			if (options.transportControls != undefined) {
-				if (options.transportControls == true) {
-					allSources[extension].transportControls = ["play", "pause", "next", "previous"];
-				} else if (options.transportControls == false) {
-					allSources[extension].transportControls = false;
-				} else {
-					allSources[extension].transportControls = options.transportControls;
-				}
+		}
+		if (options.stopOthers != undefined) allSources[extension].stopOthers = (options.stopOthers) ? true : false;
+		if (options.usesHifiberryControl != undefined) allSources[extension].usesHifiberryControl = (options.usesHifiberryControl) ? true : false;
+		if (options.allowChangingTransportControls != undefined) allSources[extension].allowChangingTransportControls = (options.allowChangingTransportControls) ? true : false;
+		if (options.aka) allSources[extension].aka = options.aka; // Other variations of the name the source might be called (by HiFiBerry Audiocontrol).
+		if (options.canLove) allSources[extension].canLove = options.canLove; // Display or don't display the "love" button.
+		if (options.startable) allSources[extension].startable = options.startable; // Can this source be started from Beocreate 2?
+		if (options.playerState) allSources[extension].playerState = options.playerState; // Player state.
+		if (options.determineChildSource) allSources[extension].determineChildSource = options.determineChildSource; // Custom function to determine the current source from Audiocontrol metadata. Must return name of the source extension.
+		if (options.childSources) allSources[extension].childSources = options.childSources; // Child sources this source can pose as.
+		if (options.backgroundService) allSources[extension].backgroundService = options.backgroundService; // Sources marked as background services won't be included in source order.
+		if (options.alias != undefined) { // An alias is an alternate name and icon for the source in Sources and Now Playing. Within the source's own menu the original name is shown for clarity. Alias is read from settings further below.
+			if (options.alias) {
+				allSources[extension].alias = {name: options.alias.name, icon: options.alias.icon};
+				settings.aliases[extension] = {name: options.alias.name, icon: options.alias.icon};
+				if (debug) console.log("Alias for source '"+extension+"' is now "+options.alias.name+".");
+			} else {
+				allSources[extension].alias = null;
+				settings.aliases[extension] = null;
+				if (debug) console.log("Alias for source '"+extension+"' was removed.");
 			}
-			if (options.stopOthers != undefined) allSources[extension].stopOthers = (options.stopOthers) ? true : false;
-			if (options.usesHifiberryControl != undefined) allSources[extension].usesHifiberryControl = (options.usesHifiberryControl) ? true : false;
-			if (options.allowChangingTransportControls != undefined) allSources[extension].allowChangingTransportControls = (options.allowChangingTransportControls) ? true : false;
-			if (options.aka) allSources[extension].aka = options.aka; // Other variations of the name the source might be called (by HiFiBerry Audiocontrol).
-			if (options.canLove) allSources[extension].canLove = options.canLove; // Display or don't display the "love" button.
-			if (options.startable) allSources[extension].startable = options.startable; // Can this source be started from Beocreate 2?
-			if (options.playerState) allSources[extension].playerState = options.playerState; // Player state.
-			if (options.determineChildSource) allSources[extension].determineChildSource = options.determineChildSource; // Custom function to determine the current source from Audiocontrol metadata. Must return name of the source extension.
-			if (options.childSources) allSources[extension].childSources = options.childSources; // Child sources this source can pose as.
-			if (options.backgroundService) allSources[extension].backgroundService = options.backgroundService; // Sources marked as background services won't be included in source order.
-			if (options.alias != undefined) { // An alias is an alternate name and icon for the source in Sources and Now Playing. Within the source's own menu the original name is shown for clarity. Alias is read from settings further below.
-				if (options.alias) {
-					allSources[extension].alias = {name: options.alias.name, icon: options.alias.icon};
-					settings.aliases[extension] = {name: options.alias.name, icon: options.alias.icon};
-					if (debug) console.log("Alias for source '"+extension+"' is now "+options.alias.name+".");
-				} else {
-					allSources[extension].alias = null;
-					settings.aliases[extension] = null;
-					if (debug) console.log("Alias for source '"+extension+"' was removed.");
+			beo.saveSettings("sources", settings);
+		}
+		if (options.aliasInNowPlaying != undefined) allSources[extension].aliasInNowPlaying = options.aliasInNowPlaying;
+		
+		
+		if (!sourceAdded) { 
+			if (!noUpdate) beo.sendToUI("sources", {header: "sources", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource}});
+			count = 0;
+			for (source in allSources) {
+				if (allSources[source].usesHifiberryControl) {
+					if (allSources[source].enabled) count++;
 				}
-				beo.saveSettings("sources", settings);
 			}
-			if (options.aliasInNowPlaying != undefined) allSources[extension].aliasInNowPlaying = options.aliasInNowPlaying;
-			
+			if (count != enabledHifiberrySources) {
+				if (debug) console.log(count+" HiFiBerry-controlled sources are now enabled.");
+				enabledHifiberrySources = count;
+			}
+		} else {
 			
-			if (!sourceAdded) { 
-				if (!noUpdate) beo.sendToUI("sources", {header: "sources", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource}});
-				count = 0;
-				for (source in allSources) {
-					if (allSources[source].usesHifiberryControl) {
-						if (allSources[source].enabled) count++;
+			if (settings.aliases[extension]) {
+				allSources[extension].alias = {name: settings.aliases[extension].name, icon: settings.aliases[extension].icon};
+			}
+		}
+		
+		if (!sourcesRegistered) {
+			clearTimeout(sourceRegistrationTimeout)
+			sourceRegistrationTimeout = setTimeout (function() {
+				if (debug) console.log("All sources registered.");
+				
+				// Order sources:
+				orderChanged = false;
+				// Check if any sources have been removed from the system.
+				for (o in settings.sourceOrder) {
+					if (!allSources[settings.sourceOrder[o]] ||
+					 	!beo.extensions[settings.sourceOrder[o]] ||
+					 	allSources[settings.sourceOrder[o]].backgroundService) {
+						// Remove this source from source order.
+						delete settings.sourceOrder[o];
+						orderChanged = true;
 					}
 				}
-				if (count != enabledHifiberrySources) {
-					if (debug) console.log(count+" HiFiBerry-controlled sources are now enabled.");
-					enabledHifiberrySources = count;
-				}
-			} else {
-				
-				if (settings.aliases[extension]) {
-					allSources[extension].alias = {name: settings.aliases[extension].name, icon: settings.aliases[extension].icon};
+				if (orderChanged) { // Remove gaps in the array.
+					settings.sourceOrder = settings.sourceOrder.filter(function (el) {
+						return el != null;
+					});
 				}
-			}
-			
-			if (!sourcesRegistered) {
-				clearTimeout(sourceRegistrationTimeout)
-				sourceRegistrationTimeout = setTimeout (function() {
-					if (debug) console.log("All sources registered.");
-					
-					// Order sources:
-					orderChanged = false;
-					// Check if any sources have been removed from the system.
-					for (o in settings.sourceOrder) {
-						if (!allSources[settings.sourceOrder[o]] ||
-						 	!beo.extensions[settings.sourceOrder[o]] ||
-						 	allSources[settings.sourceOrder[o]].backgroundService) {
-							// Remove this source from source order.
-							delete settings.sourceOrder[o];
-							orderChanged = true;
+				// Check if any new sources exist in the system.
+				for (source in allSources) {
+					if (settings.sourceOrder.indexOf(source) == -1 && !allSources[source].backgroundService) {
+						// This source doesn't exist. Add it to the mix alphabetically (by display name), preserving user order.
+						titles = [];
+						for (o in settings.sourceOrder) {
+							if (beo.extensionsList[settings.sourceOrder[o]]) titles.push(beo.extensionsList[settings.sourceOrder[o]].menuTitle);
 						}
-					}
-					if (orderChanged) { // Remove gaps in the array.
-						settings.sourceOrder = settings.sourceOrder.filter(function (el) {
-							return el != null;
-						});
-					}
-					// Check if any new sources exist in the system.
-					for (source in allSources) {
-						if (settings.sourceOrder.indexOf(source) == -1 && !allSources[source].backgroundService) {
-							// This source doesn't exist. Add it to the mix alphabetically (by display name), preserving user order.
-							titles = [];
-							for (o in settings.sourceOrder) {
-								if (beo.extensionsList[settings.sourceOrder[o]]) titles.push(beo.extensionsList[settings.sourceOrder[o]].menuTitle);
-							}
-							newTitle = beo.extensionsList[source].menuTitle;
-							newIndex = 0;
-							for (t in titles) {
-								if ([newTitle, titles[t]].sort()[1] == newTitle) newIndex = t+1;
-							}
-							settings.sourceOrder.splice(newIndex, 0, source);
-							orderChanged = true;
+						newTitle = beo.extensionsList[source].menuTitle;
+						newIndex = 0;
+						for (t in titles) {
+							if ([newTitle, titles[t]].sort()[1] == newTitle) newIndex = t+1;
 						}
+						settings.sourceOrder.splice(newIndex, 0, source);
+						orderChanged = true;
 					}
-					if (orderChanged) {
-						if (debug) console.log("Source order is now: "+settings.sourceOrder.join(", ")+".");
-						beo.saveSettings("sources", settings);
-					}
-					
-					beo.bus.emit("sources", {header: "sourcesChanged", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource, sourceOrder: settings.sourceOrder}});
-					audioControlGet("status", function(result) {
-						audioControlGet("metadata");
-					});
-					enabledHifiberrySources = 0;
-					for (source in allSources) {
-						if (allSources[source].usesHifiberryControl) {
-							if (allSources[source].enabled) enabledHifiberrySources++;
-						}
+				}
+				if (orderChanged) {
+					if (debug) console.log("Source order is now: "+settings.sourceOrder.join(", ")+".");
+					beo.saveSettings("sources", settings);
+				}
+				
+				beo.bus.emit("sources", {header: "sourcesChanged", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource, sourceOrder: settings.sourceOrder}});
+				audioControlGet("status", function(result) {
+					audioControlGet("metadata");
+				});
+				enabledHifiberrySources = 0;
+				for (source in allSources) {
+					if (allSources[source].usesHifiberryControl) {
+						if (allSources[source].enabled) enabledHifiberrySources++;
 					}
-					sourcesRegistered = true;
-					
+				}
+				sourcesRegistered = true;
+				
 
-					
-					
-				}, 1000);
-			}
+				
+				
+			}, 1000);
 		}
 	}
-	
-	var checkingEnabled = false;
-	var enabledChanged = false;
-	function checkEnabled(queue, callback) {
-		checkingEnabled = true;
-		if (!queue) {
-			if (debug > 1) console.log("Checking enabled status for all sources...");
-			queue = [];
-			for (extension in allSources) {
-				if (beo.extensions[extension].isEnabled) {
-					queue.push(extension);
-				}
+}
+
+var checkingEnabled = false;
+var enabledChanged = false;
+function checkEnabled(queue, callback) {
+	checkingEnabled = true;
+	if (!queue) {
+		if (debug > 1) console.log("Checking enabled status for all sources...");
+		queue = [];
+		for (extension in allSources) {
+			if (beo.extensions[extension].isEnabled) {
+				queue.push(extension);
 			}
 		}
-		if (queue.length > 0) {
-			source = queue.shift();
-			beo.extensions[source].isEnabled(function(enabled) {
-				if (allSources[source].enabled != enabled) {
-					enabledChanged = true;
-					if (debug) {
-						readableStatus = (enabled) ? "enabled" : "disabled";
-						if (debug) console.log("Source '"+source+"' is now "+readableStatus+".");
-					}
-					setSourceOptions(source, {enabled: enabled}, queue.length > 0); // Sends update to UI if this is the last extension to check.
-				} else if (queue.length == 0 && enabledChanged) {
-					// If the last source to check has not changed but another has, just send update.
-					beo.sendToUI("sources", {header: "sources", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource}});
-				}
-				if (queue.length > 0) {
-					checkEnabled(queue, callback);
-				} else {
-					checkingEnabled = false;
-					if (callback) callback();
-				}
-			});
-		}
 	}
-	
-	
-	function stopAllSources() {
-		// Stop currently active sources, if the source demands it.
-		execSync = require("child_process").execSync;
-		execSync("/opt/hifiberry/bin/pause-all");
-		for (source in allSources) {
-			if (allSources[source].active) {
-				if (!allSources[source].usesHifiberryControl) {
-					// Stop all other non-AudioControl sources.
-					beo.bus.emit(source, {header: "stop", content: {reason: "stopAll"}});
-				}
+	if (queue.length > 0) {
+		source = queue.shift();
+		beo.extensions[source].isEnabled(function(enabled) {
+			if (allSources[source].enabled != enabled) {
+				enabledChanged = true;
+				if (debug) {
+					readableStatus = (enabled) ? "enabled" : "disabled";
+					if (debug) console.log("Source '"+source+"' is now "+readableStatus+".");
+				}
+				setSourceOptions(source, {enabled: enabled}, queue.length > 0); // Sends update to UI if this is the last extension to check.
+			} else if (queue.length == 0 && enabledChanged) {
+				// If the last source to check has not changed but another has, just send update.
+				beo.sendToUI("sources", {header: "sources", content: {sources: allSources, currentSource: currentSource, focusedSource: focusedSource}});
+			}
+			if (queue.length > 0) {
+				checkEnabled(queue, callback);
+			} else {
+				checkingEnabled = false;
+				if (callback) callback();
+			}
+		});
+	}
+}
+
+
+function stopAllSources() {
+	// Stop currently active sources, if the source demands it.
+	execSync = require("child_process").execSync;
+	execSync("/opt/hifiberry/bin/pause-all");
+	for (source in allSources) {
+		if (allSources[source].active) {
+			if (!allSources[source].usesHifiberryControl) {
+				// Stop all other non-AudioControl sources.
+				beo.bus.emit(source, {header: "stop", content: {reason: "stopAll"}});
 			}
 		}
 	}
-	
-	interact = {
-		triggers: {
-				sourceActivated: function(data, interactData) {
-					if (!interactData.source) {
-						return (data.fromStandby) ? data.source : undefined;
-					} else {
-						return (data.source == interactData.source) ? data.source : undefined;
-					}
-				},
-				sourceDeactivated: function(data, interactData) {
-					if (!interactData.source) {
-						return (data.toStandby) ? data.source : undefined;
-					} else {
-						return (data.source == interactData.source) ? data.source : undefined;
-					}
+}
+
+
+function getCurrentSource() {
+	if (currentSource) {
+		return {currentSource: currentSource, data: allSources[currentSource]};
+	} else {
+		return null
+	}
+}
+
+interact = {
+	triggers: {
+			sourceActivated: function(data, interactData) {
+				if (!interactData.source) {
+					return (data.fromStandby) ? data.source : undefined;
+				} else {
+					return (data.source == interactData.source) ? data.source : undefined;
+				}
+			},
+			sourceDeactivated: function(data, interactData) {
+				if (!interactData.source) {
+					return (data.toStandby) ? data.source : undefined;
+				} else {
+					return (data.source == interactData.source) ? data.source : undefined;
 				}
 			}
-	}
-	
-	
+		}
+}
+
+
 module.exports = {
-	version: version,
-	setSourceOptions: setSourceOptions,
-	setMetadata: setMetadata,
-	sourceActivated: sourceActivated,
-	sourceDeactivated: sourceDeactivated,
-	allSources: allSources,
-	settings: settings,
-	stopAllSources: stopAllSources,
-	transport: transport,
-	interact: interact
+version: version,
+setSourceOptions: setSourceOptions,
+setMetadata: setMetadata,
+sourceActivated: sourceActivated,
+sourceDeactivated: sourceDeactivated,
+allSources: allSources,
+settings: settings,
+stopAllSources: stopAllSources,
+getCurrentSource: getCurrentSource,
+transport: transport,
+interact: interact
 };
 
 
diff --git a/Beocreate2/beo-extensions/speaker-preset/menu.html b/Beocreate2/beo-extensions/speaker-preset/menu.html
index a92c5917..9a950930 100644
--- a/Beocreate2/beo-extensions/speaker-preset/menu.html
+++ b/Beocreate2/beo-extensions/speaker-preset/menu.html
@@ -1,4 +1,4 @@
-<div class="menu-screen setup-large-title" id="speaker-preset" data-icon="preset.svg" data-menu-title="Speaker Preset" data-stylesheet="speaker-preset.css" data-menu-value-class="current-speaker-preset-name" data-built-in="1" data-context="sound/basic" data-enable-with="Beocreate 4-Channel Amplifier" data-namespace="speaker_preset">
+<div class="menu-screen setup-large-title" id="speaker-preset" data-icon="preset.svg" data-menu-title="Speaker Preset" data-stylesheet="speaker-preset.css" data-menu-value-class="current-speaker-preset-name" data-built-in="1" data-context="sound/basic" data-namespace="speaker_preset">
 	<header>
 		<div class="back-button master setup"></div>
 		<h1>Speaker Preset</h1>
diff --git a/Beocreate2/beo-extensions/speaker-preset/package.json b/Beocreate2/beo-extensions/speaker-preset/package.json
index 82203819..d37a8e2c 100644
--- a/Beocreate2/beo-extensions/speaker-preset/package.json
+++ b/Beocreate2/beo-extensions/speaker-preset/package.json
@@ -19,5 +19,8 @@
     "olufsen"
   ],
   "author": "Bang & Olufsen",
-  "license": "MIT"
+  "license": "MIT",
+  "beocreate": {
+  	"enableWith": ["Beocreate 4-Channel Amplifier"]
+  }
 }
diff --git a/Beocreate2/beo-extensions/toslink/menu.html b/Beocreate2/beo-extensions/toslink/menu.html
index 1602a173..70df3e2f 100644
--- a/Beocreate2/beo-extensions/toslink/menu.html
+++ b/Beocreate2/beo-extensions/toslink/menu.html
@@ -1,4 +1,4 @@
-<div class="menu-screen source" id="toslink" data-icon="toslink.svg" data-menu-title="Optical Input" data-enable-with="Beocreate 4-Channel Amplifier, DAC+ DSP">
+<div class="menu-screen source" id="toslink" data-icon="toslink.svg" data-menu-title="Optical Input">
 	
 	<header>
 		<div class="back-button master"></div>
diff --git a/Beocreate2/beo-extensions/toslink/package.json b/Beocreate2/beo-extensions/toslink/package.json
new file mode 100644
index 00000000..d15a23e9
--- /dev/null
+++ b/Beocreate2/beo-extensions/toslink/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "@beocreate/toslink",
+  "version": "0.6.0",
+  "description": "Toslink settings for Beocreate sound systems.",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "github.com/bang-olufsen/create"
+  },
+  "keywords": [
+    "display",
+    "darkmode",
+    "beocreate",
+    "bang",
+    "olufsen"
+  ],
+  "author": "Bang & Olufsen",
+  "license": "MIT",
+  "beocreate": {
+  	"enableWith": ["Beocreate 4-Channel Amplifier", "DAC+ DSP"]
+  }
+}
diff --git a/Beocreate2/beo-system/beo-server.js b/Beocreate2/beo-system/beo-server.js
index 6ceff7a3..b978634e 100644
--- a/Beocreate2/beo-system/beo-server.js
+++ b/Beocreate2/beo-system/beo-server.js
@@ -46,7 +46,8 @@ var defaultSystemConfiguration = {
 	"cardType": "Beocreate 4-Channel Amplifier",
 	"cardFeatures": ["dsp"],
 	"port": 80,
-	"language": "en"
+	"language": "en",
+	"defaultAppearance": "default"
 };
 var systemConfiguration = JSON.parse(JSON.stringify(defaultSystemConfiguration));
 
@@ -275,6 +276,8 @@ if (tempUISettings != null) uiSettings = Object.assign(uiSettings, tempUISetting
 var extensions = {}; // Import Node logic from extensions into this object.
 var extensionsList = {};
 var extensionsLoaded = false;
+var extensionsPath = systemDirectory+"/../beo-extensions";
+var userExtensionsPath = dataDirectory+"/beo-extensions";
 
 var expressServer = express(); // Create Express instance.
 
@@ -298,13 +301,13 @@ global.beo = {
 	daemon: daemonMode,
 	sendToUI: sendToUI,
 	download: download,
-	downloadJSON: downloadJSON,
 	addDownloadRoute: addDownloadRoute,
 	removeDownloadRoute: removeDownloadRoute,
 	underscore: _,
 	expressServer: expressServer
 };
-var beoUI = assembleBeoUI();
+loadAllServerExtensions();
+var beoUI = assembleBeoUI(systemConfiguration.defaultAppearance);
 if (beoUI == false) console.log("User interface could not be constructed. 'index.html' is missing.");
 var selectedExtension = null;
 var selectedDeepMenu = null;
@@ -333,13 +336,16 @@ expressServer.use("/product-images", express.static(systemDirectory+"/../beo-pro
 expressServer.use("/product-images", express.static(dataDirectory+"/beo-product-images", {etag: etags})); // For user product images.
 expressServer.use("/extensions", express.static(dataDirectory+"/beo-extensions", {etag: etags})); // For user extensions.
 expressServer.use("/extensions", express.static(systemDirectory+"/../beo-extensions", {etag: etags})); // For system extensions.
+expressServer.use("/views", express.static(dataDirectory+"/beo-views", {etag: etags})); // For user appearances.
+expressServer.use("/views", express.static(systemDirectory+"/../beo-views", {etag: etags})); // For system appearances.
+expressServer.use("/misc", express.static(systemDirectory+"/../misc", {etag: etags})); // For other files.
 expressServer.get("/", function (req, res) {
 	// Root requested, serve the complete UI
 	if (beoUI != false) {
 		res.status(200);
 		if (developerMode) {
 			console.log("Developer mode, reloading user interface...");
-			res.send(assembleBeoUI()); // No cache - use in development/debug
+			res.send(assembleBeoUI(systemConfiguration.defaultAppearance)); // No cache - use in development/debug
 	  	} else {
 	  		res.send(beoUI); // Cached version - use this in production
 	  	}
@@ -348,6 +354,18 @@ expressServer.get("/", function (req, res) {
 		//fileServer.serveFile('./common/ui-error.html', 500, {}, request, response);
 	}
 });
+expressServer.get("/view/:appearance", function (req, res) {
+	// Serve an alternate appearance.
+	if (debugMode) console.log("Loading user interface for appearance '"+req.params.appearance+"'...");
+	ui = loadAppearance(req.params.appearance);
+	if (ui) {
+		res.status(200);
+		res.send(ui);
+	} else {
+		res.status(404);
+		res.sendFile(systemDirectory+"/common/appearance-not-found.html");
+	}
+});
 // REST API endpoint to talk to extensions.
 expressServer.use(express.json());
 expressServer.post("/:extension/:header/:extra*?", function (req, res) {
@@ -455,17 +473,24 @@ if (!quietMode) {
 
 if (!fs.existsSync(dataDirectory+"/beo-extensions")) fs.mkdirSync(dataDirectory+"/beo-extensions");
 
-function assembleBeoUI() {
-	extensionsPath = systemDirectory+"/../beo-extensions";
-	userExtensionsPath = dataDirectory+"/beo-extensions";
+function assembleBeoUI(appearance = "default") {
+	
 	menus = [];
 	masterList = {};
+
+	if (fs.existsSync(dataDirectory+"/beo-views/"+appearance)) {
+		appearancePath = dataDirectory+"/beo-views/"+appearance;
+	} else if (fs.existsSync(systemDirectory+"/../beo-views/"+appearance)) {
+		appearancePath = systemDirectory+"/../beo-views/"+appearance;
+	} else {
+		return false;
+	}
 	
 	if (fs.existsSync(extensionsPath)) {
 		extensionsNames = fs.readdirSync(extensionsPath);
 		for (var i = 0; i < extensionsNames.length; i++) {
 			if (extensionsNames[i].charAt(0) != ".") {
-				masterList[extensionsNames[i]] = {path: extensionsPath+"/"+extensionsNames[i], basePath: extensionsPath};
+				masterList[extensionsNames[i]] = {userExtension: false, basePath: extensionsPath};
 			}
 		}
 	}
@@ -475,38 +500,24 @@ function assembleBeoUI() {
 		for (var i = 0; i < extensionsNames.length; i++) {
 			if (extensionsNames[i].charAt(0) != ".") {
 				if (!masterList[extensionsNames[i]] || systemConfiguration.preferUserExtensions) {
-					if (masterList[extensionsNames[i]]) {
-						if (debugMode) console.log("Loading user extension '"+extensionsNames[i]+"' instead of equivalent system extension.")
-					}
 					// If user extensions are preferred, extensions in the user directory will replace system extensions with the same name.
-					masterList[extensionsNames[i]] = {path: userExtensionsPath+"/"+extensionsNames[i], basePath: userExtensionsPath};
+					masterList[extensionsNames[i]] = {userExtension: true, basePath: userExtensionsPath};
 				}
 			}
 		}
 	}
 	
-	if (systemConfiguration.enabledExtensions && systemConfiguration.enabledExtensions.length > 0) {
-		for (extension in masterList) {
-			if (enabledExtensions.indexOf(extension) == -1) {
-				delete masterList[extension];
-				if (debugMode) console.log("Extension '"+extension+"' is listed to be loaded, excluding unlisted extensions.");
-			}
-		}
-	} else if (systemConfiguration.disabledExtensions && systemConfiguration.disabledExtensions.length > 0) {
-		for (extension in masterList) {
-			if (disabledExtensions.indexOf(extension) == -1) {
-				delete masterList[extension];
-				if (debugMode) console.log("Extension '"+extensionsNames[e]+"' is disabled and won't be loaded.");
-			}
-		}
-	}
 		
 	if (Object.keys(masterList).length > 0) {
 		
-		if (fs.existsSync(__dirname+'/navigation.txt')) {
-			navigationItems = fs.readFileSync(__dirname+'/navigation.txt', "utf8").split("\n");
-		} else {
+		try {
+			manifest = require(appearancePath+'/manifest.json');
+			navigationItems = manifest.navigation;
+			menuName = manifest.extensionMarkupFileName;
+		} catch (error) {
+			manifest = {};
 			navigationItems = [];
+			menuName = "menu";
 		}
 		
 		allExtensions = {};
@@ -514,13 +525,13 @@ function assembleBeoUI() {
 		scripts = [];
 		translations = {};
 		
-		for (var i = 0; i < navigationItems.length; i++) {
+		for (i in navigationItems) {
 			// Add top-level navigation to the menu structure.
-			if (navigationItems[i].trim() != "-") {
+			if (navigationItems[i].kind != "separator") {
 				// Navigation item.
-				if (masterList[navigationItems[i]]) {
+				if (masterList[navigationItems[i].name]) {
 					// Check that this extension exists.
-					menuStructure.push({kind: "menu", menu: navigationItems[i], submenus: []});
+					menuStructure.push({kind: "menu", menu: navigationItems[i].name, submenus: []});
 				}
 			} else {
 				// Separator.
@@ -530,11 +541,11 @@ function assembleBeoUI() {
 		
 		// Load all extensions.
 		for (extensionName in masterList) {
-			extension = loadExtensionWithPath(extensionName, masterList[extensionName].path, "extensions");
+			extension = loadExtensionWithPath(1, extensionName, masterList[extensionName].userExtension, menuName, "extensions");
 			if (extension != null) {
 				allExtensions[extensionName] = extension;
 			} else {
-				for (var i = 0; i < menuStructure.length; i++) {
+				for (i in menuStructure) {
 					if (menuStructure[i].menu == extensionName) {
 						menuStructure.splice(i, 1);
 						break;
@@ -634,14 +645,14 @@ function assembleBeoUI() {
 		
 		extensionsLoaded = true;
 	} else {
-		menus.push("<script>\n\n// NO EXTENSIONS\n\n beo.notify({title: 'Extensions folder missing', message: 'If you did not deliberately disable extensions, contact Bang & Olufsen Create support team.', id: 'noExtensions'});\nnoExtensions = true;\n\n</script>");
+		menus.push("<script>\n\n// NO EXTENSIONS\n\n if (beo && beo.notify) beo.notify({title: 'Extensions folder missing', message: 'If you did not deliberately disable extensions, contact Bang & Olufsen Create support.', id: 'noExtensions'});\nnoExtensions = true;\n\n</script>");
 		translations = "";
-		scripts = "";
+		scripts = [];
 	}
 	
-	if (fs.existsSync(__dirname+'/common/index.html')) {
+	if (fs.existsSync(appearancePath+'/index.html')) {
 		bodyClass = (systemConfiguration.cardType && systemConfiguration.cardType.indexOf("Beocreate") == -1) ? '<body class="hifiberry-os ' : '<body class="';
-		completeUI = fs.readFileSync(systemDirectory+'/common/index.html', "utf8").replace("<html>", '<html lang="'+systemConfiguration.language+'">').replace('<body class="', bodyClass).replace("</beo-dynamic-ui>", "").replace("<beo-dynamic-ui>", menus.join("\n\n")).replace("</beo-translations>", "").replace("<beo-translations>", translations).replace("</beo-scripts>", "").replace("<beo-scripts>", scripts.join("\n"));
+		completeUI = fs.readFileSync(appearancePath+'/index.html', "utf8").replace("<html>", '<html lang="'+systemConfiguration.language+'">').replace('<body class="', bodyClass).replace("</beo-dynamic-ui>", "").replace("<beo-dynamic-ui>", menus.join("\n\n")).replace("</beo-translations>", "").replace("<beo-translations>", translations).replace("</beo-scripts>", "").replace("<beo-scripts>", scripts.join("\n"));
 		
 		
 		return completeUI;
@@ -658,22 +669,57 @@ function findMenuPlacement(inNames, forName) {
 	return inNames.indexOf(forName);
 }
 
+function loadAllServerExtensions() {
+	
+	menuName = "menu";
+		
+	masterList = {};
+	
+	if (fs.existsSync(extensionsPath)) {
+		extensionsNames = fs.readdirSync(extensionsPath);
+		for (var i = 0; i < extensionsNames.length; i++) {
+			if (extensionsNames[i].charAt(0) != ".") {
+				masterList[extensionsNames[i]] = {userExtension: false, basePath: extensionsPath};
+			}
+		}
+	}
+	
+	if (fs.existsSync(userExtensionsPath)) {
+		extensionsNames = fs.readdirSync(userExtensionsPath);
+		for (var i = 0; i < extensionsNames.length; i++) {
+			if (extensionsNames[i].charAt(0) != ".") {
+				if (!masterList[extensionsNames[i]] || systemConfiguration.preferUserExtensions) {
+					if (masterList[extensionsNames[i]]) {
+						if (debugMode) console.log("Loading user extension '"+extensionsNames[i]+"' instead of equivalent system extension.");
+					}
+					// If user extensions are preferred, extensions in the user directory will replace system extensions with the same name.
+					masterList[extensionsNames[i]] = {userExtension: true, basePath: userExtensionsPath};
+				}
+			}
+		}
+	}
+	
+	// Load all extensions.
+	for (extensionName in masterList) {
+		loadExtensionWithPath(0, extensionName, masterList[extensionName].userExtension, menuName, "extensions");
+	}
+}
 
-function loadExtensionWithPath(extensionName, fullPath, basePath) {
+
+function loadExtensionWithPath(mode, extensionName, userExtension, menuName, basePath) {
+	
+	// Mode 0: Load only server-side code.
+	// Mode 1: Load UI for this appearance.
+	
+	shouldLoad = shouldLoadExtension(mode, extensionName, userExtension, menuName);
+	
+	if (!shouldLoad) return null;
 	
 	isSource = false;
-	if (fs.existsSync(fullPath) && fs.statSync(fullPath).isDirectory() && fs.existsSync(fullPath+'/menu.html')) { 
-		if (debugMode == 2 && !extensionsLoaded) console.log("Loading extension '"+extensionName+"'...");
-		// A directory is a menu and its menu.html exists.
-		menu = fs.readFileSync(fullPath+'/menu.html', "utf8"); // Read the menu from file.
-		try {
-			packageJSON = require(fullPath+"/package.json");
-		} catch (error) {
-			packageJSON = null;
-		}
-		
-		// First check if this extension is included or excluded with this hardware.
-		
+	
+	extensionsList[extensionName] = {loadedSuccessfully: false, isSource: false, menuTitle: null};
+	if (mode == 1) {
+		menu = fs.readFileSync(shouldLoad.path, "utf8"); // Read the menu from file.
 		menuParts = menu.split("\">\n");
 		if (menuParts[0].indexOf("menu-screen") != -1) {
 			headItems = menuParts[0].substring(5).split(/"\s|"\n/g);
@@ -684,132 +730,304 @@ function loadExtensionWithPath(extensionName, fullPath, basePath) {
 			preHead = menuParts[0]+"\">";
 			menuParts.splice(0, 2);
 		}
-		body = menuParts.join("\">\n");
 		head = {};
 		for (l in headItems) {
 			lineItems = headItems[l].split("=\"");
 			head[lineItems[0].trim()] = lineItems[1];
 		};
 		
+		body = menuParts.join("\">\n");
+		head["data-asset-path"] = basePath+'/'+extensionName; // Add asset path.
+		if (head.class && head.class.indexOf('source') != -1) isSource = true; 
+		body = body.split('€/').join(basePath+'/'+extensionName+'/'); // Replace the special character in src with the correct asset path
+		
 		
-		shouldIncludeExtension = true;
+		context = (head["data-context"]) ? head["data-context"].split("/")[0] : null; // Get menu context (who it wants as a parent menu, if any).
+		sortAs = (head["data-sort-as"]) ? head["data-sort-as"] : null; // Sort this extension with another name?
 		
+		// Load a translation array, if it exists.
+		if (systemConfiguration.language != "en" && fs.existsSync(fullPath+'/translations/'+systemConfiguration.language+'.json')) {
+			translations[menuPath] = JSON.parse(fs.readFileSync(fullPath+'/translations/'+systemConfiguration.language+'.json', "utf8"));
+		}
+		
+		stylesheet = (head["data-stylesheet"]) ? head["data-stylesheet"] : null;
+		
+		// Extract scripts into a separate array.
+		extensionScripts = body.match(/^<script.*/gm);
+		body = body.replace(/^<script.*/gm, "");
+		
+		headString = "<div";
+		for (headItem in head) {
+			headString += " "+headItem+'="'+head[headItem]+'"';
+		}
+		headString += ">";
+		menu = ([preHead, headString, body]).join("\n");
+		if (head['data-menu-title']) extensionsList[extensionName].menuTitle = head["data-menu-title"];
+		extensionsList[extensionName].isSource = isSource;
+	}
+	// Load the Node code for this extension.
+	if (mode == 0) {
+		try {
+			extensions[extensionName] = require(fullPath);
+			extensionsList[extensionName].loadedSuccessfully = true;
+			extensionLoadedSuccessfully = true;
+		}
+		catch (error) {
+			console.error("Error loading extension '"+extensionName+"':", error);
+			extensionLoadedSuccesfully = false;
+		}
+		
+	}
+	
+	if (mode == 1) {
+		return {menu: menu, scripts: extensionScripts, context: context, stylesheet: stylesheet, sortAs: sortAs, isSource: isSource};
+	} else {
+		return extensionLoadedSuccessfully;
+	}
 	
+}
+
+
+function shouldLoadExtension(mode, extensionName, userExtension, menuName = null) {
+	
+	// Mode 0: Load check for server-side code.
+	// Mode 1: Check for UI existence.
+	
+	if (menuName == null) menuName = "menu";
+	excludedBySystemConfig = false;
+	
+	if (systemConfiguration.enabledExtensions && systemConfiguration.enabledExtensions.length > 0) {
+		if (systemConfiguration.enabledExtensions.indexOf(extensionName) != -1) {
+			if (debugMode) console.log("Extension '"+extensionName+"' is listed to be loaded, excluding unlisted extensions.");
+		} else {
+			excludedBySystemConfig = true;
+		}
+	} else if (systemConfiguration.disabledExtensions && systemConfiguration.disabledExtensions.length > 0) {
+		if (systemConfiguration.disabledExtensions.indexOf(extensionName) != -1) {
+			if (debugMode) console.log("Extension '"+extensionName+"' is disabled and won't be loaded.");
+			excludedBySystemConfig = true;
+		}
+	}
+	
+	if (excludedBySystemConfig) return false;
+	
+	paths = [
+		(!userExtension) ? extensionsPath+"/"+extensionName : userExtensionsPath+"/"+extensionName,
+		(userExtension) ? extensionsPath+"/"+extensionName : userExtensionsPath+"/"+extensionName
+	];
+	
+	try {
+		packageJSON = require(paths[0]+"/package.json");
+	} catch (error) {
+		try {
+			packageJSON = require(paths[1]+"/package.json");
+		} catch (error) {
+			packageJSON = null;
+		}
+	}
+	
+	// First check if this extension is included or excluded with this product.
+	
+	shouldIncludeExtension = true;
+	
+	if (packageJSON && packageJSON.beocreate) {
+		// Check support/unsupport for card/features from package.json file.
+		if (packageJSON.beocreate.requireCardFeatures && 
+			typeof systemConfiguration.cardFeatures == "object") {
+			shouldIncludeExtension = true;
+			for (f in packageJSON.beocreate.requireCardFeatures) {
+				if (systemConfiguration.cardFeatures.indexOf(packageJSON.beocreate.requireCardFeatures[f]) == -1) shouldIncludeExtension = false;
+			}
+		}
+		if (packageJSON.beocreate.rejectCardFeatures && 
+			shouldIncludeExtension && 
+			typeof systemConfiguration.cardFeatures == "object") {
+			shouldIncludeExtension = true;
+			for (f in packageJSON.beocreate.rejectCardFeatures) {
+				if (systemConfiguration.cardFeatures.indexOf(packageJSON.beocreate.rejectCardFeatures[f]) != -1) shouldIncludeExtension = false;
+			}
+		}
 		
-		if (packageJSON && packageJSON.beocreate) {
-			// Check support/unsupport for card/features from package.json file.
-			if (packageJSON.beocreate.requireCardFeatures && 
-				typeof systemConfiguration.cardFeatures == "object") {
-				shouldIncludeExtension = true;
-				for (f in packageJSON.beocreate.requireCardFeatures) {
-					if (systemConfiguration.cardFeatures.indexOf(packageJSON.beocreate.requireCardFeatures[f]) == -1) shouldIncludeExtension = false;
+		cardType = systemConfiguration.cardType.toLowerCase();
+		if (packageJSON.beocreate.enableWith) {
+			shouldIncludeExtension = false;
+			if (typeof packageJSON.beocreate.enableWith == "string") {
+				if (packageJSON.beocreate.enableWith.toLowerCase() == cardType) shouldIncludeExtension = true;
+			} else {
+				for (c in packageJSON.beocreate.enableWith) {
+					if (packageJSON.beocreate.enableWith[c].toLowerCase() == cardType) shouldIncludeExtension = true;
 				}
 			}
-			if (packageJSON.beocreate.rejectCardFeatures && 
-				shouldIncludeExtension && 
-				typeof systemConfiguration.cardFeatures == "object") {
-				shouldIncludeExtension = true;
-				for (f in packageJSON.beocreate.rejectCardFeatures) {
-					if (systemConfiguration.cardFeatures.indexOf(packageJSON.beocreate.rejectCardFeatures[f]) != -1) shouldIncludeExtension = false;
+		} else if (packageJSON.beocreate.disableWith) {
+			shouldIncludeExtension = true;
+			if (typeof packageJSON.beocreate.disableWith == "string") {
+				if (packageJSON.beocreate.disableWith.toLowerCase() == cardType) shouldIncludeExtension = false;
+			} else {
+				for (c in packageJSON.beocreate.disableWith) {
+					if (packageJSON.beocreate.disableWith[c].toLowerCase() == cardType) shouldIncludeExtension = false;
 				}
 			}
-			
-			cardType = systemConfiguration.cardType.toLowerCase();
-			if (packageJSON.beocreate.enableWith) {
-				shouldIncludeExtension = false;
-				if (typeof packageJSON.beocreate.enableWith == "string") {
-					if (packageJSON.beocreate.enableWith.toLowerCase() == cardType) shouldIncludeExtension = true;
-				} else {
-					for (c in packageJSON.beocreate.enableWith) {
-						if (packageJSON.beocreate.enableWith[c].toLowerCase() == cardType) shouldIncludeExtension = true;
-					}
+		}
+	}
+	
+	if (!shouldIncludeExtension) return false;
+	
+	
+	if (mode == 0) {
+		fullPath = paths[0];
+		try {
+			require.resolve(fullPath);
+		}
+		catch (error) {
+			fullPath = paths[1];
+			try {
+				require.resolve(fullPath);
+			}
+			catch (error) {
+				if (debugMode > 2) {
+					console.error("Extension '"+extensionName+"' has no server-side code:", error);
+				} else if (debugMode) {
+					console.log("Extension '"+extensionName+"' has no server-side code.");
 				}
-			} else if (packageJSON.beocreate.disableWith) {
-				shouldIncludeExtension = true;
-				if (typeof packageJSON.beocreate.disableWith == "string") {
-					if (packageJSON.beocreate.disableWith.toLowerCase() == cardType) shouldIncludeExtension = false;
-				} else {
-					for (c in packageJSON.beocreate.disableWith) {
-						if (packageJSON.beocreate.disableWith[c].toLowerCase() == cardType) shouldIncludeExtension = false;
+				return false;
+			}
+		}
+	} 
+	if (mode == 1) {
+		extensionExists = false;
+		
+		for (p in paths) {
+			if (!extensionExists) {
+				fullPath = paths[p];
+				if (fs.existsSync(fullPath) && 
+					fs.statSync(fullPath).isDirectory()) { 
+					if (menuName.charAt(0) != "*") {
+						if (fs.existsSync(fullPath+'/'+menuName+'.html')){
+							extensionExists = true;
+							menuName += ".html";
+						}
+					} else {
+						// Wildcard matching.
+						files = fs.readdirSync(fullPath).filter(fn => fn.endsWith(menuName.substring(1)+".html"));
+						if (files.length == 1) {
+							menuName = files[0];
+							extensionExists = true;
+						}
 					}
 				}
 			}
-		} else if (head["data-enable-with"] || head["data-disable-with"]) {
-			shouldIncludeExtension = false;
-			cardType = systemConfiguration.cardType.toLowerCase();
-			if (head["data-enable-with"]) {
-				if (head["data-enable-with"].toLowerCase().split(", ").indexOf(cardType) != -1) 
-					shouldIncludeExtension = true;
-			} else if (head["data-disable-with"]) {
-				if (head["data-disable-with"].toLowerCase().split(", ").indexOf(cardType) == -1) 
-					shouldIncludeExtension = true;
+		}
+		if (!extensionExists) return false;
+	}
+	
+	
+	if (packageJSON) {
+		return {packageJSON: packageJSON, path: fullPath+"/"+menuName, directory: fullPath};
+	} else {
+		return {packageJSON: null, path: fullPath+"/"+menuName};
+	}
+	
+}
+
+
+// The new method to load UI. Not (yet?) used for the standard Beocreate 2 UI.
+function loadAppearance(appearance) {
+
+	if (fs.existsSync(dataDirectory+"/beo-views/"+appearance)) {
+		appearancePath = dataDirectory+"/beo-views/"+appearance;
+	} else if (fs.existsSync(systemDirectory+"/../beo-views/"+appearance)) {
+		appearancePath = systemDirectory+"/../beo-views/"+appearance;
+	} else {
+		return false;
+	}
+	
+	masterList = [];
+	// Check if some extensions are excluded or exlusively included.
+	if (fs.existsSync(extensionsPath)) {
+		extensionsNames = fs.readdirSync(extensionsPath);
+		for (var i = 0; i < extensionsNames.length; i++) {
+			if (extensionsNames[i].charAt(0) != ".") {
+				masterList[extensionsNames[i]] = {userExtension: false};
 			}
 		}
+	}
+	
+	if (fs.existsSync(userExtensionsPath)) {
+		extensionsNames = fs.readdirSync(userExtensionsPath);
+		for (var i = 0; i < extensionsNames.length; i++) {
+			if (extensionsNames[i].charAt(0) != ".") {
+				if (!masterList[extensionsNames[i]] || systemConfiguration.preferUserExtensions) {
+					// If user extensions are preferred, extensions in the user directory will replace system extensions with the same name.
+					masterList[extensionsNames[i]] = {userExtension: true};
+				}
+			}
+		}
+	}
+	
+	menus = [];
+	scripts = [];
+	stylesheets = [];
+	
+	if (Object.keys(masterList).length > 0) {
 		
+		navigation = [];
+		menuName = "menu";
+		try {
+			manifest = JSON.parse(fs.readFileSync(appearancePath+'/manifest.json', "utf8"));
+			if (manifest.navigation) navigation = manifest.navigation;
+			if (manifest.extensionMarkupFileName) menuName = manifest.extensionMarkupFileName;
+		} catch (error) {
+			console.error("Error loading manifest.json for appearance '"+appearance+"':",error);
+			manifest = {};
+		}
 		
-		
-		if (shouldIncludeExtension) {
-			head["data-asset-path"] = basePath+'/'+extensionName; // Add asset path.
-			if (head.class.indexOf('source') != -1) isSource = true; 
-			body = body.split('€/').join(basePath+'/'+extensionName+'/'); // Replace the special character in src with the correct asset path
-			
-			
-			context = (head["data-context"] != null) ? head["data-context"].split("/")[0] : null; // Get menu context (who it wants as a parent menu, if any).
-			
-			sortAs = (head["data-sort-as"] != null) ? head["data-sort-as"] : null; // Sort this extension with another name?
-			
-			// Load a translation array, if it exists.
-			if (systemConfiguration.language != "en" && fs.existsSync(fullPath+'/translations/'+systemConfiguration.language+'.json')) {
-				translations[menuPath] = JSON.parse(fs.readFileSync(fullPath+'/translations/'+systemConfiguration.language+'.json', "utf8"));
-			}
-			
-			// Load the Node code for this extension
-			extensionLoadedSuccesfully = false;
-			if (!extensionsLoaded) {
-				try {
-					require.resolve(fullPath);
-					try {
-						extensions[extensionName] = require(fullPath);
-						extensionLoadedSuccesfully = true;
-					}
-					catch (error) {
-						console.error("Error loading extension '"+extensionName+"':", error);
-						extensionLoadedSuccesfully = false;
+		// Load the markup for all extensions.
+		for (extensionName in masterList) {
+			shouldLoad = shouldLoadExtension(1, extensionName, masterList[extensionName].userExtension, menuName);
+			if (shouldLoad) {
+				menus.push(fs.readFileSync(shouldLoad.path, "utf8")); // Read the menu from file.
+				// Read scripts and stylesheets.
+				if (manifest.extensionScriptFileName || manifest.extensionStylesheetFileName) {
+					files = fs.readdirSync(shouldLoad.directory);
+					if (manifest.extensionScriptFileName.charAt(0) != "*") {
+						i = files.indexOf(manifest.extensionScriptFileName+".js");
+						if (i != -1) scripts.push("/extensions/"+extensionName+"/"+files.i);
+					} else {
+						filtered = files.filter(fn => fn.endsWith(manifest.extensionScriptFileName.substring(1)+".js"));
+						if (filtered.length == 1) scripts.push("/extensions/"+extensionName+"/"+filtered[0]);
 					}
-				}
-				catch (error) {
-					if (debugMode > 2) {
-						console.error("Extension '"+extensionName+"' has no server-side code:", error);
-					} else if (debugMode) {
-						console.log("Extension '"+extensionName+"' has no server-side code.");
+					if (manifest.extensionStylesheetFileName.charAt(0) != "*") {
+						i = files.indexOf(manifest.extensionStylesheetFileName+".css");
+						if (i != -1) stylesheets.push("/extensions/"+extensionName+"/"+files.i);
+					} else {
+						filtered = files.filter(fn => fn.endsWith(manifest.extensionStylesheetFileName.substring(1)+".css"));
+						if (filtered.length == 1) stylesheets.push("/extensions/"+extensionName+"/"+filtered[0]);
 					}
-					extensionLoadedSuccesfully = true;
 				}
 			}
-			if (!extensionsLoaded) extensionsList[extensionName] = ({isSource: isSource, loadedSuccesfully: extensionLoadedSuccesfully, menuTitle: head["data-menu-title"]});
-			
-			
-			// Extract scripts into a separate array
-			extensionScripts = body.match(/^<script.*/gm);
-			body = body.replace(/^<script.*/gm, "");
-			
-			headString = "<div";
-			for (headItem in head) {
-				headString += " "+headItem+'="'+head[headItem]+'"';
-			}
-			headString += ">";
-			menu = ([preHead, headString, body]).join("\n");
-			return {menu: menu, scripts: extensionScripts, context: context, sortAs: sortAs, isSource: isSource};
-		} else {
-			return null;
 		}
-	} else {
-		console.error("'"+extensionName+"' is not a Beocreate 2 extension. Skipping.");
-		return null;
 	}
 	
-	
-	
+	// Read appearance from disk.
+	if (fs.existsSync(appearancePath+'/index.html')) {
+		
+		stylesheetMarkup = "";
+		for (s in stylesheets) {
+			stylesheetMarkup += '<link rel="stylesheet" href="'+stylesheets[s]+'">\n';
+		}
+		
+		scriptMarkup = "";
+		for (s in scripts) {
+			scriptMarkup += '<script type="text/javascript" charset="utf-8" src="'+scripts[s]+'"></script>\n';
+		}
+		
+		bodyClass = (systemConfiguration.cardType && systemConfiguration.cardType.indexOf("Beocreate") == -1) ? '<body class="hifiberry-os ' : '<body class=" ';
+		completeUI = fs.readFileSync(appearancePath+'/index.html', "utf8").replace("<html>", '<html lang="'+systemConfiguration.language+'">').replace('<body class="', bodyClass).replace("</beo-dynamic-ui>", "").replace("<beo-dynamic-ui>", menus.join("\n\n")).replace("</beo-styles>", "").replace("<beo-styles>", stylesheetMarkup).replace("<beo-scripts>", "<script>navigation = "+JSON.stringify(navigation)+";\ndebug = "+debugMode+";\ndeveloperMode = "+(developerMode)+";</script>\n").replace("</beo-scripts>", scriptMarkup);
+		
+		return completeUI;
+	} else {
+		return false;
+	}
 	
 }
 
@@ -845,6 +1063,10 @@ beoCom.on("data", function(data, connection) {
 				eventHeader = "activatedExtension";
 				eventContent = {extension: data.content.extension, deepMenu: data.content.deepMenu};
 			}
+			if (data.header == "reload") {
+				content = (data.content) ? data.content : null;
+				sendToUI("general", "reload", data.content);
+			}
 			break;
 		case "test":
 		
@@ -890,83 +1112,50 @@ function playProductSound(sound) {
 // General-purpose download and upload functions available to extensions.
 
 // Modified from https://stackoverflow.com/questions/11944932/how-to-download-a-file-with-node-js-without-using-third-party-libraries
-function download(url, destination, destinationFilename, callback) {
-	if (url) {
-		filename = url.substring(url.lastIndexOf('/') + 1);
-		if (destinationFilename) filename = destinationFilename;
-		if (debugMode) console.log("Downloading '"+filename+"' to '"+destination+"'...");
-		if (destination.charAt(destination.length-1) == "/") destination = destination.slice(0, -1);
-		var file = fs.createWriteStream(destination+"/"+filename);
-		protocol = null;
-		if (url.indexOf("https") != -1) {
-			protocol = https;
-		} else if (url.indexOf("http") != -1) {
-			protocol = http;
-		}
-		if (protocol) {
-			var request = protocol.get(url, function(response) {
-				response.pipe(file);
-				file.on('finish', function() {
-					if (debugMode) console.log("Download of '"+filename+"' complete.");
-					file.close(function(err) {
-						if (!err) {
-							if (callback) callback(true);
-						} else {
-							if (callback) callback(null, err);
-						}
-					});
+function download(url, destination, filename = null) {
+	return new Promise(function(resolve, reject) {
+		if (url) {
+			if (!filename) filename = url.substring(url.lastIndexOf('/') + 1);
+			protocol = null;
+			if (url.indexOf("https") != -1) {
+				protocol = https;
+			} else if (url.indexOf("http") != -1) {
+				protocol = http;
+			}
+			if (protocol) {
+				var request = protocol.get(url, function(response) {
+					if (response.statusCode == 200) {
+						var file = fs.createWriteStream(destination+"/"+filename);
+						response.pipe(file);
+						file.on('finish', function() {
+							file.close(function(err) {
+								if (!err) {
+									resolve(destination+"/"+filename);
+								} else {
+									fs.unlink(destination+"/"+filename); // Delete the file asynchronously.
+									reject(err);
+								}
+							});
+						});
+					} else {
+						error = new Error("Error in downloading file. Server response was "+response.statusCode+".");
+						console.error(error);
+						reject(error);
+					}
+				}).on('error', function(error) { // Handle errors.
+					console.error("Error in downloading file:", error);
+					fs.unlink(destination+"/"+filename); // Delete the file asynchronously.
+					reject(error);
 				});
-			}).on('error', function(error) { // Handle errors
-				//console.log(err)
-				if (debugMode) console.log("Download of '"+filename+"' failed.");
-				fs.unlink(destination+"/"+filename); // Delete the file async. (But we don't check the result)
-				if (callback) callback(error.message);
-			});
+			} else {
+				reject("The URL has no valid protocol.");
+			}
+		} else {
+			reject("No URL specified for download.");
 		}
-	} else {
-		if (debugMode) console.log("No URL specified for download.")
-	}
+	});
 }
 
-// Adapted from https://usefulangle.com/post/109/nodejs-read-json
-function downloadJSON(url, callback) {
-	protocol = null;
-	if (url.indexOf("https") != -1) {
-		protocol = https;
-	} else if (url.indexOf("http") != -1) {
-		protocol = http;
-	}
-	if (protocol) {
-		var request = protocol.get(url, function(response) {
-			var data = '';
-			var jsonData;
-			
-			response.on('data', function(stream) {
-				data += stream;
-			});
-			response.on('end', function() {
-				err = null;
-				try {
-					jsonData = JSON.parse(data);
-					//if (callback) callback(jsonData);
-				} catch (error) {
-					err = error;
-					//if (callback) callback(null, error);
-				}
-				if (!err) {
-					if (callback) callback(jsonData);
-				} else {
-					if (callback) callback(null, err);
-				}
-			});
-		}).on('error', function(error) { // Handle errors
-			if (debugMode) console.log("Download of '"+url+"' failed.");
-			if (callback) callback(null, error.message);
-		});
-	} else {
-		if (callback) callback(null, false);
-	}
-}
 
 
 // SERVER SHUTDOWN
diff --git a/Beocreate2/beo-system/common/appearance-not-found.html b/Beocreate2/beo-system/common/appearance-not-found.html
new file mode 100644
index 00000000..0a8cebf7
--- /dev/null
+++ b/Beocreate2/beo-system/common/appearance-not-found.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="utf-8">
+	
+	<title>Appearance not found</title>
+	<link rel="stylesheet" href="/views/default/beostyle2018.css">
+</head>
+<body>
+	<div class="menu-screen visible block">
+		<header>
+			
+		</header>
+		<div class="scroll-area">
+			<div class="menu-content">
+				<h1>Appearance not found</h1>
+				<p>The requested view was not available on this product. Verify that the view is included on the file system and that the address is correct.</p>
+				<a class="button pill black" href="/">Back to Default View</a>
+			</div>
+		</div>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/Beocreate2/beo-system/common/scripts/beo-comms-new.js b/Beocreate2/beo-system/common/scripts/beo-comms-new.js
new file mode 100644
index 00000000..8f4e5b38
--- /dev/null
+++ b/Beocreate2/beo-system/common/scripts/beo-comms-new.js
@@ -0,0 +1,165 @@
+/*Copyright 2020 Bang & Olufsen A/S
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.*/
+
+var simulation = false;
+
+var productConnection;
+var productAddress = "";
+var connecting = false;
+var connected = false;
+var connectionAttempts = 0;
+var maxConnectionAttempts = 5;
+var noConnectionNotifications = false;
+var reloadOnReconnect = false;
+
+beoCom = (function() {
+
+var productConnectionTimeout;
+var productReconnectTimeout;
+
+var productConnectionNotificationTimeout = null;
+
+
+function connectToCurrentProduct() {
+	// Although the UI markup and assets are served over HTTP directly from the product, WebSocket protocol is then used for realtime communication between the UI and the product.
+	productAddress = window.location.host;
+	//if (productAddress.indexOf(":") == -1) productAddress += ":80";
+	if (!simulation && productAddress) connectProduct();
+	//beo.notify(false, "connection");
+}
+
+function connectProduct() {
+	
+	if (connected) productConnection.close();
+	
+	connected = false;
+	connecting = true;
+	
+	if (window.location.protocol.indexOf("https") != -1) {
+		// Use secure websockets:
+		wsProtocol = "wss://";
+	} else {
+		// Use unencrypted websockets:
+		wsProtocol = "ws://";
+	}
+	
+	console.log("Connecting to " + productAddress + "...");
+	productConnection = new WebSocket(wsProtocol + productAddress, ["beocreate"]);
+	
+	productConnectionNotificationTimeout = setTimeout(function() {
+		// Show "Connecting..." with a timeout so that it doesn't flash every time the UI loads.
+		if (!noConnectionNotifications && beo.notify) beo.notify({title: "Connecting...", icon: "attention", timeout: false, id: "connection"});
+	}, 1000);
+	document.dispatchEvent(new CustomEvent("general", {detail: {content: {status: "connecting"}, header: "connection"}}));
+	if (beo.sendToProductView) beo.sendToProductView({header: "connection", content: {status: "connecting"}});
+	
+	productConnectionTimeout = setTimeout(function() {
+		productConnection.close();
+	}, 5000);
+	
+	// CONNECTED
+	productConnection.onopen = function() {
+		connected = true;
+		connecting = false;
+		connectionAttempts = 0;
+		maxConnectionAttempts = 5; // Reset this to 5 at reconnect.
+		
+		clearTimeout(productConnectionTimeout);
+		clearTimeout(productConnectionNotificationTimeout);
+		console.log("Succesfully connected to " + productAddress + ".");
+		document.body.classList.add("connected");
+		document.body.classList.remove("disconnected", "connecting");
+		if (beo.notify) beo.notify(false, "connection");
+		noConnectionNotifications = false;
+		document.dispatchEvent(new CustomEvent("general", {detail: {content: {status: "connected"}, header: "connection"}}));
+		if (beo.sendToProductView) beo.sendToProductView({header: "connection", content: {status: "connected"}});
+		//if (!stateRestored) beo.restoreState();
+		if (reloadOnReconnect) window.location.reload();
+	};
+	
+	// DISCONNECTED
+	productConnection.onclose = function() {
+		document.dispatchEvent(new CustomEvent("general", {detail: {content: {status: "disconnected"}, header: "connection"}}));
+		if (connected) {
+			connected = false;
+			console.log("Disconnected from " + productAddress + ", reconnecting...");
+			if (beo.sendToProductView) beo.sendToProductView({header: "connection", content: {status: "disconnected", reconnecting: true}});
+			document.body.classList.add("connecting");
+			document.body.classList.remove("disconnected", "connected");
+			connectProduct();
+		} else {
+			if (connectionAttempts < maxConnectionAttempts) {
+				connectionAttempts++;
+				productReconnectTimeout = setTimeout(function() {
+					connectProduct();
+				}, 5000);
+				console.log("No response from " + productAddress + ", trying again in a moment...");
+			} else {
+				console.log("Stopping attempts to connect to " + productAddress + ".");
+				clearTimeout(productConnectionNotificationTimeout);
+				document.body.classList.add("disconnected");
+				document.body.classList.remove("disconnected", "connected");
+				if (beo.sendToProductView) beo.sendToProductView({header: "connection", content: {status: "disconnected", reconnecting: false}});
+				if (maxConnectionAttempts > 0 && !noConnectionNotifications && beo.notify) beo.notify({title: "Product is unreachable", message: "Make sure the product is on and that the product and your "+os[1]+" are connected to the same network.", buttonAction: "beoCom.connectToCurrentProduct();", buttonTitle: "Try Again", id: "connection", timeout: false});
+				clearTimeout(productConnectionTimeout);
+				connectionAttempts = 0;
+				connecting = false;
+			}
+		}
+	};
+	
+	// RECEIVING A MESSAGE
+	productConnection.onmessage = function(message) {
+		if (message != "reload") {
+			processReceivedData(JSON.parse(message.data));
+		} else {
+			window.location.reload(); // Remote reload function.
+		}
+	};
+}
+
+
+function processReceivedData(data) {
+	if (debug) console.log(data);
+	if (data.target && data.header && data.content) {
+		document.dispatchEvent(new CustomEvent(data.target, {detail: {content: data.content, header: data.header}}));
+		if (data.target == "general" && data.header == "reload" && beo.appearance) {
+			if (data.content == beo.appearance) window.location.reload();
+		}
+	} else if (data.target && data.header) {
+		document.dispatchEvent(new CustomEvent(data.target, {detail: {header: data.header}}));
+		if (data.target == "general" && data.header == "reload") window.location.reload();
+	}
+}
+
+
+function sendToProduct(target, header, content = undefined) {
+	if (productConnection && connected) {
+		productConnection.send(JSON.stringify({target: target, header: header, content: content}));
+	} else if (simulation) {
+		console.log("Simulated send of data:"+{target: target, header: header, content: content});
+	} else {
+		return "Product is not connected, could not send data.";
+	}
+}
+
+return {
+	connectToCurrentProduct: connectToCurrentProduct,
+	sendToProduct: sendToProduct
+}
+
+})();
diff --git a/Beocreate2/beo-system/common/scripts/beo-comms.js b/Beocreate2/beo-system/common/scripts/beo-comms.js
index 8c56bf09..67c78e9c 100644
--- a/Beocreate2/beo-system/common/scripts/beo-comms.js
+++ b/Beocreate2/beo-system/common/scripts/beo-comms.js
@@ -38,7 +38,7 @@ function connectToCurrentProduct() {
 	// Although the UI markup and assets are served over HTTP directly from the product, WebSocket protocol is then used for realtime communication between the UI and the product.
 	productAddress = window.location.host;
 	//if (productAddress.indexOf(":") == -1) productAddress += ":80";
-	if (!simulation && noExtensions == false && productAddress) connectProduct();
+	if (!simulation && productAddress) connectProduct();
 	//beo.notify(false, "connection");
 }
 
@@ -62,10 +62,10 @@ function connectProduct() {
 	
 	productConnectionNotificationTimeout = setTimeout(function() {
 		// Show "Connecting..." with a timeout so that it doesn't flash every time the UI loads.
-		if (!noConnectionNotifications) beo.notify({title: "Connecting...", icon: "attention", timeout: false, id: "connection"});
+		if (!noConnectionNotifications && beo.notify) beo.notify({title: "Connecting...", icon: "attention", timeout: false, id: "connection"});
 	}, 1000);
 	$(document).trigger("general", {header: "connection", content: {status: "connecting"}});
-	beo.sendToProductView({header: "connection", content: {status: "connecting"}});
+	if (beo.sendToProductView) beo.sendToProductView({header: "connection", content: {status: "connecting"}});
 	
 	productConnectionTimeout = setTimeout(function() {
 		productConnection.close();
@@ -81,11 +81,13 @@ function connectProduct() {
 		clearTimeout(productConnectionTimeout);
 		clearTimeout(productConnectionNotificationTimeout);
 		console.log("Succesfully connected to " + productAddress + ".");
-		$("body").addClass("connected").removeClass("disconnected connecting");
-		beo.notify(false, "connection");
+		//$("body").addClass("connected").removeClass("disconnected connecting");
+		document.body.classList.add("connected");
+		document.body.classList.remove("disconnected", "connecting");
+		if (beo.notify) beo.notify(false, "connection");
 		noConnectionNotifications = false;
 		$(document).trigger("general", {header: "connection", content: {status: "connected"}});
-		beo.sendToProductView({header: "connection", content: {status: "connected"}});
+		if (beo.sendToProductView) beo.sendToProductView({header: "connection", content: {status: "connected"}});
 		//if (!stateRestored) beo.restoreState();
 		if (reloadOnReconnect) window.location.reload();
 	};
@@ -96,8 +98,10 @@ function connectProduct() {
 		if (connected) {
 			connected = false;
 			console.log("Disconnected from " + productAddress + ", reconnecting...");
-			beo.sendToProductView({header: "connection", content: {status: "disconnected", reconnecting: true}});
-			$("body").addClass("connecting").removeClass("connected disconnected");
+			if (beo.sendToProductView) beo.sendToProductView({header: "connection", content: {status: "disconnected", reconnecting: true}});
+			//$("body").addClass("connecting").removeClass("connected disconnected");
+			document.body.classList.add("connecting");
+			document.body.classList.remove("disconnected", "connected");
 			connectProduct();
 		} else {
 			if (connectionAttempts < maxConnectionAttempts) {
@@ -109,9 +113,11 @@ function connectProduct() {
 			} else {
 				console.log("Stopping attempts to connect to " + productAddress + ".");
 				clearTimeout(productConnectionNotificationTimeout);
-				$("body").addClass("disconnected").removeClass("connecting connected");
-				beo.sendToProductView({header: "connection", content: {status: "disconnected", reconnecting: false}});
-				if (maxConnectionAttempts > 0 && !noConnectionNotifications) beo.notify({title: "Product is unreachable", message: "Make sure the product is on and that the product and your "+os[1]+" are connected to the same network.", buttonAction: "beoCom.connectToCurrentProduct();", buttonTitle: "Try Again", id: "connection", timeout: false});
+				//$("body").addClass("disconnected").removeClass("connecting connected");
+				document.body.classList.add("disconnected");
+				document.body.classList.remove("disconnected", "connected");
+				if (beo.sendToProductView) beo.sendToProductView({header: "connection", content: {status: "disconnected", reconnecting: false}});
+				if (maxConnectionAttempts > 0 && !noConnectionNotifications && beo.notify) beo.notify({title: "Product is unreachable", message: "Make sure the product is on and that the product and your "+os[1]+" are connected to the same network.", buttonAction: "beoCom.connectToCurrentProduct();", buttonTitle: "Try Again", id: "connection", timeout: false});
 				clearTimeout(productConnectionTimeout);
 				connectionAttempts = 0;
 				connecting = false;
@@ -121,7 +127,11 @@ function connectProduct() {
 	
 	// RECEIVING A MESSAGE
 	productConnection.onmessage = function(message) {
-		processReceivedData(JSON.parse(message.data));
+		if (message != "reload") {
+			processReceivedData(JSON.parse(message.data));
+		} else {
+			window.location.reload(); // Remote reload function.
+		}
 	};
 }
 
@@ -130,8 +140,12 @@ function processReceivedData(data) {
 	if (debug) console.log(data);
 	if (data.target && data.header && data.content) {
 		$(document).trigger(data.target, {header: data.header, content: data.content});
+		if (data.target == "general" && data.header == "reload" && beo.appearance) {
+			if (data.content == beo.appearance) window.location.reload();
+		}
 	} else if (data.target && data.header) {
 		$(document).trigger(data.target, {header: data.header});
+		if (data.target == "general" && data.header == "reload") window.location.reload();
 	}
 }
 
@@ -140,20 +154,18 @@ function send(data) {
 		productConnection.send(JSON.stringify(data));
 	} else if (simulation) {
 		console.log("Simulated send of data:"+data);
+	} else {
+		return "Product is not connected, could not send data.";
 	}
 }
 
 function sendToProduct(target, header, content = undefined) {
-	if (productConnection && connected) {
-		if (typeof header == "string") {
-			send({target: target, header: header, content: content});
-		} else {
-			// Legacy way of sending data, supported. 'Header' used to be 'data'.
-			header.target = target;
-			send(header);
-		}
+	if (typeof header == "string") {
+		send({target: target, header: header, content: content});
 	} else {
-		return "Product is not connected, could not send data.";
+		// Legacy way of sending data, supported. 'Header' used to be 'data'.
+		header.target = target;
+		send(header);
 	}
 }
 
diff --git a/Beocreate2/beo-system/common/scripts/beo-graph.js b/Beocreate2/beo-system/common/scripts/beo-graph.js
index 3342c883..6e70bcec 100644
--- a/Beocreate2/beo-system/common/scripts/beo-graph.js
+++ b/Beocreate2/beo-system/common/scripts/beo-graph.js
@@ -26,6 +26,7 @@
 		{data: [], show: true, fill: false, lineWidth: 1, offset: 0}
 	];
 	this.pi = Math.PI;
+	this.Fs = 48000;
 	
 	this.palette = [];
 	this.darkPalette = [];
@@ -134,6 +135,9 @@ Beograph.prototype.setOptions = function(options, autoDraw) {
 		this.resolution = options.resolution;
 	}
 	
+	if (options.Fs != undefined) {
+		this.Fs = options.Fs;
+	}
 	
 	function hexToRGB(hex) {
 	    // Expand shorthand form (e.g. "03F") to full form (e.g. "0033FF")
@@ -155,7 +159,6 @@ Beograph.prototype.setOptions = function(options, autoDraw) {
 
 Beograph.prototype.store = function(target, options, autoDraw) {
 	
-	Fs = 48000;
 	points = null;
 	if (options.coefficients) {
 		// Plot these coefficients.
@@ -170,7 +173,7 @@ Beograph.prototype.store = function(target, options, autoDraw) {
 		
 		for (var i = 0; i < this.resolution; i++) {
 			freq = logScale(i / this.resolution, 0.0001, 0.5);
-			z = freq*Fs;
+			z = freq*this.Fs;
 			w = freq * 2 * this.pi;
 			fi = Math.pow(Math.sin(w/2), 2);
 			y = Math.log(Math.pow(b0+b1+b2, 2) - 4 * (b0*b1 + 4*b0*b2 + b1*b2) * fi + 16*b0*b2*fi*fi) - Math.log(Math.pow(1+a1+a2, 2) - 4 * (a1 + 4*a2 + a1*a2)*fi + 16*a2*fi*fi);
diff --git a/Beocreate2/beo-system/common/scripts/swipe.min.js b/Beocreate2/beo-system/common/scripts/swipe.min.js
deleted file mode 100644
index b921d94a..00000000
--- a/Beocreate2/beo-system/common/scripts/swipe.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(t,e){"function"==typeof define&&define.amd?define([],function(){return t.Swipe=e(),t.Swipe}):"object"==typeof module&&module.exports?module.exports=e():t.Swipe=e()}(this,function(){var e,W="object"==typeof self&&self.self===self&&self||"object"==typeof global&&global.global===global&&global||this,Y=W.document;function Swipe(r,a){"use strict";var s,t,u={},l={},c=(a=a||{}).auto||0,e=!1,n=function(){},v=function(t){setTimeout(t||n,0)},i=function(t){return!!t&&("boolean"!=typeof t.cancelable||t.cancelable)},d={addEventListener:!!W.addEventListener,passiveEvents:function(){var e=!1;try{var t=Object.defineProperty({},"passive",{get:function(){e=!0}});W.addEventListener("testEvent",null,t),W.removeEventListener("testEvent",null,t)}catch(t){e=!1}return e}(),touch:"ontouchstart"in W||W.DocumentTouch&&Y instanceof DocumentTouch,transitions:function(t){var e=["transitionProperty","WebkitTransition","MozTransition","OTransition","msTransition"];for(var n in e)if(void 0!==t.style[e[n]])return!0;return!1}(Y.createElement("swipe"))};if(r){var f,h,m,p,E=r.children[0],y=parseInt(a.startSlide,10)||0,b=a.speed||300;a.continuous=void 0===a.continuous||a.continuous;var o,g,T,x=(g="direction",(o=r).currentStyle?T=o.currentStyle[g]:W.getComputedStyle&&(T=W.getComputedStyle(o,null).getPropertyValue(g)),"rtl"===T?"right":"left");a.autoRestart=void 0!==a.autoRestart&&a.autoRestart;var L=function(n,i){i=i||100;var o=null;function s(){o&&clearTimeout(o)}function t(){var t=this,e=arguments;s(),o=setTimeout(function(){o=null,n.apply(t,e)},i)}return t.cancel=s,t}(M),w={handleEvent:function(t){if(!e){switch(t.type){case"mousedown":case"touchstart":this.start(t);break;case"mousemove":case"touchmove":this.move(t);break;case"mouseup":case"mouseleave":case"touchend":this.end(t);break;case"webkitTransitionEnd":case"msTransitionEnd":case"oTransitionEnd":case"otransitionend":case"transitionend":this.transitionEnd(t);break;case"resize":L()}a.stopPropagation&&t.stopPropagation()}},start:function(t){var e;Q(t)?(e=t).preventDefault():e=t.touches[0],u={x:e.pageX,y:e.pageY,time:+new Date},s=void 0,l={},Q(t)?(E.addEventListener("mousemove",this,!1),E.addEventListener("mouseup",this,!1),E.addEventListener("mouseleave",this,!1)):(E.addEventListener("touchmove",this,!!d.passiveEvents&&{passive:!1}),E.addEventListener("touchend",this,!1))},move:function(t){var e;if(Q(t))e=t;else{if(1<t.touches.length||t.scale&&1!==t.scale)return;a.disableScroll&&i(t)&&t.preventDefault(),e=t.touches[0]}l={x:e.pageX-u.x,y:e.pageY-u.y},void 0===s&&(s=!!(s||Math.abs(l.x)<Math.abs(l.y))),s||(i(t)&&t.preventDefault(),N(),a.continuous?(C(j(y-1),l.x+h[j(y-1)],0),C(y,l.x+h[y],0),C(j(y+1),l.x+h[j(y+1)],0)):(l.x=l.x/(!y&&0<l.x||y===f.length-1&&l.x<0?Math.abs(l.x)/m+1:1),C(y-1,l.x+h[y-1],0),C(y,l.x+h[y],0),C(y+1,l.x+h[y+1],0)))},end:function(t){var e=+new Date-u.time,n=Number(e)<250&&20<Math.abs(l.x)||Math.abs(l.x)>m/2,i=!y&&0<l.x||y===f.length-1&&l.x<0;a.continuous&&(i=!1);var o=Math.abs(l.x)/l.x;s||(n&&!i?(y=o<0?(a.continuous?(R(j(y-1),-m,0),R(j(y+2),m,0)):R(y-1,-m,0),R(y,h[y]-m,b),R(j(y+1),h[j(y+1)]-m,b),j(y+1)):(a.continuous?(R(j(y+1),m,0),R(j(y-2),-m,0)):R(y+1,m,0),R(y,h[y]+m,b),R(j(y-1),h[j(y-1)]+m,b),j(y-1)),z(O(),f[y],o)):a.continuous?(R(j(y-1),-m,b),R(y,0,b),R(j(y+1),m,b)):(R(y-1,-m,b),R(y,0,b),R(y+1,m,b))),Q(t)?(E.removeEventListener("mousemove",w,!1),E.removeEventListener("mouseup",w,!1),E.removeEventListener("mouseleave",w,!1)):(E.removeEventListener("touchmove",w,!!d.passiveEvents&&{passive:!1}),E.removeEventListener("touchend",w,!1))},transitionEnd:function(t){parseInt(t.target.getAttribute("data-index"),10)===y&&((c||a.autoRestart)&&X(),A(O(),f[y]))}};return M(),I(),{setup:M,slide:function(t,e){N(),P(t,e)},prev:function(){N(),function(){if(e)return;a.continuous?P(y-1):y&&P(y-1)}()},next:function(){N(),S()},restart:X,stop:N,getPos:O,disable:function(){N(),e=!0},enable:function(){e=!1,X()},getNumSlides:function(){return p},kill:function(){N(),r.style.visibility="",E.style.width="",E.style[x]="";var t=f.length;for(;t--;){d.transitions&&C(t,0,0);var e=f[t];if(e.getAttribute("data-cloned")){var n=e.parentElement;n.removeChild(e)}e.style.width="",e.style[x]="",e.style.webkitTransitionDuration=e.style.MozTransitionDuration=e.style.msTransitionDuration=e.style.OTransitionDuration=e.style.transitionDuration="",e.style.webkitTransform=e.style.msTransform=e.style.MozTransform=e.style.OTransform=""}D(),L.cancel()}}}function D(){d.addEventListener?(E.removeEventListener("touchstart",w,!!d.passiveEvents&&{passive:!0}),E.removeEventListener("mousedown",w,!1),E.removeEventListener("webkitTransitionEnd",w,!1),E.removeEventListener("msTransitionEnd",w,!1),E.removeEventListener("oTransitionEnd",w,!1),E.removeEventListener("otransitionend",w,!1),E.removeEventListener("transitionend",w,!1),W.removeEventListener("resize",w,!1)):W.onresize=null}function k(t){var e=t.cloneNode(!0);E.appendChild(e),e.setAttribute("data-cloned",!0),e.removeAttribute("id")}function M(t){if(null!=t)for(var e in t)a[e]=t[e];f=E.children,p=f.length;for(var n=0;n<f.length;n++)f[n].getAttribute("data-cloned")&&p--;if(f.length<2&&(a.continuous=!1),d.transitions&&a.continuous&&f.length<3&&(k(f[0]),k(f[1]),f=E.children),"right"===x)for(var i=0;i<f.length;i++)f[i].style.float="right";h=new Array(f.length),m=r.getBoundingClientRect().width||r.offsetWidth,E.style.width=f.length*m*2+"px";for(var o=f.length;o--;){var s=f[o];s.style.width=m+"px",s.setAttribute("data-index",o),d.transitions&&(s.style[x]=o*-m+"px",R(o,o<y?-m:y<o?m:0,0))}a.continuous&&d.transitions&&(R(j(y-1),-m,0),R(j(y+1),m,0)),d.transitions||(E.style[x]=y*-m+"px"),r.style.visibility="visible",D(),d.addEventListener?(d.touch&&E.addEventListener("touchstart",w,!!d.passiveEvents&&{passive:!0}),a.draggable&&E.addEventListener("mousedown",w,!1),d.transitions&&(E.addEventListener("webkitTransitionEnd",w,!1),E.addEventListener("msTransitionEnd",w,!1),E.addEventListener("oTransitionEnd",w,!1),E.addEventListener("otransitionend",w,!1),E.addEventListener("transitionend",w,!1)),W.addEventListener("resize",w,!1)):W.onresize=L}function S(){e||(a.continuous?P(y+1):y<f.length-1&&P(y+1))}function z(t,e,n){a.callback&&a.callback(t,e,n)}function A(t,e){a.transitionEnd&&a.transitionEnd(t,e)}function j(t){return(f.length+t%f.length)%f.length}function O(){var t=y;return p<=t&&(t-=p),t}function P(t,e){if(t="number"!=typeof t?parseInt(t,10):t,y!==t){if(d.transitions){var n=Math.abs(y-t)/(y-t);if(a.continuous){var i=n;(n=-h[j(t)]/m)!==i&&(t=-n*f.length+t)}for(var o=Math.abs(y-t)-1;o--;)R(j((y<t?t:y)-o-1),m*n,0);t=j(t),R(y,m*n,e||b),R(t,0,e||b),a.continuous&&R(j(t-n),-m*n,0)}else t=j(t),function(e,n,i){if(!i)return E.style[x]=n+"px";var o=+new Date,s=setInterval(function(){var t=+new Date-o;if(i<t)return E.style[x]=n+"px",(c||a.autoRestart)&&X(),A(O(),f[y]),void clearInterval(s);E.style[x]=(n-e)*(Math.floor(t/i*100)/100)+e+"px"},4)}(y*-m,t*-m,e||b);y=t,v(function(){z(O(),f[y],n)})}}function R(t,e,n){C(t,e,n),h[t]=e}function C(t,e,n){var i=f[t],o=i&&i.style;o&&(o.webkitTransitionDuration=o.MozTransitionDuration=o.msTransitionDuration=o.OTransitionDuration=o.transitionDuration=n+"ms",o.webkitTransform=o.msTransform=o.MozTransform=o.OTransform=o.transform="translateX("+e+"px)")}function I(){(c=a.auto||0)&&(t=setTimeout(S,c))}function N(){c=0,clearTimeout(t)}function X(){N(),I()}function Q(t){return/^mouse/.test(t.type)}}return(W.jQuery||W.Zepto)&&((e=W.jQuery||W.Zepto).fn.Swipe=function(t){return this.each(function(){e(this).data("Swipe",new Swipe(e(this)[0],t))})}),Swipe});
\ No newline at end of file
diff --git a/Beocreate2/beo-system/navigation.txt b/Beocreate2/beo-system/navigation.txt
deleted file mode 100644
index e342a109..00000000
--- a/Beocreate2/beo-system/navigation.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-product-information
-clock
--
-sound
-sources
-network
-general-settings
--
-interact
\ No newline at end of file
diff --git a/Beocreate2/beo-system/package-lock.json b/Beocreate2/beo-system/package-lock.json
index e696f7be..06cca8e5 100644
--- a/Beocreate2/beo-system/package-lock.json
+++ b/Beocreate2/beo-system/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "beocreate-2",
-  "version": "2.1.10",
+  "version": "2.1.12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/Beocreate2/beo-system/package.json b/Beocreate2/beo-system/package.json
index d12a13e6..8bcba2cd 100644
--- a/Beocreate2/beo-system/package.json
+++ b/Beocreate2/beo-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "beocreate-2",
-  "version": "2.1.10",
+  "version": "2.1.12",
   "description": "Software for Beocreate sound systems",
   "main": "beo-server.js",
   "scripts": {
diff --git a/Beocreate2/beo-system/common/apple-touch-icon-hifiberry.png b/Beocreate2/beo-views/default/apple-touch-icon-hifiberry.png
similarity index 100%
rename from Beocreate2/beo-system/common/apple-touch-icon-hifiberry.png
rename to Beocreate2/beo-views/default/apple-touch-icon-hifiberry.png
diff --git a/Beocreate2/beo-system/common/apple-touch-icon.png b/Beocreate2/beo-views/default/apple-touch-icon.png
similarity index 100%
rename from Beocreate2/beo-system/common/apple-touch-icon.png
rename to Beocreate2/beo-views/default/apple-touch-icon.png
diff --git a/Beocreate2/beo-system/common/beostyle2018.css b/Beocreate2/beo-views/default/beostyle2018.css
similarity index 95%
rename from Beocreate2/beo-system/common/beostyle2018.css
rename to Beocreate2/beo-views/default/beostyle2018.css
index 568569b8..62c7a70e 100644
--- a/Beocreate2/beo-system/common/beostyle2018.css
+++ b/Beocreate2/beo-views/default/beostyle2018.css
@@ -1,5 +1,5 @@
 /* @override 
-	http://beocreate-core.local/common/beostyle2018.css
+	http://beocreate-core.local/views/default/beostyle2018.css
 	http://olohuone.local/common/beostyle2018.css */
 /* 
 
@@ -34,7 +34,7 @@ Keep track of layers in the UI
 
 */
 
-@import "fonts/metropolis.css";
+@import "/common/fonts/metropolis.css";
 
 html {
 	font-size: 18px;
@@ -646,6 +646,7 @@ nav.favourites div:active img {
 }
 
 .player-bar h3 {
+	color: white;
 	font-weight: 500;
 	font-size: 0.9em;
 	margin-bottom: 0.2em;
@@ -768,8 +769,8 @@ header .back-button:before {
 	background-color: currentColor;
 	width: 23px;
 	height: 23px;
-	-webkit-mask-image: url(symbols-black/back.svg);
-	mask-image: url(symbols-black/back.svg);
+	-webkit-mask-image: url(/common/symbols-black/back.svg);
+	mask-image: url(/common/symbols-black/back.svg);
 	-webkit-mask-repeat: no-repeat;
 	mask-repeat: no-repeat;
 	margin-right: max(var(--sidebar-padding) - 43px, -3px);
@@ -860,6 +861,7 @@ header.aux {
 	top: 0;
 	z-index: 2;
 	background-color: var(--main-bg);
+	justify-content: flex-start;
 }
 
 /* @end */
@@ -940,6 +942,14 @@ section.animating {
 	pointer-events: none;
 }
 
+.menu-screen.hidden-left {
+	z-index: -1;
+}
+
+.menu-screen.hidden-right {
+	z-index: 1;
+}
+
 .touch .menu-screen.hidden-right {
 	transform: translateX(100%);
 	/*filter: blur(20px);*/
@@ -1003,7 +1013,7 @@ section.faded-out .menu-screen {
 
 .menu-content:after,
 .menu-content-wrap:after {
-	margin-top: 7px;
+	margin-top: 20px;
 	height: 1px;
 }
 
@@ -1160,8 +1170,8 @@ section.faded-out .menu-screen {
 	margin-top: -11px;
 	opacity: 0.3;
 	transition: opacity 0.5s ease, background-color 0.5s ease;
-	-webkit-mask-image: url(symbols-black/chevron.svg);
-	mask-image: url(symbols-black/chevron.svg);
+	-webkit-mask-image: url(/common/symbols-black/chevron.svg);
+	mask-image: url(/common/symbols-black/chevron.svg);
 	-webkit-mask-size: 21px;
 	mask-size: 21px;
 	-webkit-mask-repeat: no-repeat;
@@ -1429,8 +1439,8 @@ section.faded-out .menu-screen {
 	-webkit-mask-position: center;
 	mask-position: center;
 	background-color: currentColor;
-	mask-image: url(symbols-black/checkmark.svg);
-	-webkit-mask-image: url(symbols-black/checkmark.svg);
+	mask-image: url(/common/symbols-black/checkmark.svg);
+	-webkit-mask-image: url(/common/symbols-black/checkmark.svg);
 	transition: opacity 0.3s ease, transform 0.3s ease;
 	right: 20px;
 	transform: scale(0.5);
@@ -1479,7 +1489,7 @@ section.faded-out .menu-screen {
 
 .menu-toggle:after {
 	content: "";
-	background-image: url(symbols-white/checkmark.svg);
+	background-image: url(/common/symbols-white/checkmark.svg);
 	background-repeat: no-repeat;
 	background-position: left;
 	background-size: 23px 23px;
@@ -1496,7 +1506,7 @@ section.faded-out .menu-screen {
 }
 
 .dark .menu-toggle:after {
-	background-image: url(symbols-white/checkmark.svg);
+	background-image: url(/common/symbols-white/checkmark.svg);
 }
 
 .on .menu-toggle:after {
@@ -1561,7 +1571,16 @@ h2 {
 	margin-top: 20px;
 }
 
-.dark h2 {
+h3 {
+	font-size: 1em;
+	font-weight: 500;
+	margin-bottom: 20px;
+	margin-top: 0;
+	color: gray;
+}
+
+.dark h2,
+.dark h3 {
 	/*color: white;*/
 	color: rgba(255,255,255,0.5);
 }
@@ -1581,8 +1600,8 @@ h2.sticky-header {
 }
 
 .dark h2.sticky-header {
-	background-color: rgba(51, 51, 51, 0.95);
-	box-shadow: 0 -1px rgba(51, 51, 51, 0.95);
+	box-shadow: 0 -1px rgba(34, 34, 34, 0.95);
+	background-color: rgba(34, 34, 34, 0.95);
 }
 
 .no-touch h2.disclosure:hover,
@@ -1816,28 +1835,28 @@ p.experiment:before {
 }
 
 p.success:before {
-	mask-image: url(symbols-colour/checkmark-green.svg);
-	-webkit-mask-image: url(symbols-colour/checkmark-green.svg);
+	mask-image: url(/common/symbols-colour/checkmark-green.svg);
+	-webkit-mask-image: url(/common/symbols-colour/checkmark-green.svg);
 }
 
 p.warning:before {
-	mask-image: url(symbols-colour/warning-yellow.svg);
-	-webkit-mask-image: url(symbols-colour/warning-yellow.svg);
+	mask-image: url(/common/symbols-colour/warning-yellow.svg);
+	-webkit-mask-image: url(/common/symbols-colour/warning-yellow.svg);
 }
 
 p.loading:before {
-	mask-image: url(symbols-black/wait-star.svg);
-	-webkit-mask-image: url(symbols-black/wait-star.svg);
+	mask-image: url(/common/symbols-black/wait-star.svg);
+	-webkit-mask-image: url(/common/symbols-black/wait-star.svg);
 }
 
 p.privacy:before {
-	mask-image: url(symbols-black/private.svg);
-	-webkit-mask-image: url(symbols-black/private.svg);
+	mask-image: url(/common/symbols-black/private.svg);
+	-webkit-mask-image: url(/common/symbols-black/private.svg);
 }
 
 p.experiment:before {
-	mask-image: url(symbols-black/experiment.svg);
-	-webkit-mask-image: url(symbols-black/experiment.svg);
+	mask-image: url(/common/symbols-black/experiment.svg);
+	-webkit-mask-image: url(/common/symbols-black/experiment.svg);
 }
 
 p.warning {
@@ -1976,7 +1995,7 @@ p.success {
 	width: 18px;
 	height: 18px;
 	position: absolute;
-	background-image: url(symbols-white/checkmark.svg);
+	background-image: url(/common/symbols-white/checkmark.svg);
 	background-repeat: no-repeat;
 	background-color: black;
 	background-position: center;
@@ -2086,7 +2105,7 @@ p.success {
 	width: 21px;
 	height: 21px;
 	position: absolute;
-	background-image: url(symbols-white/checkmark.svg);
+	background-image: url(/common/symbols-white/checkmark.svg);
 	background-repeat: no-repeat;
 	background-color: black;
 	background-position: center;
@@ -2111,7 +2130,7 @@ p.success {
 /* @group Buttons */
 
 .button, 
-.segmented-control, 
+.segmented-control:not(.minimal), 
 .tabs {
 	font-size: 0.7em;
 	text-transform: uppercase;
@@ -2155,7 +2174,7 @@ a.button {
 
 .button.text-chevron:after {
 	content: "";
-	background: url(symbols-black/chevron.svg);
+	background: url(/common/symbols-black/chevron.svg);
 	width: 22px;
 	height: 22px;
 	position: absolute;
@@ -2228,8 +2247,8 @@ a.button {
 	height: 21px;
 	position: absolute;
 	right: 0;
-	-webkit-mask-image: url(symbols-black/chevron-thin-updown.svg);
-	mask-image: url(symbols-black/chevron-thin-updown.svg);
+	-webkit-mask-image: url(/common/symbols-black/chevron-thin-updown.svg);
+	mask-image: url(/common/symbols-black/chevron-thin-updown.svg);
 	-webkit-mask-size: 23px;
 	mask-size: 23px;
 	-webkit-mask-repeat: no-repeat;
@@ -2442,8 +2461,11 @@ footer .button.pill {
 /* @group Segmented Control */
 
 .segmented-control {
-	height: 35px;
 	display: flex;
+}
+
+.segmented-control:not(.minimal) {
+	height: 35px;
 	width: 100%;
 	background-color: var(--menu-line-opaque);
 	box-sizing: border-box;
@@ -2452,6 +2474,13 @@ footer .button.pill {
 	padding: 1px;
 }
 
+.segmented-control.minimal {
+	height: 30px;
+	cursor: default;
+	font-size: 0.8em;
+}
+
+
 .segmented-control > div {
 	flex-basis: 30px;
 	flex-grow: 1;
@@ -2467,28 +2496,49 @@ footer .button.pill {
 	transition: transform 0.3s ease, background-color 0.3s ease, color 0.3s ease, outline-color 0.3s ease;
 }
 
-.no-touch .segmented-control > div:hover, 
-.segmented-control > div:active {
+.segmented-control.minimal > div {
+	padding-right: 0.3em;
+	padding-left: 0.3em;
+	font-weight: 500;
+	white-space: nowrap;
+	color: silver;
+	position: relative;
+}
+
+.segmented-control.minimal > span {
+	display: flex;
+	align-items: center;
+	margin-right: 0.3em;
+	color: silver;
+}
+
+.dark .segmented-control.minimal > div,
+.dark .segmented-control.minimal > span {
+	color: rgba(255,255,255,0.5);
+}
+
+.no-touch .segmented-control:not(.minimal) > div:hover, 
+.segmented-control:not(.minimal) > div:active {
 	background-color: silver;
 	outline-color: silver;
 	color: white;
 }
 
-.no-touch .dark .segmented-control > div:hover, 
-.dark .segmented-control > div:active {
+.no-touch .dark .segmented-control:not(.minimal) > div:hover, 
+.dark .segmented-control:not(.minimal) > div:active {
 	background-color: #666;
 	outline-color: #666;
 	color: white;
 }
 
-.no-touch .segmented-control > div.selected:hover, 
-.segmented-control > div.selected:active {
+.no-touch .segmented-control:not(.minimal) > div.selected:hover, 
+.segmented-control:not(.minimal) > div.selected:active {
 	background-color: #444;
 	outline-color: #444;
 }
 
-.no-touch .dark .segmented-control > div.selected:hover, 
-.dark .segmented-control > div.selected:active {
+.no-touch .dark .segmented-control:not(.minimal) > div.selected:hover, 
+.dark .segmented-control:not(.minimal) > div.selected:active {
 	background-color: white;
 	outline-color: white;
 	color: black;
@@ -2499,14 +2549,37 @@ footer .button.pill {
 	margin-right: 0;
 }
 
-.segmented-control > .selected {
+.segmented-control:not(.minimal) > .selected {
 	background-color: black;
 	color: white;
 	outline-color: black;
 	z-index: 1;
 }
 
-.dark .segmented-control > .selected {
+.segmented-control.minimal > .selected,
+.dark .segmented-control.minimal > .selected,
+.no-touch .segmented-control.minimal > div:hover,
+.touch .segmented-control.minimal > div:active {
+	color: var(--main-font-colour);
+}
+
+.segmented-control.minimal > div:after {
+	content: "";
+	width: 12px;
+	border-bottom: 2px solid currentColor;
+	position: absolute;
+	bottom: 0;
+	transition: opacity 0.5s ease;
+	opacity: 0;
+	left: 50%;
+	margin-left: -6px;
+}
+
+.segmented-control.minimal > .selected:after {
+	opacity: 1;
+}
+
+.dark .segmented-control:not(.minimal) > .selected {
 	background-color: #ddd;
 	color: black;
 	outline-color: #ddd;
@@ -3096,11 +3169,11 @@ header .tabs > div.selected:after {
 }
 
 .dark .plexi.visible {
-	background-color: rgba(34, 34, 34, 0.9);
+	background-color: rgba(0,0,0, 0.9);
 }
 
 .dark.disconnected .plexi.visible {
-	background-color: rgba(34, 34, 34, 1);
+	background-color: #000;
 }
 
 
@@ -3457,8 +3530,8 @@ input::-webkit-search-decoration {
 	-webkit-mask-position: center;
 	mask-position: center;
 	background-color: currentColor;
-	mask-image: url(symbols-black/search.svg);
-	-webkit-mask-image: url(symbols-black/search.svg);
+	mask-image: url(/common/symbols-black/search.svg);
+	-webkit-mask-image: url(/common/symbols-black/search.svg);
 	height: 21px;
 	position: absolute;
 	left: 13px;
@@ -4335,6 +4408,11 @@ header.aux .search-container {
 	height: calc(var(--sidebar-padding) - 15px);
 }
 
+.ask-content .menu-content:before,
+.ask-content .menu-content:after {
+	height: 0;
+}
+
 div:not(#text-input) .popup-content {
 	width: 60vw;
 	max-height: calc(100vh - 100px);
diff --git a/Beocreate2/beo-system/common/index.html b/Beocreate2/beo-views/default/index.html
similarity index 91%
rename from Beocreate2/beo-system/common/index.html
rename to Beocreate2/beo-views/default/index.html
index 304cf1e4..e31ae338 100644
--- a/Beocreate2/beo-system/common/index.html
+++ b/Beocreate2/beo-views/default/index.html
@@ -9,18 +9,17 @@
 	<meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<meta name="apple-mobile-web-app-status-bar-style" content="default">
-	<link rel="apple-touch-icon" href="common/apple-touch-icon.png?v=1" />
+	<link rel="apple-touch-icon" href="views/default/apple-touch-icon.png?v=1" />
 	
-	<link rel="stylesheet" type="text/css" href="common/beostyle2018.css" />
-	<script type="text/javascript" src="common/scripts/jquery-1.10.2.min.js"></script>
-	<script type="text/javascript" src="common/scripts/jquery-ui.min.js"></script>
-	<script type="text/javascript" src="common/scripts/jquery.ui.touch-punch.min.js"></script>
+	<link rel="stylesheet" type="text/css" href="views/default/beostyle2018.css" />
+	<script type="text/javascript" src="views/default/scripts/jquery-1.10.2.min.js"></script>
+	<script type="text/javascript" src="views/default/scripts/jquery-ui.min.js"></script>
+	<script type="text/javascript" src="views/default/scripts/jquery.ui.touch-punch.min.js"></script>
 	<script src='common/scripts/underscore-min.js'></script>
-	<script src='common/scripts/modernizr.js'></script>
-	<script src='common/scripts/fastclick.min.js'></script>
-	<script src='common/scripts/swipe.min.js'></script>
+	<script src='views/default/scripts/modernizr.js'></script>
+	<script src='views/default/scripts/fastclick.min.js'></script>
 	<script src='common/scripts/flotr2.mod.min.js'></script>
-	<script src='common/scripts/beo-ui.js'></script>
+	<script src='views/default/scripts/beo-ui.js'></script>
 	<script src='common/scripts/beo-drag.js'></script>
 	<script src='common/scripts/beo-comms.js'></script>
 	<script src='common/scripts/beo-dspcalc.js'></script>
diff --git a/Beocreate2/beo-views/default/manifest.json b/Beocreate2/beo-views/default/manifest.json
new file mode 100644
index 00000000..71673af6
--- /dev/null
+++ b/Beocreate2/beo-views/default/manifest.json
@@ -0,0 +1,14 @@
+{
+	"navigation": [
+			{"name": "product-information", "kind": "extension"},
+			{"kind": "separator"},
+			{"name": "sound", "kind": "extension"},
+			{"name": "sources", "kind": "extension"},
+			{"name": "network", "kind": "extension"},
+			{"name": "general-settings", "kind": "extension"},
+			{"kind": "separator"},
+			{"name": "interact", "kind": "extension"},
+			{"name": "feedback", "kind": "extension"}
+		],
+	"extensionMarkupFileName": "menu"
+}
diff --git a/Beocreate2/beo-system/common/scripts/beo-ui.js b/Beocreate2/beo-views/default/scripts/beo-ui.js
similarity index 99%
rename from Beocreate2/beo-system/common/scripts/beo-ui.js
rename to Beocreate2/beo-views/default/scripts/beo-ui.js
index 7c3c46c6..dcfa4295 100644
--- a/Beocreate2/beo-system/common/scripts/beo-ui.js
+++ b/Beocreate2/beo-views/default/scripts/beo-ui.js
@@ -55,7 +55,7 @@ $( document ).ready(function() {
 	
 	$("body").css("opacity", "1");
 	
-	if (hifiberryOS) $('head link[rel="apple-touch-icon"]').attr("href", "common/apple-touch-icon-hifiberry.png");
+	if (hifiberryOS) $('head link[rel="apple-touch-icon"]').attr("href", "views/default/apple-touch-icon-hifiberry.png");
 	
 	
 	// File selected to upload.
@@ -109,7 +109,6 @@ function sendToProductView(data) {
 
 $(document).on("general", function(event, data) {
 	
-	
 	if (data.header == "powerStatus" && !data.content.overrideUIActions) {
 		if (product_information && product_information.systemID && product_information.systemName) {
 			if (data.content.status == "shuttingDown") {
@@ -2096,6 +2095,7 @@ function showStandaloneCallToAction(show, force) {
 
 
 return {
+	appearance: "default",
 	ask: ask,
 	askOption: askOption,
 	showPopupView: showPopupView,
diff --git a/Beocreate2/beo-system/common/scripts/fastclick.min.js b/Beocreate2/beo-views/default/scripts/fastclick.min.js
similarity index 100%
rename from Beocreate2/beo-system/common/scripts/fastclick.min.js
rename to Beocreate2/beo-views/default/scripts/fastclick.min.js
diff --git a/Beocreate2/beo-system/common/scripts/jquery-1.10.2.min.js b/Beocreate2/beo-views/default/scripts/jquery-1.10.2.min.js
similarity index 100%
rename from Beocreate2/beo-system/common/scripts/jquery-1.10.2.min.js
rename to Beocreate2/beo-views/default/scripts/jquery-1.10.2.min.js
diff --git a/Beocreate2/beo-system/common/scripts/jquery-ui.min.js b/Beocreate2/beo-views/default/scripts/jquery-ui.min.js
similarity index 100%
rename from Beocreate2/beo-system/common/scripts/jquery-ui.min.js
rename to Beocreate2/beo-views/default/scripts/jquery-ui.min.js
diff --git a/Beocreate2/beo-system/common/scripts/jquery.ui.touch-punch.min.js b/Beocreate2/beo-views/default/scripts/jquery.ui.touch-punch.min.js
similarity index 100%
rename from Beocreate2/beo-system/common/scripts/jquery.ui.touch-punch.min.js
rename to Beocreate2/beo-views/default/scripts/jquery.ui.touch-punch.min.js
diff --git a/Beocreate2/beo-system/common/scripts/modernizr.js b/Beocreate2/beo-views/default/scripts/modernizr.js
similarity index 100%
rename from Beocreate2/beo-system/common/scripts/modernizr.js
rename to Beocreate2/beo-views/default/scripts/modernizr.js
diff --git a/BeocreateConnect/beocreate-app2018.css b/BeocreateConnect/beocreate-app2018.css
index 690878eb..4534e75e 100644
--- a/BeocreateConnect/beocreate-app2018.css
+++ b/BeocreateConnect/beocreate-app2018.css
@@ -1,8 +1,7 @@
 @import "fonts/metropolis.css";
 
-/* Theme Controls */
-:root {
-	color-scheme: light dark;
+
+body {
 	
 	--carnation: #FF3E46;
 	--yellow: #FFAA46;
@@ -14,11 +13,10 @@
 	--waterleaf: #9DE7D7;
 
 	--main-bg: white;
-	--main-bg-dark: #333;
 	--text: black;
-}
-
-body {
+	--button-bg: #f5f5f5;
+	--menu-line: rgba(0,0,0,0.1); 
+	
 	margin: 0;
 	padding: 0;
 	font-family: "Metropolis", -apple-system, sans-serif;
@@ -31,14 +29,21 @@ body {
 	right: 0;
 	left: 0;
 	bottom: 0;
-	background-color: transparent;
+	background-color: var(--main-bg);
+	color: var(--text);
+	
+	color-scheme: light dark;
 }
 
-.dark {
-	color: white;
-	background-color: var(--main-bg-dark);
+body.dark {
+
+	--main-bg: #333;
+	--text: white;
+	--menu-line: rgba(255,255,255,0.1); 
+	--button-bg: #444;
 }
 
+
 body.beocreate-1 .beocreate-1-hide {
 	display: none !important;
 }
@@ -809,10 +814,18 @@ hr {
 }
 
 .menu-item {
-	background-color: #f5f5f5;
-	margin-bottom: 1em;
-	padding: 7.5%;
 	position: relative;
+	display: flex;
+	padding-right: 20px;
+	padding-left: 20px;
+	height: 45px;
+	align-items: center;
+	box-sizing: border-box;
+	padding-top: 2px;
+	transition: background-color 0.3s ease, opacity 0.3s ease, transform 0.3s ease, color 0.3s ease;
+	cursor: default;
+	background-color: var(--button-bg);
+	margin-bottom: 10px;
 }
 
 .menu-item.disabled {
@@ -829,9 +842,38 @@ hr {
 }
 
 .menu-label {
-	font-size: 1.5em;
+	font-size: 1em;
 	font-weight: 500;
-	margin-bottom: 0.5em;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.menu-value {
+	margin-left: auto;
+	opacity: 0.5;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	text-align: right;
+	flex-shrink: 0;
+	padding-left: 0.5em;
+}
+
+.menu-item:hover {
+	background-color: var(--menu-line);
+}
+
+.menu-item:active {
+	background-color: #333;
+	transition: none;
+	color: white;
+}
+
+.dark .menu-item:active {
+	background-color: #eee;
+	transition: none;
+	color: black;
 }
 
 
@@ -1065,7 +1107,7 @@ hr {
 }
 
 .collection-item.configure:after {
-	content: "Configure";
+	content: "View";
 }
 
 
diff --git a/BeocreateConnect/beosound5-test.js b/BeocreateConnect/beosound5-test.js
new file mode 100644
index 00000000..7cc2c0a2
--- /dev/null
+++ b/BeocreateConnect/beosound5-test.js
@@ -0,0 +1,9 @@
+var BS5 = require("node-hid/src/beosound5.js");
+
+Beosound5 = new BS5.Beosound5();
+
+Beosound5.powerState(0);
+
+Beosound5.on('data', function() {
+	console.log("Data here");
+});
\ No newline at end of file
diff --git a/BeocreateConnect/index.html b/BeocreateConnect/index.html
index ccda90b0..e4d78441 100644
--- a/BeocreateConnect/index.html
+++ b/BeocreateConnect/index.html
@@ -151,11 +151,10 @@ <h2>Products</h2>
 				
 				<div class="menu-screen" id="set-up-new-start">
 					
-					<div class="setup-choice disabled" onclick="startAssistant('createCard');">
+					<div class="setup-choice" onclick="startAssistant('createCard');">
 						<div class="number">01</div>
 						<h1>Prepare Card</h1>
 						<p>Install the necessary software onto a MicroSD card.</p>
-						<div class="tag">Coming soon</div>
 					</div>
 					<div class="vertical-separator"></div>
 					<div class="setup-choice" onclick="startAssistant('findAndSetUp');">
@@ -163,25 +162,22 @@ <h1>Prepare Card</h1>
 						<h1>Find &amp; Set Up</h1>
 						<p>Turn on and configure the product for the first time.</p>
 					</div>
-					<!--<div class="cards">
-						<div class="card" onclick="startAssistant('createCard');">
-							<div class="card-image" style="background-image: url(images/sd-card.jpg);"></div>
-							<div class="card-content">
-								<h2>Prepare a MicroSD Card</h2>
-								<p>Install the necessary software for the product.</p>
+					
+				</div>
+				
+				<div class="menu-screen side-by-side" id="select-card">
+					<div class="banner-image" style="background-image: url(images/sd-card.jpg);"></div>
+					<div class="scroll-area">
+						<div class="menu-content">
+							<div class="menu-group">
+								<h1>Choose destination</h1>
+								<p>Connect your MicroSD card (4 GB or higher capacity) to the computer. When the card appears below, select it to continue.</p>
 							</div>
-							
-						</div>
-						
-						<div class="card" onclick="startAssistant('findAndSetUp');">
-							<div class="card-image" style="background-image: url(images/setup-card.jpg);"></div>
-							<div class="card-content">
-								<h2>First-Time Setup</h2>
-								<p>Turn on, find and set up the product.</p>
+							<div id="drive-list">
+								
 							</div>
-							
 						</div>
-					</div>-->
+					</div>
 				</div>
 				
 				<div class="menu-screen" id="writing-card">
diff --git a/BeocreateConnect/main.js b/BeocreateConnect/main.js
index 40292edb..815df8f7 100644
--- a/BeocreateConnect/main.js
+++ b/BeocreateConnect/main.js
@@ -1,9 +1,30 @@
-const {app, Menu, BrowserWindow, ipcMain, systemPreferences} = require('electron');
+/*Copyright 2018-2020 Bang & Olufsen A/S
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.*/
+
+// BEOCREATE CONNECT
+
+
+const {app, Menu, BrowserWindow, ipcMain, nativeTheme, systemPreferences} = require('electron');
 const windowStateKeeper = require('electron-window-state');
 const dnssd = require('dnssd2');
 const drivelist = require('drivelist');
-const request = require('request');
+const fetch = require('node-fetch');
 const os = require('os');
+const fs = require('fs');
 var shell = require('electron').shell;
 
 var debug = false;
@@ -163,7 +184,7 @@ Menu.setApplicationMenu(menu);
     
     win.webContents.on('did-finish-load', () => {
 		if (process.platform == 'darwin') {
-			win.webContents.send('colourSchemeIsDark', systemPreferences.isDarkMode());
+			win.webContents.send('colourSchemeIsDark', nativeTheme.shouldUseDarkColors);
 		}
 		win.webContents.send('styleForWindows', process.platform !== 'darwin');
 		setTimeout(function() {
@@ -262,12 +283,11 @@ Menu.setApplicationMenu(menu);
 
 
 // DARK / LIGHT MODE
-if (process.platform == "darwin") {
+if (process.platform == "darwin" && win) {
 	systemPreferences.subscribeNotification(
 	  'AppleInterfaceThemeChangedNotification',
 	  function theThemeHasChanged () {
-	  	console.log(systemPreferences.isDarkMode());
-		win.webContents.send('colourSchemeIsDark', systemPreferences.isDarkMode());
+		win.webContents.send('colourSchemeIsDark', nativeTheme.shouldUseDarkColors);
 	  }
 	)
 }
@@ -418,19 +438,23 @@ var manualDiscoveryInterval;
 var manualDiscoveryAddress = "10.0.0.1";
 function discoverProductAtAddress(address) {
 	if (bonjourProductCount == 0) {
-		request('http://'+address+'/product-information/discovery', { json: true }, (err, res, body) => {
-			if (res && res.statusCode == 200) {
-				service = {name: body.name, fullname: body.name+"._"+body.serviceType+"._tcp.local.", port: body.advertisePort, addresses: [address], host: address, txt: body.txtRecord, manual: true};
-				if (!manuallyDiscoveredProduct) {
-					manuallyDiscoveredProduct = service;
-					refreshProducts();
-				}
+		fetch('http://'+address+'/product-information/discovery').then(res => {
+			if (res.status == 200) {
+				res.json().then(body => {
+					service = {name: body.name, fullname: body.name+"._"+body.serviceType+"._tcp.local.", port: body.advertisePort, addresses: [address], host: address, txt: body.txtRecord, manual: true};
+					if (!manuallyDiscoveredProduct) {
+						manuallyDiscoveredProduct = service;
+						refreshProducts();
+					}
+				});
 			} else {
 				if (manuallyDiscoveredProduct != null) {
 					manuallyDiscoveredProduct = null;
 					refreshProducts();
 				}
 			}
+		}).catch(err => {
+			//console.error("Manual product discovery unsuccessful")
 		});
 	} else {
 		if (manuallyDiscoveredProduct != null) {
@@ -517,8 +541,16 @@ Array.prototype.equals = function (array) {
 Object.defineProperty(Array.prototype, "equals", {enumerable: false});
 
 
+
+
+
 // SD CARD LOGIC
 
+ipcMain.on("listDrives", (event, arg) => {
+	listDrives();
+	//console.log(app.getPath("userData"));
+}); 
+
 function listDrives() {
 	drivelist.list((error, drives) => {
 		if (error) {
@@ -526,7 +558,6 @@ function listDrives() {
 		}
 		
 		
-		
-		console.log(drives);
+		win.webContents.send('availableDrives', drives);
 	});
 }
\ No newline at end of file
diff --git a/BeocreateConnect/package-lock.json b/BeocreateConnect/package-lock.json
index cadab094..e119b73e 100644
--- a/BeocreateConnect/package-lock.json
+++ b/BeocreateConnect/package-lock.json
@@ -5,11 +5,64 @@
   "requires": true,
   "dependencies": {
     "7zip-bin": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-4.1.0.tgz",
-      "integrity": "sha512-AsnBZN3a8/JcNt+KPkGGODaA4c7l3W5+WpeKgGSbstSLxqWtTXqd1ieJGBQ8IFCtRg8DmmKUcSkIkUc0A4p3YA==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.0.3.tgz",
+      "integrity": "sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA==",
       "dev": true
     },
+    "@develar/schema-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.1.0.tgz",
+      "integrity": "sha512-qjCqB4ctMig9Gz5bd6lkdFr3bO6arOdQqptdBSpF1ZpCnjofieCciEzkoS9ujY9cMGyllYSCSmBJ3x9OKHXzoA==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.1.0",
+        "ajv-keywords": "^3.1.0"
+      }
+    },
+    "@electron/get": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.12.2.tgz",
+      "integrity": "sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==",
+      "dev": true,
+      "requires": {
+        "debug": "^4.1.1",
+        "env-paths": "^2.2.0",
+        "fs-extra": "^8.1.0",
+        "global-agent": "^2.0.2",
+        "global-tunnel-ng": "^2.7.1",
+        "got": "^9.6.0",
+        "progress": "^2.0.3",
+        "sanitize-filename": "^1.6.2",
+        "sumchecker": "^3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "sanitize-filename": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz",
+          "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==",
+          "dev": true,
+          "requires": {
+            "truncate-utf8-bytes": "^1.0.0"
+          }
+        }
+      }
+    },
     "@sindresorhus/is": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
@@ -26,15 +79,15 @@
       }
     },
     "@types/debug": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.4.tgz",
-      "integrity": "sha512-D9MyoQFI7iP5VdpEyPZyjjqIJ8Y8EDNQFIFVLOmeg1rI1xiHOChyUPMPRUVfqFCerxfE+yS3vMyj37F6IdtOoQ==",
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz",
+      "integrity": "sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==",
       "dev": true
     },
     "@types/node": {
-      "version": "10.14.12",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.12.tgz",
-      "integrity": "sha512-QcAKpaO6nhHLlxWBvpc4WeLrTvPqlHOvaj0s5GriKkA1zq+bsFBPpfYCvQhLqLgYlIko8A9YrPdaMHCo5mBcpg==",
+      "version": "12.12.39",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.39.tgz",
+      "integrity": "sha512-pADGfwnDkr6zagDwEiCVE4yQrv7XDkoeVa4OfA9Ju/zRTk6YNDLGtQbkdL4/56mCQQCs4AhNrBIag6jrp7ZuOg==",
       "dev": true
     },
     "abbrev": {
@@ -47,6 +100,7 @@
       "version": "6.10.2",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
       "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+      "dev": true,
       "requires": {
         "fast-deep-equal": "^2.0.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -55,9 +109,9 @@
       }
     },
     "ajv-keywords": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
-      "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
       "dev": true
     },
     "ansi-align": {
@@ -117,42 +171,45 @@
         "color-convert": "^1.9.0"
       }
     },
+    "any-promise": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
+    },
     "app-builder-bin": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.7.1.tgz",
-      "integrity": "sha512-ubIBeiL9XysjMW4HETBKxj3DC8ika6dGyC0vftPc0kZwGh1iXQ5bycsjoAqY/3t3BBEEIg0VruicvBaUl1pOSQ==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.4.3.tgz",
+      "integrity": "sha512-qMhayIwi3juerQEVJMQ76trObEbfQT0nhUdxZz9a26/3NLT3pE6awmQ8S1cEnrGugaaM5gYqR8OElcDezfmEsg==",
       "dev": true
     },
     "app-builder-lib": {
-      "version": "20.44.4",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.44.4.tgz",
-      "integrity": "sha512-1K1xfrhyqDgnibwyuYMgvfwGilGLMF31YwOUJ8IXreyjRef9lUjWW+BZuBXqk4Uqd0C0EYPjhofgpuN0WoAQ+A==",
+      "version": "21.2.0",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-21.2.0.tgz",
+      "integrity": "sha512-aOX/nv77/Bti6NymJDg7p9T067xD8m1ipIEJR7B4Mm1GsJWpMm9PZdXtCRiMNRjHtQS5KIljT0g17781y6qn5A==",
       "dev": true,
       "requires": {
-        "7zip-bin": "~4.1.0",
-        "app-builder-bin": "2.7.1",
+        "7zip-bin": "~5.0.3",
+        "@develar/schema-utils": "~2.1.0",
         "async-exit-hook": "^2.0.1",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "10.1.2",
-        "builder-util-runtime": "8.2.5",
+        "builder-util": "21.2.0",
+        "builder-util-runtime": "8.3.0",
         "chromium-pickle-js": "^0.2.0",
         "debug": "^4.1.1",
         "ejs": "^2.6.2",
-        "electron-osx-sign": "0.4.11",
-        "electron-publish": "20.44.4",
-        "fs-extra-p": "^8.0.2",
+        "electron-publish": "21.2.0",
+        "fs-extra": "^8.1.0",
         "hosted-git-info": "^2.7.1",
         "is-ci": "^2.0.0",
-        "isbinaryfile": "^4.0.1",
+        "isbinaryfile": "^4.0.2",
         "js-yaml": "^3.13.1",
         "lazy-val": "^1.0.4",
         "minimatch": "^3.0.4",
         "normalize-package-data": "^2.5.0",
-        "plist": "^3.0.1",
-        "read-config-file": "3.2.2",
-        "sanitize-filename": "^1.6.1",
-        "semver": "^6.1.1",
-        "temp-file": "^3.3.3"
+        "read-config-file": "5.0.0",
+        "sanitize-filename": "^1.6.2",
+        "semver": "^6.3.0",
+        "temp-file": "^3.3.4"
       },
       "dependencies": {
         "debug": {
@@ -170,30 +227,10 @@
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
-        "normalize-package-data": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-          "dev": true,
-          "requires": {
-            "hosted-git-info": "^2.1.4",
-            "resolve": "^1.10.0",
-            "semver": "2 || 3 || 4 || 5",
-            "validate-npm-package-license": "^3.0.1"
-          },
-          "dependencies": {
-            "semver": {
-              "version": "5.7.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-              "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
-              "dev": true
-            }
-          }
-        },
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
@@ -250,16 +287,11 @@
         "sprintf-js": "~1.0.2"
       }
     },
-    "array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true
-    },
     "asn1": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
       "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
       "requires": {
         "safer-buffer": "~2.1.0"
       }
@@ -267,7 +299,8 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
     },
     "async-exit-hook": {
       "version": "2.0.1",
@@ -278,7 +311,8 @@
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
     },
     "atvik": {
       "version": "0.3.1",
@@ -288,12 +322,14 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
     },
     "aws4": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz",
+      "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==",
+      "dev": true
     },
     "balanced-match": {
       "version": "1.0.0",
@@ -304,13 +340,13 @@
     "base64-js": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
-      "dev": true
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
     },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
       "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
       "requires": {
         "tweetnacl": "^0.14.3"
       }
@@ -327,17 +363,64 @@
       "requires": {
         "readable-stream": "^2.3.5",
         "safe-buffer": "^5.1.1"
+      }
+    },
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
+    },
+    "bluebird-lst": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz",
+      "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==",
+      "dev": true,
+      "requires": {
+        "bluebird": "^3.5.5"
+      }
+    },
+    "bluebird-retry": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/bluebird-retry/-/bluebird-retry-0.10.1.tgz",
+      "integrity": "sha1-zfdrAdSm3U/sTiyENgqKCQB/Z9o="
+    },
+    "bmapflash": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/bmapflash/-/bmapflash-1.2.2.tgz",
+      "integrity": "sha512-Reks9az43gzwNasI1ej3lHlfeak3ddWltSD5YJVqsBev79fxn1rTMcdJ0En+d2irkr5tJcU4c3dMn0pj2L49nQ==",
+      "requires": {
+        "bluebird": "^3.7.2",
+        "lodash": "^4.17.15",
+        "progress-stream": "^2.0.0",
+        "stream-chunker": "^1.2.8",
+        "through2": "^2.0.5",
+        "xml2js": "^0.4.23"
       },
       "dependencies": {
+        "bluebird": {
+          "version": "3.7.2",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+          "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+        },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
         },
+        "progress-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-2.0.0.tgz",
+          "integrity": "sha1-+sY6Cz0R3qy7CWmrzJOyFLzhntU=",
+          "requires": {
+            "speedometer": "~1.0.0",
+            "through2": "~2.0.3"
+          }
+        },
         "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -348,6 +431,11 @@
             "util-deprecate": "~1.0.1"
           }
         },
+        "speedometer": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz",
+          "integrity": "sha1-zWccsGdSwivKM3Di8zREC+T8YuI="
+        },
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -355,32 +443,29 @@
           "requires": {
             "safe-buffer": "~5.1.0"
           }
+        },
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        },
+        "xtend": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+          "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
         }
       }
     },
-    "block-stream": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
-      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.0"
-      }
-    },
-    "bluebird": {
-      "version": "3.5.5",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
-      "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
-      "dev": true
-    },
-    "bluebird-lst": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz",
-      "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==",
+    "boolean": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz",
+      "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==",
       "dev": true,
-      "requires": {
-        "bluebird": "^3.5.5"
-      }
+      "optional": true
     },
     "boxen": {
       "version": "3.2.0",
@@ -404,12 +489,6 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
         "chalk": {
           "version": "2.4.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -459,6 +538,15 @@
         "concat-map": "0.0.1"
       }
     },
+    "buffer": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",
+      "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4"
+      }
+    },
     "buffer-alloc": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
@@ -473,6 +561,12 @@
       "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
       "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
     },
+    "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-fill": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
@@ -485,24 +579,24 @@
       "dev": true
     },
     "builder-util": {
-      "version": "10.1.2",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-10.1.2.tgz",
-      "integrity": "sha512-LQMh36Cg0r4ZfKqNlaUclndS/IXxZ3OdCgmXvw1vdP3QwYT2NkyE7LfMikAFIHpXOs6zsVH+iW+Fe/AX1jfFag==",
+      "version": "21.2.0",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-21.2.0.tgz",
+      "integrity": "sha512-Nd6CUb6YgDY8EXAXEIegx+1kzKqyFQ5ZM5BoYkeunAlwz/zDJoH1UCyULjoS5wQe5czNClFQy07zz2bzYD0Z4A==",
       "dev": true,
       "requires": {
-        "7zip-bin": "~4.1.0",
+        "7zip-bin": "~5.0.3",
         "@types/debug": "^4.1.4",
-        "app-builder-bin": "2.7.1",
+        "app-builder-bin": "3.4.3",
         "bluebird-lst": "^1.0.9",
-        "builder-util-runtime": "^8.2.5",
+        "builder-util-runtime": "8.3.0",
         "chalk": "^2.4.2",
         "debug": "^4.1.1",
-        "fs-extra-p": "^8.0.2",
+        "fs-extra": "^8.1.0",
         "is-ci": "^2.0.0",
         "js-yaml": "^3.13.1",
-        "source-map-support": "^0.5.12",
+        "source-map-support": "^0.5.13",
         "stat-mode": "^0.3.0",
-        "temp-file": "^3.3.3"
+        "temp-file": "^3.3.4"
       },
       "dependencies": {
         "chalk": {
@@ -534,14 +628,12 @@
       }
     },
     "builder-util-runtime": {
-      "version": "8.2.5",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.5.tgz",
-      "integrity": "sha512-YILT+YUlxrE3yNB6mDC1tF+Q24mr1LSYdjP5U861jbBeDZfvy1/VPDzW3boMVrDtzYnDnvkYrzLJnoh6TXA75w==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.3.0.tgz",
+      "integrity": "sha512-CSOdsYqf4RXIHh1HANPbrZHlZ9JQJXSuDDloblZPcWQVN62inyYoTQuSmY3KrgefME2Sv3Kn2MxHvbGQHRf8Iw==",
       "dev": true,
       "requires": {
-        "bluebird-lst": "^1.0.9",
         "debug": "^4.1.1",
-        "fs-extra-p": "^8.0.2",
         "sax": "^1.2.4"
       },
       "dependencies": {
@@ -562,12 +654,6 @@
         }
       }
     },
-    "builtin-modules": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-      "dev": true
-    },
     "cacheable-request": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
@@ -611,25 +697,16 @@
       }
     },
     "camelcase": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
-    "camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "dev": true,
-      "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
-      }
-    },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
     },
     "chalk": {
       "version": "2.4.1",
@@ -643,9 +720,9 @@
       }
     },
     "chownr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
-      "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
     },
     "chromium-pickle-js": {
       "version": "0.2.0",
@@ -675,22 +752,62 @@
       }
     },
     "cli-spinners": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz",
-      "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz",
+      "integrity": "sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==",
       "dev": true
     },
     "cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
+        "string-width": "^3.1.0",
+        "strip-ansi": "^5.2.0",
+        "wrap-ansi": "^5.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
+    "clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
+      "dev": true
+    },
     "clone-response": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
@@ -721,25 +838,20 @@
       "dev": true
     },
     "colors": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.2.tgz",
-      "integrity": "sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
       "dev": true
     },
     "combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
       "requires": {
         "delayed-stream": "~1.0.0"
       }
     },
-    "compare-version": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz",
-      "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=",
-      "dev": true
-    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -756,19 +868,76 @@
         "inherits": "^2.0.3",
         "readable-stream": "^2.2.2",
         "typedarray": "^0.0.6"
+      }
+    },
+    "config-chain": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz",
+      "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "ini": "^1.3.4",
+        "proto-list": "~1.2.1"
+      }
+    },
+    "configstore": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz",
+      "integrity": "sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==",
+      "dev": true,
+      "requires": {
+        "dot-prop": "^4.1.0",
+        "graceful-fs": "^4.1.2",
+        "make-dir": "^1.0.0",
+        "unique-string": "^1.0.0",
+        "write-file-atomic": "^2.0.0",
+        "xdg-basedir": "^3.0.0"
+      }
+    },
+    "console-control-strings": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+    },
+    "core-js": {
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+      "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
+      "dev": true,
+      "optional": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "crc": {
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
+      "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
+      "requires": {
+        "buffer": "^5.1.0"
+      }
+    },
+    "crc32-stream": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-1.0.1.tgz",
+      "integrity": "sha1-zixdw72P+zgw+ctH9UAiLGPJD6s=",
+      "requires": {
+        "crc": "^3.4.4",
+        "readable-stream": "^2.0.0"
       },
       "dependencies": {
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
         },
         "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.3",
@@ -783,37 +952,12 @@
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
           "requires": {
             "safe-buffer": "~5.1.0"
           }
         }
       }
     },
-    "configstore": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-4.0.0.tgz",
-      "integrity": "sha512-CmquAXFBocrzaSM8mtGPMM/HiWmyIpr4CcJl/rgY2uCObZ/S7cKU0silxslqJejl+t/T9HS8E0PUNQD81JGUEQ==",
-      "dev": true,
-      "requires": {
-        "dot-prop": "^4.1.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^1.0.0",
-        "unique-string": "^1.0.0",
-        "write-file-atomic": "^2.0.0",
-        "xdg-basedir": "^3.0.0"
-      }
-    },
-    "console-control-strings": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
     "cross-spawn": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@@ -831,19 +975,11 @@
       "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=",
       "dev": true
     },
-    "currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
-      "requires": {
-        "array-find-index": "^1.0.1"
-      }
-    },
     "dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -852,7 +988,6 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
       "requires": {
         "ms": "2.0.0"
       }
@@ -876,16 +1011,36 @@
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
       "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
     },
+    "defaults": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
+      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
+      "dev": true,
+      "requires": {
+        "clone": "^1.0.2"
+      }
+    },
     "defer-to-connect": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz",
       "integrity": "sha512-k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw==",
       "dev": true
     },
-    "delayed-stream": {
-      "version": "1.0.0",
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
     },
     "delegates": {
       "version": "1.0.0",
@@ -897,20 +1052,31 @@
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
       "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups="
     },
+    "detect-node": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "dev": true,
+      "optional": true
+    },
+    "dev-null-stream": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/dev-null-stream/-/dev-null-stream-0.0.1.tgz",
+      "integrity": "sha1-oqLie025mSjW2NRNXF9++9TLQ3I="
+    },
     "dmg-builder": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.7.2.tgz",
-      "integrity": "sha512-xfYOwhHjOSOIqkk8A0h8zcaio/WyzrAWpMTu9hzV3Z5PI4tOG0Pq6a9Lh/mHr1r3bydif8R21qGvKU1Re9CpUg==",
+      "version": "21.2.0",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-21.2.0.tgz",
+      "integrity": "sha512-9cJEclnGy7EyKFCoHDYDf54pub/t92CQapyiUxU0w9Bj2vUvfoDagP1PMiX4XD5rPp96141h9A+QN0OB4VgvQg==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "~20.44.4",
+        "app-builder-lib": "~21.2.0",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "~10.1.2",
-        "fs-extra-p": "^8.0.2",
-        "iconv-lite": "^0.4.24",
+        "builder-util": "~21.2.0",
+        "fs-extra": "^8.1.0",
+        "iconv-lite": "^0.5.0",
         "js-yaml": "^3.13.1",
-        "parse-color": "^1.0.0",
-        "sanitize-filename": "^1.6.1"
+        "sanitize-filename": "^1.6.2"
       }
     },
     "dns-packet": {
@@ -937,21 +1103,21 @@
       }
     },
     "dotenv": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-6.2.0.tgz",
-      "integrity": "sha512-HygQCKUBSFl8wKQZBSemMywRWcEDNidvNbjGVyZu3nbZ8qq9ubiPoGLMdRDpfSrpkkm9BXYFkpKxxFX38o/76w==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
       "dev": true
     },
     "dotenv-expand": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-4.2.0.tgz",
-      "integrity": "sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU=",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
+      "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
       "dev": true
     },
     "drivelist": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/drivelist/-/drivelist-6.4.2.tgz",
-      "integrity": "sha512-l4RfX3w4ApeO5SvLH5iLvHAfe8eDGm7F6q4r6wKloRbKwWbw8U4ovyk+aDnmFPTk2sfameJAmxbJub28CchDdg==",
+      "version": "6.4.6",
+      "resolved": "https://registry.npmjs.org/drivelist/-/drivelist-6.4.6.tgz",
+      "integrity": "sha512-FVeQE8GQppabnXm5J3tz3+nNZUWBixLYl2jGuLnCI/LhpopOj6+/fvPMgaWXC/SW/gceVALCx/EBRk8HiXqB5w==",
       "requires": {
         "bindings": "^1.3.0",
         "debug": "^3.1.0",
@@ -961,12 +1127,17 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         }
       }
     },
@@ -980,47 +1151,48 @@
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
       "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
       "requires": {
         "jsbn": "~0.1.0",
         "safer-buffer": "^2.1.0"
       }
     },
     "ejs": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.2.tgz",
-      "integrity": "sha512-PcW2a0tyTuPHz3tWyYqtK6r1fZ3gp+3Sop8Ph+ZYN81Ob5rwmbHEzaqs10N3BEsaGTkh/ooniXK+WwszGlc2+Q==",
+      "version": "2.7.4",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz",
+      "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==",
       "dev": true
     },
     "electron": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-5.0.6.tgz",
-      "integrity": "sha512-0L53lv26eDhaaNxL6DqXGQrQOEAYbrQg40stRSb2pzrY06kwPbABzXEiaCvEsBuKUQ+9OQBbVyyvXRbLJlun/A==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-8.3.0.tgz",
+      "integrity": "sha512-XRjiIJICZCgUr2vKSUI2PTkfP0gPFqCtqJUaTJSfCTuE3nTrxBKOUNeRMuCzEqspKkpFQU3SB3MdbMSHmZARlQ==",
       "dev": true,
       "requires": {
-        "@types/node": "^10.12.18",
-        "electron-download": "^4.1.0",
+        "@electron/get": "^1.0.1",
+        "@types/node": "^12.0.12",
         "extract-zip": "^1.0.3"
       }
     },
     "electron-builder": {
-      "version": "20.44.4",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.44.4.tgz",
-      "integrity": "sha512-H8zzP01albkKh2Ec1zc0A7RGriUkHb5M99NJskaYtgKtGATTAGH+r9OIWVk5Hk9c1dLMVudbqEeaSlygMF2asw==",
+      "version": "21.2.0",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-21.2.0.tgz",
+      "integrity": "sha512-x8EXrqFbAb2L3N22YlGar3dGh8vwptbB3ovo3OF6K7NTpcsmM2zEoJv7GhFyX73rNzSG2HaWpXwGAtOp2JWiEw==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "20.44.4",
+        "app-builder-lib": "21.2.0",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "10.1.2",
-        "builder-util-runtime": "8.2.5",
+        "builder-util": "21.2.0",
+        "builder-util-runtime": "8.3.0",
         "chalk": "^2.4.2",
-        "dmg-builder": "6.7.2",
-        "fs-extra-p": "^8.0.2",
+        "dmg-builder": "21.2.0",
+        "fs-extra": "^8.1.0",
         "is-ci": "^2.0.0",
         "lazy-val": "^1.0.4",
-        "read-config-file": "3.2.2",
-        "sanitize-filename": "^1.6.1",
-        "update-notifier": "^3.0.0",
-        "yargs": "^13.2.4"
+        "read-config-file": "5.0.0",
+        "sanitize-filename": "^1.6.2",
+        "update-notifier": "^3.0.1",
+        "yargs": "^13.3.0"
       },
       "dependencies": {
         "ansi-regex": {
@@ -1029,12 +1201,6 @@
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
         "chalk": {
           "version": "2.4.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -1046,117 +1212,12 @@
             "supports-color": "^5.3.0"
           }
         },
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-          "dev": true,
-          "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
-          }
-        },
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "get-caller-file": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-          "dev": true
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "invert-kv": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-          "dev": true
-        },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
-        "lcid": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-          "dev": true,
-          "requires": {
-            "invert-kv": "^2.0.0"
-          }
-        },
-        "os-locale": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-          "dev": true,
-          "requires": {
-            "execa": "^1.0.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
-          }
-        },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        },
-        "require-main-filename": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-          "dev": true
-        },
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
@@ -1177,52 +1238,28 @@
             "ansi-regex": "^4.1.0"
           }
         },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-          "dev": true
-        },
-        "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
-          }
-        },
-        "y18n": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-          "dev": true
-        },
         "yargs": {
-          "version": "13.2.4",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
-          "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
           "dev": true,
           "requires": {
             "cliui": "^5.0.0",
             "find-up": "^3.0.0",
             "get-caller-file": "^2.0.1",
-            "os-locale": "^3.1.0",
             "require-directory": "^2.1.1",
             "require-main-filename": "^2.0.0",
             "set-blocking": "^2.0.0",
             "string-width": "^3.0.0",
             "which-module": "^2.0.0",
             "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.0"
+            "yargs-parser": "^13.1.2"
           }
         },
         "yargs-parser": {
-          "version": "13.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -1231,82 +1268,17 @@
         }
       }
     },
-    "electron-download": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.1.tgz",
-      "integrity": "sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.0.0",
-        "env-paths": "^1.0.0",
-        "fs-extra": "^4.0.1",
-        "minimist": "^1.2.0",
-        "nugget": "^2.0.1",
-        "path-exists": "^3.0.0",
-        "rc": "^1.2.1",
-        "semver": "^5.4.1",
-        "sumchecker": "^2.0.2"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        }
-      }
-    },
-    "electron-osx-sign": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.11.tgz",
-      "integrity": "sha512-VVd40nrnVqymvFrY9ZkOYgHJOvexHHYTR3di/SN+mjJ0OWhR1I8BRVj3U+Yamw6hnkZZNKZp52rqL5EFAAPFkQ==",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.5.0",
-        "compare-version": "^0.1.2",
-        "debug": "^2.6.8",
-        "isbinaryfile": "^3.0.2",
-        "minimist": "^1.2.0",
-        "plist": "^3.0.1"
-      },
-      "dependencies": {
-        "isbinaryfile": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
-          "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
-          "dev": true,
-          "requires": {
-            "buffer-alloc": "^1.2.0"
-          }
-        }
-      }
-    },
     "electron-publish": {
-      "version": "20.44.4",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.44.4.tgz",
-      "integrity": "sha512-50NzsKOnNqOpGJzPl04vMyitdguUvp15FWKWtu4KISsHfgdLMWGgxHGZwfMphc/vf364zXvPHsYQza3MASgaEQ==",
+      "version": "21.2.0",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-21.2.0.tgz",
+      "integrity": "sha512-mWavuoWJe87iaeKd0I24dNWIaR+0yRzshjNVqGyK019H766fsPWl3caQJnVKFaEyrZRP397v4JZVG0e7s16AxA==",
       "dev": true,
       "requires": {
         "bluebird-lst": "^1.0.9",
-        "builder-util": "~10.1.2",
-        "builder-util-runtime": "^8.2.5",
+        "builder-util": "~21.2.0",
+        "builder-util-runtime": "8.3.0",
         "chalk": "^2.4.2",
-        "fs-extra-p": "^8.0.2",
+        "fs-extra": "^8.1.0",
         "lazy-val": "^1.0.4",
         "mime": "^2.4.4"
       },
@@ -1325,41 +1297,44 @@
       }
     },
     "electron-rebuild": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.8.2.tgz",
-      "integrity": "sha512-EeR4dgb6NN7ybxduUWMeeLhU/EuF+FzwFZJfMJXD0bx96K+ttAieCXOn9lTO5nA9Qn3hiS7pEpk8pZ9StpGgSg==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.11.0.tgz",
+      "integrity": "sha512-cn6AqZBQBVtaEyj5jZW1/LOezZZ22PA1HvhEP7asvYPJ8PDF4i4UFt9be4i9T7xJKiSiomXvY5Fd+dSq3FXZxA==",
       "dev": true,
       "requires": {
-        "colors": "^1.2.0",
-        "debug": "^2.6.3",
+        "colors": "^1.3.3",
+        "debug": "^4.1.1",
         "detect-libc": "^1.0.3",
-        "fs-extra": "^3.0.1",
-        "node-abi": "^2.0.0",
-        "node-gyp": "^3.6.0",
-        "ora": "^1.2.0",
-        "rimraf": "^2.6.1",
-        "spawn-rx": "^2.0.10",
-        "yargs": "^7.0.2"
+        "fs-extra": "^8.1.0",
+        "node-abi": "^2.11.0",
+        "node-gyp": "^6.0.1",
+        "ora": "^3.4.0",
+        "spawn-rx": "^3.0.0",
+        "yargs": "^14.2.0"
       },
       "dependencies": {
-        "fs-extra": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-          "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^3.0.0",
-            "universalify": "^0.1.0"
+            "ms": "^2.1.1"
           }
         },
-        "jsonfile": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-          "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        },
+        "node-abi": {
+          "version": "2.16.0",
+          "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.16.0.tgz",
+          "integrity": "sha512-+sa0XNlWDA6T+bDLmkCUYn6W5k5W6BPRL6mqzSCs6H/xUgtl4D5x2fORKDzopKiU6wsyn/+wXlRXwXeSp+mtoA==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.6"
+            "semver": "^5.4.1"
           }
         }
       }
@@ -1379,6 +1354,13 @@
       "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
       "dev": true
     },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "dev": true,
+      "optional": true
+    },
     "end-of-stream": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
@@ -1388,20 +1370,26 @@
       }
     },
     "env-paths": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
-      "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz",
+      "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==",
       "dev": true
     },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
+    "error": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/error/-/error-7.2.1.tgz",
+      "integrity": "sha512-fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA==",
       "requires": {
-        "is-arrayish": "^0.2.1"
+        "string-template": "~0.2.1"
       }
     },
+    "es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+      "dev": true,
+      "optional": true
+    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -1414,6 +1402,263 @@
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true
     },
+    "etcher-image-write": {
+      "version": "9.1.6",
+      "resolved": "https://registry.npmjs.org/etcher-image-write/-/etcher-image-write-9.1.6.tgz",
+      "integrity": "sha512-Cm2qT342J45P2PXmBqDTNuLusy5CTkjF5IqAc6Wv57bYyYDngFMNMLWSWn74gUk38YvrdrMKYG+/2GhkWzK5qg==",
+      "requires": {
+        "bluebird": "^3.7.2",
+        "bluebird-retry": "^0.10.1",
+        "bmapflash": "^1.2.2",
+        "crc32-stream": "^1.0.1",
+        "debug": "^2.6.9",
+        "dev-null-stream": "0.0.1",
+        "drivelist": "^8.0.10",
+        "error": "^7.2.1",
+        "lodash": "^4.17.15",
+        "progress-stream": "^2.0.0",
+        "slice-stream2": "^2.0.1",
+        "stream-chunker": "^1.2.8",
+        "through2": "^2.0.5",
+        "tmp": "0.0.31"
+      },
+      "dependencies": {
+        "bl": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz",
+          "integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==",
+          "requires": {
+            "buffer": "^5.5.0",
+            "inherits": "^2.0.4",
+            "readable-stream": "^3.4.0"
+          },
+          "dependencies": {
+            "inherits": {
+              "version": "2.0.4",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+              "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+            }
+          }
+        },
+        "bluebird": {
+          "version": "3.7.2",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+          "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+        },
+        "chownr": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+        },
+        "decompress-response": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+          "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+          "requires": {
+            "mimic-response": "^2.0.0"
+          }
+        },
+        "drivelist": {
+          "version": "8.0.10",
+          "resolved": "https://registry.npmjs.org/drivelist/-/drivelist-8.0.10.tgz",
+          "integrity": "sha512-2A/NCMn9jQ/9J1B8zohS8rnXQKDM6ZixLAlYS/rBeZV2NuSXJCMr/M8kKdr4vy95oOxKXi8NXk+IVrHCS3bung==",
+          "requires": {
+            "bindings": "^1.3.0",
+            "debug": "^3.1.0",
+            "mz": "^2.7.0",
+            "nan": "^2.14.0",
+            "prebuild-install": "^5.2.4"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "3.2.6",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+              "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+              "requires": {
+                "ms": "^2.1.1"
+              }
+            }
+          }
+        },
+        "expand-template": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+          "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        },
+        "mimic-response": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+          "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "nan": {
+          "version": "2.14.1",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+          "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="
+        },
+        "node-abi": {
+          "version": "2.16.0",
+          "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.16.0.tgz",
+          "integrity": "sha512-+sa0XNlWDA6T+bDLmkCUYn6W5k5W6BPRL6mqzSCs6H/xUgtl4D5x2fORKDzopKiU6wsyn/+wXlRXwXeSp+mtoA==",
+          "requires": {
+            "semver": "^5.4.1"
+          }
+        },
+        "prebuild-install": {
+          "version": "5.3.3",
+          "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.3.tgz",
+          "integrity": "sha512-GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g==",
+          "requires": {
+            "detect-libc": "^1.0.3",
+            "expand-template": "^2.0.3",
+            "github-from-package": "0.0.0",
+            "minimist": "^1.2.0",
+            "mkdirp": "^0.5.1",
+            "napi-build-utils": "^1.0.1",
+            "node-abi": "^2.7.0",
+            "noop-logger": "^0.1.1",
+            "npmlog": "^4.0.1",
+            "pump": "^3.0.0",
+            "rc": "^1.2.7",
+            "simple-get": "^3.0.3",
+            "tar-fs": "^2.0.0",
+            "tunnel-agent": "^0.6.0",
+            "which-pm-runs": "^1.0.0"
+          }
+        },
+        "progress-stream": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-2.0.0.tgz",
+          "integrity": "sha1-+sY6Cz0R3qy7CWmrzJOyFLzhntU=",
+          "requires": {
+            "speedometer": "~1.0.0",
+            "through2": "~2.0.3"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
+          "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+        },
+        "simple-get": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
+          "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
+          "requires": {
+            "decompress-response": "^4.2.0",
+            "once": "^1.3.1",
+            "simple-concat": "^1.0.0"
+          }
+        },
+        "speedometer": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz",
+          "integrity": "sha1-zWccsGdSwivKM3Di8zREC+T8YuI="
+        },
+        "string_decoder": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+          "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+          "requires": {
+            "safe-buffer": "~5.2.0"
+          }
+        },
+        "tar-fs": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz",
+          "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==",
+          "requires": {
+            "chownr": "^1.1.1",
+            "mkdirp-classic": "^0.5.2",
+            "pump": "^3.0.0",
+            "tar-stream": "^2.0.0"
+          }
+        },
+        "tar-stream": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.2.tgz",
+          "integrity": "sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q==",
+          "requires": {
+            "bl": "^4.0.1",
+            "end-of-stream": "^1.4.1",
+            "fs-constants": "^1.0.0",
+            "inherits": "^2.0.3",
+            "readable-stream": "^3.1.1"
+          }
+        },
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.3.7",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+              "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "safe-buffer": {
+              "version": "5.1.2",
+              "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+              "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+              "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            }
+          }
+        },
+        "xtend": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+          "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+        }
+      }
+    },
     "execa": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
@@ -1437,24 +1682,26 @@
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
     },
     "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"
       }
     },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
     },
     "fast-deep-equal": {
       "version": "2.0.1",
@@ -1464,7 +1711,8 @@
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
     },
     "fast-plist": {
       "version": "0.1.2",
@@ -1472,33 +1720,40 @@
       "integrity": "sha1-pFr/NFGWAG1AbKbNzQX2kFHvNbg="
     },
     "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"
       }
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true
+    },
     "find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dev": true,
       "requires": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
+        "locate-path": "^3.0.0"
       }
     },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
     },
     "form-data": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
       "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.6",
@@ -1511,63 +1766,39 @@
       "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
     },
     "fs-extra": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-      "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
+        "graceful-fs": "^4.2.0",
         "jsonfile": "^4.0.0",
         "universalify": "^0.1.0"
-      }
-    },
-    "fs-extra-p": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-8.1.0.tgz",
-      "integrity": "sha512-sCLpU5kk5CvrWZvFM9dUlqPgHrE02AEt6XYzF7kDscr5COc7DHfhNfODTXt0bkVNmt5DkvU2uJSYjorxY3bRKA==",
-      "dev": true,
-      "requires": {
-        "bluebird-lst": "^1.0.9",
-        "fs-extra": "^8.1.0"
       },
       "dependencies": {
-        "fs-extra": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
         "graceful-fs": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.0.tgz",
-          "integrity": "sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==",
+          "version": "4.2.4",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+          "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
           "dev": true
         }
       }
     },
+    "fs-minipass": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+      "dev": true,
+      "requires": {
+        "minipass": "^2.6.0"
+      }
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "fstream": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "inherits": "~2.0.0",
-        "mkdirp": ">=0.5 0",
-        "rimraf": "2"
-      }
-    },
     "gauge": {
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
@@ -1584,15 +1815,9 @@
       }
     },
     "get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-      "dev": true
-    },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true
     },
     "get-stream": {
@@ -1605,6 +1830,7 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0"
       }
@@ -1615,9 +1841,9 @@
       "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
     },
     "glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
       "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
@@ -1628,6 +1854,31 @@
         "path-is-absolute": "^1.0.0"
       }
     },
+    "global-agent": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.8.tgz",
+      "integrity": "sha512-VpBe/rhY6Rw2VDOTszAMNambg+4Qv8j0yiTNDYEXXXxkUNGWLHp8A3ztK4YDBbFNcWF4rgsec6/5gPyryya/+A==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "boolean": "^3.0.0",
+        "core-js": "^3.6.4",
+        "es6-error": "^4.1.1",
+        "matcher": "^2.1.0",
+        "roarr": "^2.15.2",
+        "semver": "^7.1.2",
+        "serialize-error": "^5.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "global-dirs": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
@@ -1637,6 +1888,29 @@
         "ini": "^1.3.4"
       }
     },
+    "global-tunnel-ng": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz",
+      "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "encodeurl": "^1.0.2",
+        "lodash": "^4.17.10",
+        "npm-conf": "^1.1.3",
+        "tunnel": "^0.0.6"
+      }
+    },
+    "globalthis": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz",
+      "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "define-properties": "^1.1.3"
+      }
+    },
     "got": {
       "version": "9.6.0",
       "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
@@ -1685,12 +1959,14 @@
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
     },
     "har-validator": {
       "version": "5.1.3",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
       "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "dev": true,
       "requires": {
         "ajv": "^6.5.5",
         "har-schema": "^2.0.0"
@@ -1714,9 +1990,9 @@
       "dev": true
     },
     "hosted-git-info": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-      "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
       "dev": true
     },
     "http-cache-semantics": {
@@ -1729,6 +2005,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "jsprim": "^1.2.2",
@@ -1736,14 +2013,19 @@
       }
     },
     "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.1.tgz",
+      "integrity": "sha512-ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q==",
       "dev": true,
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+    },
     "import-lazy": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
@@ -1756,15 +2038,6 @@
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true
     },
-    "indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "dev": true,
-      "requires": {
-        "repeating": "^2.0.0"
-      }
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -1785,12 +2058,6 @@
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
       "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
     },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true
-    },
     "ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
@@ -1801,21 +2068,6 @@
       "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.1.0.tgz",
       "integrity": "sha512-pKnZpbgCTfH/1NLIlOduP/V+WRXzC2MOz3Qo8xmxk8C5GudJLgK5QyLVXOSWy3ParAH7Eemurl3xjv/WXYFvMA=="
     },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "is-builtin-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
-      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-      "dev": true,
-      "requires": {
-        "builtin-modules": "^1.0.0"
-      }
-    },
     "is-ci": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
@@ -1825,15 +2077,6 @@
         "ci-info": "^2.0.0"
       }
     },
-    "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
-    },
     "is-fullwidth-code-point": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -1882,12 +2125,7 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
       "dev": true
     },
     "is-yarn-global": {
@@ -1897,15 +2135,14 @@
       "dev": true
     },
     "isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-      "dev": true
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "isbinaryfile": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.1.tgz",
-      "integrity": "sha512-bvJxbNWm72dy/1+qeBm9F8wUM4siDnlzid7NN5Ib4nQcc0tNIx/YWgEih1ZRHXr8xVbpGk1ccLlA9gOSlyx3gw==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.6.tgz",
+      "integrity": "sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==",
       "dev": true
     },
     "isexe": {
@@ -1917,7 +2154,8 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
     },
     "js-yaml": {
       "version": "3.13.1",
@@ -1932,7 +2170,8 @@
     "jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
     },
     "json-buffer": {
       "version": "3.0.0",
@@ -1943,25 +2182,28 @@
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
     },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
     },
     "json5": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.0.tgz",
-      "integrity": "sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.0"
+        "minimist": "^1.2.5"
       }
     },
     "jsonfile": {
@@ -1976,6 +2218,7 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -2007,28 +2250,6 @@
       "integrity": "sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==",
       "dev": true
     },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
-    },
-    "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      }
-    },
     "locate-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
@@ -2047,6 +2268,11 @@
         }
       }
     },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+    },
     "lodash.assign": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
@@ -2062,16 +2288,6 @@
         "chalk": "^2.0.1"
       }
     },
-    "loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "dev": true,
-      "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
-      }
-    },
     "lowercase-keys": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
@@ -2095,85 +2311,46 @@
       "dev": true,
       "requires": {
         "pify": "^3.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        }
       }
     },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "dev": true,
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
-    "map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
-    },
-    "mem": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+    "matcher": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/matcher/-/matcher-2.1.0.tgz",
+      "integrity": "sha512-o+nZr+vtJtgPNklyeUKkkH42OsK8WAfdgaJE2FNxcjLPg+5QbeEoT6vRj8Xq/iv18JlQ9cmKsEu0b94ixWf1YQ==",
       "dev": true,
+      "optional": true,
       "requires": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^2.0.0",
-        "p-is-promise": "^2.0.0"
+        "escape-string-regexp": "^2.0.0"
       },
       "dependencies": {
-        "mimic-fn": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-          "dev": true
+        "escape-string-regexp": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+          "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+          "dev": true,
+          "optional": true
         }
       }
     },
-    "meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "dev": true,
-      "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
-      }
-    },
     "mime": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-      "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz",
+      "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==",
       "dev": true
     },
     "mime-db": {
-      "version": "1.42.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz",
-      "integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ=="
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+      "dev": true
     },
     "mime-types": {
-      "version": "2.1.25",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz",
-      "integrity": "sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==",
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "dev": true,
       "requires": {
-        "mime-db": "1.42.0"
+        "mime-db": "1.44.0"
       }
     },
     "mimic-fn": {
@@ -2197,34 +2374,59 @@
       }
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+    },
+    "minipass": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
+      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+      "dev": true,
       "requires": {
-        "minimist": "0.0.8"
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.0"
       },
       "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
         }
       }
     },
+    "minizlib": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+      "dev": true,
+      "requires": {
+        "minipass": "^2.9.0"
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "requires": {
+        "minimist": "^1.2.5"
+      }
+    },
+    "mkdirp-classic": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz",
+      "integrity": "sha512-ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g=="
+    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
     "multicast-dns": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.0.tgz",
-      "integrity": "sha512-Tu2QORGOFANB124NWQ/JTRhMf/ODouVLEuvu5Dz8YWEU55zQgRgFGnBHfIh5PbfNDAuaRl7yLB+pgWhSqVxi2Q==",
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.2.tgz",
+      "integrity": "sha512-XqSMeO8EWV/nOXOpPV8ztIpNweVfE1dSpz6SQvDPp71HD74lMXjt4m/mWB1YBMG0kHtOodxRWc5WOb/UNN1A5g==",
       "requires": {
         "dns-packet": "^4.0.0",
         "thunky": "^1.0.2"
@@ -2235,50 +2437,211 @@
       "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
       "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
     },
+    "mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "requires": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
     "nan": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
-      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw=="
+      "version": "2.14.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="
     },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
+    "napi-build-utils": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz",
+      "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg=="
     },
     "node-abi": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.4.3.tgz",
-      "integrity": "sha512-b656V5C0628gOOA2kwcpNA/bxdlqYF9FvxJ+qqVX0ctdXNVZpS8J6xEUYir3WAKc7U0BH/NRlSpNbGsy+azjeg==",
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.16.0.tgz",
+      "integrity": "sha512-+sa0XNlWDA6T+bDLmkCUYn6W5k5W6BPRL6mqzSCs6H/xUgtl4D5x2fORKDzopKiU6wsyn/+wXlRXwXeSp+mtoA==",
       "requires": {
         "semver": "^5.4.1"
       }
     },
+    "node-fetch": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+    },
     "node-gyp": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
-      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-6.1.0.tgz",
+      "integrity": "sha512-h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw==",
       "dev": true,
       "requires": {
-        "fstream": "^1.0.0",
-        "glob": "^7.0.3",
-        "graceful-fs": "^4.1.2",
-        "mkdirp": "^0.5.0",
-        "nopt": "2 || 3",
-        "npmlog": "0 || 1 || 2 || 3 || 4",
-        "osenv": "0",
-        "request": "^2.87.0",
-        "rimraf": "2",
-        "semver": "~5.3.0",
-        "tar": "^2.0.0",
-        "which": "1"
+        "env-paths": "^2.2.0",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.2",
+        "mkdirp": "^0.5.1",
+        "nopt": "^4.0.1",
+        "npmlog": "^4.1.2",
+        "request": "^2.88.0",
+        "rimraf": "^2.6.3",
+        "semver": "^5.7.1",
+        "tar": "^4.4.12",
+        "which": "^1.3.1"
       },
       "dependencies": {
+        "graceful-fs": {
+          "version": "4.2.4",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+          "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+          "dev": true
+        },
         "semver": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
+        }
+      }
+    },
+    "node-hid": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/node-hid/-/node-hid-1.2.0.tgz",
+      "integrity": "sha512-ap06Wo1E0aGrZf0t1zvjWSk+IzI6yvKpTDYQRIrdxLHEelifnGDx6XOb2VVlrQhxzM4etma8jH/i0M1LUB55dA==",
+      "dev": true,
+      "requires": {
+        "bindings": "^1.5.0",
+        "nan": "^2.14.0",
+        "prebuild-install": "^5.3.3"
+      },
+      "dependencies": {
+        "bindings": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+          "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+          "dev": true,
+          "requires": {
+            "file-uri-to-path": "1.0.0"
+          }
+        },
+        "bl": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz",
+          "integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==",
+          "dev": true,
+          "requires": {
+            "buffer": "^5.5.0",
+            "inherits": "^2.0.4",
+            "readable-stream": "^3.4.0"
+          },
+          "dependencies": {
+            "inherits": {
+              "version": "2.0.4",
+              "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+              "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+              "dev": true
+            }
+          }
+        },
+        "decompress-response": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+          "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+          "dev": true,
+          "requires": {
+            "mimic-response": "^2.0.0"
+          }
+        },
+        "expand-template": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
+          "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==",
+          "dev": true
+        },
+        "mimic-response": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+          "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
           "dev": true
+        },
+        "prebuild-install": {
+          "version": "5.3.4",
+          "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.4.tgz",
+          "integrity": "sha512-AkKN+pf4fSEihjapLEEj8n85YIw/tN6BQqkhzbDc0RvEZGdkpJBGMUYx66AAMcPG2KzmPQS7Cm16an4HVBRRMA==",
+          "dev": true,
+          "requires": {
+            "detect-libc": "^1.0.3",
+            "expand-template": "^2.0.3",
+            "github-from-package": "0.0.0",
+            "minimist": "^1.2.3",
+            "mkdirp": "^0.5.1",
+            "napi-build-utils": "^1.0.1",
+            "node-abi": "^2.7.0",
+            "noop-logger": "^0.1.1",
+            "npmlog": "^4.0.1",
+            "pump": "^3.0.0",
+            "rc": "^1.2.7",
+            "simple-get": "^3.0.3",
+            "tar-fs": "^2.0.0",
+            "tunnel-agent": "^0.6.0",
+            "which-pm-runs": "^1.0.0"
+          }
+        },
+        "pump": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.1.0",
+            "once": "^1.3.1"
+          }
+        },
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "simple-get": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
+          "integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
+          "dev": true,
+          "requires": {
+            "decompress-response": "^4.2.0",
+            "once": "^1.3.1",
+            "simple-concat": "^1.0.0"
+          }
+        },
+        "tar-fs": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz",
+          "integrity": "sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==",
+          "dev": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "mkdirp-classic": "^0.5.2",
+            "pump": "^3.0.0",
+            "tar-stream": "^2.0.0"
+          }
+        },
+        "tar-stream": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.2.tgz",
+          "integrity": "sha512-UaF6FoJ32WqALZGOIAApXx+OdxhekNMChu6axLJR85zMMjXKWFGjbIRe+J6P4UnRGg9rAwWvbTT0oI7hD/Un7Q==",
+          "dev": true,
+          "requires": {
+            "bl": "^4.0.1",
+            "end-of-stream": "^1.4.1",
+            "fs-constants": "^1.0.0",
+            "inherits": "^2.0.3",
+            "readable-stream": "^3.1.1"
+          }
         }
       }
     },
@@ -2288,22 +2651,23 @@
       "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI="
     },
     "nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
       "dev": true,
       "requires": {
-        "abbrev": "1"
+        "abbrev": "1",
+        "osenv": "^0.1.4"
       }
     },
     "normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
       "requires": {
         "hosted-git-info": "^2.1.4",
-        "is-builtin-module": "^1.0.0",
+        "resolve": "^1.10.0",
         "semver": "2 || 3 || 4 || 5",
         "validate-npm-package-license": "^3.0.1"
       }
@@ -2314,6 +2678,17 @@
       "integrity": "sha512-0NLtR71o4k6GLP+mr6Ty34c5GA6CMoEsncKJxvQd8NzPxaHRJNnb5gZE8R1XF4CPIS7QPHLJ74IFszwtNVAHVQ==",
       "dev": true
     },
+    "npm-conf": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz",
+      "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "config-chain": "^1.1.11",
+        "pify": "^3.0.0"
+      }
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -2334,21 +2709,6 @@
         "set-blocking": "~2.0.0"
       }
     },
-    "nugget": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
-      "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=",
-      "dev": true,
-      "requires": {
-        "debug": "^2.1.3",
-        "minimist": "^1.1.0",
-        "pretty-bytes": "^1.0.2",
-        "progress-stream": "^1.1.0",
-        "request": "^2.45.0",
-        "single-line-log": "^1.1.2",
-        "throttleit": "0.0.2"
-      }
-    },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -2357,7 +2717,8 @@
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true
     },
     "object-assign": {
       "version": "4.1.1",
@@ -2365,10 +2726,11 @@
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-keys": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-      "dev": true
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "optional": true
     },
     "once": {
       "version": "1.4.0",
@@ -2388,15 +2750,45 @@
       }
     },
     "ora": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz",
-      "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
+      "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
       "dev": true,
       "requires": {
-        "chalk": "^2.1.0",
+        "chalk": "^2.4.2",
         "cli-cursor": "^2.1.0",
-        "cli-spinners": "^1.0.1",
-        "log-symbols": "^2.1.0"
+        "cli-spinners": "^2.0.0",
+        "log-symbols": "^2.2.0",
+        "strip-ansi": "^5.2.0",
+        "wcwidth": "^1.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
     "os-homedir": {
@@ -2404,20 +2796,10 @@
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
-    "os-locale": {
-      "version": "1.4.0",
-      "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dev": true,
-      "requires": {
-        "lcid": "^1.0.0"
-      }
-    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "osenv": {
       "version": "0.1.5",
@@ -2435,24 +2817,12 @@
       "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
       "dev": true
     },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
-      "dev": true
-    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
       "dev": true
     },
-    "p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
-      "dev": true
-    },
     "p-limit": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
@@ -2478,60 +2848,25 @@
       "dev": true
     },
     "package-json": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.4.0.tgz",
-      "integrity": "sha512-bd1T8OBG7hcvMd9c/udgv6u5v9wISP3Oyl9Cm7Weop8EFwrtcQDnS2sb6zhwqus2WslSr5wSTIPiTTpxxmPm7Q==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
+      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
       "dev": true,
       "requires": {
         "got": "^9.6.0",
-        "registry-auth-token": "^3.4.0",
+        "registry-auth-token": "^4.0.0",
         "registry-url": "^5.0.0",
-        "semver": "^6.1.1"
+        "semver": "^6.2.0"
       },
       "dependencies": {
         "semver": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.2.0.tgz",
-          "integrity": "sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==",
-          "dev": true
-        }
-      }
-    },
-    "parse-color": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-color/-/parse-color-1.0.0.tgz",
-      "integrity": "sha1-e3SLlag/A/FqlPU15S1/PZRlhhk=",
-      "dev": true,
-      "requires": {
-        "color-convert": "~0.5.0"
-      },
-      "dependencies": {
-        "color-convert": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz",
-          "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
     },
-    "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "requires": {
-        "error-ex": "^1.2.0"
-      }
-    },
-    "path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "requires": {
-        "pinkie-promise": "^2.0.0"
-      }
-    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -2556,17 +2891,6 @@
       "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
       "dev": true
     },
-    "path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      }
-    },
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -2576,40 +2900,15 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
-    },
-    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+    "pify": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
       "dev": true
     },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "plist": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz",
-      "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.2.3",
-        "xmlbuilder": "^9.0.7",
-        "xmldom": "0.1.x"
-      }
-    },
     "prebuild-install": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz",
@@ -2638,30 +2937,23 @@
       "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
       "dev": true
     },
-    "pretty-bytes": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz",
-      "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^4.0.1",
-        "meow": "^3.1.0"
-      }
-    },
     "process-nextick-args": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
       "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
     },
-    "progress-stream": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz",
-      "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=",
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
+    },
+    "proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
       "dev": true,
-      "requires": {
-        "speedometer": "~0.1.2",
-        "through2": "~0.2.3"
-      }
+      "optional": true
     },
     "pseudomap": {
       "version": "1.0.2",
@@ -2670,9 +2962,10 @@
       "dev": true
     },
     "psl": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
-      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
     },
     "pump": {
       "version": "2.0.1",
@@ -2684,14 +2977,16 @@
       }
     },
     "punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "dev": true
     },
     "qs": {
       "version": "6.5.2",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true
     },
     "rc": {
       "version": "1.2.8",
@@ -2705,120 +3000,40 @@
       }
     },
     "read-config-file": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.2.2.tgz",
-      "integrity": "sha512-PuFpMgZF01VB0ydH1dfitAxCP/fh+qnfbA9cYNIPoxPbz0SMngsrafCtaHDWfER7MwlDz4fmrNBhPkakxxFpTg==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.9.2",
-        "ajv-keywords": "^3.4.0",
-        "bluebird-lst": "^1.0.7",
-        "dotenv": "^6.2.0",
-        "dotenv-expand": "^4.2.0",
-        "fs-extra-p": "^7.0.1",
-        "js-yaml": "^3.12.1",
-        "json5": "^2.1.0",
-        "lazy-val": "^1.0.4"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.10.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
-          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
-        },
-        "fs-extra": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "fs-extra-p": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-7.0.1.tgz",
-          "integrity": "sha512-yhd2OV0HnHt2oitlp+X9hl2ReX4X/7kQeL7/72qzPHTZj5eUPGzAKOvEglU02Fa1OeG2rSy/aKB4WGVaLiF8tw==",
-          "dev": true,
-          "requires": {
-            "bluebird-lst": "^1.0.7",
-            "fs-extra": "^7.0.1"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        }
-      }
-    },
-    "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
-      "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      }
-    },
-    "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-5.0.0.tgz",
+      "integrity": "sha512-jIKUu+C84bfnKxyJ5j30CxCqgXWYjZLXuVE/NYlMEpeni+dhESgAeZOZd0JZbg1xTkMmnCdxksDoarkOyfEsOg==",
       "dev": true,
       "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
+        "dotenv": "^8.0.0",
+        "dotenv-expand": "^5.1.0",
+        "fs-extra": "^8.1.0",
+        "js-yaml": "^3.13.1",
+        "json5": "^2.1.0",
+        "lazy-val": "^1.0.4"
       }
     },
     "readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "dev": true,
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
       "requires": {
         "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "dev": true,
-      "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
       }
     },
     "registry-auth-token": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
-      "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.1.1.tgz",
+      "integrity": "sha512-9bKS7nTl9+/A1s7tnPeGrUpRcVY+LUh7bfFgzpndALdPfXQBfQV77rQVtqgUV3ti4vc/Ik81Ex8UJDWDQ12zQA==",
       "dev": true,
       "requires": {
-        "rc": "^1.1.6",
-        "safe-buffer": "^5.0.1"
+        "rc": "^1.2.8"
       }
     },
     "registry-url": {
@@ -2830,19 +3045,11 @@
         "rc": "^1.2.8"
       }
     },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
     "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "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",
@@ -2851,7 +3058,7 @@
         "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
         "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
+        "har-validator": "~5.1.3",
         "http-signature": "~1.2.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
@@ -2861,7 +3068,7 @@
         "performance-now": "^2.1.0",
         "qs": "~6.5.2",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
+        "tough-cookie": "~2.5.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
       }
@@ -2873,15 +3080,15 @@
       "dev": true
     },
     "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
       "dev": true
     },
     "resolve": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
-      "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
       "dev": true,
       "requires": {
         "path-parse": "^1.0.6"
@@ -2907,21 +3114,45 @@
       }
     },
     "rimraf": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
-      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
       "dev": true,
       "requires": {
-        "glob": "^7.0.5"
+        "glob": "^7.1.3"
+      }
+    },
+    "roarr": {
+      "version": "2.15.3",
+      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.3.tgz",
+      "integrity": "sha512-AEjYvmAhlyxOeB9OqPUzQCo3kuAkNfuDk/HqWbZdFsqDFpapkTjiw+p4svNEoRLvuqNTxqfL+s+gtD4eDgZ+CA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "boolean": "^3.0.0",
+        "detect-node": "^2.0.4",
+        "globalthis": "^1.0.1",
+        "json-stringify-safe": "^5.0.1",
+        "semver-compare": "^1.0.0",
+        "sprintf-js": "^1.1.2"
+      },
+      "dependencies": {
+        "sprintf-js": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+          "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+          "dev": true,
+          "optional": true
+        }
       }
     },
     "rxjs": {
-      "version": "5.5.12",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
-      "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
+      "version": "6.5.5",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
+      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
       "dev": true,
       "requires": {
-        "symbol-observable": "1.0.1"
+        "tslib": "^1.9.0"
       }
     },
     "safe-buffer": {
@@ -2932,12 +3163,13 @@
     "safer-buffer": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
     },
     "sanitize-filename": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz",
-      "integrity": "sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz",
+      "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==",
       "dev": true,
       "requires": {
         "truncate-utf8-bytes": "^1.0.0"
@@ -2946,14 +3178,20 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
     },
     "semver": {
       "version": "5.5.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
       "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw=="
     },
+    "semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
+      "dev": true,
+      "optional": true
+    },
     "semver-diff": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
@@ -2963,6 +3201,25 @@
         "semver": "^5.0.3"
       }
     },
+    "serialize-error": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-5.0.0.tgz",
+      "integrity": "sha512-/VtpuyzYf82mHYTtI4QKtwHa79vAdU5OQpNPAmE/0UDdlGT0ZxHwC+J6gXkw29wwoVI8fMPsfcVHOwXtUQYYQA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "type-fest": "^0.8.0"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -3003,13 +3260,55 @@
         "simple-concat": "^1.0.0"
       }
     },
-    "single-line-log": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz",
-      "integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=",
-      "dev": true,
+    "slice-stream2": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/slice-stream2/-/slice-stream2-2.0.1.tgz",
+      "integrity": "sha1-e9gO/BMjLsEVFLZlxLZBWv2mkbc=",
       "requires": {
-        "string-width": "^1.0.1"
+        "through2": "^2.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        },
+        "xtend": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+          "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+        }
       }
     },
     "source-map": {
@@ -3019,9 +3318,9 @@
       "dev": true
     },
     "source-map-support": {
-      "version": "0.5.12",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
-      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
@@ -3029,20 +3328,20 @@
       }
     },
     "spawn-rx": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/spawn-rx/-/spawn-rx-2.0.12.tgz",
-      "integrity": "sha512-gOPXiQQFQ9lTOLuys0iMn3jfxxv9c7zzwhbYLOEbQGvEShHVJ5sSR1oD3Daj88os7jKArDYT7rbOKdvNhe7iEg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spawn-rx/-/spawn-rx-3.0.0.tgz",
+      "integrity": "sha512-dw4Ryg/KMNfkKa5ezAR5aZe9wNwPdKlnHEXtHOjVnyEDSPQyOpIPPRtcIiu7127SmtHhaCjw21yC43HliW0iIg==",
       "dev": true,
       "requires": {
         "debug": "^2.5.1",
         "lodash.assign": "^4.2.0",
-        "rxjs": "^5.1.1"
+        "rxjs": "^6.3.1"
       }
     },
     "spdx-correct": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
-      "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
       "dev": true,
       "requires": {
         "spdx-expression-parse": "^3.0.0",
@@ -3050,15 +3349,15 @@
       }
     },
     "spdx-exceptions": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz",
-      "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
       "dev": true
     },
     "spdx-expression-parse": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "dev": true,
       "requires": {
         "spdx-exceptions": "^2.1.0",
@@ -3066,15 +3365,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz",
-      "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==",
-      "dev": true
-    },
-    "speedometer": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz",
-      "integrity": "sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0=",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
       "dev": true
     },
     "sprintf-js": {
@@ -3087,6 +3380,7 @@
       "version": "1.16.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
       "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "dev": true,
       "requires": {
         "asn1": "~0.2.3",
         "assert-plus": "^1.0.0",
@@ -3105,6 +3399,62 @@
       "integrity": "sha512-QjMLR0A3WwFY2aZdV0okfFEJB5TRjkggXZjxP3A1RsWsNHNu3YPv8btmtc6iCFZ0Rul3FE93OYogvhOUClU+ng==",
       "dev": true
     },
+    "stream-chunker": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/stream-chunker/-/stream-chunker-1.2.8.tgz",
+      "integrity": "sha1-6zryyK7lJWzedvCh/qhjSDNtBPc=",
+      "requires": {
+        "through2": "~2.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+        },
+        "readable-stream": {
+          "version": "2.3.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "through2": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+          "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+          "requires": {
+            "readable-stream": "~2.3.6",
+            "xtend": "~4.0.1"
+          }
+        },
+        "xtend": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+          "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+        }
+      }
+    },
+    "string-template": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz",
+      "integrity": "sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0="
+    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -3116,10 +3466,12 @@
       }
     },
     "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-      "dev": true
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
     },
     "strip-ansi": {
       "version": "3.0.1",
@@ -3129,42 +3481,46 @@
         "ansi-regex": "^2.0.0"
       }
     },
-    "strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "requires": {
-        "is-utf8": "^0.2.0"
-      }
-    },
     "strip-eof": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
       "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
       "dev": true
     },
-    "strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^4.0.1"
-      }
-    },
     "strip-json-comments": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
     },
+    "sudo-prompt": {
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-9.2.1.tgz",
+      "integrity": "sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw=="
+    },
     "sumchecker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz",
-      "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
+      "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
       "dev": true,
       "requires": {
-        "debug": "^2.2.0"
+        "debug": "^4.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+          "dev": true
+        }
       }
     },
     "supports-color": {
@@ -3176,21 +3532,27 @@
         "has-flag": "^3.0.0"
       }
     },
-    "symbol-observable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
-      "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
-      "dev": true
-    },
     "tar": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
-      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
+      "version": "4.4.13",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
+      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
       "dev": true,
       "requires": {
-        "block-stream": "*",
-        "fstream": "^1.0.12",
-        "inherits": "2"
+        "chownr": "^1.1.1",
+        "fs-minipass": "^1.2.5",
+        "minipass": "^2.8.6",
+        "minizlib": "^1.2.1",
+        "mkdirp": "^0.5.0",
+        "safe-buffer": "^5.1.2",
+        "yallist": "^3.0.3"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "dev": true
+        }
       }
     },
     "tar-fs": {
@@ -3216,62 +3578,27 @@
       }
     },
     "tar-stream": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz",
-      "integrity": "sha512-IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
+      "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
       "requires": {
         "bl": "^1.0.0",
-        "buffer-alloc": "^1.1.0",
+        "buffer-alloc": "^1.2.0",
         "end-of-stream": "^1.0.0",
         "fs-constants": "^1.0.0",
         "readable-stream": "^2.3.0",
-        "to-buffer": "^1.1.0",
+        "to-buffer": "^1.1.1",
         "xtend": "^4.0.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
-        }
       }
     },
     "temp-file": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.3.3.tgz",
-      "integrity": "sha512-ErWJ0vfZwkozaH7dn/5QtYdrGwy6fWID0GG3PEzNb9Vmt6urL4mQ3lKz7NWVi1/kmZsWQzgjTL7/P4mwGx5jqg==",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.3.7.tgz",
+      "integrity": "sha512-9tBJKt7GZAQt/Rg0QzVWA8Am8c1EFl+CAv04/aBVqlx5oyfQ508sFIABshQ0xbZu6mBrFLWIUXO/bbLYghW70g==",
       "dev": true,
       "requires": {
         "async-exit-hook": "^2.0.1",
-        "bluebird-lst": "^1.0.9",
-        "fs-extra-p": "^8.0.2"
+        "fs-extra": "^8.1.0"
       }
     },
     "term-size": {
@@ -3283,26 +3610,26 @@
         "execa": "^0.7.0"
       }
     },
-    "throttleit": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
-      "integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=",
-      "dev": true
+    "thenify": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
+      "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
+      "requires": {
+        "any-promise": "^1.0.0"
+      }
     },
-    "through2": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
-      "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
-      "dev": true,
+    "thenify-all": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
+      "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
       "requires": {
-        "readable-stream": "~1.1.9",
-        "xtend": "~2.1.1"
+        "thenify": ">= 3.1.0 < 4"
       }
     },
     "thunky": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz",
-      "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
     },
     "timer-wheel": {
       "version": "0.3.2",
@@ -3337,9 +3664,9 @@
       }
     },
     "tinkerhub-mdns": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/tinkerhub-mdns/-/tinkerhub-mdns-0.5.0.tgz",
-      "integrity": "sha512-jDLHFJISSMUPHo2o0GTndEyPVJJtjMxMS10VdaDoZGIY1/rlkOBVvj0ciIfUKQPwTDnoyNjR+0JWimOSyXLtcA==",
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/tinkerhub-mdns/-/tinkerhub-mdns-0.5.1.tgz",
+      "integrity": "sha512-wvFGRKko5rlgnOy66nyy8AIZceu6YSSn8QbS+jWvEO5q0V3v/bSic+qcyS6xxUEMxfeH02jd/+NnKWjNl87ktQ==",
       "requires": {
         "atvik": "^0.3.1",
         "debug": "^4.1.1",
@@ -3365,6 +3692,14 @@
         }
       }
     },
+    "tmp": {
+      "version": "0.0.31",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
+      "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
+      "requires": {
+        "os-tmpdir": "~1.0.1"
+      }
+    },
     "to-buffer": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
@@ -3377,20 +3712,15 @@
       "dev": true
     },
     "tough-cookie": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "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.24",
-        "punycode": "^1.4.1"
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
       }
     },
-    "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "dev": true
-    },
     "truncate-utf8-bytes": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz",
@@ -3400,6 +3730,19 @@
         "utf8-byte-length": "^1.0.1"
       }
     },
+    "tslib": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==",
+      "dev": true
+    },
+    "tunnel": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+      "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
+      "dev": true,
+      "optional": true
+    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -3411,7 +3754,8 @@
     "tweetnacl": {
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
     },
     "type-fest": {
       "version": "0.3.1",
@@ -3464,6 +3808,7 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
       "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       },
@@ -3471,7 +3816,8 @@
         "punycode": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+          "dev": true
         }
       }
     },
@@ -3496,9 +3842,10 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "uuid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "dev": true
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
@@ -3514,12 +3861,22 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
         "extsprintf": "^1.2.0"
       }
     },
+    "wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+      "dev": true,
+      "requires": {
+        "defaults": "^1.0.3"
+      }
+    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -3530,9 +3887,9 @@
       }
     },
     "which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
       "dev": true
     },
     "which-pm-runs": {
@@ -3591,13 +3948,48 @@
       }
     },
     "wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
+        "ansi-styles": "^3.2.0",
+        "string-width": "^3.0.0",
+        "strip-ansi": "^5.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
     "wrappy": {
@@ -3622,31 +4014,31 @@
       "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=",
       "dev": true
     },
-    "xmlbuilder": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=",
-      "dev": true
-    },
-    "xmldom": {
-      "version": "0.1.27",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
-      "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=",
-      "dev": true
-    },
-    "xtend": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-      "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-      "dev": true,
+    "xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
       "requires": {
-        "object-keys": "~0.4.0"
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "dependencies": {
+        "xmlbuilder": {
+          "version": "11.0.1",
+          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+          "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+        }
       }
     },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+    },
     "y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
       "dev": true
     },
     "yallist": {
@@ -3656,58 +4048,76 @@
       "dev": true
     },
     "yargs": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+      "version": "14.2.3",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
+      "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
       "dev": true,
       "requires": {
-        "camelcase": "^3.0.0",
-        "cliui": "^3.2.0",
-        "decamelize": "^1.1.1",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^1.4.0",
-        "read-pkg-up": "^1.0.1",
+        "cliui": "^5.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^2.0.1",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
+        "require-main-filename": "^2.0.0",
         "set-blocking": "^2.0.0",
-        "string-width": "^1.0.2",
-        "which-module": "^1.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^5.0.0"
+        "string-width": "^3.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^15.0.1"
       },
       "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
         }
       }
     },
     "yargs-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+      "version": "15.0.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz",
+      "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==",
       "dev": true,
       "requires": {
-        "camelcase": "^3.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
-        }
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
       }
     },
     "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"
       }
     }
   }
diff --git a/BeocreateConnect/package.json b/BeocreateConnect/package.json
index 644fd4b8..da11a103 100644
--- a/BeocreateConnect/package.json
+++ b/BeocreateConnect/package.json
@@ -3,7 +3,7 @@
  "productName": "Beocreate Connect",
  "version": "0.3.0",
  "description": "Desktop utility for Beocreate-based sound systems",
- "main": "main.js",
+ "main": "start.js",
  "scripts": {
   "start": "electron .",
   "dist": "electron-builder",
@@ -13,17 +13,20 @@
  "author": "",
  "license": "MIT",
  "devDependencies": {
-  "electron": "^5.0.6",
-  "electron-builder": "^20.44.4",
-  "electron-rebuild": "^1.8.2"
+  "electron": "^8.3.0",
+  "electron-builder": "^21.2.0",
+  "electron-rebuild": "^1.11.0",
+  "node-hid": "^1.2.0"
  },
  "dependencies": {
   "dnssd2": "^1.0.0",
-  "drivelist": "^6.4.2",
+  "drivelist": "^6.4.6",
   "electron-window-state": "^5.0.3",
-  "multicast-dns": "^7.2.0",
-  "request": "^2.88.0",
-  "tinkerhub-mdns": "^0.5.0"
+  "etcher-image-write": "^9.1.6",
+  "multicast-dns": "^7.2.2",
+  "node-fetch": "^2.6.0",
+  "sudo-prompt": "^9.2.1",
+  "tinkerhub-mdns": "^0.5.1"
  },
  "build": {
   "appId": "dk.bang-olufsen.beocreateconnect",
diff --git a/BeocreateConnect/scripts/ui.js b/BeocreateConnect/scripts/ui.js
index 0a830802..45791f20 100644
--- a/BeocreateConnect/scripts/ui.js
+++ b/BeocreateConnect/scripts/ui.js
@@ -1,3 +1,23 @@
+/*Copyright 2018-2020 Bang & Olufsen A/S
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.*/
+
+// BEOCREATE CONNECT
+
+
 var inElectron = false;
 var debug = true;
 
@@ -393,6 +413,19 @@ if (ipc) {
 		//}
 		//updateProductLists();
 	});
+	
+	ipc.on('availableDrives', (event, drives) => {
+		console.log(drives);
+		$("#drive-list").empty();
+		for (d in drives) {
+			if (drives[d].busType == "USB") { // Only list USB drives.
+				size = Math.round(drives[d].size/100000000)/10;
+				if (size > 3) { // Make sure drive is large enough.
+					$("#drive-list").append('<div class="menu-item" onclick="selectDrive(\''+drives[d].raw+'\');"><div class="menu-label">'+drives[d].description+'</div><div class="menu-value">'+size+' GB</div></div>');
+				}
+			}
+		}
+	});
 }
 
 function refresh() {
@@ -642,10 +675,11 @@ function assistantFlow(step) {
 					endAssistant();
 					break;
 				case 0:
-					assistantButtons("Stop Writing", "Next Step");
+					assistantButtons("Cancel", "Prepare Card");
 					enableAssistantButtons(true, false);
-					showScreen('writing-card', direction);
+					showScreen('select-card', direction);
 					showMenuButton(true);
+					ipc.send("listDrives");
 					break;
 			}
 			break;
@@ -653,6 +687,11 @@ function assistantFlow(step) {
 }
 
 
+// SD CARD FLOW
+
+function selectDrive(raw) {
+	console.log(raw);
+}
 
 
 // COMMUNICATIONS FROM THE PRODUCT UI
diff --git a/BeocreateConnect/start.js b/BeocreateConnect/start.js
new file mode 100644
index 00000000..ff6ea97e
--- /dev/null
+++ b/BeocreateConnect/start.js
@@ -0,0 +1,25 @@
+/*Copyright 2018-2020 Bang & Olufsen A/S
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.*/
+
+// BEOCREATE CONNECT STARTER SCRIPT
+
+
+if (process.env.ELECTRON_RUN_AS_NODE) {
+	require('./writer.js');
+} else {
+	require('./main.js');
+}
\ No newline at end of file