diff --git a/core/.babelrc b/.babelrc
similarity index 73%
rename from core/.babelrc
rename to .babelrc
index 01673122..3ef5e0ea 100644
--- a/core/.babelrc
+++ b/.babelrc
@@ -3,8 +3,7 @@
         ["env", {
             "targets": {
                 "node": "6.7.0"
-            },
-            "debug": true
+            }
         }]
     ]
 }
diff --git a/.travis.yml b/.travis.yml
index 14b21a51..b9a8c60e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
 language: node_js
+
 node_js:
 - stable
+
 branches:
   only:
   - master
diff --git a/client/src/builtin/EmoteModule.js b/client/src/builtin/EmoteModule.js
index 82f188ed..95921f02 100644
--- a/client/src/builtin/EmoteModule.js
+++ b/client/src/builtin/EmoteModule.js
@@ -8,11 +8,12 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Events, Settings, Globals, WebpackModules, ReactComponents, MonkeyPatch } from 'modules';
-import { DOM, VueInjector, Reflection } from 'ui';
+import { Settings, Globals, WebpackModules, ReactComponents, MonkeyPatch } from 'modules';
+import { VueInjector, Reflection } from 'ui';
 import { Utils, FileUtils, ClientLogger as Logger } from 'common';
 import path from 'path';
 import EmoteComponent from './EmoteComponent.vue';
+import Autocomplete from '../ui/components/common/Autocomplete.vue';
 
 const enforceWrapperFrom = (new Date('2018-05-01')).valueOf();
 
@@ -24,26 +25,34 @@ export default new class EmoteModule {
     }
 
     async init() {
+        const dataPath = Globals.getPath('data');
+
         this.enabledSetting = Settings.getSetting('emotes', 'default', 'enable');
-        this.enabledSetting.on('setting-updated', event => {
+        this.enabledSetting.on('setting-updated', async event => {
+            // Load emotes if we haven't already
+            if (event.value && !this.emotes.size) await this.load(path.join(dataPath, 'emotes.json'));
+
             // Rerender all messages (or if we're disabling emotes, those that have emotes)
-            for (const message of document.querySelectorAll(event.value ? '.message' : '.bd-emote-outer')) {
+            for (const message of document.querySelectorAll(event.value ? '.message' : '.bd-emotewrapper')) {
                 Reflection(event.value ? message : message.closest('.message')).forceUpdate();
             }
         });
 
-        const dataPath = Globals.getPath('data');
         try {
-            await this.load(path.join(dataPath, 'emotes.json'));
+            if (this.enabledSetting.value) await this.load(path.join(dataPath, 'emotes.json'));
+            else Logger.info('EmoteModule', ['Not loading emotes as they\'re disabled.']);
         } catch (err) {
             Logger.err('EmoteModule', [`Failed to load emote data. Make sure you've downloaded the emote data and placed it in ${dataPath}:`, err]);
             return;
         }
 
         try {
-            await this.observe();
+            await Promise.all([
+                this.patchMessageContent(),
+                this.patchChannelTextArea()
+            ]);
         } catch (err) {
-            Logger.err('EmoteModule', ['Error patching Message', err]);
+            Logger.err('EmoteModule', ['Error patching Message / ChannelTextArea', err]);
         }
     }
 
@@ -54,8 +63,12 @@ export default new class EmoteModule {
             if ((index % 10000) === 0)
                 await Utils.wait();
 
-            const uri = emote.type === 2 ? 'https://cdn.betterttv.net/emote/:id/1x' : emote.type === 1 ? 'https://cdn.frankerfacez.com/emoticon/:id/1' : 'https://static-cdn.jtvnw.net/emoticons/v1/:id/1.0';
-            emote.name = emote.id;
+            const uri = emote.type === 2 ? 'https://cdn.betterttv.net/emote/:id/1x'
+                : emote.type === 1 ? 'https://cdn.frankerfacez.com/emoticon/:id/1'
+                    : 'https://static-cdn.jtvnw.net/emoticons/v1/:id/1.0';
+
+            // emote.id is the emote's name
+            // emote.src is the emote's URL
             emote.src = uri.replace(':id', emote.value.id || emote.value);
             this.emotes.set(emote.id, emote);
         }
@@ -92,17 +105,7 @@ export default new class EmoteModule {
         return this._searchCache || (this._searchCache = {});
     }
 
-    get React() {
-        return WebpackModules.getModuleByName('React');
-    }
-
-    get ReactDOM() {
-        return WebpackModules.getModuleByName('ReactDOM');
-    }
-
     processMarkup(markup, timestamp) {
-        if (!this.enabledSetting.value) return markup;
-
         timestamp = timestamp.valueOf();
         const allowNoWrapper = timestamp < enforceWrapperFrom;
 
@@ -126,12 +129,13 @@ export default new class EmoteModule {
                         newMarkup.push(text);
                         text = null;
                     }
-                    newMarkup.push(this.React.createElement('span', {
-                        className: 'bd-emote-outer',
-                        'data-bdemote-name': emote.name,
-                        'data-bdemote-src': emote.src,
-                        'data-has-wrapper': /;[\w]+;/gmi.test(word)
+
+                    newMarkup.push(VueInjector.createReactElement(EmoteComponent, {
+                        src: emote.src,
+                        name: emote.id,
+                        hasWrapper: /;[\w]+;/gmi.test(word)
                     }));
+
                     continue;
                 }
                 if (text === null) {
@@ -151,16 +155,6 @@ export default new class EmoteModule {
         return !/;[\w]+;/gmi.test(word);
     }
 
-    injectAll() {
-        if (!this.enabledSetting.value) return;
-
-        const all = document.getElementsByClassName('bd-emote-outer');
-        for (const ec of all) {
-            if (ec.children.length) continue;
-            this.injectEmote(ec);
-        }
-    }
-
     findByProp(obj, what, value) {
         if (obj.hasOwnProperty(what) && obj[what] === value) return obj;
         if (obj.props && !obj.children) return this.findByProp(obj.props, what, value);
@@ -173,56 +167,6 @@ export default new class EmoteModule {
         return null;
     }
 
-    async observe() {
-        const Message = await ReactComponents.getComponent('Message');
-        this.unpatchRender = MonkeyPatch('BD:EmoteModule', Message.component.prototype).after('render', (component, args, retVal) => {
-            try {
-                // First child has all the actual text content, second is the edited timestamp
-                const markup = this.findByProp(retVal, 'className', 'markup');
-                if (!markup) return;
-                markup.children[0] = this.processMarkup(markup.children[0], component.props.message.editedTimestamp || component.props.message.timestamp);
-            } catch (err) {
-                Logger.err('EmoteModule', err);
-            }
-        });
-        for (const message of document.querySelectorAll('.message')) {
-            Reflection(message).forceUpdate();
-        }
-        this.injectAll();
-        this.unpatchMount = MonkeyPatch('BD:EmoteModule', Message.component.prototype).after('componentDidMount', component => {
-            const element = this.ReactDOM.findDOMNode(component);
-            if (!element) return;
-            this.injectEmotes(element);
-        });
-        this.unpatchUpdate = MonkeyPatch('BD:EmoteModule', Message.component.prototype).after('componentDidUpdate', component => {
-            const element = this.ReactDOM.findDOMNode(component);
-            if (!element) return;
-            this.injectEmotes(element);
-        });
-    }
-
-    injectEmote(root) {
-        if (!this.enabledSetting.value) return;
-
-        while (root.firstChild) {
-            root.removeChild(root.firstChild);
-        }
-        const { bdemoteName, bdemoteSrc, hasWrapper } = root.dataset;
-        if (!bdemoteName || !bdemoteSrc) return;
-        VueInjector.inject(root, {
-            components: { EmoteComponent },
-            data: { src: bdemoteSrc, name: bdemoteName, hasWrapper },
-            template: '<EmoteComponent :src="src" :name="name" :hasWrapper="hasWrapper" />'
-        }, DOM.createElement('span'));
-        root.classList.add('bd-is-emote');
-    }
-
-    injectEmotes(element) {
-        if (!this.enabledSetting.value || !element) return;
-
-        for (const beo of element.getElementsByClassName('bd-emote-outer')) this.injectEmote(beo);
-    }
-
     getEmote(word) {
         const name = word.replace(/;/g, '');
         return this.emotes.get(name);
@@ -250,4 +194,35 @@ export default new class EmoteModule {
         return matching;
     }
 
+    async patchMessageContent() {
+        const selector = '.' + WebpackModules.getClassName('container', 'containerCozy', 'containerCompact', 'edited');
+        const MessageContent = await ReactComponents.getComponent('MessageContent', {selector});
+
+        this.unpatchRender = MonkeyPatch('BD:EmoteModule', MessageContent.component.prototype).after('render', (component, args, retVal) => {
+            try {
+                // First child has all the actual text content, second is the edited timestamp
+                const markup = retVal.props.children[1].props;
+                if (!markup || !markup.children || !this.enabledSetting.value) return;
+                markup.children[1] = this.processMarkup(markup.children[1], component.props.message.editedTimestamp || component.props.message.timestamp);
+            } catch (err) {
+                Logger.err('EmoteModule', err);
+            }
+        });
+
+        MessageContent.forceUpdateAll();
+    }
+
+    async patchChannelTextArea() {
+        const selector = '.' + WebpackModules.getClassName('channelTextArea', 'emojiButton');
+        const ChannelTextArea = await ReactComponents.getComponent('ChannelTextArea', {selector});
+
+        this.unpatchChannelTextArea = MonkeyPatch('BD:EmoteModule', ChannelTextArea.component.prototype).after('render', (component, args, retVal) => {
+            if (!(retVal.props.children instanceof Array)) retVal.props.children = [retVal.props.children];
+
+            retVal.props.children.splice(0, 0, VueInjector.createReactElement(Autocomplete, {}, true));
+        });
+
+        ChannelTextArea.forceUpdateAll();
+    }
+
 }
diff --git a/client/src/data/user.settings.default.json b/client/src/data/user.settings.default.json
index 7038d652..cfe23ae5 100644
--- a/client/src/data/user.settings.default.json
+++ b/client/src/data/user.settings.default.json
@@ -65,6 +65,18 @@
                         "value": false
                     }
                 ]
+            },
+            {
+                "id": "window-preferences",
+                "name": "Window Preferences",
+                "type": "drawer",
+                "settings": [
+                    {
+                        "id": "window-preferences",
+                        "type": "custom",
+                        "component": "WindowPreferences"
+                    }
+                ]
             }
         ]
     },
diff --git a/client/src/index.js b/client/src/index.js
index 77ad5d24..03c0b662 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -8,9 +8,9 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { DOM, BdUI, BdMenu, Modals, Reflection } from 'ui';
+import { DOM, BdUI, BdMenu, Modals, Reflection, Toasts } from 'ui';
 import BdCss from './styles/index.scss';
-import { Events, CssEditor, Globals, Settings, Database, Updater, ModuleManager, PluginManager, ThemeManager, ExtModuleManager, Vendor, WebpackModules, Patcher, MonkeyPatch, ReactComponents, ReactAutoPatcher, DiscordApi } from 'modules';
+import { Events, CssEditor, Globals, Settings, Database, Updater, ModuleManager, PluginManager, ThemeManager, ExtModuleManager, Vendor, WebpackModules, Patcher, MonkeyPatch, ReactComponents, ReactHelpers, ReactAutoPatcher, DiscordApi } from 'modules';
 import { ClientLogger as Logger, ClientIPC, Utils } from 'common';
 import { EmoteModule } from 'builtin';
 import electron from 'electron';
@@ -23,19 +23,30 @@ class BetterDiscord {
 
     constructor() {
         Logger.file = tests ? path.resolve(__dirname, '..', '..', 'tests', 'log.txt') : path.join(__dirname, 'log.txt');
+        Logger.trimLogFile();
         Logger.log('main', 'BetterDiscord starting');
 
         this._bd = {
-            DOM, BdUI, BdMenu, Modals, Reflection,
+            DOM, BdUI, BdMenu, Modals, Reflection, Toasts,
 
             Events, CssEditor, Globals, Settings, Database, Updater,
             ModuleManager, PluginManager, ThemeManager, ExtModuleManager,
             Vendor,
 
-            WebpackModules, Patcher, MonkeyPatch, ReactComponents, DiscordApi,
+            WebpackModules, Patcher, MonkeyPatch, ReactComponents, ReactHelpers, ReactAutoPatcher, DiscordApi,
             EmoteModule,
 
-            Logger, ClientIPC, Utils
+            Logger, ClientIPC, Utils,
+
+            plugins: PluginManager.localContent,
+            themes: ThemeManager.localContent,
+            extmodules: ExtModuleManager.localContent,
+
+            __filename, __dirname,
+            module: Globals.require.cache[__filename],
+            require: Globals.require,
+            webpack_require: __webpack_require__, // eslint-disable-line no-undef
+            get discord_require() { return WebpackModules.require }
         };
 
         const developermode = Settings.getSetting('core', 'advanced', 'developer-mode');
diff --git a/client/src/modules/content.js b/client/src/modules/content.js
index 854761a6..61d0101d 100644
--- a/client/src/modules/content.js
+++ b/client/src/modules/content.js
@@ -8,7 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Utils, FileUtils, ClientLogger as Logger, AsyncEventEmitter } from 'common';
+import { Utils, ClientLogger as Logger, AsyncEventEmitter } from 'common';
 import { Modals } from 'ui';
 import Database from './database';
 
diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index 2cbdd863..f89e7f94 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -12,7 +12,6 @@ import Content from './content';
 import Globals from './globals';
 import Database from './database';
 import { Utils, FileUtils, ClientLogger as Logger } from 'common';
-import { Events } from 'modules';
 import { SettingsSet, ErrorEvent } from 'structs';
 import { Modals } from 'ui';
 import path from 'path';
@@ -240,7 +239,7 @@ export default class {
                 mainPath
             };
 
-            const content = await this.loadContent(paths, configs, readConfig.info, readConfig.main, readConfig.dependencies, readConfig.permissions);
+            const content = await this.loadContent(paths, configs, readConfig.info, readConfig.main, readConfig.dependencies, readConfig.permissions, readConfig.mainExport);
             if (!content) return undefined;
             if (!reload && this.getContentById(content.id))
                 throw {message: `A ${this.contentType} with the ID ${content.id} already exists.`};
@@ -256,20 +255,26 @@ export default class {
     /**
      * Unload content.
      * @param {Content|String} content Content to unload
+     * @param {Boolean} force If true the content will be unloaded even if an exception is thrown when disabling/unloading
      * @param {Boolean} reload Whether to reload the content after
      * @return {Content}
      */
-    static async unloadContent(content, reload) {
+    static async unloadContent(content, force, reload) {
         content = this.findContent(content);
         if (!content) throw {message: `Could not find a ${this.contentType} from ${content}.`};
 
         try {
-            await content.disable(false);
-            await content.emit('unload', reload);
+            const disablePromise = content.disable(false);
+            const unloadPromise = content.emit('unload', reload);
+
+            if (!force) {
+                await disablePromise;
+                await unloadPromise;
+            }
 
             const index = this.getContentIndex(content);
 
-            delete window.require.cache[window.require.resolve(content.paths.mainPath)];
+            delete Globals.require.cache[Globals.require.resolve(content.paths.mainPath)];
 
             if (reload) {
                 const newcontent = await this.preloadContent(content.dirName, true, index);
@@ -288,10 +293,11 @@ export default class {
     /**
      * Reload content.
      * @param {Content|String} content Content to reload
+     * @param {Boolean} force If true the content will be unloaded even if an exception is thrown when disabling/unloading
      * @return {Content}
      */
-    static reloadContent(content) {
-        return this.unloadContent(content, true);
+    static reloadContent(content, force) {
+        return this.unloadContent(content, force, true);
     }
 
     /**
@@ -335,18 +341,10 @@ export default class {
     /**
      * Wait for content to load
      * @param {String} content_id
-     * @return {Promise}
+     * @return {Promise => Content}
      */
     static waitForContent(content_id) {
-        return new Promise((resolve, reject) => {
-            const check = () => {
-                const content = this.getContentById(content_id);
-                if (content) return resolve(content);
-
-                setTimeout(check, 100);
-            };
-            check();
-        });
+        return Utils.until(() => this.getContentById(content_id), 100);
     }
 
 }
diff --git a/client/src/modules/csseditor.js b/client/src/modules/csseditor.js
index 812b894c..c791f2c6 100644
--- a/client/src/modules/csseditor.js
+++ b/client/src/modules/csseditor.js
@@ -8,12 +8,12 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { FileUtils, ClientLogger as Logger, ClientIPC } from 'common';
-import Settings from './settings';
 import { DOM } from 'ui';
-import filewatcher from 'filewatcher';
+import { FileUtils, ClientLogger as Logger, ClientIPC } from 'common';
 import path from 'path';
 import electron from 'electron';
+import filewatcher from 'filewatcher';
+import Settings from './settings';
 
 /**
  * Custom css editor communications
diff --git a/client/src/modules/discordapi.js b/client/src/modules/discordapi.js
index 948a73da..b9c4113e 100644
--- a/client/src/modules/discordapi.js
+++ b/client/src/modules/discordapi.js
@@ -1,47 +1,25 @@
+/**
+ * BetterDiscord Discord API
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+import { List } from 'structs';
+import { User, Channel, Guild, Message } from 'discordstructs';
 import { WebpackModules } from './webpackmodules';
-import { $ } from 'vendor';
 
-class List extends Array {
-
-    constructor() {
-        super(...arguments);
-    }
-
-    get(...filters) {
-        return this.find(item => {
-            for (let filter of filters) {
-                for (let key in filter) {
-                    if (filter.hasOwnProperty(key)) {
-                        if (item[key] !== filter[key]) return false;
-                    }
-                }
-            }
-            return true;
-        });
-    }
-}
-
-class PermissionsError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'PermissionsError';
-    }
-}
-
-class InsufficientPermissions extends PermissionsError {
-    constructor(message) {
-        super(`Missing Permission — ${message}`)
-        this.name = 'InsufficientPermissions';
-    }
-}
-
-const Modules = {
+export const Modules = {
     _getModule(name) {
         const foundModule = WebpackModules.getModuleByName(name);
         if (!foundModule) return null;
         delete this[name];
         return this[name] = foundModule;
     },
+
     get ChannelSelector() { return this._getModule('ChannelSelector'); },
     get MessageActions() { return this._getModule('MessageActions'); },
     get MessageParser() { return this._getModule('MessageParser'); },
@@ -64,356 +42,258 @@ const Modules = {
     get UserStore() { return this._getModule('UserStore'); },
     get RelationshipStore() { return this._getModule('RelationshipStore'); },
     get RelationshipManager() { return this._getModule('RelationshipManager'); },
+    get ChangeNicknameModal() { return this._getModule('ChangeNicknameModal'); },
+    get UserSettingsStore() { return this._getModule('UserSettingsStore'); },
+    get UserSettingsWindow() { return this._getModule('UserSettingsWindow'); },
+    get UserStatusStore() { return this._getModule('UserStatusStore'); },
+    get ChannelSettingsWindow() { return this._getModule('ChannelSettingsWindow'); },
+    get GuildSettingsWindow() { return this._getModule('GuildSettingsWindow'); },
+    get CreateChannelModal() { return this._getModule('CreateChannelModal'); },
+    get PruneMembersModal() { return this._getModule('PruneMembersModal'); },
+    get NotificationSettingsModal() { return this._getModule('NotificationSettingsModal'); },
+    get PrivacySettingsModal() { return this._getModule('PrivacySettingsModal'); },
+    get UserProfileModal() { return this._getModule('UserProfileModal'); },
+    get APIModule() { return this._getModule('APIModule'); },
+    get UserNoteStore() { return this._getModule('UserNoteStore'); },
 
     get DiscordPermissions() { return this.DiscordConstants.Permissions; }
-
 };
 
-class User {
-    constructor(data) {
-        for (let key in data)
-            if (data.hasOwnProperty(key))
-                this[key] = data[key];
-        this.discordObject = data;
-    }
-
-    static fromId(id) {
-        return new User(Modules.UserStore.getUser(id));
-    }
-
-    async sendMessage(content, parse = true) {
-        const id = await Modules.PrivateChannelActions.ensurePrivateChannel(DiscordApi.currentUser.id, this.id);
-        const channel = new PrivateChannel(Modules.ChannelStore.getChannel(id));
-        channel.sendMessage(content, parse);
-    }
-
-    get isFriend() {
-        return Modules.RelationshipStore.isFriend(this.id);
-    }
-
-    get isBlocked() {
-        return Modules.RelationshipStore.isBlocked(this.id);
-    }
-
-    addFriend() {
-        Modules.RelationshipManager.addRelationship(this.id, {location: 'Context Menu'});
-    }
-
-    removeFriend() {
-        Modules.RelationshipManager.removeRelationship(this.id, {location: 'Context Menu'});
-    }
-
-    block() {
-        Modules.RelationshipManager.addRelationship(this.id, {location: 'Context Menu'}, Modules.DiscordConstants.RelationshipTypes.BLOCKED);
-    }
-
-    unblock() {
-        Modules.RelationshipManager.removeRelationship(this.id, {location: 'Context Menu'});
-    }
-}
-
-class Member extends User {
-    constructor(data, guild) {
-        super(data);
-        const userData = Modules.UserStore.getUser(data.userId);
-        for (let key in userData)
-            if (userData.hasOwnProperty(key))
-                this[key] = userData[key];
-        this.guild_id = guild;
-    }
-
-    checkPermissions(perms) {
-        return Modules.PermissionUtils.can(perms, DiscordApi.currentUser, Modules.GuildStore.getGuild(this.guild_id));
-    }
-
-    kick(reason = '') {
-        if (!this.checkPermissions(Modules.DiscordPermissions.KICK_MEMBERS)) throw new InsufficientPermissions('KICK_MEMBERS');
-        Modules.GuildActions.kickUser(this.guild_id, this.id, reason);
-    }
-
-    ban(daysToDelete = '1', reason = '') {
-        if (!this.checkPermissions(Modules.DiscordPermissions.BAN_MEMBERS)) throw new InsufficientPermissions('BAN_MEMBERS');
-        Modules.GuildActions.banUser(this.guild_id, this.id, daysToDelete, reason);
-    }
-
-    unban() {
-        if (!this.checkPermissions(Modules.DiscordPermissions.BAN_MEMBERS)) throw new InsufficientPermissions('BAN_MEMBERS');
-        Modules.GuildActions.unbanUser(this.guild_id, this.id);
-    }
-
-    move(channel_id) {
-        if (!this.checkPermissions(Modules.DiscordPermissions.MOVE_MEMBERS)) throw new InsufficientPermissions('MOVE_MEMBERS');
-        Modules.GuildActions.setChannel(this.guild_id, this.id, channel_id);
-    }
-
-    mute(active = true) {
-        if (!this.checkPermissions(Modules.DiscordPermissions.MUTE_MEMBERS)) throw new InsufficientPermissions('MUTE_MEMBERS');
-        Modules.GuildActions.setServerMute(this.guild_id, this.id, active);
-    }
-
-    unmute(active = true) {
-        this.mute(false);
-    }
-
-    deafen(active = true) {
-        if (!this.checkPermissions(Modules.DiscordPermissions.DEAFEN_MEMBERS)) throw new InsufficientPermissions('DEAFEN_MEMBERS');
-        Modules.GuildActions.setServerDeaf(this.guild_id, this.id, active);
-    }
-
-    undeafen(active = true) {
-        this.deafen(false);
-    }
-}
-
-class Guild {
-    constructor(data) {
-        for (let key in data)
-            if (data.hasOwnProperty(key))
-                this[key] = data[key];
-        this.discordObject = data;
-    }
-
-    get channels() {
-        const channels = Modules.GuildChannelsStore.getChannels(this.id);
-        const returnChannels = new List();
-        for (const category in channels) {
-            if (channels.hasOwnProperty(category)) {
-                if (!Array.isArray(channels[category])) continue;
-                const channelList = channels[category];
-                for (const channel of channelList) {
-                    returnChannels.push(new GuildChannel(channel.channel));
-                }
-            }
-        }
-        return returnChannels;
-    }
-
-    get defaultChannel() {
-        return new GuildChannel(Modules.GuildChannelsStore.getDefaultChannel(this.id));
-    }
-
-    get members() {
-        const members = Modules.GuildMemberStore.getMembers(this.id);
-        const returnMembers = new List();
-        for (const member of members) returnMembers.push(new Member(member, this.id));
-        return returnMembers;
-    }
-
-    get memberCount() {
-        return Modules.MemberCountStore.getMemberCount(this.id);
-    }
-
-    get emojis() {
-        return Modules.EmojiUtils.getGuildEmoji(this.id);
-    }
-
-    get permissions() {
-        return Modules.GuildPermissions.getGuildPermissions(this.id);
-    }
-
-    getMember(userId) {
-        return Modules.GuildMemberStore.getMember(this.id, userId);
-    }
-
-    isMember(userId) {
-        return Modules.GuildMemberStore.isMember(this.id, userId);
-    }
-
-    markAsRead() {
-        Modules.GuildActions.markGuildAsRead(this.id);
-    }
-
-    select() {
-        Modules.GuildActions.selectGuild(this.id);
-    }
-
-    nsfwAgree() {
-        Modules.GuildActions.nsfwAgree(this.id);
-    }
-
-    nsfwDisagree() {
-        Modules.GuildActions.nsfwDisagree(this.id);
-    }
-
-    changeSortLocation(index) {
-        Modules.GuildActions.move(DiscordApi.guildPositions.indexOf(this.id), index);
-    }
-}
-
-class Channel {
-    constructor(data) {
-        for (let key in data)
-            if (data.hasOwnProperty(key))
-                this[key] = data[key];
-        this.discordObject = data;
-    }
-
-    checkPermissions(perms) {
-        return Modules.PermissionUtils.can(perms, DiscordApi.currentUser, this.discordObject) || this.isPrivate();
-    }
-
-    async sendMessage(content, parse = true) {
-        if (!this.checkPermissions(Modules.DiscordPermissions.VIEW_CHANNEL | Modules.DiscordPermissions.SEND_MESSAGES)) throw new InsufficientPermissions('SEND_MESSAGES');
-        let response = {};
-        if (parse) response = await Modules.MessageActions._sendMessage(this.id, Modules.MessageParser.parse(this.discordObject, content));
-        else response = await Modules.MessageActions._sendMessage(this.id, {content});
-        return new Message(Modules.MessageStore.getMessage(this.id, response.body.id));
-    }
-
-    get messages() {
-        const messages = Modules.MessageStore.getMessages(this.id).toArray();
-        for (let i in messages)
-            if (messages.hasOwnProperty(i))
-                messages[i] = new Message(messages[i]);
-        return new List(...messages);
-    }
-
-    jumpToPresent() {
-        if (!this.checkPermissions(Modules.DiscordPermissions.VIEW_CHANNEL)) throw new InsufficientPermissions('VIEW_CHANNEL');
-        if (this.hasMoreAfter) Modules.MessageActions.jumpToPresent(this.id, Modules.DiscordConstants.MAX_MESSAGES_PER_CHANNEL);
-        else this.messages[this.messages.length - 1].jumpTo(false);
-    }
-
-    get hasMoreAfter() {
-        return Modules.MessageStore.getMessages(this.id).hasMoreAfter;
-    }
-
-    sendInvite(inviteId) {
-        if (!this.checkPermissions(Modules.DiscordPermissions.VIEW_CHANNEL | Modules.DiscordPermissions.SEND_MESSAGES)) throw new InsufficientPermissions('SEND_MESSAGES');
-        Modules.MessageActions.sendInvite(this.id, inviteId);
-    }
-
-    select() {
-        if (!this.checkPermissions(Modules.DiscordPermissions.VIEW_CHANNEL)) throw new InsufficientPermissions('VIEW_CHANNEL');
-        Modules.NavigationUtils.transitionToGuild(this.guild_id ? this.guild_id : Modules.DiscordConstants.ME, this.id);
-    }
-}
-
-class GuildChannel extends Channel {
-
-    constructor(data) {
-        super(data);
-    }
-
-    get permissions() {
-        return Modules.GuildPermissions.getChannelPermissions(this.id);
-    }
-
-    get guild() {
-        return new Guild(Modules.GuildStore.getGuild(this.guild_id));
-    }
-
-    isDefaultChannel() {
-        return Modules.GuildChannelsStore.getDefaultChannel(this.guild_id).id === this.id;
-    }
-
-}
-
-class PrivateChannel extends Channel {
-    constructor(data) {
-        super(data);
-    }
-}
-
-class Message {
-    constructor(data) {
-        for (let key in data)
-            if (data.hasOwnProperty(key))
-                this[key] = data[key];
-        this.discordObject = data;
-    }
-
-    delete() {
-        Modules.MessageActions.deleteMessage(this.channel_id, this.id);
-    }
-
-    // programmatically update the content
-    edit(content, parse = false) {
-        if (this.author.id !== DiscordApi.currentUser.id) return;
-        if (parse) Modules.MessageActions.editMessage(this.channel_id, this.id, Modules.MessageParser.parse(this.discordObject, content));
-        else Modules.MessageActions.editMessage(this.channel_id, this.id, {content});
-    }
-
-    // start the editing mode of GUI
-    startEdit() {
-        if (this.author.id !== DiscordApi.currentUser.id) return;
-        Modules.MessageActions.startEditMessage(this.channel_id, this.id, this.content);
-    }
-
-    // end editing mode of GUI
-    endEdit() {
-        Modules.MessageActions.endEditMessage();
-    }
-
-    jumpTo(flash = true) {
-        Modules.MessageActions.jumpToMessage(this.channel_id, this.id, flash);
-    }
-}
-
 export default class DiscordApi {
 
-    static get channels() {
-        const channels = Modules.ChannelStore.getChannels();
-        const returnChannels = new List();
-        for (const [key, value] of Object.entries(channels)) {
-            returnChannels.push(value.isPrivate() ? new PrivateChannel(value) : new GuildChannel(value));
-        }
-        return returnChannels;
-    }
+    static get modules() { return Modules }
+    static get User() { return User }
+    static get Channel() { return Channel }
+    static get Guild() { return Guild }
+    static get Message() { return Message }
 
+    /**
+     * A list of loaded guilds.
+     */
     static get guilds() {
         const guilds = Modules.GuildStore.getGuilds();
-        const returnGuilds = new List();
-        for (const [key, value] of Object.entries(guilds)) {
-            returnGuilds.push(new Guild(value));
-        }
-        return returnGuilds;
+        return List.from(Object.entries(guilds), ([i, g]) => Guild.from(g));
     }
 
+    /**
+     * A list of loaded channels.
+     */
+    static get channels() {
+        const channels = Modules.ChannelStore.getChannels();
+        return List.from(Object.entries(channels), ([i, c]) => Channel.from(c));
+    }
+
+    /**
+     * A list of loaded users.
+     */
     static get users() {
         const users = Modules.UserStore.getUsers();
-        const returnUsers = new List();
-        for (const [key, value] of Object.entries(users)) {
-            returnUsers.push(new User(value));
-        }
-        return returnUsers;
+        return List.from(Object.entries(users), ([i, u]) => User.from(u));
     }
 
+    /**
+     * An object mapping guild IDs to their member counts.
+     */
     static get memberCounts() {
         return Modules.MemberCountStore.getMemberCounts();
     }
 
+    /**
+     * A list of guilds in the order they appear in the server list.
+     */
     static get sortedGuilds() {
         const guilds = Modules.SortedGuildStore.getSortedGuilds();
-        const returnGuilds = new List();
-        for (const guild of guilds) {
-            returnGuilds.push(new Guild(guild));
-        }
-        return returnGuilds;
+        return List.from(guilds, g => Guild.from(g));
     }
 
+    /**
+     * An array of guild IDs in the order they appear in the server list.
+     */
     static get guildPositions() {
         return Modules.SortedGuildStore.guildPositions;
     }
 
+    /**
+     * The currently selected guild.
+     */
     static get currentGuild() {
-        return new Guild(Modules.GuildStore.getGuild(Modules.SelectedGuildStore.getGuildId()));
+        const guild = Modules.GuildStore.getGuild(Modules.SelectedGuildStore.getGuildId());
+        if (guild) return Guild.from(guild);
     }
 
+    /**
+     * The currently selected channel.
+     */
     static get currentChannel() {
         const channel = Modules.ChannelStore.getChannel(Modules.SelectedChannelStore.getChannelId());
-        if (channel) return channel.isPrivate() ? new PrivateChannel(channel) : new GuildChannel(channel);
+        if (channel) return Channel.from(channel);
     }
 
+    /**
+     * The current user.
+     */
     static get currentUser() {
-        return Modules.UserStore.getCurrentUser();
+        const user = Modules.UserStore.getCurrentUser();
+        if (user) return User.from(user);
     }
 
+    /**
+     * A list of the current user's friends.
+     */
     static get friends() {
         const friends = Modules.RelationshipStore.getFriendIDs();
-        const returnUsers = new List();
-        for (const id of friends) returnUsers.push(User.fromId(id));
-        return returnUsers;
+        return List.from(friends, id => User.fromId(id));
+    }
+
+    static get UserSettings() {
+        return UserSettings;
     }
 
 }
+
+export class UserSettings {
+    /**
+     * Opens Discord's settings UI.
+     */
+    static open(section = 'ACCOUNT') {
+        Modules.UserSettingsWindow.setSection(section);
+        Modules.UserSettingsWindow.open();
+    }
+
+    /**
+     * The user's current status. Either "online", "idle", "dnd" or "invisible".
+     */
+    static get status() { return Modules.UserSettingsStore.status }
+
+    /**
+     * The user's selected explicit content filter level.
+     * 0 == off, 1 == everyone except friends, 2 == everyone
+     * Configurable in the privacy and safety panel.
+     */
+    static get explicitContentFilter() { return Modules.UserSettingsStore.explicitContentFilter }
+
+    /**
+     * Whether to disallow direct messages from server members by default.
+     */
+    static get defaultGuildsRestricted() { return Modules.UserSettingsStore.defaultGuildsRestricted }
+
+    /**
+     * An array of guilds to disallow direct messages from their members.
+     * This is bypassed if the member is has another mutual guild with this disabled, or the member is friends with the current user.
+     * Configurable in each server's privacy settings.
+     */
+    static get restrictedGuildIds() { return Modules.UserSettingsStore.restrictedGuilds }
+
+    static get restrictedGuilds() {
+        return List.from(this.restrictedGuildIds, id => Guild.fromId(id) || id);
+    }
+
+    /**
+     * An array of flags specifying who should be allowed to add the current user as a friend.
+     * If everyone is checked, this will only have one item, "all". Otherwise it has either "mutual_friends", "mutual_guilds", both or neither.
+     * Configurable in the privacy and safety panel.
+     */
+    static get friendSourceFlags() { return Object.keys(Modules.UserSettingsStore.friendSourceFlags) }
+    static get friendSourceEveryone() { return this.friendSourceFlags.include('all') }
+    static get friendSourceMutual_friends() { return this.friendSourceFlags.include('all') || this.friendSourceFlags.include('mutual_friends') }
+    static get friendSourceMutual_guilds() { return this.friendSourceFlags.include('all') || this.friendSourceFlags.include('mutual_guilds') }
+    static get friendSourceAnyone() { return this.friendSourceFlags.length > 0 }
+
+    /**
+     * Whether to automatically add accounts from other platforms running on the user's computer.
+     * Configurable in the connections panel.
+     */
+    static get detectPlatformAccounts() { return Modules.UserSettingsStore.detectPlatformAccounts }
+
+    /**
+     * The number of seconds Discord will wait for activity before sending mobile push notifications.
+     * Configurable in the notifications panel.
+     */
+    static get afkTimeout() { return Modules.UserSettingsStore.afkTimeout }
+
+    /**
+     * Whether to display the currently running game as a status message.
+     * Configurable in the games panel.
+     */
+    static get showCurrentGame() { return Modules.UserSettingsStore.showCurrentGame }
+
+    /**
+     * Whether to show images uploaded directly to Discord.
+     * Configurable in the text and images panel.
+     */
+    static get inlineAttachmentMedia() { return Modules.UserSettingsStore.inlineAttachmentMedia }
+
+    /**
+     * Whether to show images linked in Discord.
+     * Configurable in the text and images panel.
+     */
+    static get inlineEmbedMedia() { return Modules.UserSettingsStore.inlineEmbedMedia }
+
+    /**
+     * Whether to automatically play GIFs when the Discord window is active without having to hover the mouse over the image.
+     * Configurable in the text and images panel.
+     */
+    static get autoplayGifs() { return Modules.UserSettingsStore.gifAutoPlay }
+
+    /**
+     * Whether to show content from HTTP[s] links as embeds.
+     * Configurable in the text and images panel.
+     */
+    static get showEmbeds() { return Modules.UserSettingsStore.renderEmbeds }
+
+    /**
+     * Whether to show a message's reactions.
+     * Configurable in the text and images panel.
+     */
+    static get showReactions() { return Modules.UserSettingsStore.renderReactions }
+
+    /**
+     * Whether to play animated emoji.
+     * Configurable in the text and images panel.
+     */
+    static get animateEmoji() { return Modules.UserSettingsStore.animateEmoji }
+
+    /**
+     * Whether to convert ASCII emoticons to emoji.
+     * Configurable in the text and images panel.
+     */
+    static get convertEmoticons() { return Modules.UserSettingsStore.convertEmoticons }
+
+    /**
+     * Whether to allow playing text-to-speech messages.
+     * Configurable in the text and images panel.
+     */
+    static get allowTts() { return Modules.UserSettingsStore.enableTTSCommand }
+
+    /**
+     * The user's selected theme. Either "dark" or "light".
+     * Configurable in the appearance panel.
+     */
+    static get theme() { return Modules.UserSettingsStore.theme }
+
+    /**
+     * Whether the user has enabled compact mode.
+     * `true` if compact mode is enabled, `false` if cozy mode is enabled.
+     * Configurable in the appearance panel.
+     */
+    static get displayCompact() { return Modules.UserSettingsStore.messageDisplayCompact }
+
+    /**
+     * Whether the user has enabled developer mode.
+     * Currently only adds a "Copy ID" option to the context menu on users, guilds and channels.
+     * Configurable in the appearance panel.
+     */
+    static get developerMode() { return Modules.UserSettingsStore.developerMode }
+
+    /**
+     * The user's selected language code.
+     * Configurable in the language panel.
+     */
+    static get locale() { return Modules.UserSettingsStore.locale }
+
+    /**
+     * The user's timezone offset in hours.
+     * This is not configurable.
+     */
+    static get timezoneOffset() { return Modules.UserSettingsStore.timezoneOffset }
+}
diff --git a/client/src/modules/eventhook.js b/client/src/modules/eventhook.js
index c2665e18..b1b76650 100644
--- a/client/src/modules/eventhook.js
+++ b/client/src/modules/eventhook.js
@@ -8,7 +8,6 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Utils, ClientLogger as Logger } from 'common';
 import { WebpackModules } from './webpackmodules';
 import Events from './events';
 import EventListener from './eventlistener';
@@ -22,7 +21,6 @@ import * as SocketStructs from '../structs/socketstructs';
 export default class extends EventListener {
 
     init() {
-        Logger.log('EventHook', SocketStructs);
         this.hook();
     }
 
@@ -38,18 +36,16 @@ export default class extends EventListener {
 
     hook() {
         const self = this;
-        const orig = this.eventsModule.prototype.emit;
-        this.eventsModule.prototype.emit = function (...args) {
+        const Events = WebpackModules.getModuleByName('Events');
+
+        const orig = Events.prototype.emit;
+        Events.prototype.emit = function (...args) {
             orig.call(this, ...args);
             self.wsc = this;
             self.emit(...args);
         };
     }
 
-    get eventsModule() {
-        return WebpackModules.getModuleByName('Events');
-    }
-
     /**
      * Discord emit overload
      * @param {any} event
@@ -68,22 +64,29 @@ export default class extends EventListener {
      * @param {any} event Event
      * @param {any} data Event data
      */
-    dispatch(e, d) {
-        Events.emit('raw-event', { type: e, data: d });
-        if (e === this.actions.READY || e === this.actions.RESUMED) {
-            Events.emit(e, d);
+    dispatch(type, data) {
+        Events.emit('raw-event', { type, data });
+
+        if (type === this.actions.READY || type === this.actions.RESUMED) {
+            Events.emit(type, data);
             return;
         }
-        if (!Object.keys(SocketStructs).includes(e)) return;
-        const evt = new SocketStructs[e](d);
-        Events.emit(`discord:${e}`, evt);
+
+        if (!Object.keys(SocketStructs).includes(type)) return;
+        Events.emit(`discord:${type}`, new SocketStructs[type](data));
+    }
+
+    get SocketStructs() {
+        return SocketStructs;
     }
 
     /**
      * All known socket actions
      */
     get actions() {
-        return {
+        if (this._actions) return this._actions;
+
+        return this._actions = {
             READY: 'READY', // Socket ready
             RESUMED: 'RESUMED', // Socket resumed
             TYPING_START: 'TYPING_START', // User typing start
diff --git a/client/src/modules/events.js b/client/src/modules/events.js
index 7021d33e..72e85d25 100644
--- a/client/src/modules/events.js
+++ b/client/src/modules/events.js
@@ -40,13 +40,15 @@ export default class {
         emitter.removeListener(event, callback);
     }
 
+    static get removeListener() { return this.off }
+
     /**
      * Emits an event
      * @param {String} event The event to emit
      * @param {Any} ...data Data to pass to the event listeners
      */
-    static emit(...args) {
-        emitter.emit(...args);
+    static emit(event, ...data) {
+        emitter.emit(event, ...data);
     }
 
 }
diff --git a/client/src/modules/eventswrapper.js b/client/src/modules/eventswrapper.js
index bd8ece2b..ac5deacc 100644
--- a/client/src/modules/eventswrapper.js
+++ b/client/src/modules/eventswrapper.js
@@ -14,6 +14,7 @@ export default class EventsWrapper {
 
     constructor(eventemitter, bind) {
         eventemitters.set(this, eventemitter);
+        this.bind = bind || this;
     }
 
     get eventSubs() {
@@ -37,16 +38,16 @@ export default class EventsWrapper {
 
     get off() { return this.unsubscribe }
     unsubscribe(event, callback) {
-        for (let index of this.eventSubs) {
+        for (let index in this.eventSubs) {
             if (this.eventSubs[index].event !== event || (callback && this.eventSubs[index].callback === callback)) continue;
-            eventemitters.get(this).off(event, this.eventSubs[index].boundCallback);
+            eventemitters.get(this).removeListener(event, this.eventSubs[index].boundCallback);
             this.eventSubs.splice(index, 1);
         }
     }
 
     unsubscribeAll() {
         for (let event of this.eventSubs) {
-            eventemitters.get(this).off(event.event, event.boundCallback);
+            eventemitters.get(this).removeListener(event.event, event.boundCallback);
         }
         this.eventSubs.splice(0, this.eventSubs.length);
     }
diff --git a/client/src/modules/extmodule.js b/client/src/modules/extmodule.js
index 4b8fb0db..262fbd84 100644
--- a/client/src/modules/extmodule.js
+++ b/client/src/modules/extmodule.js
@@ -8,13 +8,14 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+import Globals from './globals';
 import Content from './content';
 
 export default class ExtModule extends Content {
 
     constructor(internals) {
         super(internals);
-        this.__require = window.require(this.paths.mainPath);
+        this.__require = Globals.require(this.paths.mainPath);
     }
 
     get type() { return 'module' }
diff --git a/client/src/modules/extmodulemanager.js b/client/src/modules/extmodulemanager.js
index 89bf2efd..8055c84c 100644
--- a/client/src/modules/extmodulemanager.js
+++ b/client/src/modules/extmodulemanager.js
@@ -10,8 +10,6 @@
 
 import ContentManager from './contentmanager';
 import ExtModule from './extmodule';
-import { ClientLogger as Logger } from 'common';
-import { Events } from 'modules';
 
 export default class extends ContentManager {
 
diff --git a/client/src/modules/globals.js b/client/src/modules/globals.js
index 6b0312f4..3b0b5b3b 100644
--- a/client/src/modules/globals.js
+++ b/client/src/modules/globals.js
@@ -17,6 +17,10 @@ export default new class extends Module {
 
     constructor(args) {
         super(args);
+
+        // webpack replaces this with the normal require function
+        // eslint-disable-next-line no-undef
+        this.require = __non_webpack_require__;
     }
 
     initg() {
diff --git a/client/src/modules/modulemanager.js b/client/src/modules/modulemanager.js
index 0186cfa7..4b2e25fd 100644
--- a/client/src/modules/modulemanager.js
+++ b/client/src/modules/modulemanager.js
@@ -9,8 +9,8 @@
 */
 
 import { ClientLogger as Logger } from 'common';
-import { Events, SocketProxy, EventHook, CssEditor } from 'modules';
-import { ProfileBadges } from 'ui';
+import { SocketProxy, EventHook, CssEditor } from 'modules';
+import { ProfileBadges, ClassNormaliser } from 'ui';
 import Updater from './updater';
 
 /**
@@ -24,6 +24,7 @@ export default class {
     static get modules() {
         return this._modules ? this._modules : (this._modules = [
             new ProfileBadges(),
+            new ClassNormaliser(),
             new SocketProxy(),
             new EventHook(),
             CssEditor,
diff --git a/client/src/modules/modules.js b/client/src/modules/modules.js
index c305d11a..a038ac76 100644
--- a/client/src/modules/modules.js
+++ b/client/src/modules/modules.js
@@ -21,4 +21,4 @@ export { default as Module } from './module';
 export { default as EventListener } from './eventlistener';
 export { default as SocketProxy } from './socketproxy';
 export { default as EventHook } from './eventhook';
-export { default as DiscordApi } from './discordapi';
+export { default as DiscordApi, Modules as DiscordApiModules } from './discordapi';
diff --git a/client/src/modules/patcher.js b/client/src/modules/patcher.js
index b4891842..8f2cbce5 100644
--- a/client/src/modules/patcher.js
+++ b/client/src/modules/patcher.js
@@ -9,7 +9,7 @@
 */
 
 import { WebpackModules } from './webpackmodules';
-import { ClientLogger as Logger, Utils } from 'common';
+import { ClientLogger as Logger } from 'common';
 
 export class Patcher {
 
@@ -37,9 +37,8 @@ export class Patcher {
     }
 
     static resolveModule(module) {
-        if (module instanceof Function || (module instanceof Object && !(module instanceof Array))) return module;
+        if (module instanceof Function || (module instanceof Object)) return module;
         if (typeof module === 'string') return WebpackModules.getModuleByName(module);
-        if (module instanceof Array) return WebpackModules.getModuleByProps(module);
         return null;
     }
 
@@ -70,7 +69,7 @@ export class Patcher {
 
             for (const slavePatch of patch.children.filter(c => c.type === 'after')) {
                 try {
-                    slavePatch.callback(this, arguments, retVal);
+                    slavePatch.callback(this, arguments, retVal, r => retVal = r);
                 } catch (err) {
                     Logger.err(`Patcher:${patch.id}`, err);
                 }
@@ -80,7 +79,9 @@ export class Patcher {
     }
 
     static rePatch(patch) {
-        patch.proxyFunction = patch.module[patch.functionName] = this.overrideFn(patch);
+        if (patch.module instanceof Array && typeof patch.functionName === 'number')
+            patch.module.splice(patch.functionName, 1, patch.proxyFunction = this.overrideFn(patch));
+        else patch.proxyFunction = patch.module[patch.functionName] = this.overrideFn(patch);
     }
 
     static pushPatch(caller, id, module, functionName) {
diff --git a/client/src/modules/plugin.js b/client/src/modules/plugin.js
index 039ba05e..5a6b36ef 100644
--- a/client/src/modules/plugin.js
+++ b/client/src/modules/plugin.js
@@ -18,12 +18,12 @@ export default class Plugin extends Content {
     get start() { return this.enable }
     get stop() { return this.disable }
 
-    reload() {
-        return PluginManager.reloadPlugin(this);
+    reload(force) {
+        return PluginManager.reloadPlugin(this, force);
     }
 
-    unload() {
-        return PluginManager.unloadPlugin(this);
+    unload(force) {
+        return PluginManager.unloadPlugin(this, force);
     }
 
 }
diff --git a/client/src/modules/pluginapi.js b/client/src/modules/pluginapi.js
index f72ceab5..5f7cbfbb 100644
--- a/client/src/modules/pluginapi.js
+++ b/client/src/modules/pluginapi.js
@@ -10,8 +10,9 @@
 
 import { EmoteModule } from 'builtin';
 import { SettingsSet, SettingsCategory, Setting, SettingsScheme } from 'structs';
-import { BdMenu, Modals, DOM, Reflection } from 'ui';
-import { Utils, ClientLogger as Logger, ClientIPC, AsyncEventEmitter } from 'common';
+import { BdMenu, Modals, DOM, DOMObserver, Reflection, VueInjector, Toasts } from 'ui';
+import * as CommonComponents from 'commoncomponents';
+import { Utils, Filters, ClientLogger as Logger, ClientIPC, AsyncEventEmitter } from 'common';
 import Settings from './settings';
 import ExtModuleManager from './extmodulemanager';
 import PluginManager from './pluginmanager';
@@ -20,7 +21,7 @@ import Events from './events';
 import EventsWrapper from './eventswrapper';
 import { WebpackModules } from './webpackmodules';
 import DiscordApi from './discordapi';
-import { ReactComponents } from './reactcomponents';
+import { ReactComponents, ReactHelpers } from './reactcomponents';
 import { Patcher, MonkeyPatch } from './patcher';
 
 export default class PluginApi {
@@ -58,6 +59,20 @@ export default class PluginApi {
     get AsyncEventEmitter() { return AsyncEventEmitter }
     get EventsWrapper() { return EventsWrapper }
 
+    get CommonComponents() { return CommonComponents }
+    get Filters() { return Filters }
+    get Discord() { return DiscordApi }
+    get DiscordApi() { return DiscordApi }
+    get ReactComponents() { return ReactComponents }
+    get ReactHelpers() { return ReactHelpers }
+    get Reflection() { return Reflection }
+    get DOM() { return DOM }
+    get VueInjector() { return VueInjector }
+
+    get observer() {
+        return this._observer || (this._observer = new DOMObserver());
+    }
+
     /**
      * Logger
      */
@@ -216,7 +231,7 @@ export default class PluginApi {
         this.injectedStyles.splice(this.injectedStyles.indexOf(styleid), 1);
         DOM.deleteStyle(styleid);
     }
-    deleteAllStyles(id, css) {
+    deleteAllStyles(id) {
         for (let id of this.injectedStyles) {
             this.deleteStyle(id);
         }
@@ -267,10 +282,10 @@ export default class PluginApi {
         return this.modalStack[this.modalStack.length - 1].close(force);
     }
     basicModal(title, text) {
-        return this.addModal(Modals.basic(title, text));
+        return this.addModal(Modals.createBasicModal(title, text));
     }
     settingsModal(settingsset, headertext, options) {
-        return this.addModal(Modals.settings(settingsset, headertext, options));
+        return this.addModal(Modals.createSettingsModal(settingsset, headertext, options));
     }
     get Modals() {
         return Object.defineProperties({
@@ -290,6 +305,36 @@ export default class PluginApi {
         });
     }
 
+
+    /**
+     * Toasts
+     */
+    showToast(message, options = {}) {
+        return Toasts.push(message, options);
+    }
+    showSuccessToast(message, options = {}) {
+        return Toasts.success(message, options);
+    }
+    showInfoToast(message, options = {}) {
+        return Toasts.info(message, options);
+    }
+    showErrorToast(message, options = {}) {
+        return Toasts.error(message, options);
+    }
+    showWarningToast(message, options = {}) {
+        return Toasts.warning(message, options);
+    }
+    get Toasts() {
+        return {
+            push: this.showToast.bind(this),
+            success: this.showSuccessToast.bind(this),
+            error: this.showErrorToast.bind(this),
+            info: this.showInfoToast.bind(this),
+            warning: this.showWarningToast.bind(this)
+        };
+    }
+
+
     /**
      * Emotes
      */
@@ -403,6 +448,9 @@ export default class PluginApi {
     getWebpackModuleByName(name, fallback) {
         return WebpackModules.getModuleByName(name, fallback);
     }
+    getWebpackModuleByDisplayName(name) {
+        return WebpackModules.getModuleByDisplayName(name);
+    }
     getWebpackModuleByRegex(regex) {
         return WebpackModules.getModuleByRegex(regex, true);
     }
@@ -421,38 +469,58 @@ export default class PluginApi {
     getWebpackModulesByPrototypeFields(...props) {
         return WebpackModules.getModuleByPrototypes(props, false);
     }
+    waitForWebpackModule(filter) {
+        return WebpackModules.waitForModule(filter);
+    }
+    waitForWebpackModuleByName(name, fallback) {
+        return WebpackModules.waitForModuleByName(name, fallback);
+    }
+    waitForWebpackModuleByDisplayName(name) {
+        return WebpackModules.waitForModuleByDisplayName(name);
+    }
+    waitForWebpackModuleByRegex(regex) {
+        return WebpackModules.waitForModuleByRegex(regex);
+    }
+    waitForWebpackModuleByProperties(...props) {
+        return WebpackModules.waitForModuleByProps(props);
+    }
+    waitForWebpackModuleByPrototypeFields(...props) {
+        return WebpackModules.waitForModuleByPrototypes(props);
+    }
+    getWebpackClassName(...classes) {
+        return WebpackModules.getClassName(...classes);
+    }
+    waitForWebpackClassName(...classes) {
+        return WebpackModules.waitForClassName(...classes);
+    }
     get WebpackModules() {
-        return Object.defineProperty({
+        return new Proxy({
             getModule: this.getWebpackModule.bind(this),
             getModuleByName: this.getWebpackModuleByName.bind(this),
-            getModuleByDisplayName: this.getWebpackModuleByName.bind(this),
+            getModuleByDisplayName: this.getWebpackModuleByDisplayName.bind(this),
             getModuleByRegex: this.getWebpackModuleByRegex.bind(this),
             getModulesByRegex: this.getWebpackModulesByRegex.bind(this),
             getModuleByProperties: this.getWebpackModuleByProperties.bind(this),
             getModuleByPrototypeFields: this.getWebpackModuleByPrototypeFields.bind(this),
             getModulesByProperties: this.getWebpackModulesByProperties.bind(this),
-            getModulesByPrototypeFields: this.getWebpackModulesByPrototypeFields.bind(this)
-        }, 'require', {
-            get: () => this.webpackRequire
+            getModulesByPrototypeFields: this.getWebpackModulesByPrototypeFields.bind(this),
+            waitForModule: this.waitForWebpackModule.bind(this),
+            waitForModuleByName: this.waitForWebpackModuleByName.bind(this),
+            waitForModuleByDisplayName: this.waitForWebpackModuleByDisplayName.bind(this),
+            waitForModuleByRegex: this.waitForWebpackModuleByRegex.bind(this),
+            waitForModuleByProperties: this.waitForWebpackModuleByProperties.bind(this),
+            waitForModuleByPrototypeFields: this.waitForWebpackModuleByPrototypeFields.bind(this),
+            getClassName: this.getWebpackClassName.bind(this),
+            waitForClassName: this.waitForWebpackClassName.bind(this),
+            get KnownModules() { return WebpackModules.KnownModules },
+            get require() { return WebpackModules.require }
+        }, {
+            get(WebpackModules, property) {
+                return WebpackModules[property] || WebpackModules.getModuleByName(property);
+            }
         });
     }
 
-    /**
-     * DiscordApi
-     */
-
-    get Discord() {
-        return DiscordApi;
-    }
-
-    get ReactComponents() {
-        return ReactComponents;
-    }
-
-    get Reflection() {
-        return Reflection;
-    }
-
     /**
      * Patcher
      */
diff --git a/client/src/modules/pluginmanager.js b/client/src/modules/pluginmanager.js
index 181335a0..906b62b0 100644
--- a/client/src/modules/pluginmanager.js
+++ b/client/src/modules/pluginmanager.js
@@ -8,15 +8,16 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+import { Permissions } from 'modules';
+import { Modals } from 'ui';
+import { ErrorEvent } from 'structs';
+import { ClientLogger as Logger } from 'common';
+import Globals from './globals';
 import ContentManager from './contentmanager';
 import ExtModuleManager from './extmodulemanager';
 import Plugin from './plugin';
 import PluginApi from './pluginapi';
 import Vendor from './vendor';
-import { ClientLogger as Logger } from 'common';
-import { Events, Permissions } from 'modules';
-import { Modals } from 'ui';
-import { ErrorEvent } from 'structs';
 
 export default class extends ContentManager {
 
@@ -73,7 +74,7 @@ export default class extends ContentManager {
     static get refreshPlugins() { return this.refreshContent }
 
     static get loadContent() { return this.loadPlugin }
-    static async loadPlugin(paths, configs, info, main, dependencies, permissions) {
+    static async loadPlugin(paths, configs, info, main, dependencies, permissions, mainExport) {
         if (permissions && permissions.length > 0) {
             for (let perm of permissions) {
                 Logger.log(this.moduleName, `Permission: ${Permissions.permissionText(perm).HEADER} - ${Permissions.permissionText(perm).BODY}`);
@@ -85,7 +86,7 @@ export default class extends ContentManager {
             }
         }
 
-        const deps = [];
+        const deps = {};
         if (dependencies) {
             for (const [key, value] of Object.entries(dependencies)) {
                 const extModule = ExtModuleManager.findModule(key);
@@ -96,8 +97,15 @@ export default class extends ContentManager {
             }
         }
 
-        const plugin = window.require(paths.mainPath)(Plugin, new PluginApi(info, paths.contentPath), Vendor, deps);
-        if (!(plugin.prototype instanceof Plugin))
+        const pluginExports = Globals.require(paths.mainPath);
+
+        const pluginFunction = mainExport ? pluginExports[mainExport]
+            : pluginExports.__esModule ? pluginExports.default : pluginExports;
+        if (typeof pluginFunction !== 'function')
+            throw {message: `Plugin ${info.name} did not export a function.`};
+
+        const plugin = pluginFunction.call(pluginExports, Plugin, new PluginApi(info, paths.contentPath), Vendor, deps);
+        if (!plugin || !(plugin.prototype instanceof Plugin))
             throw {message: `Plugin ${info.name} did not return a class that extends Plugin.`};
 
         const instance = new plugin({
diff --git a/client/src/modules/reactcomponents.js b/client/src/modules/reactcomponents.js
index 55f0c040..7d62dcbc 100644
--- a/client/src/modules/reactcomponents.js
+++ b/client/src/modules/reactcomponents.js
@@ -1,6 +1,7 @@
 /**
  * BetterDiscord React Component Manipulations
- * original concept and some code by samogot - https://github.com/samogot / https://github.com/samogot/betterdiscord-plugins/tree/master/v2/1Lib%20Discord%20Internals
+ * Original concept and some code by samogot - https://github.com/samogot / https://github.com/samogot/betterdiscord-plugins/tree/master/v2/1Lib%20Discord%20Internals
+ *
  * Copyright (c) 2015-present JsSucks - https://github.com/JsSucks
  * All rights reserved.
  * https://github.com/JsSucks - https://betterdiscord.net
@@ -9,11 +10,10 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { EmoteModule } from 'builtin';
-import { Reflection } from 'ui';
-import { ClientLogger as Logger } from 'common';
-import { MonkeyPatch, Patcher } from './patcher';
-import { WebpackModules, Filters } from './webpackmodules';
+import { DOM, Reflection } from 'ui';
+import { Utils, Filters, ClientLogger as Logger } from 'common';
+import { MonkeyPatch } from './patcher';
+import { WebpackModules } from './webpackmodules';
 import DiscordApi from './discordapi';
 
 class Helpers {
@@ -166,22 +166,18 @@ class Helpers {
 export { Helpers as ReactHelpers };
 
 class ReactComponent {
-    constructor(id, component, retVal) {
-        this._id = id;
-        this._component = component;
-        this._retVal = retVal;
+    constructor(id, component, retVal, important) {
+        this.id = id;
+        this.component = component;
+        this.retVal = retVal;
+        this.important = important;
     }
 
-    get id() {
-        return this._id;
-    }
-
-    get component() {
-        return this._component;
-    }
-
-    get retVal() {
-        return this._retVal;
+    forceUpdateAll() {
+        if (!this.important || !this.important.selector) return;
+        for (let e of document.querySelectorAll(this.important.selector)) {
+            Reflection(e).forceUpdate(this);
+        }
     }
 }
 
@@ -191,60 +187,85 @@ export class ReactComponents {
     static get listeners() { return this._listeners || (this._listeners = []) }
     static get nameSetters() { return this._nameSetters || (this._nameSetters = []) }
 
-    static push(component, retVal) {
+    static get ReactComponent() { return ReactComponent }
+
+    static push(component, retVal, important) {
         if (!(component instanceof Function)) return null;
         const { displayName } = component;
         if (!displayName) {
             return this.processUnknown(component, retVal);
         }
+
         const have = this.components.find(comp => comp.id === displayName);
-        if (have) return component;
-        const c = new ReactComponent(displayName, component, retVal);
-        this.components.push(c);
-        const listener = this.listeners.find(listener => listener.id === displayName);
-        if (!listener) return c;
-        for (const l of listener.listeners) {
-            l(c);
+        if (have) {
+            if (!have.important) have.important = important;
+            return component;
         }
-        this.listeners.splice(this.listeners.findIndex(listener => listener.id === displayName), 1);
+
+        const c = new ReactComponent(displayName, component, retVal, important);
+        this.components.push(c);
+
+        const listener = this.listeners.find(listener => listener.id === displayName);
+        if (listener) {
+            for (const l of listener.listeners) l(c);
+            Utils.removeFromArray(this.listeners, listener);
+        }
+
         return c;
     }
 
-    static async getComponent(name, important) {
+    /**
+     * Finds a component from the components array or by waiting for it to be mounted.
+     * @param {String} name The component's name
+     * @param {Object} important An object containing a selector to look for
+     * @param {Function} filter A function to filter components if a single element is rendered by multiple components
+     * @return {Promise => ReactComponent}
+     */
+    static async getComponent(name, important, filter) {
         const have = this.components.find(c => c.id === name);
         if (have) return have;
+
         if (important) {
-            const importantInterval = setInterval(() => {
+            const callback = () => {
                 if (this.components.find(c => c.id === name)) {
                     Logger.info('ReactComponents', `Important component ${name} already found`);
-                    clearInterval(importantInterval);
+                    DOM.observer.unsubscribe(observerSubscription);
                     return;
                 }
-                const select = document.querySelector(important.selector);
-                if (!select) return;
-                const reflect = Reflection(select);
-                if (!reflect.component) {
-                    clearInterval(importantInterval);
-                    Logger.error('ReactComponents', [`FAILED TO GET IMPORTANT COMPONENT ${name} WITH REFLECTION FROM`, select]);
+
+                const element = document.querySelector(important.selector);
+                if (!element) return;
+
+                DOM.observer.unsubscribe(observerSubscription);
+                const reflect = Reflection(element);
+                const component = filter ? reflect.components.find(filter) : reflect.component;
+                if (!component) {
+                    Logger.err('ReactComponents', [`FAILED TO GET IMPORTANT COMPONENT ${name} WITH REFLECTION FROM`, element]);
                     return;
                 }
-                if (!reflect.component.displayName) reflect.component.displayName = name;
+
+                if (!component.displayName) component.displayName = name;
                 Logger.info('ReactComponents', [`Found important component ${name} with reflection`, reflect]);
-                this.push(reflect.component);
-                clearInterval(importantInterval);
-            }, 50);
+                important.filter = filter;
+                this.push(component, undefined, important);
+            };
+
+            const observerSubscription = DOM.observer.subscribeToQuerySelector(callback, important.selector);
+            setTimeout(callback, 0);
         }
-        const listener = this.listeners.find(l => l.id === name);
-        if (!listener) this.listeners.push({
+
+        let listener = this.listeners.find(l => l.id === name);
+        if (!listener) this.listeners.push(listener = {
             id: name,
             listeners: []
         });
+
         return new Promise(resolve => {
-            this.listeners.find(l => l.id === name).listeners.push(resolve);
+            listener.listeners.push(resolve);
         });
     }
 
-    static setName(name, filter, callback) {
+    static setName(name, filter) {
         const have = this.components.find(c => c.id === name);
         if (have) return have;
 
@@ -262,7 +283,7 @@ export class ReactComponents {
         const have = this.unknownComponents.find(c => c.component === component);
         for (const [fi, filter] of this.nameSetters.entries()) {
             if (filter.filter.filter(component)) {
-                console.log('filter match!');
+                Logger.log('ReactComponents', 'Filter match!');
                 component.displayName = filter.name;
                 this.nameSetters.splice(fi, 1);
                 return this.push(component, retVal);
@@ -275,36 +296,42 @@ export class ReactComponents {
 }
 
 export class ReactAutoPatcher {
+    /**
+     * Wait for React to be loaded and patch it's createElement to store all unknown components.
+     * Also patches of some known components.
+     */
     static async autoPatch() {
-        await this.ensureReact();
-        this.React = {};
-        this.React.unpatchCreateElement = MonkeyPatch('BD:ReactComponents:createElement', 'React').before('createElement', (component, args) => {
-            ReactComponents.push(args[0]);
-        });
+        const React = await WebpackModules.waitForModuleByName('React');
+
+        this.unpatchCreateElement = MonkeyPatch('BD:ReactComponents:createElement', React).before('createElement', (component, args) => ReactComponents.push(args[0]));
+
         this.patchComponents();
-        return 1;
     }
 
-    static async ensureReact() {
-        while (!window.webpackJsonp || !WebpackModules.getModuleByName('React')) await new Promise(resolve => setTimeout(resolve, 10));
-        return 1;
-    }
-
-    static async patchComponents() {
-        await this.patchMessage();
-        await this.patchMessageGroup();
-        await this.patchChannelMember();
-        await this.patchGuild();
-        await this.patchChannel();
-        await this.patchChannelList();
-        this.forceUpdate();
+    /**
+     * Patches a few known components.
+     */
+    static patchComponents() {
+        return Promise.all([
+            this.patchMessage(),
+            this.patchMessageGroup(),
+            this.patchChannelMember(),
+            this.patchGuild(),
+            this.patchChannel(),
+            this.patchChannelList(),
+            this.patchUserProfileModal(),
+            this.patchUserPopout()
+        ]);
     }
 
     static async patchMessage() {
-        this.Message = await ReactComponents.getComponent('Message', { selector: '.message' });
+        const selector = '.' + WebpackModules.getClassName('message', 'messageCozy', 'messageCompact');
+        this.Message = await ReactComponents.getComponent('Message', {selector}, m => m.prototype && m.prototype.renderCozy);
+
         this.unpatchMessageRender = MonkeyPatch('BD:ReactComponents', this.Message.component.prototype).after('render', (component, args, retVal) => {
-            const { message } = component.props;
+            const { message, jumpSequenceId, canFlash } = component.props;
             const { id, colorString, bot, author, attachments, embeds } = message;
+            if (jumpSequenceId && canFlash) retVal = retVal.props.children;
             retVal.props['data-message-id'] = id;
             retVal.props['data-colourstring'] = colorString;
             if (author && author.id) retVal.props['data-user-id'] = author.id;
@@ -312,63 +339,128 @@ export class ReactAutoPatcher {
             if (attachments && attachments.length) retVal.props.className += ' bd-hasAttachments';
             if (embeds && embeds.length) retVal.props.className += ' bd-hasEmbeds';
             if (author && author.id === DiscordApi.currentUser.id) retVal.props.className += ' bd-isCurrentUser';
+
+            const dapiMessage = DiscordApi.Message.from(message);
+            if (dapiMessage.guild && author.id === dapiMessage.guild.ownerId) retVal.props.className += ' bd-isGuildOwner';
+            if (dapiMessage.guild && dapiMessage.guild.isMember(author.id)) retVal.props.className += ' bd-isGuildMember';
         });
+
+        this.Message.forceUpdateAll();
     }
 
     static async patchMessageGroup() {
-        this.MessageGroup = await ReactComponents.getComponent('MessageGroup', { selector: '.message-group' });
+        const selector = '.' + WebpackModules.getClassName('container', 'message', 'messageCozy');
+        this.MessageGroup = await ReactComponents.getComponent('MessageGroup', {selector});
+
         this.unpatchMessageGroupRender = MonkeyPatch('BD:ReactComponents', this.MessageGroup.component.prototype).after('render', (component, args, retVal) => {
             const { author, type } = component.props.messages[0];
             retVal.props['data-author-id'] = author.id;
             if (author.id === DiscordApi.currentUser.id) retVal.props.className += ' bd-isCurrentUser';
             if (type !== 0) retVal.props.className += ' bd-isSystemMessage';
+
+            const dapiMessage = DiscordApi.Message.from(component.props.messages[0]);
+            if (dapiMessage.guild && author.id === dapiMessage.guild.ownerId) retVal.props.className += ' bd-isGuildOwner';
+            if (dapiMessage.guild && dapiMessage.guild.isMember(author.id)) retVal.props.className += ' bd-isGuildMember';
         });
+
+        this.MessageGroup.forceUpdateAll();
     }
 
     static async patchChannelMember() {
-        this.ChannelMember = await ReactComponents.getComponent('ChannelMember', { selector: '.member-2FrNV0' });
+        const selector = '.' + WebpackModules.getClassName('member', 'memberInner', 'activity');
+        this.ChannelMember = await ReactComponents.getComponent('ChannelMember', {selector}, m => m.prototype.renderActivity);
+
         this.unpatchChannelMemberRender = MonkeyPatch('BD:ReactComponents', this.ChannelMember.component.prototype).after('render', (component, args, retVal) => {
-            // Logger.log('ReactComponents', ['Rendering ChannelMember', component, args, retVal]);
             if (!retVal.props || !retVal.props.children) return;
             const user = Helpers.findProp(component, 'user');
             if (!user) return;
             retVal.props['data-user-id'] = user.id;
+            retVal.props['data-colourstring'] = component.props.colorString;
+            if (component.props.isOwner) retVal.props.className += ' bd-isGuildOwner';
         });
+
+        this.ChannelMember.forceUpdateAll();
     }
 
     static async patchGuild() {
-        this.Guild = await ReactComponents.getComponent('Guild');
+        const selector = `div.${WebpackModules.getClassName('guild', 'guildsWrapper')}:not(:first-child)`;
+        this.Guild = await ReactComponents.getComponent('Guild', {selector}, m => m.prototype.renderBadge);
+
         this.unpatchGuild = MonkeyPatch('BD:ReactComponents', this.Guild.component.prototype).after('render', (component, args, retVal) => {
             const { guild } = component.props;
             if (!guild) return;
             retVal.props['data-guild-id'] = guild.id;
             retVal.props['data-guild-name'] = guild.name;
         });
+
+        this.Guild.forceUpdateAll();
     }
 
     static async patchChannel() {
-        this.Channel = await ReactComponents.getComponent('Channel');
+        const selector = '.chat';
+        this.Channel = await ReactComponents.getComponent('Channel', {selector});
+
         this.unpatchChannel = MonkeyPatch('BD:ReactComponents', this.Channel.component.prototype).after('render', (component, args, retVal) => {
             const channel = component.props.channel || component.state.channel;
             if (!channel) return;
             retVal.props['data-channel-id'] = channel.id;
             retVal.props['data-channel-name'] = channel.name;
+            if ([0, 2, 4].includes(channel.type)) retVal.props.className += ' bd-isGuildChannel';
+            if ([1, 3].includes(channel.type)) retVal.props.className += ' bd-isPrivateChannel';
+            if (channel.type === 3) retVal.props.className += ' bd-isGroupChannel';
         });
+
+        this.Channel.forceUpdateAll();
     }
 
     static async patchChannelList() {
-        this.GuildChannel = await ReactComponents.getComponent('GuildChannel', { selector: '.containerDefault-7RImuF' });
+        const selector = '.' + WebpackModules.getClassName('containerDefault', 'actionIcon');
+        this.GuildChannel = await ReactComponents.getComponent('GuildChannel', {selector});
+
         this.unpatchGuildChannel = MonkeyPatch('BD:ReactComponents', this.GuildChannel.component.prototype).after('render', (component, args, retVal) => {
             const { channel } = component.props;
             if (!channel) return;
             retVal.props['data-channel-id'] = channel.id;
             retVal.props['data-channel-name'] = channel.name;
+            if ([0, 2, 4].includes(channel.type)) retVal.props.className += ' bd-isGuildChannel';
+            if ([1, 3].includes(channel.type)) retVal.props.className += ' bd-isPrivateChannel';
+            if (channel.type === 3) retVal.props.className += ' bd-isGroupChannel';
         });
+
+        this.GuildChannel.forceUpdateAll();
     }
 
-    static forceUpdate() {
-        for (const e of document.querySelectorAll('.message, .message-group, .guild, .containerDefault-7RImuF, .channel-members .member-2FrNV0')) {
-            Reflection(e).forceUpdate();
-        }
+    static async patchUserProfileModal() {
+        const selector = '.' + WebpackModules.getClassName('root', 'topSectionNormal');
+        this.UserProfileModal = await ReactComponents.getComponent('UserProfileModal', {selector}, Filters.byPrototypeFields(['renderHeader', 'renderBadges']));
+
+        this.unpatchUserProfileModal = MonkeyPatch('BD:ReactComponents', this.UserProfileModal.component.prototype).after('render', (component, args, retVal) => {
+            const { user } = component.props;
+            if (!user) return;
+            retVal.props['data-user-id'] = user.id;
+            if (user.bot) retVal.props.className += ' bd-isBot';
+            if (user.id === DiscordApi.currentUser.id) retVal.props.className += ' bd-isCurrentUser';
+        });
+
+        this.UserProfileModal.forceUpdateAll();
+    }
+
+    static async patchUserPopout() {
+        const selector = '.' + WebpackModules.getClassName('userPopout', 'headerNormal');
+        this.UserPopout = await ReactComponents.getComponent('UserPopout', {selector});
+
+        this.unpatchUserPopout = MonkeyPatch('BD:ReactComponents', this.UserPopout.component.prototype).after('render', (component, args, retVal) => {
+            const { user, guild, guildMember } = component.props;
+            if (!user) return;
+            retVal.props['data-user-id'] = user.id;
+            if (user.bot) retVal.props.className += ' bd-isBot';
+            if (user.id === DiscordApi.currentUser.id) retVal.props.className += ' bd-isCurrentUser';
+            if (guild) retVal.props['data-guild-id'] = guild.id;
+            if (guild && user.id === guild.ownerId) retVal.props.className += ' bd-isGuildOwner';
+            if (guild && guildMember) retVal.props.className += ' bd-isGuildMember';
+            if (guildMember && guildMember.roles.length) retVal.props.className += ' bd-hasRoles';
+        });
+
+        this.UserPopout.forceUpdateAll();
     }
 }
diff --git a/client/src/modules/settings.js b/client/src/modules/settings.js
index bb3486ad..403df8cc 100644
--- a/client/src/modules/settings.js
+++ b/client/src/modules/settings.js
@@ -8,9 +8,10 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+import { Toasts } from 'ui';
 import { EmoteModule } from 'builtin';
-import { SettingsSet, SettingUpdatedEvent } from 'structs';
-import { Utils, FileUtils, ClientLogger as Logger } from 'common';
+import { SettingsSet } from 'structs';
+import { FileUtils, ClientLogger as Logger } from 'common';
 import path from 'path';
 import Globals from './globals';
 import CssEditor from './csseditor';
@@ -28,6 +29,7 @@ export default new class Settings {
                 Logger.log('Settings', [`${set.id}/${category.id}/${setting.id} was changed from`, old_value, 'to', value]);
                 Events.emit('setting-updated', event);
                 Events.emit(`setting-updated-${set.id}_${category.id}_${setting.id}`, event);
+                Toasts.success(`${set.id}/${category.id}/${setting.id} was changed from ${old_value} to ${value}`); // Just for debugging purposes remove in prod
             });
 
             set.on('settings-updated', async event => {
@@ -61,7 +63,7 @@ export default new class Settings {
 
             CssEditor.setState(scss, css, css_editor_files, scss_error);
             CssEditor.editor_bounds = css_editor_bounds || {};
-            EmoteModule.favourite_emotes = favourite_emotes;
+            EmoteModule.favourite_emotes = favourite_emotes || [];
         } catch (err) {
             // There was an error loading settings
             // This probably means that the user doesn't have any settings yet
@@ -94,7 +96,7 @@ export default new class Settings {
             }
         } catch (err) {
             // There was an error saving settings
-            Logger.err('Settings', err);
+            Logger.err('Settings', ['Failed to save internal settings', err]);
             throw err;
         }
     }
diff --git a/client/src/modules/thememanager.js b/client/src/modules/thememanager.js
index 2ddf8bd8..4914cb05 100644
--- a/client/src/modules/thememanager.js
+++ b/client/src/modules/thememanager.js
@@ -10,8 +10,6 @@
 
 import ContentManager from './contentmanager';
 import Theme from './theme';
-import { FileUtils } from 'common';
-import path from 'path';
 
 export default class ThemeManager extends ContentManager {
 
@@ -116,8 +114,7 @@ export default class ThemeManager extends ContentManager {
      * @return {Promise}
      */
     static async parseSetting(setting) {
-        const { type, id, value } = setting;
-        const name = id.replace(/[^a-zA-Z0-9-]/g, '-').replace(/--/g, '-');
+        const name = setting.id.replace(/[^a-zA-Z0-9-]/g, '-').replace(/--/g, '-');
         const scss = await setting.toSCSS();
 
         if (scss) return [name, scss];
diff --git a/client/src/modules/updater.js b/client/src/modules/updater.js
index 0b79fb8e..76b4ca29 100644
--- a/client/src/modules/updater.js
+++ b/client/src/modules/updater.js
@@ -10,8 +10,8 @@
 
 import Events from './events';
 import Globals from './globals';
-import { $ } from 'vendor';
 import { ClientLogger as Logger } from 'common';
+import request from 'request-promise-native';
 
 export default new class {
 
@@ -57,40 +57,32 @@ export default new class {
      * Checks for updates.
      * @return {Promise}
      */
-    checkForUpdates() {
-        return new Promise((resolve, reject) => {
-            if (this.updatesAvailable) return resolve(true);
-            Events.emit('update-check-start');
-            Logger.info('Updater', 'Checking for updates');
+    async checkForUpdates() {
+        if (this.updatesAvailable) return true;
+        Events.emit('update-check-start');
+        Logger.info('Updater', 'Checking for updates');
 
-            $.ajax({
-                type: 'GET',
-                url: 'https://rawgit.com/JsSucks/BetterDiscordApp/master/package.json',
-                cache: false,
-                success: e => {
-                    try {
-                        this.latestVersion = e.version;
-                        Events.emit('update-check-end');
-                        Logger.info('Updater', `Latest Version: ${e.version} - Current Version: ${Globals.version}`);
-
-                        if (this.latestVersion !== Globals.version) {
-                            this.updatesAvailable = true;
-                            Events.emit('updates-available');
-                            resolve(true);
-                        }
-
-                        resolve(false);
-                    } catch (err) {
-                        Events.emit('update-check-fail', err);
-                        reject(err);
-                    }
-                },
-                fail: err => {
-                    Events.emit('update-check-fail', err);
-                    reject(err);
-                }
+        try {
+            const response = await request({
+                uri: 'https://rawgit.com/JsSucks/BetterDiscordApp/master/package.json',
+                json: true
             });
-        });
+
+            this.latestVersion = response.version;
+            Events.emit('update-check-end');
+            Logger.info('Updater', `Latest Version: ${response.version} - Current Version: ${Globals.version}`);
+
+            if (this.latestVersion !== Globals.version) {
+                this.updatesAvailable = true;
+                Events.emit('updates-available');
+                return true;
+            }
+
+            return false;
+        } catch (err) {
+            Events.emit('update-check-fail', err);
+            throw err;
+        }
     }
 
 }
diff --git a/client/src/modules/vendor.js b/client/src/modules/vendor.js
index 4b5c2d58..efdf35c7 100644
--- a/client/src/modules/vendor.js
+++ b/client/src/modules/vendor.js
@@ -8,12 +8,18 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { WebpackModules } from './webpackmodules';
 import jQuery from 'jquery';
 import lodash from 'lodash';
 import Vue from 'vue';
 
-export { jQuery as $ };
+import request from 'request-promise-native';
+
+import Combokeys from 'combokeys';
+import filetype from 'file-type';
+import filewatcher from 'filewatcher';
+import VTooltip from 'v-tooltip';
+
+export { jQuery as $, request };
 
 export default class {
 
@@ -29,18 +35,16 @@ export default class {
     static get lodash() { return lodash }
     static get _() { return this.lodash }
 
-    /**
-     * Moment
-     */
-    static get moment() {
-        return WebpackModules.getModuleByName('Moment');
-    }
-
     /**
      * Vue
      */
-    static get Vue() {
-        return Vue;
-    }
+    static get Vue() { return Vue }
+
+    static get request() { return request }
+
+    static get Combokeys() { return Combokeys }
+    static get filetype() { return filetype }
+    static get filewatcher() { return filewatcher }
+    static get VTooltip() { return VTooltip }
 
 }
diff --git a/client/src/modules/webpackmodules.js b/client/src/modules/webpackmodules.js
index 59bcf371..0175a190 100644
--- a/client/src/modules/webpackmodules.js
+++ b/client/src/modules/webpackmodules.js
@@ -8,44 +8,8 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-export class Filters {
-    static byProperties(props, selector = m => m) {
-        return module => {
-            const component = selector(module);
-            if (!component) return false;
-            return props.every(property => component[property] !== undefined);
-        };
-    }
-
-    static byPrototypeFields(fields, selector = m => m) {
-        return module => {
-            const component = selector(module);
-            if (!component) return false;
-            if (!component.prototype) return false;
-            return fields.every(field => component.prototype[field] !== undefined);
-        };
-    }
-
-    static byCode(search, selector = m => m) {
-        return module => {
-            const method = selector(module);
-            if (!method) return false;
-            return method.toString().search(search) !== -1;
-        };
-    }
-
-    static byDisplayName(name) {
-        return module => {
-            return module && module.displayName === name;
-        };
-    }
-
-    static combine(...filters) {
-        return module => {
-            return filters.every(filter => filter(module));
-        };
-    }
-}
+import { Utils, Filters } from 'common';
+import Events from './events';
 
 const KnownModules = {
     React: Filters.byProperties(['createElement', 'cloneElement']),
@@ -90,6 +54,8 @@ const KnownModules = {
     UserTypingStore: Filters.byProperties(['isTyping']),
     UserActivityStore: Filters.byProperties(['getActivity']),
     UserNameResolver: Filters.byProperties(['getName']),
+    UserNoteStore: Filters.byProperties(['getNote']),
+    UserNoteActions: Filters.byProperties(['updateNote']),
 
     /* Emoji Store and Utils */
     EmojiInfo: Filters.byProperties(['isEmojiDisabled']),
@@ -136,7 +102,7 @@ const KnownModules = {
     DNDSources: Filters.byProperties(["addTarget"]),
     DNDObjects: Filters.byProperties(["DragSource"]),
 
-    /* Electron & Other Internals with Utils*/
+    /* Electron & Other Internals with Utils */
     ElectronModule: Filters.byProperties(["_getMainWindow"]),
     Dispatcher: Filters.byProperties(['dirtyDispatch']),
     PathUtils: Filters.byProperties(["hasBasename"]),
@@ -162,7 +128,6 @@ const KnownModules = {
     WindowInfo: Filters.byProperties(['isFocused', 'windowSize']),
     TagInfo: Filters.byProperties(['VALID_TAG_NAMES']),
     DOMInfo: Filters.byProperties(['canUseDOM']),
-    HTMLUtils: Filters.byProperties(['htmlFor', 'sanitizeUrl']),
 
     /* Locale/Location and Time */
     LocaleManager: Filters.byProperties(['setLocale']),
@@ -179,15 +144,27 @@ const KnownModules = {
     URLParser: Filters.byProperties(['Url', 'parse']),
     ExtraURLs: Filters.byProperties(['getArticleURL']),
 
+    /* Text Processing */
+    hljs: Filters.byProperties(['highlight', 'highlightBlock']),
+    SimpleMarkdown: Filters.byProperties(['parseBlock', 'parseInline', 'defaultOutput']),
+
     /* DOM/React Components */
     /* ==================== */
-    UserSettingsWindow: Filters.byProperties(['open', 'updateAccount']),
     LayerManager: Filters.byProperties(['popLayer', 'pushLayer']),
+    UserSettingsWindow: Filters.byProperties(['open', 'updateAccount']),
+    ChannelSettingsWindow: Filters.byProperties(['open', 'updateChannel']),
+    GuildSettingsWindow: Filters.byProperties(['open', 'updateGuild']),
 
     /* Modals */
     ModalStack: Filters.byProperties(['push', 'update', 'pop', 'popWithKey']),
-    UserProfileModals: Filters.byProperties(['fetchMutualFriends', 'setSection']),
     ConfirmModal: Filters.byPrototypeFields(['handleCancel', 'handleSubmit', 'handleMinorConfirm']),
+    UserProfileModal: Filters.byProperties(['fetchMutualFriends', 'setSection']),
+    ChangeNicknameModal: Filters.byProperties(['open', 'changeNickname']),
+    CreateChannelModal: Filters.byProperties(['open', 'createChannel']),
+    PruneMembersModal: Filters.byProperties(['open', 'prune']),
+    NotificationSettingsModal: Filters.byProperties(['open', 'updateNotificationSettings']),
+    PrivacySettingsModal: Filters.byCode(/PRIVACY_SETTINGS_MODAL_OPEN/, m => m.open),
+    CreateInviteModal: Filters.byProperties(['open', 'createInvite']),
 
     /* Popouts */
     PopoutStack: Filters.byProperties(['open', 'close', 'closeAll']),
@@ -203,16 +180,17 @@ const KnownModules = {
     ExternalLink: Filters.byCode(/\.trusted\b/)
 };
 
-export class WebpackModules {
+class WebpackModules {
 
     /**
      * Finds a module using a filter function.
      * @param {Function} filter A function to use to filter modules
      * @param {Boolean} first Whether to return only the first matching module
+     * @param {Array} modules An array of modules to search in
      * @return {Any}
      */
-    static getModule(filter, first = true) {
-        const modules = this.getAllModules();
+    static getModule(filter, first = true, _modules) {
+        const modules = _modules || this.getAllModules();
         const rm = [];
         for (let index in modules) {
             if (!modules.hasOwnProperty(index)) continue;
@@ -227,7 +205,7 @@ export class WebpackModules {
             if (first) return foundModule;
             rm.push(foundModule);
         }
-        return first || rm.length == 0 ? undefined : rm;
+        return first ? undefined : rm;
     }
 
     /**
@@ -288,15 +266,139 @@ export class WebpackModules {
      */
     static get require() {
         if (this._require) return this._require;
-        const id = 'bd-webpackmodules';
-        const __webpack_require__ = window['webpackJsonp']([], {
-            [id]: (module, exports, __webpack_require__) => exports.default = __webpack_require__
-        }, [id]).default;
-        delete __webpack_require__.m[id];
-        delete __webpack_require__.c[id];
+
+        const __webpack_require__ = this.getWebpackRequire();
+        if (!__webpack_require__) return;
+
+        this.hookWebpackRequireCache(__webpack_require__);
         return this._require = __webpack_require__;
     }
 
+    static getWebpackRequire() {
+        const id = 'bd-webpackmodules';
+
+        if (typeof window.webpackJsonp === 'function') {
+            const __webpack_require__ = window['webpackJsonp']([], {
+                [id]: (module, exports, __webpack_require__) => exports.default = __webpack_require__
+            }, [id]).default;
+            delete __webpack_require__.m[id];
+            delete __webpack_require__.c[id];
+            return __webpack_require__;
+        } else if (window.webpackJsonp && window.webpackJsonp.push) {
+            const __webpack_require__ = window['webpackJsonp'].push([[], {
+                [id]: (module, exports, req) => exports.default = req
+            }, [[id]]]).default;
+            window['webpackJsonp'].pop();
+            delete __webpack_require__.m[id];
+            delete __webpack_require__.c[id];
+            return __webpack_require__;
+        }
+    }
+
+    static hookWebpackRequireCache(__webpack_require__) {
+        __webpack_require__.c = new Proxy(__webpack_require__.c, {
+            set(module_cache, module_id, module) {
+                // Add it to our emitter cache and emit a module-loading event
+                this.moduleLoading(module_id, module);
+                Events.emit('module-loading', module);
+
+                // Add the module to the cache as normal
+                module_cache[module_id] = module;
+            }
+        });
+    }
+
+    static moduleLoading(module_id, module) {
+        if (this.require.c[module_id]) return;
+
+        if (!this.moduleLoadedEventTimeout) {
+            this.moduleLoadedEventTimeout = setTimeout(() => {
+                this.moduleLoadedEventTimeout = undefined;
+
+                // Emit a module-loaded event for every module
+                for (let module of this.modulesLoadingCache) {
+                    Events.emit('module-loaded', module);
+                }
+
+                // Emit a modules-loaded event
+                Events.emit('modules-loaded', this.modulesLoadingCache);
+
+                this.modulesLoadedCache = [];
+            }, 0);
+        }
+
+        // Add this to our own cache
+        if (!this.modulesLoadingCache) this.modulesLoadingCache = [];
+        this.modulesLoadingCache.push(module);
+    }
+
+    static waitForWebpackRequire() {
+        return Utils.until(() => this.require, 10);
+    }
+
+    /**
+     * Waits for a module to load.
+     * This only returns a single module, as it can't guarentee there are no more modules that could
+     * match the filter, which is pretty much what that would be asking for.
+     * @param {Function} filter The name of a known module or a filter function
+     * @return {Any}
+     */
+    static async waitForModule(filter) {
+        const module = this.getModule(filter);
+        if (module) return module;
+
+        while (this.require.m.length > this.require.c.length) {
+            const additionalModules = await Events.once('modules-loaded');
+
+            const module = this.getModule(filter, true, additionalModules);
+            if (module) return module;
+        }
+
+        throw new Error('All modules have now been loaded. None match the passed filter.');
+    }
+
+    /**
+     * Finds a module by it's name.
+     * @param {String} name The name of the module
+     * @param {Function} fallback A function to use to filter modules if not finding a known module
+     * @return {Any}
+     */
+    static async waitForModuleByName(name, fallback) {
+        if (Cache.hasOwnProperty(name)) return Cache[name];
+        if (KnownModules.hasOwnProperty(name)) fallback = KnownModules[name];
+        if (!fallback) return undefined;
+        const module = await this.waitForModule(fallback, true);
+        return module ? Cache[name] = module : undefined;
+    }
+
+    static waitForModuleByDisplayName(props) {
+        return this.waitForModule(Filters.byDisplayName(props));
+    }
+    static waitForModuleByRegex(props) {
+        return this.waitForModule(Filters.byCode(props));
+    }
+    static waitForModuleByProps(props) {
+        return this.waitForModule(Filters.byProperties(props));
+    }
+    static waitForModuleByPrototypes(props) {
+        return this.waitForModule(Filters.byPrototypeFields(props));
+    }
+
+    /**
+     * Searches for a class module and returns a class from it.
+     * @param {String} base The first part of the class to find
+     * @param {String} ...additional_classes Additional classes to look for to filter duplicate class modules
+     * @return {String}
+     */
+    static getClassName(base, ...additional_classes) {
+        const class_module = this.getModuleByProps([base, ...additional_classes]);
+        if (class_module && class_module[base]) return class_module[base].split(' ')[0];
+    }
+    static async waitForClassName(base, ...additional_classes) {
+        const class_module = await this.waitForModuleByProps([base, ...additional_classes]);
+        if (class_module && class_module[base]) return class_module[base].split(' ')[0];
+    }
+
     /**
      * Returns all loaded modules.
      * @return {Array}
@@ -313,4 +415,14 @@ export class WebpackModules {
         return Object.keys(KnownModules);
     }
 
+    static get KnownModules() { return KnownModules }
+
 }
+
+const WebpackModulesProxy = new Proxy(WebpackModules, {
+    get(WebpackModules, property) {
+        return WebpackModules[property] || WebpackModules.getModuleByName(property);
+    }
+});
+
+export { WebpackModulesProxy as WebpackModules };
diff --git a/client/src/structs/discord/channel.js b/client/src/structs/discord/channel.js
new file mode 100644
index 00000000..cedbddee
--- /dev/null
+++ b/client/src/structs/discord/channel.js
@@ -0,0 +1,436 @@
+/**
+ * BetterDiscord Channel Struct
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+import { DiscordApi, DiscordApiModules as Modules } from 'modules';
+import { List, InsufficientPermissions } from 'structs';
+import { Guild } from './guild';
+import { Message } from './message';
+import { User, GuildMember } from './user';
+
+const channels = new WeakMap();
+
+export class Channel {
+
+    constructor(data) {
+        if (channels.has(data)) return channels.get(data);
+        channels.set(data, this);
+
+        this.discordObject = data;
+    }
+
+    static from(channel) {
+        switch (channel.type) {
+            default: return new Channel(channel);
+            case 0: return new GuildTextChannel(channel);
+            case 1: return new DirectMessageChannel(channel);
+            case 2: return new GuildVoiceChannel(channel);
+            case 3: return new GroupChannel(channel);
+            case 4: return new ChannelCategory(channel);
+        }
+    }
+
+    static fromId(id) {
+        const channel = Modules.ChannelStore.getChannel(id);
+        if (channel) return Channel.from(channel);
+    }
+
+    static get GuildChannel() { return GuildChannel }
+    static get GuildTextChannel() { return GuildTextChannel }
+    static get GuildVoiceChannel() { return GuildVoiceChannel }
+    static get ChannelCategory() { return ChannelCategory }
+    static get PrivateChannel() { return PrivateChannel }
+    static get DirectMessageChannel() { return DirectMessageChannel }
+    static get GroupChannel() { return GroupChannel }
+
+    get id() { return this.discordObject.id }
+    get applicationId() { return this.discordObject.application_id }
+    get type() { return this.discordObject.type }
+    get name() { return this.discordObject.name }
+
+    /**
+     * Send a message in this channel.
+     * @param {String} content The new message's content
+     * @param {Boolean} parse Whether to parse the message or send it as it is
+     * @return {Promise => Message}
+     */
+    async sendMessage(content, parse = false) {
+        if (this.assertPermissions) this.assertPermissions('SEND_MESSAGES', Modules.DiscordPermissions.VIEW_CHANNEL | Modules.DiscordPermissions.SEND_MESSAGES);
+
+        this.select();
+
+        if (parse) content = Modules.MessageParser.parse(this.discordObject, content);
+        else content = {content};
+
+        const response = await Modules.MessageActions._sendMessage(this.id, content);
+        return Message.from(Modules.MessageStore.getMessage(this.id, response.body.id));
+    }
+
+    /**
+     * Send a bot message in this channel that only the current user can see.
+     * @param {String} content The new message's content
+     * @return {Message}
+     */
+    sendBotMessage(content) {
+        this.select();
+        const message = Modules.MessageParser.createBotMessage(this.id, content);
+        Modules.MessageActions.receiveMessage(this.id, message);
+        return Message.from(Modules.MessageStore.getMessage(this.id, message.id));
+    }
+
+    /**
+     * A list of messages in this channel.
+     */
+    get messages() {
+        const messages = Modules.MessageStore.getMessages(this.id).toArray();
+        return List.from(messages, m => Message.from(m));
+    }
+
+    /**
+     * Jumps to the latest message in this channel.
+     */
+    jumpToPresent() {
+        if (this.assertPermissions) this.assertPermissions('VIEW_CHANNEL', Modules.DiscordPermissions.VIEW_CHANNEL);
+        if (this.hasMoreAfter) Modules.MessageActions.jumpToPresent(this.id, Modules.DiscordConstants.MAX_MESSAGES_PER_CHANNEL);
+        else this.messages[this.messages.length - 1].jumpTo(false);
+    }
+
+    get hasMoreAfter() {
+        return Modules.MessageStore.getMessages(this.id).hasMoreAfter;
+    }
+
+    /**
+     * Sends an invite in this channel.
+     * @param {String} code The invite code
+     * @return {Promise => Messaage}
+     */
+    async sendInvite(code) {
+        if (this.assertPermissions) this.assertPermissions('SEND_MESSAGES', Modules.DiscordPermissions.VIEW_CHANNEL | Modules.DiscordPermissions.SEND_MESSAGES);
+        const response = Modules.MessageActions.sendInvite(this.id, code);
+        return Message.from(Modules.MessageStore.getMessage(this.id, response.body.id));
+    }
+
+    /**
+     * Opens this channel in the UI.
+     */
+    select() {
+        if (this.assertPermissions) this.assertPermissions('VIEW_CHANNEL', Modules.DiscordPermissions.VIEW_CHANNEL);
+        Modules.NavigationUtils.transitionToGuild(this.guildId ? this.guildId : Modules.DiscordConstants.ME, this.id);
+    }
+
+    /**
+     * Whether this channel is currently selected.
+     */
+    get isSelected() {
+        return DiscordApi.currentChannel === this;
+    }
+
+    /**
+     * Updates this channel.
+     * @return {Promise}
+     */
+    async updateChannel(body) {
+        if (this.assertPermissions) this.assertPermissions('MANAGE_CHANNELS', Modules.DiscordPermissions.MANAGE_CHANNELS);
+        const response = await Modules.APIModule.patch({
+            url: `${Modules.DiscordConstants.Endpoints.CHANNELS}/${this.id}`,
+            body
+        });
+
+        this.discordObject = Modules.ChannelStore.getChannel(this.id);
+        channels.set(this.discordObject, this);
+    }
+
+}
+
+export class PermissionOverwrite {
+    constructor(data, channel_id) {
+        this.discordObject = data;
+        this.channelId = channel_id;
+    }
+
+    static from(data, channel_id) {
+        switch (data.type) {
+            default: return new PermissionOverwrite(data, channel_id);
+            case 'role': return new RolePermissionOverwrite(data, channel_id);
+            case 'member': return new MemberPermissionOverwrite(data, channel_id);
+        }
+    }
+
+    static get RolePermissionOverwrite() { return RolePermissionOverwrite }
+    static get MemberPermissionOverwrite() { return MemberPermissionOverwrite }
+
+    get type() { return this.discordObject.type }
+    get allow() { return this.discordObject.allow }
+    get deny() { return this.discordObject.deny }
+
+    get channel() {
+        return Channel.fromId(this.channelId);
+    }
+
+    get guild() {
+        if (this.channel) return this.channel.guild;
+    }
+}
+
+export class RolePermissionOverwrite extends PermissionOverwrite {
+    get roleId() { return this.discordObject.id }
+
+    get role() {
+        if (this.guild) return this.guild.roles.find(r => r.id === this.roleId);
+    }
+}
+
+export class MemberPermissionOverwrite extends PermissionOverwrite {
+    get memberId() { return this.discordObject.id }
+
+    get member() {
+        return GuildMember.fromId(this.memberId);
+    }
+}
+
+export class GuildChannel extends Channel {
+    static get PermissionOverwrite() { return PermissionOverwrite }
+
+    get guildId() { return this.discordObject.guild_id }
+    get parentId() { return this.discordObject.parent_id } // Channel category
+    get position() { return this.discordObject.position }
+    get nicks() { return this.discordObject.nicks }
+
+    checkPermissions(perms) {
+        return Modules.PermissionUtils.can(perms, DiscordApi.currentUser, this.discordObject);
+    }
+
+    assertPermissions(name, perms) {
+        if (!this.checkPermissions(perms)) throw new InsufficientPermissions(name);
+    }
+
+    get category() {
+        return Channel.fromId(this.parentId);
+    }
+
+    /**
+     * The current user's permissions on this channel.
+     */
+    get permissions() {
+        return Modules.GuildPermissions.getChannelPermissions(this.id);
+    }
+
+    get permissionOverwrites() {
+        return List.from(Object.entries(this.discordObject.permissionOverwrites), ([i, p]) => PermissionOverwrite.from(p, this.id));
+    }
+
+    get guild() {
+        return Guild.fromId(this.guildId);
+    }
+
+    /**
+     * Whether this channel is the guild's default channel.
+     */
+    get isDefaultChannel() {
+        return Modules.GuildChannelsStore.getDefaultChannel(this.guildId).id === this.id;
+    }
+
+    /**
+     * Opens this channel's settings window.
+     * @param {String} section The section to open (see DiscordConstants.ChannelSettingsSections)
+     */
+    openSettings(section = 'OVERVIEW') {
+        Modules.ChannelSettingsWindow.setSection(section);
+        Modules.ChannelSettingsWindow.open(this.id);
+    }
+
+    /**
+     * Updates this channel's name.
+     * @param {String} name The channel's new name
+     * @return {Promise}
+     */
+    updateName(name) {
+        return this.updateChannel({ name });
+    }
+
+    /**
+     * Changes the channel's position.
+     * @param {Number} position The channel's new position
+     * @return {Promise}
+     */
+    changeSortLocation(position = 0) {
+        if (position instanceof GuildChannel) position = position.position;
+        return this.updateChannel({ position });
+    }
+
+    /**
+     * Updates this channel's permission overwrites.
+     * @param {Array} permissionOverwrites An array of permission overwrites
+     * @return {Promise}
+     */
+    updatePermissionOverwrites(permission_overwrites) {
+        return this.updateChannel({ permission_overwrites });
+    }
+
+    /**
+     * Updates this channel's category.
+     * @param {ChannelCategory} category The new channel category
+     * @return {Promise}
+     */
+    updateCategory(category) {
+        return this.updateChannel({ parent_id: category.id || category });
+    }
+}
+
+// Type 0 - GUILD_TEXT
+export class GuildTextChannel extends GuildChannel {
+    get type() { return 'GUILD_TEXT' }
+    get topic() { return this.discordObject.topic }
+    get nsfw() { return this.discordObject.nsfw }
+
+    /**
+     * Updates this channel's topic.
+     * @param {String} topc The new channel topic
+     * @return {Promise}
+     */
+    updateTopic(topic) {
+        return this.updateChannel({ topic });
+    }
+
+    /**
+     * Updates this channel's not-safe-for-work flag.
+     * @param {Boolean} nsfw Whether the channel should be marked as NSFW
+     * @return {Promise}
+     */
+    setNsfw(nsfw = true) {
+        return this.updateChannel({ nsfw });
+    }
+
+    setNotNsfw() {
+        return this.setNsfw(false);
+    }
+}
+
+// Type 2 - GUILD_VOICE
+export class GuildVoiceChannel extends GuildChannel {
+    get type() { return 'GUILD_VOICE' }
+    get userLimit() { return this.discordObject.userLimit }
+    get bitrate() { return this.discordObject.bitrate }
+
+    sendMessage() { throw new Error('Cannot send messages in a voice channel.'); }
+    get messages() { return new List(); }
+    jumpToPresent() { throw new Error('Cannot select a voice channel.'); }
+    get hasMoreAfter() { return false; }
+    sendInvite() { throw new Error('Cannot invite someone to a voice channel.'); }
+    select() { throw new Error('Cannot select a voice channel.'); }
+
+    /**
+     * Updates this channel's bitrate.
+     * @param {Number} bitrate The new bitrate
+     * @return {Promise}
+     */
+    updateBitrate(bitrate) {
+        return this.updateChannel({ bitrate });
+    }
+
+    /**
+     * Updates this channel's user limit.
+     * @param {Number} userLimit The new user limit
+     * @return {Promise}
+     */
+    updateUserLimit(user_limit) {
+        return this.updateChannel({ user_limit });
+    }
+}
+
+// Type 4 - GUILD_CATEGORY
+export class ChannelCategory extends GuildChannel {
+    get type() { return 'GUILD_CATEGORY' }
+    get parentId() { return undefined }
+    get category() { return undefined }
+
+    sendMessage() { throw new Error('Cannot send messages in a channel category.'); }
+    get messages() { return new List(); }
+    jumpToPresent() { throw new Error('Cannot select a channel category.'); }
+    get hasMoreAfter() { return false; }
+    sendInvite() { throw new Error('Cannot invite someone to a channel category.'); }
+    select() { throw new Error('Cannot select a channel category.'); }
+    updateCategory() { throw new Error('Cannot set a channel category on another channel category.'); }
+
+    /**
+     * A list of channels in this category.
+     */
+    get channels() {
+        return List.from(this.guild.channels, c => c.parentId === this.id);
+    }
+
+    /**
+     * Opens the create channel modal for this guild.
+     * @param {Number} type The type of channel to create - either 0 (text), 2 (voice) or 4 (category)
+     * @param {GuildChannel} clone A channel to clone permissions of
+     */
+    openCreateChannelModal(type, category, clone) {
+        this.guild.openCreateChannelModal(type, this.id, this, clone);
+    }
+
+    /**
+     * Creates a channel in this category.
+     * @param {Number} type The type of channel to create - either 0 (text) or 2 (voice)
+     * @param {String} name A name for the new channel
+     * @param {Array} permission_overwrites An array of PermissionOverwrite-like objects - leave to use the permissions of the category
+     * @return {Promise => GuildChannel}
+     */
+    createChannel(type, name, permission_overwrites) {
+        return this.guild.createChannel(type, name, this, permission_overwrites);
+    }
+}
+
+export class PrivateChannel extends Channel {
+    get userLimit() { return this.discordObject.userLimit }
+    get bitrate() { return this.discordObject.bitrate }
+}
+
+// Type 1 - DM
+export class DirectMessageChannel extends PrivateChannel {
+    get type() { return 'DM' }
+    get recipientId() { return this.discordObject.recipients[0] }
+
+    /**
+     * The other user of this direct message channel.
+     */
+    get recipient() {
+        return User.fromId(this.recipientId);
+    }
+}
+
+// Type 3 - GROUP_DM
+export class GroupChannel extends PrivateChannel {
+    get ownerId() { return this.discordObject.ownerId }
+    get type() { return 'GROUP_DM' }
+    get name() { return this.discordObject.name }
+    get icon() { return this.discordObject.icon }
+
+    /**
+     * A list of the other members of this group direct message channel.
+     */
+    get members() {
+        return List.from(this.discordObject.recipients, id => User.fromId(id));
+    }
+
+    /**
+     * The owner of this group direct message channel. This is usually the person who created it.
+     */
+    get owner() {
+        return User.fromId(this.ownerId);
+    }
+
+    /**
+     * Updates this channel's name.
+     * @param {String} name The channel's new name
+     * @return {Promise}
+     */
+    updateName(name) {
+        return this.updateChannel({ name });
+    }
+}
diff --git a/client/src/structs/discord/guild.js b/client/src/structs/discord/guild.js
new file mode 100644
index 00000000..e96e06b2
--- /dev/null
+++ b/client/src/structs/discord/guild.js
@@ -0,0 +1,483 @@
+/**
+ * BetterDiscord Guild Struct
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+import { DiscordApi, DiscordApiModules as Modules } from 'modules';
+import { List, InsufficientPermissions } from 'structs';
+import { FileUtils } from 'common';
+import { Channel } from './channel';
+import { GuildMember } from './user';
+
+const roles = new WeakMap();
+
+export class Role {
+    constructor(data, guild_id) {
+        if (roles.has(data)) return roles.get(data);
+        roles.set(data, this);
+
+        this.discordObject = data;
+        this.guildId = guild_id;
+    }
+
+    get id() { return this.discordObject.id }
+    get name() { return this.discordObject.name }
+    get position() { return this.discordObject.position }
+    get originalPosition() { return this.discordObject.originalPosition }
+    get permissions() { return this.discordObject.permissions }
+    get managed() { return this.discordObject.managed }
+    get mentionable() { return this.discordObject.mentionable }
+    get hoist() { return this.discordObject.hoist }
+    get colour() { return this.discordObject.color }
+    get colourString() { return this.discordObject.colorString }
+
+    get guild() {
+        return Guild.fromId(this.guildId);
+    }
+
+    get members() {
+        return this.guild.members.filter(m => m.roles.includes(this));
+    }
+}
+
+const emojis = new WeakMap();
+
+export class Emoji {
+    constructor(data) {
+        if (emojis.has(data)) return emojis.get(data);
+        emojis.set(data, this);
+
+        this.discordObject = data;
+    }
+
+    get id() { return this.discordObject.id }
+    get guildId() { return this.discordObject.guild_id }
+    get name() { return this.discordObject.name }
+    get managed() { return this.discordObject.managed }
+    get animated() { return this.discordObject.animated }
+    get allNamesString() { return this.discordObject.allNamesString }
+    get requireColons() { return this.discordObject.require_colons }
+    get url() { return this.discordObject.url }
+    get roles() { return this.discordObject.roles }
+
+    get guild() {
+        return Guild.fromId(this.guildId);
+    }
+}
+
+const guilds = new WeakMap();
+
+export class Guild {
+
+    constructor(data) {
+        if (guilds.has(data)) return guilds.get(data);
+        guilds.set(data, this);
+
+        this.discordObject = data;
+    }
+
+    static from(data) {
+        return new Guild(data);
+    }
+
+    static fromId(id) {
+        const guild = Modules.GuildStore.getGuild(id);
+        if (guild) return Guild.from(guild);
+    }
+
+    static get Role() { return Role }
+    static get Emoji() { return Emoji }
+
+    get id() { return this.discordObject.id }
+    get ownerId() { return this.discordObject.ownerId }
+    get applicationId() { return this.discordObject.application_id }
+    get systemChannelId() { return this.discordObject.systemChannelId }
+    get name() { return this.discordObject.name }
+    get acronym() { return this.discordObject.acronym }
+    get icon() { return this.discordObject.icon }
+    get joinedAt() { return this.discordObject.joinedAt }
+    get verificationLevel() { return this.discordObject.verificationLevel }
+    get mfaLevel() { return this.discordObject.mfaLevel }
+    get large() { return this.discordObject.large }
+    get lazy() { return this.discordObject.lazy }
+    get voiceRegion() { return this.discordObject.region }
+    get afkChannelId() { return this.discordObject.afkChannelId }
+    get afkTimeout() { return this.discordObject.afkTimeout }
+    get explicitContentFilter() { return this.discordObject.explicitContentFilter }
+    get defaultMessageNotifications() { return this.discordObject.defaultMessageNotifications }
+    get splash() { return this.discordObject.splash }
+    get features() { return this.discordObject.features }
+
+    get owner() {
+        return this.members.find(m => m.userId === this.ownerId);
+    }
+
+    get roles() {
+        return List.from(Object.entries(this.discordObject.roles), ([i, r]) => new Role(r, this.id))
+            .sort((r1, r2) => r1.position === r2.position ? 0 : r1.position > r2.position ? 1 : -1);
+    }
+
+    get channels() {
+        const channels = Modules.GuildChannelsStore.getChannels(this.id);
+        const returnChannels = new List();
+        for (const category in channels) {
+            if (channels.hasOwnProperty(category)) {
+                if (!Array.isArray(channels[category])) continue;
+                const channelList = channels[category];
+                for (const channel of channelList) {
+                    // For some reason Discord adds a new category with the ID "null" and name "Uncategorized"
+                    if (channel.channel.id === 'null') continue;
+                    returnChannels.push(Channel.from(channel.channel));
+                }
+            }
+        }
+        return returnChannels;
+    }
+
+    /**
+     * Channels that don't have a parent. (Channel categories and any text/voice channel not in one.)
+     */
+    get mainChannels() {
+        return this.channels.filter(c => !c.parentId);
+    }
+
+    /**
+     * The guild's default channel. (Usually the first in the list.)
+     */
+    get defaultChannel() {
+        return Channel.from(Modules.GuildChannelsStore.getDefaultChannel(this.id));
+    }
+
+    /**
+     * The guild's AFK channel.
+     */
+    get afkChannel() {
+        if (this.afkChannelId) return Channel.fromId(this.afkChannelId);
+    }
+
+    /**
+     * The channel system messages are sent to.
+     */
+    get systemChannel() {
+        if (this.systemChannelId) return Channel.fromId(this.systemChannelId);
+    }
+
+    /**
+     * A list of GuildMember objects.
+     */
+    get members() {
+        const members = Modules.GuildMemberStore.getMembers(this.id);
+        return List.from(members, m => new GuildMember(m, this.id));
+    }
+
+    /**
+     * The current user as a GuildMember of this guild.
+     */
+    get currentUser() {
+        return this.members.find(m => m.user === DiscordApi.currentUser);
+    }
+
+    /**
+     * The total number of members in the guild.
+     */
+    get memberCount() {
+        return Modules.MemberCountStore.getMemberCount(this.id);
+    }
+
+    /**
+     * An array of the guild's custom emojis.
+     */
+    get emojis() {
+        return List.from(Modules.EmojiUtils.getGuildEmoji(this.id), e => new Emoji(e, this.id));
+    }
+
+    checkPermissions(perms) {
+        return Modules.PermissionUtils.can(perms, DiscordApi.currentUser, this.discordObject);
+    }
+
+    assertPermissions(name, perms) {
+        if (!this.checkPermissions(perms)) throw new InsufficientPermissions(name);
+    }
+
+    /**
+     * The current user's permissions on this guild.
+     */
+    get permissions() {
+        return Modules.GuildPermissions.getGuildPermissions(this.id);
+    }
+
+    /**
+     * Returns the GuildMember object for a user.
+     * @param {User|GuildMember|Number} user A User or GuildMember object or a user ID
+     * @return {GuildMember}
+     */
+    getMember(user) {
+        const member = Modules.GuildMemberStore.getMember(this.id, user.userId || user.id || user);
+        if (member) return new GuildMember(member, this.id);
+    }
+
+    /**
+     * Checks if a user is a member of this guild.
+     * @param {User|GuildMember|Number} user A User or GuildMember object or a user ID
+     * @return {Boolean}
+     */
+    isMember(user) {
+        return Modules.GuildMemberStore.isMember(this.id, user.userId || user.id || user);
+    }
+
+    /**
+     * Whether the user has not restricted direct messages from members of this guild.
+     */
+    get allowPrivateMessages() {
+        return !DiscordApi.UserSettings.restrictedGuildIds.includes(this.id);
+    }
+
+    /**
+     * Marks all messages in the guild as read.
+     */
+    markAsRead() {
+        Modules.GuildActions.markGuildAsRead(this.id);
+    }
+
+    /**
+     * Selects the guild in the UI.
+     */
+    select() {
+        Modules.GuildActions.selectGuild(this.id);
+    }
+
+    /**
+     * Whether this guild is currently selected.
+     */
+    get isSelected() {
+        return DiscordApi.currentGuild === this;
+    }
+
+    /**
+     * Opens this guild's settings window.
+     * @param {String} section The section to open (see DiscordConstants.GuildSettingsSections)
+     */
+    openSettings(section = 'OVERVIEW') {
+        Modules.GuildSettingsWindow.setSection(section);
+        Modules.GuildSettingsWindow.open(this.id);
+    }
+
+    /**
+     * Kicks members who don't have any roles and haven't been seen in the number of days passed.
+     * @param {Number} days
+     */
+    pruneMembers(days) {
+        this.assertPermissions('KICK_MEMBERS', Modules.DiscordPermissions.KICK_MEMBERS);
+        Modules.PruneMembersModal.prune(this.id, days);
+    }
+
+    openPruneMumbersModal() {
+        this.assertPermissions('KICK_MEMBERS', Modules.DiscordPermissions.KICK_MEMBERS);
+        Modules.PruneMembersModal.open(this.id);
+    }
+
+    /**
+     * Opens the create channel modal for this guild.
+     * @param {Number} type The type of channel to create - either 0 (text), 2 (voice) or 4 (category)
+     * @param {ChannelCategory} category The category to create the channel in
+     * @param {GuildChannel} clone A channel to clone permissions, topic, bitrate and user limit of
+     */
+    openCreateChannelModal(type, category, clone) {
+        this.assertPermissions('MANAGE_CHANNELS', Modules.DiscordPermissions.MANAGE_CHANNELS);
+        Modules.CreateChannelModal.open(type, this.id, category ? category.id : undefined, clone ? clone.id : undefined);
+    }
+
+    /**
+     * Creates a channel in this guild.
+     * @param {Number} type The type of channel to create - either 0 (text), 2 (voice) or 4 (category)
+     * @param {String} name A name for the new channel
+     * @param {ChannelCategory} category The category to create the channel in
+     * @param {Array} permission_overwrites An array of PermissionOverwrite-like objects - leave to use the permissions of the category
+     * @return {Promise => GuildChannel}
+     */
+    async createChannel(type, name, category, permission_overwrites) {
+        this.assertPermissions('MANAGE_CHANNELS', Modules.DiscordPermissions.MANAGE_CHANNELS);
+        const response = await Modules.APIModule.post({
+            url: Modules.DiscordConstants.Endpoints.GUILD_CHANNELS(this.id),
+            body: {
+                type, name,
+                parent_id: category ? category.id : undefined,
+                permission_overwrites: permission_overwrites ? permission_overwrites.map(p => ({
+                    type: p.type,
+                    id: (p.type === 'user' ? p.userId : p.roleId) || p.id,
+                    allow: p.allow,
+                    deny: p.deny
+                })) : undefined
+            }
+        });
+
+        return Channel.fromId(response.body.id);
+    }
+
+    openNotificationSettingsModal() {
+        Modules.NotificationSettingsModal.open(this.id);
+    }
+
+    openPrivacySettingsModal() {
+        Modules.PrivacySettingsModal.open(this.id);
+    }
+
+    nsfwAgree() {
+        Modules.GuildActions.nsfwAgree(this.id);
+    }
+
+    nsfwDisagree() {
+        Modules.GuildActions.nsfwDisagree(this.id);
+    }
+
+    /**
+     * Changes the guild's position in the list.
+     * @param {Number} index The new position
+     */
+    changeSortLocation(index) {
+        Modules.GuildActions.move(DiscordApi.guildPositions.indexOf(this.id), index);
+    }
+
+    /**
+     * Updates this guild.
+     * @return {Promise}
+     */
+    async updateGuild(body) {
+        this.assertPermissions('MANAGE_GUILD', Modules.DiscordPermissions.MANAGE_GUILD);
+        const response = await Modules.APIModule.patch({
+            url: Modules.DiscordConstants.Endpoints.GUILD(this.id),
+            body
+        });
+
+        this.discordObject = Modules.GuildStore.getGuild(this.id);
+        guilds.set(this.discordObject, this);
+    }
+
+    /**
+     * Updates this guild's name.
+     * @param {String} name The new name
+     * @return {Promise}
+     */
+    updateName(name) {
+        return this.updateGuild({ name });
+    }
+
+    /**
+     * Updates this guild's voice region.
+     * @param {String} region The ID of the new voice region (obtainable via the API - see https://discordapp.com/developers/docs/resources/voice#list-voice-regions)
+     * @return {Promise}
+     */
+    updateVoiceRegion(region) {
+        return this.updateGuild({ region });
+    }
+
+    /**
+     * Updates this guild's verification level.
+     * @param {Number} verificationLevel The new verification level (see https://discordapp.com/developers/docs/resources/guild#guild-object-verification-level)
+     * @return {Promise}
+     */
+    updateVerificationLevel(verification_level) {
+        return this.updateGuild({ verification_level });
+    }
+
+    /**
+     * Updates this guild's default message notification level.
+     * @param {Number} defaultMessageNotifications The new default notification level (0: all messages, 1: only mentions)
+     * @return {Promise}
+     */
+    updateDefaultMessageNotifications(default_message_notifications) {
+        return this.updateGuild({ default_message_notifications });
+    }
+
+    /**
+     * Updates this guild's explicit content filter level.
+     * @param {Number} explicitContentFilter The new explicit content filter level (0: disabled, 1: members without roles, 2: everyone)
+     * @return {Promise}
+     */
+    updateExplicitContentFilter(explicit_content_filter) {
+        return this.updateGuild({ explicit_content_filter });
+    }
+
+    /**
+     * Updates this guild's AFK channel.
+     * @param {GuildVoiceChannel} afkChannel The new AFK channel
+     * @return {Promise}
+     */
+    updateAfkChannel(afk_channel) {
+        return this.updateGuild({ afk_channel_id: afk_channel.id || afk_channel });
+    }
+
+    /**
+     * Updates this guild's AFK timeout.
+     * @param {Number} afkTimeout The new AFK timeout
+     * @return {Promise}
+     */
+    updateAfkTimeout(afk_timeout) {
+        return this.updateGuild({ afk_timeout });
+    }
+
+    /**
+     * Updates this guild's icon.
+     * @param {Buffer|String} icon A buffer/base 64 encoded 128x128 JPEG image
+     * @return {Promise}
+     */
+    updateIcon(icon) {
+        return this.updateGuild({ icon: typeof icon === 'string' ? icon : icon.toString('base64') });
+    }
+
+    /**
+     * Updates this guild's icon using a local file.
+     * TODO
+     * @param {String} icon_path The path to the new icon
+     * @return {Promise}
+     */
+    async updateIconFromFile(icon_path) {
+        const buffer = await FileUtils.readFileBuffer(icon_path);
+        return this.updateIcon(buffer);
+    }
+
+    /**
+     * Updates this guild's owner. (Should plugins really ever need to do this?)
+     * @param {User|GuildMember} owner The user/guild member to transfer ownership to
+     * @return {Promise}
+     */
+    updateOwner(owner) {
+        return this.updateGuild({ owner_id: owner.user ? owner.user.id : owner.id || owner });
+    }
+
+    /**
+     * Updates this guild's splash image.
+     * (I don't know what this is actually used for. The API documentation says it's VIP-only.)
+     * @param {Buffer|String} icon A buffer/base 64 encoded 128x128 JPEG image
+     * @return {Promise}
+     */
+    updateSplash(splash) {
+        return this.updateGuild({ splash: typeof splash === 'string' ? splash : splash.toString('base64') });
+    }
+
+    /**
+     * Updates this guild's splash image using a local file.
+     * TODO
+     * @param {String} splash_path The path to the new splash
+     * @return {Promise}
+     */
+    async updateSplashFromFile(splash_path) {
+        const buffer = await FileUtils.readFileBuffer(splash_path);
+        return this.updateSplash(buffer);
+    }
+
+    /**
+     * Updates this guild's system channel.
+     * @param {GuildTextChannel} systemChannel The new system channel
+     * @return {Promise}
+     */
+    updateSystemChannel(system_channel) {
+        return this.updateGuild({ system_channel_id: system_channel.id || system_channel });
+    }
+
+}
diff --git a/client/src/structs/discord/message.js b/client/src/structs/discord/message.js
new file mode 100644
index 00000000..7c2206b8
--- /dev/null
+++ b/client/src/structs/discord/message.js
@@ -0,0 +1,306 @@
+/**
+ * BetterDiscord Message Struct
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+import { DiscordApi, DiscordApiModules as Modules } from 'modules';
+import { List, InsufficientPermissions } from 'structs';
+import { Channel } from './channel';
+import { User } from './user';
+
+const reactions = new WeakMap();
+
+export class Reaction {
+    constructor(data, message_id, channel_id) {
+        if (reactions.has(data)) return reactions.get(data);
+        reactions.set(data, this);
+
+        this.discordObject = data;
+        this.messageId = message_id;
+        this.channelId = channel_id;
+    }
+
+    get emoji() {
+        const id = this.discordObject.emoji.id;
+        if (!id || !this.guild) return this.discordObject.emoji;
+        return this.guild.emojis.find(e => e.id === id);
+    }
+
+    get count() { return this.discordObject.count }
+    get me() { return this.discordObject.me }
+
+    get channel() {
+        return Channel.fromId(this.channel_id);
+    }
+
+    get message() {
+        if (this.channel) return this.channel.messages.find(m => m.id === this.messageId);
+    }
+
+    get guild() {
+        if (this.channel) return this.channel.guild;
+    }
+}
+
+const embeds = new WeakMap();
+
+export class Embed {
+    constructor(data, message_id, channel_id) {
+        if (embeds.has(data)) return embeds.get(data);
+        embeds.set(data, this);
+
+        this.discordObject = data;
+        this.messageId = message_id;
+        this.channelId = channel_id;
+    }
+
+    get title() { return this.discordObject.title }
+    get type() { return this.discordObject.type }
+    get description() { return this.discordObject.description }
+    get url() { return this.discordObject.url }
+    get timestamp() { return this.discordObject.timestamp }
+    get colour() { return this.discordObject.color }
+    get footer() { return this.discordObject.footer }
+    get image() { return this.discordObject.image }
+    get thumbnail() { return this.discordObject.thumbnail }
+    get video() { return this.discordObject.video }
+    get provider() { return this.discordObject.provider }
+    get author() { return this.discordObject.author }
+    get fields() { return this.discordObject.fields }
+
+    get channel() {
+        return Channel.fromId(this.channelId);
+    }
+
+    get message() {
+        if (this.channel) return this.channel.messages.find(m => m.id === this.messageId);
+    }
+
+    get guild() {
+        if (this.channel) return this.channel.guild;
+    }
+}
+
+const messages = new WeakMap();
+
+export class Message {
+
+    constructor(data) {
+        if (messages.has(data)) return messages.get(data);
+        messages.set(data, this);
+
+        this.discordObject = data;
+    }
+
+    static from(data) {
+        switch (data.type) {
+            default: return new Message(data);
+            case 0: return new DefaultMessage(data);
+            case 1: return new RecipientAddMessage(data);
+            case 2: return new RecipientRemoveMessage(data);
+            case 3: return new CallMessage(data);
+            case 4: return new GroupChannelNameChangeMessage(data);
+            case 5: return new GroupChannelIconChangeMessage(data);
+            case 6: return new MessagePinnedMessage(data);
+            case 7: return new GuildMemberJoinMessage(data);
+        }
+    }
+
+    static get DefaultMessage() { return DefaultMessage }
+    static get RecipientAddMessage() { return RecipientAddMessage }
+    static get RecipientRemoveMessage() { return RecipientRemoveMessage }
+    static get CallMessage() { return CallMessage }
+    static get GroupChannelNameChangeMessage() { return GroupChannelNameChangeMessage }
+    static get GroupChannelIconChangeMessage() { return GroupChannelIconChangeMessage }
+    static get MessagePinnedMessage() { return MessagePinnedMessage }
+    static get GuildMemberJoinMessage() { return GuildMemberJoinMessage }
+
+    static get Reaction() { return Reaction }
+    static get Embed() { return Embed }
+
+    get id() { return this.discordObject.id }
+    get channelId() { return this.discordObject.channel_id }
+    get nonce() { return this.discordObject.nonce }
+    get type() { return this.discordObject.type }
+    get timestamp() { return this.discordObject.timestamp }
+    get state() { return this.discordObject.state }
+    get nick() { return this.discordObject.nick }
+    get colourString() { return this.discordObject.colorString }
+
+    get author() {
+        if (this.discordObject.author && !this.webhookId) return User.from(this.discordObject.author);
+    }
+
+    get channel() {
+        return Channel.fromId(this.channelId);
+    }
+
+    get guild() {
+        if (this.channel) return this.channel.guild;
+    }
+
+    /**
+     * Deletes the message.
+     * @return {Promise}
+     */
+    delete() {
+        if (!this.isDeletable) throw new Error(`Message type ${this.type} is not deletable.`);
+        if (this.author === DiscordApi.currentUser) {}
+        else if (this.channel.assertPermissions) this.channel.assertPermissions('MANAGE_MESSAGES', Modules.DiscordPermissions.MANAGE_MESSAGES);
+        else if (!this.channel.owner === DiscordApi.currentUser) throw new InsufficientPermissions('MANAGE_MESSAGES');
+
+        return Modules.APIModule.delete(`${Modules.DiscordConstants.Endpoints.MESSAGES(this.channelId)}/${this.id}`);
+    }
+
+    get isDeletable() {
+        return this.type === 'DEFAULT' || this.type === 'CHANNEL_PINNED_MESSAGE' || this.type === 'GUILD_MEMBER_JOIN';
+    }
+
+    /**
+     * Jumps to the message.
+     */
+    jumpTo(flash = true) {
+        Modules.MessageActions.jumpToMessage(this.channelId, this.id, flash);
+    }
+
+}
+
+export class DefaultMessage extends Message {
+    get webhookId() { return this.discordObject.webhookId }
+    get type() { return 'DEFAULT' }
+    get content() { return this.discordObject.content }
+    get contentParsed() { return this.discordObject.contentParsed }
+    get inviteCodes() { return this.discordObject.invites }
+    get attachments() { return this.discordObject.attachments }
+    get mentionIds() { return this.discordObject.mentions }
+    get mentionRoleIds() { return this.discordObject.mentionRoles }
+    get mentionEveryone() { return this.discordObject.mentionEveryone }
+    get editedTimestamp() { return this.discordObject.editedTimestamp }
+    get tts() { return this.discordObject.tts }
+    get mentioned() { return this.discordObject.mentioned }
+    get bot() { return this.discordObject.bot }
+    get blocked() { return this.discordObject.blocked }
+    get pinned() { return this.discordObject.pinned }
+    get activity() { return this.discordObject.activity }
+    get application() { return this.discordObject.application }
+
+    get webhook() {
+        if (this.webhookId) return this.discordObject.author;
+    }
+
+    get mentions() {
+        return List.from(this.mentionIds, id => User.fromId(id));
+    }
+
+    get mention_roles() {
+        return List.from(this.mentionRoleIds, id => this.guild.roles.find(r => r.id === id));
+    }
+
+    get embeds() {
+        return List.from(this.discordObject.embeds, r => new Embed(r, this.id, this.channelId));
+    }
+
+    get reactions() {
+        return List.from(this.discordObject.reactions, r => new Reaction(r, this.id, this.channelId));
+    }
+
+    get edited() {
+        return !!this.editedTimestamp;
+    }
+
+    /**
+     * Programmatically update the message's content.
+     * @param {String} content The message's new content
+     * @param {Boolean} parse Whether to parse the message or update it as it is
+     * @return {Promise}
+     */
+    async edit(content, parse = false) {
+        if (this.author !== DiscordApi.currentUser) throw new Error('Cannot edit messages sent by other users.');
+        if (parse) content = Modules.MessageParser.parse(this.discordObject, content);
+        else content = {content};
+
+        const response = await Modules.APIModule.patch({
+            url: `${Modules.DiscordConstants.Endpoints.MESSAGES(this.channelId)}/${this.id}`,
+            body: content
+        });
+
+        this.discordObject = Modules.MessageStore.getMessage(this.id, response.body.id);
+        messages.set(this.discordObject, this);
+    }
+
+    /**
+     * Start the edit mode of the UI.
+     * @param {String} content A string to show in the message text area - if empty the message's current content will be used
+     */
+    startEdit(content) {
+        if (this.author !== DiscordApi.currentUser) throw new Error('Cannot edit messages sent by other users.');
+        Modules.MessageActions.startEditMessage(this.channelId, this.id, content || this.content);
+    }
+
+    /**
+     * Exit the edit mode of the UI.
+     */
+    endEdit() {
+        Modules.MessageActions.endEditMessage();
+    }
+}
+
+export class RecipientAddMessage extends Message {
+    get type() { return 'RECIPIENT_ADD' }
+    get addedUserId() { return this.discordObject.mentions[0] }
+
+    get addedUser() {
+        return User.fromId(this.addedUserId);
+    }
+}
+
+export class RecipientRemoveMessage extends Message {
+    get type() { return 'RECIPIENT_REMOVE' }
+    get removedUserId() { return this.discordObject.mentions[0] }
+
+    get removedUser() {
+        return User.fromId(this.removedUserId);
+    }
+
+    get userLeft() {
+        return this.author === this.removedUser;
+    }
+}
+
+export class CallMessage extends Message {
+    get type() { return 'CALL' }
+    get mentionIds() { return this.discordObject.mentions }
+    get call() { return this.discordObject.call }
+
+    get endedTimestamp() { return this.call.endedTimestamp }
+
+    get mentions() {
+        return List.from(this.mentionIds, id => User.fromId(id));
+    }
+
+    get participants() {
+        return List.from(this.call.participants, id => User.fromId(id));
+    }
+}
+
+export class GroupChannelNameChangeMessage extends Message {
+    get type() { return 'CHANNEL_NAME_CHANGE' }
+    get newName() { return this.discordObject.content }
+}
+
+export class GroupChannelIconChangeMessage extends Message {
+    get type() { return 'CHANNEL_ICON_CHANGE' }
+}
+
+export class MessagePinnedMessage extends Message {
+    get type() { return 'CHANNEL_PINNED_MESSAGE' }
+}
+
+export class GuildMemberJoinMessage extends Message {
+    get type() { return 'GUILD_MEMBER_JOIN' }
+}
diff --git a/client/src/structs/discord/user.js b/client/src/structs/discord/user.js
new file mode 100644
index 00000000..1254bdaf
--- /dev/null
+++ b/client/src/structs/discord/user.js
@@ -0,0 +1,330 @@
+/**
+ * BetterDiscord User Struct
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+import { DiscordApi, DiscordApiModules as Modules } from 'modules';
+import { List, InsufficientPermissions } from 'structs';
+import { Utils } from 'common';
+import { Guild } from './guild';
+import { Channel } from './channel';
+
+const users = new WeakMap();
+
+export class User {
+
+    constructor(data) {
+        if (users.has(data)) return users.get(data);
+        users.set(data, this);
+
+        this.discordObject = data;
+    }
+
+    static from(data) {
+        return new User(data);
+    }
+
+    static fromId(id) {
+        const user = Modules.UserStore.getUser(id);
+        if (user) return User.from(user);
+    }
+
+    static get GuildMember() { return GuildMember }
+
+    get id() { return this.discordObject.id }
+    get username() { return this.discordObject.username }
+    get usernameLowerCase() { return this.discordObject.usernameLowerCase }
+    get discriminator() { return this.discordObject.discriminator }
+    get avatar() { return this.discordObject.avatar }
+    get email() { return undefined }
+    get phone() { return undefined }
+    get flags() { return this.discordObject.flags }
+    get isBot() { return this.discordObject.bot }
+    get premium() { return this.discordObject.premium }
+    get verified() { return this.discordObject.verified }
+    get mfaEnabled() { return this.discordObject.mfaEnabled }
+    get mobile() { return this.discordObject.mobile }
+
+    get tag() { return this.discordObject.tag }
+    get avatarUrl() { return this.discordObject.avatarURL }
+    get createdAt() { return this.discordObject.createdAt }
+
+    get isClamied() { return this.discordObject.isClaimed() }
+    get isLocalBot() { return this.discordObject.isLocalBot() }
+    get isPhoneVerified() { return this.discordObject.isPhoneVerified() }
+
+    get guilds() {
+        return DiscordApi.guilds.filter(g => g.members.find(m => m.user === this));
+    }
+
+    get status() {
+        return Modules.UserStatusStore.getStatus(this.id);
+    }
+
+    get activity() {
+        // type can be either 0 (normal/rich presence game), 1 (streaming) or 2 (listening to Spotify)
+        // (3 appears as watching but is undocumented)
+        return Modules.UserStatusStore.getActivity(this.id);
+    }
+
+    get note() {
+        const note = Modules.UserNoteStore.getNote(this.id);
+        if (note) return note;
+    }
+
+    /**
+     * Updates the note for this user.
+     * @param {String} note The new note
+     * @return {Promise}
+     */
+    updateNote(note) {
+        return Modules.APIModule.put({
+            url: `${Modules.DiscordConstants.Endpoints.NOTES}/${this.id}`,
+            body: { note }
+        });
+    }
+
+    get privateChannel() {
+        return DiscordApi.channels.find(c => c.type === 'DM' && c.recipientId === this.id);
+    }
+
+    async ensurePrivateChannel() {
+        if (DiscordApi.currentUser === this)
+            throw new Error('Cannot create a direct message channel to the current user.');
+        return Channel.fromId(await Modules.PrivateChannelActions.ensurePrivateChannel(DiscordApi.currentUser.id, this.id));
+    }
+
+    async sendMessage(content, parse = true) {
+        const channel = await this.ensurePrivateChannel();
+        return channel.sendMessage(content, parse);
+    }
+
+    get isFriend() {
+        return Modules.RelationshipStore.isFriend(this.id);
+    }
+
+    get isBlocked() {
+        return Modules.RelationshipStore.isBlocked(this.id);
+    }
+
+    addFriend() {
+        Modules.RelationshipManager.addRelationship(this.id, {location: 'Context Menu'});
+    }
+
+    removeFriend() {
+        Modules.RelationshipManager.removeRelationship(this.id, {location: 'Context Menu'});
+    }
+
+    block() {
+        Modules.RelationshipManager.addRelationship(this.id, {location: 'Context Menu'}, Modules.DiscordConstants.RelationshipTypes.BLOCKED);
+    }
+
+    unblock() {
+        Modules.RelationshipManager.removeRelationship(this.id, {location: 'Context Menu'});
+    }
+
+    /**
+     * Opens the profile modal for this user.
+     * @param {String} section The section to open (see DiscordConstants.UserProfileSections)
+     */
+    openUserProfileModal(section = 'USER_INFO') {
+        Modules.UserProfileModal.open(this.id);
+        Modules.UserProfileModal.setSection(section);
+    }
+
+}
+
+const guild_members = new WeakMap();
+
+export class GuildMember {
+    constructor(data, guild_id) {
+        if (guild_members.has(data)) return guild_members.get(data);
+        guild_members.set(data, this);
+
+        this.discordObject = data;
+        this.guildId = guild_id;
+    }
+
+    get userId() { return this.discordObject.userId }
+    get nickname() { return this.discordObject.nick }
+    get colourString() { return this.discordObject.colorString }
+    get hoistRoleId() { return this.discordObject.hoistRoleId }
+    get roleIds() { return this.discordObject.roles }
+
+    get user() {
+        return User.fromId(this.userId);
+    }
+
+    get name() {
+        return this.nickname || this.user.username;
+    }
+
+    get guild() {
+        return Guild.fromId(this.guildId);
+    }
+
+    get roles() {
+        return List.from(this.roleIds, id => this.guild.roles.find(r => r.id === id))
+            .sort((r1, r2) => r1.position === r2.position ? 0 : r1.position > r2.position ? 1 : -1);
+    }
+
+    get hoistRole() {
+        return this.guild.roles.find(r => r.id === this.hoistRoleId);
+    }
+
+    checkPermissions(perms) {
+        return Modules.PermissionUtils.can(perms, DiscordApi.currentUser.discordObject, this.guild.discordObject);
+    }
+
+    assertPermissions(name, perms) {
+        if (!this.checkPermissions(perms)) throw new InsufficientPermissions(name);
+    }
+
+    /**
+     * Opens the modal to change this user's nickname.
+     */
+    openChangeNicknameModal() {
+        if (DiscordApi.currentUser === this.user)
+            this.assertPermissions('CHANGE_NICKNAME', Modules.DiscordPermissions.CHANGE_NICKNAME);
+        else this.assertPermissions('MANAGE_NICKNAMES', Modules.DiscordPermissions.MANAGE_NICKNAMES);
+
+        Modules.ChangeNicknameModal.open(this.guildId, this.userId);
+    }
+
+    /**
+     * Changes the user's nickname on this guild.
+     * @param {String} nickname The user's new nickname
+     * @return {Promise}
+     */
+    changeNickname(nick) {
+        if (DiscordApi.currentUser === this.user)
+            this.assertPermissions('CHANGE_NICKNAME', Modules.DiscordPermissions.CHANGE_NICKNAME);
+        else this.assertPermissions('MANAGE_NICKNAMES', Modules.DiscordPermissions.MANAGE_NICKNAMES);
+
+        return Modules.APIModule.patch({
+            url: `${Modules.DiscordConstants.Endpoints.GUILD_MEMBERS(this.guild_id)}/${DiscordApi.currentUser === this.user ? '@me/nick' : this.userId}`,
+            body: { nick }
+        });
+    }
+
+    /**
+     * Kicks this user from the guild.
+     * @param {String} reason A reason to attach to the audit log entry
+     * @return {Promise}
+     */
+    kick(reason = '') {
+        this.assertPermissions('KICK_MEMBERS', Modules.DiscordPermissions.KICK_MEMBERS);
+        return Modules.GuildActions.kickUser(this.guildId, this.userId, reason);
+    }
+
+    /**
+     * Bans this user from the guild.
+     * @param {Number} daysToDelete The number of days of the user's recent message history to delete
+     * @param {String} reason A reason to attach to the audit log entry
+     * @return {Promise}
+     */
+    ban(daysToDelete = 1, reason = '') {
+        this.assertPermissions('BAN_MEMBERS', Modules.DiscordPermissions.BAN_MEMBERS);
+        return Modules.GuildActions.banUser(this.guildId, this.userId, daysToDelete, reason);
+    }
+
+    /**
+     * Removes the ban for this user.
+     * @return {Promise}
+     */
+    unban() {
+        this.assertPermissions('BAN_MEMBERS', Modules.DiscordPermissions.BAN_MEMBERS);
+        return Modules.GuildActions.unbanUser(this.guildId, this.userId);
+    }
+
+    /**
+     * Moves this user to another voice channel.
+     * @param {GuildVoiceChannel} channel The channel to move this user to
+     */
+    move(channel) {
+        this.assertPermissions('MOVE_MEMBERS', Modules.DiscordPermissions.MOVE_MEMBERS);
+        Modules.GuildActions.setChannel(this.guildId, this.userId, channel.id);
+    }
+
+    /**
+     * Mutes this user for everyone in the guild.
+     */
+    mute(active = true) {
+        this.assertPermissions('MUTE_MEMBERS', Modules.DiscordPermissions.MUTE_MEMBERS);
+        Modules.GuildActions.setServerMute(this.guildId, this.userId, active);
+    }
+
+    /**
+     * Unmutes this user.
+     */
+    unmute() {
+        this.mute(false);
+    }
+
+    /**
+     * Deafens this user.
+     */
+    deafen(active = true) {
+        this.assertPermissions('DEAFEN_MEMBERS', Modules.DiscordPermissions.DEAFEN_MEMBERS);
+        Modules.GuildActions.setServerDeaf(this.guildId, this.userId, active);
+    }
+
+    /**
+     * Undeafens this user.
+     */
+    undeafen() {
+        this.deafen(false);
+    }
+
+    /**
+     * Gives this user a role.
+     * @param {Role} role The role to add
+     * @return {Promise}
+     */
+    addRole(...roles) {
+        const newRoles = this.roleIds.concat([]);
+        let changed = false;
+        for (let role of roles) {
+            if (newRoles.includes(role.id || role)) continue;
+            newRoles.push(role.id || role);
+            changed = true;
+        }
+        if (!changed) return;
+        return this.updateRoles(newRoles);
+    }
+
+    /**
+     * Removes a role from this user.
+     * @param {Role} role The role to remove
+     * @return {Promise}
+     */
+    removeRole(...roles) {
+        const newRoles = this.roleIds.concat([]);
+        let changed = false;
+        for (let role of roles) {
+            if (!newRoles.includes(role.id || role)) continue;
+            Utils.removeFromArray(newRoles, role.id || role);
+            changed = true;
+        }
+        if (!changed) return;
+        return this.updateRoles(newRoles);
+    }
+
+    /**
+     * Updates this user's roles.
+     * @param {Array} roles An array of Role objects or role IDs
+     * @return {Promise}
+     */
+    updateRoles(roles) {
+        roles = roles.map(r => r.id || r);
+        return Modules.APIModule.patch({
+            url: `${Modules.DiscordConstants.Endpoints.GUILD_MEMBERS(this.guildId)}/${this.userId}`,
+            body: { roles }
+        });
+    }
+}
diff --git a/client/src/structs/discordstructs.js b/client/src/structs/discordstructs.js
new file mode 100644
index 00000000..1341ca20
--- /dev/null
+++ b/client/src/structs/discordstructs.js
@@ -0,0 +1,4 @@
+export * from './discord/user';
+export * from './discord/guild';
+export * from './discord/channel';
+export * from './discord/message';
diff --git a/client/src/structs/events/index.js b/client/src/structs/events/index.js
index f10d1e35..5b9d7eb7 100644
--- a/client/src/structs/events/index.js
+++ b/client/src/structs/events/index.js
@@ -1,3 +1,4 @@
 export { default as SettingUpdatedEvent } from './settingupdated';
 export { default as SettingsUpdatedEvent } from './settingsupdated';
 export { default as ErrorEvent } from './error';
+export { PermissionsError, InsufficientPermissions } from './permissionserror';
diff --git a/client/src/structs/events/permissionserror.js b/client/src/structs/events/permissionserror.js
new file mode 100644
index 00000000..0ff95192
--- /dev/null
+++ b/client/src/structs/events/permissionserror.js
@@ -0,0 +1,25 @@
+/**
+ * BetterDiscord Permissions Error Struct
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+import ErrorEvent from './error';
+
+export class PermissionsError extends ErrorEvent {
+    constructor(message) {
+        super(message);
+        this.name = 'PermissionsError';
+    }
+}
+
+export class InsufficientPermissions extends PermissionsError {
+    constructor(message) {
+        super(`Missing Permission — ${message}`);
+        this.name = 'InsufficientPermissions';
+    }
+}
diff --git a/client/src/structs/list.js b/client/src/structs/list.js
new file mode 100644
index 00000000..157f1e9f
--- /dev/null
+++ b/client/src/structs/list.js
@@ -0,0 +1,30 @@
+/**
+ * BetterDiscord List
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+export default class List extends Array {
+
+    constructor() {
+        super(...arguments);
+    }
+
+    get(...filters) {
+        return this.find(item => {
+            for (let filter of filters) {
+                for (let key in filter) {
+                    if (filter.hasOwnProperty(key)) {
+                        if (item[key] !== filter[key]) return false;
+                    }
+                }
+            }
+            return true;
+        });
+    }
+
+}
diff --git a/client/src/structs/settings/multiplechoiceoption.js b/client/src/structs/settings/multiplechoiceoption.js
index 3e583c91..217ab430 100644
--- a/client/src/structs/settings/multiplechoiceoption.js
+++ b/client/src/structs/settings/multiplechoiceoption.js
@@ -8,8 +8,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { Utils } from 'common';
-
 export default class MultipleChoiceOption {
 
     constructor(args) {
diff --git a/client/src/structs/settings/setting.js b/client/src/structs/settings/setting.js
index de2ffcc4..286706f0 100644
--- a/client/src/structs/settings/setting.js
+++ b/client/src/structs/settings/setting.js
@@ -8,8 +8,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { Utils } from 'common';
-
 import BoolSetting from './types/bool';
 import StringSetting from './types/text';
 import NumberSetting from './types/number';
diff --git a/client/src/structs/settings/settingscategory.js b/client/src/structs/settings/settingscategory.js
index cf1c9453..33f8402d 100644
--- a/client/src/structs/settings/settingscategory.js
+++ b/client/src/structs/settings/settingscategory.js
@@ -8,10 +8,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import { SettingUpdatedEvent, SettingsUpdatedEvent } from 'structs';
+import { ClientLogger as Logger, AsyncEventEmitter } from 'common';
 import Setting from './setting';
 import BaseSetting from './types/basesetting';
-import { ClientLogger as Logger, AsyncEventEmitter } from 'common';
-import { SettingUpdatedEvent, SettingsUpdatedEvent } from 'structs';
+import SettingsProxy from './settingsproxy';
 
 export default class SettingsCategory extends AsyncEventEmitter {
 
@@ -173,6 +174,14 @@ export default class SettingsCategory extends AsyncEventEmitter {
         await this.emit('removed-category', event);
     }
 
+    /**
+     * Returns a proxy which can be used to access the category's values like a normal object.
+     * @return {SettingsCategoryProxy}
+     */
+    get proxy() {
+        return this._proxy || (this._proxy = SettingsProxy.createProxy(this));
+    }
+
     /**
      * Returns the first setting where calling {function} returns true.
      * @param {Function} function A function to call to filter settings
diff --git a/client/src/structs/settings/settingsproxy.js b/client/src/structs/settings/settingsproxy.js
new file mode 100644
index 00000000..d8de7720
--- /dev/null
+++ b/client/src/structs/settings/settingsproxy.js
@@ -0,0 +1,109 @@
+/**
+ * BetterDiscord Settings Proxy
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import SettingsSet from './settingsset';
+import SettingsCategory from './settingscategory';
+
+const setHandler = {
+    get({ set }, category_id) {
+        const category = set.getCategory(category_id);
+        if (category) return SettingsProxy.createProxy(category);
+
+        const setting = set.getSetting(category_id);
+        if (setting) return setting.value;
+    },
+    set({ set }, category_id, values) {
+        const category = set.getCategory(category_id);
+        if (category) return category.merge(values);
+
+        const setting = set.getSetting(category_id);
+        if (setting) return setting.value = values;
+    },
+    has({ set }, category_id) {
+        const category = set.getCategory(category_id);
+        if (category) return true;
+
+        const setting = set.getSetting(category_id);
+        if (setting) return true;
+    },
+    getPrototypeOf({ set }) {
+        return SettingsSetProxy.prototype;
+    },
+    setPrototypeOf({ set }) {},
+    isExtensible({ set }) {
+        return false;
+    },
+    preventExtensions({ set }) {},
+    getOwnPropertyDescriptor({ set }, category_id) {
+        return {
+            value: setHandler.get({ set }, category_id),
+            writable: true,
+            enumerable: true,
+            configurable: true
+        };
+    },
+    defineProperty({ set }) {},
+    deleteProperty({ set }) {},
+    ownKeys({ set }) {
+        return set.categories.map(c => c.id);
+    }
+};
+
+const categoryHandler = {
+    get({ category }, setting_id) {
+        const setting = category.getSetting(setting_id);
+        if (setting) return setting.value;
+    },
+    set({ category }, setting_id, value) {
+        const setting = category.getSetting(setting_id);
+        if (setting) return setting.value = value;
+    },
+    has({ category }, setting_id) {
+        const setting = category.getSetting(setting_id);
+        if (setting) return true;
+    },
+    getPrototypeOf({ category }) {
+        return SettingsCategoryProxy.prototype;
+    },
+    setPrototypeOf({ category }) {},
+    isExtensible({ category }) {
+        return false;
+    },
+    preventExtensions({ category }) {},
+    getOwnPropertyDescriptor({ category }, setting_id) {
+        return {
+            value: categoryHandler.get({ category }, setting_id),
+            writable: true,
+            enumerable: true,
+            configurable: true
+        };
+    },
+    defineProperty({ category }) {},
+    deleteProperty({ category }) {},
+    ownKeys({ category }) {
+        return category.settings.map(s => s.id);
+    }
+};
+
+export default class SettingsProxy {
+
+    constructor(args) {
+        Object.assign(this, args);
+    }
+
+    static createProxy(set) {
+        if (set instanceof SettingsSet) return new Proxy(new SettingsSetProxy({ set }), setHandler);
+        if (set instanceof SettingsCategory) return new Proxy(new SettingsCategoryProxy({ category: set }), categoryHandler);
+    }
+
+}
+
+export class SettingsSetProxy extends SettingsProxy {}
+export class SettingsCategoryProxy extends SettingsProxy {}
diff --git a/client/src/structs/settings/settingsset.js b/client/src/structs/settings/settingsset.js
index fce98e9c..51aaba2c 100644
--- a/client/src/structs/settings/settingsset.js
+++ b/client/src/structs/settings/settingsset.js
@@ -8,11 +8,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import SettingsCategory from './settingscategory';
-import SettingsScheme from './settingsscheme';
-import { ClientLogger as Logger, AsyncEventEmitter } from 'common';
 import { SettingUpdatedEvent, SettingsUpdatedEvent } from 'structs';
 import { Modals } from 'ui';
+import { ClientLogger as Logger, AsyncEventEmitter } from 'common';
+import SettingsCategory from './settingscategory';
+import SettingsScheme from './settingsscheme';
+import SettingsProxy from './settingsproxy';
 
 export default class SettingsSet extends AsyncEventEmitter {
 
@@ -245,6 +246,14 @@ export default class SettingsSet extends AsyncEventEmitter {
         });
     }
 
+    /**
+     * Returns a proxy which can be used to access the set's categories like a normal object.
+     * @return {SettingsSetProxy}
+     */
+    get proxy() {
+        return this._proxy || (this._proxy = SettingsProxy.createProxy(this));
+    }
+
     /**
      * Returns the first category where calling {function} returns true.
      * @param {Function} function A function to call to filter categories
@@ -356,7 +365,7 @@ export default class SettingsSet extends AsyncEventEmitter {
      * Merges a set into this set without emitting events (and therefore synchronously).
      * This only exists for use by the constructor.
      */
-    _merge(newSet, emit_multi = true) {
+    _merge(newSet) {
         let updatedSettings = [];
         // const categories = newSet instanceof Array ? newSet : newSet.settings;
         const categories = newSet && newSet.args ? newSet.args.settings : newSet ? newSet.settings : newSet;
diff --git a/client/src/structs/settings/types/custom.js b/client/src/structs/settings/types/custom.js
index a44bdb54..c632d53b 100644
--- a/client/src/structs/settings/types/custom.js
+++ b/client/src/structs/settings/types/custom.js
@@ -8,10 +8,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import Setting from './basesetting';
-import SettingsCategory from '../settingscategory';
-import SettingsScheme from '../settingsscheme';
+import { Globals } from 'modules';
 import path from 'path';
+import Setting from './basesetting';
 
 export default class CustomSetting extends Setting {
 
@@ -68,7 +67,7 @@ export default class CustomSetting extends Setting {
      * @param {String} classExport The name of a property of the file's exports that will be used (optional)
      */
     setClass(class_file, class_export) {
-        const component = window.require(path.join(this.path, class_file));
+        const component = Globals.require(path.join(this.path, class_file));
         const setting_class = class_export ? component[class_export](CustomSetting) : component.default ? component.default(CustomSetting) : component(CustomSetting);
 
         if (!(setting_class.prototype instanceof CustomSetting))
diff --git a/client/src/structs/settings/types/keybind.js b/client/src/structs/settings/types/keybind.js
index f98371c4..1a7984da 100644
--- a/client/src/structs/settings/types/keybind.js
+++ b/client/src/structs/settings/types/keybind.js
@@ -8,9 +8,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import Setting from './basesetting';
 import Combokeys from 'combokeys';
+import CombokeysGlobalBind from 'combokeys/plugins/global-bind';
+import Setting from './basesetting';
 
+const instances = new Set();
 let keybindsPaused = false;
 
 export default class KeybindSetting extends Setting {
@@ -18,10 +20,23 @@ export default class KeybindSetting extends Setting {
     constructor(args, ...merge) {
         super(args, ...merge);
 
+        // When adding a keybind-activated listener, add the keybind setting to the set of active keybind settings
+        // This creates a reference to the keybind setting, which may cause memory leaks
+        this.on('newListener', ({event: [event, listener]}) => {
+            if (event === 'keybind-activated') instances.add(this);
+        });
+
+        // When there are no more keybind-activated listeners, remove the keybind setting from the set of active keybind settings
+        // Always remember to unbind keybind-activated listeners!
+        this.on('removeListener', ({event: [event, listener]}) => {
+            if (!this.listenerCount('keybind-activated')) instances.delete(this);
+        });
+
         this.__keybind_activated = this.__keybind_activated.bind(this);
 
-        this.combokeys = new Combokeys(document);
-        this.combokeys.bind(this.value, this.__keybind_activated);
+        this.combokeys = new Combokeys(this);
+        CombokeysGlobalBind(this.combokeys);
+        this.combokeys.bindGlobal(this.value, this.__keybind_activated);
     }
 
     /**
@@ -33,7 +48,7 @@ export default class KeybindSetting extends Setting {
 
     setValueHook() {
         this.combokeys.reset();
-        this.combokeys.bind(this.value, this.__keybind_activated);
+        this.combokeys.bindGlobal(this.value, this.__keybind_activated);
     }
 
     __keybind_activated(event) {
@@ -41,6 +56,22 @@ export default class KeybindSetting extends Setting {
         this.emit('keybind-activated', event);
     }
 
+    // Event function aliases for Combokeys
+    get addEventListener() { return this.on }
+    get removeEventListener() { return this.removeListener }
+
+    static _init() {
+        document.addEventListener('keydown', this.__event_handler.bind(this, 'keydown'));
+        document.addEventListener('keyup', this.__event_handler.bind(this, 'keyup'));
+        document.addEventListener('keypress', this.__event_handler.bind(this, 'keypress'));
+    }
+
+    static __event_handler(event, data) {
+        for (let keybindSetting of instances) {
+            keybindSetting.emit(event, data);
+        }
+    }
+
     static get paused() {
         return keybindsPaused;
     }
@@ -50,3 +81,5 @@ export default class KeybindSetting extends Setting {
     }
 
 }
+
+KeybindSetting._init();
diff --git a/client/src/structs/settings/types/radio.js b/client/src/structs/settings/types/radio.js
index 1438de4e..cb4021a4 100644
--- a/client/src/structs/settings/types/radio.js
+++ b/client/src/structs/settings/types/radio.js
@@ -52,6 +52,28 @@ export default class RadioSetting extends Setting {
         this.args.value = selected_option.id;
     }
 
+    /**
+     * Whether the user should be allowed to choose multiple options.
+     */
+    get multi() {
+        return this.args.multi;
+    }
+
+    /**
+     * The minimum number of options the user may select if a multi select group.
+     * This only restricts deselecting options when there is less or equal options selected than this, and does not ensure that this number of options are actually selected.
+     */
+    get min() {
+        return this.multi ? this.args.min || 0 : 1;
+    }
+
+    /**
+     * The maximum number of options the user may select if a multi select group.
+     */
+    get max() {
+        return this.multi ? this.args.max || 0 : 1;
+    }
+
     /**
      * Returns a representation of this setting's value in SCSS.
      * @return {String}
diff --git a/client/src/structs/structs.js b/client/src/structs/structs.js
index b368dc11..22a0b84b 100644
--- a/client/src/structs/structs.js
+++ b/client/src/structs/structs.js
@@ -1,2 +1,4 @@
+export { default as List } from './list';
+
 export * from './events/index';
 export * from './settings/index';
diff --git a/client/src/styles/index.scss b/client/src/styles/index.scss
index a5a02b66..1bce97fa 100644
--- a/client/src/styles/index.scss
+++ b/client/src/styles/index.scss
@@ -1 +1 @@
-@import './partials/index.scss';
\ No newline at end of file
+@import './partials/index.scss';
diff --git a/client/src/styles/partials/animations.scss b/client/src/styles/partials/animations.scss
index e4597d42..1287340a 100644
--- a/client/src/styles/partials/animations.scss
+++ b/client/src/styles/partials/animations.scss
@@ -49,6 +49,30 @@
     }
 }
 
+@keyframes bd-toast-up {
+    0% {
+        transform: translateY(10px);
+        opacity: 0;
+    }
+
+    100% {
+        transform: translateY(0%);
+        opacity: 1;
+    }
+}
+
+@keyframes bd-toast-down {
+    0% {
+        transform: translateY(0%);
+        opacity: 1;
+    }
+
+    100% {
+        transform: translateY(10px);
+        opacity: 0;
+    }
+}
+
 @keyframes bd-fade-out {
     0% {
         opacity: 1;
diff --git a/client/src/styles/partials/badges.scss b/client/src/styles/partials/badges.scss
index 585fef64..5326fce7 100644
--- a/client/src/styles/partials/badges.scss
+++ b/client/src/styles/partials/badges.scss
@@ -18,50 +18,49 @@
     background-size: cover;
     cursor: pointer;
     height: 16px;
+    width: 16px;
     margin-right: 6px;
 }
 
 .bd-profile-badge-developer,
-.bd-profile-badge-contributor,
-.bd-message-badge-developer,
-.bd-message-badge-contributor {
+.bd-profile-badge-webdev,
+.bd-profile-badge-contributor {
     background-image: $logoSmallBw;
-    width: 16px;
     filter: brightness(10);
-    cursor: pointer;
+
+    .theme-light [class*="topSectionNormal-"] .bd-profile-badges-profile-modal > &,
+    .theme-light :not(.bd-profile-badges-profile-modal) > & {
+        background-image: $logoSmallLight;
+        filter: none;
+    }
 }
 
-.theme-light [class*="topSectionNormal-"] .bd-profile-badge-developer,
-.theme-light [class*="topSectionNormal-"] .bd-profile-badge-contributor,
-.theme-light .bd-message-badge-developer,
-.theme-light .bd-message-badge-contributor {
-    background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FscXVlXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMjAwMCAyMDAwIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAyMDAwIDIwMDAiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxnPjxwYXRoIGZpbGw9IiMzRTgyRTUiIGQ9Ik0xNDAyLjIsNjMxLjdjLTkuNy0zNTMuNC0yODYuMi00OTYtNjQyLjYtNDk2SDY4LjR2NzE0LjFsNDQyLDM5OFY0OTAuN2gyNTdjMjc0LjUsMCwyNzQuNSwzNDQuOSwwLDM0NC45SDU5Ny42djMyOS41aDE2OS44YzI3NC41LDAsMjc0LjUsMzQ0LjgsMCwzNDQuOGgtNjk5djM1NC45aDY5MS4yYzM1Ni4zLDAsNjMyLjgtMTQyLjYsNjQyLjYtNDk2YzAtMTYyLjYtNDQuNS0yODQuMS0xMjIuOS0zNjguNkMxMzU3LjcsOTE1LjgsMTQwMi4yLDc5NC4zLDE0MDIuMiw2MzEuN3oiLz48cGF0aCBmaWxsPSIjYmJiYmJiIiBkPSJNMTI2Mi41LDEzNS4yTDEyNjIuNSwxMzUuMmwtNzYuOCwwYzI2LjYsMTMuMyw1MS43LDI4LjEsNzUsNDQuM2M3MC43LDQ5LjEsMTI2LjEsMTExLjUsMTY0LjYsMTg1LjNjMzkuOSw3Ni42LDYxLjUsMTY1LjYsNjQuMywyNjQuNmwwLDEuMnYxLjJjMCwxNDEuMSwwLDU5Ni4xLDAsNzM3LjF2MS4ybDAsMS4yYy0yLjcsOTktMjQuMywxODgtNjQuMywyNjQuNmMtMzguNSw3My44LTkzLjgsMTM2LjItMTY0LjYsMTg1LjNjLTIyLjYsMTUuNy00Ni45LDMwLjEtNzIuNiw0My4xaDcyLjVjMzQ2LjIsMS45LDY3MS0xNzEuMiw2NzEtNTY3LjlWNzE2LjdDMTkzMy41LDMxMi4yLDE2MDguNywxMzUuMiwxMjYyLjUsMTM1LjJ6Ii8+PC9nPjwvc3ZnPg==');
-    filter: none;
-}
-
-.bd-message-badges-wrap {
+.bd-profile-badges.bd-profile-badges-nametag {
     display: inline-block;
     margin-left: 6px;
     height: 11px;
 
-    .bd-message-badge-developer,
-    .bd-message-badge-contributor {
+    .bd-profile-badge {
         width: 12px;
         height: 12px;
+
+        &:last-child {
+            margin-right: 0;
+        }
     }
 }
 
-.member-username .bd-message-badges-wrap {
-    display: inline-block;
-    height: 17px;
-    width: 14px;
-
-    .bd-message-badge-developer,
-    .bd-message-badge-contributor {
-        width: 14px;
-        height: 16px;
-        background-position: center;
-        background-size: 12px 12px;
-        background-repeat: no-repeat;
-    }
-}
+// .member-username .bd-profile-badges {
+//     display: inline-block;
+//     height: 17px;
+//     width: 14px;
+//
+//     .bd-badge,
+//     .bd-badge-c {
+//         width: 14px;
+//         height: 16px;
+//         background-position: center;
+//         background-size: 12px 12px;
+//         background-repeat: no-repeat;
+//     }
+// }
diff --git a/client/src/styles/partials/bdsettings/card.scss b/client/src/styles/partials/bdsettings/card.scss
index e997aa5f..aad5ac82 100644
--- a/client/src/styles/partials/bdsettings/card.scss
+++ b/client/src/styles/partials/bdsettings/card.scss
@@ -19,6 +19,7 @@
         .bd-card-icon {
             width: 30px;
             height: 30px;
+            background-size: cover;
         }
 
         > span {
diff --git a/client/src/styles/partials/bdsettings/index.scss b/client/src/styles/partials/bdsettings/index.scss
index 8d498189..605c4b92 100644
--- a/client/src/styles/partials/bdsettings/index.scss
+++ b/client/src/styles/partials/bdsettings/index.scss
@@ -5,3 +5,4 @@
 @import './tooltips.scss';
 @import './settings-schemes.scss';
 @import './updater.scss';
+@import './window-preferences';
diff --git a/client/src/styles/partials/bdsettings/window-preferences.scss b/client/src/styles/partials/bdsettings/window-preferences.scss
new file mode 100644
index 00000000..67483288
--- /dev/null
+++ b/client/src/styles/partials/bdsettings/window-preferences.scss
@@ -0,0 +1,5 @@
+.bd-window-preferences {
+    .bd-window-preferences-disabled p {
+        color: #f6f6f7;
+    }
+}
diff --git a/client/src/styles/partials/discordoverrides.scss b/client/src/styles/partials/discordoverrides.scss
index 43c0f3b2..6d051e20 100644
--- a/client/src/styles/partials/discordoverrides.scss
+++ b/client/src/styles/partials/discordoverrides.scss
@@ -1,4 +1,4 @@
-.guilds-wrapper {
+[class*="guildsWrapper-"] {
     padding-top: 49px !important;
 
     .platform-osx & {
@@ -6,11 +6,11 @@
     }
 }
 
-[class*="guilds-wrapper"] + [class*="flex"] {
+[class*="guildsWrapper-"] + [class*="flex"] {
     border-radius: 0 0 0 5px;
 }
 
-.unread-mentions-indicator-top {
+[class*="unreadMentionsIndicatorTop-"] {
     top: 49px;
 
     .platform-osx & {
@@ -19,6 +19,10 @@
 }
 
 // Any layers need to be above the main layer (where the BD button is placed)
-.layer-kosS71 + .layer-kosS71 {
+[class*="layers-"] > * + * {
     z-index: 900;
 }
+
+.bd-settings-wrapper.platform-linux {
+    transform: none;
+}
diff --git a/client/src/styles/partials/emotes.scss b/client/src/styles/partials/emotes.scss
index 1bfe491e..61559446 100644
--- a/client/src/styles/partials/emotes.scss
+++ b/client/src/styles/partials/emotes.scss
@@ -9,7 +9,7 @@
 }
 
 .bd-emotewrapper {
-    display: flex;
+    display: inline-flex;
     max-height: 32px;
 
     img {
diff --git a/client/src/styles/partials/generic/buttons.scss b/client/src/styles/partials/generic/buttons.scss
index ceb9d6fc..cffdf1ce 100644
--- a/client/src/styles/partials/generic/buttons.scss
+++ b/client/src/styles/partials/generic/buttons.scss
@@ -61,13 +61,14 @@
 
     .bd-button,
     .bd-material-button {
-
         &:first-of-type {
-            border-radius: 6px 0 0 6px;
+            border-top-left-radius: 6px;
+            border-bottom-left-radius: 6px;
         }
 
         &:last-of-type {
-            border-radius: 0 6px 6px 0;
+            border-top-right-radius: 6px;
+            border-bottom-right-radius: 6px;
         }
 
         &:not(:last-of-type) {
diff --git a/client/src/styles/partials/generic/drawers.scss b/client/src/styles/partials/generic/drawers.scss
index cfe4fb94..d35cd5c6 100644
--- a/client/src/styles/partials/generic/drawers.scss
+++ b/client/src/styles/partials/generic/drawers.scss
@@ -33,7 +33,6 @@
     }
 
     .bd-drawer-contents-wrap {
-        overflow: hidden;
         min-height: 5px;
     }
 
@@ -50,7 +49,8 @@
         }
     }
 
-    &.bd-animating {
+    &.bd-animating,
+    &:not(.bd-drawer-open) {
         > .bd-drawer-contents-wrap {
             overflow: hidden;
         }
diff --git a/client/src/styles/partials/index.scss b/client/src/styles/partials/index.scss
index 0adc254d..c45015c8 100644
--- a/client/src/styles/partials/index.scss
+++ b/client/src/styles/partials/index.scss
@@ -13,3 +13,4 @@
 @import './helpers.scss';
 @import './misc.scss';
 @import './emotes.scss';
+@import './toasts.scss';
diff --git a/client/src/styles/partials/toasts.scss b/client/src/styles/partials/toasts.scss
new file mode 100644
index 00000000..0281240b
--- /dev/null
+++ b/client/src/styles/partials/toasts.scss
@@ -0,0 +1,68 @@
+.bd-toasts {
+    display: flex;
+    position: fixed;
+    top: 0;
+    width: 700px;
+    left: 50%;
+    transform: translateX(-50%);
+    bottom: 100px;
+    flex-direction: column;
+    align-items: center;
+    justify-content: flex-end;
+    pointer-events: none;
+    z-index: 4000;
+
+    .bd-toast {
+        position: relative;
+        animation: bd-toast-up 300ms ease;
+        background: #36393F;
+        padding: 10px;
+        border-radius: 5px;
+        box-shadow: 0 0 0 1px rgba(32,34,37,.6), 0 2px 10px 0 rgba(0,0,0,.2);
+        font-weight: 500;
+        color: #fff;
+        user-select: text;
+        font-size: 14px;
+        margin-top: 10px;
+
+        &.bd-toast-error {
+            background: #f04747;
+        }
+
+        &.bd-toast-info {
+            background: #4a90e2;
+        }
+
+        &.bd-toast-warning {
+            background: #FFA600;
+        }
+
+        &.bd-toast-success {
+            background: #43b581;
+        }
+
+        &.bd-toast-has-icon {
+            padding-left: 30px;
+        }
+    }
+
+    .bd-toast-icon {
+        position: absolute;
+        left: 5px;
+        top: 50%;
+        transform: translateY(-50%);
+        bottom: 0;
+        height: 20px;
+        width: 20px;
+        border-radius: 50%;
+        overflow: hidden;
+
+        svg {
+            fill: white;
+        }
+    }
+
+    .bd-toast.bd-toast-closing {
+        animation: bd-toast-down 300ms ease;
+    }
+}
diff --git a/client/src/styles/partials/variables/images.scss b/client/src/styles/partials/variables/images.scss
index 25e043fd..4a2f0b3f 100644
--- a/client/src/styles/partials/variables/images.scss
+++ b/client/src/styles/partials/variables/images.scss
@@ -1,3 +1,5 @@
 $logoSmallBw: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FscXVlXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMjAwMCAyMDAwIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAyMDAwIDIwMDAiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxnPjxwYXRoIGZpbGw9IiMzRTgyRTUiIGQ9Ik0xNDAyLjIsNjMxLjdjLTkuNy0zNTMuNC0yODYuMi00OTYtNjQyLjYtNDk2SDY4LjR2NzE0LjFsNDQyLDM5OFY0OTAuN2gyNTdjMjc0LjUsMCwyNzQuNSwzNDQuOSwwLDM0NC45SDU5Ny42djMyOS41aDE2OS44YzI3NC41LDAsMjc0LjUsMzQ0LjgsMCwzNDQuOGgtNjk5djM1NC45aDY5MS4yYzM1Ni4zLDAsNjMyLjgtMTQyLjYsNjQyLjYtNDk2YzAtMTYyLjYtNDQuNS0yODQuMS0xMjIuOS0zNjguNkMxMzU3LjcsOTE1LjgsMTQwMi4yLDc5NC4zLDE0MDIuMiw2MzEuN3oiLz48cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNMTI2Mi41LDEzNS4yTDEyNjIuNSwxMzUuMmwtNzYuOCwwYzI2LjYsMTMuMyw1MS43LDI4LjEsNzUsNDQuM2M3MC43LDQ5LjEsMTI2LjEsMTExLjUsMTY0LjYsMTg1LjNjMzkuOSw3Ni42LDYxLjUsMTY1LjYsNjQuMywyNjQuNmwwLDEuMnYxLjJjMCwxNDEuMSwwLDU5Ni4xLDAsNzM3LjF2MS4ybDAsMS4yYy0yLjcsOTktMjQuMywxODgtNjQuMywyNjQuNmMtMzguNSw3My44LTkzLjgsMTM2LjItMTY0LjYsMTg1LjNjLTIyLjYsMTUuNy00Ni45LDMwLjEtNzIuNiw0My4xaDcyLjVjMzQ2LjIsMS45LDY3MS0xNzEuMiw2NzEtNTY3LjlWNzE2LjdDMTkzMy41LDMxMi4yLDE2MDguNywxMzUuMiwxMjYyLjUsMTM1LjJ6Ii8+PC9nPjwvc3ZnPg==);
 
+$logoSmallLight: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FscXVlXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMjAwMCAyMDAwIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAyMDAwIDIwMDAiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxnPjxwYXRoIGZpbGw9IiMzRTgyRTUiIGQ9Ik0xNDAyLjIsNjMxLjdjLTkuNy0zNTMuNC0yODYuMi00OTYtNjQyLjYtNDk2SDY4LjR2NzE0LjFsNDQyLDM5OFY0OTAuN2gyNTdjMjc0LjUsMCwyNzQuNSwzNDQuOSwwLDM0NC45SDU5Ny42djMyOS41aDE2OS44YzI3NC41LDAsMjc0LjUsMzQ0LjgsMCwzNDQuOGgtNjk5djM1NC45aDY5MS4yYzM1Ni4zLDAsNjMyLjgtMTQyLjYsNjQyLjYtNDk2YzAtMTYyLjYtNDQuNS0yODQuMS0xMjIuOS0zNjguNkMxMzU3LjcsOTE1LjgsMTQwMi4yLDc5NC4zLDE0MDIuMiw2MzEuN3oiLz48cGF0aCBmaWxsPSIjYmJiYmJiIiBkPSJNMTI2Mi41LDEzNS4yTDEyNjIuNSwxMzUuMmwtNzYuOCwwYzI2LjYsMTMuMyw1MS43LDI4LjEsNzUsNDQuM2M3MC43LDQ5LjEsMTI2LjEsMTExLjUsMTY0LjYsMTg1LjNjMzkuOSw3Ni42LDYxLjUsMTY1LjYsNjQuMywyNjQuNmwwLDEuMnYxLjJjMCwxNDEuMSwwLDU5Ni4xLDAsNzM3LjF2MS4ybDAsMS4yYy0yLjcsOTktMjQuMywxODgtNjQuMywyNjQuNmMtMzguNSw3My44LTkzLjgsMTM2LjItMTY0LjYsMTg1LjNjLTIyLjYsMTUuNy00Ni45LDMwLjEtNzIuNiw0My4xaDcyLjVjMzQ2LjIsMS45LDY3MS0xNzEuMiw2NzEtNTY3LjlWNzE2LjdDMTkzMy41LDMxMi4yLDE2MDguNywxMzUuMiwxMjYyLjUsMTM1LjJ6Ii8+PC9nPjwvc3ZnPg==');
+
 $logoBigBw: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FscXVlXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMTk0MCA2NDAiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDE5NDAgNjQwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48Zz48cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNMTU2LjEsMjczLjlIMjl2MTQyLjdsODQuNiw3Ni4yVjM1NC4yaDQ1LjJjMjguNywwLDQyLjksMTMuOCw0Mi45LDM2djEwNmMwLDIyLjItMTMuNCwzNy4xLTQyLjksMzcuMUgyOC42djgwLjdoMTI3YzY4LjEsMC40LDEzMi0zMy43LDEzMi0xMTEuN3YtMTE0QzI4OC4xLDMwOC43LDIyNC4yLDI3My45LDE1Ni4xLDI3My45TDE1Ni4xLDI3My45eiIvPjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik04MjEuOSw1MDIuM1YzODUuMmMwLTQyLjEsNzUuOC01MS43LDk4LjctOS42bDcwLTI4LjNjLTI3LjYtNjAuNS03Ny43LTc4LjEtMTE5LjQtNzguMWMtNjguMSwwLTEzNS41LDM5LjQtMTM1LjUsMTE1Ljl2MTE3LjFjMCw3Ny4zLDY3LjMsMTE1LjksMTMzLjksMTE1LjljNDIuOSwwLDk0LjEtMjEsMTIyLjUtNzYuMmwtNzUtMzQuNEM4OTguOCw1NTQuOCw4MjEuOSw1NDMuMyw4MjEuOSw1MDIuM0w4MjEuOSw1MDIuM3oiLz48cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNNTkwLjQsNDAxLjNjLTI2LjQtNS43LTQ0LTE1LjMtNDUuMi0zMS44YzEuNS0zOS40LDYyLjQtNDAuOSw5OC0zLjFsNTYuMy00My4yYy0zNS4yLTQyLjktNzUtNTQuMy0xMTUuOS01NC4zYy02Mi40LDAtMTIyLjgsMzUuMi0xMjIuOCwxMDEuOGMwLDY0LjcsNDkuNyw5OS41LDEwNC41LDEwNy45YzI3LjksMy44LDU4LjksMTQuOSw1OC4yLDM0LjFjLTIuMywzNi40LTc3LjMsMzQuNC0xMTEuNC02LjlsLTU0LjMsNTAuOWMzMS44LDQwLjksNzUsNjEuNiwxMTUuNiw2MS42YzYyLjQsMCwxMzEuNi0zNiwxMzQuMy0xMDEuOEM3MTEuMyw0MzMuNSw2NTAuOSw0MTIuNCw1OTAuNCw0MDEuM0w1OTAuNCw0MDEuM3oiLz48cmVjdCB4PSIzMzQiIHk9IjI3My45IiBmaWxsPSIjRkZGRkZGIiB3aWR0aD0iODUuNyIgaGVpZ2h0PSIzMzkuOCIvPjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik0xNzc5LjMsMjczLjloLTEyN3YxNDIuN2w4NC42LDc2LjJWMzU0LjJoNDUuMmMyOC43LDAsNDIuOSwxMy44LDQyLjksMzZ2MTA2YzAsMjIuMi0xMy40LDM3LjEtNDIuOSwzNy4xaC0xMzAuMXY4MC43aDEyNy40YzY4LjEsMC40LDEzMi0zMy43LDEzMi0xMTEuN3YtMTE0QzE5MTEuNCwzMDguNywxODQ3LjUsMjczLjksMTc3OS4zLDI3My45TDE3NzkuMywyNzMuOXoiLz48cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNMTE1NiwyNjkuM2MtNzAuNCwwLTE0MC40LDM4LjMtMTQwLjQsMTE2LjdWNTAyYzAsNzcuNyw3MC40LDExNi43LDE0MS4yLDExNi43YzcwLjQsMCwxNDAuNC0zOSwxNDAuNC0xMTYuN1YzODZDMTI5Ny4yLDMwNy45LDEyMjYuNCwyNjkuMywxMTU2LDI2OS4zeiBNMTIxMS4xLDUwMmMwLDI0LjUtMjcuNiwzNy4xLTU0LjcsMzcuMWMtMjcuNiwwLTU1LjEtMTEuOS01NS4xLTM3LjFWMzg2YzAtMjQuOSwyNi44LTM4LjMsNTMuNi0zOC4zYzI3LjksMCw1Ni4zLDExLjksNTYuMywzOC4zVjUwMnoiLz48cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNMTUzOC4zLDQ5Ny40YzQwLjktMTMsNjYuNi00OC42LDY2LjYtMTExLjRjLTEuOS03OS42LTU2LjMtMTExLjctMTI2LjMtMTExLjdoLTEzNS44djMzOS44aDg2LjlWNTA2LjJoMTUuM2w3OC44LDEwNy45aDEwNy4xTDE1MzguMyw0OTcuNHogTTE0ODAuMSw0MzEuOWgtNTAuNXYtNzcuN2g1MC41QzE1MzQuMSwzNTQuMiwxNTM0LjEsNDMxLjksMTQ4MC4xLDQzMS45eiIvPjwvZz48Zz48cGF0aCBmaWxsPSIjM0U4MkU1IiBkPSJNMTAzLjMsNDMuM0gyOC42djc3LjFsNDcuNyw0M1Y4MS43aDI3LjhjMjkuNiwwLDI5LjYsMzcuMiwwLDM3LjJIODUuOHYzNS42aDE4LjNjMjkuNiwwLDI5LjYsMzcuMiwwLDM3LjJIMjguNlYyMzBoNzQuNmMzOC41LDAsNjguMy0xNS40LDY5LjQtNTMuNmMwLTE3LjYtNC44LTMwLjctMTMuMy0zOS44YzguNS05LjEsMTMuMy0yMi4yLDEzLjMtMzkuOEMxNzEuNiw1OC43LDE0MS44LDQzLjMsMTAzLjMsNDMuM3oiLz48cG9seWdvbiBmaWxsPSIjM0U4MkU1IiBwb2ludHM9IjM1OC43LDQzLjMgMzU4LjcsODEuNyA0MDYuOCw4MS43IDQwNi44LDIzMCA0NTQuNSwyMzAgNDU0LjUsODEuNyA1MjkuOCw4MS43IDUyOS44LDIzMCA1NzcuNiwyMzAgNTc3LjYsODEuNyA2MjUuNyw4MS43IDYyNS43LDQzLjMgIi8+PHBvbHlnb24gZmlsbD0iIzNFODJFNSIgcG9pbnRzPSIxOTcuNiw0My4zIDE5Ny42LDIzMCAzNDEuNywyMzAgMzQxLjcsMTkxLjcgMjQ1LjQsMTkxLjcgMjQ1LjQsMTYwLjUgMjk2LjUsMTYwLjUgMjk2LjUsMTEyLjggMjQ1LjQsMTEyLjggMjQ1LjQsODEuNyAzNDEuNyw4MS43IDM0MS43LDQzLjMgIi8+PHBvbHlnb24gZmlsbD0iIzNFODJFNSIgcG9pbnRzPSI2NDIuNCw0My4zIDY0Mi40LDIzMCA3ODYuNCwyMzAgNzg2LjQsMTkxLjcgNjkwLjEsMTkxLjcgNjkwLjEsMTYwLjUgNzQxLjMsMTYwLjUgNzQxLjMsMTEyLjggNjkwLjEsMTEyLjggNjkwLjEsODEuNyA3ODYuNCw4MS43IDc4Ni40LDQzLjMgIi8+PHBhdGggZmlsbD0iIzNFODJFNSIgZD0iTTkxOC42LDE2NmMyMi41LTcuMSwzNi41LTI2LjYsMzYuNS02MS4xYy0xLTQzLjYtMzAuOC02MS43LTY5LjItNjEuN2gtNzQuNVYyMzBIODU5di01OS4yaDguNGw0My4yLDU5LjJoNTguN0w5MTguNiwxNjZ6IE04ODYuNywxMzAuMkg4NTlWODEuN2gyNy43QzkxNi4zLDgxLjcsOTE2LjMsMTMwLjIsODg2LjcsMTMwLjJ6Ii8+PC9nPjwvc3ZnPg==);
diff --git a/client/src/ui/automanip.js b/client/src/ui/automanip.js
deleted file mode 100644
index b24e6784..00000000
--- a/client/src/ui/automanip.js
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- * BetterDiscord Automated DOM Manipulations
- * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
- * All rights reserved.
- * https://betterdiscord.net
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
-*/
-
-import { Events, WebpackModules, EventListener, DiscordApi, ReactComponents, Renderer } from 'modules';
-import { ClientLogger as Logger } from 'common';
-import Reflection from './reflection';
-import DOM from './dom';
-import VueInjector from './vueinjector';
-import EditedTimeStamp from './components/common/EditedTimestamp.vue';
-import Autocomplete from './components/common/Autocomplete.vue';
-
-export default class extends EventListener {
-
-    constructor(args) {
-        super(args);
-    }
-
-    bindings() {
-        this.manipAll = this.manipAll.bind(this);
-        this.markupInjector = this.markupInjector.bind(this);
-        this.setIds = this.setIds.bind(this);
-        this.setMessageIds = this.setMessageIds.bind(this);
-        this.setUserIds = this.setUserIds.bind(this);
-    }
-
-    get eventBindings() {
-        return [
-            // { id: 'server-switch', callback: this.manipAll },
-            // { id: 'channel-switch', callback: this.manipAll },
-            // { id: 'discord:MESSAGE_CREATE', callback: this.markupInjector },
-            // { id: 'discord:MESSAGE_UPDATE', callback: this.markupInjector },
-            { id: 'gkh:keyup', callback: this.injectAutocomplete }
-        ];
-    }
-
-    manipAll() {
-        try {
-            this.appMount.setAttribute('guild-id', DiscordApi.currentGuild.id);
-            this.appMount.setAttribute('channel-id', DiscordApi.currentChannel.id);
-            this.setIds();
-            this.makeMutable();
-        } catch (err) {
-            Logger.err('AutoManip', err);
-        }
-    }
-
-    markupInjector(e) {
-        if (!e.element) return;
-        this.setId(e.element);
-        const markup = e.element.querySelector('.markup:not(.mutable)');
-        if (markup) this.injectMarkup(markup, this.cloneMarkup(markup), false);
-    }
-
-    getEts(node) {
-        try {
-            const reh = Object.keys(node).find(k => k.startsWith('__reactInternalInstance'));
-            return node[reh].memoizedProps.children[node[reh].memoizedProps.children.length - 1].props.text;
-        } catch (err) {
-            return null;
-        }
-    }
-
-    makeMutable() {
-        for (const el of document.querySelectorAll('.markup:not(.mutable)')) {
-            this.injectMarkup(el, this.cloneMarkup(el), false);
-        }
-    }
-
-    cloneMarkup(node) {
-        const childNodes = [...node.childNodes];
-        const clone = document.createElement('div');
-        clone.className = 'markup mutable';
-        const ets = this.getEts(node);
-        for (const [cni, cn] of childNodes.entries()) {
-            if (cn.nodeType !== Node.TEXT_NODE) {
-                if (cn.className.includes('edited')) continue;
-            }
-            clone.appendChild(cn.cloneNode(true));
-        }
-        return { clone, ets }
-    }
-
-    injectMarkup(sibling, markup, reinject) {
-        if (sibling.className && sibling.className.includes('mutable')) return; // Ignore trying to make mutable again
-        let cc = null;
-        for (const cn of sibling.parentElement.childNodes) {
-            if (cn.className && cn.className.includes('mutable')) cc = cn;
-        }
-        if (cc) sibling.parentElement.removeChild(cc);
-        if (markup === true) markup = this.cloneMarkup(sibling);
-
-        sibling.parentElement.insertBefore(markup.clone, sibling);
-        sibling.classList.add('shadow');
-        sibling.style.display = 'none';
-        if (markup.ets) {
-            const etsRoot = document.createElement('span');
-            markup.clone.appendChild(etsRoot);
-            VueInjector.inject(etsRoot, {
-                components: { EditedTimeStamp },
-                data: { ets: markup.ets },
-                template: '<EditedTimeStamp :ets="ets" />'
-            });
-        }
-
-        Events.emit('ui:mutable:.markup', markup.clone);
-    }
-
-    setIds() {
-        this.setMessageIds();
-        this.setUserIds();
-        this.setChannelIds();
-    }
-
-    setMessageIds() {
-        for (let msg of document.querySelectorAll('.message')) {
-            this.setId(msg);
-        }
-    }
-
-    setUserIds() {
-        for (let user of document.querySelectorAll('.channel-members-wrap .member, .channel-members-wrap .member-2FrNV0')) {
-            this.setUserId(user);
-        }
-    }
-
-    setChannelIds() {
-        for (let channel of document.querySelectorAll('[class*=channels] [class*=containerDefault]')) {
-            this.setChannelId(channel);
-        }
-    }
-
-    setId(msg) {
-        if (msg.hasAttribute('message-id')) return;
-        const messageid = Reflection(msg).prop('message.id');
-        const authorid = Reflection(msg).prop('message.author.id');
-        if (!messageid || !authorid) {
-            const msgGroup = msg.closest('.message-group');
-            if (!msgGroup) return;
-            const userTest = Reflection(msgGroup).prop('user');
-            if (!userTest) return;
-            msgGroup.setAttribute('data-author-id', userTest.id);
-            if (userTest.id === DiscordApi.currentUserId) msgGroup.setAttribute('data-currentuser', true);
-            return;
-        }
-        msg.setAttribute('data-message-id', messageid);
-        const msgGroup = msg.closest('.message-group');
-        if (!msgGroup) return;
-        msgGroup.setAttribute('data-author-id', authorid);
-        if (authorid === DiscordApi.currentUser.id) msgGroup.setAttribute('data-currentuser', true);
-    }
-
-    setUserId(user) {
-        if (user.hasAttribute('data-user-id')) return;
-        const userid = Reflection(user).prop('user.id');
-        if (!userid) return;
-        user.setAttribute('data-user-id', userid);
-        const currentUser = userid === DiscordApi.currentUser.id;
-        if (currentUser) user.setAttribute('data-currentuser', true);
-        Events.emit('ui:useridset', user);
-    }
-
-    setChannelId(channel) {
-        if (channel.hasAttribute('data-channel-id')) return;
-        const channelObj = Reflection(channel).prop('channel');
-        if (!channelObj) return;
-        channel.setAttribute('data-channel-id', channelObj.id);
-        if (channelObj.nsfw) channel.setAttribute('data-channel-nsfw', true);
-        if (channelObj.type && channelObj.type === 2) channel.setAttribute('data-channel-voice', true);
-    }
-
-    get appMount() {
-        return document.getElementById('app-mount');
-    }
-
-    injectAutocomplete(e) {
-        if (document.querySelector('.bd-autocomplete')) return;
-        if (!e.target.closest('[class*=channelTextArea]')) return;
-        const root = document.createElement('span');
-        const parent = document.querySelector('[class*="channelTextArea"] > [class*="inner"]');
-        if (!parent) return;
-        parent.parentElement.insertBefore(root, parent);
-        VueInjector.inject(root, {
-            components: { Autocomplete },
-            data: { initial: e.target.value },
-            template: '<Autocomplete :initial="initial" />'
-        });
-    }
-
-}
diff --git a/client/src/ui/bdmenu.js b/client/src/ui/bdmenu.js
index 01bee667..0d58adfb 100644
--- a/client/src/ui/bdmenu.js
+++ b/client/src/ui/bdmenu.js
@@ -31,8 +31,6 @@ let items = 0;
 
 export const BdMenuItems = new class {
     constructor() {
-        window.bdmenu = this;
-
         this.items = [];
 
         const updater = this.add({category: 'Updates', contentid: 'updater', text: 'Updates available!', hidden: true});
diff --git a/client/src/ui/bdui.js b/client/src/ui/bdui.js
index df3ff80a..4cf25833 100644
--- a/client/src/ui/bdui.js
+++ b/client/src/ui/bdui.js
@@ -8,13 +8,11 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Events, WebpackModules, DiscordApi, MonkeyPatch } from 'modules';
-import { Utils } from 'common';
+import { Events, DiscordApi } from 'modules';
 import { remote } from 'electron';
 import DOM from './dom';
 import Vue from './vue';
-import AutoManip from './automanip';
-import { BdSettingsWrapper, BdModals } from './components';
+import { BdSettingsWrapper, BdModals, BdToasts } from './components';
 
 export default class {
 
@@ -25,50 +23,35 @@ export default class {
             channel: DiscordApi.currentChannel
         };
 
-        window.addEventListener('keyup', e => Events.emit('gkh:keyup', e));
-        this.autoManip = new AutoManip();
+        remote.getCurrentWindow().webContents.on('did-navigate-in-page', (e, url, isMainFrame) => {
+            const { currentGuild, currentChannel } = DiscordApi;
 
-        const ehookInterval = setInterval(() => {
-            if (!remote.BrowserWindow.getFocusedWindow()) return;
-            clearInterval(ehookInterval);
-            remote.BrowserWindow.getFocusedWindow().webContents.on('did-navigate-in-page', (e, url, isMainFrame) => {
-                const { currentGuild, currentChannel } = DiscordApi;
+            if (!this.pathCache.server)
+                Events.emit('server-switch', { server: currentGuild, channel: currentChannel });
+            else if (!this.pathCache.channel)
+                Events.emit('channel-switch', currentChannel);
+            else if (currentGuild && currentGuild.id && this.pathCache.server && this.pathCache.server.id !== currentGuild.id)
+                Events.emit('server-switch', { server: currentGuild, channel: currentChannel });
+            else if (currentChannel && currentChannel.id && this.pathCache.channel && this.pathCache.channel.id !== currentChannel.id)
+                Events.emit('channel-switch', currentChannel);
 
-                if (!this.pathCache.server) {
-                    Events.emit('server-switch', { server: currentGuild, channel: currentChannel });
-                    this.pathCache.server = currentGuild;
-                    this.pathCache.channel = currentChannel;
-                    return;
-                }
-
-                if (!this.pathCache.channel) {
-                    Events.emit('channel-switch', currentChannel);
-                    this.pathCache.server = currentGuild;
-                    this.pathCache.channel = currentChannel;
-                    return;
-                }
-
-                if (currentGuild && currentGuild.id && this.pathCache.server && this.pathCache.server.id !== currentGuild.id) {
-                    Events.emit('server-switch', { server: currentGuild, channel: currentChannel });
-                    this.pathCache.server = currentGuild;
-                    this.pathCache.channel = currentChannel;
-                    return;
-                }
-
-                if (currentChannel && currentChannel.id && this.pathCache.channel && this.pathCache.channel.id !== currentChannel.id)
-                    Events.emit('channel-switch', currentChannel);
-
-                this.pathCache.server = currentGuild;
-                this.pathCache.channel = currentChannel;
-            });
-        }, 100);
+            this.pathCache.server = currentGuild;
+            this.pathCache.channel = currentChannel;
+        });
     }
 
     static injectUi() {
         DOM.createElement('div', null, 'bd-settings').appendTo(DOM.bdBody);
         DOM.createElement('div', null, 'bd-modals').appendTo(DOM.bdModals);
+        DOM.createElement('div', null, 'bd-toasts').appendTo(DOM.bdToasts);
         DOM.createElement('bd-tooltips').appendTo(DOM.bdBody);
 
+        this.toasts = new Vue({
+            el: '#bd-toasts',
+            components: { BdToasts },
+            template: '<BdToasts />'
+        });
+
         this.modals = new Vue({
             el: '#bd-modals',
             components: { BdModals },
diff --git a/client/src/ui/classnormaliser.js b/client/src/ui/classnormaliser.js
new file mode 100644
index 00000000..a49263b4
--- /dev/null
+++ b/client/src/ui/classnormaliser.js
@@ -0,0 +1,47 @@
+/**
+ * BetterDiscord Class Normaliser
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+import { Module, WebpackModules } from 'modules';
+
+export default class ClassNormaliser extends Module {
+
+    init() {
+        this.patchClassModules(WebpackModules.getModule(this.moduleFilter, false));
+    }
+
+    patchClassModules(modules) {
+        for (let module of modules) {
+            this.patchClassModule('da', module);
+        }
+    }
+
+    moduleFilter(module) {
+        if (typeof module !== 'object' || Array.isArray(module)) return false;
+        if (Array.isArray(module)) return false;
+        if (module.__esModule) return false;
+        if (!Object.keys(module).length) return false;
+        for (let baseClassName in module) {
+            if (typeof module[baseClassName] !== 'string') return false;
+            if (module[baseClassName].split('-').length === 1) return false;
+            const alphaNumeric = module[baseClassName].split(/-(.+)/)[1].split(' ')[0];
+            if (alphaNumeric.length !== 6) return false;
+        }
+
+        return true;
+    }
+
+    patchClassModule(componentName, classNames) {
+        for (let baseClassName in classNames) {
+            const normalised = baseClassName.split('-')[0].replace(/[A-Z]/g, m => `-${m}`).toLowerCase();
+            classNames[baseClassName] += ` ${componentName}-${normalised}`;
+        }
+    }
+
+}
diff --git a/client/src/ui/commoncomponents.js b/client/src/ui/commoncomponents.js
new file mode 100644
index 00000000..0bb9ee28
--- /dev/null
+++ b/client/src/ui/commoncomponents.js
@@ -0,0 +1,10 @@
+export { ReactComponent } from './vue';
+
+export * from './components/common';
+
+export { default as SettingsWrapper } from './components/bd/SettingsWrapper.vue';
+export { default as SettingsPanel } from './components/bd/SettingsPanel.vue';
+export { default as Setting } from './components/bd/setting/Setting.vue';
+export { default as Card } from './components/bd/Card.vue';
+export { default as ContentAuthor } from './components/bd/ContentAuthor.vue';
+export { default as BdBadge } from './components/bd/BdBadge.vue';
diff --git a/client/src/ui/components/BdModals.vue b/client/src/ui/components/BdModals.vue
index 78e04f3b..d7c76192 100644
--- a/client/src/ui/components/BdModals.vue
+++ b/client/src/ui/components/BdModals.vue
@@ -47,9 +47,12 @@
             Events.on('bd-refresh-modals', this.eventListener = () => {
                 this.$forceUpdate();
             });
+
+            window.addEventListener('keyup', this.keyupListener);
         },
         destroyed() {
             if (this.eventListener) Events.off('bd-refresh-modals', this.eventListener);
+            window.removeEventListener('keyup', this.keyupListener);
         },
         methods: {
             closeModal(modal) {
@@ -57,6 +60,10 @@
             },
             downscale(index, times) {
                 return 1 - ((this.modals.stack.filter(m => !m.closing).length - index) * times);
+            },
+            keyupListener(e) {
+                if (this.modals.stack.length && e.which === 27)
+                    this.modals.closeLast(e.shiftKey);
             }
         }
     }
diff --git a/client/src/ui/components/BdSettings.vue b/client/src/ui/components/BdSettings.vue
index 5f09d7d6..1c190585 100644
--- a/client/src/ui/components/BdSettings.vue
+++ b/client/src/ui/components/BdSettings.vue
@@ -75,7 +75,8 @@
                 first: true,
                 Settings,
                 timeout: null,
-                SettingsWrapper
+                SettingsWrapper,
+                openMenuHandler: null
             };
         },
         props: ['active'],
@@ -101,7 +102,8 @@
         methods: {
             itemOnClick(id) {
                 if (this.animating || id === this.activeIndex) return;
-                if (this.activeIndex >= 0) this.sidebarItems.find(item => item.id === this.activeIndex).active = false;
+                const activeItem = this.sidebarItems.find(item => item.id === this.activeIndex);
+                if (activeItem) activeItem.active = false;
                 this.sidebarItems.find(item => item.id === id).active = true;
                 this.animating = true;
                 this.lastActiveIndex = this.activeIndex;
@@ -153,7 +155,10 @@
             }
         },
         created() {
-            Events.on('bd-open-menu', item => item && this.itemOnClick(this.sidebarItems.find(i => i === item || i.id === item || i.contentid === item || i.set === item).id));
+            Events.on('bd-open-menu', this.openMenuHandler = item => item && this.itemOnClick(this.sidebarItems.find(i => i === item || i.id === item || i.contentid === item || i.set === item).id));
+        },
+        destroyed() {
+            if (this.openMenuHandler) Events.off('bd-open-menu', this.openMenuHandler);
         }
     }
 </script>
diff --git a/client/src/ui/components/BdSettingsWrapper.vue b/client/src/ui/components/BdSettingsWrapper.vue
index 1b636769..196639a4 100644
--- a/client/src/ui/components/BdSettingsWrapper.vue
+++ b/client/src/ui/components/BdSettingsWrapper.vue
@@ -23,6 +23,7 @@
     // Imports
     import { Events, Settings } from 'modules';
     import { Modals } from 'ui';
+    import process from 'process';
     import BdSettings from './BdSettings.vue';
 
     export default {
@@ -33,7 +34,9 @@
                 active: false,
                 animating: false,
                 timeout: null,
-                platform: global.process.platform
+                platform: process.platform,
+                eventHandlers: {},
+                keybindHandler: null
             };
         },
         components: {
@@ -65,21 +68,29 @@
             }
         },
         created() {
-            Events.on('ready', e => this.loaded = true);
-            Events.on('bd-open-menu', item => this.active = true);
-            Events.on('bd-close-menu', () => this.active = false);
-            Events.on('update-check-start', e => this.updating = 0);
-            Events.on('update-check-end', e => this.updating = 1);
-            Events.on('updates-available', e => this.updating = 2);
+            Events.on('ready', this.eventHandlers.ready = e => this.loaded = true);
+            Events.on('bd-open-menu', this.eventHandlers['bd-open-menu'] = item => this.active = true);
+            Events.on('bd-close-menu', this.eventHandlers['bd-close-menu'] = () => this.active = false);
+            Events.on('update-check-start', this.eventHandlers['update-check-start'] = e => this.updating = 0);
+            Events.on('update-check-end', this.eventHandlers['update-check-end'] = e => this.updating = 1);
+            Events.on('updates-available', this.eventHandlers['updates-available'] = e => this.updating = 2);
+
             window.addEventListener('keyup', this.keyupListener);
             window.addEventListener('keydown', this.prevent, true);
 
             const menuKeybind = Settings.getSetting('core', 'default', 'menu-keybind');
-            menuKeybind.on('keybind-activated', () => this.active = !this.active);
+            menuKeybind.on('keybind-activated', this.keybindHandler = () => this.active = !this.active);
         },
         destroyed() {
+            for (let event in this.eventHandlers) Events.off(event, this.eventHandlers[event]);
+
             window.removeEventListener('keyup', this.keyupListener);
             window.removeEventListener('keydown', this.prevent);
+
+            if (this.keybindHandler) {
+                const menuKeybind = Settings.getSetting('core', 'default', 'menu-keybind');
+                menuKeybind.removeListener('keybind-activated', this.keybindHandler = () => this.active = !this.active);
+            }
         }
     }
 </script>
diff --git a/client/src/ui/components/BdToasts.vue b/client/src/ui/components/BdToasts.vue
new file mode 100644
index 00000000..87397ea9
--- /dev/null
+++ b/client/src/ui/components/BdToasts.vue
@@ -0,0 +1,32 @@
+/**
+ * BetterDiscord Toasts Component
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+<template>
+    <div class="bd-toasts">
+        <Toast v-for="(toast, index) in toasts" :message="toast.message" :type="toast.type" :icon="toast.icon" :class="toast.additionalClasses" :closing="toast.closing" :key="toast.id"></Toast>
+    </div>
+</template>
+
+<script>
+    // Imports
+    import { Toasts } from 'ui';
+    import { Toast } from './common';
+
+    export default {
+        components: {
+            Toast
+        },
+        data() {
+            return {
+                toasts: Toasts.stack
+            };
+        }
+    }
+</script>
diff --git a/client/src/ui/components/bd/BdBadge.vue b/client/src/ui/components/bd/BdBadge.vue
index 1d71284f..266ee6de 100644
--- a/client/src/ui/components/bd/BdBadge.vue
+++ b/client/src/ui/components/bd/BdBadge.vue
@@ -9,12 +9,10 @@
 */
 
 <template>
-    <div class="bd-profile-badges-wrap">
-        <div class="bd-profile-badges">
-            <div v-if="developer" v-tooltip="'BetterDiscord Developer'" class="bd-profile-badge bd-profile-badge-developer" @click="click"></div>
-            <div v-else-if="webdev" v-tooltip="'BetterDiscord Web Developer'" class="bd-profile-badge bd-profile-badge-developer" @click="click"></div>
-            <div v-else-if="contributor" v-tooltip="'BetterDiscord Contributor'" class="bd-profile-badge bd-profile-badge-contributor" @click="click"></div>
-        </div>
+    <div class="bd-profile-badges" :class="[`bd-profile-badges-${type}`]" @click.stop>
+        <div v-if="contributor.developer" v-tooltip="'BetterDiscord Developer'" class="bd-profile-badge bd-profile-badge-developer" @click="click"></div>
+        <div v-else-if="contributor.webdev" v-tooltip="'BetterDiscord Web Developer'" class="bd-profile-badge bd-profile-badge-developer" @click="click"></div>
+        <div v-else-if="contributor.contributor" v-tooltip="'BetterDiscord Contributor'" class="bd-profile-badge bd-profile-badge-contributor" @click="click"></div>
     </div>
 </template>
 
@@ -23,12 +21,12 @@
     import { shell } from 'electron';
 
     export default {
-        props: ['webdev', 'developer', 'contributor'],
+        props: ['contributor', 'type'],
         methods: {
             click() {
-                if (this.developer) return shell.openExternal('https://github.com/JsSucks/BetterDiscordApp');
-                if (this.webdev) return shell.openExternal('https://betterdiscord.net');
-                if (this.contributor) return shell.openExternal('https://github.com/JsSucks/BetterDiscordApp/graphs/contributors');
+                if (this.contributor.developer) return shell.openExternal('https://github.com/JsSucks/BetterDiscordApp');
+                if (this.contributor.webdev) return shell.openExternal('https://betterdiscord.net');
+                if (this.contributor.contributor) return shell.openExternal('https://github.com/JsSucks/BetterDiscordApp/graphs/contributors');
             }
         }
     }
diff --git a/client/src/ui/components/bd/BdMessageBadge.vue b/client/src/ui/components/bd/BdMessageBadge.vue
deleted file mode 100644
index 1344529b..00000000
--- a/client/src/ui/components/bd/BdMessageBadge.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * BetterDiscord BD Message Badge Component
- * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
- * All rights reserved.
- * https://betterdiscord.net
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
-*/
-
-<template>
-    <div class="bd-message-badges-wrap" @click.stop>
-        <div v-if="developer" v-tooltip="'BetterDiscord Developer'" class="bd-message-badge bd-message-badge-developer" @click="click"></div>
-        <div v-else-if="webdev" v-tooltip="'BetterDiscord Web Developer'" class="bd-message-badge bd-message-badge-developer" @click="click"></div>
-        <div v-else-if="contributor" v-tooltip="'BetterDiscord Contributor'" class="bd-message-badge bd-message-badge-contributor" @click="click"></div>
-    </div>
-</template>
-
-<script>
-    // Imports
-    import { shell } from 'electron';
-
-    export default {
-        props: ['webdev', 'developer', 'contributor', 'hasBadges'],
-        methods: {
-            click() {
-                if (this.developer) return shell.openExternal('https://github.com/JsSucks/BetterDiscordApp');
-                if (this.webdev) return shell.openExternal('https://betterdiscord.net');
-                if (this.contributor) return shell.openExternal('https://github.com/JsSucks/BetterDiscordApp/graphs/contributors');
-            }
-        }
-    }
-</script>
diff --git a/client/src/ui/components/bd/Card.vue b/client/src/ui/components/bd/Card.vue
index 5fbe7ede..7645d3df 100644
--- a/client/src/ui/components/bd/Card.vue
+++ b/client/src/ui/components/bd/Card.vue
@@ -11,7 +11,7 @@
 <template>
     <div class="bd-card">
         <div class="bd-card-header">
-            <div class="bd-card-icon" :style="{backgroundImage: item.icon ? `url(${item.icon})` : null}">
+            <div class="bd-card-icon" :style="{backgroundImage: iconURL}">
                 <MiExtension v-if="!item.icon" :size="30" />
             </div>
             <span>{{item.name}}</span>
@@ -37,14 +37,41 @@
 
 <script>
     // Imports
+    import { FileUtils, ClientLogger as Logger } from 'common';
+    import path from 'path';
     import { MiExtension } from '../common';
     import ContentAuthor from './ContentAuthor.vue';
 
     export default {
         props: ['item'],
+        data() {
+            return {
+                iconURL: undefined
+            };
+        },
         components: {
             ContentAuthor,
             MiExtension
+        },
+        methods: {
+            async getIconURL() {
+                if (!this.item.icon) return;
+
+                try {
+                    if (this.item.icon.substr(0, 5) === 'data:') {
+                        return `url(${this.item.icon})`;
+                    }
+
+                    const iconPath = path.join(this.item.contentPath, this.item.icon);
+                    const iconURL = await FileUtils.toDataURI(iconPath, this.item.info.icon_type);
+                    return `url(${iconURL})`;
+                } catch (err) {
+                    Logger.err('ContentCard', ['Invalid icon URL', this.item]);
+                }
+            }
+        },
+        async created() {
+            this.iconURL = await this.getIconURL();
         }
     }
 </script>
diff --git a/client/src/ui/components/bd/ContentAuthor.vue b/client/src/ui/components/bd/ContentAuthor.vue
index 639e520c..0b35da54 100644
--- a/client/src/ui/components/bd/ContentAuthor.vue
+++ b/client/src/ui/components/bd/ContentAuthor.vue
@@ -10,12 +10,6 @@
 
 <template>
     <v-popover class="bd-content-author bd-inline" popoverClass="bd-popover bd-content-author-links" trigger="click" placement="top" :disabled="!hasLinks">
-        <!-- <template v-if="typeof author === 'string'">{{ author }}</template>
-        <a v-else-if="author.url" :href="author.url" @click="openLink">{{ author.name }}</a>
-        <a v-else-if="author.github_username" :href="'https://github.com/' + author.github_username" @click="openLink">{{ author.name }}</a>
-        <span v-else-if="author.discord_id" @click="openUserProfileModal(author.discord_id)">{{ author.name }}</span>
-        <template v-else>{{ author.name }}</template> -->
-
         <span :class="{'bd-content-author-link': hasLinks}">{{ author.name || author }}</span><span v-text="after" @click.stop></span>
 
         <template slot="popover">
@@ -50,8 +44,7 @@
                 e.preventDefault();
             },
             openUserProfileModal(discord_id) {
-                const UserProfileModal = WebpackModules.getModuleByProps(['fetchMutualFriends', 'setSection']);
-                UserProfileModal.open(discord_id);
+                WebpackModules.getModuleByName('UserProfileModal').open(discord_id);
                 BdMenu.close();
             },
             openGitHub() {
diff --git a/client/src/ui/components/bd/index.js b/client/src/ui/components/bd/index.js
index 532c5478..6e75be68 100644
--- a/client/src/ui/components/bd/index.js
+++ b/client/src/ui/components/bd/index.js
@@ -5,4 +5,3 @@ export { default as PluginsView } from './PluginsView.vue';
 export { default as ThemesView } from './ThemesView.vue';
 export { default as UpdaterView } from './UpdaterView.vue';
 export { default as BdBadge } from './BdBadge.vue';
-export { default as BdMessageBadge } from './BdMessageBadge.vue';
diff --git a/client/src/ui/components/bd/internal-settings/WindowPreferences.vue b/client/src/ui/components/bd/internal-settings/WindowPreferences.vue
new file mode 100644
index 00000000..9330eac0
--- /dev/null
+++ b/client/src/ui/components/bd/internal-settings/WindowPreferences.vue
@@ -0,0 +1,193 @@
+/**
+ * BetterDiscord Window Preferences Component
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+<template>
+    <div class="bd-window-preferences">
+        <div v-if="disabled" class="bd-form-item bd-window-preferences-disabled">
+            <p>You can't edit your window preferences here as you are using a JavaScript file to set window preferences.</p>
+            <FormButton @click="openFile">Open</FormButton>
+            <p class="bd-hint">This will open {{ filePath }} in your system's default editor.</p>
+        </div>
+
+        <div v-else-if="settingsSet" class="bd-form-item">
+            <SettingsPanel :settings="settingsSet" />
+
+            <p class="bd-hint">You must fully restart Discord for changes here to take effect.</p>
+            <FormButton @click="restart">Restart</FormButton>
+
+            <FormButton @click="openFile">Open</FormButton>
+            <p class="bd-hint">This will open {{ filePath }} in your system's default editor.</p>
+        </div>
+
+        <div v-else>
+            <p>Loading...</p>
+        </div>
+    </div>
+</template>
+
+<script>
+    import { Globals } from 'modules';
+    import { SettingsSet } from 'structs';
+    import { Utils, FileUtils, ClientLogger as Logger } from 'common';
+    import path from 'path';
+    import { remote, shell } from 'electron';
+    import SettingsPanel from '../SettingsPanel.vue';
+    import { FormButton } from '../../common';
+
+    export default {
+        props: ['setting'],
+        data() {
+            return {
+                saved: {},
+                settingsSet: null,
+                disabled: false
+            };
+        },
+        components: {
+            // SettingsPanel,
+            FormButton
+        },
+        computed: {
+            filePath() {
+                return Globals.require.resolve(path.join(Globals.getPath('data'), 'window'));
+            }
+        },
+        methods: {
+            openFile() {
+                return shell.openExternal('file://' + this.filePath);
+            },
+            restart() {
+                remote.app.relaunch();
+                remote.app.quit();
+            },
+            async listener(event) {
+                const newPreferences = Utils.deepclone(this.saved);
+
+                if (event.category.id === 'default' && event.setting.id === 'transparent') {
+                    newPreferences.transparent = event.value;
+                    if (event.value) delete newPreferences.backgroundColor;
+                }
+
+                if (event.category.id === 'default' && event.setting.id === 'background-colour') {
+                    newPreferences.backgroundColor = event.value;
+                }
+
+                if (event.category.id === 'default' && event.setting.id === 'frame') {
+                    newPreferences.frame = event.value;
+                }
+
+                if (event.category.id === 'advanced' && event.setting.id === 'experimental-features') {
+                    if (!newPreferences.webPreferences) newPreferences.webPreferences = {};
+                    newPreferences.webPreferences.experimentalFeatures = event.value;
+                }
+
+                if (event.category.id === 'advanced' && event.setting.id === 'preload') {
+                    if (!newPreferences.webPreferences) newPreferences.webPreferences = {};
+                    newPreferences.webPreferences.preload = event.value;
+                }
+
+                if (event.category.id === 'advanced' && event.setting.id === 'webview-tag') {
+                    if (!newPreferences.webPreferences) newPreferences.webPreferences = {};
+                    newPreferences.webPreferences.webviewTag = event.value;
+                }
+
+                try {
+                    await FileUtils.writeJsonToFile(this.filePath, newPreferences, true);
+                    await this.update();
+                } catch (err) {
+                    Logger.err('WindowPreferences', ['Failed to update window preferences:', err]);
+                }
+            },
+            async update() {
+                this.saved = await FileUtils.readJsonFromFile(this.filePath) || {};
+                this.settingsSet.getSetting('default', 'transparent').value = this.saved.transparent;
+                this.settingsSet.getSetting('default', 'background-colour').value = this.saved.backgroundColor;
+                this.settingsSet.getSetting('default', 'frame').value = this.saved.frame;
+                this.settingsSet.getSetting('advanced', 'experimental-features').value = this.saved.webPreferences && this.saved.webPreferences.experimentalFeatures;
+                this.settingsSet.getSetting('advanced', 'preload').value = this.saved.webPreferences && this.saved.webPreferences.preload;
+                this.settingsSet.getSetting('advanced', 'webview-tag').value = this.saved.webPreferences && this.saved.webPreferences.webviewTag;
+                this.settingsSet.setSaved();
+            }
+        },
+        beforeCreate() {
+            // https://vuejs.org/v2/guide/components.html#Circular-References-Between-Components
+            this.$options.components.SettingsPanel = SettingsPanel;
+        },
+        async created() {
+            if (this.filePath !== path.join(Globals.getPath('data'), 'window.json')) {
+                this.disabled = true;
+                return;
+            }
+
+            this.settingsSet = new SettingsSet({});
+
+            const category = await this.settingsSet.addCategory({id: 'default'});
+
+            await category.addSetting({
+                id: 'transparent',
+                type: 'bool',
+                text: 'Transparent',
+                hint: 'Removes the window background. This requires the background colour option to be disabled, and a theme to remove any higher backgrounds.'
+            });
+
+            await category.addSetting({
+                id: 'background-colour',
+                type: 'colour',
+                text: 'Background colour',
+                hint: 'Sets the background colour under any elements.'
+            });
+
+            await category.addSetting({
+                id: 'frame',
+                type: 'bool',
+                text: 'Frame',
+                hint: 'Shows the desktop environment\'s default window frame.'
+            });
+
+            const advanced = await this.settingsSet.addCategory({
+                id: 'advanced',
+                name: 'Advanced',
+                type: 'drawer'
+            });
+
+            await advanced.addSetting({
+                id: 'experimental-features',
+                type: 'bool',
+                text: 'Experimental features',
+                hint: 'Enables Chromium\'s experimental features.'
+            });
+
+            await advanced.addSetting({
+                id: 'preload',
+                type: 'text',
+                text: 'Preload script',
+                hint: 'The path of a JavaScript file relative to the BetterDiscord data directory to run before the window is loaded.'
+            });
+
+            await advanced.addSetting({
+                id: 'webview-tag',
+                type: 'bool',
+                text: 'Webview tag',
+                hint: 'Enables the webview tag. If you enable this you should use a preload script to restrict how the webview tag can be used.'
+            });
+
+            try {
+                await this.update();
+            } catch (err) {
+                Logger.err('WindowPreferences', ['Failed to read window preferences:', err]);
+            }
+
+            this.settingsSet.on('setting-updated', this.listener);
+        },
+        unmounted() {
+            if (this.settingsSet) this.settingsSet.removeListener('setting-updated', this.listener);
+        }
+    }
+</script>
diff --git a/client/src/ui/components/bd/internal-settings/index.js b/client/src/ui/components/bd/internal-settings/index.js
new file mode 100644
index 00000000..fc619bf8
--- /dev/null
+++ b/client/src/ui/components/bd/internal-settings/index.js
@@ -0,0 +1 @@
+export { default as WindowPreferences } from './WindowPreferences.vue';
diff --git a/client/src/ui/components/bd/modals/ErrorModal.vue b/client/src/ui/components/bd/modals/ErrorModal.vue
index d43a5139..3c4b70f4 100644
--- a/client/src/ui/components/bd/modals/ErrorModal.vue
+++ b/client/src/ui/components/bd/modals/ErrorModal.vue
@@ -1,6 +1,6 @@
 <template>
     <Modal :headerText="modal.event.header" @close="modal.close"
-           :class="[{'bd-err': modal.event.type && modal.event.type === 'err'}, {'bd-modal-out': modal.closing}]">
+           :class="{'bd-err': modal.event.type && modal.event.type === 'err', 'bd-modal-out': modal.closing}">
         <MiError v-if="modal.event.type === 'err'" slot="icon" size="20"/>
         <div slot="body">
             <div v-for="(content, index) in modal.event.content">
@@ -28,11 +28,10 @@
 
 <script>
     // Imports
+    import process from 'process';
     import { Modal } from '../../common';
     import { MiError } from '../../common/MaterialIcon';
 
-    const process = window.require('process');
-
     export default {
         props: ['modal'],
         components: {
diff --git a/client/src/ui/components/bd/modals/PermissionModal.vue b/client/src/ui/components/bd/modals/PermissionModal.vue
index 805cde48..b6f0097f 100644
--- a/client/src/ui/components/bd/modals/PermissionModal.vue
+++ b/client/src/ui/components/bd/modals/PermissionModal.vue
@@ -37,19 +37,18 @@
     import { Permissions } from 'modules';
 
     export default {
-        data() {
-            return { permissions: [] }
-        },
         props: ['modal'],
         components: {
             Modal
         },
-        beforeMount() {
-            this.permissions = this.modal.perms.map(perm => {
-                const getPerm = Permissions.permissionText(perm);
-                getPerm.BODY = getPerm.BODY.replace(':NAME:', this.modal.name);
-                return getPerm;
-            });
+        computed: {
+            permissions() {
+                return this.modal.perms.map(perm => {
+                    const getPerm = Permissions.permissionText(perm);
+                    getPerm.BODY = getPerm.BODY.replace(':NAME:', this.modal.name);
+                    return getPerm;
+                });
+            }
         }
     }
 </script>
diff --git a/client/src/ui/components/bd/modals/SettingsModal.vue b/client/src/ui/components/bd/modals/SettingsModal.vue
index 24e89da8..9c3e302f 100644
--- a/client/src/ui/components/bd/modals/SettingsModal.vue
+++ b/client/src/ui/components/bd/modals/SettingsModal.vue
@@ -37,7 +37,8 @@
                 warnclose: false,
                 settings: null,
                 closing: false,
-                saving: false
+                saving: false,
+                closeHandler: null
             }
         },
         components: {
@@ -70,7 +71,7 @@
             }
         },
         created() {
-            this.modal.on('close', force => {
+            this.modal.on('close', this.closeHandler = force => {
                 if (this.changed && !force) {
                     this.warnclose = true;
                     setTimeout(() => this.warnclose = false, 400);
@@ -82,6 +83,7 @@
             this.cloneSettings();
         },
         destroyed() {
+            if (this.closeHandler) this.modal.removeListener('close', this.closeHandler);
             this.modal.settings.off('settings-updated', this.cloneSettings);
         }
     }
diff --git a/client/src/ui/components/bd/setting/Custom.vue b/client/src/ui/components/bd/setting/Custom.vue
index 1d827f45..ac10085f 100644
--- a/client/src/ui/components/bd/setting/Custom.vue
+++ b/client/src/ui/components/bd/setting/Custom.vue
@@ -27,10 +27,11 @@
 </template>
 
 <script>
-    import { PluginManager } from 'modules';
+    import { Globals, PluginManager } from 'modules';
     import SettingsPanel from '../SettingsPanel.vue';
     import Drawer from '../../common/Drawer.vue';
     import Button from '../../common/Button.vue';
+    import * as InternalSettings from '../internal-settings';
     import path from 'path';
 
     export default {
@@ -41,12 +42,12 @@
         },
         computed: {
             component() {
-                if (typeof this.setting.file === 'string') {
-                    const component = window.require(path.join(this.setting.path, this.setting.file));
+                if (this.setting.path && typeof this.setting.file === 'string') {
+                    const component = Globals.require(path.join(this.setting.path, this.setting.file));
                     return this.setting.component ? component[this.setting.component] : component.default ? component.default : component;
                 }
 
-                if (typeof this.setting.function === 'string') {
+                if (this.setting.path && typeof this.setting.function === 'string') {
                     const plugin = PluginManager.getPluginByPath(this.setting.path);
                     if (!plugin) return;
                     const component = plugin[this.setting.function](this.setting, this.change);
@@ -55,16 +56,18 @@
                     return component;
                 }
 
-                if (typeof this.setting.component === 'string') {
+                if (this.setting.path && typeof this.setting.component === 'string') {
                     const plugin = PluginManager.getPluginByPath(this.setting.path);
-                    if (!plugin) return;
-                    const component = plugin[this.setting.component];
-                    return component;
+                    if (plugin && plugin[this.setting.component]) return plugin[this.setting.component];
                 }
 
                 if (typeof this.setting.component === 'object') {
                     return this.setting.component;
                 }
+
+                if (typeof this.setting.component === 'string' && InternalSettings[this.setting.component]) {
+                    return InternalSettings[this.setting.component];
+                }
             }
         },
         methods: {
diff --git a/client/src/ui/components/bd/setting/File.vue b/client/src/ui/components/bd/setting/File.vue
index b0217971..01b3a447 100644
--- a/client/src/ui/components/bd/setting/File.vue
+++ b/client/src/ui/components/bd/setting/File.vue
@@ -20,8 +20,8 @@
                 <!-- Maybe add a preview here later? -->
                 <!-- For now just show the selected file path -->
                 <span class="bd-file-path">{{ file_path }}</span>
-                <span class="bd-file-open" @click="() => openItem(file_path)"><MiOpenInNew /></span>
-                <span class="bd-file-remove" :class="{'bd-disabled': setting.disabled}" @click="() => removeItem(file_path)"><MiMinus /></span>
+                <span class="bd-file-open" @click="openItem(file_path)"><MiOpenInNew /></span>
+                <span class="bd-file-remove" :class="{'bd-disabled': setting.disabled}" @click="removeItem(file_path)"><MiMinus /></span>
             </div>
         </div>
     </div>
@@ -29,7 +29,7 @@
 
 <script>
     import { shell } from 'electron';
-    import { ClientIPC } from 'common';
+    import { Utils, ClientIPC } from 'common';
     import { MiOpenInNew, MiMinus } from '../../common';
     import path from 'path';
 
@@ -51,7 +51,7 @@
             },
             removeItem(file_path) {
                 if (this.setting.disabled) return;
-                this.setting = this.setting.value.filter(f => f !== file_path);
+                this.setting.value = Utils.removeFromArray(this.setting.value, file_path);
             }
         }
     }
diff --git a/client/src/ui/components/bd/setting/Multiline.vue b/client/src/ui/components/bd/setting/Multiline.vue
index 2b82d898..2169afbe 100644
--- a/client/src/ui/components/bd/setting/Multiline.vue
+++ b/client/src/ui/components/bd/setting/Multiline.vue
@@ -30,8 +30,12 @@
                 textarea.style.height = textarea.scrollHeight + 2 + 'px';
             }
         },
+        watch: {
+            'setting.value'() {
+                this.recalculateHeight();
+            }
+        },
         mounted() {
-            this.$watch('setting.value', this.recalculateHeight);
             this.recalculateHeight();
         }
     }
diff --git a/client/src/ui/components/bd/setting/Radio.vue b/client/src/ui/components/bd/setting/Radio.vue
index eacdfd85..5fe3a5ab 100644
--- a/client/src/ui/components/bd/setting/Radio.vue
+++ b/client/src/ui/components/bd/setting/Radio.vue
@@ -16,7 +16,7 @@
             </div>
             <div class="bd-hint">{{setting.hint}}</div>
         </div>
-        <RadioGroup :options="setting.options" v-model="setting.value" :disabled="setting.disabled" />
+        <RadioGroup :options="setting.options" v-model="setting.value" :multi="setting.multi" :min="setting.min" :max="setting.max" :disabled="setting.disabled" />
     </div>
 </template>
 
diff --git a/client/src/ui/components/common/Autocomplete.vue b/client/src/ui/components/common/Autocomplete.vue
index 06fb02fa..ace3ce46 100644
--- a/client/src/ui/components/common/Autocomplete.vue
+++ b/client/src/ui/components/common/Autocomplete.vue
@@ -37,7 +37,7 @@
 <script>
     import { EmoteModule } from 'builtin';
     import { Events, Settings } from 'modules';
-    import { DOM } from 'ui';
+    import { DOMManip as Manip } from 'ui';
     import { MiStar } from './MaterialIcon';
 
     export default {
@@ -53,25 +53,26 @@
                 selected: '',
                 open: false,
                 selectedIndex: 0,
-                sterm: ''
+                sterm: '',
+                settingUpdatedHandler: null
             };
         },
-        props: ['initial'],
-        beforeMount() {
-            // this.emotes = EmoteModule.filter(new RegExp(this.initial, 'i'), 10);
-            // this.open = this.emotes.length;
-        },
         created() {
-            const enabled = Settings.getSetting('emotes', 'default', 'enable');
-            enabled.on('setting-updated', event => {
+            const enabledSetting = Settings.getSetting('emotes', 'default', 'enable');
+            enabledSetting.on('setting-updated', this.settingUpdatedHandler = event => {
                 if (event.value) return this.addEventListeners();
                 this.removeEventListeners();
                 this.reset();
             });
 
-            if (enabled.value) this.addEventListeners();
+            if (enabledSetting.value) this.addEventListeners();
         },
         destroyed() {
+            if (this.settingUpdatedHandler) {
+                const enabledSetting = Settings.getSetting('emotes', 'default', 'enable');
+                enabledSetting.removeListener('setting-updated', this.settingUpdatedHandler);
+            }
+
             this.removeEventListeners();
         },
         methods: {
@@ -134,8 +135,8 @@
                     this.reset();
                     return;
                 }
-                this.title = this.sterm;
-                this.emotes = EmoteModule.filter(new RegExp(this.sterm.substr(1), ''), 10);
+                this.title = this.sterm.substr(1);
+                this.emotes = EmoteModule.filter(new RegExp(this.sterm.substr(1), 'i'), 10);
                 this.open = this.emotes.length;
             },
             traverse(e) {
@@ -167,7 +168,7 @@
                 let substr = value.substr(0, selectionEnd);
                 substr = substr.replace(new RegExp(this.sterm + '$'), en);
 
-                DOM.manip.setText(substr + value.substr(selectionEnd, value.length), false);
+                Manip.setText(substr + value.substr(selectionEnd, value.length), false);
                 ta.selectionEnd = ta.selectionStart = selectionEnd + en.length - this.sterm.length;
                 this.reset();
             }
diff --git a/client/src/ui/components/common/Dropdown.vue b/client/src/ui/components/common/Dropdown.vue
index bcaad311..137f6949 100644
--- a/client/src/ui/components/common/Dropdown.vue
+++ b/client/src/ui/components/common/Dropdown.vue
@@ -27,7 +27,8 @@
         props: ['options', 'value', 'disabled'],
         data() {
             return {
-                active: false
+                active: false,
+                clickHandler: null
             };
         },
         methods: {
@@ -41,12 +42,15 @@
             }
         },
         mounted() {
-            document.addEventListener('click', e => {
+            document.addEventListener('click', this.clickHandler = e => {
                 let options = this.$refs.options;
                 if (options && !options.contains(e.target) && options !== e.target) {
                     this.active = false;
                 }
             });
+        },
+        beforeDestroy() {
+            if (this.clickHandler) document.removeEventListener('click', this.clickHandler);
         }
     }
 </script>
diff --git a/client/src/ui/components/common/EditedTimestamp.vue b/client/src/ui/components/common/EditedTimestamp.vue
deleted file mode 100644
index 723cea85..00000000
--- a/client/src/ui/components/common/EditedTimestamp.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-<template>
-    <span class="edited" v-tooltip="ets">(edited)</span>
-</template>
-<script>
-    export default {
-        props: ['ets']
-    }
-</script>
diff --git a/client/src/ui/components/common/MaterialIcon.js b/client/src/ui/components/common/MaterialIcon.js
index 94c2c27c..a6991924 100644
--- a/client/src/ui/components/common/MaterialIcon.js
+++ b/client/src/ui/components/common/MaterialIcon.js
@@ -14,3 +14,6 @@ export { default as MiExtension } from './materialicons/Extension.vue';
 export { default as MiError } from './materialicons/Error.vue';
 export { default as MiDiscord } from './materialicons/Discord.vue';
 export { default as MiStar } from './materialicons/Star.vue';
+export { default as MiInfo } from './materialicons/Info.vue';
+export { default as MiWarning } from './materialicons/Warning.vue';
+export { default as MiSuccess } from './materialicons/Success.vue';
diff --git a/client/src/ui/components/common/Modal.vue b/client/src/ui/components/common/Modal.vue
index 52b720bb..964dd5fc 100644
--- a/client/src/ui/components/common/Modal.vue
+++ b/client/src/ui/components/common/Modal.vue
@@ -47,18 +47,6 @@
             return {
                 scrolled: false
             };
-        },
-        beforeMount() {
-            window.addEventListener('keyup', this.keyupListener);
-        },
-        destroyed() {
-            window.removeEventListener('keyup', this.keyupListener);
-        },
-        methods: {
-            keyupListener(e) {
-                if (e.which === 27)
-                    this.$emit('close', false, e);
-            }
         }
     }
 </script>
diff --git a/client/src/ui/components/common/RadioGroup.vue b/client/src/ui/components/common/RadioGroup.vue
index 0be86883..c52d844f 100644
--- a/client/src/ui/components/common/RadioGroup.vue
+++ b/client/src/ui/components/common/RadioGroup.vue
@@ -10,7 +10,7 @@
 
 <template>
     <div class="bd-radio-group" :class="{'bd-disabled': disabled}">
-        <label class="bd-radio" v-for="option in options" :class="{'bd-radio-selected': value === option.value}" @click="$emit('input', option.value)">
+        <label class="bd-radio" v-for="option in options" :class="{'bd-radio-selected': isSelected(option.value)}" @click="toggleOption(option.value)">
             <div class="bd-radio-control-wrap">
                 <svg class="bd-radio-control" name="Checkmark" width="18" height="18" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
                     <g fill="none" fill-rule="evenodd"><polyline stroke="#3e82e5" stroke-width="2" points="3.5 9.5 7 13 15 5"></polyline></g>
@@ -22,7 +22,32 @@
 </template>
 
 <script>
+    import { Utils } from 'common';
+
     export default {
-        props: ['options', 'value', 'disabled']
+        props: ['options', 'value', 'multi', 'min', 'max', 'disabled'],
+        methods: {
+            toggleOption(value) {
+                if (!this.multi)
+                    return this.$emit('input', value);
+
+                const values = this.value instanceof Array ? this.value : [this.value];
+
+                if (values.find(v => Utils.compare(v, value))) {
+                    if (this.min && (values.length - 1) <= this.min) return;
+                    this.$emit('input', values.filter(v => !Utils.compare(v, value)));
+                } else {
+                    if (this.max && values.length > this.max) return;
+                    this.$emit('input', values.concat([value]));
+                }
+            },
+            isSelected(value) {
+                if (!this.multi)
+                    return Utils.compare(this.value, value);
+
+                const values = this.value instanceof Array ? this.value : [this.value];
+                return values.find(v => Utils.compare(v, value));
+            }
+        }
     }
 </script>
diff --git a/client/src/ui/components/common/Toast.vue b/client/src/ui/components/common/Toast.vue
new file mode 100644
index 00000000..cf93ad70
--- /dev/null
+++ b/client/src/ui/components/common/Toast.vue
@@ -0,0 +1,46 @@
+/**
+ * BetterDiscord Toast Component
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+<template>
+    <div :class="['bd-toast', 'bd-toast-' + type, {'bd-toast-has-icon': type !== 'basic' || icon, 'bd-toast-closing': closing}]">
+        <div class="bd-toast-icon" v-if="type !== 'basic' || icon">
+            <img v-if="icon" :src="icon" width="20" height="20" />
+            <MiSuccess v-else-if="type === 'success'" size="20" />
+            <MiWarning v-else-if="type === 'warning'" size="20" />
+            <MiInfo v-else-if="type === 'info'" size="20" />
+            <MiError v-else-if="type === 'error'" size="20" />
+        </div>
+        <div class="bd-toast-text">
+            {{message}}
+        </div>
+    </div>
+</template>
+
+<script>
+    // Imports
+    import { MiSuccess, MiWarning, MiError, MiInfo } from './MaterialIcon';
+
+    export default {
+        props: {
+            message: String,
+            icon: String,
+            type: {
+                default: 'basic',
+                validator(value) {
+                    return ['success', 'warning', 'error', 'info', 'basic'].indexOf(value) !== -1
+                }
+            },
+            closing: {type: Boolean, default: false}
+        },
+        components: {
+            MiSuccess, MiWarning, MiError, MiInfo
+        }
+    }
+</script>
diff --git a/client/src/ui/components/common/index.js b/client/src/ui/components/common/index.js
index 5875e4d2..c0241497 100644
--- a/client/src/ui/components/common/index.js
+++ b/client/src/ui/components/common/index.js
@@ -4,4 +4,10 @@ export { default as FormButton } from './FormButton.vue';
 export { default as ButtonGroup } from './ButtonGroup.vue';
 export { default as Button } from './Button.vue';
 export { default as Modal } from './Modal.vue';
+export { default as Toast } from './Toast.vue';
 export * from './MaterialIcon';
+
+export { default as RefreshBtn } from './RefreshBtn.vue';
+export { default as RadioGroup } from './RadioGroup.vue';
+export { default as Dropdown } from './Dropdown.vue';
+export { default as Drawer } from './Drawer.vue';
diff --git a/client/src/ui/components/common/materialicons/Discord.vue b/client/src/ui/components/common/materialicons/Discord.vue
index 71d79a36..4a08a66a 100644
--- a/client/src/ui/components/common/materialicons/Discord.vue
+++ b/client/src/ui/components/common/materialicons/Discord.vue
@@ -16,7 +16,7 @@
 <template>
     <span class="bd-material-design-icon">
         <svg :width="size || 24" :height="size || 24" viewBox="0 0 24 24">
-	        <path d="M 22,24L 16.75,19L 17.375,21L 4.5,21C 3.11929,21 2,19.8807 2,18.5L 2,3.5C 2,2.11929 3.11929,1 4.5,1L 19.5,1C 20.8807,1 22,2.11929 22,3.5L 22,24 Z M 12,6.8C 9.31508,6.8 7.4401,7.95052 7.4401,7.95052C 8.47135,7.02864 10.2682,6.48177 10.2682,6.48177L 10.0964,6.32552C 8.40885,6.35677 6.8776,7.52864 6.8776,7.52864C 5.15885,11.1224 5.26823,14.2161 5.26823,14.2161C 6.67448,16.0286 8.7526,15.9036 8.7526,15.9036L 9.45573,14.9974C 8.20572,14.7318 7.42448,13.6224 7.42448,13.6224C 7.42448,13.6224 9.29946,14.9 12,14.9C 14.7005,14.9 16.5755,13.6224 16.5755,13.6224C 16.5755,13.6224 15.7943,14.7318 14.5443,14.9974L 15.2474,15.9036C 15.2474,15.9036 17.3255,16.0286 18.7318,14.2161C 18.7318,14.2161 18.8411,11.1224 17.1224,7.52865C 17.1224,7.52865 15.5911,6.35677 13.9036,6.32552L 13.7318,6.48177C 13.7318,6.48177 15.5286,7.02865 16.5599,7.95052C 16.5599,7.95052 14.6849,6.80001 12,6.8 Z M 9.93143,10.5886C 10.5829,10.5886 11.1086,11.16 11.0971,11.8571C 11.0971,12.5543 10.5829,13.1257 9.93143,13.1257C 9.29143,13.1257 8.76571,12.5543 8.76571,11.8571C 8.76571,11.16 9.28,10.5886 9.93143,10.5886 Z M 14.1028,10.5886C 14.7543,10.5886 15.2686,11.16 15.2686,11.8572C 15.2686,12.5543 14.7543,13.1257 14.1028,13.1257C 13.4628,13.1257 12.9371,12.5543 12.9371,11.8572C 12.9371,11.16 13.4514,10.5886 14.1028,10.5886 Z " />
+            <path d="M 22,24L 16.75,19L 17.375,21L 4.5,21C 3.11929,21 2,19.8807 2,18.5L 2,3.5C 2,2.11929 3.11929,1 4.5,1L 19.5,1C 20.8807,1 22,2.11929 22,3.5L 22,24 Z M 12,6.8C 9.31508,6.8 7.4401,7.95052 7.4401,7.95052C 8.47135,7.02864 10.2682,6.48177 10.2682,6.48177L 10.0964,6.32552C 8.40885,6.35677 6.8776,7.52864 6.8776,7.52864C 5.15885,11.1224 5.26823,14.2161 5.26823,14.2161C 6.67448,16.0286 8.7526,15.9036 8.7526,15.9036L 9.45573,14.9974C 8.20572,14.7318 7.42448,13.6224 7.42448,13.6224C 7.42448,13.6224 9.29946,14.9 12,14.9C 14.7005,14.9 16.5755,13.6224 16.5755,13.6224C 16.5755,13.6224 15.7943,14.7318 14.5443,14.9974L 15.2474,15.9036C 15.2474,15.9036 17.3255,16.0286 18.7318,14.2161C 18.7318,14.2161 18.8411,11.1224 17.1224,7.52865C 17.1224,7.52865 15.5911,6.35677 13.9036,6.32552L 13.7318,6.48177C 13.7318,6.48177 15.5286,7.02865 16.5599,7.95052C 16.5599,7.95052 14.6849,6.80001 12,6.8 Z M 9.93143,10.5886C 10.5829,10.5886 11.1086,11.16 11.0971,11.8571C 11.0971,12.5543 10.5829,13.1257 9.93143,13.1257C 9.29143,13.1257 8.76571,12.5543 8.76571,11.8571C 8.76571,11.16 9.28,10.5886 9.93143,10.5886 Z M 14.1028,10.5886C 14.7543,10.5886 15.2686,11.16 15.2686,11.8572C 15.2686,12.5543 14.7543,13.1257 14.1028,13.1257C 13.4628,13.1257 12.9371,12.5543 12.9371,11.8572C 12.9371,11.16 13.4514,10.5886 14.1028,10.5886 Z " />
         </svg>
     </span>
 </template>
diff --git a/client/src/ui/components/common/materialicons/Info.vue b/client/src/ui/components/common/materialicons/Info.vue
new file mode 100644
index 00000000..c5cd80af
--- /dev/null
+++ b/client/src/ui/components/common/materialicons/Info.vue
@@ -0,0 +1,28 @@
+/**
+ * BetterDiscord Material Design Icon
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * Material Design Icons
+ * Copyright (c) 2014 Google
+ * Apache 2.0 LICENSE
+ * https://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+
+<template>
+    <span class="bd-material-design-icon">
+        <svg :width="size || 24" :height="size || 24" viewBox="0 0 24 24">
+            <path d="M0 0h24v24H0z" fill="none"/>
+            <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"/>
+        </svg>
+    </span>
+</template>
+<script>
+    export default {
+        props: ['size']
+    }
+</script>
diff --git a/client/src/ui/components/common/materialicons/Star.vue b/client/src/ui/components/common/materialicons/Star.vue
index 541adfe2..eb9eb8ec 100644
--- a/client/src/ui/components/common/materialicons/Star.vue
+++ b/client/src/ui/components/common/materialicons/Star.vue
@@ -16,7 +16,7 @@
 <template>
     <span class="bd-material-design-icon">
         <svg :width="size || 24" :height="size || 24" viewBox="0 0 24 24">
-        	<path d="M 11.9994,17.2708L 18.1794,20.9978L 16.5444,13.9688L 21.9994,9.24277L 14.8084,8.62477L 11.9994,1.99777L 9.1904,8.62477L 1.9994,9.24277L 7.4544,13.9688L 5.8194,20.9978L 11.9994,17.2708 Z " />
+            <path d="M 11.9994,17.2708L 18.1794,20.9978L 16.5444,13.9688L 21.9994,9.24277L 14.8084,8.62477L 11.9994,1.99777L 9.1904,8.62477L 1.9994,9.24277L 7.4544,13.9688L 5.8194,20.9978L 11.9994,17.2708 Z " />
         </svg>
     </span>
 </template>
diff --git a/client/src/ui/components/common/materialicons/Success.vue b/client/src/ui/components/common/materialicons/Success.vue
new file mode 100644
index 00000000..15d5548e
--- /dev/null
+++ b/client/src/ui/components/common/materialicons/Success.vue
@@ -0,0 +1,28 @@
+/**
+ * BetterDiscord Material Design Icon
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * Material Design Icons
+ * Copyright (c) 2014 Google
+ * Apache 2.0 LICENSE
+ * https://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+
+<template>
+    <span class="bd-material-design-icon">
+        <svg :width="size || 24" :height="size || 24" viewBox="0 0 24 24">
+            <path d="M0 0h24v24H0z" fill="none"/>
+            <path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/>
+        </svg>
+    </span>
+</template>
+<script>
+    export default {
+        props: ['size']
+    }
+</script>
diff --git a/client/src/ui/components/common/materialicons/Warning.vue b/client/src/ui/components/common/materialicons/Warning.vue
new file mode 100644
index 00000000..7660ec27
--- /dev/null
+++ b/client/src/ui/components/common/materialicons/Warning.vue
@@ -0,0 +1,28 @@
+/**
+ * BetterDiscord Material Design Icon
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * Material Design Icons
+ * Copyright (c) 2014 Google
+ * Apache 2.0 LICENSE
+ * https://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+
+<template>
+    <span class="bd-material-design-icon">
+        <svg :width="size || 24" :height="size || 24" viewBox="0 0 24 24">
+            <path d="M0 0h24v24H0z" fill="none"/>
+            <path d="M1 21h22L12 2 1 21zm12-3h-2v-2h2v2zm0-4h-2v-4h2v4z"/>
+        </svg>
+    </span>
+</template>
+<script>
+    export default {
+        props: ['size']
+    }
+</script>
diff --git a/client/src/ui/components/index.js b/client/src/ui/components/index.js
index 8f8e4a8c..3a22b4d8 100644
--- a/client/src/ui/components/index.js
+++ b/client/src/ui/components/index.js
@@ -1,3 +1,4 @@
 export { default as BdSettingsWrapper } from './BdSettingsWrapper.vue';
 export { default as BdSettings } from './BdSettings.vue';
 export { default as BdModals } from './BdModals.vue';
+export { default as BdToasts } from './BdToasts.vue';
diff --git a/client/src/ui/dom.js b/client/src/ui/dom.js
index c738ea04..6646a3f7 100644
--- a/client/src/ui/dom.js
+++ b/client/src/ui/dom.js
@@ -8,6 +8,8 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+import { Utils, ClientLogger as Logger } from 'common';
+
 class BdNode {
     constructor(tag, className, id) {
         this.element = document.createElement(tag);
@@ -30,12 +32,16 @@ class BdNode {
     }
 }
 
-class DOMObserver {
-
-    constructor() {
+export class DOMObserver {
+    constructor(root, options) {
         this.observe = this.observe.bind(this);
         this.subscribe = this.subscribe.bind(this);
         this.observerCallback = this.observerCallback.bind(this);
+
+        this.active = false;
+        this.root = root || document.getElementById('app-mount');
+        this.options = options || { attributes: true, childList: true, subtree: true };
+
         this.observer = new MutationObserver(this.observerCallback);
         this.observe();
     }
@@ -43,46 +49,103 @@ class DOMObserver {
     observerCallback(mutations) {
         for (let sub of this.subscriptions) {
             try {
-                const f = sub.type && sub.type === 'filter' ? mutations.filter(sub.filter) : mutations.find(sub.filter);
-                if (!f) continue;
-                if (sub.type && sub.type === 'filter' && !f.length) continue;
-                sub.callback(f);
-            } catch(err) {}
+                const filteredMutations = sub.filter ? mutations.filter(sub.filter) : mutations;
+
+                if (sub.group) {
+                    if (!filteredMutations.length) continue;
+                    sub.callback.call(sub.bind || sub, filteredMutations);
+                } else {
+                    for (let mutation of filteredMutations) sub.callback.call(sub.bind || sub, mutation);
+                }
+            } catch (err) {
+                Logger.warn('DOMObserver', [`Error in observer callback`, err]);
+            }
         }
     }
 
+    /**
+     * Starts observing the element. This will be called when attaching a callback.
+     * You don't need to call this manually.
+     */
     observe() {
+        if (this.active) return;
         this.observer.observe(this.root, this.options);
+        this.active = true;
     }
 
-    get root() {
-        return document.getElementById('app-mount');
+    /**
+     * Disconnects this observer. This stops callbacks being called, but does not unbind them.
+     * You probably want to use observer.unsubscribeAll instead.
+     */
+    disconnect() {
+        if (!this.active) return;
+        this.observer.disconnect();
+        this.active = false;
     }
 
-    get options() {
-        return { attributes: true, childList: true, subtree: true };
+    reconnect() {
+        if (this.active) {
+            this.disconnect();
+            this.observe();
+        }
     }
 
+    get root() { return this._root }
+    set root(root) { this._root = root; this.reconnect(); }
+
+    get options() { return this._options }
+    set options(options) { this._options = options; this.reconnect(); }
+
     get subscriptions() {
         return this._subscriptions || (this._subscriptions = []);
     }
 
-    subscribe(id, filter, callback, type) {
-        if (this.subscriptions.find(sub => sub.id === id)) return;
-        this.subscriptions.push({
-            id,
-            filter,
-            callback,
-            type
-        });
+    /**
+     * Subscribes to mutations.
+     * @param {Function} callback A function to call when on a mutation
+     * @param {Function} filter A function to call to filter mutations
+     * @param {Any} bind Something to bind the callback to
+     * @param {Boolean} group Whether to call the callback with an array of mutations instead of a single mutation
+     * @return {Object}
+     */
+    subscribe(callback, filter, bind, group) {
+        const subscription = { callback, filter, bind, group };
+        this.subscriptions.push(subscription);
+        this.observe();
+        return subscription;
     }
 
-    unsubscribe(id) {
-        const index = this.subscriptions.find(sub => sub.id === id);
-        if (index < 0) return;
-        this.subscriptions.splice(index, 1);
+    /**
+     * Removes a subscription and disconnect if there are none left.
+     * @param {Object} subscription A subscription object returned by observer.subscribe
+     */
+    unsubscribe(subscription) {
+        if (!this.subscriptions.includes(subscription))
+            subscription = this.subscriptions.find(s => s.callback === subscription);
+        Utils.removeFromArray(this.subscriptions, subscription);
+        if (!this.subscriptions.length) this.disconnect();
     }
 
+    unsubscribeAll() {
+        this.subscriptions.splice(0, this.subscriptions.length);
+        this.disconnect();
+    }
+
+    /**
+     * Subscribes to mutations that affect an element matching a selector.
+     * @param {Function} callback A function to call when on a mutation
+     * @param {Function} filter A function to call to filter mutations
+     * @param {Any} bind Something to bind the callback to
+     * @param {Boolean} group Whether to call the callback with an array of mutations instead of a single mutation
+     * @return {Object}
+     */
+    subscribeToQuerySelector(callback, selector, bind, group) {
+        return this.subscribe(callback, mutation => {
+            return mutation.target.matches(selector) // If the target matches the selector
+                || Array.from(mutation.addedNodes).concat(Array.from(mutation.removedNodes)) // Or if either an added or removed node
+                    .find(n => n instanceof Element && (n.matches(selector) || n.querySelector(selector))); // match or contain an element matching the selector
+        }, bind, group);
+    }
 }
 
 class Manip {
@@ -95,6 +158,7 @@ class Manip {
         document.execCommand('insertText', false, text);
         if (activeElement && refocus) activeElement.focus();
     }
+
     static getText() {
         const txt = document.querySelector('.chat form textarea');
         if (!txt) return '';
@@ -102,6 +166,8 @@ class Manip {
     }
 }
 
+export { Manip as DOMManip };
+
 export default class DOM {
 
     static get manip() {
@@ -112,23 +178,14 @@ export default class DOM {
         return this._observer || (this._observer = new DOMObserver());
     }
 
-    static get bdHead() {
-        return this.getElement('bd-head') || this.createElement('bd-head').appendTo('head');
-    }
-    static get bdBody() {
-        return this.getElement('bd-body') || this.createElement('bd-body').appendTo('body');
-    }
-    static get bdStyles() {
-        return this.getElement('bd-styles') || this.createElement('bd-styles').appendTo(this.bdHead);
-    }
-    static get bdThemes() {
-        return this.getElement('bd-themes') || this.createElement('bd-themes').appendTo(this.bdHead);
-    }
-    static get bdTooltips() {
-        return this.getElement('bd-tooltips') || this.createElement('bd-tooltips').appendTo(this.bdBody);
-    }
-    static get bdModals() {
-        return this.getElement('bd-modals') || this.createElement('bd-modals').appendTo(this.bdBody);
+    static get bdHead() { return this.getElement('bd-head') || this.createElement('bd-head').appendTo('head') }
+    static get bdBody() { return this.getElement('bd-body') || this.createElement('bd-body').appendTo('body') }
+    static get bdStyles() { return this.getElement('bd-styles') || this.createElement('bd-styles').appendTo(this.bdHead) }
+    static get bdThemes() { return this.getElement('bd-themes') || this.createElement('bd-themes').appendTo(this.bdHead) }
+    static get bdTooltips() { return this.getElement('bd-tooltips') || this.createElement('bd-tooltips').appendTo(this.bdBody) }
+    static get bdModals() { return this.getElement('bd-modals') || this.createElement('bd-modals').appendTo(this.bdBody) }
+    static get bdToasts() {
+        return this.getElement('bd-toasts') || this.createElement('bd-toasts').appendTo(this.bdBody);
     }
 
     static getElement(e) {
diff --git a/client/src/ui/modals.js b/client/src/ui/modals.js
index 73a56d12..f8e927e9 100644
--- a/client/src/ui/modals.js
+++ b/client/src/ui/modals.js
@@ -8,7 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Utils, FileUtils, ClientLogger as Logger, AsyncEventEmitter } from 'common';
+import { ClientLogger as Logger, AsyncEventEmitter } from 'common';
 import { Settings, Events, PluginManager, ThemeManager } from 'modules';
 import BaseModal from './components/common/Modal.vue';
 import BasicModal from './components/bd/modals/BasicModal.vue';
@@ -17,31 +17,38 @@ import ErrorModal from './components/bd/modals/ErrorModal.vue';
 import SettingsModal from './components/bd/modals/SettingsModal.vue';
 import PermissionModal from './components/bd/modals/PermissionModal.vue';
 
+let modals = 0;
+
 class Modal extends AsyncEventEmitter {
     constructor(_modal, component) {
         super();
 
-        for (let key in _modal)
-            this[key] = _modal[key];
+        Object.assign(this, _modal);
 
         const modal = this;
         this.component = this.component || {
-            template: '<custom-modal :modal="modal" />',
-            components: { 'custom-modal': component },
+            render(createElement) {
+                return createElement(component, {
+                    props: {
+                        modal,
+                        id: modal.id,
+                        closing: modal.closing
+                    }
+                });
+            },
             data() { return { modal }; },
-            mounted() {
-                modal.vueInstance = this;
-                modal.vue = this.$children[0];
-            }
+            created() { modal.vueInstance = this; },
+            mounted() { modal.vue = this.$children[0]; },
+            beforeDestroy() { modal.vue = undefined; },
+            destroyed() { modal.vueInstance = undefined; }
         };
 
         this.closing = false;
-        this.id = Date.now();
+        this.id = modals++;
         this.vueInstance = undefined;
         this.vue = undefined;
 
         this.close = this.close.bind(this);
-        this.closed = this.once('closed');
     }
 
     /**
@@ -65,6 +72,14 @@ export default class Modals {
     static add(_modal, component) {
         const modal = _modal instanceof Modal ? _modal : new Modal(_modal, component);
 
+        if (this.stack.includes(modal)) {
+            Logger.log('Modals', ['Trying to show a modal that is already in the modal stack.', modal]);
+            throw new Error('Trying to show a modal that is already in the modal stack.');
+        }
+
+        modal.closing = false;
+        modal.closed = modal.once('closed');
+
         this.stack.push(modal);
         Events.emit('bd-refresh-modals');
         return modal;
@@ -134,7 +149,11 @@ export default class Modals {
      * @return {Modal}
      */
     static basic(title, text) {
-        return this.add({ title, text }, BasicModal);
+        return this.add(this.createBasicModal(title, text));
+    }
+
+    static createBasicModal(title, text) {
+        return new Modal({ title, text }, BasicModal);
     }
 
     /**
@@ -145,13 +164,16 @@ export default class Modals {
      * @return {Modal}
      */
     static confirm(title, text) {
+        return this.add(this.createConfirmModal(title, text));
+    }
+
+    static createConfirmModal(title, text) {
         const modal = { title, text };
         modal.promise = new Promise((resolve, reject) => {
             modal.confirm = () => resolve(true);
             modal.beforeClose = () => reject();
-            this.add(modal, ConfirmModal);
         });
-        return modal;
+        return new Modal(modal, ConfirmModal);
     }
 
     /**
@@ -163,13 +185,16 @@ export default class Modals {
      * @return {Modal}
      */
     static permissions(title, name, perms) {
+        return this.add(this.createPermissionsModal(title, name, perms));
+    }
+
+    static createPermissionsModal(title, name, perms) {
         const modal = { title, name, perms };
         modal.promise = new Promise((resolve, reject) => {
             modal.confirm = () => resolve(true);
             modal.beforeClose = () => reject();
-            this.add(modal, PermissionModal);
         });
-        return modal;
+        return new Modal(modal, PermissionModal);
     }
 
     /**
@@ -178,7 +203,11 @@ export default class Modals {
      * @return {Modal}
      */
     static error(event) {
-        return this.add({ event }, ErrorModal);
+        return this.add(this.createErrorModal(event));
+    }
+
+    static createErrorModal(event) {
+        return new Modal({ event }, ErrorModal);
     }
 
     /**
@@ -221,7 +250,11 @@ export default class Modals {
      * @return {Modal}
      */
     static settings(settingsset, headertext, options) {
-        return this.add(Object.assign({
+        return this.add(this.createSettingsModal(settingsset, headertext, options));
+    }
+
+    static createSettingsModal(settingsset, headertext, options) {
+        return new Modal(Object.assign({
             headertext: headertext ? headertext : settingsset.headertext,
             settings: settingsset,
             schemes: settingsset.schemes
diff --git a/client/src/ui/profilebadges.js b/client/src/ui/profilebadges.js
index 6a1d95b0..82df695e 100644
--- a/client/src/ui/profilebadges.js
+++ b/client/src/ui/profilebadges.js
@@ -10,9 +10,8 @@
 
 import { Module, ReactComponents, ReactHelpers, MonkeyPatch, WebpackModules } from 'modules';
 import { Reflection } from 'ui';
-import { Utils, ClientLogger as Logger } from 'common';
-import DOM from './dom';
-import { BdBadge, BdMessageBadge } from './components/bd';
+import { ClientLogger as Logger } from 'common';
+import { BdBadge } from './components/bd';
 import VueInjector from './vueinjector';
 import contributors from '../data/contributors';
 
@@ -22,7 +21,7 @@ export default class extends Module {
         this.patchMessage();
         this.patchChannelMember();
         this.patchNameTag();
-        this.patchUserProfileModals();
+        this.patchUserProfileModal();
     }
 
     get contributors() {
@@ -30,45 +29,32 @@ export default class extends Module {
     }
 
     /**
-     * Patches Message to use the extended NameTag.
-     * This is because NameTag is also used in places we don't really want any badges.
+     * Patches Message to render profile badges.
      */
     async patchMessage() {
         const Message = await ReactComponents.getComponent('Message');
 
         this.unpatchMessageRender = MonkeyPatch('ProfileBadges', Message.component.prototype).after('render', (component, args, retVal) => {
             if (!retVal.props || !retVal.props.children) return;
+            if (ReactHelpers.findProp(component, 'jumpSequenceId') && ReactHelpers.findProp(component, 'canFlash')) retVal = retVal.props.children;
 
             const message = ReactHelpers.findProp(component, 'message');
             if (!message || !message.author) return;
             const user = message.author;
-            const c = contributors.find(c => c.id === user.id);
-            if (!c) return;
+            const contributor = contributors.find(c => c.id === user.id);
+            if (!contributor) return;
 
             const username = ReactHelpers.findByProp(retVal, 'type', 'h2');
             if (!username) return;
-            username.props.children.splice(1, 0, ReactHelpers.React.createElement('span', {
-                className: 'bd-badge-outer',
-                'data-userid': user.id
+
+            username.props.children.splice(1, 0, VueInjector.createReactElement(BdBadge, {
+                contributor,
+                type: 'nametag'
             }));
         });
 
-        this.unpatchMessageMount = MonkeyPatch('ProfileBadges', Message.component.prototype).after('componentDidMount', component => {
-            const element = ReactHelpers.ReactDOM.findDOMNode(component);
-            if (!element) return;
-            this.injectMessageBadges(element);
-        });
-
-        this.unpatchMessageUpdate = MonkeyPatch('ProfileBadges', Message.component.prototype).after('componentDidUpdate', component => {
-            const element = ReactHelpers.ReactDOM.findDOMNode(component);
-            if (!element) return;
-            this.injectMessageBadges(element);
-        });
-
         // Rerender all messages
-        for (const message of document.querySelectorAll('.message')) {
-            Reflection(message).forceUpdate();
-        }
+        Message.forceUpdateAll();
     }
 
     /**
@@ -92,9 +78,7 @@ export default class extends Module {
 
         // Rerender all channel members
         if (this.PatchedNameTag) {
-            for (const channelMember of document.querySelectorAll('.member-2FrNV0')) {
-                Reflection(channelMember).forceUpdate();
-            }
+            ChannelMember.forceUpdateAll();
         }
     }
 
@@ -104,8 +88,8 @@ export default class extends Module {
     async patchNameTag() {
         if (this.PatchedNameTag) return this.PatchedNameTag;
 
-        const ProfileBadges = this;
-        const NameTag = await ReactComponents.getComponent('NameTag', {selector: '.nameTag-26T3kW'});
+        const selector = '.' + WebpackModules.getClassName('nameTag', 'username', 'discriminator', 'ownerIcon');
+        const NameTag = await ReactComponents.getComponent('NameTag', {selector});
 
         this.PatchedNameTag = class extends NameTag.component {
             render() {
@@ -115,94 +99,55 @@ export default class extends Module {
 
                     const user = ReactHelpers.findProp(this, 'user');
                     if (!user) return;
-                    const c = contributors.find(c => c.id === user.id);
-                    if (!c) return;
+                    const contributor = contributors.find(c => c.id === user.id);
+                    if (!contributor) return;
 
-                    retVal.props.children.splice(1, 0, ReactHelpers.React.createElement('span', {
-                        className: 'bd-badge-outer',
-                        'data-userid': user.id
+                    retVal.props.children.splice(1, 0, VueInjector.createReactElement(BdBadge, {
+                        contributor,
+                        type: 'nametag'
                     }));
                 } catch (err) {
                     Logger.err('ProfileBadges', ['Error thrown while rendering a NameTag', err]);
                 }
                 return retVal;
             }
-
-            componentDidMount() {
-                const element = ReactHelpers.ReactDOM.findDOMNode(this);
-                if (!element) return;
-                ProfileBadges.injectMessageBadges(element);
-            }
-
-            componentDidUpdate() {
-                const element = ReactHelpers.ReactDOM.findDOMNode(this);
-                if (!element) return;
-                ProfileBadges.injectMessageBadges(element);
-            }
         };
 
         // Rerender all channel members
         if (this.unpatchChannelMemberRender) {
-            for (const channelMember of document.querySelectorAll('.member-2FrNV0')) {
-                Reflection(channelMember).forceUpdate();
-            }
+            const ChannelMember = await ReactComponents.getComponent('ChannelMember');
+            ChannelMember.forceUpdateAll();
         }
 
         return this.PatchedNameTag;
     }
 
-    injectMessageBadges(element) {
-        for (const beo of element.getElementsByClassName('bd-badge-outer'))
-            this.injectMessageBadge(beo);
-    }
-
-    injectMessageBadge(root) {
-        while (root.firstChild) {
-            root.removeChild(root.firstChild);
-        }
-
-        const { userid } = root.dataset;
-        if (!userid) return;
-
-        const c = contributors.find(c => c.id === userid);
-        if (!c) return;
-
-        VueInjector.inject(root, {
-            components: { BdMessageBadge },
-            data: { c },
-            template: '<BdMessageBadge :developer="c.developer" :webdev="c.webdev" :contributor="c.contributor" />'
-        }, DOM.createElement('span'));
-        root.classList.add('bd-has-badge');
-    }
-
     /**
-     * Patches UserProfileModals to inject profile badges into the modal once opened.
-     * TODO: just patch the modal component
+     * Patches UserProfileModal to render profile badges.
      */
-    async patchUserProfileModals() {
-        const UserProfileModals = WebpackModules.getModuleByName('UserProfileModals');
+    async patchUserProfileModal() {
+        const UserProfileModal = await ReactComponents.getComponent('UserProfileModal');
 
-        MonkeyPatch('BdUI', UserProfileModals).after('open', async (context, [userid]) => {
-            const c = contributors.find(c => c.id === userid);
-            if (!c) return;
+        this.unpatchUserProfileModal = MonkeyPatch('ProfileBadges', UserProfileModal.component.prototype).after('renderBadges', (component, args, retVal, setRetVal) => {
+            const user = ReactHelpers.findProp(component, 'user');
+            if (!user) return;
+            const contributor = contributors.find(c => c.id === user.id);
+            if (!contributor) return;
 
-            const root = await Utils.until(() => document.querySelector('[class*="headerInfo"]'));
-            const el = DOM.createElement('div', null, 'bdprofilebadges');
-            root.insertBefore(el.element, root.firstChild.nextSibling);
+            const element = VueInjector.createReactElement(BdBadge, {
+                contributor,
+                type: 'profile-modal'
+            });
 
-            this.injectProfileBadge(userid, el.element);
+            if (!retVal) {
+                setRetVal(ReactHelpers.React.createElement('div', {
+                    className: 'bd-profile-badges-wrap',
+                    children: element
+                }));
+            } else retVal.props.children.splice(0, 0, element);
         });
-    }
 
-    injectProfileBadge(userid, root) {
-        const c = contributors.find(c => c.id === userid);
-        if (!c) return;
-
-        VueInjector.inject(root, {
-            components: { BdBadge },
-            data: { c },
-            template: '<BdBadge :developer="c.developer" :webdev="c.webdev" :contributor="c.contributor" />',
-        });
+        UserProfileModal.forceUpdateAll();
     }
 
 }
diff --git a/client/src/ui/reflection.js b/client/src/ui/reflection.js
index 92ea3df2..18e33c75 100644
--- a/client/src/ui/reflection.js
+++ b/client/src/ui/reflection.js
@@ -8,7 +8,8 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { ClientLogger as Logger } from 'common';
+import { Filters, ClientLogger as Logger } from 'common';
+import { ReactComponents } from 'modules';
 
 class Reflection {
     static reactInternalInstance(node) {
@@ -84,71 +85,134 @@ class Reflection {
     }
 
     static getState(node) {
-        try {
-            return this.reactInternalInstance(node).return.stateNode.state;
-        } catch (err) {
-            return null;
-        }
+        const stateNode = this.getStateNode(node);
+        if (stateNode) return stateNode.state;
     }
 
     static getStateNode(node) {
-        try {
-            return this.reactInternalInstance(node).return.stateNode;
-        } catch (err) {
-            return null;
+        return this.getStateNodes(node)[0];
+    }
+
+    static getStateNodes(node) {
+        const instance = this.reactInternalInstance(node);
+        const stateNodes = [];
+        let lastInstance = instance;
+
+        do {
+            if (lastInstance.return.stateNode instanceof HTMLElement) break;
+            if (lastInstance.return.stateNode) stateNodes.push(lastInstance.return.stateNode);
+            lastInstance = lastInstance.return;
+        } while (lastInstance.return);
+
+        return stateNodes;
+    }
+
+    static getComponentStateNode(node, component) {
+        if (component instanceof ReactComponents.ReactComponent) component = component.component;
+
+        for (let stateNode of this.getStateNodes(node)) {
+            if (stateNode instanceof component) return stateNode;
         }
     }
 
-    static getComponent(node, first = true) {
-        // IMPORTANT TODO Currently only checks the first found component. For example channel-member will not return the correct component
-        try {
-            return this.reactInternalInstance(node).return.type;
-        } catch (err) {
-            return null;
-        }
-        /*
-        if (!node) return null;
-        if (first) node = this.reactInternalInstance(node);
-        if (node.hasOwnProperty('return')) {
-            if (node.return.hasOwnProperty('return') && !node.return.type) return node.type;
-            return this.getComponent(node.return, false);
-        }
-        if (node.hasOwnProperty('type')) return node.type;
-        return null;
-        */
+    static findStateNode(node, filter, first = true) {
+        return this.getStateNodes(node)[first ? 'find' : 'filter'](filter);
+    }
+
+    static getComponent(node) {
+        return this.getComponents(node)[0];
+    }
+
+    static getComponents(node) {
+        const instance = this.reactInternalInstance(node);
+        const components = [];
+        let lastInstance = instance;
+
+        do {
+            if (typeof lastInstance.return.type === 'string') break;
+            if (lastInstance.return.type) components.push(lastInstance.return.type);
+            lastInstance = lastInstance.return;
+        } while (lastInstance.return);
+
+        return components;
+    }
+
+    static findComponent(node, filter, first = true) {
+        return this.getComponents(node)[first ? 'find' : 'filter'](filter);
     }
 }
 
+const propsProxyHandler = {
+    get(node, prop) {
+        return Reflection.findProp(node, prop);
+    }
+};
+
 export default function (node) {
-    return new class {
+    return new class ReflectionInstance {
         constructor(node) {
-            if ('string' === typeof node) node = document.querySelector(node);
-            this.node = this.el = this.element = node;
+            if (typeof node === 'string') node = document.querySelector(node);
+            this.node = /* this.el = this.element = */ node;
         }
+
+        get el() { return this.node }
+        get element() { return this.node }
+
+        get reactInternalInstance() {
+            return Reflection.reactInternalInstance(this.node);
+        }
+
         get props() {
-            return 'not yet implemented';
+            return new Proxy(this.node, propsProxyHandler);
         }
         get state() {
             return Reflection.getState(this.node);
         }
+
         get stateNode() {
             return Reflection.getStateNode(this.node);
         }
-        get reactInternalInstance() {
-            return Reflection.reactInternalInstance(this.node);
+        get stateNodes() {
+            return Reflection.getStateNodes(this.node);
         }
+        getComponentStateNode(component) {
+            return Reflection.getComponentStateNode(this.node, component);
+        }
+        findStateNode(filter) {
+            if (typeof filter === 'function') return Reflection.findStateNode(this.node, filter);
+            if (filter) return Reflection.getComponentStateNode(this.node, filter);
+            return Reflection.getStateNode(this.node);
+        }
+
         get component() {
             return Reflection.getComponent(this.node);
         }
-        forceUpdate() {
+        get components() {
+            return Reflection.getComponents(this.node);
+        }
+        getComponentByProps(props, selector) {
+            return Reflection.findComponent(this.node, Filters.byProperties(props, selector));
+        }
+        getComponentByPrototypes(props, selector) {
+            return Reflection.findComponent(this.node, Filters.byPrototypeFields(props, selector));
+        }
+        getComponentByRegex(regex, selector) {
+            return Reflection.findComponent(this.node, Filters.byCode(regex, selector));
+        }
+        getComponentByDisplayName(name) {
+            return Reflection.findComponent(this.node, Filters.byDisplayName(name));
+        }
+
+        forceUpdate(filter) {
             try {
-                const stateNode = Reflection.getStateNode(this.node);
+                const stateNode = this.findStateNode(filter);
                 if (!stateNode || !stateNode.forceUpdate) return;
                 stateNode.forceUpdate();
             } catch (err) {
                 Logger.err('Reflection', err);
             }
         }
+
         prop(propName) {
             const split = propName.split('.');
             const first = Reflection.findProp(this.node, split[0]);
diff --git a/client/src/ui/toasts.js b/client/src/ui/toasts.js
new file mode 100644
index 00000000..1b572a54
--- /dev/null
+++ b/client/src/ui/toasts.js
@@ -0,0 +1,75 @@
+/**
+ * BetterDiscord Toasts
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+let toasts = 0;
+
+export default class Toasts {
+
+    /**
+     * This shows a popup message at the bottom of the screen similar to Android Toasts. This is useful for small user feedback.
+     *
+     * @param {string} message The message to be displayed in the toast
+     * @param {Object} options Options object. Optional parameter.
+     * @param {string} options.type Changes the type of the toast stylistically and semantically. Choices: "basic", "info", "success", "error", "warning". Default: "basic"
+     * @param {string} options.icon URL to custom icon to show in the toast. Having this overrides the default icon for the toast type.
+     * @param {string|Object|Array} options.additionalClasses Additional classes to add to the toast element. Can be used to style it. Optional.
+     * @param {number} options.timeout Adjusts the time (in ms) the toast should be shown for before disappearing automatically. Default: 3000
+     * @returns {Promise} This promise resolves when the toast is removed from the DOM.
+     */
+    static async push(message, options = {}) {
+        const {type = 'basic', icon, additionalClasses, timeout = 3000} = options;
+        const toast = {id: toasts++, message, type, icon, additionalClasses, closing: false};
+        this.stack.push(toast);
+        await new Promise(resolve => setTimeout(resolve, timeout));
+        toast.closing = true;
+        await new Promise(resolve => setTimeout(resolve, 300));
+        this.stack.splice(this.stack.indexOf(toast), 1);
+    }
+
+    /**
+     * This is a shortcut for `type = "success"` in {@link Toasts#push}. The parameters and options are the same.
+     */
+    static async success(message, options = {}) {
+        options.type = 'success';
+        return this.push(message, options);
+    }
+
+    /**
+     * This is a shortcut for `type = "error"` in {@link Toasts#push}. The parameters and options are the same.
+     */
+    static async error(message, options = {}) {
+        options.type = 'error';
+        return this.push(message, options);
+    }
+
+    /**
+     * This is a shortcut for `type = "info"` in {@link Toasts#push}. The parameters and options are the same.
+     */
+    static async info(message, options = {}) {
+        options.type = 'info';
+        return this.push(message, options);
+    }
+
+    /**
+     * This is a shortcut for `type = "warning"` in {@link Toasts#push}. The parameters and options are the same.
+     */
+    static async warning(message, options = {}) {
+        options.type = 'warning';
+        return this.push(message, options);
+    }
+
+    /**
+     * An array of active toasts.
+     */
+    static get stack() {
+        return this._stack || (this._stack = []);
+    }
+
+}
diff --git a/client/src/ui/ui.js b/client/src/ui/ui.js
index 3fa0513b..95cb30ed 100644
--- a/client/src/ui/ui.js
+++ b/client/src/ui/ui.js
@@ -1,7 +1,11 @@
-export { default as DOM } from './dom';
+export { default as DOM, DOMObserver, DOMManip } from './dom';
 export { default as BdUI } from './bdui';
-export { default as VueInjector } from './vueinjector';
 export { default as BdMenu, BdMenuItems } from './bdmenu';
 export { default as Modals } from './modals';
-export { default as ProfileBadges } from './profilebadges';
+export { default as Toasts } from './toasts';
+
+export { default as VueInjector } from './vueinjector';
 export { default as Reflection } from './reflection';
+
+export { default as ProfileBadges } from './profilebadges';
+export { default as ClassNormaliser } from './classnormaliser';
diff --git a/client/src/ui/vue.js b/client/src/ui/vue.js
index 571dec48..b0425a9a 100644
--- a/client/src/ui/vue.js
+++ b/client/src/ui/vue.js
@@ -8,9 +8,10 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import DOM from 'dom';
+import { WebpackModules } from 'modules';
 import Vue from 'vue';
 import VTooltip from 'v-tooltip';
+import DOM from './dom';
 
 Vue.use(VTooltip, {
     defaultContainer: 'bd-tooltips',
@@ -26,8 +27,40 @@ Vue.use(VTooltip, {
         defaultWrapperClass: 'bd-popover-wrapper',
         defaultInnerClass: 'bd-popover-inner',
         defaultArrowClass: 'bd-popover-arrow',
-        defaultBoundariesElement: DOM.getElement('#app-mount')
+        defaultBoundariesElement: DOM.getElement('#app-mount'),
+        defaultPopperOptions: {
+            modifiers: {
+                computeStyle: {
+                    gpuAcceleration: false
+                }
+            }
+        }
+    },
+    defaultPopperOptions: {
+        modifiers: {
+            computeStyle: {
+                gpuAcceleration: false
+            }
+        }
     }
 });
 
+export const ReactComponent = {
+    props: ['component', 'component-props', 'component-children', 'react-element'],
+    render(createElement) {
+        return createElement('div');
+    },
+    mounted() {
+        const { React, ReactDOM } = WebpackModules;
+
+        ReactDOM.unmountComponentAtNode(this.$el);
+        ReactDOM.render(this.reactElement || React.createElement(this.component, this.componentProps, ...(this.componentChildren || [])), this.$el);
+    },
+    beforeDestroy() {
+        WebpackModules.ReactDOM.unmountComponentAtNode(this.$el);
+    }
+};
+
+Vue.component('ReactComponent', ReactComponent);
+
 export default Vue;
diff --git a/client/src/ui/vueinjector.js b/client/src/ui/vueinjector.js
index e1703f99..0523d434 100644
--- a/client/src/ui/vueinjector.js
+++ b/client/src/ui/vueinjector.js
@@ -8,6 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+import { WebpackModules } from 'modules';
 import Vue from './vue';
 
 export default class {
@@ -28,4 +29,68 @@ export default class {
         return vue;
     }
 
+    /**
+     * Returns a React element that will render a Vue component.
+     * @param {Object} component A Vue component to render
+     * @param {Object} props Props to pass to the Vue component
+     * @param {Boolean} mountAtTop Whether to mount the Vue component at the top of the React component instead of mounting it in a container
+     * @return {React.Element}
+     */
+    static createReactElement(component, props, mountAtTop) {
+        const React = WebpackModules.getModuleByName('React');
+        return React.createElement(this.ReactCompatibility, {component, mountAtTop, props});
+    }
+
+    static get ReactCompatibility() {
+        if (this._ReactCompatibility) return this._ReactCompatibility;
+
+        const React = WebpackModules.getModuleByName('React');
+        const ReactDOM = WebpackModules.getModuleByName('ReactDOM');
+
+        return this._ReactCompatibility = class VueComponent extends React.Component {
+            render() {
+                return React.createElement('span');
+            }
+
+            componentDidMount() {
+                this.vueInstance.$mount(this.vueMount);
+            }
+
+            componentDidUpdate(oldProps) {
+                if (oldProps.options && !this.props.options || !oldProps.options && this.props.options) {
+                    this.vueInstance.$destroy();
+                    delete this._vueInstance;
+                }
+
+                this.vueInstance.$mount(this.vueMount);
+            }
+
+            componentWillUnmount() {
+                this.vueInstance.$destroy();
+                delete this._vueInstance;
+            }
+
+            get vueMount() {
+                const element = ReactDOM.findDOMNode(this);
+                if (!element) return;
+                if (this.props.mountAtTop) return element;
+                if (element.firstChild) return element.firstChild;
+                const newElement = document.createElement('span');
+                element.appendChild(newElement);
+                return newElement;
+            }
+
+            get vueInstance() {
+                return this._vueInstance || (this._vueInstance = new Vue(this.props.options || {
+                    data: this.props,
+                    render(createElement) {
+                        return createElement(this.component, {
+                            props: this.props
+                        });
+                    }
+                }));
+            }
+        }
+    }
+
 }
diff --git a/client/webpack.config.js b/client/webpack.config.js
index 8821001e..62a2c236 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -31,10 +31,13 @@ module.exports = {
         loaders: [jsLoader, vueLoader, scssLoader]
     },
     externals: {
-        electron: 'window.require("electron")',
-        fs: 'window.require("fs")',
-        path: 'window.require("path")',
-        node_utils: 'window.require("util")',
+        electron: 'require("electron")',
+        fs: 'require("fs")',
+        path: 'require("path")',
+        util: 'require("util")',
+        process: 'require("process")',
+        net: 'require("net")',
+        request: 'require(require("path").join(require("electron").remote.app.getAppPath(), "node_modules", "request"))',
         sparkplug: 'require("../../core/dist/sparkplug")'
     },
     resolve: {
@@ -55,5 +58,9 @@ module.exports = {
         process: false,
         __filename: false,
         __dirname: false
-    }
+    },
+    plugins: [
+        new webpack.NamedModulesPlugin(),
+        new webpack.EvalSourceMapDevToolPlugin()
+    ]
 };
diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js
index e200a115..80dbeb3c 100644
--- a/client/webpack.production.config.js
+++ b/client/webpack.production.config.js
@@ -32,10 +32,13 @@ module.exports = {
         loaders: [jsLoader, vueLoader, scssLoader]
     },
     externals: {
-        electron: 'window.require("electron")',
-        fs: 'window.require("fs")',
-        path: 'window.require("path")',
-        node_utils: 'window.require("util")',
+        electron: 'require("electron")',
+        fs: 'require("fs")',
+        path: 'require("path")',
+        util: 'require("util")',
+        process: 'require("process")',
+        net: 'require("net")',
+        request: 'require(require("path").join(require("electron").remote.app.getAppPath(), "node_modules", "request"))',
         sparkplug: 'require("./sparkplug")'
     },
     resolve: {
diff --git a/common/modules/async-eventemitter.js b/common/modules/async-eventemitter.js
index be173698..f5a8f2b4 100644
--- a/common/modules/async-eventemitter.js
+++ b/common/modules/async-eventemitter.js
@@ -11,7 +11,7 @@
 import EventEmitter from 'events';
 
 /**
- * Extends Node.js' EventEmitter to trigger event listeners asyncronously.
+ * Extends Node.js' EventEmitter to call event listeners asyncronously.
  */
 export default class AsyncEventEmitter extends EventEmitter {
 
@@ -42,7 +42,7 @@ export default class AsyncEventEmitter extends EventEmitter {
 
     /**
      * Adds an event listener that will be removed when it is called and therefore only be called once.
-     * If a callback is not specified a promise that is resolved once the event is triggered is returned.
+     * If a callback is not specified a promise that is resolved once the event is emitted is returned.
      */
     once(event, callback) {
         if (callback) {
@@ -50,7 +50,7 @@ export default class AsyncEventEmitter extends EventEmitter {
             return EventEmitter.prototype.once.apply(this, arguments);
         }
 
-        // Otherwise return a promise that is resolved once this event is triggered
+        // Otherwise return a promise that is resolved once this event is emitted
         return new Promise((resolve, reject) => {
             EventEmitter.prototype.once.call(this, event, data => {
                 return resolve(data);
diff --git a/common/modules/common.js b/common/modules/common.js
index 41865a34..3ae581aa 100644
--- a/common/modules/common.js
+++ b/common/modules/common.js
@@ -1,4 +1,5 @@
-export { default as ClientIPC } from './bdipc';
 export * from './utils';
-export { ClientLogger } from './logger';
+export { default as Filters } from './filters';
+export { default as Logger, ClientLogger } from './logger';
+export { default as ClientIPC } from './bdipc';
 export { default as AsyncEventEmitter } from './async-eventemitter';
diff --git a/common/modules/filters.js b/common/modules/filters.js
new file mode 100644
index 00000000..9295a8e5
--- /dev/null
+++ b/common/modules/filters.js
@@ -0,0 +1,48 @@
+/**
+ * BetterDiscord Filters Module
+ * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
+ * All rights reserved.
+ * https://betterdiscord.net
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+*/
+
+export default class Filters {
+    static byProperties(props, selector = m => m) {
+        return module => {
+            const component = selector(module);
+            if (!component) return false;
+            return props.every(property => component[property] !== undefined);
+        };
+    }
+
+    static byPrototypeFields(fields, selector = m => m) {
+        return module => {
+            const component = selector(module);
+            if (!component) return false;
+            if (!component.prototype) return false;
+            return fields.every(field => component.prototype[field] !== undefined);
+        };
+    }
+
+    static byCode(search, selector = m => m) {
+        return module => {
+            const method = selector(module);
+            if (!method) return false;
+            return method.toString().search(search) !== -1;
+        };
+    }
+
+    static byDisplayName(name) {
+        return module => {
+            return module && module.displayName === name;
+        };
+    }
+
+    static combine(...filters) {
+        return module => {
+            return filters.every(filter => filter(module));
+        };
+    }
+}
diff --git a/common/modules/logger.js b/common/modules/logger.js
index 8c12fef8..9ed5d5a3 100644
--- a/common/modules/logger.js
+++ b/common/modules/logger.js
@@ -8,9 +8,8 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Vendor } from 'modules';
 import { FileUtils } from './utils';
-import node_utils from 'node_utils';
+import node_utils from 'util';
 
 export const logLevels = {
     'log': 'log',
@@ -40,7 +39,7 @@ export default class Logger {
         message = typeof message === 'object' && message instanceof Array ? message : [message];
         console[level]('[%cBetter%cDiscord:%s]', 'color: #3E82E5', '', `${module}${level === 'debug' ? '|DBG' : ''}`, ...message);
 
-        const message_string = message.map(m => typeof m === 'string' ? m : node_utils.inspect(m)).join(' ');
+        const message_string = message.map(m => typeof m === 'string' ? m : node_utils.inspect(m, {showProxy: true})).join(' ');
         this.logs.push(`${level.toUpperCase()} : [${Logger.timestamp}|${module}] ${message_string}`);
 
         if (this.file)
@@ -60,7 +59,25 @@ export default class Logger {
     }
 
     static get timestamp() {
-        return Vendor.moment().format('DD/MM/YY hh:mm:ss');
+        return (new Date()).toLocaleString('en-GB');
+    }
+
+    trimLogFile() {
+        if (!this.file) throw new Error('This logger does not have a file.');
+        return Logger.trimLogFile(this.file);
+    }
+
+    static async trimLogFile(file) {
+        const stat = await FileUtils.stat(file);
+        if (stat.size < 20 * 1024 * 1024) return; // 20 MB
+
+        const logs = await FileUtils.readFile(file);
+
+        // Trim to about 1 MB
+        const trimFrom = logs.substr(0 - 1024 * 1024).lastIndexOf('\nLOG : [');
+        if (trimFrom < 0) return;
+
+        await FileUtils.writeFile(file, logs.substr(trimFrom));
     }
 
 }
diff --git a/common/modules/utils.js b/common/modules/utils.js
index 05175937..508cf1fe 100644
--- a/common/modules/utils.js
+++ b/common/modules/utils.js
@@ -8,7 +8,6 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import path from 'path';
 import fs from 'fs';
 import _ from 'lodash';
 import filetype from 'file-type';
@@ -87,16 +86,19 @@ export class Utils {
     /**
      * Clones an object and all it's properties.
      * @param {Any} value The value to clone
+     * @param {Function} exclude A function to filter objects that shouldn't be cloned
      * @return {Any} The cloned value
      */
-    static deepclone(value) {
+    static deepclone(value, exclude) {
+        if (exclude && exclude(value)) return value;
+
         if (typeof value === 'object') {
-            if (value instanceof Array) return value.map(i => this.deepclone(i));
+            if (value instanceof Array) return value.map(i => this.deepclone(i, exclude));
 
             const clone = Object.assign({}, value);
 
             for (let key in clone) {
-                clone[key] = this.deepclone(clone[key]);
+                clone[key] = this.deepclone(clone[key], exclude);
             }
 
             return clone;
@@ -108,7 +110,7 @@ export class Utils {
     /**
      * Freezes an object and all it's properties.
      * @param {Any} object The object to freeze
-     * @param {Function} exclude A function to filter object that shouldn't be frozen
+     * @param {Function} exclude A function to filter objects that shouldn't be frozen
      */
     static deepfreeze(object, exclude) {
         if (exclude && exclude(object)) return;
@@ -178,49 +180,49 @@ export class Utils {
 
 export class FileUtils {
     /**
-     * Checks if a file exists and is a file.
+     * Gets information about a file.
      * @param {String} path The file's path
      * @return {Promise}
      */
-    static async fileExists(path) {
+    static async stat(path) {
         return new Promise((resolve, reject) => {
-            fs.stat(path, (err, stats) => {
+            fs.stat(path, (err, stat) => {
                 if (err) return reject({
                     message: `No such file or directory: ${err.path}`,
                     err
                 });
 
-                if (!stats.isFile()) return reject({
-                    message: `Not a file: ${path}`,
-                    stats
-                });
-
-                resolve();
+                resolve(stat);
             });
         });
     }
 
+    /**
+     * Checks if a file exists and is a file.
+     * @param {String} path The file's path
+     * @return {Promise}
+     */
+    static async fileExists(path) {
+        const stats = await this.stat(path);
+
+        if (!stats.isFile()) throw {
+            message: `Not a file: ${path}`,
+            stats
+        };
+    }
+
     /**
      * Checks if a directory exists and is a directory.
      * @param {String} path The directory's path
      * @return {Promise}
      */
     static async directoryExists(path) {
-        return new Promise((resolve, reject) => {
-            fs.stat(path, (err, stats) => {
-                if (err) return reject({
-                    message: `Directory does not exist: ${path}`,
-                    err
-                });
+        const stats = await this.stat(path);
 
-                if (!stats.isDirectory()) return reject({
-                    message: `Not a directory: ${path}`,
-                    stats
-                });
-
-                resolve();
-            });
-        });
+        if (!stats.isDirectory()) throw {
+            message: `Not a directory: ${path}`,
+            stats
+        };
     }
 
     /**
@@ -247,12 +249,8 @@ export class FileUtils {
             await this.directoryExists(path);
             return true;
         } catch (err) {
-            try {
-                await this.createDirectory(path);
-                return true;
-            } catch (err) {
-                throw err;
-            }
+            await this.createDirectory(path);
+            return true;
         }
     }
 
@@ -262,11 +260,7 @@ export class FileUtils {
      * @return {Promise}
      */
     static async readFile(path) {
-        try {
-            await this.fileExists(path);
-        } catch (err) {
-            throw err;
-        }
+        await this.fileExists(path);
 
         return new Promise((resolve, reject) => {
             fs.readFile(path, 'utf-8', (err, data) => {
@@ -287,11 +281,7 @@ export class FileUtils {
      * @return {Promise}
      */
     static async readFileBuffer(path, options) {
-        try {
-            await this.fileExists(path);
-        } catch (err) {
-            throw err;
-        }
+        await this.fileExists(path);
 
         return new Promise((resolve, reject) => {
             fs.readFile(path, options || {}, (err, data) => {
@@ -337,12 +327,7 @@ export class FileUtils {
      * @return {Promise}
      */
     static async readJsonFromFile(path) {
-        let readFile;
-        try {
-            readFile = await this.readFile(path);
-        } catch (err) {
-            throw (err);
-        }
+        const readFile = await this.readFile(path);
 
         try {
             return await Utils.tryParseJson(readFile);
@@ -355,10 +340,11 @@ export class FileUtils {
      * Writes to a file as JSON.
      * @param {String} path The file's path
      * @param {Any} data The file's new contents
+     * @param {Boolean} pretty Whether to pretty print the JSON object
      * @return {Promise}
      */
-    static async writeJsonToFile(path, json) {
-        return this.writeFile(path, JSON.stringify(json));
+    static async writeJsonToFile(path, json, pretty) {
+        return this.writeFile(path, JSON.stringify(json, null, pretty ? 4 : 0) + '\n');
     }
 
     /**
@@ -368,6 +354,7 @@ export class FileUtils {
      */
     static async listDirectory(path) {
         await this.directoryExists(path);
+
         return new Promise((resolve, reject) => {
             fs.readdir(path, (err, files) => {
                 if (err) reject(err);
diff --git a/core/gulpfile.babel.js b/core/gulpfile.babel.js
new file mode 100644
index 00000000..c1ed5600
--- /dev/null
+++ b/core/gulpfile.babel.js
@@ -0,0 +1,20 @@
+import gulp from 'gulp';
+import pump from 'pump';
+import babel from 'gulp-babel';
+import watch from 'gulp-watch';
+
+gulp.task('build', function () {
+    return pump([
+        gulp.src('src/**/*.js'),
+        babel(),
+        gulp.dest('dist')
+    ]);
+});
+
+gulp.task('watch', function () {
+    return pump([
+        watch('src/**/*.js'),
+        babel(),
+        gulp.dest('dist')
+    ]);
+});
diff --git a/core/gulpfile.js b/core/gulpfile.js
deleted file mode 100644
index f521aced..00000000
--- a/core/gulpfile.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const
-    gulp = require('gulp'),
-    pump = require('pump'),
-    babel = require('gulp-babel'),
-    plumber = require('gulp-plumber'),
-    watch = require('gulp-watch');
-
-const task_build = function () {
-    return pump([
-        gulp.src('src/**/*js'),
-        plumber(),
-        babel(),
-        gulp.dest('dist')
-    ]);
-}
-
-const task_watch = function () {
-    return pump([
-        watch('src/**/*js'),
-        plumber(),
-        babel(),
-        gulp.dest('dist')
-    ]);
-}
-
-gulp.task('build', task_build);
-gulp.task('watch', task_watch);
diff --git a/core/src/main.js b/core/src/main.js
index ecc6eea6..23a92132 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -8,11 +8,13 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-const path = require('path');
-const sass = require('node-sass');
-const { BrowserWindow, dialog } = require('electron');
+import path from 'path';
+import sass from 'node-sass';
+import { BrowserWindow, dialog, session } from 'electron';
+import deepmerge from 'deepmerge';
+import ContentSecurityPolicy from 'csp-parse';
 
-const { FileUtils, BDIpc, Config, WindowUtils, CSSEditor, Database } = require('./modules');
+import { FileUtils, BDIpc, Config, WindowUtils, CSSEditor, Database } from './modules';
 
 const tests = typeof PRODUCTION === 'undefined';
 
@@ -54,13 +56,35 @@ const globals = {
 
 class PatchedBrowserWindow extends BrowserWindow {
     constructor(originalOptions) {
-        const options = Object.assign({}, originalOptions);
+        const userOptions = PatchedBrowserWindow.userWindowPreferences;
+
+        const options = deepmerge(originalOptions, userOptions);
         options.webPreferences = Object.assign({}, options.webPreferences);
 
         // Make sure Node integration is enabled
-        options.webPreferences.nodeIntegration = true;
+        options.webPreferences.preload = sparkplug;
 
-        return new BrowserWindow(options);
+        super(options);
+
+        this.__bd_preload = [];
+
+        if (originalOptions.webPreferences && originalOptions.webPreferences.preload) {
+            this.__bd_preload.push(originalOptions.webPreferences.preload);
+        }
+        if (userOptions.webPreferences && userOptions.webPreferences.preload) {
+            this.__bd_preload.push(path.resolve(_dataPath, userOptions.webPreferences.preload));
+        }
+    }
+
+    static get userWindowPreferences() {
+        try {
+            const userWindowPreferences = require(path.join(_dataPath, 'window'));
+            if (typeof userWindowPreferences === 'object') return userWindowPreferences;
+        } catch (err) {
+            console.log('[BetterDiscord] Error getting window preferences:', err);
+        }
+
+        return {};
     }
 }
 
@@ -114,7 +138,7 @@ class Comms {
     }
 }
 
-class BetterDiscord {
+export class BetterDiscord {
 
     constructor(args) {
         if (BetterDiscord.loaded) {
@@ -147,7 +171,6 @@ class BetterDiscord {
 
         this.csseditor = new CSSEditor(this, this.config.getPath('csseditor'));
 
-        this.windowUtils.on('did-get-response-details', () => this.ignite());
         this.windowUtils.on('did-finish-load', () => this.injectScripts(true));
 
         this.windowUtils.on('did-navigate-in-page', (event, url, isMainFrame) => {
@@ -160,15 +183,10 @@ class BetterDiscord {
     }
 
     async waitForWindow() {
-        const self = this;
         return new Promise(resolve => {
             const defer = setInterval(() => {
                 const windows = BrowserWindow.getAllWindows();
 
-                for (let window of windows) {
-                    if (window) BetterDiscord.ignite(window);
-                }
-
                 if (windows.length === 1 && windows[0].webContents.getURL().includes('discordapp.com')) {
                     resolve(windows[0]);
                     clearInterval(defer);
@@ -224,10 +242,29 @@ class BetterDiscord {
         browser_window_module.exports = PatchedBrowserWindow;
     }
 
+    /**
+     * Attaches an event handler for HTTP requests to update the Content Security Policy.
+     */
+    static hookSessionRequest() {
+        session.defaultSession.webRequest.onHeadersReceived((details, callback) => {
+            for (let [header, values] of Object.entries(details.responseHeaders)) {
+                if (!header.match(/^Content-Security-Policy(-Report-Only)?$/i)) continue;
+
+                details.responseHeaders[header] = values.map(value => {
+                    const policy = new ContentSecurityPolicy(value);
+
+                    // Add hosts that serve emotes (https://static-cdn.jtvnw.net is already in the CSP)
+                    policy.set('img-src', `${policy.get('img-src') || policy.get('default-src')} https://cdn.betterttv.net https://cdn.frankerfacez.com`);
+
+                    return policy.toString();
+                });
+            }
+
+            callback({ responseHeaders: details.responseHeaders });
+        });
+    }
+
 }
 
 BetterDiscord.patchBrowserWindow();
-
-module.exports = {
-    BetterDiscord
-};
+BetterDiscord.hookSessionRequest();
diff --git a/core/src/modules/bdipc.js b/core/src/modules/bdipc.js
index de9a9599..788fe9d4 100644
--- a/core/src/modules/bdipc.js
+++ b/core/src/modules/bdipc.js
@@ -8,16 +8,15 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-const { ipcMain } = require('electron');
-
-const { Module } = require('./modulebase');
+import { ipcMain } from 'electron';
+import Module from './modulebase';
 
 const callbacks = new WeakMap();
 
 /**
  * The IPC module used in the main process.
  */
-class BDIpc {
+export default class BDIpc {
 
     /**
      * Adds an IPC event listener.
@@ -76,7 +75,7 @@ class BDIpc {
 
 }
 
-class BDIpcEvent extends Module {
+export class BDIpcEvent extends Module {
 
     constructor(event, args) {
         super(args);
@@ -117,5 +116,3 @@ class BDIpcEvent extends Module {
     }
 
 }
-
-module.exports = { BDIpc };
diff --git a/core/src/modules/config.js b/core/src/modules/config.js
index b9df602b..f36c486a 100644
--- a/core/src/modules/config.js
+++ b/core/src/modules/config.js
@@ -8,9 +8,9 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-const { Module } = require('./modulebase');
+import Module from './modulebase';
 
-class Config extends Module {
+export default class Config extends Module {
 
     get version() {
         return this.args.version;
@@ -33,5 +33,3 @@ class Config extends Module {
     }
 
 }
-
-module.exports = { Config };
diff --git a/core/src/modules/csseditor.js b/core/src/modules/csseditor.js
index b4920405..e961bcc3 100644
--- a/core/src/modules/csseditor.js
+++ b/core/src/modules/csseditor.js
@@ -8,14 +8,14 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-const path = require('path');
-const { BrowserWindow } = require('electron');
+import path from 'path';
+import { BrowserWindow } from 'electron';
 
-const { Module } = require('./modulebase');
-const { WindowUtils } = require('./utils');
-const { BDIpc } = require('./bdipc');
+import Module from './modulebase';
+import { WindowUtils } from './utils';
+import BDIpc from './bdipc';
 
-class CSSEditor extends Module {
+export default class CSSEditor extends Module {
 
     constructor(bd, path) {
         super();
@@ -91,5 +91,3 @@ class CSSEditor extends Module {
     }
 
 }
-
-module.exports = { CSSEditor };
diff --git a/core/src/modules/database.js b/core/src/modules/database.js
index 6f79df86..744407ec 100644
--- a/core/src/modules/database.js
+++ b/core/src/modules/database.js
@@ -8,9 +8,9 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-const Datastore = require('nedb');
+import Datastore from 'nedb';
 
-class Database {
+export default class Database {
 
     constructor(dbPath) {
         this.exec = this.exec.bind(this);
@@ -67,5 +67,3 @@ class Database {
     }
 
 }
-
-module.exports = { Database };
diff --git a/core/src/modules/index.js b/core/src/modules/index.js
index 5f2029d9..5f922a23 100644
--- a/core/src/modules/index.js
+++ b/core/src/modules/index.js
@@ -1,5 +1,5 @@
-export { BDIpc } from './bdipc';
+export { default as BDIpc } from './bdipc';
 export { Utils, FileUtils, WindowUtils } from './utils';
-export { Config } from './config';
-export { CSSEditor } from './csseditor';
-export { Database } from './database';
+export { default as Config } from './config';
+export { default as CSSEditor } from './csseditor';
+export { default as Database } from './database';
diff --git a/core/src/modules/modulebase.js b/core/src/modules/modulebase.js
index 3713a162..5623e3e9 100644
--- a/core/src/modules/modulebase.js
+++ b/core/src/modules/modulebase.js
@@ -11,7 +11,7 @@
 /**
  * Base Module that every non-static module should extend.
  */
-class Module {
+export default class Module {
 
     constructor(args) {
         this.__ = {
@@ -31,5 +31,3 @@ class Module {
     get state() { return this.__.state; }
 
 }
-
-module.exports = { Module };
diff --git a/core/src/modules/utils.js b/core/src/modules/utils.js
index c41c2400..ac793dce 100644
--- a/core/src/modules/utils.js
+++ b/core/src/modules/utils.js
@@ -10,13 +10,12 @@
 
 // TODO Use common
 
-const path = require('path');
-const fs = require('fs');
+import fs from 'fs';
 
-const { Module } = require('./modulebase');
-const { BDIpc } = require('./bdipc');
+import Module from './modulebase';
+import BDIpc from './bdipc';
 
-class Utils {
+export class Utils {
     static async tryParseJson(jsonString) {
         try {
             return JSON.parse(jsonString);
@@ -29,7 +28,7 @@ class Utils {
     }
 }
 
-class FileUtils {
+export class FileUtils {
     static async fileExists(path) {
         return new Promise((resolve, reject) => {
             fs.stat(path, (err, stats) => {
@@ -158,7 +157,7 @@ class FileUtils {
     }
 }
 
-class WindowUtils extends Module {
+export class WindowUtils extends Module {
     bindings() {
         this.openDevTools = this.openDevTools.bind(this);
         this.executeJavascript = this.executeJavascript.bind(this);
@@ -185,7 +184,7 @@ class WindowUtils extends Module {
         return WindowUtils.injectScript(this.window, fpath, variable);
     }
 
-    static injectScript(window, fpath, variable) {
+    static async injectScript(window, fpath, variable) {
         window = window.webContents || window;
         if (!window) return;
         // console.log(`Injecting: ${fpath} to`, window);
@@ -193,6 +192,10 @@ class WindowUtils extends Module {
         const escaped_path = fpath.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
         const escaped_variable = variable ? variable.replace(/\\/g, '\\\\').replace(/"/g, '\\"') : null;
 
+        const nodeIntegration = await window.executeJavaScript(`typeof require !== 'undefined'`);
+
+        if (!nodeIntegration) return window.send('--bd-inject-script', {script: fpath, variable});
+
         if (variable) return window.executeJavaScript(`window["${escaped_variable}"] = require("${escaped_path}");`);
         else return window.executeJavaScript(`require("${escaped_path}");`);
     }
@@ -205,9 +208,3 @@ class WindowUtils extends Module {
         return BDIpc.send(this.window, channel, message);
     }
 }
-
-module.exports = {
-    Utils,
-    FileUtils,
-    WindowUtils
-};
diff --git a/core/src/sparkplug.js b/core/src/sparkplug.js
index 5709da11..b635414e 100644
--- a/core/src/sparkplug.js
+++ b/core/src/sparkplug.js
@@ -10,11 +10,31 @@
  * This file is evaluated in the renderer process!
  */
 
+import electron, { ipcRenderer } from 'electron';
+
 (() => {
     if (module.exports.bd) return;
 
     console.log('[BetterDiscord|Sparkplug]');
 
+    const currentWindow = electron.remote.getCurrentWindow();
+
+    if (currentWindow.__bd_preload) {
+        for (let preloadScript of currentWindow.__bd_preload) {
+            try {
+                require(preloadScript);
+            } catch (err) {
+                console.error('[BetterDiscord|Sparkplug] Error thrown in preload script', preloadScript, err);
+            }
+        }
+    }
+
+    ipcRenderer.on('--bd-inject-script', (event, {script, variable}) => {
+        console.log('[BetterDiscord|Sparkplug] Injecting script', script, variable);
+        if (variable) window[variable] = require(script);
+        else require(script);
+    });
+
     const ls = window.localStorage;
     if (!ls) console.warn('[BetterDiscord|Sparkplug] Failed to hook localStorage :(');
     const wsOrig = window.WebSocket;
diff --git a/csseditor/src/Editor.vue b/csseditor/src/Editor.vue
index 66d68f5f..e6b8324c 100644
--- a/csseditor/src/Editor.vue
+++ b/csseditor/src/Editor.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-    import ClientIPC from 'bdipc';
+    import { ClientIPC } from 'common';
 
     import { remote } from 'electron';
 
diff --git a/csseditor/webpack.config.js b/csseditor/webpack.config.js
index 0cacab6b..ea3122ad 100644
--- a/csseditor/webpack.config.js
+++ b/csseditor/webpack.config.js
@@ -23,7 +23,9 @@ module.exports = {
     },
     externals: {
         electron: 'window.require("electron")',
-        fs: 'window.require("fs")'
+        fs: 'window.require("fs")',
+        util: 'window.require("util")',
+        process: 'require("process")'
     },
     resolve: {
         alias: {
diff --git a/csseditor/webpack.production.config.js b/csseditor/webpack.production.config.js
index 8d2cd354..77f7571c 100644
--- a/csseditor/webpack.production.config.js
+++ b/csseditor/webpack.production.config.js
@@ -24,7 +24,9 @@ module.exports = {
     },
     externals: {
         electron: 'window.require("electron")',
-        fs: 'window.require("fs")'
+        fs: 'window.require("fs")',
+        util: 'window.require("util")',
+        process: 'require("process")'
     },
     resolve: {
         alias: {
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
new file mode 100644
index 00000000..14086f32
--- /dev/null
+++ b/gulpfile.babel.js
@@ -0,0 +1,86 @@
+import gulp from 'gulp';
+import pump from 'pump';
+import del from 'del';
+import copy from 'gulp-copy';
+import rename from 'gulp-rename';
+import inject from 'gulp-inject-string';
+import copydeps from 'gulp-npm-copy-deps';
+import file from 'gulp-file';
+import editjson from 'gulp-json-editor';
+
+import corepkg from './core/package';
+import clientpkg from './client/package';
+
+gulp.task('release-package', function () {
+    return pump([
+        gulp.src('package.json'),
+        editjson(function (mainpkg) {
+            delete mainpkg.main;
+            delete mainpkg.devDependencies;
+            delete mainpkg.scripts;
+            return mainpkg;
+        }),
+        gulp.dest('release')
+    ]);
+});
+
+gulp.task('client', function () {
+    return pump([
+        gulp.src('client/dist/*.client-release.js'),
+        rename(`client.${clientpkg.version}.js`),
+        gulp.dest('release')
+    ]);
+});
+
+gulp.task('core', function () {
+    return pump([
+        gulp.src('core/dist/main.js'),
+        inject.after("'use strict';\n", 'const PRODUCTION = true;\n'),
+        rename(`core.${corepkg.version}.js`),
+        gulp.dest('release')
+    ]);
+});
+
+gulp.task('sparkplug', function () {
+    return pump([
+        gulp.src('core/dist/sparkplug.js'),
+        gulp.dest('release')
+    ]);
+});
+
+gulp.task('core-modules', function () {
+    return pump([
+        gulp.src('core/dist/modules/**/*'),
+        copy('release', { prefix: 2 })
+    ]);
+});
+
+gulp.task('index', function () {
+    return pump([
+        file('index.js', `module.exports = require('./core.${corepkg.version}.js');`, {src: true}),
+        gulp.dest('release')
+    ]);
+});
+
+gulp.task('css-editor', function () {
+    return pump([
+        gulp.src('csseditor/dist/csseditor-release.js'),
+        rename('csseditor.js'),
+        gulp.dest('release/csseditor')
+    ]);
+});
+
+gulp.task('dependencies', function () {
+    return copydeps('.', 'release');
+});
+
+gulp.task('node-sass-bindings', function () {
+    return pump([
+        gulp.src('other/node_sass_bindings/**/*'),
+        copy('release/node_modules/node-sass/vendor', { prefix: 2 })
+    ]);
+});
+
+gulp.task('release', gulp.series(function () {
+    return del(['release/**/*']);
+}, gulp.parallel('release-package', 'client', 'core', 'sparkplug', 'core-modules', 'index', 'css-editor', gulp.series('dependencies', 'node-sass-bindings'))));
diff --git a/gulpfile.js b/gulpfile.js
deleted file mode 100644
index c056deac..00000000
--- a/gulpfile.js
+++ /dev/null
@@ -1,82 +0,0 @@
-const
-    fs = require('fs'),
-    mkdirp = require('mkdirp'),
-    gulp = require('gulp'),
-    del = require('del'),
-    pump = require('pump'),
-    merge = require('gulp-merge'),
-    copy = require('gulp-copy'),
-    rename = require('gulp-rename'),
-    inject = require('gulp-inject-string'),
-    copydeps = require('gulp-npm-copy-deps');
-
-const mainpkg = require('./package.json');
-const corepkg = require('./core/package.json');
-const clientpkg = require('./client/package.json');
-const editorpkg = require('./csseditor/package.json');
-
-const releasepkg = function() {
-    delete mainpkg.main;
-    delete mainpkg.devDependencies;
-    delete mainpkg.scripts;
-    mkdirp.sync('./release');
-    return fs.writeFileSync('./release/package.json', JSON.stringify(mainpkg, null, 2));
-};
-
-const client = function() {
-    return pump([
-        gulp.src('./client/dist/*.client-release.js'),
-        rename(`client.${clientpkg.version}.js`),
-        gulp.dest('./release')
-    ]);
-};
-
-const core = function() {
-    return pump([
-        gulp.src('./core/dist/main.js'),
-        inject.after("'use strict';\n", 'const PRODUCTION = true;\n'),
-        rename(`core.${corepkg.version}.js`),
-        gulp.dest('./release')
-    ]);
-};
-
-const sparkplug = function() {
-    return pump([
-        gulp.src('./core/dist/sparkplug.js'),
-        gulp.dest('./release')
-    ]);
-};
-
-const core_modules = function() {
-    return pump([
-        gulp.src('./core/dist/modules/**/*'),
-        copy('release/', { prefix: 2 })
-    ]);
-};
-
-const index = function() {
-    return fs.writeFileSync('./release/index.js', `module.exports = require('./core.${corepkg.version}.js');`);
-};
-
-const cssEditor = function() {
-    return pump([
-        gulp.src('./csseditor/dist/csseditor-release.js'),
-        rename('csseditor.js'),
-        copy('release/csseditor', { prefix: 2 })
-    ]);
-};
-
-const deps = function() {
-    return copydeps('./', './release');
-};
-
-const node_sass_bindings = function() {
-    return pump([
-        gulp.src('./other/node_sass_bindings/**/*'),
-        copy('release/node_modules/node-sass/vendor', { prefix: 2 })
-    ]);
-};
-
-gulp.task('release', function () {
-    return del(['./release/**/*']).then(() => merge(releasepkg(), client(), core(), sparkplug(), core_modules(), index(), cssEditor(), deps(), node_sass_bindings()));
-});
diff --git a/package-lock.json b/package-lock.json
index f3b3a2ec..b78a6481 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,9 +16,9 @@
       "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="
     },
     "acorn": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.0.tgz",
-      "integrity": "sha1-GrtYf78FH5Tj3iDmsm75ELGCgpg=",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz",
+      "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==",
       "dev": true
     },
     "acorn-dynamic-import": {
@@ -124,9 +124,9 @@
       }
     },
     "ansi-escapes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz",
-      "integrity": "sha1-7D6LTp+AZPwCw6ybZfHCdb2o75I=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
       "dev": true
     },
     "ansi-gray": {
@@ -166,7 +166,7 @@
     "anymatch": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
       "dev": true,
       "requires": {
         "micromatch": "2.3.11",
@@ -264,10 +264,19 @@
         }
       }
     },
+    "append-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
+      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
+      "dev": true,
+      "requires": {
+        "buffer-equal": "1.0.0"
+      }
+    },
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo="
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
     },
     "archiver": {
       "version": "2.1.1",
@@ -279,7 +288,7 @@
         "async": "2.6.0",
         "buffer-crc32": "0.2.13",
         "glob": "7.1.2",
-        "lodash": "4.17.5",
+        "lodash": "4.17.10",
         "readable-stream": "2.3.5",
         "tar-stream": "1.5.5",
         "zip-stream": "1.2.0"
@@ -332,7 +341,7 @@
         "glob": "7.1.2",
         "graceful-fs": "4.1.11",
         "lazystream": "1.0.0",
-        "lodash": "4.17.5",
+        "lodash": "4.17.10",
         "normalize-path": "2.1.1",
         "readable-stream": "2.3.5"
       },
@@ -382,12 +391,12 @@
       "dev": true
     },
     "are-we-there-yet": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
-      "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
       "requires": {
         "delegates": "1.0.0",
-        "readable-stream": "2.3.4"
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -398,26 +407,26 @@
         "process-nextick-args": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o="
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
         },
         "readable-stream": {
-          "version": "2.3.4",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz",
-          "integrity": "sha1-yUbD9H+n2Oq8C2FQ9KEvaaRXQHE=",
+          "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.2",
             "inherits": "2.0.3",
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
             "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+          "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.1"
           }
@@ -427,7 +436,7 @@
     "argparse": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "requires": {
         "sprintf-js": "1.0.3"
@@ -439,12 +448,30 @@
       "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
       "dev": true
     },
+    "arr-filter": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
+      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
+      "dev": true,
+      "requires": {
+        "make-iterator": "1.0.1"
+      }
+    },
     "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
       "dev": true
     },
+    "arr-map": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
+      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
+      "dev": true,
+      "requires": {
+        "make-iterator": "1.0.1"
+      }
+    },
     "arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
@@ -468,12 +495,66 @@
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
       "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
     },
+    "array-initial": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
+      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
+      "dev": true,
+      "requires": {
+        "array-slice": "1.1.0",
+        "is-number": "4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        }
+      }
+    },
+    "array-last": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
+      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
+      "dev": true,
+      "requires": {
+        "is-number": "4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        }
+      }
+    },
     "array-slice": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha1-42jqFfibxwaff/uJrsOmx9SsItQ=",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
       "dev": true
     },
+    "array-sort": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
+      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
+      "dev": true,
+      "requires": {
+        "default-compare": "1.0.0",
+        "get-value": "2.0.6",
+        "kind-of": "5.1.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
     "array-union": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -509,12 +590,12 @@
     "asn1.js": {
       "version": "4.10.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha1-ucK/WAXx5kqt7tbfOiv6+1pz9aA=",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
         "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0"
+        "minimalistic-assert": "1.0.1"
       }
     },
     "assert": {
@@ -524,6 +605,23 @@
       "dev": true,
       "requires": {
         "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
       }
     },
     "assert-plus": {
@@ -543,7 +641,19 @@
       "integrity": "sha1-YaKau2/MAm/qd+VtHG7FOnlZUfQ=",
       "dev": true,
       "requires": {
-        "lodash": "4.17.5"
+        "lodash": "4.17.10"
+      }
+    },
+    "async-done": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.1.tgz",
+      "integrity": "sha512-R1BaUeJ4PMoLNJuk+0tLJgjmEqVsdN118+Z8O+alhnQDQgy0kmD5Mqi0DNEmMx2LM0Ed5yekKu+ZXYvIHceicg==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.4.1",
+        "once": "1.4.0",
+        "process-nextick-args": "1.0.7",
+        "stream-exhaust": "1.0.2"
       }
     },
     "async-each": {
@@ -557,6 +667,15 @@
       "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
     },
+    "async-settle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
+      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
+      "dev": true,
+      "requires": {
+        "async-done": "1.3.1"
+      }
+    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -575,7 +694,7 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000810",
+        "caniuse-db": "1.0.30000862",
         "normalize-range": "0.1.2",
         "num2fraction": "1.2.2",
         "postcss": "5.2.18",
@@ -588,8 +707,8 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "1.0.30000810",
-            "electron-to-chromium": "1.3.31"
+            "caniuse-db": "1.0.30000862",
+            "electron-to-chromium": "1.3.51"
           }
         }
       }
@@ -616,9 +735,9 @@
       }
     },
     "babel-core": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
-      "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
+      "version": "6.26.3",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
+      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
       "dev": true,
       "requires": {
         "babel-code-frame": "6.26.0",
@@ -634,7 +753,7 @@
         "convert-source-map": "1.5.1",
         "debug": "2.6.9",
         "json5": "0.5.1",
-        "lodash": "4.17.5",
+        "lodash": "4.17.10",
         "minimatch": "3.0.4",
         "path-is-absolute": "1.0.1",
         "private": "0.1.8",
@@ -645,7 +764,7 @@
     "babel-generator": {
       "version": "6.26.1",
       "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
-      "integrity": "sha1-GERAjTuPDTWkBOp6wYDwh6YBvZA=",
+      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
       "dev": true,
       "requires": {
         "babel-messages": "6.23.0",
@@ -653,7 +772,7 @@
         "babel-types": "6.26.0",
         "detect-indent": "4.0.0",
         "jsesc": "1.3.0",
-        "lodash": "4.17.5",
+        "lodash": "4.17.10",
         "source-map": "0.5.7",
         "trim-right": "1.0.1"
       }
@@ -701,7 +820,7 @@
         "babel-helper-function-name": "6.24.1",
         "babel-runtime": "6.26.0",
         "babel-types": "6.26.0",
-        "lodash": "4.17.5"
+        "lodash": "4.17.10"
       }
     },
     "babel-helper-explode-assignable-expression": {
@@ -766,7 +885,7 @@
       "requires": {
         "babel-runtime": "6.26.0",
         "babel-types": "6.26.0",
-        "lodash": "4.17.5"
+        "lodash": "4.17.10"
       }
     },
     "babel-helper-remap-async-to-generator": {
@@ -807,9 +926,9 @@
       }
     },
     "babel-loader": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.3.tgz",
-      "integrity": "sha1-/1tEDacW6RU6u5RiUamrdnADexY=",
+      "version": "7.1.5",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.5.tgz",
+      "integrity": "sha512-iCHfbieL5d1LfOQeeVJEUyD9rTwBcP/fcEbRCfempxTDuqrKpu0AZjLAQHEQa3Yqyj9ORKe2iHfoj4rHLf7xpw==",
       "dev": true,
       "requires": {
         "find-cache-dir": "1.0.0",
@@ -904,7 +1023,7 @@
         "babel-template": "6.26.0",
         "babel-traverse": "6.26.0",
         "babel-types": "6.26.0",
-        "lodash": "4.17.5"
+        "lodash": "4.17.10"
       }
     },
     "babel-plugin-transform-es2015-classes": {
@@ -1191,9 +1310,9 @@
       }
     },
     "babel-preset-env": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.1.tgz",
-      "integrity": "sha1-oYtWTMm5r99KrleuPBsNmRiOb0g=",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz",
+      "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==",
       "dev": true,
       "requires": {
         "babel-plugin-check-es2015-constants": "6.22.0",
@@ -1223,7 +1342,7 @@
         "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
         "babel-plugin-transform-exponentiation-operator": "6.24.1",
         "babel-plugin-transform-regenerator": "6.26.0",
-        "browserslist": "2.11.3",
+        "browserslist": "3.2.8",
         "invariant": "2.2.2",
         "semver": "5.5.0"
       }
@@ -1289,11 +1408,11 @@
       "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
       "dev": true,
       "requires": {
-        "babel-core": "6.26.0",
+        "babel-core": "6.26.3",
         "babel-runtime": "6.26.0",
         "core-js": "2.5.3",
         "home-or-tmp": "2.0.0",
-        "lodash": "4.17.5",
+        "lodash": "4.17.10",
         "mkdirp": "0.5.1",
         "source-map-support": "0.4.18"
       }
@@ -1318,7 +1437,7 @@
         "babel-traverse": "6.26.0",
         "babel-types": "6.26.0",
         "babylon": "6.18.0",
-        "lodash": "4.17.5"
+        "lodash": "4.17.10"
       }
     },
     "babel-traverse": {
@@ -1335,7 +1454,7 @@
         "debug": "2.6.9",
         "globals": "9.18.0",
         "invariant": "2.2.2",
-        "lodash": "4.17.5"
+        "lodash": "4.17.10"
       }
     },
     "babel-types": {
@@ -1346,7 +1465,7 @@
       "requires": {
         "babel-runtime": "6.26.0",
         "esutils": "2.0.2",
-        "lodash": "4.17.5",
+        "lodash": "4.17.10",
         "to-fast-properties": "1.0.3"
       }
     },
@@ -1356,6 +1475,23 @@
       "integrity": "sha1-ry87iPpvXB5MY00aD46sT1WzleM=",
       "dev": true
     },
+    "bach": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
+      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
+      "dev": true,
+      "requires": {
+        "arr-filter": "1.1.2",
+        "arr-flatten": "1.1.0",
+        "arr-map": "2.0.2",
+        "array-each": "1.0.1",
+        "array-initial": "1.1.0",
+        "array-last": "1.3.0",
+        "async-done": "1.3.1",
+        "async-settle": "1.0.0",
+        "now-and-later": "2.0.0"
+      }
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -1377,9 +1513,9 @@
       }
     },
     "base64-js": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.3.tgz",
-      "integrity": "sha1-+xNmgjPZYUz1+0vOlam6QJbN+AE=",
+      "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
     },
     "bcrypt-pbkdf": {
@@ -1400,7 +1536,7 @@
     "big.js": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-      "integrity": "sha1-pfwpi4G54Nyi5FiCR4S2XFK6WI4=",
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
       "dev": true
     },
     "binary-extensions": {
@@ -1482,7 +1618,7 @@
     "bn.js": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
       "dev": true
     },
     "boolbase": {
@@ -1491,14 +1627,6 @@
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
       "dev": true
     },
-    "boom": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
-      "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
-      "requires": {
-        "hoek": "4.2.0"
-      }
-    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1535,34 +1663,34 @@
       "dev": true
     },
     "browserify-aes": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz",
-      "integrity": "sha1-OLerVe24Bv8tzaGn8WIHc6R3xJ8=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dev": true,
       "requires": {
         "buffer-xor": "1.0.3",
         "cipher-base": "1.0.4",
-        "create-hash": "1.1.3",
+        "create-hash": "1.2.0",
         "evp_bytestokey": "1.0.3",
         "inherits": "2.0.3",
         "safe-buffer": "5.1.1"
       }
     },
     "browserify-cipher": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
-      "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
       "dev": true,
       "requires": {
-        "browserify-aes": "1.1.1",
-        "browserify-des": "1.0.0",
+        "browserify-aes": "1.2.0",
+        "browserify-des": "1.0.1",
         "evp_bytestokey": "1.0.3"
       }
     },
     "browserify-des": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
-      "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz",
+      "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==",
       "dev": true,
       "requires": {
         "cipher-base": "1.0.4",
@@ -1588,30 +1716,30 @@
       "requires": {
         "bn.js": "4.11.8",
         "browserify-rsa": "4.0.1",
-        "create-hash": "1.1.3",
-        "create-hmac": "1.1.6",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
         "elliptic": "6.4.0",
         "inherits": "2.0.3",
-        "parse-asn1": "5.1.0"
+        "parse-asn1": "5.1.1"
       }
     },
     "browserify-zlib": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha1-KGlFnZqjviRf6P4sofRuLn9U1z8=",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
       "dev": true,
       "requires": {
         "pako": "1.0.6"
       }
     },
     "browserslist": {
-      "version": "2.11.3",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
-      "integrity": "sha1-/jYWeu0bvN5IJ+v+cTR6LMcLmbI=",
+      "version": "3.2.8",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
+      "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "1.0.30000810",
-        "electron-to-chromium": "1.3.31"
+        "caniuse-lite": "1.0.30000862",
+        "electron-to-chromium": "1.3.51"
       }
     },
     "buffer": {
@@ -1620,8 +1748,8 @@
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
       "dev": true,
       "requires": {
-        "base64-js": "1.2.3",
-        "ieee754": "1.1.8",
+        "base64-js": "1.3.0",
+        "ieee754": "1.1.12",
         "isarray": "1.0.0"
       },
       "dependencies": {
@@ -1639,6 +1767,12 @@
       "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
       "dev": true
     },
+    "buffer-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
+      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
+      "dev": true
+    },
     "buffer-xor": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
@@ -1666,7 +1800,7 @@
         "chownr": "1.0.1",
         "glob": "7.1.2",
         "graceful-fs": "4.1.11",
-        "lru-cache": "4.1.2",
+        "lru-cache": "4.1.3",
         "mississippi": "2.0.0",
         "mkdirp": "0.5.1",
         "move-concurrently": "1.0.1",
@@ -1678,9 +1812,9 @@
       },
       "dependencies": {
         "lru-cache": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz",
-          "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==",
+          "version": "4.1.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
+          "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
           "dev": true,
           "requires": {
             "pseudomap": "1.0.2",
@@ -1758,7 +1892,7 @@
       "dev": true,
       "requires": {
         "browserslist": "1.7.7",
-        "caniuse-db": "1.0.30000810",
+        "caniuse-db": "1.0.30000862",
         "lodash.memoize": "4.1.2",
         "lodash.uniq": "4.5.0"
       },
@@ -1769,22 +1903,22 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "1.0.30000810",
-            "electron-to-chromium": "1.3.31"
+            "caniuse-db": "1.0.30000862",
+            "electron-to-chromium": "1.3.51"
           }
         }
       }
     },
     "caniuse-db": {
-      "version": "1.0.30000810",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000810.tgz",
-      "integrity": "sha1-vSWDDEHvq2Qzmi44H0lnc0PIRQk=",
+      "version": "1.0.30000862",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000862.tgz",
+      "integrity": "sha1-bB4pb4u+Xl6kbwQhXouQ7Y+52o0=",
       "dev": true
     },
     "caniuse-lite": {
-      "version": "1.0.30000810",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000810.tgz",
-      "integrity": "sha1-R1hf/84OnzWTpv7qRnO5RUJDUdk=",
+      "version": "1.0.30000862",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000862.tgz",
+      "integrity": "sha512-e9DBeH0Oby7EbUQN3DRWKxgbpEJO3KAZUhP0xDmPA23Qr6PmvXI7Ojy8ZthsOsz+1iSoaV9G7eWJXUOyryJ6NA==",
       "dev": true
     },
     "caseless": {
@@ -1878,7 +2012,7 @@
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
@@ -1888,13 +2022,13 @@
     "circular-json": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
-      "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==",
       "dev": true
     },
     "clap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz",
-      "integrity": "sha1-TzZ0WzIAhJJVf0ZBLWbVDLmbzlE=",
+      "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==",
       "dev": true,
       "requires": {
         "chalk": "1.1.3"
@@ -1999,9 +2133,9 @@
       }
     },
     "cli-spinners": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.1.0.tgz",
-      "integrity": "sha1-8YR7FohE2RemceudFH499JfJDQY=",
+      "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==",
       "dev": true
     },
     "cli-width": {
@@ -2033,26 +2167,15 @@
       "dev": true
     },
     "clone-deep": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.3.0.tgz",
-      "integrity": "sha1-NIxhrpzb4O3+BT2R/0zFIdeQ7eg=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
+      "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
       "dev": true,
       "requires": {
         "for-own": "1.0.0",
         "is-plain-object": "2.0.4",
-        "kind-of": "3.2.2",
-        "shallow-clone": "0.1.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
-        }
+        "kind-of": "6.0.2",
+        "shallow-clone": "1.0.0"
       }
     },
     "clone-stats": {
@@ -2148,11 +2271,22 @@
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
     "codemirror": {
-      "version": "5.35.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.35.0.tgz",
-      "integrity": "sha1-KAZT1JVFW8ZqqH5ihCkrAndbqHg=",
+      "version": "5.39.2",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.39.2.tgz",
+      "integrity": "sha512-mchBy0kQ1Wggi+e58SmoLgKO4nG7s/BqNg6/6TRbhsnXI/KRG+fKAvRQ1LLhZZ6ZtUoDQ0dl5aMhE+IkSRh60Q==",
       "dev": true
     },
+    "collection-map": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
+      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
+      "dev": true,
+      "requires": {
+        "arr-map": "2.0.2",
+        "for-own": "1.0.0",
+        "make-iterator": "1.0.1"
+      }
+    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -2170,23 +2304,23 @@
       "dev": true,
       "requires": {
         "clone": "1.0.3",
-        "color-convert": "1.9.1",
+        "color-convert": "1.9.2",
         "color-string": "0.3.0"
       }
     },
     "color-convert": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
-      "integrity": "sha1-wSYRB66y8pTr/+ye2eytUppgl+0=",
+      "version": "1.9.2",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz",
+      "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==",
       "dev": true,
       "requires": {
-        "color-name": "1.1.3"
+        "color-name": "1.1.1"
       }
     },
     "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz",
+      "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=",
       "dev": true
     },
     "color-string": {
@@ -2195,7 +2329,7 @@
       "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
       "dev": true,
       "requires": {
-        "color-name": "1.1.3"
+        "color-name": "1.1.1"
       }
     },
     "color-support": {
@@ -2212,7 +2346,7 @@
       "requires": {
         "color": "0.11.4",
         "css-color-names": "0.0.4",
-        "has": "1.0.1"
+        "has": "1.0.3"
       }
     },
     "colors": {
@@ -2236,9 +2370,10 @@
       "dev": true
     },
     "commander": {
-      "version": "2.14.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
-      "integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
+      "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
+      "dev": true
     },
     "commondir": {
       "version": "1.0.1",
@@ -2356,6 +2491,16 @@
         }
       }
     },
+    "config-chain": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz",
+      "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=",
+      "dev": true,
+      "requires": {
+        "ini": "1.3.5",
+        "proto-list": "1.2.4"
+      }
+    },
     "console-browserify": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
@@ -2411,6 +2556,16 @@
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
       "dev": true
     },
+    "copy-props": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
+      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
+      "dev": true,
+      "requires": {
+        "each-props": "1.3.2",
+        "is-plain-object": "2.0.4"
+      }
+    },
     "core-js": {
       "version": "2.5.3",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
@@ -2425,7 +2580,7 @@
     "cosmiconfig": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-      "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=",
+      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
       "dev": true,
       "requires": {
         "is-directory": "0.3.1",
@@ -2500,9 +2655,9 @@
       }
     },
     "create-ecdh": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
-      "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
@@ -2510,44 +2665,48 @@
       }
     },
     "create-hash": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
-      "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dev": true,
       "requires": {
         "cipher-base": "1.0.4",
         "inherits": "2.0.3",
-        "ripemd160": "2.0.1",
-        "sha.js": "2.4.10"
+        "md5.js": "1.3.4",
+        "ripemd160": "2.0.2",
+        "sha.js": "2.4.11"
       }
     },
     "create-hmac": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
-      "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dev": true,
       "requires": {
         "cipher-base": "1.0.4",
-        "create-hash": "1.1.3",
+        "create-hash": "1.2.0",
         "inherits": "2.0.3",
-        "ripemd160": "2.0.1",
+        "ripemd160": "2.0.2",
         "safe-buffer": "5.1.1",
-        "sha.js": "2.4.10"
+        "sha.js": "2.4.11"
       }
     },
     "cross-spawn": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
-      "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "dev": true,
       "requires": {
-        "lru-cache": "4.1.1",
+        "lru-cache": "4.1.3",
+        "shebang-command": "1.2.0",
         "which": "1.3.0"
       },
       "dependencies": {
         "lru-cache": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-          "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=",
+          "version": "4.1.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
+          "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
+          "dev": true,
           "requires": {
             "pseudomap": "1.0.2",
             "yallist": "2.1.2"
@@ -2555,43 +2714,28 @@
         }
       }
     },
-    "cryptiles": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
-      "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-      "requires": {
-        "boom": "5.2.0"
-      },
-      "dependencies": {
-        "boom": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
-          "integrity": "sha1-XdnabuOl8wIHdDYpDLcX0/SlTgI=",
-          "requires": {
-            "hoek": "4.2.0"
-          }
-        }
-      }
-    },
     "crypto-browserify": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha1-OWz58xN/A+S45TLFj2mCVOAPgOw=",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
       "dev": true,
       "requires": {
-        "browserify-cipher": "1.0.0",
+        "browserify-cipher": "1.0.1",
         "browserify-sign": "4.0.4",
-        "create-ecdh": "4.0.0",
-        "create-hash": "1.1.3",
-        "create-hmac": "1.1.6",
-        "diffie-hellman": "5.0.2",
+        "create-ecdh": "4.0.3",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "diffie-hellman": "5.0.3",
         "inherits": "2.0.3",
-        "pbkdf2": "3.0.14",
-        "public-encrypt": "4.0.0",
+        "pbkdf2": "3.0.16",
+        "public-encrypt": "4.0.2",
         "randombytes": "2.0.6",
         "randomfill": "1.0.4"
       }
     },
+    "csp-parse": {
+      "version": "github:macropodhq/csp-parse#db7d5f954b420b527d7fb452a93bb6e2fa302c5a"
+    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@@ -2599,9 +2743,9 @@
       "dev": true
     },
     "css-loader": {
-      "version": "0.28.10",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.10.tgz",
-      "integrity": "sha1-QCgueSMPe8tOSD76Yx1nC3Nev0I=",
+      "version": "0.28.11",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.11.tgz",
+      "integrity": "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==",
       "dev": true,
       "requires": {
         "babel-code-frame": "6.26.0",
@@ -2677,7 +2821,7 @@
         "autoprefixer": "6.7.7",
         "decamelize": "1.2.0",
         "defined": "1.0.0",
-        "has": "1.0.1",
+        "has": "1.0.3",
         "object-assign": "4.1.1",
         "postcss": "5.2.18",
         "postcss-calc": "5.3.1",
@@ -2688,7 +2832,7 @@
         "postcss-discard-empty": "2.1.0",
         "postcss-discard-overridden": "0.1.1",
         "postcss-discard-unused": "2.2.3",
-        "postcss-filter-plugins": "2.0.2",
+        "postcss-filter-plugins": "2.0.3",
         "postcss-merge-idents": "2.1.7",
         "postcss-merge-longhand": "2.0.2",
         "postcss-merge-rules": "2.1.2",
@@ -2805,6 +2949,34 @@
       "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
       "dev": true
     },
+    "deepmerge": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.1.1.tgz",
+      "integrity": "sha512-urQxA1smbLZ2cBbXbaYObM1dJ82aJ2H57A1C/Kklfh/ZN1bgH4G/n5KWhdNfOK11W98gqZfyYj7W4frJJRwA2w=="
+    },
+    "default-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
+      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
+      "dev": true,
+      "requires": {
+        "kind-of": "5.1.0"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "default-resolution": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
+      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
+      "dev": true
+    },
     "defaults": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
@@ -2884,7 +3056,7 @@
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0"
+        "minimalistic-assert": "1.0.1"
       }
     },
     "detect-file": {
@@ -2909,15 +3081,15 @@
       "dev": true
     },
     "diff-match-patch": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.0.tgz",
-      "integrity": "sha1-HMPIOkkNZ/ldkeOfatHy4Ia2MEg=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.1.tgz",
+      "integrity": "sha512-A0QEhr4PxGUMEtKxd6X+JLnOTFd3BfIPSDpsc4dMvj+CbSaErDwTpoTo/nFJDMSrjxLW4BiNq+FbNisAAHhWeQ==",
       "dev": true
     },
     "diffie-hellman": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
-      "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
@@ -2928,7 +3100,7 @@
     "doctrine": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha1-XNAfwQFiG0LEzX9dGmYkNxbT850=",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
       "requires": {
         "esutils": "2.0.2"
@@ -2972,7 +3144,7 @@
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto=",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
       "dev": true
     },
     "domelementtype": {
@@ -3074,6 +3246,16 @@
         }
       }
     },
+    "each-props": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
+      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
+      "dev": true,
+      "requires": {
+        "is-plain-object": "2.0.4",
+        "object.defaults": "1.1.0"
+      }
+    },
     "ecc-jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
@@ -3083,6 +3265,30 @@
         "jsbn": "0.1.1"
       }
     },
+    "editorconfig": {
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.13.3.tgz",
+      "integrity": "sha512-WkjsUNVCu+ITKDj73QDvi0trvpdDWdkDyHybDGSXPfekLCqwmpD7CP7iPbvBgosNuLcI96XTDwNa75JyFl7tEQ==",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1",
+        "commander": "2.16.0",
+        "lru-cache": "3.2.0",
+        "semver": "5.5.0",
+        "sigmund": "1.0.1"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz",
+          "integrity": "sha1-cXibO39Tmb7IVl3aOKow0qCX7+4=",
+          "dev": true,
+          "requires": {
+            "pseudomap": "1.0.2"
+          }
+        }
+      }
+    },
     "electron": {
       "version": "1.6.15",
       "resolved": "https://registry.npmjs.org/electron/-/electron-1.6.15.tgz",
@@ -3129,23 +3335,29 @@
       }
     },
     "electron-rebuild": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.7.3.tgz",
-      "integrity": "sha1-JK4GrZ3WHLfk1oiWH0kRjEChEOs=",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.8.2.tgz",
+      "integrity": "sha512-EeR4dgb6NN7ybxduUWMeeLhU/EuF+FzwFZJfMJXD0bx96K+ttAieCXOn9lTO5nA9Qn3hiS7pEpk8pZ9StpGgSg==",
       "dev": true,
       "requires": {
-        "colors": "1.1.2",
+        "colors": "1.3.1",
         "debug": "2.6.9",
         "detect-libc": "1.0.3",
         "fs-extra": "3.0.1",
-        "node-abi": "2.2.0",
-        "node-gyp": "3.6.2",
+        "node-abi": "2.4.3",
+        "node-gyp": "3.7.0",
         "ora": "1.4.0",
         "rimraf": "2.6.2",
         "spawn-rx": "2.0.12",
         "yargs": "7.1.0"
       },
       "dependencies": {
+        "colors": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.1.tgz",
+          "integrity": "sha512-jg/vxRmv430jixZrC+La5kMbUWqIg32/JsYNZb94+JEmzceYbWKTsv1OuTp+7EaqiaWRR2tPcykibwCRgclIsw==",
+          "dev": true
+        },
         "fs-extra": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
@@ -3154,7 +3366,7 @@
           "requires": {
             "graceful-fs": "4.1.11",
             "jsonfile": "3.0.1",
-            "universalify": "0.1.1"
+            "universalify": "0.1.2"
           }
         },
         "jsonfile": {
@@ -3169,9 +3381,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.31",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.31.tgz",
-      "integrity": "sha1-ANgyy6n+I1hlKwxIqIFsjjoDfp8=",
+      "version": "1.3.51",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.51.tgz",
+      "integrity": "sha1-akK0nar38ipbN7mR2vlJ8029ubU=",
       "dev": true
     },
     "elliptic": {
@@ -3182,10 +3394,10 @@
       "requires": {
         "bn.js": "4.11.8",
         "brorand": "1.1.0",
-        "hash.js": "1.1.3",
+        "hash.js": "1.1.4",
         "hmac-drbg": "1.0.1",
         "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0",
+        "minimalistic-assert": "1.0.1",
         "minimalistic-crypto-utils": "1.0.1"
       }
     },
@@ -3196,23 +3408,12 @@
       "dev": true
     },
     "end-of-stream": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
-      "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
+      "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
       "dev": true,
       "requires": {
-        "once": "1.3.3"
-      },
-      "dependencies": {
-        "once": {
-          "version": "1.3.3",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-          "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
-          "dev": true,
-          "requires": {
-            "wrappy": "1.0.2"
-          }
-        }
+        "once": "1.4.0"
       }
     },
     "enhanced-resolve": {
@@ -3225,6 +3426,14 @@
         "memory-fs": "0.4.1",
         "object-assign": "4.1.1",
         "tapable": "0.2.8"
+      },
+      "dependencies": {
+        "tapable": {
+          "version": "0.2.8",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz",
+          "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
+          "dev": true
+        }
       }
     },
     "entities": {
@@ -3236,7 +3445,7 @@
     "errno": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-      "integrity": "sha1-RoTXF3mtOa8Xfj8AeZb3xnyFJhg=",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
       "dev": true,
       "requires": {
         "prr": "1.0.1"
@@ -3251,15 +3460,15 @@
       }
     },
     "es-abstract": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz",
-      "integrity": "sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
+      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
       "dev": true,
       "requires": {
         "es-to-primitive": "1.1.1",
         "function-bind": "1.1.1",
-        "has": "1.0.1",
-        "is-callable": "1.1.3",
+        "has": "1.0.3",
+        "is-callable": "1.1.4",
         "is-regex": "1.0.4"
       }
     },
@@ -3269,7 +3478,7 @@
       "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
       "dev": true,
       "requires": {
-        "is-callable": "1.1.3",
+        "is-callable": "1.1.4",
         "is-date-object": "1.0.1",
         "is-symbol": "1.0.1"
       }
@@ -3312,7 +3521,7 @@
     "es6-promise": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz",
-      "integrity": "sha1-3EIhwrFlGHYL2MOaUtjzVvwA7Sk=",
+      "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==",
       "dev": true
     },
     "es6-set": {
@@ -3363,40 +3572,40 @@
       "requires": {
         "es6-map": "0.1.5",
         "es6-weak-map": "2.0.2",
-        "esrecurse": "4.2.0",
+        "esrecurse": "4.2.1",
         "estraverse": "4.2.0"
       }
     },
     "eslint": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.18.2.tgz",
-      "integrity": "sha1-D4EmetEBLn0gUeGGqQBMwiZ7jUU=",
+      "version": "4.19.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.19.1.tgz",
+      "integrity": "sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==",
       "dev": true,
       "requires": {
         "ajv": "5.5.2",
         "babel-code-frame": "6.26.0",
-        "chalk": "2.3.2",
+        "chalk": "2.4.1",
         "concat-stream": "1.6.0",
         "cross-spawn": "5.1.0",
         "debug": "3.1.0",
         "doctrine": "2.1.0",
         "eslint-scope": "3.7.1",
         "eslint-visitor-keys": "1.0.0",
-        "espree": "3.5.2",
-        "esquery": "1.0.0",
+        "espree": "3.5.4",
+        "esquery": "1.0.1",
         "esutils": "2.0.2",
         "file-entry-cache": "2.0.0",
         "functional-red-black-tree": "1.0.1",
         "glob": "7.1.2",
-        "globals": "11.3.0",
-        "ignore": "3.3.7",
+        "globals": "11.7.0",
+        "ignore": "3.3.10",
         "imurmurhash": "0.1.4",
         "inquirer": "3.3.0",
         "is-resolvable": "1.1.0",
-        "js-yaml": "3.10.0",
+        "js-yaml": "3.12.0",
         "json-stable-stringify-without-jsonify": "1.0.1",
         "levn": "0.3.0",
-        "lodash": "4.17.5",
+        "lodash": "4.17.10",
         "minimatch": "3.0.4",
         "mkdirp": "0.5.1",
         "natural-compare": "1.4.0",
@@ -3404,6 +3613,7 @@
         "path-is-inside": "1.0.2",
         "pluralize": "7.0.0",
         "progress": "2.0.0",
+        "regexpp": "1.1.0",
         "require-uncached": "1.0.3",
         "semver": "5.5.0",
         "strip-ansi": "4.0.0",
@@ -3421,38 +3631,27 @@
         "ansi-styles": {
           "version": "3.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-          "integrity": "sha1-JQ3JawdJG/1gHmSNZt319gx6XGU=",
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.1",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "5.3.0"
-          }
-        },
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "4.1.1",
-            "shebang-command": "1.2.0",
-            "which": "1.3.0"
+            "supports-color": "5.4.0"
           }
         },
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -3461,13 +3660,13 @@
         "esprima": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-          "integrity": "sha1-RJnt3NERDgshi6zy+n9/WfVcqAQ=",
+          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
           "dev": true
         },
         "globals": {
-          "version": "11.3.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz",
-          "integrity": "sha1-4E/be5eW2K2snI9kwUg3sjEzeLA=",
+          "version": "11.7.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz",
+          "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==",
           "dev": true
         },
         "has-flag": {
@@ -3477,25 +3676,15 @@
           "dev": true
         },
         "js-yaml": {
-          "version": "3.10.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz",
-          "integrity": "sha1-LnhEFka9RoLpY/IrbpKCPDCcYtw=",
+          "version": "3.12.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
+          "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
           "dev": true,
           "requires": {
             "argparse": "1.0.10",
             "esprima": "4.0.0"
           }
         },
-        "lru-cache": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-          "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=",
-          "dev": true,
-          "requires": {
-            "pseudomap": "1.0.2",
-            "yallist": "2.1.2"
-          }
-        },
         "strip-ansi": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -3506,9 +3695,9 @@
           }
         },
         "supports-color": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-          "integrity": "sha1-WySsFduA+pJ89SJ6SjP9PEx2dsA=",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
             "has-flag": "3.0.0"
@@ -3517,9 +3706,9 @@
       }
     },
     "eslint-plugin-vue": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-4.3.0.tgz",
-      "integrity": "sha1-R4xiZyaduqIPboss+uegzMmMHXI=",
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-4.7.1.tgz",
+      "integrity": "sha512-esETKhVMI7Vdli70Wt4bvAwnZBJeM0pxVX9Yb0wWKxdCJc2EADalVYK/q2FzMw8oKN0wPMdqVCKS8kmR89recA==",
       "dev": true,
       "requires": {
         "vue-eslint-parser": "2.0.3"
@@ -3531,23 +3720,23 @@
       "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=",
       "dev": true,
       "requires": {
-        "esrecurse": "4.2.0",
+        "esrecurse": "4.2.1",
         "estraverse": "4.2.0"
       }
     },
     "eslint-visitor-keys": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha1-PzGA+y4pEBdxastMnW1bXDSmqB0=",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
       "dev": true
     },
     "espree": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz",
-      "integrity": "sha1-dWrai5eenc/NswqtjRqTBKkF4co=",
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
       "dev": true,
       "requires": {
-        "acorn": "5.5.0",
+        "acorn": "5.7.1",
         "acorn-jsx": "3.0.1"
       }
     },
@@ -3558,22 +3747,21 @@
       "dev": true
     },
     "esquery": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
-      "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
       "dev": true,
       "requires": {
         "estraverse": "4.2.0"
       }
     },
     "esrecurse": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
-      "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
       "dev": true,
       "requires": {
-        "estraverse": "4.2.0",
-        "object-assign": "4.1.1"
+        "estraverse": "4.2.0"
       }
     },
     "estraverse": {
@@ -3622,7 +3810,7 @@
     "evp_bytestokey": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
       "requires": {
         "md5.js": "1.3.4",
@@ -3642,29 +3830,6 @@
         "p-finally": "1.0.0",
         "signal-exit": "3.0.2",
         "strip-eof": "1.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
-          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
-          "dev": true,
-          "requires": {
-            "lru-cache": "4.1.1",
-            "shebang-command": "1.2.0",
-            "which": "1.3.0"
-          }
-        },
-        "lru-cache": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-          "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=",
-          "dev": true,
-          "requires": {
-            "pseudomap": "1.0.2",
-            "yallist": "2.1.2"
-          }
-        }
       }
     },
     "expand-brackets": {
@@ -3756,18 +3921,18 @@
       "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
       "dev": true,
       "requires": {
-        "fill-range": "2.2.3"
+        "fill-range": "2.2.4"
       },
       "dependencies": {
         "fill-range": {
-          "version": "2.2.3",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
-          "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+          "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
           "dev": true,
           "requires": {
             "is-number": "2.1.0",
             "isobject": "2.1.0",
-            "randomatic": "1.1.7",
+            "randomatic": "3.0.0",
             "repeat-element": "1.1.2",
             "repeat-string": "1.6.1"
           }
@@ -3831,13 +3996,13 @@
       }
     },
     "external-editor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz",
-      "integrity": "sha1-PQJqIbf5W1cmOH1CAKwWDTcsO0g=",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
       "dev": true,
       "requires": {
         "chardet": "0.4.2",
-        "iconv-lite": "0.4.19",
+        "iconv-lite": "0.4.23",
         "tmp": "0.0.33"
       }
     },
@@ -3947,9 +4112,9 @@
       }
     },
     "file-type": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/file-type/-/file-type-7.6.0.tgz",
-      "integrity": "sha1-s9v8gCkUjobzB2GyElNWKUPSHwY=",
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/file-type/-/file-type-7.7.1.tgz",
+      "integrity": "sha512-bTrKkzzZI6wH+NXhyD3SOXtb2zXTw2SbwI2RxUlRcXVsnN7jNL5hJzVQLYv7FOQhxFkK4XWdAflEaWFpaLLWpQ==",
       "dev": true
     },
     "filename-regex": {
@@ -3986,7 +4151,7 @@
       "dev": true,
       "requires": {
         "commondir": "1.0.1",
-        "make-dir": "1.1.0",
+        "make-dir": "1.3.0",
         "pkg-dir": "2.0.0"
       }
     },
@@ -4172,9 +4337,9 @@
       "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
     },
     "form-data": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
-      "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
       "requires": {
         "asynckit": "0.4.0",
         "combined-stream": "1.0.6",
@@ -4203,7 +4368,7 @@
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
-        "readable-stream": "2.3.5"
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -4219,9 +4384,9 @@
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.5",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
+          "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,
           "requires": {
             "core-util-is": "1.0.2",
@@ -4229,14 +4394,14 @@
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
             "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "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.1"
@@ -4257,6 +4422,70 @@
         "rimraf": "2.6.2"
       }
     },
+    "fs-mkdirp-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
+      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "through2": "2.0.3"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "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==",
+          "dev": true
+        },
+        "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,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "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.2"
+          }
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "through2": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2.3.6",
+            "xtend": "4.0.1"
+          }
+        },
+        "xtend": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+          "dev": true
+        }
+      }
+    },
     "fs-write-stream-atomic": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
@@ -5327,7 +5556,7 @@
         "signal-exit": "3.0.2",
         "string-width": "1.0.2",
         "strip-ansi": "3.0.1",
-        "wide-align": "1.1.2"
+        "wide-align": "1.1.3"
       }
     },
     "gaze": {
@@ -5339,19 +5568,6 @@
         "globule": "0.1.0"
       }
     },
-    "generate-function": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ="
-    },
-    "generate-object-property": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
-      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-      "requires": {
-        "is-property": "1.0.2"
-      }
-    },
     "get-caller-file": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
@@ -5442,77 +5658,71 @@
       }
     },
     "glob-stream": {
-      "version": "3.1.18",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
-      "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
+      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
       "dev": true,
       "requires": {
-        "glob": "4.5.3",
-        "glob2base": "0.0.12",
-        "minimatch": "2.0.10",
-        "ordered-read-streams": "0.1.0",
-        "through2": "0.6.5",
-        "unique-stream": "1.0.0"
+        "extend": "3.0.1",
+        "glob": "7.1.2",
+        "glob-parent": "3.1.0",
+        "is-negated-glob": "1.0.0",
+        "ordered-read-streams": "1.0.1",
+        "pumpify": "1.4.0",
+        "readable-stream": "2.3.6",
+        "remove-trailing-separator": "1.1.0",
+        "to-absolute-glob": "2.0.2",
+        "unique-stream": "2.2.1"
       },
       "dependencies": {
-        "glob": {
-          "version": "4.5.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
-          "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
-          "dev": true,
-          "requires": {
-            "inflight": "1.0.6",
-            "inherits": "2.0.3",
-            "minimatch": "2.0.10",
-            "once": "1.4.0"
-          }
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
         },
-        "minimatch": {
-          "version": "2.0.10",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
-          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "1.1.11"
-          }
+        "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==",
+          "dev": true
         },
         "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "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,
           "requires": {
             "core-util-is": "1.0.2",
             "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
-        "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+        "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==",
           "dev": true,
           "requires": {
-            "readable-stream": "1.0.34",
-            "xtend": "4.0.1"
+            "safe-buffer": "5.1.1"
           }
-        },
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-          "dev": true
         }
       }
     },
     "glob-watcher": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
-      "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.1.tgz",
+      "integrity": "sha512-fK92r2COMC199WCyGUblrZKhjra3cyVMDiypDdqg1vsSDmexnbYivK1kNR4QItiNXLKmGlqan469ks67RtNa2g==",
       "dev": true,
       "requires": {
-        "gaze": "0.5.2"
+        "async-done": "1.3.1",
+        "chokidar": "2.0.2",
+        "just-debounce": "1.0.0",
+        "object.defaults": "1.1.0"
       }
     },
     "glob2base": {
@@ -5527,11 +5737,11 @@
     "global-modules": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha1-bXcPDrUjrHgWTXK15xqIdyZcw+o=",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
       "dev": true,
       "requires": {
         "global-prefix": "1.0.2",
-        "is-windows": "1.0.1",
+        "is-windows": "1.0.2",
         "resolve-dir": "1.0.1"
       }
     },
@@ -5544,7 +5754,7 @@
         "expand-tilde": "2.0.2",
         "homedir-polyfill": "1.0.1",
         "ini": "1.3.5",
-        "is-windows": "1.0.1",
+        "is-windows": "1.0.2",
         "which": "1.3.0"
       }
     },
@@ -5642,37 +5852,42 @@
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
     "gulp": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz",
-      "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.0.tgz",
+      "integrity": "sha1-lXZsYB2t5Kd+0+eyttwDiBtZY2Y=",
       "dev": true,
       "requires": {
-        "archy": "1.0.0",
-        "chalk": "1.1.3",
-        "deprecated": "0.0.1",
-        "gulp-util": "3.0.8",
-        "interpret": "1.1.0",
-        "liftoff": "2.5.0",
-        "minimist": "1.2.0",
-        "orchestrator": "0.3.8",
-        "pretty-hrtime": "1.0.3",
-        "semver": "4.3.6",
-        "tildify": "1.2.0",
-        "v8flags": "2.1.1",
-        "vinyl-fs": "0.3.14"
+        "glob-watcher": "5.0.1",
+        "gulp-cli": "2.0.1",
+        "undertaker": "1.2.0",
+        "vinyl-fs": "3.0.3"
       },
       "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
-        },
-        "semver": {
-          "version": "4.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
-          "dev": true
+        "gulp-cli": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.0.1.tgz",
+          "integrity": "sha512-RxujJJdN8/O6IW2nPugl7YazhmrIEjmiVfPKrWt68r71UCaLKS71Hp0gpKT+F6qOUFtr7KqtifDKaAJPRVvMYQ==",
+          "dev": true,
+          "requires": {
+            "ansi-colors": "1.1.0",
+            "archy": "1.0.0",
+            "array-sort": "1.0.0",
+            "color-support": "1.1.3",
+            "concat-stream": "1.6.0",
+            "copy-props": "2.0.4",
+            "fancy-log": "1.3.2",
+            "gulplog": "1.0.0",
+            "interpret": "1.1.0",
+            "isobject": "3.0.1",
+            "liftoff": "2.5.0",
+            "matchdep": "2.0.0",
+            "mute-stdout": "1.0.0",
+            "pretty-hrtime": "1.0.3",
+            "replace-homedir": "1.0.0",
+            "semver-greatest-satisfied-range": "1.1.0",
+            "v8flags": "3.1.1",
+            "yargs": "7.1.0"
+          }
         }
       }
     },
@@ -5784,12 +5999,140 @@
         "through2": "2.0.3"
       },
       "dependencies": {
+        "clone": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
+          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
+          "dev": true
+        },
+        "glob": {
+          "version": "4.5.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz",
+          "integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
+          "dev": true,
+          "requires": {
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "2.0.10",
+            "once": "1.4.0"
+          }
+        },
+        "glob-stream": {
+          "version": "3.1.18",
+          "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz",
+          "integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=",
+          "dev": true,
+          "requires": {
+            "glob": "4.5.3",
+            "glob2base": "0.0.12",
+            "minimatch": "2.0.10",
+            "ordered-read-streams": "0.1.0",
+            "through2": "0.6.5",
+            "unique-stream": "1.0.0"
+          },
+          "dependencies": {
+            "isarray": {
+              "version": "0.0.1",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+              "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+              "dev": true
+            },
+            "readable-stream": {
+              "version": "1.0.34",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+              "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+              "dev": true,
+              "requires": {
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "0.0.1",
+                "string_decoder": "0.10.31"
+              }
+            },
+            "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
+            },
+            "through2": {
+              "version": "0.6.5",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+              "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+              "dev": true,
+              "requires": {
+                "readable-stream": "1.0.34",
+                "xtend": "4.0.1"
+              }
+            }
+          }
+        },
+        "glob-watcher": {
+          "version": "0.0.6",
+          "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz",
+          "integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=",
+          "dev": true,
+          "requires": {
+            "gaze": "0.5.2"
+          }
+        },
+        "graceful-fs": {
+          "version": "3.0.11",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
+          "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
+          "dev": true,
+          "requires": {
+            "natives": "1.1.4"
+          }
+        },
+        "gulp": {
+          "version": "3.9.1",
+          "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz",
+          "integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=",
+          "dev": true,
+          "requires": {
+            "archy": "1.0.0",
+            "chalk": "1.1.3",
+            "deprecated": "0.0.1",
+            "gulp-util": "3.0.8",
+            "interpret": "1.1.0",
+            "liftoff": "2.5.0",
+            "minimist": "1.2.0",
+            "orchestrator": "0.3.8",
+            "pretty-hrtime": "1.0.3",
+            "semver": "4.3.6",
+            "tildify": "1.2.0",
+            "v8flags": "2.1.1",
+            "vinyl-fs": "0.3.14"
+          }
+        },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "dev": true
         },
+        "minimatch": {
+          "version": "2.0.10",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz",
+          "integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "1.1.11"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        },
+        "ordered-read-streams": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
+          "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=",
+          "dev": true
+        },
         "process-nextick-args": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
@@ -5811,6 +6154,12 @@
             "util-deprecate": "1.0.2"
           }
         },
+        "semver": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
+          "dev": true
+        },
         "string_decoder": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
@@ -5820,6 +6169,16 @@
             "safe-buffer": "5.1.1"
           }
         },
+        "strip-bom": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+          "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=",
+          "dev": true,
+          "requires": {
+            "first-chunk-stream": "1.0.0",
+            "is-utf8": "0.2.1"
+          }
+        },
         "through2": {
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
@@ -5830,6 +6189,83 @@
             "xtend": "4.0.1"
           }
         },
+        "unique-stream": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
+          "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=",
+          "dev": true
+        },
+        "v8flags": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
+          "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
+          "dev": true,
+          "requires": {
+            "user-home": "1.1.1"
+          }
+        },
+        "vinyl": {
+          "version": "0.4.6",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
+          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
+          "dev": true,
+          "requires": {
+            "clone": "0.2.0",
+            "clone-stats": "0.0.1"
+          }
+        },
+        "vinyl-fs": {
+          "version": "0.3.14",
+          "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz",
+          "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=",
+          "dev": true,
+          "requires": {
+            "defaults": "1.0.3",
+            "glob-stream": "3.1.18",
+            "glob-watcher": "0.0.6",
+            "graceful-fs": "3.0.11",
+            "mkdirp": "0.5.1",
+            "strip-bom": "1.0.0",
+            "through2": "0.6.5",
+            "vinyl": "0.4.6"
+          },
+          "dependencies": {
+            "isarray": {
+              "version": "0.0.1",
+              "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+              "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+              "dev": true
+            },
+            "readable-stream": {
+              "version": "1.0.34",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+              "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+              "dev": true,
+              "requires": {
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "0.0.1",
+                "string_decoder": "0.10.31"
+              }
+            },
+            "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
+            },
+            "through2": {
+              "version": "0.6.5",
+              "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+              "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+              "dev": true,
+              "requires": {
+                "readable-stream": "1.0.34",
+                "xtend": "4.0.1"
+              }
+            }
+          }
+        },
         "xtend": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
@@ -5838,6 +6274,72 @@
         }
       }
     },
+    "gulp-file": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-file/-/gulp-file-0.4.0.tgz",
+      "integrity": "sha1-RRNWoqxQicbbkaBEQlKgVDZXAGs=",
+      "dev": true,
+      "requires": {
+        "through2": "0.4.2",
+        "vinyl": "2.2.0"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
+          "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
+          "dev": true
+        },
+        "clone-stats": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+          "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "replace-ext": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+          "dev": true
+        },
+        "through2": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
+          "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.0.34",
+            "xtend": "2.1.2"
+          }
+        },
+        "vinyl": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
+          "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
+          "dev": true,
+          "requires": {
+            "clone": "2.1.1",
+            "clone-buffer": "1.0.0",
+            "clone-stats": "1.0.0",
+            "cloneable-readable": "1.0.0",
+            "remove-trailing-separator": "1.1.0",
+            "replace-ext": "1.0.0"
+          }
+        }
+      }
+    },
     "gulp-inject-string": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/gulp-inject-string/-/gulp-inject-string-1.1.1.tgz",
@@ -5848,22 +6350,99 @@
         "plugin-error": "0.1.2"
       }
     },
-    "gulp-merge": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/gulp-merge/-/gulp-merge-0.1.1.tgz",
-      "integrity": "sha1-pGLuARd6jqfEYPDqia1ULsdSujc=",
+    "gulp-json-editor": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/gulp-json-editor/-/gulp-json-editor-2.4.2.tgz",
+      "integrity": "sha512-mUPSsibfnRT04Iy9AfrvC8kfcJZJFYt5qfr6TTQHHBZ1qviz2qqfAf7DLS2Frp33ycyZJvm6n9cwNgV00A95TA==",
       "dev": true,
       "requires": {
-        "through2": "1.1.1"
+        "deepmerge": "2.1.1",
+        "detect-indent": "5.0.0",
+        "js-beautify": "1.7.5",
+        "plugin-error": "1.0.1",
+        "through2": "2.0.3"
       },
       "dependencies": {
-        "through2": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
-          "integrity": "sha1-CEfLxESfNAVXTb3M2buEG4OsNUU=",
+        "detect-indent": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz",
+          "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=",
+          "dev": true
+        },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
           "dev": true,
           "requires": {
-            "readable-stream": "1.1.14",
+            "assign-symbols": "1.0.0",
+            "is-extendable": "1.0.1"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "2.0.4"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "plugin-error": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+          "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+          "dev": true,
+          "requires": {
+            "ansi-colors": "1.1.0",
+            "arr-diff": "4.0.0",
+            "arr-union": "3.1.0",
+            "extend-shallow": "3.0.2"
+          }
+        },
+        "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==",
+          "dev": true
+        },
+        "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,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "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.2"
+          }
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "through2": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2.3.6",
             "xtend": "4.0.1"
           }
         },
@@ -5881,70 +6460,10 @@
       "integrity": "sha1-QEeTkUnWk1u1K0tWxyarwnjzb9Q=",
       "dev": true
     },
-    "gulp-plumber": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.2.0.tgz",
-      "integrity": "sha1-GOoDkSye5IP4pUmZc7WVTNkPatg=",
-      "dev": true,
-      "requires": {
-        "chalk": "1.1.3",
-        "fancy-log": "1.3.2",
-        "plugin-error": "0.1.2",
-        "through2": "2.0.3"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        },
-        "through2": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
-          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "2.3.3",
-            "xtend": "4.0.1"
-          }
-        },
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-          "dev": true
-        }
-      }
-    },
     "gulp-rename": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz",
-      "integrity": "sha1-OtRCh2PwXidk3sHGfYaNsnVoeBc=",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.4.0.tgz",
+      "integrity": "sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg==",
       "dev": true
     },
     "gulp-util": {
@@ -6034,20 +6553,22 @@
       }
     },
     "gulp-watch": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-watch/-/gulp-watch-5.0.0.tgz",
-      "integrity": "sha1-b7A6sXNZcuDShmR1tWhVWDbf0Os=",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/gulp-watch/-/gulp-watch-5.0.1.tgz",
+      "integrity": "sha512-HnTSBdzAOFIT4wmXYPDUn783TaYAq9bpaN05vuZNP5eni3z3aRx0NAKbjhhMYtcq76x4R1wf4oORDGdlrEjuog==",
       "dev": true,
       "requires": {
+        "ansi-colors": "1.1.0",
         "anymatch": "1.3.2",
         "chokidar": "2.0.2",
+        "fancy-log": "1.3.2",
         "glob-parent": "3.1.0",
-        "gulp-util": "3.0.8",
         "object-assign": "4.1.1",
         "path-is-absolute": "1.0.1",
-        "readable-stream": "2.3.3",
+        "plugin-error": "1.0.1",
+        "readable-stream": "2.3.6",
         "slash": "1.0.0",
-        "vinyl": "2.1.0",
+        "vinyl": "2.2.0",
         "vinyl-file": "2.0.0"
       },
       "dependencies": {
@@ -6063,24 +6584,61 @@
           "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
           "dev": true
         },
+        "extend-shallow": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+          "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+          "dev": true,
+          "requires": {
+            "assign-symbols": "1.0.0",
+            "is-extendable": "1.0.1"
+          }
+        },
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "dev": true,
+          "requires": {
+            "is-plain-object": "2.0.4"
+          }
+        },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "dev": true
         },
+        "plugin-error": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
+          "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
+          "dev": true,
+          "requires": {
+            "ansi-colors": "1.1.0",
+            "arr-diff": "4.0.0",
+            "arr-union": "3.1.0",
+            "extend-shallow": "3.0.2"
+          }
+        },
+        "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==",
+          "dev": true
+        },
         "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
+          "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,
           "requires": {
             "core-util-is": "1.0.2",
             "inherits": "2.0.3",
             "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
+            "process-nextick-args": "2.0.0",
             "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
@@ -6091,18 +6649,18 @@
           "dev": true
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+          "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.1"
           }
         },
         "vinyl": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz",
-          "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
+          "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
           "dev": true,
           "requires": {
             "clone": "2.1.1",
@@ -6139,9 +6697,9 @@
       }
     },
     "has": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
-      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dev": true,
       "requires": {
         "function-bind": "1.1.1"
@@ -6170,6 +6728,12 @@
         "sparkles": "1.0.0"
       }
     },
+    "has-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
+      "dev": true
+    },
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
@@ -6208,12 +6772,13 @@
       }
     },
     "hash-base": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
-      "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
       "dev": true,
       "requires": {
-        "inherits": "2.0.3"
+        "inherits": "2.0.3",
+        "safe-buffer": "5.1.1"
       }
     },
     "hash-sum": {
@@ -6223,24 +6788,13 @@
       "dev": true
     },
     "hash.js": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-      "integrity": "sha1-NA3tvmKQGHFRweodd3o0SJNd+EY=",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz",
+      "integrity": "sha512-A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw==",
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
-        "minimalistic-assert": "1.0.0"
-      }
-    },
-    "hawk": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
-      "integrity": "sha1-r02RTrBl+bXOTZ0RwcshJu7MMDg=",
-      "requires": {
-        "boom": "4.3.1",
-        "cryptiles": "3.1.2",
-        "hoek": "4.2.0",
-        "sntp": "2.1.0"
+        "minimalistic-assert": "1.0.1"
       }
     },
     "he": {
@@ -6255,16 +6809,11 @@
       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
       "dev": true,
       "requires": {
-        "hash.js": "1.1.3",
-        "minimalistic-assert": "1.0.0",
+        "hash.js": "1.1.4",
+        "minimalistic-assert": "1.0.1",
         "minimalistic-crypto-utils": "1.0.1"
       }
     },
-    "hoek": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-      "integrity": "sha1-ctnQdU9/4lyi0BrY+PmpRJqJUm0="
-    },
     "home-or-tmp": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
@@ -6302,57 +6851,40 @@
       "dev": true
     },
     "html-minifier": {
-      "version": "3.5.12",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.12.tgz",
-      "integrity": "sha512-+N778qLf0RWBscD0TPGoYdeGNDZ0s76/0pQhY1/409EOudcENkm9IbSkk37RDyPdg/09GVHTKotU4ya93RF1Gg==",
+      "version": "3.5.18",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.18.tgz",
+      "integrity": "sha512-sczoq/9zeXiKZMj8tsQzHJE7EyjrpMHvblTLuh9o8h5923a6Ts5uQ/3YdY+xIqJYRjzHQPlrHjfjh0BtwPJG0g==",
       "dev": true,
       "requires": {
         "camel-case": "3.0.0",
         "clean-css": "4.1.11",
-        "commander": "2.15.1",
+        "commander": "2.16.0",
         "he": "1.1.1",
-        "ncname": "1.0.0",
         "param-case": "2.1.1",
         "relateurl": "0.2.7",
-        "uglify-js": "3.3.16"
+        "uglify-js": "3.4.3"
       },
       "dependencies": {
         "commander": {
-          "version": "2.15.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-          "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+          "version": "2.16.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
+          "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
           "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "uglify-js": {
-          "version": "3.3.16",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.16.tgz",
-          "integrity": "sha512-FMh5SRqJRGhv9BbaTffENIpDDQIoPDR8DBraunGORGhySArsXlw9++CN+BWzPBLpoI4RcSnpfGPnilTxWL3Vvg==",
-          "dev": true,
-          "requires": {
-            "commander": "2.15.1",
-            "source-map": "0.6.1"
-          }
         }
       }
     },
     "html-webpack-plugin": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.0.7.tgz",
-      "integrity": "sha1-tGB09qdueRWB/+m7BZpytFLZmQc=",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
+      "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=",
       "dev": true,
       "requires": {
-        "html-minifier": "3.5.12",
+        "html-minifier": "3.5.18",
         "loader-utils": "0.2.17",
-        "lodash": "4.17.5",
+        "lodash": "4.17.10",
         "pretty-error": "2.1.1",
         "tapable": "1.0.0",
-        "toposort": "1.0.6",
+        "toposort": "1.0.7",
         "util.promisify": "1.0.0"
       },
       "dependencies": {
@@ -6367,12 +6899,6 @@
             "json5": "0.5.1",
             "object-assign": "4.1.1"
           }
-        },
-        "tapable": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz",
-          "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==",
-          "dev": true
         }
       }
     },
@@ -6428,10 +6954,13 @@
       "dev": true
     },
     "iconv-lite": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-      "integrity": "sha1-90aPYBNfXl2tM5nAqBvpoWA6CCs=",
-      "dev": true
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "2.1.2"
+      }
     },
     "icss-replace-symbols": {
       "version": "1.1.0",
@@ -6445,78 +6974,67 @@
       "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.16"
+        "postcss": "6.0.23"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha1-tepI78nBeT3MybR2fJORTT8tUro=",
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.0",
+            "ansi-styles": "3.2.1",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.5.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "4.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-              "dev": true,
-              "requires": {
-                "has-flag": "2.0.0"
-              }
-            }
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
         "postcss": {
-          "version": "6.0.16",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
-          "integrity": "sha1-ES4v4qbSEJvglXaHJDFw6lWJ4UY=",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
+            "chalk": "2.4.1",
             "source-map": "0.6.1",
-            "supports-color": "5.1.0"
+            "supports-color": "5.4.0"
           }
         },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
         "supports-color": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
-          "integrity": "sha1-BYoCHRthn33fOYDXEuo1kM5949U=",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
     },
     "ieee754": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
-      "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz",
+      "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==",
       "dev": true
     },
     "iferr": {
@@ -6526,9 +7044,9 @@
       "dev": true
     },
     "ignore": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
-      "integrity": "sha1-YSKJv7PCIOGGpYEYYY1b6MG6sCE=",
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
       "dev": true
     },
     "immediate": {
@@ -6590,16 +7108,16 @@
     "inquirer": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
-      "integrity": "sha1-ndLyrXZdyrH/BEO0kUQqILoifck=",
+      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "3.0.0",
-        "chalk": "2.3.2",
+        "ansi-escapes": "3.1.0",
+        "chalk": "2.4.1",
         "cli-cursor": "2.1.0",
         "cli-width": "2.2.0",
-        "external-editor": "2.1.0",
+        "external-editor": "2.2.0",
         "figures": "2.0.0",
-        "lodash": "4.17.5",
+        "lodash": "4.17.10",
         "mute-stream": "0.0.7",
         "run-async": "2.3.0",
         "rx-lite": "4.0.8",
@@ -6618,21 +7136,21 @@
         "ansi-styles": {
           "version": "3.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-          "integrity": "sha1-JQ3JawdJG/1gHmSNZt319gx6XGU=",
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.1",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "5.3.0"
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
@@ -6650,7 +7168,7 @@
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
             "is-fullwidth-code-point": "2.0.0",
@@ -6667,9 +7185,9 @@
           }
         },
         "supports-color": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-          "integrity": "sha1-WySsFduA+pJ89SJ6SjP9PEx2dsA=",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
             "has-flag": "3.0.0"
@@ -6700,11 +7218,11 @@
     "is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha1-OV4a6EsR8mrReV5zwXN45IowFXY=",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
       "dev": true,
       "requires": {
         "is-relative": "1.0.0",
-        "is-windows": "1.0.1"
+        "is-windows": "1.0.2"
       }
     },
     "is-absolute-url": {
@@ -6751,9 +7269,9 @@
       }
     },
     "is-callable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
-      "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
       "dev": true
     },
     "is-data-descriptor": {
@@ -6840,23 +7358,11 @@
         "is-extglob": "2.1.1"
       }
     },
-    "is-my-json-valid": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz",
-      "integrity": "sha1-PamJFKcKIvCoVj7xURokbG/FVHE=",
-      "requires": {
-        "generate-function": "2.0.0",
-        "generate-object-property": "1.2.0",
-        "jsonpointer": "4.0.1",
-        "xtend": "4.0.1"
-      },
-      "dependencies": {
-        "xtend": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
-        }
-      }
+    "is-negated-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
+      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
+      "dev": true
     },
     "is-number": {
       "version": "3.0.0",
@@ -6944,24 +7450,19 @@
       "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
       "dev": true
     },
-    "is-property": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ="
-    },
     "is-regex": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
       "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
       "dev": true,
       "requires": {
-        "has": "1.0.1"
+        "has": "1.0.3"
       }
     },
     "is-relative": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha1-obtpNc6MXboei5dUubLcwCDiJg0=",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
       "dev": true,
       "requires": {
         "is-unc-path": "1.0.0"
@@ -6970,7 +7471,7 @@
     "is-resolvable": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha1-+xj4fOH+uSUWnJpAfBkxijIG7Yg=",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
       "dev": true
     },
     "is-stream": {
@@ -7002,7 +7503,7 @@
     "is-unc-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha1-1zHoiY7QkKEsNSrS6u1Qla0yLJ0=",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
       "dev": true,
       "requires": {
         "unc-path-regex": "0.1.2"
@@ -7013,10 +7514,16 @@
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
     },
+    "is-valid-glob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
+      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
+      "dev": true
+    },
     "is-windows": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz",
-      "integrity": "sha1-MQ23D3QtJZoWo2kgK1GvhCMzENk=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true
     },
     "isarray": {
@@ -7048,9 +7555,21 @@
       "dev": true
     },
     "js-base64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.1.tgz",
-      "integrity": "sha1-4CgTGBzVMAKIjpGJNUZ6yykQ5ZY="
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.5.tgz",
+      "integrity": "sha512-aUnNwqMOXw3yvErjMPSQu6qIIzUmT1e5KcU1OZxRDU1g/am6mzBvcrmLAYwzmB59BHPrh5/tKaiF4OPhqRWESQ=="
+    },
+    "js-beautify": {
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.7.5.tgz",
+      "integrity": "sha512-9OhfAqGOrD7hoQBLJMTA+BKuKmoEtTJXzZ7WDF/9gvjtey1koVLuZqIY6c51aPDjbNdNtIXAkiWKVhziawE9Og==",
+      "dev": true,
+      "requires": {
+        "config-chain": "1.1.11",
+        "editorconfig": "0.13.3",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6"
+      }
     },
     "js-tokens": {
       "version": "3.0.2",
@@ -7083,7 +7602,7 @@
     "json-loader": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
-      "integrity": "sha1-3KFKcCNf+C8KyaOr62DTN6NlGF0=",
+      "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
       "dev": true
     },
     "json-schema": {
@@ -7096,6 +7615,14 @@
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
       "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
     },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "requires": {
+        "jsonify": "0.0.0"
+      }
+    },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -7122,10 +7649,10 @@
         "graceful-fs": "4.1.11"
       }
     },
-    "jsonpointer": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk="
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
     },
     "jsprim": {
       "version": "1.4.1",
@@ -7138,6 +7665,12 @@
         "verror": "1.10.0"
       }
     },
+    "just-debounce": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
+      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
+      "dev": true
+    },
     "kind-of": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
@@ -7153,6 +7686,16 @@
         "graceful-fs": "4.1.11"
       }
     },
+    "last-run": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
+      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
+      "dev": true,
+      "requires": {
+        "default-resolution": "2.0.0",
+        "es6-weak-map": "2.0.2"
+      }
+    },
     "lazy-cache": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz",
@@ -7217,6 +7760,15 @@
         "invert-kv": "1.0.0"
       }
     },
+    "lead": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
+      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
+      "dev": true,
+      "requires": {
+        "flush-write-stream": "1.0.3"
+      }
+    },
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -7306,9 +7858,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.5",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
-      "integrity": "sha1-maktZcAnLevoyWtgV7yPv6O+1RE="
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
     },
     "lodash._basecopy": {
       "version": "3.0.1",
@@ -7421,13 +7973,13 @@
     "lodash.merge": {
       "version": "4.6.1",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
-      "integrity": "sha1-rcJdnLmbk5HFliTzefu6YNcRHVQ=",
+      "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==",
       "dev": true
     },
     "lodash.mergewith": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz",
-      "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU="
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
+      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ=="
     },
     "lodash.restparam": {
       "version": "3.6.1",
@@ -7483,45 +8035,45 @@
     "log-symbols": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha1-V0Dhxdbw39pK2TI7UzIQfva0xAo=",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
       "dev": true,
       "requires": {
-        "chalk": "2.3.0"
+        "chalk": "2.4.1"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha1-tepI78nBeT3MybR2fJORTT8tUro=",
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.0",
+            "ansi-styles": "3.2.1",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.5.0"
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -7562,39 +8114,22 @@
       "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
       "dev": true
     },
-    "macaddress": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz",
-      "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=",
-      "dev": true
-    },
     "make-dir": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz",
-      "integrity": "sha1-GbQ2n+SMEW9Twq+VrRAsDjnoXVE=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
       "dev": true,
       "requires": {
         "pify": "3.0.0"
       }
     },
     "make-iterator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.0.tgz",
-      "integrity": "sha1-V7713IXSOSO6I3ZzJNjo+PPZaUs=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
       "dev": true,
       "requires": {
-        "kind-of": "3.2.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
-        }
+        "kind-of": "6.0.2"
       }
     },
     "map-cache": {
@@ -7623,10 +8158,22 @@
         "object-visit": "1.0.1"
       }
     },
+    "matchdep": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
+      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
+      "dev": true,
+      "requires": {
+        "findup-sync": "2.0.0",
+        "micromatch": "3.1.5",
+        "resolve": "1.5.0",
+        "stack-trace": "0.0.10"
+      }
+    },
     "material-colors": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.5.tgz",
-      "integrity": "sha1-UpJZPmdUyxvMK5gDDk4Najr8nqE=",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
+      "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==",
       "dev": true
     },
     "math-expression-evaluator": {
@@ -7635,6 +8182,12 @@
       "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=",
       "dev": true
     },
+    "math-random": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
+      "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
+      "dev": true
+    },
     "md5.js": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz",
@@ -7643,18 +8196,6 @@
       "requires": {
         "hash-base": "3.0.4",
         "inherits": "2.0.3"
-      },
-      "dependencies": {
-        "hash-base": {
-          "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-          "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.3",
-            "safe-buffer": "5.1.1"
-          }
-        }
       }
     },
     "mem": {
@@ -7663,7 +8204,7 @@
       "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
       "dev": true,
       "requires": {
-        "mimic-fn": "1.1.0"
+        "mimic-fn": "1.2.0"
       }
     },
     "memory-fs": {
@@ -7673,7 +8214,7 @@
       "dev": true,
       "requires": {
         "errno": "0.1.7",
-        "readable-stream": "2.3.4"
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -7685,13 +8226,13 @@
         "process-nextick-args": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=",
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.4",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz",
-          "integrity": "sha1-yUbD9H+n2Oq8C2FQ9KEvaaRXQHE=",
+          "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,
           "requires": {
             "core-util-is": "1.0.2",
@@ -7699,14 +8240,14 @@
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
             "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+          "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.1"
@@ -7762,7 +8303,7 @@
     "miller-rabin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha1-8IA1HIZbDcViqEYpZtqlNUPHik0=",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
@@ -7783,15 +8324,15 @@
       }
     },
     "mimic-fn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
-      "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
       "dev": true
     },
     "minimalistic-assert": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
-      "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
       "dev": true
     },
     "minimalistic-crypto-utils": {
@@ -7831,15 +8372,6 @@
         "through2": "2.0.3"
       },
       "dependencies": {
-        "end-of-stream": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-          "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-          "dev": true,
-          "requires": {
-            "once": "1.4.0"
-          }
-        },
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -7863,9 +8395,9 @@
           }
         },
         "readable-stream": {
-          "version": "2.3.5",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
+          "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,
           "requires": {
             "core-util-is": "1.0.2",
@@ -7873,14 +8405,14 @@
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
             "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "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.1"
@@ -7892,7 +8424,7 @@
           "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
           "dev": true,
           "requires": {
-            "readable-stream": "2.3.5",
+            "readable-stream": "2.3.6",
             "xtend": "4.0.1"
           }
         },
@@ -7980,6 +8512,12 @@
         "duplexer2": "0.0.2"
       }
     },
+    "mute-stdout": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.0.tgz",
+      "integrity": "sha1-WzLqB+tDyd7WEwQ0z5JvRrKn/U0=",
+      "dev": true
+    },
     "mute-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
@@ -7989,7 +8527,9 @@
     "nan": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
-      "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo="
+      "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=",
+      "dev": true,
+      "optional": true
     },
     "nanomatch": {
       "version": "1.2.7",
@@ -8019,9 +8559,9 @@
       }
     },
     "natives": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz",
-      "integrity": "sha1-ARrM4ffL2H97prMJPWzZOSvhxXQ=",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz",
+      "integrity": "sha512-Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg==",
       "dev": true
     },
     "natural-compare": {
@@ -8030,15 +8570,6 @@
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
-    "ncname": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz",
-      "integrity": "sha1-W1etGLHKCShk72Kwse2BlPODtxw=",
-      "dev": true,
-      "requires": {
-        "xml-char-classes": "1.0.0"
-      }
-    },
     "nedb": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/nedb/-/nedb-1.8.0.tgz",
@@ -8059,9 +8590,9 @@
       }
     },
     "neo-async": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.0.tgz",
-      "integrity": "sha1-drHIIxMMyias+6zMj7rwovozsY8=",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz",
+      "integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==",
       "dev": true
     },
     "no-case": {
@@ -8074,136 +8605,42 @@
       }
     },
     "node-abi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.2.0.tgz",
-      "integrity": "sha1-6AKseiQI4sBZP7MXb/34qZqbTew=",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.4.3.tgz",
+      "integrity": "sha512-b656V5C0628gOOA2kwcpNA/bxdlqYF9FvxJ+qqVX0ctdXNVZpS8J6xEUYir3WAKc7U0BH/NRlSpNbGsy+azjeg==",
       "dev": true,
       "requires": {
         "semver": "5.5.0"
       }
     },
     "node-gyp": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
-      "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz",
+      "integrity": "sha512-qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg==",
       "requires": {
         "fstream": "1.0.11",
         "glob": "7.1.2",
         "graceful-fs": "4.1.11",
-        "minimatch": "3.0.4",
         "mkdirp": "0.5.1",
         "nopt": "3.0.6",
         "npmlog": "4.1.2",
-        "osenv": "0.1.4",
-        "request": "2.83.0",
+        "osenv": "0.1.5",
+        "request": "2.81.0",
         "rimraf": "2.6.2",
         "semver": "5.3.0",
         "tar": "2.2.1",
         "which": "1.3.0"
       },
       "dependencies": {
-        "semver": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
-        }
-      }
-    },
-    "node-libs-browser": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
-      "integrity": "sha1-X5QmPUBPbkR2fXJpAf/wVHjWAN8=",
-      "dev": true,
-      "requires": {
-        "assert": "1.4.1",
-        "browserify-zlib": "0.2.0",
-        "buffer": "4.9.1",
-        "console-browserify": "1.1.0",
-        "constants-browserify": "1.0.0",
-        "crypto-browserify": "3.12.0",
-        "domain-browser": "1.2.0",
-        "events": "1.1.1",
-        "https-browserify": "1.0.0",
-        "os-browserify": "0.3.0",
-        "path-browserify": "0.0.0",
-        "process": "0.11.10",
-        "punycode": "1.4.1",
-        "querystring-es3": "0.2.1",
-        "readable-stream": "2.3.4",
-        "stream-browserify": "2.0.1",
-        "stream-http": "2.8.0",
-        "string_decoder": "1.0.3",
-        "timers-browserify": "2.0.6",
-        "tty-browserify": "0.0.0",
-        "url": "0.11.0",
-        "util": "0.10.3",
-        "vm-browserify": "0.0.4"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.4",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz",
-          "integrity": "sha1-yUbD9H+n2Oq8C2FQ9KEvaaRXQHE=",
-          "dev": true,
+        "ajv": {
+          "version": "4.11.8",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+          "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
           "requires": {
-            "core-util-is": "1.0.2",
-            "inherits": "2.0.3",
-            "isarray": "1.0.0",
-            "process-nextick-args": "2.0.0",
-            "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
-            "util-deprecate": "1.0.2"
+            "co": "4.6.0",
+            "json-stable-stringify": "1.0.1"
           }
         },
-        "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.1.1"
-          }
-        }
-      }
-    },
-    "node-sass": {
-      "version": "4.7.2",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.2.tgz",
-      "integrity": "sha1-k2Z3i6FGnrAUOKnoWS9CYry2eU4=",
-      "requires": {
-        "async-foreach": "0.1.3",
-        "chalk": "1.1.3",
-        "cross-spawn": "3.0.1",
-        "gaze": "1.1.2",
-        "get-stdin": "4.0.1",
-        "glob": "7.1.2",
-        "in-publish": "2.0.0",
-        "lodash.assign": "4.2.0",
-        "lodash.clonedeep": "4.5.0",
-        "lodash.mergewith": "4.6.0",
-        "meow": "3.7.0",
-        "mkdirp": "0.5.1",
-        "nan": "2.8.0",
-        "node-gyp": "3.6.2",
-        "npmlog": "4.1.2",
-        "request": "2.79.0",
-        "sass-graph": "2.2.4",
-        "stdout-stream": "1.4.0",
-        "true-case-path": "1.0.2"
-      },
-      "dependencies": {
         "assert-plus": {
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
@@ -8222,11 +8659,6 @@
             "hoek": "2.16.3"
           }
         },
-        "caseless": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-          "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c="
-        },
         "cryptiles": {
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
@@ -8245,33 +8677,18 @@
             "mime-types": "2.1.17"
           }
         },
-        "gaze": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
-          "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
-          "requires": {
-            "globule": "1.2.0"
-          }
-        },
-        "globule": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
-          "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
-          "requires": {
-            "glob": "7.1.2",
-            "lodash": "4.17.5",
-            "minimatch": "3.0.4"
-          }
+        "har-schema": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
+          "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4="
         },
         "har-validator": {
-          "version": "2.0.6",
-          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
-          "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
+          "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
           "requires": {
-            "chalk": "1.1.3",
-            "commander": "2.14.1",
-            "is-my-json-valid": "2.17.1",
-            "pinkie-promise": "2.0.1"
+            "ajv": "4.11.8",
+            "har-schema": "1.0.5"
           }
         },
         "hawk": {
@@ -8300,24 +8717,29 @@
             "sshpk": "1.13.1"
           }
         },
+        "performance-now": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+          "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
+        },
         "qs": {
-          "version": "6.3.2",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw="
+          "version": "6.4.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
+          "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM="
         },
         "request": {
-          "version": "2.79.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
-          "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
+          "version": "2.81.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
+          "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
           "requires": {
             "aws-sign2": "0.6.0",
             "aws4": "1.6.0",
-            "caseless": "0.11.0",
+            "caseless": "0.12.0",
             "combined-stream": "1.0.6",
             "extend": "3.0.1",
             "forever-agent": "0.6.1",
             "form-data": "2.1.4",
-            "har-validator": "2.0.6",
+            "har-validator": "4.2.1",
             "hawk": "3.1.3",
             "http-signature": "1.1.1",
             "is-typedarray": "1.0.0",
@@ -8325,13 +8747,20 @@
             "json-stringify-safe": "5.0.1",
             "mime-types": "2.1.17",
             "oauth-sign": "0.8.2",
-            "qs": "6.3.2",
+            "performance-now": "0.2.0",
+            "qs": "6.4.0",
+            "safe-buffer": "5.1.1",
             "stringstream": "0.0.5",
             "tough-cookie": "2.3.3",
-            "tunnel-agent": "0.4.3",
+            "tunnel-agent": "0.6.0",
             "uuid": "3.2.1"
           }
         },
+        "semver": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
+        },
         "sntp": {
           "version": "1.0.9",
           "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
@@ -8339,11 +8768,144 @@
           "requires": {
             "hoek": "2.16.3"
           }
+        }
+      }
+    },
+    "node-libs-browser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz",
+      "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==",
+      "dev": true,
+      "requires": {
+        "assert": "1.4.1",
+        "browserify-zlib": "0.2.0",
+        "buffer": "4.9.1",
+        "console-browserify": "1.1.0",
+        "constants-browserify": "1.0.0",
+        "crypto-browserify": "3.12.0",
+        "domain-browser": "1.2.0",
+        "events": "1.1.1",
+        "https-browserify": "1.0.0",
+        "os-browserify": "0.3.0",
+        "path-browserify": "0.0.0",
+        "process": "0.11.10",
+        "punycode": "1.4.1",
+        "querystring-es3": "0.2.1",
+        "readable-stream": "2.3.6",
+        "stream-browserify": "2.0.1",
+        "stream-http": "2.8.3",
+        "string_decoder": "1.1.1",
+        "timers-browserify": "2.0.10",
+        "tty-browserify": "0.0.0",
+        "url": "0.11.0",
+        "util": "0.10.4",
+        "vm-browserify": "0.0.4"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
         },
-        "tunnel-agent": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
+        "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==",
+          "dev": true
+        },
+        "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,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "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.2"
+          }
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        }
+      }
+    },
+    "node-sass": {
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.2.tgz",
+      "integrity": "sha512-LdxoJLZutx0aQXHtWIYwJKMj+9pTjneTcLWJgzf2XbGu0q5pRNqW5QvFCEdm3mc5rJOdru/mzln5d0EZLacf6g==",
+      "requires": {
+        "async-foreach": "0.1.3",
+        "chalk": "1.1.3",
+        "cross-spawn": "3.0.1",
+        "gaze": "1.1.3",
+        "get-stdin": "4.0.1",
+        "glob": "7.1.2",
+        "in-publish": "2.0.0",
+        "lodash.assign": "4.2.0",
+        "lodash.clonedeep": "4.5.0",
+        "lodash.mergewith": "4.6.1",
+        "meow": "3.7.0",
+        "mkdirp": "0.5.1",
+        "nan": "2.10.0",
+        "node-gyp": "3.7.0",
+        "npmlog": "4.1.2",
+        "request": "2.87.0",
+        "sass-graph": "2.2.4",
+        "stdout-stream": "1.4.0",
+        "true-case-path": "1.0.2"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
+          "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
+          "requires": {
+            "lru-cache": "4.1.3",
+            "which": "1.3.0"
+          }
+        },
+        "gaze": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz",
+          "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
+          "requires": {
+            "globule": "1.2.1"
+          }
+        },
+        "globule": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
+          "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==",
+          "requires": {
+            "glob": "7.1.2",
+            "lodash": "4.17.10",
+            "minimatch": "3.0.4"
+          }
+        },
+        "lru-cache": {
+          "version": "4.1.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
+          "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
+          "requires": {
+            "pseudomap": "1.0.2",
+            "yallist": "2.1.2"
+          }
+        },
+        "nan": {
+          "version": "2.10.0",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+          "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
         }
       }
     },
@@ -8393,6 +8955,15 @@
         "sort-keys": "1.1.2"
       }
     },
+    "now-and-later": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.0.tgz",
+      "integrity": "sha1-vGHLtFbXnLMiB85HygUTb/Ln1u4=",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0"
+      }
+    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@@ -8405,9 +8976,9 @@
     "npmlog": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
+      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
       "requires": {
-        "are-we-there-yet": "1.1.4",
+        "are-we-there-yet": "1.1.5",
         "console-control-strings": "1.1.0",
         "gauge": "2.7.4",
         "set-blocking": "2.0.0"
@@ -8432,7 +9003,7 @@
         "minimist": "1.2.0",
         "pretty-bytes": "1.0.4",
         "progress-stream": "1.2.0",
-        "request": "2.83.0",
+        "request": "2.87.0",
         "single-line-log": "1.1.2",
         "throttleit": "0.0.2"
       },
@@ -8549,6 +9120,26 @@
         "isobject": "3.0.1"
       }
     },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "function-bind": "1.1.1",
+        "has-symbols": "1.0.0",
+        "object-keys": "1.0.12"
+      },
+      "dependencies": {
+        "object-keys": {
+          "version": "1.0.12",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
+          "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
+          "dev": true
+        }
+      }
+    },
     "object.defaults": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
@@ -8568,7 +9159,7 @@
       "dev": true,
       "requires": {
         "define-properties": "1.1.2",
-        "es-abstract": "1.10.0"
+        "es-abstract": "1.12.0"
       }
     },
     "object.map": {
@@ -8578,7 +9169,7 @@
       "dev": true,
       "requires": {
         "for-own": "1.0.0",
-        "make-iterator": "1.0.0"
+        "make-iterator": "1.0.1"
       }
     },
     "object.omit": {
@@ -8611,6 +9202,16 @@
         "isobject": "3.0.1"
       }
     },
+    "object.reduce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
+      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
+      "dev": true,
+      "requires": {
+        "for-own": "1.0.0",
+        "make-iterator": "1.0.1"
+      }
+    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -8625,7 +9226,7 @@
       "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
       "dev": true,
       "requires": {
-        "mimic-fn": "1.1.0"
+        "mimic-fn": "1.2.0"
       }
     },
     "optionator": {
@@ -8645,48 +9246,48 @@
     "ora": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz",
-      "integrity": "sha1-iERYIVs6XUCXWSKF+TMhu3p54uU=",
+      "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==",
       "dev": true,
       "requires": {
-        "chalk": "2.3.0",
+        "chalk": "2.4.1",
         "cli-cursor": "2.1.0",
-        "cli-spinners": "1.1.0",
+        "cli-spinners": "1.3.1",
         "log-symbols": "2.2.0"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha1-tepI78nBeT3MybR2fJORTT8tUro=",
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.0",
+            "ansi-styles": "3.2.1",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.5.0"
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
         "supports-color": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -8699,14 +9300,75 @@
       "requires": {
         "end-of-stream": "0.1.5",
         "sequencify": "0.0.7",
-        "stream-consume": "0.1.0"
+        "stream-consume": "0.1.1"
+      },
+      "dependencies": {
+        "end-of-stream": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz",
+          "integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=",
+          "dev": true,
+          "requires": {
+            "once": "1.3.3"
+          }
+        },
+        "once": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+          "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        }
       }
     },
     "ordered-read-streams": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
-      "integrity": "sha1-/VZamvjrRHO6abbtijQ1LLVS8SY=",
-      "dev": true
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
+      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
+      "dev": true,
+      "requires": {
+        "readable-stream": "2.3.6"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "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==",
+          "dev": true
+        },
+        "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,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "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.2"
+          }
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        }
+      }
     },
     "os-browserify": {
       "version": "0.3.0",
@@ -8733,9 +9395,9 @@
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "osenv": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
-      "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
       "requires": {
         "os-homedir": "1.0.2",
         "os-tmpdir": "1.0.2"
@@ -8748,9 +9410,9 @@
       "dev": true
     },
     "p-limit": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
-      "integrity": "sha1-DpK2vty1nwIsE9DxlJ3ILRWQnxw=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
       "dev": true,
       "requires": {
         "p-try": "1.0.0"
@@ -8762,7 +9424,7 @@
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
       "requires": {
-        "p-limit": "1.2.0"
+        "p-limit": "1.3.0"
       }
     },
     "p-map": {
@@ -8780,7 +9442,7 @@
     "pako": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
-      "integrity": "sha1-AQEhG6pwxLykoPY/Igbpe3368lg=",
+      "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==",
       "dev": true
     },
     "parallel-transform": {
@@ -8791,7 +9453,7 @@
       "requires": {
         "cyclist": "0.2.2",
         "inherits": "2.0.3",
-        "readable-stream": "2.3.5"
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -8807,9 +9469,9 @@
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.5",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
-          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
+          "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,
           "requires": {
             "core-util-is": "1.0.2",
@@ -8817,14 +9479,14 @@
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
             "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "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.1"
@@ -8842,16 +9504,16 @@
       }
     },
     "parse-asn1": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
-      "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
+      "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
       "dev": true,
       "requires": {
         "asn1.js": "4.10.1",
-        "browserify-aes": "1.1.1",
-        "create-hash": "1.1.3",
+        "browserify-aes": "1.2.0",
+        "create-hash": "1.2.0",
         "evp_bytestokey": "1.0.3",
-        "pbkdf2": "3.0.14"
+        "pbkdf2": "3.0.16"
       }
     },
     "parse-filepath": {
@@ -8997,16 +9659,16 @@
       }
     },
     "pbkdf2": {
-      "version": "3.0.14",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
-      "integrity": "sha1-o14TxkeZsGzhUyD0WcIw5o5zut4=",
+      "version": "3.0.16",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz",
+      "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==",
       "dev": true,
       "requires": {
-        "create-hash": "1.1.3",
-        "create-hmac": "1.1.6",
-        "ripemd160": "2.0.1",
+        "create-hash": "1.2.0",
+        "create-hmac": "1.1.7",
+        "ripemd160": "2.0.2",
         "safe-buffer": "5.1.1",
-        "sha.js": "2.4.10"
+        "sha.js": "2.4.11"
       }
     },
     "pend": {
@@ -9103,13 +9765,13 @@
     "pluralize": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz",
-      "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=",
+      "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==",
       "dev": true
     },
     "popper.js": {
-      "version": "1.12.9",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.12.9.tgz",
-      "integrity": "sha1-DfvC3/lsRRuzMu3Pz6r1ZtMx1bM=",
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.3.tgz",
+      "integrity": "sha1-FDj5jQRqz3tNeM1QK/QYrGTU8JU=",
       "dev": true
     },
     "posix-character-classes": {
@@ -9121,11 +9783,11 @@
     "postcss": {
       "version": "5.2.18",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
-      "integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
+      "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
       "dev": true,
       "requires": {
         "chalk": "1.1.3",
-        "js-base64": "2.4.1",
+        "js-base64": "2.4.5",
         "source-map": "0.5.7",
         "supports-color": "3.2.3"
       },
@@ -9220,13 +9882,12 @@
       }
     },
     "postcss-filter-plugins": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz",
-      "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz",
+      "integrity": "sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==",
       "dev": true,
       "requires": {
-        "postcss": "5.2.18",
-        "uniqid": "4.1.1"
+        "postcss": "5.2.18"
       }
     },
     "postcss-load-config": {
@@ -9267,7 +9928,7 @@
       "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
       "dev": true,
       "requires": {
-        "has": "1.0.1",
+        "has": "1.0.3",
         "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       }
@@ -9291,7 +9952,7 @@
         "caniuse-api": "1.6.1",
         "postcss": "5.2.18",
         "postcss-selector-parser": "2.2.3",
-        "vendors": "1.0.1"
+        "vendors": "1.0.2"
       },
       "dependencies": {
         "browserslist": {
@@ -9300,8 +9961,8 @@
           "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
           "dev": true,
           "requires": {
-            "caniuse-db": "1.0.30000810",
-            "electron-to-chromium": "1.3.31"
+            "caniuse-db": "1.0.30000862",
+            "electron-to-chromium": "1.3.51"
           }
         }
       }
@@ -9352,7 +10013,7 @@
       "dev": true,
       "requires": {
         "alphanum-sort": "1.0.2",
-        "has": "1.0.1",
+        "has": "1.0.3",
         "postcss": "5.2.18",
         "postcss-selector-parser": "2.2.3"
       }
@@ -9363,70 +10024,59 @@
       "integrity": "sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=",
       "dev": true,
       "requires": {
-        "postcss": "6.0.16"
+        "postcss": "6.0.23"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha1-tepI78nBeT3MybR2fJORTT8tUro=",
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.0",
+            "ansi-styles": "3.2.1",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.5.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "4.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-              "dev": true,
-              "requires": {
-                "has-flag": "2.0.0"
-              }
-            }
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
         "postcss": {
-          "version": "6.0.16",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
-          "integrity": "sha1-ES4v4qbSEJvglXaHJDFw6lWJ4UY=",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
+            "chalk": "2.4.1",
             "source-map": "0.6.1",
-            "supports-color": "5.1.0"
+            "supports-color": "5.4.0"
           }
         },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
         "supports-color": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
-          "integrity": "sha1-BYoCHRthn33fOYDXEuo1kM5949U=",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -9438,70 +10088,59 @@
       "dev": true,
       "requires": {
         "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.16"
+        "postcss": "6.0.23"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha1-tepI78nBeT3MybR2fJORTT8tUro=",
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.0",
+            "ansi-styles": "3.2.1",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.5.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "4.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-              "dev": true,
-              "requires": {
-                "has-flag": "2.0.0"
-              }
-            }
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
         "postcss": {
-          "version": "6.0.16",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
-          "integrity": "sha1-ES4v4qbSEJvglXaHJDFw6lWJ4UY=",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
+            "chalk": "2.4.1",
             "source-map": "0.6.1",
-            "supports-color": "5.1.0"
+            "supports-color": "5.4.0"
           }
         },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
         "supports-color": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
-          "integrity": "sha1-BYoCHRthn33fOYDXEuo1kM5949U=",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -9513,70 +10152,59 @@
       "dev": true,
       "requires": {
         "css-selector-tokenizer": "0.7.0",
-        "postcss": "6.0.16"
+        "postcss": "6.0.23"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha1-tepI78nBeT3MybR2fJORTT8tUro=",
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.0",
+            "ansi-styles": "3.2.1",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.5.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "4.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-              "dev": true,
-              "requires": {
-                "has-flag": "2.0.0"
-              }
-            }
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
         "postcss": {
-          "version": "6.0.16",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
-          "integrity": "sha1-ES4v4qbSEJvglXaHJDFw6lWJ4UY=",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
+            "chalk": "2.4.1",
             "source-map": "0.6.1",
-            "supports-color": "5.1.0"
+            "supports-color": "5.4.0"
           }
         },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
         "supports-color": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
-          "integrity": "sha1-BYoCHRthn33fOYDXEuo1kM5949U=",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -9588,70 +10216,59 @@
       "dev": true,
       "requires": {
         "icss-replace-symbols": "1.1.0",
-        "postcss": "6.0.16"
+        "postcss": "6.0.23"
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-          "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=",
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
-          "integrity": "sha1-tepI78nBeT3MybR2fJORTT8tUro=",
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "3.2.0",
+            "ansi-styles": "3.2.1",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "4.5.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "4.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
-              "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
-              "dev": true,
-              "requires": {
-                "has-flag": "2.0.0"
-              }
-            }
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
         "postcss": {
-          "version": "6.0.16",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.16.tgz",
-          "integrity": "sha1-ES4v4qbSEJvglXaHJDFw6lWJ4UY=",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.0",
+            "chalk": "2.4.1",
             "source-map": "0.6.1",
-            "supports-color": "5.1.0"
+            "supports-color": "5.4.0"
           }
         },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
         "supports-color": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
-          "integrity": "sha1-BYoCHRthn33fOYDXEuo1kM5949U=",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
           }
         }
       }
@@ -9712,7 +10329,7 @@
       "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
       "dev": true,
       "requires": {
-        "has": "1.0.1",
+        "has": "1.0.3",
         "postcss": "5.2.18",
         "postcss-value-parser": "3.3.0"
       }
@@ -9763,7 +10380,7 @@
       "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
       "dev": true,
       "requires": {
-        "has": "1.0.1",
+        "has": "1.0.3",
         "postcss": "5.2.18",
         "uniqs": "2.0.0"
       }
@@ -9787,9 +10404,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.11.1.tgz",
-      "integrity": "sha1-YeQ/xM1E5o8rDfwsOM1LsPzNzHU=",
+      "version": "1.13.7",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.13.7.tgz",
+      "integrity": "sha512-KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w==",
       "dev": true
     },
     "pretty-bytes": {
@@ -9833,7 +10450,8 @@
     "process-nextick-args": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
-      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+      "dev": true
     },
     "progress": {
       "version": "2.0.0",
@@ -9857,6 +10475,12 @@
       "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
       "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
+    },
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -9869,15 +10493,15 @@
       "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "public-encrypt": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
-      "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz",
+      "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==",
       "dev": true,
       "requires": {
         "bn.js": "4.11.8",
         "browserify-rsa": "4.0.1",
-        "create-hash": "1.1.3",
-        "parse-asn1": "5.1.0",
+        "create-hash": "1.2.0",
+        "parse-asn1": "5.1.1",
         "randombytes": "2.0.6"
       }
     },
@@ -9946,9 +10570,9 @@
       "dev": true
     },
     "qs": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "integrity": "sha1-NJzfbu+J7EXBLX1es/wMhwNDptg="
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
     },
     "query-string": {
       "version": "4.3.4",
@@ -9973,30 +10597,28 @@
       "dev": true
     },
     "randomatic": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-      "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
+      "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
       "dev": true,
       "requires": {
-        "is-number": "3.0.0",
-        "kind-of": "4.0.0"
+        "is-number": "4.0.0",
+        "kind-of": "6.0.2",
+        "math-random": "1.0.1"
       },
       "dependencies": {
-        "kind-of": {
+        "is-number": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
         }
       }
     },
     "randombytes": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz",
-      "integrity": "sha1-0wLFIpSFiISKjTAMkytEwkIx2oA=",
+      "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==",
       "dev": true,
       "requires": {
         "safe-buffer": "5.1.1"
@@ -10005,7 +10627,7 @@
     "randomfill": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha1-ySGW/IarQr6YPxvzF3giSTHWFFg=",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
       "dev": true,
       "requires": {
         "randombytes": "2.0.6",
@@ -10206,7 +10828,7 @@
     "regex-cache": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
       "dev": true,
       "requires": {
         "is-equal-shallow": "0.1.3"
@@ -10221,6 +10843,12 @@
         "extend-shallow": "2.0.1"
       }
     },
+    "regexpp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-1.1.0.tgz",
+      "integrity": "sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==",
+      "dev": true
+    },
     "regexpu-core": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
@@ -10261,6 +10889,81 @@
       "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
       "dev": true
     },
+    "remove-bom-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
+      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
+      "dev": true,
+      "requires": {
+        "is-buffer": "1.1.6",
+        "is-utf8": "0.2.1"
+      }
+    },
+    "remove-bom-stream": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
+      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
+      "dev": true,
+      "requires": {
+        "remove-bom-buffer": "3.0.0",
+        "safe-buffer": "5.1.1",
+        "through2": "2.0.3"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "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==",
+          "dev": true
+        },
+        "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,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "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.2"
+          }
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "through2": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2.3.6",
+            "xtend": "4.0.1"
+          }
+        },
+        "xtend": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+          "dev": true
+        }
+      }
+    },
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -10314,10 +11017,21 @@
       "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=",
       "dev": true
     },
+    "replace-homedir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
+      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
+      "dev": true,
+      "requires": {
+        "homedir-polyfill": "1.0.1",
+        "is-absolute": "1.0.0",
+        "remove-trailing-separator": "1.1.0"
+      }
+    },
     "request": {
-      "version": "2.83.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
-      "integrity": "sha1-ygtl2gLtYpNYh4COb1EDgQNOM1Y=",
+      "version": "2.87.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
+      "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
       "requires": {
         "aws-sign2": "0.7.0",
         "aws4": "1.6.0",
@@ -10325,9 +11039,8 @@
         "combined-stream": "1.0.6",
         "extend": "3.0.1",
         "forever-agent": "0.6.1",
-        "form-data": "2.3.1",
+        "form-data": "2.3.2",
         "har-validator": "5.0.3",
-        "hawk": "6.0.2",
         "http-signature": "1.2.0",
         "is-typedarray": "1.0.0",
         "isstream": "0.1.2",
@@ -10335,14 +11048,33 @@
         "mime-types": "2.1.17",
         "oauth-sign": "0.8.2",
         "performance-now": "2.1.0",
-        "qs": "6.5.1",
+        "qs": "6.5.2",
         "safe-buffer": "5.1.1",
-        "stringstream": "0.0.5",
         "tough-cookie": "2.3.3",
         "tunnel-agent": "0.6.0",
         "uuid": "3.2.1"
       }
     },
+    "request-promise-core": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz",
+      "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.10"
+      }
+    },
+    "request-promise-native": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz",
+      "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=",
+      "dev": true,
+      "requires": {
+        "request-promise-core": "1.1.1",
+        "stealthy-require": "1.1.1",
+        "tough-cookie": "2.3.3"
+      }
+    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -10394,6 +11126,15 @@
       "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=",
       "dev": true
     },
+    "resolve-options": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
+      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
+      "dev": true,
+      "requires": {
+        "value-or-function": "3.0.0"
+      }
+    },
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -10428,12 +11169,12 @@
       }
     },
     "ripemd160": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
-      "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "dev": true,
       "requires": {
-        "hash-base": "2.0.2",
+        "hash-base": "3.0.4",
         "inherits": "2.0.3"
       }
     },
@@ -10471,9 +11212,9 @@
       }
     },
     "rxjs": {
-      "version": "5.5.6",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.6.tgz",
-      "integrity": "sha1-4x+5bW/S/x/YS86orpwC0AcXnAI=",
+      "version": "5.5.11",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz",
+      "integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==",
       "dev": true,
       "requires": {
         "symbol-observable": "1.0.1"
@@ -10484,34 +11225,40 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
       "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
     },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
     "sass-graph": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
       "requires": {
         "glob": "7.1.2",
-        "lodash": "4.17.5",
+        "lodash": "4.17.10",
         "scss-tokenizer": "0.2.3",
         "yargs": "7.1.0"
       }
     },
     "sass-loader": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.6.tgz",
-      "integrity": "sha1-6dXmwfFV+qMqSybXqbcQfCJeQPk=",
+      "version": "6.0.7",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-6.0.7.tgz",
+      "integrity": "sha512-JoiyD00Yo1o61OJsoP2s2kb19L1/Y2p3QFcCdWdF6oomBGKVYuZyqHWemRBfQ2uGYsk+CH3eCguXNfpjzlcpaA==",
       "dev": true,
       "requires": {
-        "async": "2.6.0",
-        "clone-deep": "0.3.0",
+        "clone-deep": "2.0.2",
         "loader-utils": "1.1.0",
         "lodash.tail": "4.1.1",
+        "neo-async": "2.5.1",
         "pify": "3.0.0"
       }
     },
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
       "dev": true
     },
     "schema-utils": {
@@ -10520,25 +11267,38 @@
       "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
       "dev": true,
       "requires": {
-        "ajv": "6.3.0",
-        "ajv-keywords": "3.1.0"
+        "ajv": "6.5.2",
+        "ajv-keywords": "3.2.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.3.0.tgz",
-          "integrity": "sha1-FlCkERTvAFdMrBC4Ay2PTBSBLac=",
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz",
+          "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "1.0.0",
+            "fast-deep-equal": "2.0.1",
             "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.3.1"
+            "json-schema-traverse": "0.4.1",
+            "uri-js": "4.2.2"
           }
         },
         "ajv-keywords": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz",
-          "integrity": "sha1-rCsnk5xUPpXSwG5/f1wnvkqlQ74=",
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
+          "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
+          "dev": true
+        },
+        "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
+        },
+        "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
         }
       }
@@ -10548,7 +11308,7 @@
       "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "requires": {
-        "js-base64": "2.4.1",
+        "js-base64": "2.4.5",
         "source-map": "0.4.4"
       },
       "dependencies": {
@@ -10565,7 +11325,16 @@
     "semver": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs="
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
+    },
+    "semver-greatest-satisfied-range": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
+      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
+      "dev": true,
+      "requires": {
+        "sver-compat": "1.5.0"
+      }
     },
     "sequencify": {
       "version": "0.0.7",
@@ -10574,9 +11343,9 @@
       "dev": true
     },
     "serialize-javascript": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz",
-      "integrity": "sha1-fJWFFNtqwkQ6irwGLcn3iGp/YAU=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz",
+      "integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==",
       "dev": true
     },
     "set-blocking": {
@@ -10618,9 +11387,9 @@
       "dev": true
     },
     "sha.js": {
-      "version": "2.4.10",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.10.tgz",
-      "integrity": "sha1-sf3lzX0RpWJmOKB8YEq5Cc+jH5s=",
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
@@ -10628,30 +11397,20 @@
       }
     },
     "shallow-clone": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
-      "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
+      "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
       "dev": true,
       "requires": {
         "is-extendable": "0.1.1",
-        "kind-of": "2.0.1",
-        "lazy-cache": "0.2.7",
+        "kind-of": "5.1.0",
         "mixin-object": "2.0.1"
       },
       "dependencies": {
         "kind-of": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
-          "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "1.1.6"
-          }
-        },
-        "lazy-cache": {
-          "version": "0.2.7",
-          "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
-          "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
         }
       }
@@ -10700,7 +11459,7 @@
     "slice-ansi": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
-      "integrity": "sha1-BE8aSdiEL/MHqta1Be0Xi9lQE00=",
+      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
       "dev": true,
       "requires": {
         "is-fullwidth-code-point": "2.0.0"
@@ -10829,14 +11588,6 @@
         }
       }
     },
-    "sntp": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
-      "integrity": "sha1-LGzsFP7cIiJznK+bXD2F0cxaLMg=",
-      "requires": {
-        "hoek": "4.2.0"
-      }
-    },
     "sort-keys": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
@@ -10849,7 +11600,7 @@
     "source-list-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
-      "integrity": "sha1-qqR0A/eyRakvvJfqCPJQ1gh+0IU=",
+      "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
       "dev": true
     },
     "source-map": {
@@ -10874,7 +11625,7 @@
     "source-map-support": {
       "version": "0.4.18",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
-      "integrity": "sha1-Aoam3ovkJkEzhZTpfM6nXwosWF8=",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
       "dev": true,
       "requires": {
         "source-map": "0.5.7"
@@ -10895,12 +11646,12 @@
     "spawn-rx": {
       "version": "2.0.12",
       "resolved": "https://registry.npmjs.org/spawn-rx/-/spawn-rx-2.0.12.tgz",
-      "integrity": "sha1-tihSlEmUJgib7qDDwewy1/xXo3Y=",
+      "integrity": "sha512-gOPXiQQFQ9lTOLuys0iMn3jfxxv9c7zzwhbYLOEbQGvEShHVJ5sSR1oD3Daj88os7jKArDYT7rbOKdvNhe7iEg==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
         "lodash.assign": "4.2.0",
-        "rxjs": "5.5.6"
+        "rxjs": "5.5.11"
       }
     },
     "spdx-correct": {
@@ -10996,6 +11747,12 @@
         "safe-buffer": "5.1.1"
       }
     },
+    "stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "dev": true
+    },
     "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -11079,7 +11836,7 @@
       "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz",
       "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
       "requires": {
-        "readable-stream": "2.3.3"
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -11087,30 +11844,41 @@
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
         },
+        "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=="
+        },
         "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
+          "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.2",
             "inherits": "2.0.3",
             "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
+            "process-nextick-args": "2.0.0",
             "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+          "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.1"
           }
         }
       }
     },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+      "dev": true
+    },
     "stream-browserify": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
@@ -11118,7 +11886,7 @@
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
-        "readable-stream": "2.3.4"
+        "readable-stream": "2.3.6"
       },
       "dependencies": {
         "isarray": {
@@ -11130,13 +11898,13 @@
         "process-nextick-args": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=",
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.4",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz",
-          "integrity": "sha1-yUbD9H+n2Oq8C2FQ9KEvaaRXQHE=",
+          "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,
           "requires": {
             "core-util-is": "1.0.2",
@@ -11144,14 +11912,14 @@
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
             "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+          "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.1"
@@ -11169,9 +11937,9 @@
       }
     },
     "stream-consume": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
-      "integrity": "sha1-pB6tGm1ggc63n2WwYZAbbY89HQ8=",
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz",
+      "integrity": "sha512-tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg==",
       "dev": true
     },
     "stream-each": {
@@ -11182,28 +11950,23 @@
       "requires": {
         "end-of-stream": "1.4.1",
         "stream-shift": "1.0.0"
-      },
-      "dependencies": {
-        "end-of-stream": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
-          "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-          "dev": true,
-          "requires": {
-            "once": "1.4.0"
-          }
-        }
       }
     },
+    "stream-exhaust": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
+      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
+      "dev": true
+    },
     "stream-http": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz",
-      "integrity": "sha1-/YZUbaybHJGv+PxdKHuY+vtBvBA=",
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
       "dev": true,
       "requires": {
         "builtin-status-codes": "3.0.0",
         "inherits": "2.0.3",
-        "readable-stream": "2.3.4",
+        "readable-stream": "2.3.6",
         "to-arraybuffer": "1.0.1",
         "xtend": "4.0.1"
       },
@@ -11217,13 +11980,13 @@
         "process-nextick-args": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-          "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=",
+          "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
           "dev": true
         },
         "readable-stream": {
-          "version": "2.3.4",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.4.tgz",
-          "integrity": "sha1-yUbD9H+n2Oq8C2FQ9KEvaaRXQHE=",
+          "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,
           "requires": {
             "core-util-is": "1.0.2",
@@ -11231,14 +11994,14 @@
             "isarray": "1.0.0",
             "process-nextick-args": "2.0.0",
             "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+          "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.1"
@@ -11317,7 +12080,7 @@
           "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=",
           "dev": true,
           "requires": {
-            "readable-stream": "2.3.3"
+            "readable-stream": "2.3.6"
           }
         },
         "isarray": {
@@ -11326,25 +12089,31 @@
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "dev": true
         },
+        "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==",
+          "dev": true
+        },
         "readable-stream": {
-          "version": "2.3.3",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-          "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
+          "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,
           "requires": {
             "core-util-is": "1.0.2",
             "inherits": "2.0.3",
             "isarray": "1.0.0",
-            "process-nextick-args": "1.0.7",
+            "process-nextick-args": "2.0.0",
             "safe-buffer": "5.1.1",
-            "string_decoder": "1.0.3",
+            "string_decoder": "1.1.1",
             "util-deprecate": "1.0.2"
           }
         },
         "string_decoder": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+          "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.1"
@@ -11387,6 +12156,16 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
       "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
     },
+    "sver-compat": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
+      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1"
+      }
+    },
     "svgo": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
@@ -11411,13 +12190,13 @@
     "table": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz",
-      "integrity": "sha1-ozRHN1OR52atNNNIbm4q7chNLjY=",
+      "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==",
       "dev": true,
       "requires": {
         "ajv": "5.5.2",
         "ajv-keywords": "2.1.1",
-        "chalk": "2.3.2",
-        "lodash": "4.17.5",
+        "chalk": "2.4.1",
+        "lodash": "4.17.10",
         "slice-ansi": "1.0.0",
         "string-width": "2.1.1"
       },
@@ -11431,21 +12210,21 @@
         "ansi-styles": {
           "version": "3.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-          "integrity": "sha1-JQ3JawdJG/1gHmSNZt319gx6XGU=",
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.1",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "5.3.0"
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
@@ -11463,7 +12242,7 @@
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
             "is-fullwidth-code-point": "2.0.0",
@@ -11480,9 +12259,9 @@
           }
         },
         "supports-color": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-          "integrity": "sha1-WySsFduA+pJ89SJ6SjP9PEx2dsA=",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
             "has-flag": "3.0.0"
@@ -11491,9 +12270,9 @@
       }
     },
     "tapable": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz",
-      "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.0.0.tgz",
+      "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==",
       "dev": true
     },
     "tar": {
@@ -11599,6 +12378,70 @@
         "xtend": "2.1.2"
       }
     },
+    "through2-filter": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
+      "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
+      "dev": true,
+      "requires": {
+        "through2": "2.0.3",
+        "xtend": "4.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "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==",
+          "dev": true
+        },
+        "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,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "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.2"
+          }
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "through2": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2.3.6",
+            "xtend": "4.0.1"
+          }
+        },
+        "xtend": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+          "dev": true
+        }
+      }
+    },
     "tildify": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/tildify/-/tildify-1.2.0.tgz",
@@ -11615,9 +12458,9 @@
       "dev": true
     },
     "timers-browserify": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.6.tgz",
-      "integrity": "sha1-JB52kn2coF9NlZgZAi9bNmS2S64=",
+      "version": "2.0.10",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+      "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
       "dev": true,
       "requires": {
         "setimmediate": "1.0.5"
@@ -11632,12 +12475,22 @@
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "requires": {
         "os-tmpdir": "1.0.2"
       }
     },
+    "to-absolute-glob": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
+      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
+      "dev": true,
+      "requires": {
+        "is-absolute": "1.0.0",
+        "is-negated-glob": "1.0.0"
+      }
+    },
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
@@ -11759,10 +12612,73 @@
         "repeat-string": "1.6.1"
       }
     },
+    "to-through": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
+      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
+      "dev": true,
+      "requires": {
+        "through2": "2.0.3"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "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==",
+          "dev": true
+        },
+        "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,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "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.2"
+          }
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "through2": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "2.3.6",
+            "xtend": "4.0.1"
+          }
+        },
+        "xtend": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+          "dev": true
+        }
+      }
+    },
     "toposort": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.6.tgz",
-      "integrity": "sha1-wxdI5V0hDv/AD9zcfW5o19e7nOw=",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
+      "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=",
       "dev": true
     },
     "tough-cookie": {
@@ -11841,20 +12757,20 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
-    "uglify-es": {
-      "version": "3.3.9",
-      "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
-      "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
+    "uglify-js": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.3.tgz",
+      "integrity": "sha512-RbOgGjF04sFUNSi8xGOTB9AmtVmMmVVAL5a7lxIgJ8urejJen+priq0ooRIHHa8AXI/dSvNF9yYMz9OP4PhybQ==",
       "dev": true,
       "requires": {
-        "commander": "2.13.0",
+        "commander": "2.16.0",
         "source-map": "0.6.1"
       },
       "dependencies": {
         "commander": {
-          "version": "2.13.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
-          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
+          "version": "2.16.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz",
+          "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==",
           "dev": true
         },
         "source-map": {
@@ -11873,26 +12789,42 @@
       "optional": true
     },
     "uglifyjs-webpack-plugin": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz",
-      "integrity": "sha512-z0IbjpW8b3O/OVn+TTZN4pI29RN1zktFBXLIzzfZ+++cUtZ1ERSlLWgpE/5OERuEUs1ijVQnpYAkSlpoVmQmSQ==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz",
+      "integrity": "sha512-1VicfKhCYHLS8m1DCApqBhoulnASsEoJ/BvpUpP4zoNAPpKzdH+ghk0olGJMmwX2/jprK2j3hAHdUbczBSy2FA==",
       "dev": true,
       "requires": {
         "cacache": "10.0.4",
         "find-cache-dir": "1.0.0",
         "schema-utils": "0.4.5",
-        "serialize-javascript": "1.4.0",
+        "serialize-javascript": "1.5.0",
         "source-map": "0.6.1",
         "uglify-es": "3.3.9",
         "webpack-sources": "1.1.0",
         "worker-farm": "1.6.0"
       },
       "dependencies": {
+        "commander": {
+          "version": "2.13.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
+          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "uglify-es": {
+          "version": "3.3.9",
+          "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
+          "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
+          "dev": true,
+          "requires": {
+            "commander": "2.13.0",
+            "source-map": "0.6.1"
+          }
         }
       }
     },
@@ -11907,6 +12839,29 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
       "integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ="
     },
+    "undertaker": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.0.tgz",
+      "integrity": "sha1-M52kZGJS0ILcN45wgGcpl1DhG0k=",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "1.1.0",
+        "arr-map": "2.0.2",
+        "bach": "1.2.0",
+        "collection-map": "1.0.0",
+        "es6-weak-map": "2.0.2",
+        "last-run": "1.1.1",
+        "object.defaults": "1.1.0",
+        "object.reduce": "1.0.1",
+        "undertaker-registry": "1.0.1"
+      }
+    },
+    "undertaker-registry": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
+      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
+      "dev": true
+    },
     "union-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
@@ -11939,15 +12894,6 @@
       "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
       "dev": true
     },
-    "uniqid": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz",
-      "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=",
-      "dev": true,
-      "requires": {
-        "macaddress": "0.2.8"
-      }
-    },
     "uniqs": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
@@ -11973,15 +12919,19 @@
       }
     },
     "unique-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
-      "integrity": "sha1-1ZpKdUJ0R9mqbJHnAmP40mpLEEs=",
-      "dev": true
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz",
+      "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
+      "dev": true,
+      "requires": {
+        "json-stable-stringify": "1.0.1",
+        "through2-filter": "2.0.0"
+      }
     },
     "universalify": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz",
-      "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=",
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true
     },
     "unset-value": {
@@ -12042,6 +12992,23 @@
       "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
       "dev": true
     },
+    "uri-js": {
+      "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.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+          "dev": true
+        }
+      }
+    },
     "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
@@ -12152,20 +13119,12 @@
       "dev": true
     },
     "util": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
       "dev": true,
       "requires": {
-        "inherits": "2.0.1"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        }
+        "inherits": "2.0.3"
       }
     },
     "util-deprecate": {
@@ -12195,23 +13154,23 @@
       "integrity": "sha1-EsUou51Y0LkmXZovbw/ovhf/HxQ="
     },
     "v-tooltip": {
-      "version": "2.0.0-rc.31",
-      "resolved": "https://registry.npmjs.org/v-tooltip/-/v-tooltip-2.0.0-rc.31.tgz",
-      "integrity": "sha1-vjse2EfoMJUY1B3JkVs7/f8MBII=",
+      "version": "2.0.0-rc.33",
+      "resolved": "https://registry.npmjs.org/v-tooltip/-/v-tooltip-2.0.0-rc.33.tgz",
+      "integrity": "sha1-ePfY6cNCZWIr5lup3HjGfx3AK3M=",
       "dev": true,
       "requires": {
         "lodash.merge": "4.6.1",
-        "popper.js": "1.12.9",
+        "popper.js": "1.14.3",
         "vue-resize": "0.4.4"
       }
     },
     "v8flags": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
-      "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz",
+      "integrity": "sha512-iw/1ViSEaff8NJ3HLyEjawk/8hjJib3E7pvG4pddVXfUg1983s3VGsiClDjhK64MQVDGqc1Q8r18S4VKQZS9EQ==",
       "dev": true,
       "requires": {
-        "user-home": "1.1.1"
+        "homedir-polyfill": "1.0.1"
       }
     },
     "validate-npm-package-license": {
@@ -12223,10 +13182,16 @@
         "spdx-expression-parse": "1.0.4"
       }
     },
+    "value-or-function": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
+      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
+      "dev": true
+    },
     "vendors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz",
-      "integrity": "sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz",
+      "integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==",
       "dev": true
     },
     "verror": {
@@ -12284,76 +13249,106 @@
       }
     },
     "vinyl-fs": {
-      "version": "0.3.14",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz",
-      "integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
+      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
       "dev": true,
       "requires": {
-        "defaults": "1.0.3",
-        "glob-stream": "3.1.18",
-        "glob-watcher": "0.0.6",
-        "graceful-fs": "3.0.11",
-        "mkdirp": "0.5.1",
-        "strip-bom": "1.0.0",
-        "through2": "0.6.5",
-        "vinyl": "0.4.6"
+        "fs-mkdirp-stream": "1.0.0",
+        "glob-stream": "6.1.0",
+        "graceful-fs": "4.1.11",
+        "is-valid-glob": "1.0.0",
+        "lazystream": "1.0.0",
+        "lead": "1.0.0",
+        "object.assign": "4.1.0",
+        "pumpify": "1.4.0",
+        "readable-stream": "2.3.6",
+        "remove-bom-buffer": "3.0.0",
+        "remove-bom-stream": "1.2.0",
+        "resolve-options": "1.1.0",
+        "through2": "2.0.3",
+        "to-through": "2.0.0",
+        "value-or-function": "3.0.0",
+        "vinyl": "2.2.0",
+        "vinyl-sourcemap": "1.1.0"
       },
       "dependencies": {
         "clone": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz",
-          "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=",
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
+          "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
           "dev": true
         },
-        "graceful-fs": {
-          "version": "3.0.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
-          "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
-          "dev": true,
-          "requires": {
-            "natives": "1.1.1"
-          }
+        "clone-stats": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+          "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+          "dev": true
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+          "dev": true
+        },
+        "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==",
+          "dev": true
         },
         "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "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,
           "requires": {
             "core-util-is": "1.0.2",
             "inherits": "2.0.3",
-            "isarray": "0.0.1",
-            "string_decoder": "0.10.31"
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
           }
         },
-        "strip-bom": {
+        "replace-ext": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
-          "integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+          "dev": true
+        },
+        "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==",
           "dev": true,
           "requires": {
-            "first-chunk-stream": "1.0.0",
-            "is-utf8": "0.2.1"
+            "safe-buffer": "5.1.1"
           }
         },
         "through2": {
-          "version": "0.6.5",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
-          "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+          "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
           "dev": true,
           "requires": {
-            "readable-stream": "1.0.34",
+            "readable-stream": "2.3.6",
             "xtend": "4.0.1"
           }
         },
         "vinyl": {
-          "version": "0.4.6",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz",
-          "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
+          "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
           "dev": true,
           "requires": {
-            "clone": "0.2.0",
-            "clone-stats": "0.0.1"
+            "clone": "2.1.1",
+            "clone-buffer": "1.0.0",
+            "clone-stats": "1.0.0",
+            "cloneable-readable": "1.0.0",
+            "remove-trailing-separator": "1.1.0",
+            "replace-ext": "1.0.0"
           }
         },
         "xtend": {
@@ -12364,6 +13359,55 @@
         }
       }
     },
+    "vinyl-sourcemap": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
+      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
+      "dev": true,
+      "requires": {
+        "append-buffer": "1.0.2",
+        "convert-source-map": "1.5.1",
+        "graceful-fs": "4.1.11",
+        "normalize-path": "2.1.1",
+        "now-and-later": "2.0.0",
+        "remove-bom-buffer": "3.0.0",
+        "vinyl": "2.2.0"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
+          "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
+          "dev": true
+        },
+        "clone-stats": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+          "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+          "dev": true
+        },
+        "replace-ext": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
+          "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+          "dev": true
+        },
+        "vinyl": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
+          "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
+          "dev": true,
+          "requires": {
+            "clone": "2.1.1",
+            "clone-buffer": "1.0.0",
+            "clone-stats": "1.0.0",
+            "cloneable-readable": "1.0.0",
+            "remove-trailing-separator": "1.1.0",
+            "replace-ext": "1.0.0"
+          }
+        }
+      }
+    },
     "vinyl-sourcemaps-apply": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
@@ -12383,50 +13427,50 @@
       }
     },
     "vue": {
-      "version": "2.5.13",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.13.tgz",
-      "integrity": "sha1-lb0x4g7896fzkjnJqmeHzoz1eOE=",
+      "version": "2.5.17",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.17.tgz",
+      "integrity": "sha512-mFbcWoDIJi0w0Za4emyLiW72Jae0yjANHbCVquMKijcavBGypqlF7zHRgMa5k4sesdv7hv2rB4JPdZfR+TPfhQ==",
       "dev": true
     },
     "vue-codemirror": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/vue-codemirror/-/vue-codemirror-4.0.3.tgz",
-      "integrity": "sha1-g3IQMeH2BvQoE2o9/Z/HEP/ewUk=",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/vue-codemirror/-/vue-codemirror-4.0.5.tgz",
+      "integrity": "sha512-VeLTG6/c/8+q46XT7Uoeiiwtb18+USSEY7uajG3dtfWS4tkA/R8PDKUdTwI1xJh7rnAMMtZ8tlQGASUoA5Yebw==",
       "dev": true,
       "requires": {
-        "codemirror": "5.35.0",
-        "diff-match-patch": "1.0.0"
+        "codemirror": "5.39.2",
+        "diff-match-patch": "1.0.1"
       }
     },
     "vue-color": {
-      "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/vue-color/-/vue-color-2.4.5.tgz",
-      "integrity": "sha1-kE6PG8YtEH5LyFis1+XYNglNE10=",
+      "version": "2.4.6",
+      "resolved": "https://registry.npmjs.org/vue-color/-/vue-color-2.4.6.tgz",
+      "integrity": "sha512-kGz1LNu1DKIcT8jQmUeSjQNqh9NGYBCvMFXU43MRF4kg7A33Z4tZMQFLrPrX7d8r3ptbmLq+MaclJiVQFMCMqg==",
       "dev": true,
       "requires": {
         "lodash.throttle": "4.1.1",
-        "material-colors": "1.2.5",
+        "material-colors": "1.2.6",
         "tinycolor2": "1.4.1"
       }
     },
     "vue-eslint-parser": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz",
-      "integrity": "sha1-wmjJbG2Uz+PZOKX3WTlZsMozYNE=",
+      "integrity": "sha512-ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw==",
       "dev": true,
       "requires": {
         "debug": "3.1.0",
         "eslint-scope": "3.7.1",
         "eslint-visitor-keys": "1.0.0",
-        "espree": "3.5.2",
-        "esquery": "1.0.0",
-        "lodash": "4.17.5"
+        "espree": "3.5.4",
+        "esquery": "1.0.1",
+        "lodash": "4.17.10"
       },
       "dependencies": {
         "debug": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
             "ms": "2.0.0"
@@ -12437,23 +13481,23 @@
     "vue-hot-reload-api": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz",
-      "integrity": "sha1-l5dhQkBdE9jvrhVHSeiMTjWM+SY=",
+      "integrity": "sha512-2j/t+wIbyVMP5NvctQoSUvLkYKoWAAk2QlQiilrM2a6/ulzFgdcLUJfTvs4XQ/3eZhHiBmmEojbjmM4AzZj8JA==",
       "dev": true
     },
     "vue-loader": {
-      "version": "13.7.1",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-13.7.1.tgz",
-      "integrity": "sha1-2QCdCr05K07+i4+x9UL2cjsC3To=",
+      "version": "13.7.2",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-13.7.2.tgz",
+      "integrity": "sha512-pgFWFsUjYO1v+J+3r7K0Q4lCp0eOyI24/q9j+cCudWyCTjgpjpcAa1MdwjlDUUettt9xkkUBbQ9fkAN1NC8t9w==",
       "dev": true,
       "requires": {
         "consolidate": "0.14.5",
         "hash-sum": "1.0.2",
         "loader-utils": "1.1.0",
-        "lru-cache": "4.1.1",
-        "postcss": "6.0.19",
+        "lru-cache": "4.1.3",
+        "postcss": "6.0.23",
         "postcss-load-config": "1.2.0",
         "postcss-selector-parser": "2.2.3",
-        "prettier": "1.11.1",
+        "prettier": "1.13.7",
         "resolve": "1.5.0",
         "source-map": "0.6.1",
         "vue-hot-reload-api": "2.3.0",
@@ -12464,21 +13508,21 @@
         "ansi-styles": {
           "version": "3.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
-            "color-convert": "1.9.1"
+            "color-convert": "1.9.2"
           }
         },
         "chalk": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz",
-          "integrity": "sha1-JQ3JawdJG/1gHmSNZt319gx6XGU=",
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
           "dev": true,
           "requires": {
             "ansi-styles": "3.2.1",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "5.3.0"
+            "supports-color": "5.4.0"
           }
         },
         "has-flag": {
@@ -12488,9 +13532,9 @@
           "dev": true
         },
         "lru-cache": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-          "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=",
+          "version": "4.1.3",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
+          "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
           "dev": true,
           "requires": {
             "pseudomap": "1.0.2",
@@ -12498,26 +13542,26 @@
           }
         },
         "postcss": {
-          "version": "6.0.19",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.19.tgz",
-          "integrity": "sha1-dqeDhvZwudlJSmVb8jrAEu/9FVU=",
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
           "dev": true,
           "requires": {
-            "chalk": "2.3.2",
+            "chalk": "2.4.1",
             "source-map": "0.6.1",
-            "supports-color": "5.3.0"
+            "supports-color": "5.4.0"
           }
         },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
         "supports-color": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz",
-          "integrity": "sha1-WySsFduA+pJ89SJ6SjP9PEx2dsA=",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
           "dev": true,
           "requires": {
             "has-flag": "3.0.0"
@@ -12526,21 +13570,21 @@
       }
     },
     "vue-material-design-icons": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-1.1.0.tgz",
-      "integrity": "sha1-FpK6sd2y8WNpvLX3NEA3/cOpPTY=",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/vue-material-design-icons/-/vue-material-design-icons-1.6.0.tgz",
+      "integrity": "sha1-oGJe4jqJkkGHlr2xhK2NiAD8qhk=",
       "dev": true
     },
     "vue-resize": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-0.4.4.tgz",
-      "integrity": "sha1-3um43RsYnn4/bsR/hsYGlKJBuxc=",
+      "integrity": "sha512-Lb/cnE2N9Y42ZJPw8wpjkpuX5a9ReerWNGcQRcbNCwfCnkHG6++FurNNmLIdU8dcCTH4c5rtTPdxBqFoRMK2cQ==",
       "dev": true
     },
     "vue-style-loader": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.1.2.tgz",
-      "integrity": "sha1-a2atNJmPyVIMLx5NX6QJFkHBWXo=",
+      "integrity": "sha512-ICtVdK/p+qXWpdSs2alWtsXt9YnDoYjQe0w5616j9+/EhjoxZkbun34uWgsMFnC1MhrMMwaWiImz3K2jK1Yp2Q==",
       "dev": true,
       "requires": {
         "hash-sum": "1.0.2",
@@ -12548,9 +13592,9 @@
       }
     },
     "vue-template-compiler": {
-      "version": "2.5.13",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.13.tgz",
-      "integrity": "sha1-EqKqDs1hWKxeXxTSlLCZPzmcPTg=",
+      "version": "2.5.17",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.17.tgz",
+      "integrity": "sha512-63uI4syCwtGR5IJvZM0LN5tVsahrelomHtCxvRkZPJ/Tf3ADm1U1wG6KWycK3qCfqR+ygM5vewUvmJ0REAYksg==",
       "dev": true,
       "requires": {
         "de-indent": "1.0.2",
@@ -12560,30 +13604,30 @@
     "vue-template-es2015-compiler": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz",
-      "integrity": "sha1-3EJpcTMwLOMBdSQ1amxht7abShg=",
+      "integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==",
       "dev": true
     },
     "watchpack": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.5.0.tgz",
-      "integrity": "sha1-Ix54Ovgwoi+JZvZcTEusyBQHLu0=",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
       "dev": true,
       "requires": {
         "chokidar": "2.0.2",
         "graceful-fs": "4.1.11",
-        "neo-async": "2.5.0"
+        "neo-async": "2.5.1"
       }
     },
     "webpack": {
-      "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.11.0.tgz",
-      "integrity": "sha1-d9pFGx17SxF62vQaGpO1dC8k2JQ=",
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
+      "integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
       "dev": true,
       "requires": {
-        "acorn": "5.5.0",
+        "acorn": "5.7.1",
         "acorn-dynamic-import": "2.0.2",
-        "ajv": "6.2.0",
-        "ajv-keywords": "3.1.0",
+        "ajv": "6.5.2",
+        "ajv-keywords": "3.2.0",
         "async": "2.6.0",
         "enhanced-resolve": "3.4.1",
         "escope": "3.6.0",
@@ -12599,26 +13643,27 @@
         "supports-color": "4.5.0",
         "tapable": "0.2.8",
         "uglifyjs-webpack-plugin": "0.4.6",
-        "watchpack": "1.5.0",
+        "watchpack": "1.6.0",
         "webpack-sources": "1.1.0",
         "yargs": "8.0.2"
       },
       "dependencies": {
         "ajv": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.2.0.tgz",
-          "integrity": "sha1-r6wpW7qgFSRJ5SJ0LkVHwa6TKNI=",
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz",
+          "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==",
           "dev": true,
           "requires": {
-            "fast-deep-equal": "1.0.0",
+            "fast-deep-equal": "2.0.1",
             "fast-json-stable-stringify": "2.0.0",
-            "json-schema-traverse": "0.3.1"
+            "json-schema-traverse": "0.4.1",
+            "uri-js": "4.2.2"
           }
         },
         "ajv-keywords": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz",
-          "integrity": "sha1-rCsnk5xUPpXSwG5/f1wnvkqlQ74=",
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
+          "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
           "dev": true
         },
         "ansi-regex": {
@@ -12628,9 +13673,26 @@
           "dev": true
         },
         "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+          "dev": true
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "dev": true,
+          "requires": {
+            "center-align": "0.1.3",
+            "right-align": "0.1.3",
+            "wordwrap": "0.0.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
         },
         "has-flag": {
@@ -12639,10 +13701,10 @@
           "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
           "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=",
+        "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
         },
         "load-json-file": {
@@ -12660,7 +13722,7 @@
         "os-locale": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
-          "integrity": "sha1-QrwpAKa1uL0XN2yOiCtlr8zyS/I=",
+          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
           "dev": true,
           "requires": {
             "execa": "0.7.0",
@@ -12707,20 +13769,28 @@
         "string-width": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
             "is-fullwidth-code-point": "2.0.0",
             "strip-ansi": "4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "3.0.0"
+          },
+          "dependencies": {
+            "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
+            },
+            "strip-ansi": {
+              "version": "4.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "3.0.0"
+              }
+            }
           }
         },
         "strip-bom": {
@@ -12738,6 +13808,12 @@
             "has-flag": "2.0.0"
           }
         },
+        "tapable": {
+          "version": "0.2.8",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz",
+          "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=",
+          "dev": true
+        },
         "uglify-js": {
           "version": "2.8.29",
           "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
@@ -12749,23 +13825,6 @@
             "yargs": "3.10.0"
           },
           "dependencies": {
-            "camelcase": {
-              "version": "1.2.1",
-              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-              "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
-              "dev": true
-            },
-            "cliui": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
-              "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
-              "dev": true,
-              "requires": {
-                "center-align": "0.1.3",
-                "right-align": "0.1.3",
-                "wordwrap": "0.0.2"
-              }
-            },
             "yargs": {
               "version": "3.10.0",
               "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
@@ -12822,6 +13881,38 @@
             "which-module": "2.0.0",
             "y18n": "3.2.1",
             "yargs-parser": "7.0.0"
+          },
+          "dependencies": {
+            "camelcase": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+              "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+              "dev": true
+            },
+            "cliui": {
+              "version": "3.2.0",
+              "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+              "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+              "dev": true,
+              "requires": {
+                "string-width": "1.0.2",
+                "strip-ansi": "3.0.1",
+                "wrap-ansi": "2.1.0"
+              },
+              "dependencies": {
+                "string-width": {
+                  "version": "1.0.2",
+                  "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+                  "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+                  "dev": true,
+                  "requires": {
+                    "code-point-at": "1.1.0",
+                    "is-fullwidth-code-point": "1.0.0",
+                    "strip-ansi": "3.0.1"
+                  }
+                }
+              }
+            }
           }
         },
         "yargs-parser": {
@@ -12831,6 +13922,14 @@
           "dev": true,
           "requires": {
             "camelcase": "4.1.0"
+          },
+          "dependencies": {
+            "camelcase": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+              "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+              "dev": true
+            }
           }
         }
       }
@@ -12838,7 +13937,7 @@
     "webpack-sources": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz",
-      "integrity": "sha1-oQHrrlnWUHNU1x2AE5UKOot6WlQ=",
+      "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==",
       "dev": true,
       "requires": {
         "source-list-map": "2.0.0",
@@ -12848,7 +13947,7 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
@@ -12873,9 +13972,9 @@
       "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
     },
     "wide-align": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
-      "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
       "requires": {
         "string-width": "1.0.2"
       }
@@ -12924,12 +14023,6 @@
         "mkdirp": "0.5.1"
       }
     },
-    "xml-char-classes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz",
-      "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=",
-      "dev": true
-    },
     "xtend": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
@@ -13008,7 +14101,7 @@
       "requires": {
         "archiver-utils": "1.3.0",
         "compress-commons": "1.2.2",
-        "lodash": "4.17.5",
+        "lodash": "4.17.10",
         "readable-stream": "2.3.5"
       },
       "dependencies": {
diff --git a/package.json b/package.json
index 11fd3d24..b3b47fe0 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "version": "2.0.0a",
   "homepage": "https://betterdiscord.net",
   "license": "MIT",
-  "main": "./core/index.js",
+  "main": "core/dist/main.js",
   "contributors": [
     "Jiiks",
     "Pohky"
@@ -16,51 +16,54 @@
   },
   "private": false,
   "dependencies": {
-    "node-sass": "^4.7.2",
-    "nedb": "^1.8.0"
+    "csp-parse": "github:macropodhq/csp-parse",
+    "deepmerge": "^2.1.1",
+    "nedb": "^1.8.0",
+    "node-sass": "^4.9.2"
   },
   "devDependencies": {
     "archiver": "^2.1.1",
-    "babel-core": "^6.26.0",
-    "babel-loader": "^7.1.2",
-    "babel-preset-env": "^1.6.1",
+    "babel-core": "^6.26.3",
+    "babel-loader": "^7.1.5",
+    "babel-preset-env": "^1.7.0",
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-react": "^6.24.1",
-    "codemirror": "^5.23.0",
+    "codemirror": "^5.39.2",
     "combokeys": "^3.0.0",
-    "css-loader": "^0.28.9",
+    "css-loader": "^0.28.11",
     "del": "^3.0.0",
     "electron": "1.6.15",
-    "electron-rebuild": "^1.7.3",
-    "eslint": "^4.16.0",
-    "eslint-plugin-vue": "^4.3.0",
-    "file-type": "^7.6.0",
+    "electron-rebuild": "^1.8.2",
+    "eslint": "^4.19.1",
+    "eslint-plugin-vue": "^4.7.1",
+    "file-type": "^7.7.1",
     "filewatcher": "^3.0.1",
-    "gulp": "^3.9.1",
+    "gulp": "^4.0.0",
     "gulp-babel": "^7.0.0",
     "gulp-copy": "^1.1.0",
+    "gulp-file": "^0.4.0",
     "gulp-inject-string": "^1.1.1",
-    "gulp-merge": "^0.1.1",
+    "gulp-json-editor": "^2.4.2",
     "gulp-npm-copy-deps": "^1.0.2",
-    "gulp-plumber": "^1.2.0",
-    "gulp-rename": "^1.2.2",
-    "gulp-watch": "^5.0.0",
-    "html-webpack-plugin": "^3.0.6",
+    "gulp-rename": "^1.4.0",
+    "gulp-watch": "^5.0.1",
+    "html-webpack-plugin": "^3.2.0",
     "jquery": "^3.2.1",
-    "lodash": "^4.17.4",
+    "lodash": "^4.17.10",
     "mkdirp": "^0.5.1",
-    "node-gyp": "^3.6.2",
+    "node-gyp": "^3.7.0",
     "pump": "^3.0.0",
-    "sass-loader": "^6.0.6",
-    "uglifyjs-webpack-plugin": "^1.2.4",
-    "v-tooltip": "^2.0.0-rc.30",
-    "vue": "^2.5.13",
-    "vue-codemirror": "^4.0.3",
-    "vue-color": "^2.4.4",
-    "vue-loader": "^13.7.0",
-    "vue-material-design-icons": "^1.0.0",
-    "vue-template-compiler": "^2.5.13",
-    "webpack": "^3.10.0"
+    "request-promise-native": "^1.0.5",
+    "sass-loader": "^6.0.7",
+    "uglifyjs-webpack-plugin": "^1.2.7",
+    "v-tooltip": "^2.0.0-rc.33",
+    "vue": "^2.5.17",
+    "vue-codemirror": "^4.0.5",
+    "vue-color": "^2.4.6",
+    "vue-loader": "^13.7.2",
+    "vue-material-design-icons": "^1.6.0",
+    "vue-template-compiler": "^2.5.17",
+    "webpack": "^3.12.0"
   },
   "scripts": {
     "build": "npm run build --prefix client && npm run build --prefix core && npm run build --prefix csseditor && npm run build --prefix installer",
@@ -72,7 +75,7 @@
     "watch_csseditor": "npm run watch --prefix csseditor",
     "build_installer": "npm run build --prefix installer",
     "watch_installer": "npm run watch --prefix installer",
-    "lint": "eslint -f unix client/src core/src csseditor/src",
+    "lint": "eslint -f unix client/src core/src csseditor/src common",
     "test": "npm run build && npm run lint",
     "build_node-sass": "node scripts/build-node-sass.js",
     "build_release": "npm run release --prefix client && npm run build --prefix core && npm run release --prefix csseditor",
diff --git a/tests/ext/plugins/Example 2/index.js b/tests/ext/plugins/Example 2/index.js
index c601a557..a28b615f 100644
--- a/tests/ext/plugins/Example 2/index.js	
+++ b/tests/ext/plugins/Example 2/index.js	
@@ -1,6 +1,6 @@
-module.exports = (Plugin, Api, Vendor) => 
+module.exports = (Plugin, Api, Vendor) =>
 
-    const { $, moment } = Vendor;
+    const { $ } = Vendor;
     const { Events } = Api;
 
     const test = 'Testing';
diff --git a/tests/ext/plugins/Example 3/index.js b/tests/ext/plugins/Example 3/index.js
index de2c05ed..6b14c7c8 100644
--- a/tests/ext/plugins/Example 3/index.js	
+++ b/tests/ext/plugins/Example 3/index.js	
@@ -1,6 +1,6 @@
 module.exports = (Plugin, Api, Vendor) => {
 
-    const { $, moment } = Vendor;
+    const { $ } = Vendor;
     const { Events, Logger } = Api;
 
     return class extends Plugin {
diff --git a/tests/ext/plugins/Example 4/config.json b/tests/ext/plugins/Example 4/config.json
index 6c54c7f2..c7f354e7 100644
--- a/tests/ext/plugins/Example 4/config.json	
+++ b/tests/ext/plugins/Example 4/config.json	
@@ -15,7 +15,7 @@
         "description": "Plugin for testing array setting events as the first example plugin has a lot of stuff in it now."
     },
     "main": "index.js",
-    "type": "plugin",
+    "mainExport": "main",
     "defaultConfig": [
         {
             "category": "default",
diff --git a/tests/ext/plugins/Example 4/index.js b/tests/ext/plugins/Example 4/index.js
index 7cc502ca..d142d875 100644
--- a/tests/ext/plugins/Example 4/index.js	
+++ b/tests/ext/plugins/Example 4/index.js	
@@ -1,13 +1,13 @@
-module.exports = (Plugin, { Logger, Settings, Modals, BdMenu: { BdMenuItems }, Api }) => class extends Plugin {
-	async onstart() {
+exports.main = (Plugin, { Logger, Settings, Modals, BdMenu: { BdMenuItems }, CommonComponents, Api }) => class extends Plugin {
+    async onstart() {
         this.keybindEvent = this.keybindEvent.bind(this);
 
-		// Some array event examples
-		const arraySetting = this.settings.getSetting('default', 'array-1');
-		Logger.log('Array setting', arraySetting);
-		arraySetting.on('item-added', event => Logger.log('Item', event.item, 'was added to the array setting'));
-		arraySetting.on('item-updated', event => Logger.log('Item', event.item, 'of the array setting was updated', event));
-		arraySetting.on('item-removed', event => Logger.log('Item', event.item, 'removed from the array setting'));
+        // Some array event examples
+        const arraySetting = this.settings.getSetting('default', 'array-1');
+        Logger.log('Array setting', arraySetting);
+        arraySetting.on('item-added', event => Logger.log('Item', event.item, 'was added to the array setting'));
+        arraySetting.on('item-updated', event => Logger.log('Item', event.item, 'of the array setting was updated', event));
+        arraySetting.on('item-removed', event => Logger.log('Item', event.item, 'removed from the array setting'));
 
         // Keybind setting examples
         const keybindSetting = this.settings.getSetting('default', 'keybind-1');
@@ -54,22 +54,24 @@ module.exports = (Plugin, { Logger, Settings, Modals, BdMenu: { BdMenuItems }, A
         this.menuItem = BdMenuItems.addSettingsSet('Plugins', set, 'Plugin 4');
 
         this.menuItem2 = BdMenuItems.addVueComponent('Plugins', 'Also Plugin 4', {
-            template: `<component :is="SettingsWrapper" :headertext="plugin.name + ' custom menu panel'">
+            template: `<settings-wrapper :headertext="plugin.name + ' custom menu panel'">
                 <p style="margin-top: 0; color: #f6f6f7;">Test</p>
-            </component>`,
-            props: ['SettingsWrapper'],
+            </settings-wrapper>`,
+            components: {
+                SettingsWrapper: CommonComponents.SettingsWrapper
+            },
             data() { return {
                 Api, plugin: Api.plugin
             }; }
         });
-	}
+    }
 
-	onstop() {
+    onstop() {
         const keybindSetting = this.settings.getSetting('default', 'keybind-1');
         keybindSetting.off('keybind-activated', this.keybindEvent);
 
         BdMenuItems.removeAll();
-	}
+    }
 
     keybindEvent(event) {
         Logger.log('Keybind pressed', event);
diff --git a/tests/ext/plugins/Example/config.json b/tests/ext/plugins/Example/config.json
index ad85c4bd..a99ebcb5 100644
--- a/tests/ext/plugins/Example/config.json
+++ b/tests/ext/plugins/Example/config.json
@@ -24,7 +24,8 @@
         ],
         "version": 1.0,
         "description": "Example Plugin Description.\n\nDescriptions are preformatted (you can use newlines).",
-        "icon": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FscXVlXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMjAwMCAyMDAwIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAyMDAwIDIwMDAiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxnPjxwYXRoIGZpbGw9IiMzRTgyRTUiIGQ9Ik0xNDAyLjIsNjMxLjdjLTkuNy0zNTMuNC0yODYuMi00OTYtNjQyLjYtNDk2SDY4LjR2NzE0LjFsNDQyLDM5OFY0OTAuN2gyNTdjMjc0LjUsMCwyNzQuNSwzNDQuOSwwLDM0NC45SDU5Ny42djMyOS41aDE2OS44YzI3NC41LDAsMjc0LjUsMzQ0LjgsMCwzNDQuOGgtNjk5djM1NC45aDY5MS4yYzM1Ni4zLDAsNjMyLjgtMTQyLjYsNjQyLjYtNDk2YzAtMTYyLjYtNDQuNS0yODQuMS0xMjIuOS0zNjguNkMxMzU3LjcsOTE1LjgsMTQwMi4yLDc5NC4zLDE0MDIuMiw2MzEuN3oiLz48cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNMTI2Mi41LDEzNS4yTDEyNjIuNSwxMzUuMmwtNzYuOCwwYzI2LjYsMTMuMyw1MS43LDI4LjEsNzUsNDQuM2M3MC43LDQ5LjEsMTI2LjEsMTExLjUsMTY0LjYsMTg1LjNjMzkuOSw3Ni42LDYxLjUsMTY1LjYsNjQuMywyNjQuNmwwLDEuMnYxLjJjMCwxNDEuMSwwLDU5Ni4xLDAsNzM3LjF2MS4ybDAsMS4yYy0yLjcsOTktMjQuMywxODgtNjQuMywyNjQuNmMtMzguNSw3My44LTkzLjgsMTM2LjItMTY0LjYsMTg1LjNjLTIyLjYsMTUuNy00Ni45LDMwLjEtNzIuNiw0My4xaDcyLjVjMzQ2LjIsMS45LDY3MS0xNzEuMiw2NzEtNTY3LjlWNzE2LjdDMTkzMy41LDMxMi4yLDE2MDguNywxMzUuMiwxMjYyLjUsMTM1LjJ6Ii8+PC9nPjwvc3ZnPg=="
+        "icon": "icon.svg",
+        "icon_type": "image/svg+xml"
     },
     "main": "index.js",
     "dependencies": {
diff --git a/tests/ext/plugins/Example/icon.svg b/tests/ext/plugins/Example/icon.svg
new file mode 100644
index 00000000..2714a185
--- /dev/null
+++ b/tests/ext/plugins/Example/icon.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 2000 2000" enable-background="new 0 0 2000 2000" xml:space="preserve">
+    <g>
+        <path fill="#3E82E5" d="M1402.2,631.7c-9.7-353.4-286.2-496-642.6-496H68.4v714.1l442,398V490.7h257c274.5,0,274.5,344.9,0,344.9H597.6v329.5h169.8c274.5,0,274.5,344.8,0,344.8h-699v354.9h691.2c356.3,0,632.8-142.6,642.6-496c0-162.6-44.5-284.1-122.9-368.6C1357.7,915.8,1402.2,794.3,1402.2,631.7z"/>
+        <path fill="#FFFFFF" d="M1262.5,135.2L1262.5,135.2l-76.8,0c26.6,13.3,51.7,28.1,75,44.3c70.7,49.1,126.1,111.5,164.6,185.3c39.9,76.6,61.5,165.6,64.3,264.6l0,1.2v1.2c0,141.1,0,596.1,0,737.1v1.2l0,1.2c-2.7,99-24.3,188-64.3,264.6c-38.5,73.8-93.8,136.2-164.6,185.3c-22.6,15.7-46.9,30.1-72.6,43.1h72.5c346.2,1.9,671-171.2,671-567.9V716.7C1933.5,312.2,1608.7,135.2,1262.5,135.2z"/>
+    </g>
+</svg>
diff --git a/tests/ext/plugins/Example/index.js b/tests/ext/plugins/Example/index.js
index dc1fc018..83ebc418 100644
--- a/tests/ext/plugins/Example/index.js
+++ b/tests/ext/plugins/Example/index.js
@@ -1,6 +1,6 @@
 module.exports = (Plugin, Api, Vendor, Dependencies) => {
 
-    const { $, moment, _ } = Vendor;
+    const { $, _ } = Vendor;
     const { Events, Logger, InternalSettings, CssUtils } = Api;
 
     return class extends Plugin {