From 994faf94d6cbbed0fe1deb94a0aaad0612b5173a Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Tue, 20 Mar 2018 21:11:11 +0000
Subject: [PATCH 01/23] Refactor Vue injector and sparkplug and move
 contributors to data

---
 client/package.json                           |  3 -
 client/src/builtin/EmoteComponent.vue         |  5 +-
 client/src/builtin/EmoteModule.js             | 11 ++--
 client/src/data/contributors.json             | 65 +++++++++++++++++++
 client/src/data/user.settings.default.json    |  1 -
 client/src/index.js                           | 40 +++++-------
 client/src/modules/globals.js                 | 57 +++++++++++-----
 client/src/modules/modulemanager.js           |  8 ++-
 client/src/modules/modules.js                 | 22 ++++---
 client/src/ui/automanip.js                    | 24 +++----
 client/src/ui/components/bd/BdBadge.vue       |  8 +--
 .../src/ui/components/bd/BdMessageBadge.vue   |  6 +-
 .../src/ui/components/common/Autocomplete.vue |  3 +-
 client/src/ui/profilebadges.js                | 56 ++++++----------
 client/src/ui/vueinjector.js                  | 13 +++-
 client/webpack.config.js                      |  7 +-
 core/src/sparkplug.js                         | 26 ++++++--
 17 files changed, 219 insertions(+), 136 deletions(-)
 create mode 100644 client/src/data/contributors.json

diff --git a/client/package.json b/client/package.json
index 6e536f09..aee1ddf3 100644
--- a/client/package.json
+++ b/client/package.json
@@ -15,9 +15,6 @@
     "url": "https://github.com/Jiiks/BetterDiscordApp.git"
   },
   "private": false,
-  "devDependencies": {
-    
-  },
   "scripts": {
     "build": "webpack --progress --colors",
     "watch": "webpack --progress --colors --watch"
diff --git a/client/src/builtin/EmoteComponent.vue b/client/src/builtin/EmoteComponent.vue
index 3561ad70..98cd63a1 100644
--- a/client/src/builtin/EmoteComponent.vue
+++ b/client/src/builtin/EmoteComponent.vue
@@ -9,11 +9,10 @@
         data() {
             return {
                 favourite: false
-            }
+            };
         },
         props: ['src', 'name'],
-        methods: {
-        },
+        methods: {},
         beforeMount() {
             // Check favourite state
         }
diff --git a/client/src/builtin/EmoteModule.js b/client/src/builtin/EmoteModule.js
index 0a02c41a..7c901607 100644
--- a/client/src/builtin/EmoteModule.js
+++ b/client/src/builtin/EmoteModule.js
@@ -131,12 +131,11 @@ export default class {
         }
         const { bdemoteName, bdemoteSrc } = root.dataset;
         if (!bdemoteName || !bdemoteSrc) return;
-        VueInjector.inject(
-            root,
-            DOM.createElement('span'),
-            { EmoteComponent },
-            `<EmoteComponent src="${bdemoteSrc}" name="${bdemoteName}"/>`
-        );
+        VueInjector.inject(root, {
+            components: { EmoteComponent },
+            data: { src: bdemoteSrc, name: bdemoteName },
+            template: '<EmoteComponent :src="src" :name="name" />'
+        }, DOM.createElement('span'));
         root.classList.add('bd-is-emote');
     }
 
diff --git a/client/src/data/contributors.json b/client/src/data/contributors.json
new file mode 100644
index 00000000..bcdd89ec
--- /dev/null
+++ b/client/src/data/contributors.json
@@ -0,0 +1,65 @@
+[
+    {
+        "__user": "Jiiks#5000",
+        "id": "81388395867156480",
+        "developer": true,
+        "webdev": true,
+        "contributor": true
+    },
+    {
+        "__user": "Pohky#0156",
+        "id": "98003542823944192",
+        "developer": true,
+        "webdev": false,
+        "contributor": true
+    },
+    {
+        "__user": "Hammock#3110",
+        "id": "138850472541814784",
+        "developer": false,
+        "webdev": true,
+        "contributor": true
+    },
+    {
+        "__user": "Zerebos#7790",
+        "id": "249746236008169473",
+        "developer": true,
+        "webdev": false,
+        "contributor": true
+    },
+    {
+        "__user": "Pierce#1337",
+        "id": "125367412370440192",
+        "developer": true,
+        "webdev": false,
+        "contributor": true
+    },
+    {
+        "__user": "Samuel Elliott#2764",
+        "id": "284056145272766465",
+        "developer": true,
+        "webdev": false,
+        "contributor": true
+    },
+    {
+        "__user": "Lilian Tedone#6223",
+        "id": "184021060562321419",
+        "developer": false,
+        "webdev": false,
+        "contributor": true
+    },
+    {
+        "__user": "samfun123#8972",
+        "id": "76052829285916672",
+        "developer": false,
+        "webdev": false,
+        "contributor": true
+    },
+    {
+        "__user": "samogot#4379",
+        "id": "171005991272316937",
+        "developer": false,
+        "webdev": false,
+        "contributor": true
+    }
+]
diff --git a/client/src/data/user.settings.default.json b/client/src/data/user.settings.default.json
index 49efdfdc..2b49c23a 100644
--- a/client/src/data/user.settings.default.json
+++ b/client/src/data/user.settings.default.json
@@ -91,7 +91,6 @@
     {
         "id": "css",
         "text": "CSS Editor",
-        "hidden": true,
         "settings": [
             {
                 "category": "default",
diff --git a/client/src/index.js b/client/src/index.js
index 94307dc5..f7a74b6e 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -10,9 +10,10 @@
 
 import { DOM, BdUI, Modals, Reflection } from 'ui';
 import BdCss from './styles/index.scss';
-import { Patcher, MonkeyPatch, Vendor, Events, CssEditor, Globals, ExtModuleManager, PluginManager, ThemeManager, ModuleManager, WebpackModules, Settings, Database, ReactComponents, ReactAutoPatcher, DiscordApi } from 'modules';
+import { Events, CssEditor, Globals, Settings, Database, Updater, ModuleManager, PluginManager, ThemeManager, ExtModuleManager, Vendor, WebpackModules, Patcher, MonkeyPatch, ReactComponents, ReactAutoPatcher, DiscordApi } from 'modules';
 import { ClientLogger as Logger, ClientIPC, Utils } from 'common';
 import { EmoteModule } from 'builtin';
+
 const ignoreExternal = false;
 const DEV = true;
 
@@ -20,29 +21,16 @@ class BetterDiscord {
 
     constructor() {
         this._bd = {
-            DOM,
-            BdUI,
-            Modals,
-            Reflection,
-            Patcher,
-            MonkeyPatch,
+            DOM, BdUI, Modals, Reflection,
+
+            Events, CssEditor, Globals, Settings, Database, Updater,
+            ModuleManager, PluginManager, ThemeManager, ExtModuleManager,
             Vendor,
-            Events,
-            CssEditor,
-            Globals,
-            ExtModuleManager,
-            PluginManager,
-            ThemeManager,
-            ModuleManager,
-            WebpackModules,
-            Settings,
-            Database,
-            ReactComponents,
-            DiscordApi,
-            Logger,
-            ClientIPC,
-            Utils,
-            EmoteModule
+
+            WebpackModules, Patcher, MonkeyPatch, ReactComponents, DiscordApi,
+            EmoteModule,
+
+            Logger, ClientIPC, Utils
         };
 
         const developermode = Settings.getSetting('core', 'advanced', 'developer-mode');
@@ -63,14 +51,16 @@ class BetterDiscord {
             await Database.init();
             await Settings.loadSettings();
             await ModuleManager.initModules();
-            Modals.showContentManagerErrors();
+
             if (!ignoreExternal) {
                 await ExtModuleManager.loadAllModules(true);
                 await PluginManager.loadAllPlugins(true);
                 await ThemeManager.loadAllThemes(true);
             }
+
             if (!Settings.get('core', 'advanced', 'ignore-content-manager-errors'))
                 Modals.showContentManagerErrors();
+
             Events.emit('ready');
             Events.emit('discord-ready');
             EmoteModule.observe();
@@ -90,7 +80,7 @@ class BetterDiscord {
 if (window.BetterDiscord) {
     Logger.log('main', 'Attempting to inject again?');
 } else {
-    let instance = null;
+    let instance;
     Events.on('autopatcher', () => instance = new BetterDiscord());
     ReactAutoPatcher.autoPatch().then(() => Events.emit('autopatcher'));
 }
diff --git a/client/src/modules/globals.js b/client/src/modules/globals.js
index 50b3dbb8..4971ec2a 100644
--- a/client/src/modules/globals.js
+++ b/client/src/modules/globals.js
@@ -8,9 +8,10 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+import sparkplug from 'sparkplug';
+import { ClientIPC } from 'bdipc';
 import Module from './module';
 import Events from './events';
-import { ClientIPC } from 'bdipc';
 
 export default new class extends Module {
 
@@ -31,20 +32,18 @@ export default new class extends Module {
     first() {
         (async() => {
             const config = await ClientIPC.send('getConfig');
-            this.setState(config);
+            this.setState({ config });
 
             // This is for Discord to stop error reporting :3
             window.BetterDiscord = {
-                'version': config.version,
-                'v': config.version
+                version: config.version,
+                v: config.version
             };
             window.jQuery = {};
 
-            if (window.__bd) {
-                this.setState(window.__bd);
-                window.__bd = {
-                    setWS: this.setWS
-                }
+            if (sparkplug.bd) {
+                this.setState({ bd: sparkplug.bd });
+                sparkplug.bd.setWS = this.setWS;
             }
 
             Events.emit('global-ready');
@@ -60,19 +59,43 @@ export default new class extends Module {
     }
 
     getObject(name) {
-        return this.state[name];
+        return this.config[name] || this.bd[name];
+    }
+
+    get bd() {
+        return this.state.bd;
+    }
+
+    get localStorage() {
+        return this.bd.localStorage;
+    }
+
+    get webSocket() {
+        return this.bd.wsHook;
+    }
+
+    get WebSocket() {
+        return this.bd.wsOrig;
+    }
+
+    get ignited() {
+        return this.bd.ignited;
+    }
+
+    get config() {
+        return this.state.config;
+    }
+
+    get paths() {
+        return this.config.paths;
     }
 
     getPath(id) {
-        return this.state.paths.find(path => path.id === id).path;
+        return this.paths.find(path => path.id === id).path;
     }
 
-    static get paths() {
-        return this.state.paths;
-    }
-
-    static get version() {
-        return this.state.version;
+    get version() {
+        return this.config.version;
     }
 
 }
diff --git a/client/src/modules/modulemanager.js b/client/src/modules/modulemanager.js
index 209f32bf..c1f69d51 100644
--- a/client/src/modules/modulemanager.js
+++ b/client/src/modules/modulemanager.js
@@ -8,12 +8,14 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-/*Module Manager initializes all modules when everything is ready*/
-
+import { ClientLogger as Logger } from 'common';
 import { Events, SocketProxy, EventHook, CssEditor } from 'modules';
 import { ProfileBadges } from 'ui';
 import Updater from './updater';
 
+/**
+ * Module Manager initializes all modules when everything is ready
+ */
 export default class {
 
     static get modules() {
@@ -31,7 +33,7 @@ export default class {
             try {
                 if (module.init && module.init instanceof Function) module.init();
             } catch (err) {
-                console.log(`Failed to initialize module: ${err}`);
+                Logger.err('Module Manager', ['Failed to initialize module:', err]);
             }
         }
         return true;
diff --git a/client/src/modules/modules.js b/client/src/modules/modules.js
index 8bd1b7eb..f885fcdb 100644
--- a/client/src/modules/modules.js
+++ b/client/src/modules/modules.js
@@ -1,19 +1,23 @@
 export { default as Events } from './events';
-export { default as Settings } from './settings';
 export { default as CssEditor } from './csseditor';
-export { default as ExtModuleManager } from './extmodulemanager';
+export { default as Globals } from './globals';
+export { default as Settings } from './settings';
+export { default as Database } from './database';
+export { default as Updater } from './updater';
+
+export { default as ModuleManager } from './modulemanager';
 export { default as PluginManager } from './pluginmanager';
 export { default as ThemeManager } from './thememanager';
-export { default as Globals } from './globals';
+export { default as ExtModuleManager } from './extmodulemanager';
+export { default as Permissions } from './permissionmanager';
+
+export { default as EventsWrapper } from './eventswrapper';
 export { default as Vendor } from './vendor';
+
 export * from './webpackmodules';
-export { default as ModuleManager } from './modulemanager';
+export * from './patcher';
+export * from './reactcomponents';
 export { default as EventListener } from './eventlistener';
 export { default as SocketProxy } from './socketproxy';
 export { default as EventHook } from './eventhook';
-export { default as Permissions } from './permissionmanager';
-export { default as Database } from './database';
-export { default as EventsWrapper } from './eventswrapper';
 export { default as DiscordApi } from './discordapi';
-export * from './patcher';
-export * from './reactcomponents';
diff --git a/client/src/ui/automanip.js b/client/src/ui/automanip.js
index 0eb69629..7331f66c 100644
--- a/client/src/ui/automanip.js
+++ b/client/src/ui/automanip.js
@@ -128,13 +128,11 @@ export default class extends EventListener {
         if (markup.ets) {
             const etsRoot = document.createElement('span');
             markup.clone.appendChild(etsRoot);
-            VueInjector.inject(
-                etsRoot,
-                DOM.createElement('span', null, 'test'),
-                { EditedTimeStamp },
-                `<EditedTimeStamp ets="${markup.ets}"/>`,
-                true
-            );
+            VueInjector.inject(etsRoot, {
+                components: { EditedTimeStamp },
+                data: { ets: markup.ets },
+                template: '<EditedTimeStamp :ets="ets" />'
+            });
         }
 
         Events.emit('ui:mutable:.markup', markup.clone);
@@ -214,12 +212,10 @@ export default class extends EventListener {
         const parent = document.querySelector('[class*="channelTextArea"] > [class*="inner"]');
         if (!parent) return;
         parent.append(root);
-        VueInjector.inject(
-            root,
-            DOM.createElement('span'),
-            { Autocomplete },
-           `<Autocomplete initial="${e.target.value}"/>`,
-            true
-        );
+        VueInjector.inject(root, {
+            components: { Autocomplete },
+            data: { initial: e.target.value },
+            template: '<Autocomplete :initial="initial" />'
+        });
     }
 }
diff --git a/client/src/ui/components/bd/BdBadge.vue b/client/src/ui/components/bd/BdBadge.vue
index 2c82a62d..969f8692 100644
--- a/client/src/ui/components/bd/BdBadge.vue
+++ b/client/src/ui/components/bd/BdBadge.vue
@@ -9,11 +9,11 @@
 */
 
 <template>
-    <div :class="{'bd-profile-badges-wrap': hasBadges == 'false'}">
+    <div :class="{'bd-profile-badges-wrap': !hasBadges}">
         <div class="bd-profile-badges">
-            <div v-if="developer == 'true'" v-tooltip="'BetterDiscord Developer'" class="bd-profile-badge bd-profile-badge-developer" @click="onClick"></div>
-            <div v-else-if="webdev == 'true'" v-tooltip="'BetterDiscord Web Developer'" class="bd-profile-badge bd-profile-badge-developer" @click="onClick"></div>
-            <div v-else-if="contributor == 'true'" v-tooltip="'BetterDiscord Contributor'" class="bd-profile-badge bd-profile-badge-contributor" @click="onClick"></div>
+            <div v-if="developer" v-tooltip="'BetterDiscord Developer'" class="bd-profile-badge bd-profile-badge-developer" @click="onClick"></div>
+            <div v-else-if="webdev" v-tooltip="'BetterDiscord Web Developer'" class="bd-profile-badge bd-profile-badge-developer" @click="onClick"></div>
+            <div v-else-if="contributor" v-tooltip="'BetterDiscord Contributor'" class="bd-profile-badge bd-profile-badge-contributor" @click="onClick"></div>
         </div>
     </div>
 </template>
diff --git a/client/src/ui/components/bd/BdMessageBadge.vue b/client/src/ui/components/bd/BdMessageBadge.vue
index c4258d5b..29e88adc 100644
--- a/client/src/ui/components/bd/BdMessageBadge.vue
+++ b/client/src/ui/components/bd/BdMessageBadge.vue
@@ -10,9 +10,9 @@
 
 <template>
     <div class="bd-message-badges-wrap">
-        <div v-if="developer == 'true'" v-tooltip="'BetterDiscord Developer'" class="bd-message-badge bd-message-badge-developer" @click="onClick"></div>
-        <div v-else-if="webdev == 'true'" v-tooltip="'BetterDiscord Web Developer'" class="bd-message-badge bd-message-badge-developer" @click="onClick"></div>
-        <div v-else-if="contributor == 'true'" v-tooltip="'BetterDiscord Contributor'" class="bd-message-badge bd-message-badge-contributor" @click="onClick"></div>
+        <div v-if="developer" v-tooltip="'BetterDiscord Developer'" class="bd-message-badge bd-message-badge-developer" @click="onClick"></div>
+        <div v-else-if="webdev" v-tooltip="'BetterDiscord Web Developer'" class="bd-message-badge bd-message-badge-developer" @click="onClick"></div>
+        <div v-else-if="contributor" v-tooltip="'BetterDiscord Contributor'" class="bd-message-badge bd-message-badge-contributor" @click="onClick"></div>
     </div>
 </template>
 <script>
diff --git a/client/src/ui/components/common/Autocomplete.vue b/client/src/ui/components/common/Autocomplete.vue
index 6b099ee7..627f5262 100644
--- a/client/src/ui/components/common/Autocomplete.vue
+++ b/client/src/ui/components/common/Autocomplete.vue
@@ -34,6 +34,7 @@
     import { EmoteModule } from 'builtin';
     import { Events } from 'modules';
     import { DOM } from 'ui';
+
     export default {
         data() {
             return {
@@ -44,7 +45,7 @@
                 open: false,
                 selectedIndex: 0,
                 sterm: ''
-            }
+            };
         },
         props: ['initial'],
         beforeMount() {
diff --git a/client/src/ui/profilebadges.js b/client/src/ui/profilebadges.js
index d576b1f1..9b43bb9b 100644
--- a/client/src/ui/profilebadges.js
+++ b/client/src/ui/profilebadges.js
@@ -12,6 +12,7 @@ import { EventListener } from 'modules';
 import DOM from './dom';
 import { BdBadge, BdMessageBadge } from './components/bd';
 import VueInjector from './vueinjector';
+import contributors from '../data/contributors';
 
 export default class extends EventListener {
 
@@ -55,43 +56,39 @@ export default class extends EventListener {
         if (msgGroup.dataset.hasBadges) return;
         msgGroup.setAttribute('data-has-badges', true);
         if (!msgGroup.dataset.authorId) return;
-        const c = this.contributors.find(c => c.id === msgGroup.dataset.authorId);
+        const c = contributors.find(c => c.id === msgGroup.dataset.authorId);
         if (!c) return;
         const root = document.createElement('span');
         const wrapperParent = msgGroup.querySelector('.username-wrapper').parentElement;
         if (!wrapperParent || wrapperParent.children.length < 2) return;
         wrapperParent.insertBefore(root, wrapperParent.children[1]);
         const { developer, contributor, webdev } = c;
-        VueInjector.inject(
-            root,
-            DOM.createElement('div', null, 'bdmessagebadges'),
-            { BdMessageBadge },
-            `<BdMessageBadge developer="${developer}" webdev="${webdev}" contributor="${contributor}"/>`,
-            true
-        );
+        VueInjector.inject(root, {
+            components: { BdMessageBadge },
+            data: { developer, contributor, webdev },
+            template: '<BdMessageBadge :developer="developer" :webdev="webdev" :contributor="contributor" />'
+        });
     }
 
     userlistBadge(e) {
-        const c = this.contributors.find(c => c.id === e.dataset.userId);
+        const c = contributors.find(c => c.id === e.dataset.userId);
         if (!c) return;
         const memberUsername = e.querySelector('.member-username');
         if (!memberUsername) return;
         const root = document.createElement('span');
         memberUsername.append(root);
         const { developer, contributor, webdev } = c;
-        VueInjector.inject(
-            root,
-            DOM.createElement('div', null, 'bdmessagebadges'),
-            { BdMessageBadge },
-            `<BdMessageBadge developer="${developer}" webdev="${webdev}" contributor="${contributor}"/>`,
-            true
-        );
+        VueInjector.inject(root, {
+            components: { BdMessageBadge },
+            data: { developer, contributor, webdev },
+            template: '<BdMessageBadge :developer="developer" :webdev="webdev" :contributor="contributor" />'
+        });
     }
 
     inject(userid) {
-        const c = this.contributors.find(c => c.id === userid);
+        const c = contributors.find(c => c.id === userid);
         if (!c) return;
- 
+
         setTimeout(() => {
             let hasBadges = false;
             let root = document.querySelector('[class*="profileBadges"]');
@@ -103,27 +100,16 @@ export default class extends EventListener {
 
             const { developer, contributor, webdev } = c;
 
-            VueInjector.inject(
-                root,
-                DOM.createElement('div', null, 'bdprofilebadges'),
-                { BdBadge },
-                `<BdBadge hasBadges="${hasBadges}" developer="${developer}" webdev="${webdev}" contributor="${contributor}"/>`
-            );
+            VueInjector.inject(root, {
+                components: { BdBadge },
+                data: { hasBadges, c },
+                template: '<BdBadge :hasBadges="hasBadges" :developer="c.developer" :webdev="c.webdev" :contributor="c.contributor" />',
+            }, DOM.createElement('div', null, 'bdprofilebadges'));
         }, 400);
     }
 
     get contributors() {
-        return [
-            { 'id': '81388395867156480', 'webdev': true, 'developer': true, 'contributor': true }, // Jiiks
-            { 'id': '98003542823944192', 'webdev': false, 'developer': true, 'contributor': true }, // Pohky
-            { 'id': '138850472541814784', 'webdev': true, 'developer': false, 'contributor': true }, // Hammock
-            { 'id': '249746236008169473', 'webdev': false, 'developer': true, 'contributor': true }, // Zerebos
-            { 'id': '125367412370440192', 'webdev': false, 'developer': true, 'contributor': true }, // Pierce
-            { 'id': '284056145272766465', 'webdev': false, 'developer': false, 'contributor': true }, // Samuel Elliott
-            { 'id': '184021060562321419', 'webdev': false, 'developer': false, 'contributor': true }, // Lilian Tedone
-            { 'id': '76052829285916672', 'webdev': false, 'developer': false, 'contributor': true }, // samfun123
-            { 'id': '171005991272316937', 'webdev': false, 'developer': false, 'contributor': true }, // samogot
-        ];
+        return contributors;
     }
 
 }
diff --git a/client/src/ui/vueinjector.js b/client/src/ui/vueinjector.js
index 13809c3a..085b7390 100644
--- a/client/src/ui/vueinjector.js
+++ b/client/src/ui/vueinjector.js
@@ -1,5 +1,5 @@
 /**
- * BetterDiscord VUE Injector Module
+ * BetterDiscord Vue Injector Module
  * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
  * All rights reserved.
  * https://betterdiscord.net
@@ -11,7 +11,7 @@
 import Vue from './vue';
 
 export default class {
-    
+
     static inject(root, bdnode, components, template, replaceRoot) {
         if(!replaceRoot) bdnode.appendTo(root);
 
@@ -22,4 +22,13 @@ export default class {
         });
     }
 
+    static _inject(root, options, bdnode) {
+        if(bdnode) bdnode.appendTo(root);
+
+        const vue = new Vue(options);
+
+        vue.$mount(bdnode || root);
+        return vue;
+    }
+
 }
diff --git a/client/webpack.config.js b/client/webpack.config.js
index fe4e9b9b..0cbaa481 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -32,9 +32,10 @@ module.exports = {
         loaders: [jsLoader, vueLoader, scssLoader]
     },
     externals: {
-        'electron': 'window.require("electron")',
-        'fs': 'window.require("fs")',
-        'path': 'window.require("path")'
+        electron: 'window.require("electron")',
+        fs: 'window.require("fs")',
+        path: 'window.require("path")',
+        sparkplug: 'require("../../core/dist/sparkplug")'
     },
     resolve: {
         alias: {
diff --git a/core/src/sparkplug.js b/core/src/sparkplug.js
index fb7eb59b..5709da11 100644
--- a/core/src/sparkplug.js
+++ b/core/src/sparkplug.js
@@ -1,5 +1,17 @@
+/**
+ * BetterDiscord Sparkplug
+ * Copyright (c) 2015-present JsSucks - https://github.com/JsSucks
+ * All rights reserved.
+ * https://github.com/JsSucks - 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.
+ *
+ * This file is evaluated in the renderer process!
+ */
+
 (() => {
-    if (window.__bd && window.__bd.ignited) return;
+    if (module.exports.bd) return;
 
     console.log('[BetterDiscord|Sparkplug]');
 
@@ -7,12 +19,12 @@
     if (!ls) console.warn('[BetterDiscord|Sparkplug] Failed to hook localStorage :(');
     const wsOrig = window.WebSocket;
 
-    window.__bd = {
+    const bd = module.exports.bd = {
         localStorage: ls,
         wsHook: null,
         wsOrig,
         ignited: true
-    }
+    };
 
     class WSHook extends window.WebSocket {
 
@@ -25,14 +37,14 @@
             console.info(`[BetterDiscord|WebSocket Proxy] new WebSocket detected, url: ${url}`);
             if (!url.includes('gateway.discord.gg')) return;
 
-            if (window.__bd.setWS) {
-                window.__bd.setWS(this);
+            if (bd.setWS) {
+                bd.setWS(this);
                 console.info(`[BetterDiscord|WebSocket Proxy] WebSocket sent to instance`);
                 return;
             }
 
-            console.info(`[BetterDiscord|WebSocket Proxy] WebSocket stored to __bd['wsHook']`);
-            window.__bd.wsHook = this;
+            console.info(`[BetterDiscord|WebSocket Proxy] WebSocket stored to bd.wsHook`);
+            bd.wsHook = this;
         }
 
     }

From b4bd9e9c7b43a76b4388259ce0f7150d982702e1 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Tue, 20 Mar 2018 23:24:31 +0000
Subject: [PATCH 02/23] Comments and fix tooltip arrow positioning

---
 client/src/modules/content.js                 |   4 +-
 client/src/modules/database.js                |  11 +
 client/src/modules/discordapi.js              |   4 +-
 client/src/modules/eventhook.js               |  21 +-
 client/src/modules/events.js                  |  33 ++-
 client/src/modules/eventswrapper.js           |  26 +-
 client/src/modules/module.js                  |  12 +-
 client/src/modules/modulemanager.js           |   7 +
 client/src/modules/plugin.js                  |   6 +-
 client/src/modules/pluginapi.js               |  56 ++--
 client/src/modules/pluginmanager.js           |   6 +-
 client/src/modules/settings.js                |  76 +++---
 client/src/modules/socketproxy.js             |   7 +-
 client/src/modules/theme.js                   |   9 +-
 client/src/modules/thememanager.js            |  20 ++
 client/src/modules/updater.js                 |  58 +++--
 client/src/modules/vendor.js                  |  27 +-
 client/src/modules/webpackmodules.js          | 112 ++++----
 client/src/structs/events/error.js            |  15 ++
 client/src/structs/events/event.js            |  11 +-
 client/src/structs/events/settingsupdated.js  |   6 +
 client/src/structs/events/settingupdated.js   |  33 ++-
 .../structs/settings/multiplechoiceoption.js  |  15 +-
 client/src/structs/settings/settingsscheme.js |  31 ++-
 client/src/structs/settings/settingsset.js    |   2 +-
 client/src/styles/partials/badges.scss        |  13 +-
 .../styles/partials/bdsettings/tooltips.scss  |  24 +-
 client/src/ui/automanip.js                    |  49 +---
 client/src/ui/bdmenu.js                       |  25 ++
 client/src/ui/bdui.js                         |  55 +---
 .../src/ui/components/{bd => }/BdModals.vue   |   7 +-
 client/src/ui/components/BdSettings.vue       |   2 +-
 client/src/ui/components/bd/PluginCard.vue    |  10 +-
 client/src/ui/components/bd/PluginsView.vue   |  28 +-
 client/src/ui/components/bd/ThemeCard.vue     |   7 +-
 client/src/ui/components/bd/ThemesView.vue    |  26 +-
 .../src/ui/components/bd/setting/Keybind.vue  |   4 +-
 client/src/ui/components/index.js             |   1 +
 client/src/ui/dom.js                          |   1 +
 client/src/ui/modals.js                       |   2 +-
 client/src/ui/vue.js                          |   3 +-
 client/src/ui/vueinjector.js                  |  19 +-
 common/modules/utils.js                       | 239 +++++++++++++-----
 43 files changed, 706 insertions(+), 417 deletions(-)
 rename client/src/ui/components/{bd => }/BdModals.vue (92%)

diff --git a/client/src/modules/content.js b/client/src/modules/content.js
index 2200c30a..fdc6c463 100644
--- a/client/src/modules/content.js
+++ b/client/src/modules/content.js
@@ -91,9 +91,9 @@ export default class Content {
                 config: this.settings.strip().settings,
                 data: this.data
             });
-			this.settings.setSaved();
+            this.settings.setSaved();
         } catch (err) {
-			Logger.err(this.name, ['Failed to save configuration', err]);
+            Logger.err(this.name, ['Failed to save configuration', err]);
             throw err;
         }
     }
diff --git a/client/src/modules/database.js b/client/src/modules/database.js
index 9b6e475d..1405b4aa 100644
--- a/client/src/modules/database.js
+++ b/client/src/modules/database.js
@@ -16,6 +16,12 @@ export default class {
         return true;
     }
 
+    /**
+     * Inserts or updates data in the database.
+     * @param {Object} args The record to find
+     * @param {Object} data The new record
+     * @return {Promise}
+     */
     static async insertOrUpdate(args, data) {
         try {
             return ClientIPC.send('bd-dba', { action: 'update', args, data });
@@ -24,6 +30,11 @@ export default class {
         }
     }
 
+    /**
+     * Finds data in the database.
+     * @param {Object} args The record to find
+     * @return {Promise}
+     */
     static async find(args) {
         try {
             return ClientIPC.send('bd-dba', { action: 'find', args });
diff --git a/client/src/modules/discordapi.js b/client/src/modules/discordapi.js
index 661976e9..948a73da 100644
--- a/client/src/modules/discordapi.js
+++ b/client/src/modules/discordapi.js
@@ -402,7 +402,7 @@ export default class DiscordApi {
 
     static get currentChannel() {
         const channel = Modules.ChannelStore.getChannel(Modules.SelectedChannelStore.getChannelId());
-        return channel.isPrivate ? new PrivateChannel(channel) : new GuildChannel(channel);
+        if (channel) return channel.isPrivate() ? new PrivateChannel(channel) : new GuildChannel(channel);
     }
 
     static get currentUser() {
@@ -415,5 +415,5 @@ export default class DiscordApi {
         for (const id of friends) returnUsers.push(User.fromId(id));
         return returnUsers;
     }
-    
+
 }
diff --git a/client/src/modules/eventhook.js b/client/src/modules/eventhook.js
index 9ae647f4..d6ba83b4 100644
--- a/client/src/modules/eventhook.js
+++ b/client/src/modules/eventhook.js
@@ -1,5 +1,5 @@
 /**
- * BetterDiscord WebpackModules Module
+ * BetterDiscord Event Hook
  * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
  * All rights reserved.
  * https://betterdiscord.net
@@ -8,14 +8,13 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import EventListener from './eventlistener';
-import { Utils } from 'common';
-import Events from './events';
+import { Utils, ClientLogger as Logger } from 'common';
 import { WebpackModules } from './webpackmodules';
+import Events from './events';
+import EventListener from './eventlistener';
 
 import * as SocketStructs from '../structs/socketstructs';
 
-
 /**
  * Discord socket event hook
  * @extends {EventListener}
@@ -23,7 +22,7 @@ import * as SocketStructs from '../structs/socketstructs';
 export default class extends EventListener {
 
     init() {
-        console.log(SocketStructs);
+        Logger.log('EventHook', SocketStructs);
         this.hook();
     }
 
@@ -44,11 +43,11 @@ export default class extends EventListener {
             orig.call(this, ...args);
             self.wsc = this;
             self.emit(...args);
-        }
+        };
     }
 
     get eventsModule() {
-        return WebpackModules.getModuleByPrototypes(['setMaxListeners', 'emit']);
+        return WebpackModules.getModuleByName('Events');
     }
 
     /**
@@ -66,8 +65,8 @@ export default class extends EventListener {
 
     /**
      * Emit callback
-     * @param {any} e Event Action
-     * @param {any} d Event Args
+     * @param {any} event Event
+     * @param {any} data Event data
      */
     dispatch(e, d) {
         Events.emit('raw-event', { type: e, data: d });
@@ -143,7 +142,7 @@ export default class extends EventListener {
             LFG_LISTING_CREATE: 'LFG_LISTING_CREATE', // No groups here
             LFG_LISTING_DELETE: 'LFG_LISTING_DELETE', // Thank you
             BRAINTREE_POPUP_BRIDGE_CALLBACK: 'BRAINTREE_POPUP_BRIDGE_CALLBACK' // What
-        }
+        };
     }
 
 }
diff --git a/client/src/modules/events.js b/client/src/modules/events.js
index c60f8ee3..7021d33e 100644
--- a/client/src/modules/events.js
+++ b/client/src/modules/events.js
@@ -12,14 +12,39 @@ import { EventEmitter } from 'events';
 const emitter = new EventEmitter();
 
 export default class {
-    static on(eventName, callBack) {
-        emitter.on(eventName, callBack);
+
+    /**
+     * Adds an event listener.
+     * @param {String} event The event to listen for
+     * @param {Function} callback The function to call when the event is emitted
+     */
+    static on(event, callback) {
+        emitter.on(event, callback);
     }
 
-    static off(eventName, callBack) {
-        emitter.removeListener(eventName, callBack);
+    /**
+     * Adds an event listener that is only called once.
+     * @param {String} event The event to listen for
+     * @param {Function} callback The function to call when the event is emitted
+     */
+    static once(event, callback) {
+        emitter.once(event, callback);
     }
 
+    /**
+     * Removes an event listener.
+     * @param {String} event The event to remove
+     * @param {Function} callback The listener to remove
+     */
+    static off(event, callback) {
+        emitter.removeListener(event, callback);
+    }
+
+    /**
+     * 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);
     }
diff --git a/client/src/modules/eventswrapper.js b/client/src/modules/eventswrapper.js
index 49a654cd..8196e561 100644
--- a/client/src/modules/eventswrapper.js
+++ b/client/src/modules/eventswrapper.js
@@ -11,7 +11,8 @@
 const eventemitters = new WeakMap();
 
 export default class EventsWrapper {
-    constructor(eventemitter) {
+
+    constructor(eventemitter, bind) {
         eventemitters.set(this, eventemitter);
     }
 
@@ -19,26 +20,33 @@ export default class EventsWrapper {
         return this._eventSubs || (this._eventSubs = []);
     }
 
+    get on() { return this.subscribe }
     subscribe(event, callback) {
         if (this.eventSubs.find(e => e.event === event && e.callback === callback)) return;
-        this.eventSubs.push({
-            event,
-            callback
-        });
-        eventemitters.get(this).on(event, callback);
+        const boundCallback = () => callback.apply(this.bind, arguments);
+        this.eventSubs.push({ event, callback, boundCallback });
+        eventemitters.get(this).on(event, boundCallback);
     }
 
+    once(event, callback) {
+        if (this.eventSubs.find(e => e.event === event && e.callback === callback)) return;
+        const boundCallback = () => this.off(event, callback) && callback.apply(this.bind, arguments);
+        this.eventSubs.push({ event, callback, boundCallback });
+        eventemitters.get(this).on(event, boundCallback);
+    }
+
+    get off() { return this.unsubscribe }
     unsubscribe(event, callback) {
         for (let index of this.eventSubs) {
-            if (this.eventSubs[index].event !== event || (callback && this.eventSubs[index].callback === callback)) return;
-            eventemitters.get(this).off(event, this.eventSubs[index].callback);
+            if (this.eventSubs[index].event !== event || (callback && this.eventSubs[index].callback === callback)) continue;
+            eventemitters.get(this).off(event, this.eventSubs[index].boundCallback);
             this.eventSubs.splice(index, 1);
         }
     }
 
     unsubscribeAll() {
         for (let event of this.eventSubs) {
-            eventemitters.get(this).off(event.event, event.callback);
+            eventemitters.get(this).off(event.event, event.boundCallback);
         }
         this.eventSubs.splice(0, this.eventSubs.length);
     }
diff --git a/client/src/modules/module.js b/client/src/modules/module.js
index c786e366..c358662d 100644
--- a/client/src/modules/module.js
+++ b/client/src/modules/module.js
@@ -5,20 +5,19 @@
  * https://github.com/JsSucks - 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. 
-*/
-
-/*
-Base Module that every non-static module should extend
+ * LICENSE file in the root directory of this source tree.
 */
 
+/**
+ * Base Module that every non-static module should extend
+ */
 export default class Module {
 
     constructor(args) {
         this.__ = {
             state: args || {},
             args
-        }
+        };
         this.setState = this.setState.bind(this);
         this.initialize();
     }
@@ -38,7 +37,6 @@ export default class Module {
     set args(t) { }
     get args() { return this.__.args; }
 
-
     set state(state) { return this.__.state = state; }
     get state() { return this.__.state; }
 
diff --git a/client/src/modules/modulemanager.js b/client/src/modules/modulemanager.js
index c1f69d51..99d9324c 100644
--- a/client/src/modules/modulemanager.js
+++ b/client/src/modules/modulemanager.js
@@ -18,6 +18,9 @@ import Updater from './updater';
  */
 export default class {
 
+    /**
+     * An array of modules.
+     */
     static get modules() {
         return this._modules ? this._modules : (this._modules = [
             new ProfileBadges(),
@@ -28,6 +31,10 @@ export default class {
         ]);
     }
 
+    /**
+     * Initializes all modules.
+     * @return {Promise}
+     */
     static async initModules() {
         for (let module of this.modules) {
             try {
diff --git a/client/src/modules/plugin.js b/client/src/modules/plugin.js
index 7b786eff..dcf26bef 100644
--- a/client/src/modules/plugin.js
+++ b/client/src/modules/plugin.js
@@ -15,12 +15,8 @@ export default class Plugin extends Content {
 
     get type() { return 'plugin' }
 
-	// Don't use - these will eventually be removed!
-    get pluginPath() { return this.contentPath }
-    get pluginConfig() { return this.config }
-
     get start() { return this.enable }
-	get stop() { return this.disable }
+    get stop() { return this.disable }
 
     unload() {
         PluginManager.unloadPlugin(this);
diff --git a/client/src/modules/pluginapi.js b/client/src/modules/pluginapi.js
index 3bb93be8..670a407c 100644
--- a/client/src/modules/pluginapi.js
+++ b/client/src/modules/pluginapi.js
@@ -1,5 +1,5 @@
 /**
- * BetterDiscord Plugin Api
+ * BetterDiscord Plugin API
  * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
  * All rights reserved.
  * https://betterdiscord.net
@@ -8,7 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Utils, ClientLogger as Logger, ClientIPC } from 'common';
+import { Utils, ClientLogger as Logger, ClientIPC, AsyncEventEmitter } from 'common';
 import Settings from './settings';
 import ExtModuleManager from './extmodulemanager';
 import PluginManager from './pluginmanager';
@@ -24,27 +24,20 @@ import { MonkeyPatch } from './patcher';
 
 export default class PluginApi {
 
-    constructor(pluginInfo) {
+    constructor(pluginInfo, pluginPath) {
         this.pluginInfo = pluginInfo;
+        this.pluginPath = pluginPath;
+
         this.Events = new EventsWrapper(Events);
+        Utils.defineSoftGetter(this.Events, 'bind', () => this.plugin);
+
         this._menuItems = undefined;
         this._injectedStyles = undefined;
         this._modalStack = undefined;
     }
-    get Discord() {
-        return DiscordApi;
-    }
-    get ReactComponents() {
-        return ReactComponents;
-    }
-    get Reflection() {
-        return Reflection;
-    }
-    get MonkeyPatch() {
-        return module => MonkeyPatch(this.pluginInfo.id, module);
-    }
+
     get plugin() {
-        return PluginManager.getPluginById(this.pluginInfo.id || this.pluginInfo.name.toLowerCase().replace(/[^a-zA-Z0-9-]/g, '-').replace(/--/g, '-'));
+        return PluginManager.getPluginByPath(this.pluginPath);
     }
 
     async bridge(plugin_id) {
@@ -61,15 +54,18 @@ export default class PluginApi {
 
     get Api() { return this }
 
+    get AsyncEventEmitter() { return AsyncEventEmitter }
+    get EventsWrapper() { return EventsWrapper }
+
     /**
      * Logger
      */
 
-    loggerLog(...message) { Logger.log(this.pluginInfo.name, message) }
-    loggerErr(...message) { Logger.err(this.pluginInfo.name, message) }
-    loggerWarn(...message) { Logger.warn(this.pluginInfo.name, message) }
-    loggerInfo(...message) { Logger.info(this.pluginInfo.name, message) }
-    loggerDbg(...message) { Logger.dbg(this.pluginInfo.name, message) }
+    loggerLog(...message) { Logger.log(this.plugin.name, message) }
+    loggerErr(...message) { Logger.err(this.plugin.name, message) }
+    loggerWarn(...message) { Logger.warn(this.plugin.name, message) }
+    loggerInfo(...message) { Logger.info(this.plugin.name, message) }
+    loggerDbg(...message) { Logger.dbg(this.plugin.name, message) }
     get Logger() {
         return {
             log: this.loggerLog.bind(this),
@@ -381,6 +377,24 @@ export default class PluginApi {
         });
     }
 
+    /**
+     * DiscordApi
+     */
+
+    get Discord() {
+        return DiscordApi;
+    }
+
+    get ReactComponents() {
+        return ReactComponents;
+    }
+    get Reflection() {
+        return Reflection;
+    }
+    get MonkeyPatch() {
+        return module => MonkeyPatch(this.plugin.id, module);
+    }
+
 }
 
 // Stop plugins from modifying the plugin API for all plugins
diff --git a/client/src/modules/pluginmanager.js b/client/src/modules/pluginmanager.js
index 198d06e1..9275eda2 100644
--- a/client/src/modules/pluginmanager.js
+++ b/client/src/modules/pluginmanager.js
@@ -76,12 +76,12 @@ export default class extends ContentManager {
     static async loadPlugin(paths, configs, info, main, dependencies, permissions) {
         if (permissions && permissions.length > 0) {
             for (let perm of permissions) {
-                console.log(`Permission: ${Permissions.permissionText(perm).HEADER} - ${Permissions.permissionText(perm).BODY}`);
+                Logger.log(this.moduleName, `Permission: ${Permissions.permissionText(perm).HEADER} - ${Permissions.permissionText(perm).BODY}`);
             }
             try {
                 const allowed = await Modals.permissions(`${info.name} wants to:`, info.name, permissions).promise;
             } catch (err) {
-                return null;
+                return;
             }
         }
 
@@ -98,7 +98,7 @@ export default class extends ContentManager {
             }
         }
 
-        const plugin = window.require(paths.mainPath)(Plugin, new PluginApi(info), Vendor, deps);
+        const plugin = window.require(paths.mainPath)(Plugin, new PluginApi(info, paths.contentPath), Vendor, deps);
         if (!(plugin.prototype instanceof Plugin))
             throw {message: `Plugin ${info.name} did not return a class that extends Plugin.`};
 
diff --git a/client/src/modules/settings.js b/client/src/modules/settings.js
index de4f4a0b..f382ec0d 100644
--- a/client/src/modules/settings.js
+++ b/client/src/modules/settings.js
@@ -8,22 +8,23 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import defaultSettings from '../data/user.settings.default';
-import Globals from './globals';
-import CssEditor from './csseditor';
-import Events from './events';
 import { Utils, FileUtils, ClientLogger as Logger } from 'common';
 import { SettingsSet, SettingUpdatedEvent } from 'structs';
 import path from 'path';
+import Globals from './globals';
+import CssEditor from './csseditor';
+import Events from './events';
+import defaultSettings from '../data/user.settings.default';
 
 export default new class Settings {
+
     constructor() {
         this.settings = defaultSettings.map(_set => {
             const set = new SettingsSet(_set);
 
             set.on('setting-updated', event => {
                 const { category, setting, value, old_value } = event;
-                Logger.log('Settings', `${set.id}/${category.id}/${setting.id} was changed from ${old_value} to ${value}`);
+                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);
             });
@@ -37,6 +38,9 @@ export default new class Settings {
         });
     }
 
+    /**
+     * Loads BetterDiscord's settings.
+     */
     async loadSettings() {
         try {
             await FileUtils.ensureDirectory(this.dataPath);
@@ -48,7 +52,7 @@ export default new class Settings {
             for (let set of this.settings) {
                 const newSet = settings.find(s => s.id === set.id);
                 if (!newSet) continue;
-                set.merge(newSet);
+                await set.merge(newSet);
                 set.setSaved();
             }
 
@@ -61,6 +65,9 @@ export default new class Settings {
         }
     }
 
+    /**
+     * Saves BetterDiscord's settings including CSS editor data.
+     */
     async saveSettings() {
         try {
             await FileUtils.ensureDirectory(this.dataPath);
@@ -72,15 +79,10 @@ export default new class Settings {
                 css: CssEditor.css,
                 css_editor_files: CssEditor.files,
                 scss_error: CssEditor.error,
-                css_editor_bounds: {
-                    width: CssEditor.editor_bounds.width,
-                    height: CssEditor.editor_bounds.height,
-                    x: CssEditor.editor_bounds.x,
-                    y: CssEditor.editor_bounds.y
-                }
+                css_editor_bounds: CssEditor.editor_bounds
             });
 
-            for (let set of this.getSettings) {
+            for (let set of this.settings) {
                 set.setSaved();
             }
         } catch (err) {
@@ -90,8 +92,13 @@ export default new class Settings {
         }
     }
 
+    /**
+     * Finds one of BetterDiscord's settings sets.
+     * @param {String} set_id The ID of the set to find
+     * @return {SettingsSet}
+     */
     getSet(set_id) {
-        return this.getSettings.find(s => s.id === set_id);
+        return this.settings.find(s => s.id === set_id);
     }
 
     get core() { return this.getSet('core') }
@@ -100,39 +107,46 @@ export default new class Settings {
     get css() { return this.getSet('css') }
     get security() { return this.getSet('security') }
 
+    /**
+     * Finds a category in one of BetterDiscord's settings sets.
+     * @param {String} set_id The ID of the set to look in
+     * @param {String} category_id The ID of the category to find
+     * @return {SettingsCategory}
+     */
     getCategory(set_id, category_id) {
         const set = this.getSet(set_id);
         return set ? set.getCategory(category_id) : undefined;
     }
 
+    /**
+     * Finds a setting in one of BetterDiscord's settings sets.
+     * @param {String} set_id The ID of the set to look in
+     * @param {String} category_id The ID of the category to look in
+     * @param {String} setting_id The ID of the setting to find
+     * @return {Setting}
+     */
     getSetting(set_id, category_id, setting_id) {
         const set = this.getSet(set_id);
         return set ? set.getSetting(category_id, setting_id) : undefined;
     }
 
+    /**
+     * Returns a setting's value in one of BetterDiscord's settings sets.
+     * @param {String} set_id The ID of the set to look in
+     * @param {String} category_id The ID of the category to look in
+     * @param {String} setting_id The ID of the setting to find
+     * @return {Any}
+     */
     get(set_id, category_id, setting_id) {
         const set = this.getSet(set_id);
         return set ? set.get(category_id, setting_id) : undefined;
     }
 
-    async mergeSettings(set_id, newSettings) {
-        const set = this.getSet(set_id);
-        if (!set) return;
-
-        return await set.merge(newSettings);
-    }
-
-    setSetting(set_id, category_id, setting_id, value) {
-        const setting = this.getSetting(set_id, category_id, setting_id);
-        if (!setting) throw {message: `Tried to set ${set_id}/${category_id}/${setting_id}, which doesn't exist`};
-        setting.value = value;
-    }
-
-    get getSettings() {
-        return this.settings;
-    }
-
+    /**
+     * The path to store user data in.
+     */
     get dataPath() {
         return Globals.getPath('data');
     }
+
 }
diff --git a/client/src/modules/socketproxy.js b/client/src/modules/socketproxy.js
index 745d32a8..e3657343 100644
--- a/client/src/modules/socketproxy.js
+++ b/client/src/modules/socketproxy.js
@@ -8,6 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+import { ClientLogger as Logger } from 'common';
 import EventListener from './eventlistener';
 
 export default class SocketProxy extends EventListener {
@@ -19,7 +20,7 @@ export default class SocketProxy extends EventListener {
 
     get eventBindings() {
         return [
-            { id: 'socket-created', 'callback': this.socketCreated }
+            { id: 'socket-created', callback: this.socketCreated }
         ];
     }
 
@@ -29,11 +30,11 @@ export default class SocketProxy extends EventListener {
 
     socketCreated(socket) {
         this.activeSocket = socket;
-       // socket.addEventListener('message', this.onMessage);
+        // socket.addEventListener('message', this.onMessage);
     }
 
     onMessage(e) {
-        console.info(e);
+        Logger.info('SocketProxy', e);
     }
 
 }
diff --git a/client/src/modules/theme.js b/client/src/modules/theme.js
index b02ba3ed..bbabc810 100644
--- a/client/src/modules/theme.js
+++ b/client/src/modules/theme.js
@@ -31,10 +31,6 @@ export default class Theme extends Content {
     get type() { return 'theme' }
     get css() { return this.data.css }
 
-    // Don't use - these will eventually be removed!
-    get themePath() { return this.contentPath }
-    get themeConfig() { return this.config }
-
     /**
      * Called when settings are updated.
      * This can be overridden by other content types.
@@ -63,7 +59,7 @@ export default class Theme extends Content {
      * @return {Promise}
      */
     async compile() {
-        console.log('Compiling CSS');
+        Logger.log(this.name, 'Compiling CSS');
 
         if (this.info.type === 'sass') {
             const config = await ThemeManager.getConfigAsSCSS(this.settings);
@@ -76,7 +72,7 @@ export default class Theme extends Content {
             Logger.log(this.name, ['Finished compiling theme', new class Info {
                 get SCSS_variables() { console.log(config); }
                 get Compiled_SCSS() { console.log(result.css.toString()); }
-				get Result() { console.log(result); }
+                get Result() { console.log(result); }
             }]);
 
             return {
@@ -121,6 +117,7 @@ export default class Theme extends Content {
      */
     set files(files) {
         this.data.files = files;
+
         if (Settings.get('css', 'default', 'watch-files'))
             this.watchfiles = files;
     }
diff --git a/client/src/modules/thememanager.js b/client/src/modules/thememanager.js
index 81276c5d..dfaf7a37 100644
--- a/client/src/modules/thememanager.js
+++ b/client/src/modules/thememanager.js
@@ -74,6 +74,11 @@ export default class ThemeManager extends ContentManager {
         return theme instanceof Theme;
     }
 
+    /**
+     * Returns a representation of a settings set's values in SCSS.
+     * @param {SettingsSet} settingsset The set to convert to SCSS
+     * @return {Promise}
+     */
     static async getConfigAsSCSS(settingsset) {
         const variables = [];
 
@@ -87,6 +92,11 @@ export default class ThemeManager extends ContentManager {
         return variables.join('\n');
     }
 
+    /**
+     * Returns a representation of a settings set's values as an SCSS map.
+     * @param {SettingsSet} settingsset The set to convert to an SCSS map
+     * @return {Promise}
+     */
     static async getConfigAsSCSSMap(settingsset) {
         const variables = [];
 
@@ -100,6 +110,11 @@ export default class ThemeManager extends ContentManager {
         return '(' + variables.join(', ') + ')';
     }
 
+    /**
+     * Returns a setting's name and value as a string that can be included in SCSS.
+     * @param {Setting} setting The setting to convert to SCSS
+     * @return {Promise}
+     */
     static async parseSetting(setting) {
         const { type, id, value } = setting;
         const name = id.replace(/[^a-zA-Z0-9-]/g, '-').replace(/--/g, '-');
@@ -108,6 +123,11 @@ export default class ThemeManager extends ContentManager {
         if (scss) return [name, scss];
     }
 
+    /**
+     * Escapes a string so it can be included in SCSS.
+     * @param {String} value The string to escape
+     * @return {String}
+     */
     static toSCSSString(value) {
         if (typeof value !== 'string' && value.toString) value = value.toString();
         return `'${typeof value === 'string' ? value.replace(/\\/g, '\\\\').replace(/'/g, '\\\'') : ''}'`;
diff --git a/client/src/modules/updater.js b/client/src/modules/updater.js
index 08efbc8c..36ec548d 100644
--- a/client/src/modules/updater.js
+++ b/client/src/modules/updater.js
@@ -22,6 +22,9 @@ export default class {
         this.checkForUpdates = this.checkForUpdates.bind(this);
     }
 
+    /**
+     * The interval to wait before checking for updates.
+     */
     get interval() {
         return 60 * 1000 * 30;
     }
@@ -30,34 +33,51 @@ export default class {
         this.updateInterval = setInterval(this.checkForUpdates, this.interval);
     }
 
+    /**
+     * Installs an update.
+     * TODO
+     */
     update() {
-        // TODO
         this.updatesAvailable = false;
         Events.emit('update-check-end');
     }
 
+    /**
+     * Checks for updates.
+     * @return {Promise}
+     */
     checkForUpdates() {
-        if (this.updatesAvailable) return;
-        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 {
-                    Events.emit('update-check-end');
-                    Logger.info('Updater',
-                        `Latest Version: ${e.version} - Current Version: ${Globals.version}`);
-                    if (e.version !== Globals.version) {
-                        this.updatesAvailable = true;
-                        Events.emit('updates-available');
+        return new Promise((resolve, reject) => {
+            if (this.updatesAvailable) return resolve(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 {
+                        Events.emit('update-check-end');
+                        Logger.info('Updater', `Latest Version: ${e.version} - Current Version: ${Globals.getObject('version')}`);
+
+                        if (e.version !== Globals.getObject('version')) {
+                            this.updatesAvailable = true;
+                            Events.emit('updates-available');
+                            resolve(true);
+                        }
+
+                        resolve(false);
+                    } catch (err) {
+                        Events.emit('update-check-fail', err);
+                        reject(err);
                     }
-                } catch (err) {
+                },
+                fail: err => {
                     Events.emit('update-check-fail', err);
+                    reject(err);
                 }
-            },
-            fail: e => Events.emit('update-check-fail', e)
+            });
         });
     }
 
diff --git a/client/src/modules/vendor.js b/client/src/modules/vendor.js
index 7ce84fa1..29d5a804 100644
--- a/client/src/modules/vendor.js
+++ b/client/src/modules/vendor.js
@@ -16,22 +16,21 @@ export { jQuery as $ };
 
 export default class {
 
-    static get jQuery() {
-        return jQuery;
-    }
+    /**
+     * jQuery
+     */
+    static get jQuery() { return jQuery }
+    static get $() { return this.jQuery }
 
-    static get $() {
-        return this.jQuery;
-    }
-
-    static get lodash() {
-        return lodash;
-    }
-
-    static get _() {
-        return this.lodash;
-    }
+    /**
+     * Lodash
+     */
+    static get lodash() { return lodash }
+    static get _() { return this.lodash }
 
+    /**
+     * Moment
+     */
     static get moment() {
         return WebpackModules.getModuleByName('Moment');
     }
diff --git a/client/src/modules/webpackmodules.js b/client/src/modules/webpackmodules.js
index 82906d67..71b03ecd 100644
--- a/client/src/modules/webpackmodules.js
+++ b/client/src/modules/webpackmodules.js
@@ -51,6 +51,8 @@ const KnownModules = {
     React: Filters.byProperties(['createElement', 'cloneElement']),
     ReactDOM: Filters.byProperties(['render', 'findDOMNode']),
 
+    Events: Filters.byPrototypeFields(['setMaxListeners', 'emit']),
+
     /* Guild Info, Stores, and Utilities */
     GuildStore: Filters.byProperties(['getGuild']),
     SortedGuildStore: Filters.byProperties(['getSortedGuilds']),
@@ -207,37 +209,37 @@ const KnownModules = {
 
 export 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
-	 * @return {Any}
-	 */
-	static getModule(filter, first = true) {
-		const modules = this.getAllModules();
-		const rm = [];
-		for (let index in modules) {
-			if (!modules.hasOwnProperty(index)) continue;
-			const module = modules[index];
-			const { exports } = module;
-			let foundModule = null;
+    /**
+     * 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
+     * @return {Any}
+     */
+    static getModule(filter, first = true) {
+        const modules = this.getAllModules();
+        const rm = [];
+        for (let index in modules) {
+            if (!modules.hasOwnProperty(index)) continue;
+            const module = modules[index];
+            const { exports } = module;
+            let foundModule = null;
 
-			if (!exports) continue;
-			if (exports.__esModule && exports.default && filter(exports.default)) foundModule = exports.default;
-			if (filter(exports)) foundModule = exports;
-			if (!foundModule) continue;
-			if (first) return foundModule;
-			rm.push(foundModule);
-		}
-		return first || rm.length == 0 ? undefined : rm;
-	}
+            if (!exports) continue;
+            if (exports.__esModule && exports.default && filter(exports.default)) foundModule = exports.default;
+            if (filter(exports)) foundModule = exports;
+            if (!foundModule) continue;
+            if (first) return foundModule;
+            rm.push(foundModule);
+        }
+        return first || rm.length == 0 ? undefined : rm;
+    }
 
-	/**
-	 * 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}
-	 */
+    /**
+     * 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 getModuleByName(name, fallback) {
         if (Cache.hasOwnProperty(name)) return Cache[name];
         if (KnownModules.hasOwnProperty(name)) fallback = KnownModules[name];
@@ -246,48 +248,48 @@ export class WebpackModules {
         return module ? Cache[name] = module : undefined;
     }
 
-	/**
-	 * Finds a module by it's display name.
-	 * @param {String} name The display name of the module
-	 * @return {Any}
-	 */
+    /**
+     * Finds a module by it's display name.
+     * @param {String} name The display name of the module
+     * @return {Any}
+     */
     static getModuleByDisplayName(name) {
         return this.getModule(Filters.byDisplayName(name), true);
     }
 
-	/**
-	 * Finds a module using it's code.
-	 * @param {RegEx} regex A regular expression to use to filter modules
-	 * @param {Boolean} first Whether to return the only the first matching module
-	 * @return {Any}
-	 */
+    /**
+     * Finds a module using it's code.
+     * @param {RegEx} regex A regular expression to use to filter modules
+     * @param {Boolean} first Whether to return the only the first matching module
+     * @return {Any}
+     */
     static getModuleByRegex(regex, first = true) {
         return this.getModule(Filters.byCode(regex), first);
     }
 
-	/**
-	 * Finds a module using properties on it's prototype.
-	 * @param {Array} props Properties to use to filter modules
-	 * @param {Boolean} first Whether to return only the first matching module
-	 * @return {Any}
-	 */
+    /**
+     * Finds a module using properties on it's prototype.
+     * @param {Array} props Properties to use to filter modules
+     * @param {Boolean} first Whether to return only the first matching module
+     * @return {Any}
+     */
     static getModuleByPrototypes(prototypes, first = true) {
         return this.getModule(Filters.byPrototypeFields(prototypes), first);
     }
 
-	/**
-	 * Finds a module using it's own properties.
-	 * @param {Array} props Properties to use to filter modules
-	 * @param {Boolean} first Whether to return only the first matching module
-	 * @return {Any}
-	 */
+    /**
+     * Finds a module using it's own properties.
+     * @param {Array} props Properties to use to filter modules
+     * @param {Boolean} first Whether to return only the first matching module
+     * @return {Any}
+     */
     static getModuleByProps(props, first = true) {
         return this.getModule(Filters.byProperties(props), first);
     }
 
-	/**
-	 * Discord's __webpack_require__ function.
-	 */
+    /**
+     * Discord's __webpack_require__ function.
+     */
     static get require() {
         if (this._require) return this._require;
         const id = 'bd-webpackmodules';
diff --git a/client/src/structs/events/error.js b/client/src/structs/events/error.js
index 04f8bf8f..4268c753 100644
--- a/client/src/structs/events/error.js
+++ b/client/src/structs/events/error.js
@@ -17,22 +17,37 @@ export default class ErrorEvent extends Event {
         this.showStack = false; // For error modal
     }
 
+    /**
+     * The module the error occured in.
+     */
     get module() {
         return this.args.module;
     }
 
+    /**
+     * A message describing the error.
+     */
     get message() {
         return this.args.message;
     }
 
+    /**
+     * The original error object.
+     */
     get err() {
         return this.args.err;
     }
 
+    /**
+     * A trace showing which functions were called when the error occured.
+     */
     get stackTrace() {
         return this.err.stack;
     }
 
+    /**
+     * The type of event.
+     */
     get __eventType() {
         return 'error';
     }
diff --git a/client/src/structs/events/event.js b/client/src/structs/events/event.js
index 1159910e..cb26edf6 100644
--- a/client/src/structs/events/event.js
+++ b/client/src/structs/events/event.js
@@ -17,14 +17,23 @@ export default class Event {
         };
     }
 
+    /**
+     * An object containing information about the event.
+     */
     get event() {
         return this.__eventInfo;
     }
 
+    /**
+     * The first argument that was passed to the constructor, which contains information about the event.
+     */
     get args() {
         return this.event.args[0];
     }
 
-    get __eventType() { return null; }
+    /**
+     * The type of event.
+     */
+    get __eventType() { return undefined; }
 
 }
diff --git a/client/src/structs/events/settingsupdated.js b/client/src/structs/events/settingsupdated.js
index 99470ea7..8c8965ad 100644
--- a/client/src/structs/events/settingsupdated.js
+++ b/client/src/structs/events/settingsupdated.js
@@ -12,10 +12,16 @@ import Event from './event';
 
 export default class SettingsUpdatedEvent extends Event {
 
+    /**
+     * An array of SettingUpdated events.
+     */
     get updatedSettings() {
         return this.args.updatedSettings;
     }
 
+    /**
+     * The type of event.
+     */
     get __eventType() {
         return 'settings-updated';
     }
diff --git a/client/src/structs/events/settingupdated.js b/client/src/structs/events/settingupdated.js
index 9edbb19f..c69e81db 100644
--- a/client/src/structs/events/settingupdated.js
+++ b/client/src/structs/events/settingupdated.js
@@ -12,38 +12,65 @@ import Event from './event';
 
 export default class SettingUpdatedEvent extends Event {
 
+    /**
+     * The set containing the setting that was updated.
+     */
     get set() {
         return this.args.set;
     }
 
+    /**
+     * The ID of the set containing the setting that was updated.
+     */
     get set_id() {
-        return this.args.set.id;
+        return this.set.id;
     }
 
+    /**
+     * The category containing the setting that was updated.
+     */
     get category() {
         return this.args.category;
     }
 
+    /**
+     * The ID of the category containing the setting that was updated.
+     */
     get category_id() {
-        return this.args.category.id;
+        return this.category.id;
     }
 
+    /**
+     * The setting that was updated.
+     */
     get setting() {
         return this.args.setting;
     }
 
+    /**
+     * The ID of the setting that was updated.
+     */
     get setting_id() {
-        return this.args.setting.id;
+        return this.setting.id;
     }
 
+    /**
+     * The setting's new value.
+     */
     get value() {
         return this.args.value;
     }
 
+    /**
+     * The setting's old value.
+     */
     get old_value() {
         return this.args.old_value;
     }
 
+    /**
+     * The type of event.
+     */
     get __eventType() {
         return 'setting-updated';
     }
diff --git a/client/src/structs/settings/multiplechoiceoption.js b/client/src/structs/settings/multiplechoiceoption.js
index 70f8abbe..3e583c91 100644
--- a/client/src/structs/settings/multiplechoiceoption.js
+++ b/client/src/structs/settings/multiplechoiceoption.js
@@ -14,22 +14,29 @@ export default class MultipleChoiceOption {
 
     constructor(args) {
         this.args = args.args || args;
+
+        Object.freeze(this);
     }
 
+    /**
+     * This option's ID.
+     */
     get id() {
         return this.args.id || this.value;
     }
 
+    /**
+     * A string describing this option.
+     */
     get text() {
         return this.args.text;
     }
 
+    /**
+     * The value to return when this option is active.
+     */
     get value() {
         return this.args.value;
     }
 
-    clone() {
-        return new MultipleChoiceOption(Utils.deepclone(this.args));
-    }
-
 }
diff --git a/client/src/structs/settings/settingsscheme.js b/client/src/structs/settings/settingsscheme.js
index 8f3d945a..2d4a14f6 100644
--- a/client/src/structs/settings/settingsscheme.js
+++ b/client/src/structs/settings/settingsscheme.js
@@ -24,26 +24,46 @@ export default class SettingsScheme {
         Object.freeze(this);
     }
 
+    /**
+     * The scheme's ID.
+     */
     get id() {
         return this.args.id;
     }
 
+    /**
+     * The URL of the scheme's icon. This should be a base64 encoded data URI.
+     */
     get icon_url() {
         return this.args.icon_url;
     }
 
+    /**
+     * The scheme's name.
+     */
     get name() {
         return this.args.name;
     }
 
+    /**
+     * A string to be displayed under the scheme.
+     */
     get hint() {
         return this.args.hint;
     }
 
+    /**
+     * An array of stripped settings categories this scheme manages.
+     */
     get settings() {
         return this.args.settings || [];
     }
 
+    /**
+     * Checks if this scheme's values are currently applied to a set.
+     * @param {SettingsSet} set The set to check
+     * @return {Boolean}
+     */
     isActive(set) {
         for (let schemeCategory of this.settings) {
             const category = set.categories.find(c => c.category === schemeCategory.category);
@@ -66,12 +86,13 @@ export default class SettingsScheme {
         return true;
     }
 
+    /**
+     * Applies this scheme's values to a set.
+     * @param {SettingsSet} set The set to merge this scheme's values into
+     * @return {Promise}
+     */
     applyTo(set) {
-        return set.merge({ settings: this.settings });
-    }
-
-    clone() {
-        return new SettingsScheme(Utils.deepclone(this.args));
+        return set.merge(this);
     }
 
 }
diff --git a/client/src/structs/settings/settingsset.js b/client/src/structs/settings/settingsset.js
index 5b324a69..bb87fac9 100644
--- a/client/src/structs/settings/settingsset.js
+++ b/client/src/structs/settings/settingsset.js
@@ -446,7 +446,7 @@ export default class SettingsSet {
             text: this.text,
             headertext: this.headertext,
             settings: this.categories.map(category => category.clone()),
-            schemes: this.schemes.map(scheme => scheme.clone())
+            schemes: this.schemes
         }, ...merge);
     }
 
diff --git a/client/src/styles/partials/badges.scss b/client/src/styles/partials/badges.scss
index fee77077..fb5656df 100644
--- a/client/src/styles/partials/badges.scss
+++ b/client/src/styles/partials/badges.scss
@@ -25,16 +25,21 @@
     width: 16px;
     filter: brightness(10);
     cursor: pointer;
-    .theme-light [class*="topSectionNormal-"] & {
-        background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FscXVlXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMjAwMCAyMDAwIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAyMDAwIDIwMDAiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxnPjxwYXRoIGZpbGw9IiMzRTgyRTUiIGQ9Ik0xNDAyLjIsNjMxLjdjLTkuNy0zNTMuNC0yODYuMi00OTYtNjQyLjYtNDk2SDY4LjR2NzE0LjFsNDQyLDM5OFY0OTAuN2gyNTdjMjc0LjUsMCwyNzQuNSwzNDQuOSwwLDM0NC45SDU5Ny42djMyOS41aDE2OS44YzI3NC41LDAsMjc0LjUsMzQ0LjgsMCwzNDQuOGgtNjk5djM1NC45aDY5MS4yYzM1Ni4zLDAsNjMyLjgtMTQyLjYsNjQyLjYtNDk2YzAtMTYyLjYtNDQuNS0yODQuMS0xMjIuOS0zNjguNkMxMzU3LjcsOTE1LjgsMTQwMi4yLDc5NC4zLDE0MDIuMiw2MzEuN3oiLz48cGF0aCBmaWxsPSIjYmJiYmJiIiBkPSJNMTI2Mi41LDEzNS4yTDEyNjIuNSwxMzUuMmwtNzYuOCwwYzI2LjYsMTMuMyw1MS43LDI4LjEsNzUsNDQuM2M3MC43LDQ5LjEsMTI2LjEsMTExLjUsMTY0LjYsMTg1LjNjMzkuOSw3Ni42LDYxLjUsMTY1LjYsNjQuMywyNjQuNmwwLDEuMnYxLjJjMCwxNDEuMSwwLDU5Ni4xLDAsNzM3LjF2MS4ybDAsMS4yYy0yLjcsOTktMjQuMywxODgtNjQuMywyNjQuNmMtMzguNSw3My44LTkzLjgsMTM2LjItMTY0LjYsMTg1LjNjLTIyLjYsMTUuNy00Ni45LDMwLjEtNzIuNiw0My4xaDcyLjVjMzQ2LjIsMS45LDY3MS0xNzEuMiw2NzEtNTY3LjlWNzE2LjdDMTkzMy41LDMxMi4yLDE2MDguNywxMzUuMiwxMjYyLjUsMTM1LjJ6Ii8+PC9nPjwvc3ZnPg==');
-        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 {
     display: inline-block;
     margin-left: 6px;
     height: 11px;
+
     .bd-message-badge-developer,
     .bd-message-badge-contributor {
         width: 12px;
diff --git a/client/src/styles/partials/bdsettings/tooltips.scss b/client/src/styles/partials/bdsettings/tooltips.scss
index 0ec5e69f..3eaa12d4 100644
--- a/client/src/styles/partials/bdsettings/tooltips.scss
+++ b/client/src/styles/partials/bdsettings/tooltips.scss
@@ -20,17 +20,17 @@ bd-tooltips {
     word-wrap: break-word;
     z-index: 9001;
     margin-bottom: 10px;
-}
 
-.bd-tooltip:after {
-    border: 5px solid transparent;
-    content: " ";
-    height: 0;
-    pointer-events: none;
-    width: 0;
-    border-top-color: #000;
-    left: 50%;
-    margin-left: -5px;
-    position: absolute;
-    top: 100%;
+    .bd-tooltip-arrow {
+        border: 5px solid transparent;
+        content: " ";
+        height: 0;
+        pointer-events: none;
+        width: 0;
+        border-top-color: #000;
+        left: 50%;
+        margin-left: -5px;
+        position: absolute;
+        top: 100%;
+    }
 }
diff --git a/client/src/ui/automanip.js b/client/src/ui/automanip.js
index 7331f66c..88f19651 100644
--- a/client/src/ui/automanip.js
+++ b/client/src/ui/automanip.js
@@ -8,37 +8,14 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { Events, WebpackModules, EventListener, ReactComponents, Renderer } from 'modules';
+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';
 
-class TempApi {
-    static get currentGuildId() {
-        try {
-            return WebpackModules.getModuleByName('SelectedGuildStore').getGuildId();
-        } catch (err) {
-            return 0;
-        }
-    }
-    static get currentChannelId() {
-        try {
-            return WebpackModules.getModuleByName('SelectedChannelStore').getChannelId();
-        } catch (err) {
-            return 0;
-        }
-    }
-    static get currentUserId() {
-        try {
-            return WebpackModules.getModuleByName('UserStore').getCurrentUser().id;
-        } catch (err) {
-            return 0;
-        }
-    }
-}
-
 export default class extends EventListener {
 
     constructor(args) {
@@ -54,22 +31,19 @@ export default class extends EventListener {
     }
 
     get eventBindings() {
-        return [{ id: 'gkh:keyup', callback: this.injectAutocomplete }];
-        /*
         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: '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', TempApi.currentGuildId);
-            this.appMount.setAttribute('channel-id', TempApi.currentChannelId);
+            this.appMount.setAttribute('guild-id', DiscordApi.currentGuild.id);
+            this.appMount.setAttribute('channel-id', DiscordApi.currentChannel.id);
             this.setIds();
             this.makeMutable();
         } catch (err) {
@@ -172,14 +146,14 @@ export default class extends EventListener {
             const userTest = Reflection(msgGroup).prop('user');
             if (!userTest) return;
             msgGroup.setAttribute('data-author-id', userTest.id);
-            if (userTest.id === TempApi.currentUserId) msgGroup.setAttribute('data-currentuser', true);
+            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 === TempApi.currentUserId) msgGroup.setAttribute('data-currentuser', true);
+        if (authorid === DiscordApi.currentUser.id) msgGroup.setAttribute('data-currentuser', true);
     }
 
     setUserId(user) {
@@ -187,7 +161,7 @@ export default class extends EventListener {
         const userid = Reflection(user).prop('user.id');
         if (!userid) return;
         user.setAttribute('data-user-id', userid);
-        const currentUser = userid === TempApi.currentUserId;
+        const currentUser = userid === DiscordApi.currentUser.id;
         if (currentUser) user.setAttribute('data-currentuser', true);
         Events.emit('ui:useridset', user);
     }
@@ -218,4 +192,5 @@ export default class extends EventListener {
             template: '<Autocomplete :initial="initial" />'
         });
     }
+
 }
diff --git a/client/src/ui/bdmenu.js b/client/src/ui/bdmenu.js
index c8f6cd60..0eb3a019 100644
--- a/client/src/ui/bdmenu.js
+++ b/client/src/ui/bdmenu.js
@@ -28,7 +28,14 @@ const BdMenuItems = new class {
         this.add({category: 'External', contentid: 'themes', text: 'Themes'});
     }
 
+    /**
+     * Adds an item to the menu.
+     * @param {Object} item The item to add to the menu
+     * @return {Object}
+     */
     add(item) {
+        if (this.items.includes(item)) return item;
+
         item.id = items++;
         item.contentid = item.contentid || (items++ + '');
         item.active = false;
@@ -39,6 +46,13 @@ const BdMenuItems = new class {
         return item;
     }
 
+    /**
+     * Adds a settings set to the menu.
+     * @param {String} category The category to display this item under
+     * @param {SettingsSet} set The settings set to display when this item is active
+     * @param {String} text The text to display in the menu (optional)
+     * @return {Object} The item that was added
+     */
     addSettingsSet(category, set, text) {
         return this.add({
             category, set,
@@ -46,12 +60,23 @@ const BdMenuItems = new class {
         });
     }
 
+    /**
+     * Adds a Vue component to the menu.
+     * @param {String} category The category to display this item under
+     * @param {String} text The text to display in the menu
+     * @param {Object} component The Vue component to display when this item is active
+     * @return {Object} The item that was added
+     */
     addVueComponent(category, text, component) {
         return this.add({
             category, text, component
         });
     }
 
+    /**
+     * Removes an item from the menu.
+     * @param {Object} item The item to remove from the menu
+     */
     remove(item) {
         Utils.removeFromArray(this.items, item);
     }
diff --git a/client/src/ui/bdui.js b/client/src/ui/bdui.js
index 009a2905..458fcf12 100644
--- a/client/src/ui/bdui.js
+++ b/client/src/ui/bdui.js
@@ -8,48 +8,21 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+import { Events, WebpackModules, DiscordApi } from 'modules';
+import { Utils } from 'common';
+import { remote } from 'electron';
 import DOM from './dom';
 import Vue from './vue';
-import { BdSettingsWrapper } from './components';
-import BdModals from './components/bd/BdModals.vue';
-import { Events, WebpackModules } from 'modules';
-import { Utils } from 'common';
 import AutoManip from './automanip';
-import { remote } from 'electron';
-
-class TempApi {
-    static get currentGuild() {
-        try {
-            const currentGuildId = WebpackModules.getModuleByName('SelectedGuildStore').getGuildId();
-            return WebpackModules.getModuleByName('GuildStore').getGuild(currentGuildId);
-        } catch (err) {
-            return null;
-        }
-    }
-    static get currentChannel() {
-        try {
-            const currentChannelId = WebpackModules.getModuleByName('SelectedChannelStore').getChannelId();
-            return WebpackModules.getModuleByName('ChannelStore').getChannel(currentChannelId);
-        } catch (err) {
-            return 0;
-        }
-    }
-    static get currentUserId() {
-        try {
-            return WebpackModules.getModuleByName('UserStore').getCurrentUser().id;
-        } catch (err) {
-            return 0;
-        }
-    }
-}
+import { BdSettingsWrapper, BdModals } from './components';
 
 export default class {
 
     static initUiEvents() {
         this.pathCache = {
             isDm: null,
-            server: TempApi.currentGuild,
-            channel: TempApi.currentChannel
+            server: DiscordApi.currentGuild,
+            channel: DiscordApi.currentChannel
         };
         window.addEventListener('keyup', e => Events.emit('gkh:keyup', e));
         this.autoManip = new AutoManip();
@@ -67,9 +40,9 @@ export default class {
             if (!remote.BrowserWindow.getFocusedWindow()) return;
             clearInterval(ehookInterval);
             remote.BrowserWindow.getFocusedWindow().webContents.on('did-navigate-in-page', (e, url, isMainFrame) => {
-                const { currentGuild, currentChannel } = TempApi;
+                const { currentGuild, currentChannel } = DiscordApi;
                 if (!this.pathCache.server) {
-                    Events.emit('server-switch', { 'server': currentGuild, 'channel': currentChannel });
+                    Events.emit('server-switch', { server: currentGuild, channel: currentChannel });
                     this.pathCache.server = currentGuild;
                     this.pathCache.channel = currentChannel;
                     return;
@@ -84,7 +57,7 @@ export default class {
                     currentGuild.id &&
                     this.pathCache.server &&
                     this.pathCache.server.id !== currentGuild.id) {
-                    Events.emit('server-switch', { 'server': currentGuild, 'channel': currentChannel });
+                    Events.emit('server-switch', { server: currentGuild, channel: currentChannel });
                     this.pathCache.server = currentGuild;
                     this.pathCache.channel = currentChannel;
                     return;
@@ -110,19 +83,19 @@ export default class {
         DOM.createElement('div', null, 'bd-modals').appendTo(DOM.bdModals);
         DOM.createElement('bd-tooltips').appendTo(DOM.bdBody);
 
-        const modals = new Vue({
+        this.modals = new Vue({
             el: '#bd-modals',
             components: { BdModals },
-            template: '<BdModals/>'
+            template: '<BdModals />'
         });
 
-        const vueInstance = new Vue({
+        this.vueInstance = new Vue({
             el: '#bd-settings',
             components: { BdSettingsWrapper },
-            template: '<BdSettingsWrapper/>'
+            template: '<BdSettingsWrapper />'
         });
 
-        return vueInstance;
+        return this.vueInstance;
     }
 
 }
diff --git a/client/src/ui/components/bd/BdModals.vue b/client/src/ui/components/BdModals.vue
similarity index 92%
rename from client/src/ui/components/bd/BdModals.vue
rename to client/src/ui/components/BdModals.vue
index 60a85d32..78e04f3b 100644
--- a/client/src/ui/components/bd/BdModals.vue
+++ b/client/src/ui/components/BdModals.vue
@@ -19,13 +19,14 @@
         </div>
     </div>
 </template>
+
 <script>
     // Imports
     import { Events } from 'modules';
     import { Modals } from 'ui';
-    import { Modal } from '../common';
-    import { MiError } from '../common/MaterialIcon';
-    import ErrorModal from './modals/ErrorModal.vue';
+    import { Modal } from './common';
+    import { MiError } from './common/MaterialIcon';
+    import ErrorModal from './bd/modals/ErrorModal.vue';
 
     export default {
         components: {
diff --git a/client/src/ui/components/BdSettings.vue b/client/src/ui/components/BdSettings.vue
index 0fbff82d..cf6fc888 100644
--- a/client/src/ui/components/BdSettings.vue
+++ b/client/src/ui/components/BdSettings.vue
@@ -131,7 +131,7 @@
                 this.timeout = setTimeout(() => {
                     this.animating = false;
                     this.lastActiveIndex = -1;
-					this.timeout = null;
+                    this.timeout = null;
                 }, 400);
             },
             openGithub() {
diff --git a/client/src/ui/components/bd/PluginCard.vue b/client/src/ui/components/bd/PluginCard.vue
index a35cf18e..9438fd36 100644
--- a/client/src/ui/components/bd/PluginCard.vue
+++ b/client/src/ui/components/bd/PluginCard.vue
@@ -21,16 +21,12 @@
 </template>
 <script>
     // Imports
+    import { ClientLogger as Logger } from 'common';
     import { shell } from 'electron';
     import Card from './Card.vue';
     import { Button, ButtonGroup, SettingSwitch, MiSettings, MiRefresh, MiPencil, MiDelete, MiExtension } from '../common';
 
     export default {
-        data() {
-            return {
-                settingsOpen: false
-            }
-        },
         props: ['plugin', 'togglePlugin', 'reloadPlugin', 'deletePlugin', 'showSettings'],
         components: {
             Card, Button, ButtonGroup, SettingSwitch, MiSettings, MiRefresh, MiPencil, MiDelete, MiExtension
@@ -38,9 +34,9 @@
         methods: {
             editPlugin() {
                 try {
-                    shell.openItem(this.plugin.pluginPath);
+                    shell.openItem(this.plugin.contentPath);
                 } catch (err) {
-                    console.log(err);
+                    Logger.err('PluginCard', [`Error opening plugin directory ${this.plugin.contentPath}:`, err]);
                 }
             }
         }
diff --git a/client/src/ui/components/bd/PluginsView.vue b/client/src/ui/components/bd/PluginsView.vue
index 45fa08c8..09809efd 100644
--- a/client/src/ui/components/bd/PluginsView.vue
+++ b/client/src/ui/components/bd/PluginsView.vue
@@ -37,17 +37,19 @@
     // Imports
     import { PluginManager } from 'modules';
     import { Modals } from 'ui';
-    import { SettingsWrapper } from './';
-    import PluginCard from './PluginCard.vue';
+    import { ClientLogger as Logger } from 'common';
     import { MiRefresh } from '../common';
+    import SettingsWrapper from './SettingsWrapper.vue';
+    import PluginCard from './PluginCard.vue';
     import RefreshBtn from '../common/RefreshBtn.vue';
 
     export default {
         data() {
             return {
+                PluginManager,
                 local: true,
                 localPlugins: PluginManager.localPlugins
-            }
+            };
         },
         components: {
             SettingsWrapper, PluginCard,
@@ -62,32 +64,32 @@
                 this.local = false;
             },
             async refreshLocal() {
-                await PluginManager.refreshPlugins();
+                await this.PluginManager.refreshPlugins();
             },
             async refreshOnline() {
-
+                // TODO
             },
             async togglePlugin(plugin) {
-                // TODO Display error if plugin fails to start/stop
+                // TODO: display error if plugin fails to start/stop
+                const enabled = plugin.enabled;
                 try {
-                    await plugin.enabled ? PluginManager.stopPlugin(plugin) : PluginManager.startPlugin(plugin);
+                    await enabled ? this.PluginManager.stopPlugin(plugin) : this.PluginManager.startPlugin(plugin);
                 } catch (err) {
-                    console.log(err);
+                    Logger.err('PluginsView', [`Error ${enabled ? 'stopp' : 'start'}ing plugin ${plugin.name}:`, err]);
                 }
             },
             async reloadPlugin(plugin) {
                 try {
-                    await PluginManager.reloadPlugin(plugin);
+                    await this.PluginManager.reloadPlugin(plugin);
                 } catch (err) {
-                    console.log(err);
+                    Logger.err('PluginsView', [`Error reloading plugin ${plugin.name}:`, err]);
                 }
             },
             async deletePlugin(plugin, unload) {
                 try {
-                    if (unload) await PluginManager.unloadPlugin(plugin);
-                    else await PluginManager.deletePlugin(plugin);
+                    await unload ? this.PluginManager.unloadPlugin(plugin) : this.PluginManager.deletePlugin(plugin);
                 } catch (err) {
-                    console.error(err);
+                    Logger.err('PluginsView', [`Error ${unload ? 'unload' : 'delet'}ing plugin ${plugin.name}:`, err]);
                 }
             },
             showSettings(plugin, dont_clone) {
diff --git a/client/src/ui/components/bd/ThemeCard.vue b/client/src/ui/components/bd/ThemeCard.vue
index 2cb29f9d..83c67d1a 100644
--- a/client/src/ui/components/bd/ThemeCard.vue
+++ b/client/src/ui/components/bd/ThemeCard.vue
@@ -26,11 +26,6 @@
     import { Button, ButtonGroup, SettingSwitch, MiSettings, MiRefresh, MiPencil, MiDelete, MiExtension } from '../common';
 
     export default {
-        data() {
-            return {
-                settingsOpen: false
-            }
-        },
         props: ['theme', 'toggleTheme', 'reloadTheme', 'deleteTheme', 'showSettings'],
         components: {
             Card, Button, ButtonGroup, SettingSwitch, MiSettings, MiRefresh, MiPencil, MiDelete, MiExtension
@@ -40,7 +35,7 @@
                 try {
                     shell.openItem(this.theme.themePath);
                 } catch (err) {
-                    console.log(err);
+                    Logger.err('ThemeCard', [`Error opening theme directory ${this.theme.contentPath}:`, err]);
                 }
             }
         }
diff --git a/client/src/ui/components/bd/ThemesView.vue b/client/src/ui/components/bd/ThemesView.vue
index c8bbf54f..7d10b9f1 100644
--- a/client/src/ui/components/bd/ThemesView.vue
+++ b/client/src/ui/components/bd/ThemesView.vue
@@ -37,17 +37,19 @@
     // Imports
     import { ThemeManager } from 'modules';
     import { Modals } from 'ui';
-    import { SettingsWrapper } from './';
+    import { ClientLogger as Logger } from 'common';
     import { MiRefresh } from '../common';
+    import SettingsWrapper from './SettingsWrapper.vue';
     import ThemeCard from './ThemeCard.vue';
     import RefreshBtn from '../common/RefreshBtn.vue';
 
     export default {
         data() {
             return {
+                ThemeManager,
                 local: true,
                 localThemes: ThemeManager.localThemes
-            }
+            };
         },
         components: {
             SettingsWrapper, ThemeCard,
@@ -62,33 +64,31 @@
                 this.local = false;
             },
             async refreshLocal() {
-                await ThemeManager.refreshThemes();
+                await this.ThemeManager.refreshThemes();
             },
             async refreshOnline() {
-
+                // TODO
             },
             async toggleTheme(theme) {
-                // TODO Display error if theme fails to enable/disable
+                // TODO: display error if theme fails to enable/disable
                 try {
-                    await theme.enabled ? ThemeManager.disableTheme(theme) : ThemeManager.enableTheme(theme);
+                    await theme.enabled ? this.ThemeManager.disableTheme(theme) : this.ThemeManager.enableTheme(theme);
                 } catch (err) {
-                    console.log(err);
+                    Logger.err('ThemesView', [`Error ${enabled ? 'stopp' : 'start'}ing theme ${theme.name}:`, err]);
                 }
             },
             async reloadTheme(theme, reload) {
                 try {
-                    if (reload) await ThemeManager.reloadTheme(theme);
-                    else await theme.recompile();
+                    await reload ? this.ThemeManager.reloadTheme(theme) : theme.recompile();
                 } catch (err) {
-                    console.log(err);
+                    Logger.err('ThemesView', [`Error ${reload ? 'reload' : 'recompil'}ing theme ${theme.name}:`, err]);
                 }
             },
             async deleteTheme(theme, unload) {
                 try {
-                    if (unload) await ThemeManager.unloadTheme(theme);
-                    else await ThemeManager.deleteTheme(theme);
+                    await unload ? this.ThemeManager.unloadTheme(theme) : this.ThemeManager.deleteTheme(theme);
                 } catch (err) {
-                    console.error(err);
+                    Logger.err('ThemesView', [`Error ${unload ? 'unload' : 'delet'}ing theme ${theme.name}:`, err]);
                 }
             },
             showSettings(theme, dont_clone) {
diff --git a/client/src/ui/components/bd/setting/Keybind.vue b/client/src/ui/components/bd/setting/Keybind.vue
index e59b3b35..e5258eb2 100644
--- a/client/src/ui/components/bd/setting/Keybind.vue
+++ b/client/src/ui/components/bd/setting/Keybind.vue
@@ -25,7 +25,7 @@
 
 <script>
     import { shell } from 'electron';
-    import { ClientIPC } from 'common';
+    import { ClientIPC, ClientLogger as Logger } from 'common';
     import Combokeys from 'combokeys';
     import CombokeysRecord from 'combokeys/plugins/record';
 
@@ -65,7 +65,7 @@
                 this.active = false;
                 this.recordingValue = undefined;
                 this.setting.value = sequence.join(' ');
-                console.log('keypress', sequence);
+                Logger.log('Keybind', ['Recorded sequence', sequence]);
             },
             getDisplayString(value) {
                 if (!value) return;
diff --git a/client/src/ui/components/index.js b/client/src/ui/components/index.js
index 439836f9..8f8e4a8c 100644
--- a/client/src/ui/components/index.js
+++ b/client/src/ui/components/index.js
@@ -1,2 +1,3 @@
 export { default as BdSettingsWrapper } from './BdSettingsWrapper.vue';
 export { default as BdSettings } from './BdSettings.vue';
+export { default as BdModals } from './BdModals.vue';
diff --git a/client/src/ui/dom.js b/client/src/ui/dom.js
index 2a88a2c5..c738ea04 100644
--- a/client/src/ui/dom.js
+++ b/client/src/ui/dom.js
@@ -186,4 +186,5 @@ export default class DOM {
             node.setAttribute(attribute.name, attribute.value);
         }
     }
+
 }
diff --git a/client/src/ui/modals.js b/client/src/ui/modals.js
index 6ebbaa0c..73a56d12 100644
--- a/client/src/ui/modals.js
+++ b/client/src/ui/modals.js
@@ -209,7 +209,7 @@ export default class Modals {
                 ThemeManager._errors = [];
             }
 
-			return modal;
+            return modal;
         }
     }
 
diff --git a/client/src/ui/vue.js b/client/src/ui/vue.js
index ecdc26b9..0ad489cb 100644
--- a/client/src/ui/vue.js
+++ b/client/src/ui/vue.js
@@ -16,8 +16,9 @@ Vue.use(VTooltip, {
     defaultContainer: 'bd-tooltips',
     defaultClass: 'bd-tooltip',
     defaultTargetClass: 'bd-has-tooltip',
+    defaultArrowSelector: '.bd-tooltip-arrow',
     defaultInnerSelector: '.bd-tooltip-inner',
-    defaultTemplate: '<div class="bd-tooltip"><span class="bd-tooltip-inner"></span></div>',
+    defaultTemplate: '<div class="bd-tooltip"><div class="bd-tooltip-arrow"></div><span class="bd-tooltip-inner"></span></div>',
     defaultBoundariesElement: DOM.getElement('#app-mount')
 });
 
diff --git a/client/src/ui/vueinjector.js b/client/src/ui/vueinjector.js
index 085b7390..97371af9 100644
--- a/client/src/ui/vueinjector.js
+++ b/client/src/ui/vueinjector.js
@@ -12,17 +12,14 @@ import Vue from './vue';
 
 export default class {
 
-    static inject(root, bdnode, components, template, replaceRoot) {
-        if(!replaceRoot) bdnode.appendTo(root);
-
-        return new Vue({
-            el: replaceRoot ? root : bdnode.element,
-            components,
-            template
-        });
-    }
-
-    static _inject(root, options, bdnode) {
+    /**
+     * Creates a new Vue object and mounts it in the passed element.
+     * @param {HTMLElement} root The element to mount the new Vue object at
+     * @param {Object} options Options to pass to Vue
+     * @param {BdNode} bdnode The element to append to
+     * @return {Vue}
+     */
+    static inject(root, options, bdnode) {
         if(bdnode) bdnode.appendTo(root);
 
         const vue = new Vue(options);
diff --git a/common/modules/utils.js b/common/modules/utils.js
index c47a30fa..527fab73 100644
--- a/common/modules/utils.js
+++ b/common/modules/utils.js
@@ -8,19 +8,13 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-const
-    path = require('path'),
-    fs = require('fs'),
-    _ = require('lodash');
-
 import { PatchedFunction, Patch } from './monkeypatch';
-import { Vendor } from 'modules';
+import path from 'path';
+import fs from 'fs';
+import _ from 'lodash';
 import filetype from 'file-type';
 
 export class Utils {
-    static isArrowFunction(fn) {
-        return !fn.toString().startsWith('function');
-    }
     static overload(fn, cb) {
         const orig = fn;
         return function (...args) {
@@ -31,6 +25,10 @@ export class Utils {
 
     /**
      * Monkey-patches an object's method.
+     * @param {Object} object The object containing the function to monkey patch
+     * @param {String} methodName The name of the method to monkey patch
+     * @param {Object|String|Function} options Options to pass to the Patch constructor
+     * @param {Function} function If {options} is either "before" or "after", this function will be used as that hook
      */
     static monkeyPatch(object, methodName, options, f) {
         const patchedFunction = new PatchedFunction(object, methodName);
@@ -41,12 +39,31 @@ export class Utils {
 
     /**
      * Monkey-patches an object's method and returns a promise that will be resolved with the data object when the method is called.
-     * You will have to call data.callOriginalMethod() if it wants the original method to be called.
+     * This can only be used to get the arguments and return data. If you want to change anything, call Utils.monkeyPatch with the once option set to true.
      */
     static monkeyPatchOnce(object, methodName) {
+        return new Promise((resolve, reject) => {
+            this.monkeyPatch(object, methodName, 'after', data => {
+                data.patch.cancel();
+                resolve(data);
+            });
+        });
+    }
+
+    /**
+     * Monkey-patches an object's method and returns a promise that will be resolved with the data object when the method is called.
+     * You will have to call data.callOriginalMethod() if you wants the original method to be called.
+     */
+    static monkeyPatchAsync(object, methodName, callback) {
         return new Promise((resolve, reject) => {
             this.monkeyPatch(object, methodName, data => {
                 data.patch.cancel();
+
+                data.promise = data.return = callback ? Promise.all(callback.call(global, data, ...data.arguments)) : new Promise((resolve, reject) => {
+                    data.resolve = resolve;
+                    data.reject = reject;
+                });
+
                 resolve(data);
             });
         });
@@ -81,15 +98,20 @@ export class Utils {
         };
 
         const patch = this.monkeyPatch(what, methodName, {
-            before: before ? compatible_function(before) : undefined,
+            before: !instead && before ? compatible_function(before) : undefined,
             instead: instead ? compatible_function(instead) : undefined,
-            after: after ? compatible_function(after) : undefined,
+            after: !instead && after ? compatible_function(after) : undefined,
             once
         });
 
         return cancelPatch;
     }
 
+    /**
+     * Attempts to parse a string as JSON.
+     * @param {String} json The string to parse
+     * @return {Any}
+     */
     static async tryParseJson(jsonString) {
         try {
             return JSON.parse(jsonString);
@@ -101,6 +123,11 @@ export class Utils {
         }
     }
 
+    /**
+     * Returns a new object with normalised keys.
+     * @param {Object} object
+     * @return {Object}
+     */
     static toCamelCase(o) {
         const camelCased = {};
         _.forEach(o, (value, key) => {
@@ -112,17 +139,20 @@ export class Utils {
         return camelCased;
     }
 
-    static compare(value1, value2) {
+    /**
+     * Checks if two or more values contain the same data.
+     * @param {Any} ...value The value to compare
+     * @return {Boolean}
+     */
+    static compare(value1, value2, ...values) {
         // Check to see if value1 and value2 contain the same data
         if (typeof value1 !== typeof value2) return false;
         if (value1 === null && value2 === null) return true;
         if (value1 === null || value2 === null) return false;
 
-        if (typeof value1 === 'object' || typeof value1 === 'array') {
+        if (typeof value1 === 'object') {
             // Loop through the object and check if everything's the same
-            let value1array = typeof value1 === 'array' ? value1 : Object.keys(value1);
-            let value2array = typeof value2 === 'array' ? value2 : Object.keys(value2);
-            if (value1array.length !== value2array.length) return false;
+            if (Object.keys(value1).length !== Object.keys(value2).length) return false;
 
             for (let key in value1) {
                 if (!this.compare(value1[key], value2[key])) return false;
@@ -130,9 +160,20 @@ export class Utils {
         } else if (value1 !== value2) return false;
 
         // value1 and value2 contain the same data
+        // Check any more values
+        for (let value3 of values) {
+            if (!this.compare(value1, value3))
+                return false;
+        }
+
         return true;
     }
 
+    /**
+     * Clones an object and all it's properties.
+     * @param {Any} value The value to clone
+     * @return {Any} The cloned value
+     */
     static deepclone(value) {
         if (typeof value === 'object') {
             if (value instanceof Array) return value.map(i => this.deepclone(i));
@@ -149,6 +190,11 @@ export class Utils {
         return value;
     }
 
+    /**
+     * 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
+     */
     static deepfreeze(object, exclude) {
         if (exclude && exclude(object)) return;
 
@@ -165,38 +211,57 @@ export class Utils {
         return object;
     }
 
-    static filterArray(array, filter) {
-        const indexes = [];
-        for (let index in array) {
-            if (!filter(array[index], index))
-                indexes.push(index);
-        }
-
-        for (let i in indexes)
-            array.splice(indexes[i] - i, 1);
-
-        return array;
-    }
-
+    /**
+     * Removes an item from an array. This differs from Array.prototype.filter as it mutates the original array instead of creating a new one.
+     * @param {Array} array The array to filter
+     * @param {Any} item The item to remove from the array
+     * @return {Array}
+     */
     static removeFromArray(array, item) {
         let index;
         while ((index = array.indexOf(item)) > -1)
             array.splice(index, 1);
         return array;
     }
+
+    /**
+     * Defines a property with a getter that can be changed like a normal property.
+     * @param {Object} object The object to define a property on
+     * @param {String} property The property to define
+     * @param {Function} getter The property's getter
+     * @return {Object}
+     */
+    static defineSoftGetter(object, property, get) {
+        return Object.defineProperty(object, property, {
+            get,
+            set: value => Object.defineProperty(object, property, {
+                value,
+                writable: true,
+                configurable: true,
+                enumerable: true
+            }),
+            configurable: true,
+            enumerable: true
+        });
+    }
 }
 
 export class FileUtils {
+    /**
+     * Checks if a file exists and is a file.
+     * @param {String} path The file's path
+     * @return {Promise}
+     */
     static async fileExists(path) {
         return new Promise((resolve, reject) => {
             fs.stat(path, (err, stats) => {
                 if (err) return reject({
-                    'message': `No such file or directory: ${err.path}`,
+                    message: `No such file or directory: ${err.path}`,
                     err
                 });
 
                 if (!stats.isFile()) return reject({
-                    'message': `Not a file: ${path}`,
+                    message: `Not a file: ${path}`,
                     stats
                 });
 
@@ -205,16 +270,21 @@ export class FileUtils {
         });
     }
 
+    /**
+     * 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}`,
+                    message: `Directory does not exist: ${path}`,
                     err
                 });
 
                 if (!stats.isDirectory()) return reject({
-                    'message': `Not a directory: ${path}`,
+                    message: `Not a directory: ${path}`,
                     stats
                 });
 
@@ -223,18 +293,25 @@ export class FileUtils {
         });
     }
 
+    /**
+     * Creates a directory.
+     * @param {String} path The directory's path
+     * @return {Promise}
+     */
     static async createDirectory(path) {
         return new Promise((resolve, reject) => {
             fs.mkdir(path, err => {
-                if (err) {
-                    if (err.code === 'EEXIST') return resolve();
-                    else return reject(err);
-                }
-                resolve();
+                if (err) reject(err);
+                else resolve();
             });
         });
     }
 
+    /**
+     * Checks if a directory exists and creates it if it doesn't.
+     * @param {String} path The directory's path
+     * @return {Promise}
+     */
     static async ensureDirectory(path) {
         try {
             await this.directoryExists(path);
@@ -249,17 +326,22 @@ export class FileUtils {
         }
     }
 
+    /**
+     * Returns the contents of a file.
+     * @param {String} path The file's path
+     * @return {Promise}
+     */
     static async readFile(path) {
         try {
             await this.fileExists(path);
         } catch (err) {
-            throw (err);
+            throw err;
         }
 
         return new Promise((resolve, reject) => {
             fs.readFile(path, 'utf-8', (err, data) => {
-                if (err) reject({
-                    'message': `Could not read file: ${path}`,
+                if (err) return reject({
+                    message: `Could not read file: ${path}`,
                     err
                 });
 
@@ -268,24 +350,47 @@ export class FileUtils {
         });
     }
 
+    /**
+     * Returns the contents of a file.
+     * @param {String} path The file's path
+     * @param {Object} options Additional options to pass to fs.readFile
+     * @return {Promise}
+     */
     static async readFileBuffer(path, options) {
+        try {
+            await this.fileExists(path);
+        } catch (err) {
+            throw err;
+        }
+
         return new Promise((resolve, reject) => {
             fs.readFile(path, options || {}, (err, data) => {
-                if (err) return reject(err);
-                resolve(data);
+                if (err) reject(err);
+                else resolve(data);
             });
         });
     }
 
+    /**
+     * Writes to a file.
+     * @param {String} path The file's path
+     * @param {String} data The file's new contents
+     * @return {Promise}
+     */
     static async writeFile(path, data) {
         return new Promise((resolve, reject) => {
             fs.writeFile(path, data, err => {
-                if (err) return reject(err);
-                resolve();
+                if (err) reject(err);
+                else resolve();
             });
         });
     }
 
+    /**
+     * Returns the contents of a file parsed as JSON.
+     * @param {String} path The file's path
+     * @return {Promise}
+     */
     static async readJsonFromFile(path) {
         let readFile;
         try {
@@ -295,41 +400,57 @@ export class FileUtils {
         }
 
         try {
-            const parsed = await Utils.tryParseJson(readFile);
-            return parsed;
+            return await Utils.tryParseJson(readFile);
         } catch (err) {
-            throw (Object.assign(err, { path }));
+            throw Object.assign(err, { path });
         }
     }
 
+    /**
+     * Writes to a file as JSON.
+     * @param {String} path The file's path
+     * @param {Any} data The file's new contents
+     * @return {Promise}
+     */
     static async writeJsonToFile(path, json) {
         return this.writeFile(path, JSON.stringify(json));
     }
 
+    /**
+     * Returns an array of items in a directory.
+     * @param {String} path The directory's path
+     * @return {Promise}
+     */
     static async listDirectory(path) {
-        try {
-            await this.directoryExists(path);
-            return new Promise((resolve, reject) => {
-                fs.readdir(path, (err, files) => {
-                    if (err) return reject(err);
-                    resolve(files);
-                });
+        await this.directoryExists(path);
+        return new Promise((resolve, reject) => {
+            fs.readdir(path, (err, files) => {
+                if (err) reject(err);
+                else resolve(files);
             });
-        } catch (err) {
-            throw err;
-        }
+        });
     }
 
     static async readDir(path) {
         return this.listDirectory(path);
     }
 
+    /**
+     * Returns a file or buffer's MIME type and typical file extension.
+     * @param {String|Buffer} buffer A buffer or the path of a file
+     * @return {Promise}
+     */
     static async getFileType(buffer) {
         if (typeof buffer === 'string') buffer = await this.readFileBuffer(buffer);
 
         return filetype(buffer);
     }
 
+    /**
+     * Returns a file's contents as a data URI.
+     * @param {String} path The directory's path
+     * @return {Promise}
+     */
     static async toDataURI(buffer, type) {
         if (typeof buffer === 'string') buffer = await this.readFileBuffer(buffer);
         if (!type) type = this.getFileType(buffer).mime;

From 1772edd37c44180c4affdfc7206a2daaeff9f090 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Tue, 20 Mar 2018 23:29:00 +0000
Subject: [PATCH 03/23] Cleanup project root and update package-lock.json

---
 .editorconfig                 |    1 +
 .gitattributes                |    2 +-
 .gitignore                    |   32 +-
 .travis.yml                   |    2 +-
 LICENSE                       |    2 +-
 README.MD => README.md        |    3 +-
 client/package.json           |    2 +-
 core/.babelrc                 |    2 +-
 core/gulpfile.js              |    8 +-
 core/index.js                 |    1 -
 core/package.json             |    7 +-
 csseditor/package.json        |    5 +-
 csseditor/webpack.config.js   |   20 +-
 gulpfile.js                   |   38 +-
 installer/package.json        |    5 +-
 installer/webpack.config.js   |    5 +-
 package-lock.json             | 1024 ++++++++++++++++++++++-----------
 package.json                  |    2 -
 scripts/build.bat             |    2 +-
 scripts/rebuild-node-sass.bat |   12 +-
 scripts/watch_client.bat      |    2 +-
 scripts/watch_core.bat        |    2 +-
 tests/config.json             |    4 -
 tests/csseditor/index.html    |   50 --
 tests/csseditor/main.css      |  294 ----------
 tests/csseditor/main.js       |  123 ----
 tests/csseditor/mainold.css   |  448 ---------------
 tests/frontend/index.html     |    5 -
 tests/frontend/main.js        |   26 -
 tests/index.js                |   21 -
 tests/run.bat                 |    1 -
 31 files changed, 750 insertions(+), 1401 deletions(-)
 rename README.MD => README.md (69%)
 delete mode 100644 core/index.js
 delete mode 100644 tests/config.json
 delete mode 100644 tests/csseditor/index.html
 delete mode 100644 tests/csseditor/main.css
 delete mode 100644 tests/csseditor/main.js
 delete mode 100644 tests/csseditor/mainold.css
 delete mode 100644 tests/frontend/index.html
 delete mode 100644 tests/frontend/main.js
 delete mode 100644 tests/index.js
 delete mode 100644 tests/run.bat

diff --git a/.editorconfig b/.editorconfig
index 4fdb56c0..e3711b6b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,6 +2,7 @@ root = true
 
 [*]
 end_of_line = lf
+insert_final_newline = true
 trim_trailing_whitespace = true
 
 indent_style = space
diff --git a/.gitattributes b/.gitattributes
index a77ae3e0..c7fba0f8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1 @@
-*.sh text=auto
\ No newline at end of file
+*.sh text=auto
diff --git a/.gitignore b/.gitignore
index ea11a01e..85ce57bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,9 @@
-.idea/*
-*.name
-devjs/.idea/devjs.iml
-*.bak
-*.bak.*
-*.xpi
-Firefox/data/js/jquery-2.1.4.min.js
-*.dev.*
-/nbproject/private/
+# Generated files
 node_modules
-.sass-cache
-/*.jiiks
-Installers/dotNet/bin/
-Installers/dotNet/packages/
-Installers/dotNet/dlls/
-v2/dist/vendor/
-v2/lib/static.js
-**/*.suo
-Installers/**/*/bin
-Installers/**/*/obj
-Installers/**/*/packages
-.vs
-dist/
-user.config.json
+dist
+etc
+release
+
+# User data
 tests/data
-/tests/themes/SimplerFlat
-release
\ No newline at end of file
+user.config.json
diff --git a/.travis.yml b/.travis.yml
index c732127c..14b21a51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,4 +3,4 @@ node_js:
 - stable
 branches:
   only:
-  - master
\ No newline at end of file
+  - master
diff --git a/LICENSE b/LICENSE
index ac2a6584..ad0371ad 100644
--- a/LICENSE
+++ b/LICENSE
@@ -6,4 +6,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.MD b/README.md
similarity index 69%
rename from README.MD
rename to README.md
index 7c03c365..7c887b4b 100644
--- a/README.MD
+++ b/README.md
@@ -1,3 +1,4 @@
 # BetterDiscordApp [![Travis][build-badge]][build]
+
 [build-badge]: https://img.shields.io/travis/JsSucks/BetterDiscordApp/master.svg
-[build]: https://travis-ci.org/JsSucks/BetterDiscordApp
\ No newline at end of file
+[build]: https://travis-ci.org/JsSucks/BetterDiscordApp
diff --git a/client/package.json b/client/package.json
index aee1ddf3..237c6e98 100644
--- a/client/package.json
+++ b/client/package.json
@@ -5,7 +5,7 @@
   "version": "2.0.0b",
   "homepage": "https://betterdiscord.net",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/betterdiscord.client.js",
   "contributors": [
     "Jiiks",
     "Pohky"
diff --git a/core/.babelrc b/core/.babelrc
index 562ff7c9..01673122 100644
--- a/core/.babelrc
+++ b/core/.babelrc
@@ -7,4 +7,4 @@
             "debug": true
         }]
     ]
-}
\ No newline at end of file
+}
diff --git a/core/gulpfile.js b/core/gulpfile.js
index 0174e5c0..f521aced 100644
--- a/core/gulpfile.js
+++ b/core/gulpfile.js
@@ -5,7 +5,7 @@ const
     plumber = require('gulp-plumber'),
     watch = require('gulp-watch');
 
-const task_babel = function () {
+const task_build = function () {
     return pump([
         gulp.src('src/**/*js'),
         plumber(),
@@ -14,7 +14,7 @@ const task_babel = function () {
     ]);
 }
 
-const watch_babel = function () {
+const task_watch = function () {
     return pump([
         watch('src/**/*js'),
         plumber(),
@@ -23,5 +23,5 @@ const watch_babel = function () {
     ]);
 }
 
-gulp.task('build', task_babel);
-gulp.task('watch', watch_babel);
\ No newline at end of file
+gulp.task('build', task_build);
+gulp.task('watch', task_watch);
diff --git a/core/index.js b/core/index.js
deleted file mode 100644
index 19fd23d9..00000000
--- a/core/index.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = require('./main.js');
diff --git a/core/package.json b/core/package.json
index 498906a5..99f75df3 100644
--- a/core/package.json
+++ b/core/package.json
@@ -5,7 +5,7 @@
   "version": "2.0.0b",
   "homepage": "https://betterdiscord.net",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/main.js",
   "contributors": [
     "Jiiks",
     "Pohky"
@@ -15,11 +15,8 @@
     "url": "https://github.com/Jiiks/BetterDiscordApp.git"
   },
   "private": false,
-  "devDependencies": {
-    
-  },
   "scripts": {
     "build": "gulp build",
-    "watch": "gulp watch" 
+    "watch": "gulp watch"
   }
 }
diff --git a/csseditor/package.json b/csseditor/package.json
index 43608e53..98d964ba 100644
--- a/csseditor/package.json
+++ b/csseditor/package.json
@@ -5,7 +5,7 @@
   "version": "0.4.0",
   "homepage": "https://betterdiscord.net",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/csseditor.js",
   "contributors": [
     "Jiiks",
     "Pohky"
@@ -15,9 +15,6 @@
     "url": "https://github.com/Jiiks/BetterDiscordApp.git"
   },
   "private": false,
-  "devDependencies": {
-
-  },
   "scripts": {
     "build": "webpack --progress --colors",
     "watch": "webpack --progress --colors --watch"
diff --git a/csseditor/webpack.config.js b/csseditor/webpack.config.js
index 0e7ff99d..0cacab6b 100644
--- a/csseditor/webpack.config.js
+++ b/csseditor/webpack.config.js
@@ -1,16 +1,16 @@
-const
-    path = require('path'),
-    webpack = require('webpack');
+const path = require('path');
+const webpack = require('webpack');
+
 const vueLoader = {
     test: /\.(vue)$/,
     exclude: /node_modules/,
     loader: 'vue-loader'
-}
+};
 
 const scssLoader = {
     test: /\.(css|scss)$/,
     loader: ['css-loader', 'sass-loader']
-}
+};
 
 module.exports = {
     entry: './src/index.js',
@@ -21,9 +21,17 @@ module.exports = {
     module: {
         loaders: [vueLoader, scssLoader]
     },
+    externals: {
+        electron: 'window.require("electron")',
+        fs: 'window.require("fs")'
+    },
     resolve: {
         alias: {
             vue$: path.resolve('..', 'node_modules', 'vue', 'dist', 'vue.esm.js')
-        }
+        },
+        modules: [
+            path.resolve('..', 'node_modules'),
+            path.resolve('..', 'common', 'modules')
+        ]
     }
 };
diff --git a/gulpfile.js b/gulpfile.js
index 35166675..68f9401d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -18,52 +18,52 @@ const client = function() {
         rename(`client.${clientpkg.version}.js`),
         gulp.dest('./release')
     ]);
-}
+};
 
 const core = function() {
-    return pump([
-        gulp.src('./core/dist/modules/**/*'),
-        copy('release/', { prefix: 2 })
-    ]);
-}
-
-const core2 = function() {
     return pump([
         gulp.src('./core/dist/main.js'),
         rename(`core.${corepkg.version}.js`),
         gulp.dest('./release')
     ]);
-}
-
-const core3 = function() {
-    return fs.writeFileSync('./release/index.js', `module.exports = require('./core.${corepkg.version}.js');`);
-}
+};
 
 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/**/*'),
         copy('release/csseditor', { prefix: 2 })
     ]);
-}
+};
 
 const deps = function() {
     return copydeps('./', './release');
-}
+};
 
-const bindings = function() {
+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 () {
-    del(['./release/**/*']).then(() => merge(client(), core(), core2(), core3(), sparkplug(), cssEditor(), deps(), bindings()));
+    del(['./release/**/*']).then(() => merge(client(), core(), sparkplug(), core_modules(), index(), cssEditor(), deps(), node_sass_bindings()));
 });
diff --git a/installer/package.json b/installer/package.json
index b6484474..0cfd724f 100644
--- a/installer/package.json
+++ b/installer/package.json
@@ -5,7 +5,7 @@
   "version": "2.0.0",
   "homepage": "https://betterdiscord.net",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/installer.js",
   "contributors": [
     "Jiiks",
     "Pohky"
@@ -15,9 +15,6 @@
     "url": "https://github.com/Jiiks/BetterDiscordApp.git"
   },
   "private": false,
-  "devDependencies": {
-
-  },
   "scripts": {
     "build": "webpack --progress --colors",
     "watch": "webpack --progress --colors --watch"
diff --git a/installer/webpack.config.js b/installer/webpack.config.js
index 575e24cf..682e8351 100644
--- a/installer/webpack.config.js
+++ b/installer/webpack.config.js
@@ -2,16 +2,17 @@ const
     path = require('path'),
     webpack = require('webpack'),
     HtmlWebpackPlugin = require('html-webpack-plugin');
+
 const vueLoader = {
     test: /\.(vue)$/,
     exclude: /node_modules/,
     loader: 'vue-loader'
-}
+};
 
 const scssLoader = {
     test: /\.(css|scss)$/,
     loader: ['css-loader', 'sass-loader']
-}
+};
 
 module.exports = {
     entry: './src/index.js',
diff --git a/package-lock.json b/package-lock.json
index 15334a32..72858dc1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,8 +13,7 @@
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=",
-      "dev": true
+      "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="
     },
     "acorn": {
       "version": "5.5.0",
@@ -60,7 +59,6 @@
       "version": "5.5.2",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
       "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
-      "dev": true,
       "requires": {
         "co": "4.6.0",
         "fast-deep-equal": "1.0.0",
@@ -105,8 +103,7 @@
     "amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
     },
     "ansi-colors": {
       "version": "1.1.0",
@@ -153,14 +150,12 @@
     "ansi-regex": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
     },
     "ansi-styles": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "dev": true
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
     },
     "ansi-wrap": {
       "version": "0.1.0",
@@ -272,8 +267,7 @@
     "aproba": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=",
-      "dev": true
+      "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo="
     },
     "archy": {
       "version": "1.0.0",
@@ -285,7 +279,6 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
       "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
-      "dev": true,
       "requires": {
         "delegates": "1.0.0",
         "readable-stream": "2.3.4"
@@ -294,20 +287,17 @@
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "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": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=",
-          "dev": true
+          "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o="
         },
         "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,
           "requires": {
             "core-util-is": "1.0.2",
             "inherits": "2.0.3",
@@ -322,7 +312,6 @@
           "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"
           }
@@ -371,8 +360,7 @@
     "array-find-index": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
     },
     "array-slice": {
       "version": "1.1.0",
@@ -410,8 +398,7 @@
     "asn1": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
-      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
-      "dev": true
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y="
     },
     "asn1.js": {
       "version": "4.10.1",
@@ -436,8 +423,7 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "assign-symbols": {
       "version": "1.0.0",
@@ -463,14 +449,12 @@
     "async-foreach": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
-      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
-      "dev": true
+      "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI="
     },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "atob": {
       "version": "2.0.3",
@@ -507,14 +491,12 @@
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz",
-      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=",
-      "dev": true
+      "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4="
     },
     "babel-code-frame": {
       "version": "6.26.0",
@@ -1271,8 +1253,7 @@
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
     },
     "base": {
       "version": "0.11.2",
@@ -1299,7 +1280,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
       "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
-      "dev": true,
       "optional": true,
       "requires": {
         "tweetnacl": "0.14.5"
@@ -1327,7 +1307,6 @@
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.5.tgz",
       "integrity": "sha1-fbs7IQ/coIJFDa0jNMMErzm9x4Q=",
-      "dev": true,
       "requires": {
         "underscore": "1.4.4"
       }
@@ -1336,7 +1315,6 @@
       "version": "0.0.9",
       "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "dev": true,
       "requires": {
         "inherits": "2.0.3"
       }
@@ -1353,11 +1331,16 @@
       "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=",
       "dev": true
     },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "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=",
-      "dev": true,
       "requires": {
         "hoek": "4.2.0"
       }
@@ -1366,7 +1349,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
-      "dev": true,
       "requires": {
         "balanced-match": "1.0.0",
         "concat-map": "0.0.1"
@@ -1506,8 +1488,7 @@
     "builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-      "dev": true
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
     },
     "builtin-status-codes": {
       "version": "3.0.0",
@@ -1547,17 +1528,25 @@
       "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=",
       "dev": true
     },
+    "camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.2",
+        "upper-case": "1.1.3"
+      }
+    },
     "camelcase": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-      "dev": true
+      "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
     },
     "camelcase-keys": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "dev": true,
       "requires": {
         "camelcase": "2.1.1",
         "map-obj": "1.0.1"
@@ -1602,8 +1591,7 @@
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
     },
     "center-align": {
       "version": "0.1.3",
@@ -1627,7 +1615,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true,
       "requires": {
         "ansi-styles": "2.2.1",
         "escape-string-regexp": "1.0.5",
@@ -1788,6 +1775,15 @@
         }
       }
     },
+    "clean-css": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz",
+      "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=",
+      "dev": true,
+      "requires": {
+        "source-map": "0.5.7"
+      }
+    },
     "cli-cursor": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
@@ -1813,7 +1809,6 @@
       "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",
@@ -1931,8 +1926,7 @@
     "co": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
     },
     "coa": {
       "version": "1.0.4",
@@ -1946,8 +1940,7 @@
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
     },
     "codemirror": {
       "version": "5.35.0",
@@ -2027,7 +2020,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
       "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
-      "dev": true,
       "requires": {
         "delayed-stream": "1.0.0"
       }
@@ -2041,8 +2033,7 @@
     "commander": {
       "version": "2.14.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
-      "integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao=",
-      "dev": true
+      "integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
     },
     "commondir": {
       "version": "1.0.1",
@@ -2059,8 +2050,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
     },
     "concat-stream": {
       "version": "1.6.0",
@@ -2123,8 +2113,7 @@
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
     },
     "consolidate": {
       "version": "0.14.5",
@@ -2162,8 +2151,7 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
       "version": "2.2.2",
@@ -2228,7 +2216,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
       "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
-      "dev": true,
       "requires": {
         "lru-cache": "4.1.1",
         "which": "1.3.0"
@@ -2238,7 +2225,6 @@
           "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"
@@ -2250,7 +2236,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
       "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
-      "dev": true,
       "requires": {
         "boom": "5.2.0"
       },
@@ -2259,7 +2244,6 @@
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
           "integrity": "sha1-XdnabuOl8wIHdDYpDLcX0/SlTgI=",
-          "dev": true,
           "requires": {
             "hoek": "4.2.0"
           }
@@ -2313,6 +2297,18 @@
         "source-list-map": "2.0.0"
       }
     },
+    "css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "dev": true,
+      "requires": {
+        "boolbase": "1.0.0",
+        "css-what": "2.1.0",
+        "domutils": "1.5.1",
+        "nth-check": "1.0.1"
+      }
+    },
     "css-selector-tokenizer": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz",
@@ -2337,6 +2333,12 @@
         }
       }
     },
+    "css-what": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz",
+      "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=",
+      "dev": true
+    },
     "cssesc": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
@@ -2397,7 +2399,6 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
       "requires": {
         "array-find-index": "1.0.2"
       }
@@ -2415,7 +2416,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0"
       }
@@ -2456,8 +2456,7 @@
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
     "decode-uri-component": {
       "version": "0.2.0",
@@ -2486,6 +2485,24 @@
         "clone": "1.0.3"
       }
     },
+    "define-properties": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+      "dev": true,
+      "requires": {
+        "foreach": "2.0.5",
+        "object-keys": "1.0.11"
+      },
+      "dependencies": {
+        "object-keys": {
+          "version": "1.0.11",
+          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
+          "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=",
+          "dev": true
+        }
+      }
+    },
     "define-property": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
@@ -2502,39 +2519,28 @@
       "dev": true
     },
     "del": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
-      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
       "dev": true,
       "requires": {
-        "globby": "5.0.0",
+        "globby": "6.1.0",
         "is-path-cwd": "1.0.0",
         "is-path-in-cwd": "1.0.0",
-        "object-assign": "4.1.1",
-        "pify": "2.3.0",
-        "pinkie-promise": "2.0.1",
+        "p-map": "1.2.0",
+        "pify": "3.0.0",
         "rimraf": "2.6.2"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
       }
     },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
     },
     "deprecated": {
       "version": "0.0.1",
@@ -2599,12 +2605,72 @@
         "esutils": "2.0.2"
       }
     },
+    "dom-converter": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz",
+      "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=",
+      "dev": true,
+      "requires": {
+        "utila": "0.3.3"
+      },
+      "dependencies": {
+        "utila": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz",
+          "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=",
+          "dev": true
+        }
+      }
+    },
+    "dom-serializer": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+      "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.1.3",
+        "entities": "1.1.1"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=",
+          "dev": true
+        }
+      }
+    },
     "domain-browser": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
       "integrity": "sha1-PTH1AZGmdJ3RN1p/Ui6CPULlTto=",
       "dev": true
     },
+    "domelementtype": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz",
+      "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=",
+      "dev": true
+    },
+    "domhandler": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz",
+      "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.3.0"
+      }
+    },
+    "domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "dev": true,
+      "requires": {
+        "dom-serializer": "0.1.0",
+        "domelementtype": "1.3.0"
+      }
+    },
     "duplexer2": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
@@ -2618,7 +2684,6 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
       "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
-      "dev": true,
       "optional": true,
       "requires": {
         "jsbn": "0.1.1"
@@ -2768,6 +2833,12 @@
         "tapable": "0.2.8"
       }
     },
+    "entities": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
+      "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
+      "dev": true
+    },
     "errno": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
@@ -2781,11 +2852,34 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
       "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-      "dev": true,
       "requires": {
         "is-arrayish": "0.2.1"
       }
     },
+    "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==",
+      "dev": true,
+      "requires": {
+        "es-to-primitive": "1.1.1",
+        "function-bind": "1.1.1",
+        "has": "1.0.1",
+        "is-callable": "1.1.3",
+        "is-regex": "1.0.4"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+      "dev": true,
+      "requires": {
+        "is-callable": "1.1.3",
+        "is-date-object": "1.0.1",
+        "is-symbol": "1.0.1"
+      }
+    },
     "es5-ext": {
       "version": "0.10.38",
       "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.38.tgz",
@@ -2865,8 +2959,7 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escope": {
       "version": "3.6.0",
@@ -3317,8 +3410,7 @@
     "extend": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
-      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
-      "dev": true
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
     },
     "extend-shallow": {
       "version": "2.0.1",
@@ -3382,8 +3474,7 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fancy-log": {
       "version": "1.3.2",
@@ -3399,14 +3490,12 @@
     "fast-deep-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz",
-      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
-      "dev": true
+      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8="
     },
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -3554,6 +3643,43 @@
         "del": "2.2.2",
         "graceful-fs": "4.1.11",
         "write": "0.2.1"
+      },
+      "dependencies": {
+        "del": {
+          "version": "2.2.2",
+          "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+          "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+          "dev": true,
+          "requires": {
+            "globby": "5.0.0",
+            "is-path-cwd": "1.0.0",
+            "is-path-in-cwd": "1.0.0",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1",
+            "rimraf": "2.6.2"
+          }
+        },
+        "globby": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+          "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+          "dev": true,
+          "requires": {
+            "array-union": "1.0.2",
+            "arrify": "1.0.1",
+            "glob": "7.1.2",
+            "object-assign": "4.1.1",
+            "pify": "2.3.0",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "dev": true
+        }
       }
     },
     "flatten": {
@@ -3577,17 +3703,21 @@
         "for-in": "1.0.2"
       }
     },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
+      "dev": true
+    },
     "forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
+      "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=",
-      "dev": true,
       "requires": {
         "asynckit": "0.4.0",
         "combined-stream": "1.0.6",
@@ -3619,8 +3749,7 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
     },
     "fsevents": {
       "version": "1.1.3",
@@ -4644,7 +4773,6 @@
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-      "dev": true,
       "requires": {
         "graceful-fs": "4.1.11",
         "inherits": "2.0.3",
@@ -4668,7 +4796,6 @@
       "version": "2.7.4",
       "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dev": true,
       "requires": {
         "aproba": "1.2.0",
         "console-control-strings": "1.1.0",
@@ -4692,14 +4819,12 @@
     "generate-function": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
-      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
-      "dev": true
+      "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=",
-      "dev": true,
       "requires": {
         "is-property": "1.0.2"
       }
@@ -4707,14 +4832,12 @@
     "get-caller-file": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz",
-      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=",
-      "dev": true
+      "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U="
     },
     "get-stdin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
     },
     "get-stream": {
       "version": "3.0.0",
@@ -4732,7 +4855,6 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
       "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0"
       }
@@ -4741,7 +4863,6 @@
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
       "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-      "dev": true,
       "requires": {
         "fs.realpath": "1.0.0",
         "inflight": "1.0.6",
@@ -4911,13 +5032,12 @@
       "dev": true
     },
     "globby": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
-      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
       "dev": true,
       "requires": {
         "array-union": "1.0.2",
-        "arrify": "1.0.1",
         "glob": "7.1.2",
         "object-assign": "4.1.1",
         "pify": "2.3.0",
@@ -4996,8 +5116,7 @@
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
-      "dev": true
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
     },
     "gulp": {
       "version": "3.9.1",
@@ -5131,6 +5250,104 @@
         }
       }
     },
+    "gulp-copy": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/gulp-copy/-/gulp-copy-1.1.0.tgz",
+      "integrity": "sha512-OM+6ICtL2nYpzXF/qZb0eLDrIRe28MnN548Dsc60okV/evNbo0552VjtZ317x3MnCh5mGZDcTGK/hX4OwbE7xw==",
+      "dev": true,
+      "requires": {
+        "gulp": "3.9.1",
+        "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
+        },
+        "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.5",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
+          "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.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": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "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.5",
+            "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-merge": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/gulp-merge/-/gulp-merge-0.1.1.tgz",
+      "integrity": "sha1-pGLuARd6jqfEYPDqia1ULsdSujc=",
+      "dev": true,
+      "requires": {
+        "through2": "1.1.1"
+      },
+      "dependencies": {
+        "through2": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz",
+          "integrity": "sha1-CEfLxESfNAVXTb3M2buEG4OsNUU=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.1.14",
+            "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-npm-copy-deps": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/gulp-npm-copy-deps/-/gulp-npm-copy-deps-1.0.2.tgz",
+      "integrity": "sha1-QEeTkUnWk1u1K0tWxyarwnjzb9Q=",
+      "dev": true
+    },
     "gulp-plumber": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.2.0.tgz",
@@ -5191,6 +5408,12 @@
         }
       }
     },
+    "gulp-rename": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz",
+      "integrity": "sha1-OtRCh2PwXidk3sHGfYaNsnVoeBc=",
+      "dev": true
+    },
     "gulp-util": {
       "version": "3.0.8",
       "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz",
@@ -5371,14 +5594,12 @@
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
       "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
-      "dev": true,
       "requires": {
         "ajv": "5.5.2",
         "har-schema": "2.0.0"
@@ -5397,7 +5618,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
       "requires": {
         "ansi-regex": "2.1.1"
       }
@@ -5420,8 +5640,7 @@
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
     },
     "has-value": {
       "version": "1.0.0",
@@ -5484,7 +5703,6 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
       "integrity": "sha1-r02RTrBl+bXOTZ0RwcshJu7MMDg=",
-      "dev": true,
       "requires": {
         "boom": "4.3.1",
         "cryptiles": "3.1.2",
@@ -5512,8 +5730,7 @@
     "hoek": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
-      "integrity": "sha1-ctnQdU9/4lyi0BrY+PmpRJqJUm0=",
-      "dev": true
+      "integrity": "sha1-ctnQdU9/4lyi0BrY+PmpRJqJUm0="
     },
     "home-or-tmp": {
       "version": "2.0.0",
@@ -5543,8 +5760,7 @@
     "hosted-git-info": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=",
-      "dev": true
+      "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw="
     },
     "html-comment-regex": {
       "version": "1.1.1",
@@ -5552,11 +5768,120 @@
       "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=",
       "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==",
+      "dev": true,
+      "requires": {
+        "camel-case": "3.0.0",
+        "clean-css": "4.1.11",
+        "commander": "2.15.1",
+        "he": "1.1.1",
+        "ncname": "1.0.0",
+        "param-case": "2.1.1",
+        "relateurl": "0.2.7",
+        "uglify-js": "3.3.16"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.15.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+          "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+          "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=",
+      "dev": true,
+      "requires": {
+        "html-minifier": "3.5.12",
+        "loader-utils": "0.2.17",
+        "lodash": "4.17.5",
+        "pretty-error": "2.1.1",
+        "tapable": "1.0.0",
+        "toposort": "1.0.6",
+        "util.promisify": "1.0.0"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "0.2.17",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+          "dev": true,
+          "requires": {
+            "big.js": "3.2.0",
+            "emojis-list": "2.1.0",
+            "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
+        }
+      }
+    },
+    "htmlparser2": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz",
+      "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=",
+      "dev": true,
+      "requires": {
+        "domelementtype": "1.3.0",
+        "domhandler": "2.1.0",
+        "domutils": "1.1.6",
+        "readable-stream": "1.0.34"
+      },
+      "dependencies": {
+        "domutils": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz",
+          "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=",
+          "dev": true,
+          "requires": {
+            "domelementtype": "1.3.0"
+          }
+        },
+        "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"
+          }
+        }
+      }
+    },
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
       "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "jsprim": "1.4.1",
@@ -5670,8 +5995,7 @@
     "immediate": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
-      "dev": true
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
     },
     "imurmurhash": {
       "version": "0.1.4",
@@ -5682,14 +6006,12 @@
     "in-publish": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
-      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
-      "dev": true
+      "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E="
     },
     "indent-string": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "dev": true,
       "requires": {
         "repeating": "2.0.1"
       }
@@ -5710,7 +6032,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
       "requires": {
         "once": "1.4.0",
         "wrappy": "1.0.2"
@@ -5719,8 +6040,7 @@
     "inherits": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ini": {
       "version": "1.3.5",
@@ -5836,8 +6156,7 @@
     "invert-kv": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
     },
     "is-absolute": {
       "version": "1.0.0",
@@ -5867,8 +6186,7 @@
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
     },
     "is-binary-path": {
       "version": "1.0.1",
@@ -5889,11 +6207,16 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-      "dev": true,
       "requires": {
         "builtin-modules": "1.1.1"
       }
     },
+    "is-callable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
+      "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=",
+      "dev": true
+    },
     "is-data-descriptor": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
@@ -5903,6 +6226,12 @@
         "kind-of": "6.0.2"
       }
     },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+      "dev": true
+    },
     "is-descriptor": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
@@ -5951,7 +6280,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
       "requires": {
         "number-is-nan": "1.0.1"
       }
@@ -5960,7 +6288,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
       "requires": {
         "number-is-nan": "1.0.1"
       }
@@ -5978,7 +6305,6 @@
       "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=",
-      "dev": true,
       "requires": {
         "generate-function": "2.0.0",
         "generate-object-property": "1.2.0",
@@ -5989,8 +6315,7 @@
         "xtend": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
-          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
-          "dev": true
+          "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
         }
       }
     },
@@ -6083,8 +6408,16 @@
     "is-property": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
-      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
-      "dev": true
+      "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"
+      }
     },
     "is-relative": {
       "version": "1.0.0",
@@ -6116,11 +6449,16 @@
         "html-comment-regex": "1.1.1"
       }
     },
+    "is-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
+      "dev": true
+    },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-unc-path": {
       "version": "1.0.0",
@@ -6134,8 +6472,7 @@
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
     },
     "is-windows": {
       "version": "1.0.1",
@@ -6152,8 +6489,7 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "isobject": {
       "version": "3.0.1",
@@ -6164,8 +6500,7 @@
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
     },
     "jquery": {
       "version": "3.3.1",
@@ -6176,8 +6511,7 @@
     "js-base64": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.1.tgz",
-      "integrity": "sha1-4CgTGBzVMAKIjpGJNUZ6yykQ5ZY=",
-      "dev": true
+      "integrity": "sha1-4CgTGBzVMAKIjpGJNUZ6yykQ5ZY="
     },
     "js-tokens": {
       "version": "3.0.2",
@@ -6199,7 +6533,6 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
       "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true,
       "optional": true
     },
     "jsesc": {
@@ -6217,14 +6550,12 @@
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
     },
     "json-schema-traverse": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
-      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
-      "dev": true
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
     },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -6235,8 +6566,7 @@
     "json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json5": {
       "version": "0.5.1",
@@ -6256,14 +6586,12 @@
     "jsonpointer": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
-      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
-      "dev": true
+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk="
     },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
       "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "extsprintf": "1.3.0",
@@ -6299,7 +6627,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
       "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
       "requires": {
         "invert-kv": "1.0.0"
       }
@@ -6318,7 +6645,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
       "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
-      "dev": true,
       "requires": {
         "immediate": "3.0.6"
       }
@@ -6343,7 +6669,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
       "requires": {
         "graceful-fs": "4.1.11",
         "parse-json": "2.2.0",
@@ -6355,8 +6680,7 @@
         "pify": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
         }
       }
     },
@@ -6381,7 +6705,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.6.0.tgz",
       "integrity": "sha1-iwBZvus4dcSBJChsp/2/I9UrjJc=",
-      "dev": true,
       "requires": {
         "lie": "3.1.1"
       }
@@ -6399,8 +6722,7 @@
     "lodash": {
       "version": "4.17.5",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz",
-      "integrity": "sha1-maktZcAnLevoyWtgV7yPv6O+1RE=",
-      "dev": true
+      "integrity": "sha1-maktZcAnLevoyWtgV7yPv6O+1RE="
     },
     "lodash._basecopy": {
       "version": "3.0.1",
@@ -6459,8 +6781,7 @@
     "lodash.assign": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-      "dev": true
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
     },
     "lodash.camelcase": {
       "version": "4.3.0",
@@ -6471,8 +6792,7 @@
     "lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
     },
     "lodash.escape": {
       "version": "3.2.0",
@@ -6521,8 +6841,7 @@
     "lodash.mergewith": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.0.tgz",
-      "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU=",
-      "dev": true
+      "integrity": "sha1-FQzwoWeR9ZA7iJHqsVRgknS96lU="
     },
     "lodash.restparam": {
       "version": "3.6.1",
@@ -6640,12 +6959,17 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "dev": true,
       "requires": {
         "currently-unhandled": "0.4.1",
         "signal-exit": "3.0.2"
       }
     },
+    "lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
+      "dev": true
+    },
     "lru-cache": {
       "version": "2.7.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
@@ -6696,8 +7020,7 @@
     "map-obj": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
     },
     "map-visit": {
       "version": "1.0.0",
@@ -6803,7 +7126,6 @@
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "dev": true,
       "requires": {
         "camelcase-keys": "2.1.0",
         "decamelize": "1.2.0",
@@ -6820,8 +7142,7 @@
         "minimist": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-          "dev": true
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         }
       }
     },
@@ -6859,14 +7180,12 @@
     "mime-db": {
       "version": "1.30.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
-      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
-      "dev": true
+      "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE="
     },
     "mime-types": {
       "version": "2.1.17",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
       "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
-      "dev": true,
       "requires": {
         "mime-db": "1.30.0"
       }
@@ -6893,7 +7212,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-      "dev": true,
       "requires": {
         "brace-expansion": "1.1.11"
       }
@@ -6901,8 +7219,7 @@
     "minimist": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-      "dev": true
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
     "mixin-deep": {
       "version": "1.3.0",
@@ -6947,7 +7264,6 @@
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
       "requires": {
         "minimist": "0.0.8"
       }
@@ -6976,8 +7292,7 @@
     "nan": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz",
-      "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=",
-      "dev": true
+      "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo="
     },
     "nanomatch": {
       "version": "1.2.7",
@@ -7018,11 +7333,19 @@
       "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",
       "integrity": "sha1-DjUCzYLABNU1WkPJ5VV3vXvZHYg=",
-      "dev": true,
       "requires": {
         "async": "0.2.10",
         "binary-search-tree": "0.2.5",
@@ -7034,8 +7357,7 @@
         "async": {
           "version": "0.2.10",
           "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-          "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
-          "dev": true
+          "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E="
         }
       }
     },
@@ -7045,6 +7367,15 @@
       "integrity": "sha1-drHIIxMMyias+6zMj7rwovozsY8=",
       "dev": true
     },
+    "no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "dev": true,
+      "requires": {
+        "lower-case": "1.1.4"
+      }
+    },
     "node-abi": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.2.0.tgz",
@@ -7058,7 +7389,6 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz",
       "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=",
-      "dev": true,
       "requires": {
         "fstream": "1.0.11",
         "glob": "7.1.2",
@@ -7078,8 +7408,7 @@
         "semver": {
           "version": "5.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-          "dev": true
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
         }
       }
     },
@@ -7156,7 +7485,6 @@
       "version": "4.7.2",
       "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.2.tgz",
       "integrity": "sha1-k2Z3i6FGnrAUOKnoWS9CYry2eU4=",
-      "dev": true,
       "requires": {
         "async-foreach": "0.1.3",
         "chalk": "1.1.3",
@@ -7182,20 +7510,17 @@
         "assert-plus": {
           "version": "0.2.0",
           "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-          "dev": true
+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ="
         },
         "aws-sign2": {
           "version": "0.6.0",
           "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-          "dev": true
+          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8="
         },
         "boom": {
           "version": "2.10.1",
           "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
           "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-          "dev": true,
           "requires": {
             "hoek": "2.16.3"
           }
@@ -7203,14 +7528,12 @@
         "caseless": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
-          "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
-          "dev": true
+          "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c="
         },
         "cryptiles": {
           "version": "2.0.5",
           "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
           "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-          "dev": true,
           "requires": {
             "boom": "2.10.1"
           }
@@ -7219,7 +7542,6 @@
           "version": "2.1.4",
           "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
           "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-          "dev": true,
           "requires": {
             "asynckit": "0.4.0",
             "combined-stream": "1.0.6",
@@ -7230,7 +7552,6 @@
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz",
           "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=",
-          "dev": true,
           "requires": {
             "globule": "1.2.0"
           }
@@ -7239,7 +7560,6 @@
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz",
           "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=",
-          "dev": true,
           "requires": {
             "glob": "7.1.2",
             "lodash": "4.17.5",
@@ -7250,7 +7570,6 @@
           "version": "2.0.6",
           "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
           "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
-          "dev": true,
           "requires": {
             "chalk": "1.1.3",
             "commander": "2.14.1",
@@ -7262,7 +7581,6 @@
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
           "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-          "dev": true,
           "requires": {
             "boom": "2.10.1",
             "cryptiles": "2.0.5",
@@ -7273,14 +7591,12 @@
         "hoek": {
           "version": "2.16.3",
           "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-          "dev": true
+          "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0="
         },
         "http-signature": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
           "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-          "dev": true,
           "requires": {
             "assert-plus": "0.2.0",
             "jsprim": "1.4.1",
@@ -7290,14 +7606,12 @@
         "qs": {
           "version": "6.3.2",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz",
-          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=",
-          "dev": true
+          "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw="
         },
         "request": {
           "version": "2.79.0",
           "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz",
           "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=",
-          "dev": true,
           "requires": {
             "aws-sign2": "0.6.0",
             "aws4": "1.6.0",
@@ -7325,7 +7639,6 @@
           "version": "1.0.9",
           "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
           "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-          "dev": true,
           "requires": {
             "hoek": "2.16.3"
           }
@@ -7333,8 +7646,7 @@
         "tunnel-agent": {
           "version": "0.4.3",
           "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
-          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
-          "dev": true
+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us="
         }
       }
     },
@@ -7342,7 +7654,6 @@
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "dev": true,
       "requires": {
         "abbrev": "1.1.1"
       }
@@ -7351,7 +7662,6 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
       "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
-      "dev": true,
       "requires": {
         "hosted-git-info": "2.5.0",
         "is-builtin-module": "1.0.0",
@@ -7399,7 +7709,6 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
       "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
-      "dev": true,
       "requires": {
         "are-we-there-yet": "1.1.4",
         "console-control-strings": "1.1.0",
@@ -7407,6 +7716,15 @@
         "set-blocking": "2.0.0"
       }
     },
+    "nth-check": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz",
+      "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=",
+      "dev": true,
+      "requires": {
+        "boolbase": "1.0.0"
+      }
+    },
     "nugget": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz",
@@ -7439,20 +7757,17 @@
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
     },
     "oauth-sign": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
-      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
-      "dev": true
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM="
     },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
       "version": "0.1.0",
@@ -7549,6 +7864,16 @@
         "isobject": "3.0.1"
       }
     },
+    "object.getownpropertydescriptors": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "es-abstract": "1.10.0"
+      }
+    },
     "object.map": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
@@ -7593,7 +7918,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "requires": {
         "wrappy": "1.0.2"
       }
@@ -7696,14 +8020,12 @@
     "os-homedir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
     },
     "os-locale": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dev": true,
       "requires": {
         "lcid": "1.0.0"
       }
@@ -7711,14 +8033,12 @@
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
     },
     "osenv": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
       "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
-      "dev": true,
       "requires": {
         "os-homedir": "1.0.2",
         "os-tmpdir": "1.0.2"
@@ -7748,6 +8068,12 @@
         "p-limit": "1.2.0"
       }
     },
+    "p-map": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "dev": true
+    },
     "p-try": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
@@ -7760,6 +8086,15 @@
       "integrity": "sha1-AQEhG6pwxLykoPY/Igbpe3368lg=",
       "dev": true
     },
+    "param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "dev": true,
+      "requires": {
+        "no-case": "2.3.2"
+      }
+    },
     "parse-asn1": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
@@ -7817,7 +8152,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
       "requires": {
         "error-ex": "1.3.1"
       }
@@ -7855,8 +8189,7 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
     "path-is-inside": {
       "version": "1.0.2",
@@ -7895,7 +8228,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
       "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dev": true,
       "requires": {
         "graceful-fs": "4.1.11",
         "pify": "2.3.0",
@@ -7905,8 +8237,7 @@
         "pify": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
         }
       }
     },
@@ -7932,8 +8263,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "pify": {
       "version": "3.0.0",
@@ -7944,14 +8274,12 @@
     "pinkie": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
     },
     "pinkie-promise": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
       "requires": {
         "pinkie": "2.0.4"
       }
@@ -8719,6 +9047,16 @@
         "meow": "3.7.0"
       }
     },
+    "pretty-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
+      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
+      "dev": true,
+      "requires": {
+        "renderkid": "2.0.1",
+        "utila": "0.4.0"
+      }
+    },
     "pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
@@ -8740,8 +9078,7 @@
     "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=",
-      "dev": true
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
     },
     "progress": {
       "version": "2.0.0",
@@ -8768,8 +9105,7 @@
     "pseudomap": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
     },
     "public-encrypt": {
       "version": "4.0.0",
@@ -8808,8 +9144,7 @@
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-      "dev": true
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
     },
     "q": {
       "version": "1.5.1",
@@ -8820,8 +9155,7 @@
     "qs": {
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "integrity": "sha1-NJzfbu+J7EXBLX1es/wMhwNDptg=",
-      "dev": true
+      "integrity": "sha1-NJzfbu+J7EXBLX1es/wMhwNDptg="
     },
     "query-string": {
       "version": "4.3.4",
@@ -8909,7 +9243,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
       "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
       "requires": {
         "load-json-file": "1.1.0",
         "normalize-package-data": "2.4.0",
@@ -8920,7 +9253,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
       "requires": {
         "find-up": "1.1.2",
         "read-pkg": "1.1.0"
@@ -8930,7 +9262,6 @@
           "version": "1.1.2",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-          "dev": true,
           "requires": {
             "path-exists": "2.1.0",
             "pinkie-promise": "2.0.1"
@@ -8940,7 +9271,6 @@
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-          "dev": true,
           "requires": {
             "pinkie-promise": "2.0.1"
           }
@@ -9016,7 +9346,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "dev": true,
       "requires": {
         "indent-string": "2.1.0",
         "strip-indent": "1.0.1"
@@ -9133,12 +9462,39 @@
         }
       }
     },
+    "relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=",
+      "dev": true
+    },
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
       "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
       "dev": true
     },
+    "renderkid": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.1.tgz",
+      "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=",
+      "dev": true,
+      "requires": {
+        "css-select": "1.2.0",
+        "dom-converter": "0.1.4",
+        "htmlparser2": "3.3.0",
+        "strip-ansi": "3.0.1",
+        "utila": "0.3.3"
+      },
+      "dependencies": {
+        "utila": {
+          "version": "0.3.3",
+          "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz",
+          "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=",
+          "dev": true
+        }
+      }
+    },
     "repeat-element": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
@@ -9155,7 +9511,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
       "requires": {
         "is-finite": "1.0.2"
       }
@@ -9170,7 +9525,6 @@
       "version": "2.83.0",
       "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
       "integrity": "sha1-ygtl2gLtYpNYh4COb1EDgQNOM1Y=",
-      "dev": true,
       "requires": {
         "aws-sign2": "0.7.0",
         "aws4": "1.6.0",
@@ -9199,8 +9553,7 @@
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
     "require-from-string": {
       "version": "1.2.1",
@@ -9211,8 +9564,7 @@
     "require-main-filename": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-      "dev": true
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
     },
     "require-uncached": {
       "version": "1.0.3",
@@ -9278,7 +9630,6 @@
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
       "integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
-      "dev": true,
       "requires": {
         "glob": "7.1.2"
       }
@@ -9329,14 +9680,12 @@
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
-      "dev": true
+      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
     },
     "sass-graph": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
-      "dev": true,
       "requires": {
         "glob": "7.1.2",
         "lodash": "4.17.5",
@@ -9367,7 +9716,6 @@
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
-      "dev": true,
       "requires": {
         "js-base64": "2.4.1",
         "source-map": "0.4.4"
@@ -9377,7 +9725,6 @@
           "version": "0.4.4",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
-          "dev": true,
           "requires": {
             "amdefine": "1.0.1"
           }
@@ -9387,8 +9734,7 @@
     "semver": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=",
-      "dev": true
+      "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs="
     },
     "sequencify": {
       "version": "0.0.7",
@@ -9399,8 +9745,7 @@
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
     },
     "set-getter": {
       "version": "0.1.0",
@@ -9498,8 +9843,7 @@
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "single-line-log": {
       "version": "1.1.2",
@@ -9652,7 +9996,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
       "integrity": "sha1-LGzsFP7cIiJznK+bXD2F0cxaLMg=",
-      "dev": true,
       "requires": {
         "hoek": "4.2.0"
       }
@@ -9727,7 +10070,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
       "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
-      "dev": true,
       "requires": {
         "spdx-license-ids": "1.2.2"
       }
@@ -9735,14 +10077,12 @@
     "spdx-expression-parse": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
-      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=",
-      "dev": true
+      "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw="
     },
     "spdx-license-ids": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz",
-      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=",
-      "dev": true
+      "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc="
     },
     "speedometer": {
       "version": "0.1.4",
@@ -9790,7 +10130,6 @@
       "version": "1.13.1",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz",
       "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=",
-      "dev": true,
       "requires": {
         "asn1": "0.2.3",
         "assert-plus": "1.0.0",
@@ -9884,7 +10223,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz",
       "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=",
-      "dev": true,
       "requires": {
         "readable-stream": "2.3.3"
       },
@@ -9892,14 +10230,12 @@
         "isarray": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-          "dev": true
+          "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
         },
         "readable-stream": {
           "version": "2.3.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",
@@ -9914,7 +10250,6 @@
           "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"
           }
@@ -10042,7 +10377,6 @@
       "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",
@@ -10058,14 +10392,12 @@
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
-      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=",
-      "dev": true
+      "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg="
     },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
       "requires": {
         "ansi-regex": "2.1.1"
       }
@@ -10074,7 +10406,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
       "requires": {
         "is-utf8": "0.2.1"
       }
@@ -10140,7 +10471,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
       "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
       "requires": {
         "get-stdin": "4.0.1"
       }
@@ -10164,8 +10494,7 @@
     "supports-color": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "dev": true
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
     },
     "svgo": {
       "version": "0.7.2",
@@ -10280,7 +10609,6 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
       "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-      "dev": true,
       "requires": {
         "block-stream": "0.0.9",
         "fstream": "1.0.11",
@@ -10475,11 +10803,16 @@
         "repeat-string": "1.6.1"
       }
     },
+    "toposort": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.6.tgz",
+      "integrity": "sha1-wxdI5V0hDv/AD9zcfW5o19e7nOw=",
+      "dev": true
+    },
     "tough-cookie": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
       "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
-      "dev": true,
       "requires": {
         "punycode": "1.4.1"
       }
@@ -10487,8 +10820,7 @@
     "trim-newlines": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "dev": true
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
     },
     "trim-right": {
       "version": "1.0.1",
@@ -10500,7 +10832,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz",
       "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=",
-      "dev": true,
       "requires": {
         "glob": "6.0.4"
       },
@@ -10509,7 +10840,6 @@
           "version": "6.0.4",
           "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
           "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=",
-          "dev": true,
           "requires": {
             "inflight": "1.0.6",
             "inherits": "2.0.3",
@@ -10530,7 +10860,6 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
       "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
       "requires": {
         "safe-buffer": "5.1.1"
       }
@@ -10539,7 +10868,6 @@
       "version": "0.14.5",
       "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true,
       "optional": true
     },
     "type-check": {
@@ -10632,8 +10960,7 @@
     "underscore": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz",
-      "integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ=",
-      "dev": true
+      "integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ="
     },
     "union-value": {
       "version": "1.0.0",
@@ -10746,6 +11073,12 @@
       "integrity": "sha1-7iMhugp4bFCXPbBDpQt7y6giNh0=",
       "dev": true
     },
+    "upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=",
+      "dev": true
+    },
     "urix": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
@@ -10875,14 +11208,28 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "util.promisify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "dev": true,
+      "requires": {
+        "define-properties": "1.1.2",
+        "object.getownpropertydescriptors": "2.0.3"
+      }
+    },
+    "utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=",
       "dev": true
     },
     "uuid": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
-      "integrity": "sha1-EsUou51Y0LkmXZovbw/ovhf/HxQ=",
-      "dev": true
+      "integrity": "sha1-EsUou51Y0LkmXZovbw/ovhf/HxQ="
     },
     "v-tooltip": {
       "version": "2.0.0-rc.31",
@@ -10908,7 +11255,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
       "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
-      "dev": true,
       "requires": {
         "spdx-correct": "1.0.2",
         "spdx-expression-parse": "1.0.4"
@@ -10924,7 +11270,6 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
       "requires": {
         "assert-plus": "1.0.0",
         "core-util-is": "1.0.2",
@@ -11496,7 +11841,6 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
       "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=",
-      "dev": true,
       "requires": {
         "isexe": "2.0.0"
       }
@@ -11504,14 +11848,12 @@
     "which-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-      "dev": true
+      "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=",
-      "dev": true,
       "requires": {
         "string-width": "1.0.2"
       }
@@ -11532,7 +11874,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dev": true,
       "requires": {
         "string-width": "1.0.2",
         "strip-ansi": "3.0.1"
@@ -11541,8 +11882,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write": {
       "version": "0.2.1",
@@ -11553,6 +11893,12 @@
         "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",
@@ -11565,20 +11911,17 @@
     "y18n": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-      "dev": true
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
     },
     "yallist": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
     },
     "yargs": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
       "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-      "dev": true,
       "requires": {
         "camelcase": "3.0.0",
         "cliui": "3.2.0",
@@ -11598,8 +11941,7 @@
         "camelcase": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
         }
       }
     },
@@ -11607,7 +11949,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
       "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
-      "dev": true,
       "requires": {
         "camelcase": "3.0.0"
       },
@@ -11615,8 +11956,7 @@
         "camelcase": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-          "dev": true
+          "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
         }
       }
     },
diff --git a/package.json b/package.json
index 8ad374b7..b61b6ec9 100644
--- a/package.json
+++ b/package.json
@@ -46,9 +46,7 @@
     "html-webpack-plugin": "^3.0.6",
     "jquery": "^3.2.1",
     "lodash": "^4.17.4",
-    "nedb": "^1.8.0",
     "node-gyp": "^3.6.2",
-    "node-sass": "^4.7.2",
     "pump": "^2.0.0",
     "sass-loader": "^6.0.6",
     "v-tooltip": "^2.0.0-rc.30",
diff --git a/scripts/build.bat b/scripts/build.bat
index 10da9ff7..d6cb2884 100644
--- a/scripts/build.bat
+++ b/scripts/build.bat
@@ -1 +1 @@
-npm run build
\ No newline at end of file
+npm run build
diff --git a/scripts/rebuild-node-sass.bat b/scripts/rebuild-node-sass.bat
index 9dc38365..38ac7c7b 100644
--- a/scripts/rebuild-node-sass.bat
+++ b/scripts/rebuild-node-sass.bat
@@ -4,11 +4,11 @@ set "ELECTRON=1.6.15"
 set "PLATFORM=win32"
 set "ARCH=ia32"
 set "VER=53"
-set "VENDOR_PATH=..\node_modules\node-sass\vendor"
-set "BUILD_PATH=..\node_modules\node-sass\build\Release\binding.node"
+set "VENDOR_PATH=.\node_modules\node-sass\vendor"
+set "BUILD_PATH=.\node_modules\node-sass\build\Release\binding.node"
 
 echo Building %PLATFORM%-%ARCH% bindings
-call ../node_modules/.bin/electron-rebuild -v=%ELECTRON% -a=%ARCH% -m ../node_modules/node-sass
+call ./node_modules/.bin/electron-rebuild -v=%ELECTRON% -a=%ARCH% -m ./node_modules/node-sass
 
 if exist %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%\binding.node (
     echo Deleting old %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%\binding.node
@@ -17,7 +17,7 @@ if exist %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%\binding.node (
 
 if not exist %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER% (
     echo Dir %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER% does not exist, creating.
-    mkdir %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER% 
+    mkdir %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%
 )
 
 if not exist %BUILD_PATH% (
@@ -30,7 +30,7 @@ if not exist %BUILD_PATH% (
 set "ARCH=x64"
 
 echo Building %PLATFORM%-%ARCH% bindings
-call ../node_modules/.bin/electron-rebuild -v=%ELECTRON% -a=%ARCH% -m ../node_modules/node-sass
+call ./node_modules/.bin/electron-rebuild -v=%ELECTRON% -a=%ARCH% -m ./node_modules/node-sass
 
 if exist %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%\binding.node (
     echo Deleting old %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%\binding.node
@@ -39,7 +39,7 @@ if exist %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%\binding.node (
 
 if not exist %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER% (
     echo Dir %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER% does not exist, creating.
-    mkdir %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER% 
+    mkdir %VENDOR_PATH%\%PLATFORM%-%ARCH%-%VER%
 )
 
 if not exist %BUILD_PATH% (
diff --git a/scripts/watch_client.bat b/scripts/watch_client.bat
index 8fdc63c3..d65e4839 100644
--- a/scripts/watch_client.bat
+++ b/scripts/watch_client.bat
@@ -1 +1 @@
-npm run watch_client
\ No newline at end of file
+npm run watch_client
diff --git a/scripts/watch_core.bat b/scripts/watch_core.bat
index 39183acc..3a77743e 100644
--- a/scripts/watch_core.bat
+++ b/scripts/watch_core.bat
@@ -1 +1 @@
-npm run watch_core
\ No newline at end of file
+npm run watch_core
diff --git a/tests/config.json b/tests/config.json
deleted file mode 100644
index fa1a8e7e..00000000
--- a/tests/config.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "version": "0.3.2",
-  "paths":  [] 
-}
\ No newline at end of file
diff --git a/tests/csseditor/index.html b/tests/csseditor/index.html
deleted file mode 100644
index 13e21507..00000000
--- a/tests/csseditor/index.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-<head>
-    <title>CSS Editor</title>
-    <link rel="stylesheet" href="../../node_modules/codemirror/lib/codemirror.css" />
-    <link rel="stylesheet" href="../../node_modules/codemirror/theme/material.css" />
-    <link rel="stylesheet" href="../../node_modules/codemirror/addon/scroll/simplescrollbars.css" />
-    <link rel="stylesheet" href="../../node_modules/codemirror/addon/dialog/dialog.css" />
-    <link rel="stylesheet" href="../../node_modules/codemirror/addon/hint/show-hint.css" />
-    <link rel="stylesheet" href="./main.css" />
-</head>
-<body>
-    <div class="container">
-        <div class="titlebar">
-            <div class="draggable"></div>
-            <div class="icon">
-                <div class="inner"></div>
-            </div>
-            <div class="title">CSS Editor</div>
-            <div class="flex-spacer"></div>
-            <div class="controls">
-                <button title="Toggle always on top" id="toggleaot">P</button>
-                <button title="Close CSS Editor" id="closeeditor">X</button>
-            </div>
-        </div>
-        <div id="spinner"><div class="valign">Loading Please Wait...</div></div>
-        <div class="editor" id="editor">
-        </div>
-        <div class="tools">
-            <div class="flex-row">
-                <button id="btnSave">Save</button>
-                <button id="btnUpdate">Update</button>
-                <div class="flex-spacer"></div>
-                <div id="chkboxLiveUpdate"><input type="checkbox"><span>Live Update</span></div>
-            </div>
-        </div>
-    </div>
-
-    <script>const $ = require('../../node_modules/jquery/dist/jquery.min.js');</script>
-    <script src="../../node_modules/codemirror/lib/codemirror.js"></script>
-    <script src="../../node_modules/codemirror/mode/css/css.js"></script>
-    <script src="../../node_modules/codemirror/addon/scroll/simplescrollbars.js"></script>
-    <script src="../../node_modules/codemirror/addon/search/search.js"></script>
-    <script src="../../node_modules/codemirror/addon/search/searchcursor.js"></script>
-    <script src="../../node_modules/codemirror/addon/search/jump-to-line.js"></script>
-    <script src="../../node_modules/codemirror/addon/dialog/dialog.js"></script>
-    <script src="../../node_modules/codemirror/addon/hint/show-hint.js"></script>
-    <script src="../../node_modules/codemirror/addon/hint/css-hint.js"></script>
-    <script src="./main.js"></script>
-</body>
-</html>
diff --git a/tests/csseditor/main.css b/tests/csseditor/main.css
deleted file mode 100644
index 5124957f..00000000
--- a/tests/csseditor/main.css
+++ /dev/null
@@ -1,294 +0,0 @@
-html, body {
-    margin: 0;
-    padding: 0;
-    max-height: 100%;
-    height: 100%;
-    background: #2c383e;
-    min-width: 700px;
-    min-height: 400px;
-}
-
-* {
-    outline: none;
-}
-
-.flex-spacer {
-    flex-grow: 1;
-}
-
-.flex-row {
-    display: flex;
-    flex-direction: row;
-}
-
-.valign {
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
-}
-
-.container {
-    display: flex;
-    flex-grow: 1;
-    flex-direction: column;
-    height: 100%;
-}
-
-.titlebar {
-    display: flex;
-    height: 25px;
-    padding: 4px 5px;
-    background: #292b2f;
-    border-bottom: 1px solid hsla(218,5%,47%,.3);
-    user-select: none;
-    cursor: default;
-}
-
-.titlebar .icon {
-    width: 31px;
-    height: 25px;
-}
-
-.titlebar .icon .inner {
-    width: 25px;
-    height: 25px;
-    background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iQ2FscXVlXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB2aWV3Qm94PSIwIDAgMjAwMCAyMDAwIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAyMDAwIDIwMDAiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxnPjxwYXRoIGZpbGw9IiMzRTgyRTUiIGQ9Ik0xNDAyLjIsNjMxLjdjLTkuNy0zNTMuNC0yODYuMi00OTYtNjQyLjYtNDk2SDY4LjR2NzE0LjFsNDQyLDM5OFY0OTAuN2gyNTdjMjc0LjUsMCwyNzQuNSwzNDQuOSwwLDM0NC45SDU5Ny42djMyOS41aDE2OS44YzI3NC41LDAsMjc0LjUsMzQ0LjgsMCwzNDQuOGgtNjk5djM1NC45aDY5MS4yYzM1Ni4zLDAsNjMyLjgtMTQyLjYsNjQyLjYtNDk2YzAtMTYyLjYtNDQuNS0yODQuMS0xMjIuOS0zNjguNkMxMzU3LjcsOTE1LjgsMTQwMi4yLDc5NC4zLDE0MDIuMiw2MzEuN3oiLz48cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNMTI2Mi41LDEzNS4yTDEyNjIuNSwxMzUuMmwtNzYuOCwwYzI2LjYsMTMuMyw1MS43LDI4LjEsNzUsNDQuM2M3MC43LDQ5LjEsMTI2LjEsMTExLjUsMTY0LjYsMTg1LjNjMzkuOSw3Ni42LDYxLjUsMTY1LjYsNjQuMywyNjQuNmwwLDEuMnYxLjJjMCwxNDEuMSwwLDU5Ni4xLDAsNzM3LjF2MS4ybDAsMS4yYy0yLjcsOTktMjQuMywxODgtNjQuMywyNjQuNmMtMzguNSw3My44LTkzLjgsMTM2LjItMTY0LjYsMTg1LjNjLTIyLjYsMTUuNy00Ni45LDMwLjEtNzIuNiw0My4xaDcyLjVjMzQ2LjIsMS45LDY3MS0xNzEuMiw2NzEtNTY3LjlWNzE2LjdDMTkzMy41LDMxMi4yLDE2MDguNywxMzUuMiwxMjYyLjUsMTM1LjJ6Ii8+PC9nPjwvc3ZnPg==);
-    background-size: 22px 22px;
-    background-repeat: no-repeat;
-    background-position: center;
-}
-
-.titlebar .title {
-    color: #bac9d2;
-    font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
-    line-height: 25px;
-    font-size: 15px;
-}
-
-.titlebar .controls {
-    margin: 0 0 0 2px;
-    font-size: 0;
-}
-
-.titlebar .controls button {
-    -webkit-app-region: no-drag;
-    border-radius: 3px;
-    width: 25px;
-    font-size: 12px;
-    font-weight: 600;
-    /*background: #263238;*/
-    background: #36393f;
-    color: #bac9d2;
-    font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
-    transition: background-color .2s ease;
-    cursor: default;
-    border: 0;
-    height: 25px;
-    z-index: 900062;
-    padding: 0;
-    margin: 0 0 0 4px;
-}
-
-.titlebar .controls button:hover {
-    background: #44474e;
-    color: #FFF;
-}
-
-.titlebar .controls button.active {
-    background: #3a71c1;
-}
-
-.titlebar .draggable {
-    top: 0;
-    left: 0;
-    right: 63px;
-    position: absolute;
-    height: 33px;
-    -webkit-app-region: drag;
-}
-
-#spinner {
-    background: rgba(51, 48, 48, 0.41);
-    position: absolute;
-    top: 34px;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    color: #bac9d2;
-    font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
-    font-weight: 600;
-    font-size: 2em;
-    z-index: 90000;
-    user-select: none;
-}
-
-.editor {
-    display: flex;
-    flex-direction: column;
-    flex-grow: 1;
-    overflow: hidden;
-}
-
-.editor .CodeMirror {
-    flex-grow: 1;
-}
-
-.tools {
-    height: 36px;
-    background: #292b2f;
-    border-top: 1px solid hsla(218,5%,47%,.3);
-    display: flex;
-    flex-direction: column;
-    user-select: none;
-}
-
-.tools .flex-row {
-    flex-grow: 1;
-    padding: 4px 5px;
-}
-
-.tools button {
-    border-radius: 3px;
-    width: 100px;
-    padding: 3px 10px;
-    font-size: 12px;
-    font-weight: 600;
-    background: #36393f;
-    color: #bac9d2;
-    font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
-    transition: background-color .2s ease;
-    cursor: pointer;
-    border: 0;
-    margin-right: 4px;
-}
-
-.tools button:hover {
-    background: #44474e;
-    color: #FFF;
-}
-
-.tools #chkboxLiveUpdate {
-    padding: 3px 10px;
-    line-height: 22px;
-}
-
-.tools #chkboxLiveUpdate input[type="checkbox"] {
-    margin: 0 6px 0 0;
-    cursor: pointer;
-}
-
-.tools #chkboxLiveUpdate span {
-    font-size: 12px;
-    font-weight: 500;
-    color: #bac9d2;
-    font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
-    cursor: default;
-}
-
-/*CodeMirror styling*/
-.CodeMirror-scroll {
-    cursor: text;
-}
-
-.CodeMirror-overlayscroll .CodeMirror-scrollbar-filler {
-    background: #38444a;
-}
-
-.CodeMirror-overlayscroll-horizontal div,
-.CodeMirror-overlayscroll-vertical div {
-    background: rgb(41, 43, 47);
-}
-
-.CodeMirror-overlayscroll-horizontal,
-.CodeMirror-overlayscroll-horizontal div {
-    height: 10px;
-}
-
-.CodeMirror-overlayscroll-vertical,
-.CodeMirror-overlayscroll-vertical div {
-    width: 10px;
-}
-
-.CodeMirror-scrollbar-filler {
-    width: 10px;
-    height: 10px;
-    background: rgb(41, 43, 47);
-}
-
-.cm-s-material.CodeMirror {
-    background: #36393f;
-}
-
-.CodeMirror-scroll {
-    cursor: text;
-}
-
-.cm-s-material .CodeMirror-gutters {
-    background: #292b2f;
-}
-
-.CodeMirror-gutter {
-    min-width: 34px;
-    border-right: 1px solid hsla(218,5%,47%,.3);
-    cursor: default;
-}
-
-.CodeMirror-hints {
-    /*background: #1e262a;*/
-    background: #292b2f;
-    box-shadow: 2px 3px 5px rgba(4, 4, 4, 0.22);
-    border: 1px solid #262f33;
-}
-
-.CodeMirror-hints::-webkit-scrollbar {
-    background: transparent;
-}
-
-.CodeMirror-hints::-webkit-scrollbar-thumb {
-    background-color: rgba(0,0,0,.4);
-    border-color: transparent;
-}
-
-.CodeMirror-hints::-webkit-scrollbar-thumb,
-.CodeMirror-hints::-webkit-scrollbar-track {
-    background-clip: padding-box;
-    border-width: 3px;
-    border-style: solid;
-    border-radius: 7px;
-}
-
-.CodeMirror-hints::-webkit-scrollbar-track {
-    background-color: transparent;
-    border-color: transparent;
-}
-
-.CodeMirror-linenumber,
-.CodeMirror-line {
-    padding: 0 5px !important;
-}
-
-.CodeMirror-linenumber {
-    cursor: text;
-}
-
-.cm-s-material .CodeMirror-linenumber {
-    color: #f6f6f7;
-}
-
-.CodeMirror-hint {
-    color: #bac9d2;
-}
-
-li.CodeMirror-hint-active {
-    color: #bac9d2;
-    /*background: #3b4950;*/
-    background: #36393f;
-}
-
-.CodeMirror-dialog-top {
-    bottom: 0;
-    top: auto;
-    border: none;
-    background: #1e262a;
-}
diff --git a/tests/csseditor/main.js b/tests/csseditor/main.js
deleted file mode 100644
index a9f23d58..00000000
--- a/tests/csseditor/main.js
+++ /dev/null
@@ -1,123 +0,0 @@
-const { remote, ipcRenderer } = require('electron');
-const { BDIpc } = require('../frontend/main.js');
-
-//Options
-const options = {
-    alwaysOnTop: false,
-    liveUpdate: false
-};
-
-function sendToDiscord(channel, message) {
-    BDIpc.send('bd-sendToDiscord', {channel, message});
-}
-
-//Elements
-const
-    $spinner = $('#spinner'),
-    $toggleaot = $('#toggleaot'),
-    $closeeditor = $('#closeeditor'),
-    $editor = $('#editor'),
-    $btnSave = $('#btnSave'),
-    $btnUpdate = $('#btnUpdate'),
-    $chkboxLiveUpdate = $("#chkboxLiveUpdate input");
-
-$toggleaot.on('click', e => {
-    $toggleaot.toggleClass("active");
-    remote.getCurrentWindow().setAlwaysOnTop(options.alwaysOnTop = !options.alwaysOnTop);
-});
-$closeeditor.on('click', e => window.close());
-
-$btnSave.on('click', () => sendToDiscord("save-css", codeMirror.getValue()));
-$btnUpdate.on('click', () => sendToDiscord("update-css", codeMirror.getValue()));
-$chkboxLiveUpdate.on('change', () => options.liveUpdate = $chkboxLiveUpdate[0].checked);
-
-BDIpc.on("set-css", (_, data) => {
-    if (data.error) {
-        alert(data.error);
-        return;
-    }
-
-    setCss(data.css);
-    $spinner.hide();
-});
-
-function setCss(css) {
-    codeMirror.setValue(css);
-}
-
-function alert(message) {}
-
-const codeMirror = CodeMirror($editor[0], {
-    lineNumbers: true,
-    mode: 'css',
-    indentUnit: 4,
-    theme: 'material',
-    scrollbarStyle: 'overlay',
-    extraKeys: { 'Ctrl-Space': 'autocomplete' },
-    dialog: { 'position': 'bottom' }
-});
-
-codeMirror.on('change', () => {
-    if (options.liveUpdate)
-        sendToDiscord("update-css", codeMirror.getValue());
-});
-
-codeMirror.on('keyup', function (editor, event) {
-    if (window.controlDown) return;
-    if (ExcludedIntelliSenseTriggerKeys[event.keyCode]) return;
-    CodeMirror.commands.autocomplete(editor, null, { completeSingle: false });
-});
-
-const ExcludedIntelliSenseTriggerKeys = {
-    '8': 'backspace',
-    '9': 'tab',
-    '13': 'enter',
-    '16': 'shift',
-    '17': 'ctrl',
-    '18': 'alt',
-    '19': 'pause',
-    '20': 'capslock',
-    '27': 'escape',
-    '33': 'pageup',
-    '34': 'pagedown',
-    '35': 'end',
-    '36': 'home',
-    '37': 'left',
-    '38': 'up',
-    '39': 'right',
-    '40': 'down',
-    '45': 'insert',
-    '46': 'delete',
-    '91': 'left window key',
-    '92': 'right window key',
-    '93': 'select',
-    '107': 'add',
-    '109': 'subtract',
-    '110': 'decimal point',
-    '111': 'divide',
-    '112': 'f1',
-    '113': 'f2',
-    '114': 'f3',
-    '115': 'f4',
-    '116': 'f5',
-    '117': 'f6',
-    '118': 'f7',
-    '119': 'f8',
-    '120': 'f9',
-    '121': 'f10',
-    '122': 'f11',
-    '123': 'f12',
-    '144': 'numlock',
-    '145': 'scrolllock',
-    '186': 'semicolon',
-    '187': 'equalsign',
-    '188': 'comma',
-    '189': 'dash',
-    '190': 'period',
-    '191': 'slash',
-    '192': 'graveaccent',
-    '220': 'backslash',
-    '222': 'quote'
-};
-
-BDIpc.send('bd-get-css');
diff --git a/tests/csseditor/mainold.css b/tests/csseditor/mainold.css
deleted file mode 100644
index 753690c4..00000000
--- a/tests/csseditor/mainold.css
+++ /dev/null
@@ -1,448 +0,0 @@
-html, body {
-    margin: 0;
-    padding: 0;
-    max-height: 100%;
-    background: #2c383e;
-    min-width: 700px;
-    min-height: 400px;
-}
-
-.titlebg {
-    z-index: 0;
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    height: 40px;
-    /*background: #2c383e;*/
-    background: #292b2f;
-    /*border-bottom: 1px solid #303e46;*/
-    border-bottom: 1px solid hsla(218,5%,47%,.3);
-}
-
-.titlebar {
-    z-index: 1;
-    display: flex;
-    height: 23px;
-    /*background: #2c383e;*/
-    background: #292b2f;
-    -webkit-app-region: drag;
-    /*border-bottom: 1px solid #303e46;*/
-    border-bottom: 1px solid hsla(218,5%,47%,.3);
-    padding: 10px;
-    margin-right: 70px;
-    max-height: 20px;
-    min-height: 20px;
-}
-
-    .titlebar .title {
-        color: #bac9d2;
-        font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
-        line-height: 18px;
-        display: inline-block;
-        margin-left: 10px;
-        margin-top: 2px;
-    }
-
-    .titlebar .icon {
-        width: 16px;
-        height: 16px;
-        background-size: 100% 100%;
-        display: block;
-        margin-top: 2px;
-        background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAARCAYAAADUryzEAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAABGFJREFUeAEAUQSu+wH///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAACo4PeOYsD0cSgTBPkAAAAAAAAAAAAAAAAAAAAAAP4AAAD/AAAAAAAAAAAAAAAAAAD8/wAB6vn+BJU6C3EEAAAAAPz9/vr3+f4Az+v7BwD8/wAA/gAAAAEAAAD/AAAABgEAAAQAAAD/AAAA/wAAAAMAAAABAQAA+P8ABgH+9AQAAAAAFAkE2gADAAAAAQAACwoCAP8AAAAAAAAAAP0AAAEPAQD/CgEAAP0AAAEAAAD/AQAA9vf/AA4BAQAQBgXaBAAAAAD3+/3dAAQBAAD0/gC5VhIAOxYGAAAAAAAAAAAA/wAAAPj9/gD/AAAACgMCAKXm+ABcuPEAGA8D/vX8/d8EAAAAAAgDBOAaCgL/5vL8AcPp+gAeDAQAy+z8AOL0/ABLHQYAJQ0EAAAAAAAAAAAA4/b+AAD9/wAUBgH7wOX35QIAAAAAyuz04RYHAfwADwYAeb/zAB6I5ABTtewA2PP7ABYIAQAAAP8AreX4ACG47AB5zvQAAAoDABkKA/YhDgUABAAAAAAXCgUAGgv9+tDk+AUMEgMAjkgOAGUmCgAAAAEAAAAAAPD7/QDP8f0AXR8KALTr+gDP2foAEwcA8/gA+QAEAAAAAAL5AQATBQH0APb+C1kxCgBlJgsAAAAAAAAAAAAAAAAAEAUDAIQqCwAAAAAAyfL8AAD3/QAdDAXuMhUJAAQAAAAA4vsAAAoGAfEACwIXsOH5AN3z7wDt+P4A+PwAAAMLAQDj/v8AuTgOADkSBQDl9/0AAAQBAAgCAOrj8f4ABAAAAAApEwUA3fH87QD5AAAWCAIAvUcRALTi+ABNmekAABUGAAAG/wANOgAAAAAAAOr4/wAAAwEA/v8A587p+wAEAAAAAPH19wAMAgTnAAEAAPP8/wAAAAAATB4IAI1ZEwC37fsASx0HACwQBQD4/f8A7Pn+AAAA/wAWCwHkCwkCAAQAAAAAGQwHAPX7AeUABAAA4vP9ALDh9wBMHQcAciwMAHIAAAAAAAAA+v7/AJ7i9wD//P8AAAEAABgKAuH+BAEABAAAAADD6fsAJw0E4gAEAQAAAAIAUbLwAAAMAgA/GAUANhsGAL70/QDN6foAAPj/AAACAgAA/wEAAv4B3ubu/gAEAAAAACERAwAiCwPIDg0BAPL2/gAAAQIAAPUAAMHZ+QDB4vkAAAcCAAD5/wAA/QAAAAL+AC4aBfwQCgHN5f4BAAH///8AAADsAPv+AwCQ0wUAJg4EV+P4/GW96Pw1tOP6Dvz7AAALBAEATx8F7DsXBsUaDAOW5PP7ukgpCwACAQEABAAAAAAAAPwA+/7/AAoDBgDw9vypLRMAqTQWCiY7FgV80+38NlEhCLgYCgKG5fP66uf4/QAEAf8AA/8BAAkBAAABAAD//6/RP29a9e2vAAAAAElFTkSuQmCC");
-    }
-
-button.close,
-button.aot {
-    position: absolute;
-    border-radius: 3px;
-    width: 25px;
-    font-size: 12px;
-    font-weight: 600;
-    /*background: #263238;*/
-    background: #36393f;
-    color: #bac9d2;
-    font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
-    transition: background-color .2s ease;
-    cursor: pointer;
-    border: 0;
-    height: 25px;
-    z-index: 900062;
-    padding: 0;
-    margin: 0;
-}
-
-    button.close:hover,
-    button.aot:hover {
-        /* background: #303f46;*/
-        background: #44474e;
-        color: #FFF;
-    }
-
-button.close {
-    right: 8px;
-    top: 8px;
-}
-
-button.aot {
-    right: 38px;
-    top: 8px;
-}
-
-    button.aot.enabled {
-        /*background: #376982;*/
-        background: #3a71c1;
-    }
-
-.spacer {
-    flex-grow: 1;
-}
-
-.container {
-    display: flex;
-    flex-direction: column;
-    max-height: 100%;
-}
-
-#cm-container {
-    flex-grow: 1;
-    display: flex;
-    flex-direction: column;
-}
-
-.CodeMirror {
-    height: 100%;
-}
-
-.controls {
-    display: flex;
-    padding: 5px;
-    height: 40px;
-    min-height: 40px;
-    /*background: #2c383e;*/
-    /*border-top: 1px solid #38444a;*/
-    overflow: hidden;
-    background: #292b2f;
-    border-top: 1px solid hsla(218,5%,47%,.3);
-}
-
-    .controls button {
-        border-radius: 3px;
-        width: 100px;
-        padding: 10px 20px;
-        font-size: 16px;
-        font-weight: 600;
-        /* background: #263238;*/
-        background: #36393f;
-        color: #bac9d2;
-        font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
-        transition: background-color .2s ease;
-        cursor: pointer;
-        border: 0;
-        margin-left: 5px;
-    }
-
-        .controls button:hover {
-            /*background: #303f46;*/
-            background: #44474e;
-            color: #FFF;
-        }
-
-    .controls .checkbox-container {
-        display: flex;
-        cursor: pointer;
-        margin-left: 5px;
-        margin-top: 10px;
-    }
-
-        .controls .checkbox-container:hover .checkbox + span {
-            color: #FFF;
-        }
-
-        .controls .checkbox-container:hover .checkbox {
-            /*background: #303f46;*/
-            background: #44474e;
-            border-color: #44474e;
-            /*border-color: #303f46;*/
-        }
-
-        .controls .checkbox-container .checkbox {
-            position: relative;
-            width: 15px;
-            height: 15px;
-            /*background: #263238;*/
-            background: #36393f;
-            /*border: 3px solid #263238;*/
-            border: 3px solid #36393f;
-            border-radius: 3px;
-            margin-right: 5px;
-            -webkit-transition: 0.2s all ease;
-            -moz-transition: 0.2s all ease;
-            transition: 0.2s all ease;
-        }
-
-        .controls .checkbox-container.checked .checkbox {
-            /*background: #376982;*/
-            /*border: 3px solid #376982;*/
-            background: #3a71c1;
-            border: 3px solid #3a71c1;
-        }
-
-            .controls .checkbox-container.checked .checkbox::after {
-                opacity: 1;
-            }
-
-        .controls .checkbox-container .checkbox + span {
-            color: #bac9d2;
-            font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
-            line-height: 20px;
-            font-size: 16px;
-            -webkit-user-select: none;
-            -moz-user-select: none;
-            -ms-user-select: none;
-            user-select: none;
-        }
-
-        .controls .checkbox-container .checkbox::after {
-            content: "";
-            position: absolute;
-            top: -2px;
-            left: 3px;
-            width: 8px;
-            height: 13px;
-            border: 2px solid #bac9d2;
-            border-top-width: 0;
-            border-left-width: 0;
-            -webkit-transform: rotate(40deg);
-            transform: rotate(40deg);
-            opacity: 0;
-            */ -webkit-transition: 0.2s all ease;
-            -moz-transition: 0.2s all ease;
-            transition: 0.2s all ease;
-        }
-
-button:focus, button:active {
-    outline: none;
-}
-
-.CodeMirror-overlayscroll .CodeMirror-scrollbar-filler {
-    background: #38444a;
-}
-
-.CodeMirror-overlayscroll-horizontal div,
-.CodeMirror-overlayscroll-vertical div {
-    background: rgb(56, 68, 74);
-}
-
-.cm-s-material.CodeMirror {
-    background: #36393f;
-}
-
-.cm-s-material .CodeMirror-gutters {
-    background: #292b2f;
-}
-
-#hints {
-    position: fixed;
-    z-index: 90000;
-    bottom: 100px;
-    /*background: rgba(34, 44, 49, 0.4);*/
-    background: #292b2f;
-    border-radius: 5px;
-    left: 10px;
-    padding: 10px;
-    color: #bac9d2;
-    -webkit-transition: 0.2s all ease;
-    -moz-transition: 0.2s all ease;
-    transition: 0.2s all ease;
-    opacity: 0;
-    font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
-    pointer-events: none;
-}
-
-    #hints.visible {
-        opacity: 1;
-    }
-
-    #hints h3 {
-        margin: 0;
-        margin-bottom: 10px;
-        border-bottom: 1px solid hsla(218,5%,47%,.3);
-        /*border-bottom: 1px solid #38444a;*/
-    }
-
-    #hints table {
-        color: #bac9d2;
-    }
-
-#cmhints {
-    position: fixed;
-    z-index: 90000;
-    bottom: 100px;
-    /*background: rgba(34, 44, 49, 0.4);*/
-    background: #292b2f;
-    border-radius: 5px;
-    right: 10px;
-    padding: 10px;
-    color: #bac9d2;
-    -webkit-transition: 0.2s all ease;
-    -moz-transition: 0.2s all ease;
-    transition: 0.2s all ease;
-    opacity: 0;
-    font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
-    pointer-events: none;
-}
-
-    #cmhints.visible {
-        opacity: 1;
-    }
-
-    #cmhints h3 {
-        margin: 0;
-        margin-bottom: 10px;
-        border-bottom: 1px solid hsla(218,5%,47%,.3);
-        /*border-bottom: 1px solid #38444a;*/
-    }
-
-    #cmhints table {
-        color: #bac9d2;
-    }
-
-.CodeMirror-hints {
-    /*background: #1e262a;*/
-    background: #292b2f;
-    box-shadow: 2px 3px 5px rgba(4, 4, 4, 0.22);
-    border: 1px solid #262f33;
-}
-
-    .CodeMirror-hints::-webkit-scrollbar {
-        background: transparent;
-    }
-
-    .CodeMirror-hints::-webkit-scrollbar-thumb {
-        background-color: rgba(0,0,0,.4);
-        border-color: transparent;
-    }
-
-    .CodeMirror-hints::-webkit-scrollbar-thumb,
-    .CodeMirror-hints::-webkit-scrollbar-track {
-        background-clip: padding-box;
-        border-width: 3px;
-        border-style: solid;
-        border-radius: 7px;
-    }
-
-    .CodeMirror-hints::-webkit-scrollbar-track {
-        background-color: transparent;
-        border-color: transparent;
-    }
-
-.cm-s-material .CodeMirror-linenumber {
-    color: #f6f6f7;
-}
-
-.CodeMirror-hint {
-    color: #bac9d2;
-}
-
-li.CodeMirror-hint-active {
-    color: #bac9d2;
-    /*background: #3b4950;*/
-    background: #36393f;
-}
-
-#eehint {
-    position: absolute;
-    z-index: 9000;
-    top: 70px;
-    left: 0;
-    right: 0;
-    text-align: center;
-    color: #FFF;
-    font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
-    -webkit-transition: 0.2s all ease;
-    -moz-transition: 0.2s all ease;
-    transition: 0.2s all ease;
-    opacity: 0;
-    pointer-events: none;
-}
-
-    #eehint span {
-        /* background: rgba(44, 56, 62, 0.51);*/
-        background: #292b2f;
-        padding: 10px;
-        border-radius: 10px;
-        pointer-events: none;
-        -webkit-user-select: none;
-        user-select: none;
-    }
-
-    #eehint.visible {
-        opacity: 1;
-    }
-
-.CodeMirror-dialog-top {
-    bottom: 0;
-    top: auto;
-    border: none;
-    background: #1e262a;
-}
-
-#spinner {
-    background: rgba(51, 48, 48, 0.41);
-    position: absolute;
-    top: 41px;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    z-index: 90000;
-}
-
-    #spinner.hidden {
-        display: none;
-    }
-
-    #spinner .valign {
-        position: absolute;
-        left: 50%;
-        top: 50%;
-        transform: translate(-50%, -50%);
-        color: #bac9d2;
-        font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
-        font-weight: 600;
-        font-size: 2em;
-    }
-
-.checkbox-container.hidden,
-button.hidden {
-    display: none;
-}
-
-#alert {
-    position: absolute;
-    bottom: 55px;
-    z-index: 9;
-    left: 50px;
-    font-family: Whitney,Helvetica Neue,Helvetica,Arial,sans-serif;
-    color: #FFF;
-    padding: 2px 15px;
-    border-radius: 5px;
-    pointer-events: none;
-    opacity: 0;
-    -webkit-transition: 0.2s all ease;
-    -moz-transition: 0.2s all ease;
-    transition: 0.2s all ease;
-}
-
-    #alert.success {
-        background: rgba(77, 255, 77, 0.15);
-    }
-
-    #alert.danger {
-        background: rgba(255, 77, 77, 0.15);
-    }
-
-    #alert.visible {
-        opacity: 1;
-    }
diff --git a/tests/frontend/index.html b/tests/frontend/index.html
deleted file mode 100644
index a99e496b..00000000
--- a/tests/frontend/index.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-    <head>
-        <script src="main.js"></script>
-    </head>
-</html>
\ No newline at end of file
diff --git a/tests/frontend/main.js b/tests/frontend/main.js
deleted file mode 100644
index 78d0cf79..00000000
--- a/tests/frontend/main.js
+++ /dev/null
@@ -1,26 +0,0 @@
-const { ipcRenderer } = require('electron');
-
-class BDIpc {
-
-    static on(channel, cb) {
-        ipcRenderer.on(channel, (event, args) => cb(event, args));
-    }
-
-    static async send(channel, message) {
-        const __eid = Date.now().toString();
-        ipcRenderer.send(
-            channel.startsWith('bd-') ? channel: `bd-${channel}`,
-            message === undefined ? { __eid } : Object.assign(message, { __eid })
-        );
-
-        return new Promise((resolve, reject) => {
-            ipcRenderer.once(__eid, (event, arg) => {
-                if (arg.err) return reject(arg);
-                resolve(arg);
-            });
-        });
-    }
-
-}
-
-module.exports = { BDIpc };
\ No newline at end of file
diff --git a/tests/index.js b/tests/index.js
deleted file mode 100644
index 0c1a74a0..00000000
--- a/tests/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const { app, BrowserWindow } = require('electron');
-const { BetterDiscord } = require('../core/dist/main.js');
-const path = require('path');
-const url = require('url');
-
-const config = require('./config.json');
-
-let bw;
-const bd = new BetterDiscord(Object.assign(config));
-app.on('ready', () => {
-
-    bw = new BrowserWindow({ width: 1920, height: 1080 });
-    bw.webContents.openDevTools();
-    bw.loadURL(url.format({
-        pathname: path.join(__dirname, 'frontend', 'index.html'),
-        protocol: 'file',
-        slashes: true
-    }));
-    bw.on('closed', () => app.quit());
-
-});
\ No newline at end of file
diff --git a/tests/run.bat b/tests/run.bat
deleted file mode 100644
index 0d495882..00000000
--- a/tests/run.bat
+++ /dev/null
@@ -1 +0,0 @@
-..\core\node_modules\.bin\electron.cmd .\
\ No newline at end of file

From 2fb5d8fe11cfaf722e82cd453d18a382ffe3217d Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 21 Mar 2018 00:16:42 +0000
Subject: [PATCH 04/23] Pause all keybinds while recording and add debugger
 keybind

---
 client/src/data/user.settings.default.json    |  6 ++++
 client/src/index.js                           |  9 ++++++
 client/src/structs/settings/index.js          |  1 +
 client/src/structs/settings/types/index.js    | 12 ++++++++
 client/src/structs/settings/types/keybind.js  | 28 +++++++++++++++++--
 .../src/ui/components/bd/setting/Keybind.vue  |  4 ++-
 6 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 client/src/structs/settings/types/index.js

diff --git a/client/src/data/user.settings.default.json b/client/src/data/user.settings.default.json
index 2b49c23a..3cf0ddda 100644
--- a/client/src/data/user.settings.default.json
+++ b/client/src/data/user.settings.default.json
@@ -51,6 +51,12 @@
                         "hint": "Adds some of BetterDiscord's internal modules to `global._bd`.",
                         "value": false
                     },
+                    {
+                        "id": "debugger-keybind",
+                        "type": "keybind",
+                        "text": "Debugger keybind",
+                        "hint": "When this keybind is activated the developer tools will be opened and Discord will be paused."
+                    },
                     {
                         "id": "ignore-content-manager-errors",
                         "type": "bool",
diff --git a/client/src/index.js b/client/src/index.js
index f7a74b6e..3c4e0348 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -13,6 +13,7 @@ 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 { ClientLogger as Logger, ClientIPC, Utils } from 'common';
 import { EmoteModule } from 'builtin';
+import electron from 'electron';
 
 const ignoreExternal = false;
 const DEV = true;
@@ -40,6 +41,14 @@ class BetterDiscord {
             else if (window._bd) delete window._bd;
         });
 
+        const debuggerkeybind = Settings.getSetting('core', 'advanced', 'debugger-keybind');
+        debuggerkeybind.on('keybind-activated', () => {
+            const currentWindow = electron.remote.getCurrentWindow();
+            if (currentWindow.isDevToolsOpened()) return eval('debugger;');
+            currentWindow.openDevTools();
+            setTimeout(() => eval('debugger;'), 1000);
+        });
+
         DOM.injectStyle(BdCss, 'bdmain');
         this.globalReady = this.globalReady.bind(this);
         Events.on('global-ready', this.globalReady);
diff --git a/client/src/structs/settings/index.js b/client/src/structs/settings/index.js
index 7a7f50df..da66c0ec 100644
--- a/client/src/structs/settings/index.js
+++ b/client/src/structs/settings/index.js
@@ -2,3 +2,4 @@ export { default as SettingsSet } from './settingsset';
 export { default as SettingsCategory } from './settingscategory';
 export { default as Setting } from './setting';
 export { default as SettingsScheme } from './settingsscheme';
+export * from './types';
diff --git a/client/src/structs/settings/types/index.js b/client/src/structs/settings/types/index.js
new file mode 100644
index 00000000..8a212c1c
--- /dev/null
+++ b/client/src/structs/settings/types/index.js
@@ -0,0 +1,12 @@
+export { default as BoolSetting } from './bool';
+export { default as StringSetting } from './text';
+export { default as NumberSetting } from './number';
+export { default as DropdownSetting } from './dropdown';
+export { default as RadioSetting } from './radio';
+export { default as SliderSetting } from './slider';
+export { default as ColourSetting } from './colour';
+export { default as KeybindSetting } from './keybind';
+export { default as FileSetting } from './file';
+export { default as GuildSetting } from './guild';
+export { default as ArraySetting } from './array';
+export { default as CustomSetting } from './custom';
diff --git a/client/src/structs/settings/types/keybind.js b/client/src/structs/settings/types/keybind.js
index efbe3f90..f98371c4 100644
--- a/client/src/structs/settings/types/keybind.js
+++ b/client/src/structs/settings/types/keybind.js
@@ -11,18 +11,42 @@
 import Setting from './basesetting';
 import Combokeys from 'combokeys';
 
+let keybindsPaused = false;
+
 export default class KeybindSetting extends Setting {
 
     constructor(args, ...merge) {
         super(args, ...merge);
 
+        this.__keybind_activated = this.__keybind_activated.bind(this);
+
         this.combokeys = new Combokeys(document);
-        this.combokeys.bind(this.value, event => this.emit('keybind-activated', event));
+        this.combokeys.bind(this.value, this.__keybind_activated);
+    }
+
+    /**
+     * The value to use when the setting doesn't have a value.
+     */
+    get defaultValue() {
+        return '';
     }
 
     setValueHook() {
         this.combokeys.reset();
-        this.combokeys.bind(this.value, event => this.emit('keybind-activated', event));
+        this.combokeys.bind(this.value, this.__keybind_activated);
+    }
+
+    __keybind_activated(event) {
+        if (KeybindSetting.paused) return;
+        this.emit('keybind-activated', event);
+    }
+
+    static get paused() {
+        return keybindsPaused;
+    }
+
+    static set paused(paused) {
+        keybindsPaused = paused;
     }
 
 }
diff --git a/client/src/ui/components/bd/setting/Keybind.vue b/client/src/ui/components/bd/setting/Keybind.vue
index e5258eb2..53498084 100644
--- a/client/src/ui/components/bd/setting/Keybind.vue
+++ b/client/src/ui/components/bd/setting/Keybind.vue
@@ -24,8 +24,9 @@
 </template>
 
 <script>
-    import { shell } from 'electron';
+    import { KeybindSetting } from 'structs';
     import { ClientIPC, ClientLogger as Logger } from 'common';
+    import { shell } from 'electron';
     import Combokeys from 'combokeys';
     import CombokeysRecord from 'combokeys/plugins/record';
 
@@ -49,6 +50,7 @@
         },
         watch: {
             active(active) {
+                KeybindSetting.paused = active;
                 if (active) combokeys.record(this.recorded);
             }
         },

From a4a130bfc68fb31a1762c163146fbc4dc50e9dc0 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 21 Mar 2018 15:57:10 +0000
Subject: [PATCH 05/23] Write logs to a file

---
 .gitignore                          |  2 +
 client/src/index.js                 |  6 ++-
 client/src/modules/modulemanager.js |  2 +-
 client/src/modules/updater.js       |  2 +-
 client/webpack.config.js            | 20 +++++----
 common/modules/logger.js            | 67 +++++++++++++++++------------
 common/modules/utils.js             | 15 +++++++
 7 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index 85ce57bf..6ce1cc91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@ dist
 etc
 release
 
+tests/log.txt
+
 # User data
 tests/data
 user.config.json
diff --git a/client/src/index.js b/client/src/index.js
index 3c4e0348..58c3da93 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -14,13 +14,17 @@ import { Events, CssEditor, Globals, Settings, Database, Updater, ModuleManager,
 import { ClientLogger as Logger, ClientIPC, Utils } from 'common';
 import { EmoteModule } from 'builtin';
 import electron from 'electron';
+import path from 'path';
 
+const tests = true;
 const ignoreExternal = false;
-const DEV = true;
 
 class BetterDiscord {
 
     constructor() {
+        Logger.file = tests ? path.join(__dirname, '..', '..', 'tests', 'log.txt') : path.join(__dirname, 'log.txt');
+        Logger.log('main', 'BetterDiscord starting');
+
         this._bd = {
             DOM, BdUI, Modals, Reflection,
 
diff --git a/client/src/modules/modulemanager.js b/client/src/modules/modulemanager.js
index 99d9324c..0186cfa7 100644
--- a/client/src/modules/modulemanager.js
+++ b/client/src/modules/modulemanager.js
@@ -27,7 +27,7 @@ export default class {
             new SocketProxy(),
             new EventHook(),
             CssEditor,
-            new Updater()
+            Updater
         ]);
     }
 
diff --git a/client/src/modules/updater.js b/client/src/modules/updater.js
index 36ec548d..435fba9e 100644
--- a/client/src/modules/updater.js
+++ b/client/src/modules/updater.js
@@ -13,7 +13,7 @@ import Globals from './globals';
 import { $ } from 'vendor';
 import { ClientLogger as Logger } from 'common';
 
-export default class {
+export default new class {
 
     constructor() {
         window.updater = this;
diff --git a/client/webpack.config.js b/client/webpack.config.js
index 0cbaa481..3bca7afb 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -1,6 +1,5 @@
-const
-    path = require('path'),
-    webpack = require('webpack');
+const path = require('path');
+const webpack = require('webpack');
 
 const jsLoader = {
     test: /\.(js|jsx)$/,
@@ -9,18 +8,18 @@ const jsLoader = {
     query: {
         presets: ['react']
     }
-}
+};
 
 const vueLoader = {
     test: /\.(vue)$/,
     loader: 'vue-loader'
-}
+};
 
 const scssLoader = {
     test: /\.scss$/,
     exclude: /node_modules/,
     loader: ['css-loader', 'sass-loader']
-}
+};
 
 module.exports = {
     entry: './src/index.js',
@@ -50,8 +49,13 @@ module.exports = {
             path.resolve('src', 'structs'),
             path.resolve('src', 'builtin')
         ]
+    },
+    node: {
+        process: false,
+        __filename: false,
+        __dirname: false
     }
-   /* resolve: {
+    /* resolve: {
         alias: {
             'momentjs': 'vendor/moment.min.js'
         },
@@ -60,5 +64,5 @@ module.exports = {
             path.resolve(__dirname, '..'),
             path.resolve(__dirname, '..', 'node_modules')
         ]
-    }*/
+    } */
 };
diff --git a/common/modules/logger.js b/common/modules/logger.js
index df4b6830..78f4cee0 100644
--- a/common/modules/logger.js
+++ b/common/modules/logger.js
@@ -9,34 +9,55 @@
 */
 
 import { Vendor } from 'modules';
+import { FileUtils } from './utils';
 
-const logs = [];
+export const logLevels = {
+    'log': 'log',
+    'warn': 'warn',
+    'err': 'error',
+    'error': 'error',
+    'debug': 'debug',
+    'dbg': 'debug',
+    'info': 'info'
+};
 
-export class ClientLogger {
+export class Logger {
 
-    static err(module, message) { this.log(module, message, 'err'); }
-    static warn(module, message) { this.log(module, message, 'warn'); }
-    static info(module, message) { this.log(module, message, 'info'); }
-    static dbg(module, message) { this.log(module, message, 'dbg'); }
+    constructor(file) {
+        this.logs = [];
+        this.file = file;
+    }
 
-    static log(module, message, level = 'log') {
-        level = this.parseLevel(level);
+    err(module, message) { this.log(module, message, 'err'); }
+    warn(module, message) { this.log(module, message, 'warn'); }
+    info(module, message) { this.log(module, message, 'info'); }
+    dbg(module, message) { this.log(module, message, 'dbg'); }
+
+    log(module, message, level = 'log') {
+        level = Logger.parseLevel(level);
         if (typeof message === 'object' && !(message instanceof Array)) {
             console[level]('[%cBetter%cDiscord:%s]', 'color: #3E82E5', '', `${module}${level === 'debug' ? '|DBG' : ''}`, message);
             let message_string = message.toString();
             if (message_string === '[object Object]')
                 message_string += ' ' + JSON.stringify(message, null, 4);
 
-            logs.push(`${level.toUpperCase()} : [${Vendor.moment().format('DD/MM/YY hh:mm:ss')}|${module}] ${message_string}${message_string === '[object Object]' ? ' ' + JSON.stringify(message, null, 4) : ''}`);
+            this.logs.push(`${level.toUpperCase()} : [${Logger.timestamp}|${module}] ${message_string}${message_string === '[object Object]' ? ' ' + JSON.stringify(message, null, 4) : ''}`);
+
+            if (this.file)
+                FileUtils.appendToFile(this.file, `${level.toUpperCase()} : [${Logger.timestamp}|${module}] ${message_string}${message_string === '[object Object]' ? ' ' + JSON.stringify(message, null, 4) : ''}\n`);
+
             return;
         }
 
         message = typeof message === 'object' && message instanceof Array ? message : [message];
         console[level]('[%cBetter%cDiscord:%s]', 'color: #3E82E5', '', `${module}${level === 'debug' ? '|DBG' : ''}`, ...message);
-        logs.push(`${level.toUpperCase()} : [${Vendor.moment().format('DD/MM/YY hh:mm:ss')}|${module}] ${message.join(' ')}`);
+        this.logs.push(`${level.toUpperCase()} : [${Logger.timestamp}|${module}] ${message.join(' ')}`);
+
+        if (this.file)
+            FileUtils.appendToFile(this.file, `${level.toUpperCase()} : [${Logger.timestamp}|${module}] ${message.join(' ')}\n`);
     }
 
-    static logError(err) {
+    logError(err) {
         if (!err.module && !err.message) {
             console.log(err);
             return;
@@ -44,24 +65,14 @@ export class ClientLogger {
         this.err(err.module, err.message);
     }
 
-    static get logs() {
-        return logs;
-    }
-
-    static get levels() {
-        return {
-            'log': 'log',
-            'warn': 'warn',
-            'err': 'error',
-            'error': 'error',
-            'debug': 'debug',
-            'dbg': 'debug',
-            'info': 'info'
-        };
-    }
-
     static parseLevel(level) {
-        return this.levels.hasOwnProperty(level) ? this.levels[level] : 'log';
+        return logLevels.hasOwnProperty(level) ? logLevels[level] : 'log';
+    }
+
+    static get timestamp() {
+        return Vendor.moment().format('DD/MM/YY hh:mm:ss');
     }
 
 }
+
+export const ClientLogger = new Logger();
diff --git a/common/modules/utils.js b/common/modules/utils.js
index 527fab73..07b46bbf 100644
--- a/common/modules/utils.js
+++ b/common/modules/utils.js
@@ -386,6 +386,21 @@ export class FileUtils {
         });
     }
 
+    /**
+     * Writes to the end of a file.
+     * @param {String} path The file's path
+     * @param {String} data The data to append to the file
+     * @return {Promise}
+     */
+    static async appendToFile(path, data) {
+        return new Promise((resolve, reject) => {
+            fs.appendFile(path, data, err => {
+                if (err) reject(err);
+                else resolve();
+            });
+        });
+    }
+
     /**
      * Returns the contents of a file parsed as JSON.
      * @param {String} path The file's path

From dc44af6968c256dd73cc59dc9cb6265fd21b17dc Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 21 Mar 2018 17:41:27 +0000
Subject: [PATCH 06/23] Cleanup core

---
 core/src/main.js               | 140 ++++++++++++++++-----------------
 core/src/modules/bdipc.js      |   8 +-
 core/src/modules/config.js     |   8 +-
 core/src/modules/csseditor.js  |  27 +++++--
 core/src/modules/database.js   |   2 +-
 core/src/modules/modulebase.js |  13 ++-
 core/src/modules/utils.js      |  66 +++++++---------
 csseditor/src/Editor.vue       |  20 ++---
 8 files changed, 143 insertions(+), 141 deletions(-)

diff --git a/core/src/main.js b/core/src/main.js
index c9dc6fa4..8aad0c90 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -15,43 +15,40 @@ const { FileUtils, BDIpc, Config, WindowUtils, CSSEditor, Database } = require('
 const { BrowserWindow, dialog } = require('electron');
 
 const tests = true;
-const _basePath = __dirname;
+
+const _basePath = tests ? path.resolve(__dirname, '..', '..') : __dirname;
+const _baseDataPath = tests ? path.resolve(_basePath, 'tests') : _basePath;
+
+const sparkplug = path.resolve(__dirname, 'sparkplug.js');
+
 const _clientScript = tests
-    ? path.resolve(__dirname, '..', '..', 'client', 'dist', 'betterdiscord.client.js')
-    : path.resolve(__dirname, 'betterdiscord.client.js');
-const _dataPath = tests
-    ? path.resolve(__dirname, '..', '..', 'tests', 'data')
-    : path.resolve(__dirname, 'data');
-const _extPath = tests
-    ? path.resolve(__dirname, '..', '..', 'tests', 'ext')
-    : path.resolve(__dirname, 'ext');
-const _pluginPath = path.resolve(_extPath, 'plugins');
-const _themePath = path.resolve(_extPath, 'themes');
-const _modulePath = path.resolve(_extPath, 'modules');
+    ? path.resolve(_basePath, 'client', 'dist', 'betterdiscord.client.js')
+    : path.resolve(_basePath, 'betterdiscord.client.js');
 const _cssEditorPath = tests
     ? path.resolve(__dirname, '..', '..', 'csseditor', 'dist')
     : path.resolve(__dirname, 'csseditor');
 
+const _dataPath = path.resolve(_baseDataPath, 'data');
+const _extPath = path.resolve(_baseDataPath, 'ext');
+const _pluginPath = path.resolve(_extPath, 'plugins');
+const _themePath = path.resolve(_extPath, 'themes');
+const _modulePath = path.resolve(_extPath, 'modules');
+
 const paths = [
-    { id: 'base', path: _basePath.replace(/\\/g, '/') },
-    { id: 'cs', path: _clientScript.replace(/\\/g, '/') },
-    { id: 'data', path: _dataPath.replace(/\\/g, '/') },
-    { id: 'ext', path: _extPath.replace(/\\/g, '/') },
-    { id: 'plugins', path: _pluginPath.replace(/\\/g, '/') },
-    { id: 'themes', path: _themePath.replace(/\\/g, '/') },
-    { id: 'modules', path: _modulePath.replace(/\\/g, '/') },
-    { id: 'csseditor', path: _cssEditorPath.replace(/\\/g, '/') }
+    { id: 'base', path: _basePath },
+    { id: 'cs', path: _clientScript },
+    { id: 'data', path: _dataPath },
+    { id: 'ext', path: _extPath },
+    { id: 'plugins', path: _pluginPath },
+    { id: 'themes', path: _themePath },
+    { id: 'modules', path: _modulePath },
+    { id: 'csseditor', path: _cssEditorPath }
 ];
 
-const sparkplug = path.resolve(__dirname, 'sparkplug.js').replace(/\\/g, '/');
-
-const Common = {};
 const globals = {
     version: '2.0.0a',
     paths
-}
-
-const dbInstance = new Database(paths.find(path => path.id === 'data').path);
+};
 
 class Comms {
 
@@ -61,9 +58,7 @@ class Comms {
     }
 
     initListeners() {
-        BDIpc.on('bd-getConfig', o => {
-            o.reply(Common.Config.config);
-        });
+        BDIpc.on('bd-getConfig', o => o.reply(this.bd.config.config));
 
         BDIpc.on('bd-sendToDiscord', event => this.bd.windowUtils.send(event.args.channel, event.args.message));
 
@@ -71,9 +66,6 @@ class Comms {
         // BDIpc.on('bd-setScss', o => this.bd.csseditor.setSCSS(o.args.scss));
         BDIpc.on('bd-sendToCssEditor', o => this.bd.csseditor.send(o.args.channel, o.args.data));
 
-        BDIpc.on('bd-readFile', this.readFile);
-        BDIpc.on('bd-readJson', o => this.readFile(o, true));
-
         BDIpc.on('bd-native-open', o => {
             dialog.showOpenDialog(BrowserWindow.fromWebContents(o.ipcEvent.sender), o.args, filenames => {
                 o.reply(filenames);
@@ -88,36 +80,22 @@ class Comms {
             }
 
             sass.render(o.args, (err, result) => {
-                if (err) {
-                    o.reply({ err });
-                    return;
-                }
-                o.reply(result);
+                if (err) return o.reply({ err });
+                else o.reply(result);
             });
         });
 
         BDIpc.on('bd-dba', o => {
             (async () => {
                 try {
-                    const ret = await dbInstance.exec(o.args);
-                    o.reply(ret);
+                    o.reply(await this.bd.dbInstance.exec(o.args));
                 } catch (err) {
-                    o.reply({err});
+                    o.reply({ err });
                 }
             })();
         });
     }
 
-    async readFile(o, json) {
-        const { path } = o.args;
-        try {
-            const readFile = json ? await FileUtils.readJsonFromFile(path) : await FileUtils.readFile(path);
-            o.reply(readFile);
-        } catch (err) {
-            o.reply(err);
-        }
-    }
-
     async send(channel, message) {
         BDIpc.send(channel, message);
     }
@@ -135,23 +113,25 @@ class BetterDiscord {
 
         this.injectScripts = this.injectScripts.bind(this);
         this.ignite = this.ignite.bind(this);
-        Common.Config = new Config(globals);
+
+        this.config = new Config(args || globals);
+        this.dbInstance = new Database(this.config.paths.find(path => path.id === 'data').path);
         this.comms = new Comms(this);
+
         this.init();
     }
 
     async init() {
-        const window = await this.waitForWindow();
-        this.windowUtils = new WindowUtils({ window });
+        await this.waitForWindowUtils();
 
-        await FileUtils.ensureDirectory(paths.find(path => path.id === 'ext').path);
+        await FileUtils.ensureDirectory(this.config.paths.find(path => path.id === 'ext').path);
 
-        this.csseditor = new CSSEditor(this, paths.find(path => path.id === 'csseditor').path);
+        this.csseditor = new CSSEditor(this, this.config.paths.find(path => path.id === 'csseditor').path);
 
-        this.windowUtils.events('did-get-response-details', () => this.ignite(this.windowUtils.window));
-        this.windowUtils.events('did-finish-load', e => this.injectScripts(true));
+        this.windowUtils.on('did-get-response-details', () => this.ignite());
+        this.windowUtils.on('did-finish-load', e => this.injectScripts(true));
 
-        this.windowUtils.events('did-navigate-in-page', (event, url, isMainFrame) => {
+        this.windowUtils.on('did-navigate-in-page', (event, url, isMainFrame) => {
             this.windowUtils.send('did-navigate-in-page', { event, url, isMainFrame });
         });
 
@@ -166,10 +146,8 @@ class BetterDiscord {
             const defer = setInterval(() => {
                 const windows = BrowserWindow.getAllWindows();
 
-                if (windows.length > 0) {
-                    windows.forEach(window => {
-                        self.ignite(window);
-                    });
+                for (let window of windows) {
+                    BetterDiscord.ignite(window);
                 }
 
                 if (windows.length === 1 && windows[0].webContents.getURL().includes('discordapp.com')) {
@@ -180,23 +158,45 @@ class BetterDiscord {
         });
     }
 
-    ignite(window) {
-        //Hook things that Discord removes from global. These will be removed again in the client script
-        window.webContents.executeJavaScript(`require("${sparkplug}");`);
+    async waitForWindowUtils() {
+        if (this.windowUtils) return this.windowUtils;
+        const window = await this.waitForWindow();
+        return this.windowUtils = new WindowUtils({ window });
     }
 
+    get window() {
+        return this.windowUtils ? this.windowUtils.window : undefined;
+    }
+
+    /**
+     * Hooks things that Discord removes from global. These will be removed again in the client script.
+     */
+    ignite() {
+        return BetterDiscord.ignite(this.window);
+    }
+
+    /**
+     * Hooks things that Discord removes from global. These will be removed again in the client script.
+     * @param {BrowserWindow} window The window to inject the sparkplug script into
+     */
+    static ignite(window) {
+        return WindowUtils.injectScript(window, sparkplug);
+    }
+
+    /**
+     * Injects the client script into the main window.
+     * @param {Boolean} reload Whether the main window was reloaded
+     */
     async injectScripts(reload = false) {
         console.log(`RELOAD? ${reload}`);
         if (!tests) {
-            const files = await FileUtils.listDirectory(paths.find(path => path.id === 'base').path);
+            const files = await FileUtils.listDirectory(this.config.paths.find(path => path.id === 'base').path);
             const latestCs = FileUtils.resolveLatest(files, file => file.endsWith('.js') && file.startsWith('client.'), file => file.replace('client.', '').replace('.js', ''), 'client.', '.js');
-            paths.find(path => path.id === 'cs').path = path.resolve(paths.find(path => path.id === 'base').path, latestCs).replace(/\\/g, '/');
+            this.config.paths.find(path => path.id === 'cs').path = path.resolve(this.config.paths.find(path => path.id === 'base').path, latestCs);
         }
-        this.windowUtils.injectScript(paths.find(path => path.id === 'cs').path);
+        return this.windowUtils.injectScript(this.config.paths.find(path => path.id === 'cs').path);
     }
 
-    get fileUtils() { return FileUtils; }
-
 }
 
 module.exports = {
diff --git a/core/src/modules/bdipc.js b/core/src/modules/bdipc.js
index c9fd7d46..7cfcdb31 100644
--- a/core/src/modules/bdipc.js
+++ b/core/src/modules/bdipc.js
@@ -5,14 +5,15 @@
  * https://github.com/JsSucks - 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. 
+ * LICENSE file in the root directory of this source tree.
 */
+
 const { Module } = require('./modulebase');
 
 const { ipcMain } = require('electron');
 
 class BDIpcEvent extends Module {
-    
+
     constructor(event, args) {
         super(args);
         this.ipcEvent = event;
@@ -34,10 +35,9 @@ class BDIpcEvent extends Module {
 }
 
 class BDIpc {
-
     static on(channel, cb) {
         ipcMain.on(channel, (event, args) => cb(new BDIpcEvent(event, args)));
     }
 }
 
-module.exports = { BDIpc };
\ No newline at end of file
+module.exports = { BDIpc };
diff --git a/core/src/modules/config.js b/core/src/modules/config.js
index cb73e865..417de899 100644
--- a/core/src/modules/config.js
+++ b/core/src/modules/config.js
@@ -5,7 +5,7 @@
  * https://github.com/JsSucks - 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. 
+ * LICENSE file in the root directory of this source tree.
 */
 
 const { Module } = require('./modulebase');
@@ -22,11 +22,11 @@ class Config extends Module {
 
     get config() {
         return {
-            'version': this.version,
-            'paths': this.paths
+            version: this.version,
+            paths: this.paths
         };
     }
 
 }
 
-module.exports = { Config };
\ No newline at end of file
+module.exports = { Config };
diff --git a/core/src/modules/csseditor.js b/core/src/modules/csseditor.js
index a70274a9..9e50d053 100644
--- a/core/src/modules/csseditor.js
+++ b/core/src/modules/csseditor.js
@@ -22,6 +22,10 @@ class CSSEditor extends Module {
         this.bd = bd;
     }
 
+    /**
+     * Opens an editor and replies to an IPC event.
+     * @param {BDIpcEvent} event
+     */
     openEditor(o) {
         if (this.editor) {
             if (this.editor.isFocused()) return;
@@ -32,12 +36,7 @@ class CSSEditor extends Module {
             return;
         }
 
-        const options = this.options;
-        for (let option in o.args) {
-            if (o.args.hasOwnProperty(option)) {
-                options[option] = o.args[option];
-            }
-        }
+        const options = Object.assign({}, this.options, o.message);
 
         this.editor = new BrowserWindow(options);
         this.editor.loadURL('about:blank');
@@ -59,20 +58,34 @@ class CSSEditor extends Module {
         });
     }
 
+    /**
+     * Sets the SCSS in the editor.
+     */
     setSCSS(scss) {
         this.send('set-scss', scss);
     }
 
+    /**
+     * Sends data to the editor.
+     * @param {String} channel
+     * @param {Any} data
+     */
     send(channel, data) {
         if (!this.editor) return;
         this.editor.webContents.send(channel, data);
     }
 
+    /**
+     * Sets the CSS editor's always on top flag.
+     */
     set alwaysOnTop(state) {
         if (!this.editor) return;
         this.editor.setAlwaysOnTop(state);
     }
 
+    /**
+     * Default options to pass to BrowserWindow.
+     */
     get options() {
         return {
             width: 800,
@@ -81,7 +94,7 @@ class CSSEditor extends Module {
             frame: false
         };
     }
-    
+
 }
 
 module.exports = { CSSEditor };
diff --git a/core/src/modules/database.js b/core/src/modules/database.js
index e0844954..6f79df86 100644
--- a/core/src/modules/database.js
+++ b/core/src/modules/database.js
@@ -10,7 +10,7 @@
 
 const Datastore = require('nedb');
 
-class Database  {
+class Database {
 
     constructor(dbPath) {
         this.exec = this.exec.bind(this);
diff --git a/core/src/modules/modulebase.js b/core/src/modules/modulebase.js
index 20cba6ca..3713a162 100644
--- a/core/src/modules/modulebase.js
+++ b/core/src/modules/modulebase.js
@@ -5,20 +5,19 @@
  * https://github.com/JsSucks - 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. 
-*/
-
-/*
-Base Module that every non-static module should extend
+ * LICENSE file in the root directory of this source tree.
 */
 
+/**
+ * Base Module that every non-static module should extend.
+ */
 class Module {
 
     constructor(args) {
         this.__ = {
             state: args,
             args
-        }
+        };
         this.init();
     }
 
@@ -33,4 +32,4 @@ class Module {
 
 }
 
-module.exports = { Module };
\ No newline at end of file
+module.exports = { Module };
diff --git a/core/src/modules/utils.js b/core/src/modules/utils.js
index 3a31dbb0..12c205f1 100644
--- a/core/src/modules/utils.js
+++ b/core/src/modules/utils.js
@@ -10,43 +10,35 @@
 
 // TODO Use common
 
-const
-    path = require('path'),
-    fs = require('fs');
+const path = require('path');
+const fs = require('fs');
 
 const { Module } = require('./modulebase');
 
 class Utils {
-
     static async tryParseJson(jsonString) {
         try {
             return JSON.parse(jsonString);
-        }catch(err) {
+        } catch (err) {
             throw ({
-                'message': 'Failed to parse json',
+                message: 'Failed to parse json',
                 err
             });
         }
     }
-
-    static get timestamp() {
-        return 'Timestamp';
-    }
-
 }
 
 class FileUtils {
-
     static async fileExists(path) {
         return new Promise((resolve, reject) => {
             fs.stat(path, (err, stats) => {
                 if(err) return reject({
-                    'message': `No such file or directory: ${err.path}`,
+                    message: `No such file or directory: ${err.path}`,
                     err
                 });
 
                 if(!stats.isFile()) return reject({
-                    'message': `Not a file: ${path}`,
+                    message: `Not a file: ${path}`,
                     stats
                 });
 
@@ -59,12 +51,12 @@ class FileUtils {
         return new Promise((resolve, reject) => {
             fs.stat(path, (err, stats) => {
                 if(err) return reject({
-                    'message': `Directory does not exist: ${path}`,
+                    message: `Directory does not exist: ${path}`,
                     err
                 });
 
                 if(!stats.isDirectory()) return reject({
-                    'message': `Not a directory: ${path}`,
+                    message: `Not a directory: ${path}`,
                     stats
                 });
 
@@ -76,14 +68,14 @@ class FileUtils {
     static async readFile(path) {
         try {
             await this.fileExists(path);
-        } catch(err) {
-            throw(err);
+        } catch (err) {
+            throw err;
         }
 
         return new Promise((resolve, reject) => {
             fs.readFile(path, 'utf-8', (err, data) => {
-                if(err) reject({
-                    'message': `Could not read file: ${path}`,
+                if(err) return reject({
+                    message: `Could not read file: ${path}`,
                     err
                 });
 
@@ -97,14 +89,13 @@ class FileUtils {
         try {
             readFile = await this.readFile(path);
         } catch(err) {
-            throw(err);
+            throw err;
         }
 
         try {
-            const parsed = await Utils.tryParseJson(readFile);
-            return parsed;
-        } catch(err) {
-            throw(Object.assign(err, { path }));
+            return await Utils.tryParseJson(readFile);
+        } catch (err) {
+            throw Object.assign(err, { path });
         }
     }
 
@@ -113,8 +104,8 @@ class FileUtils {
             await this.directoryExists(path);
             return new Promise((resolve, reject) => {
                 fs.readdir(path, (err, files) => {
-                    if (err) return reject(err);
-                    resolve(files);
+                    if (err) reject(err);
+                    else resolve(files);
                 });
             });
         } catch (err) {
@@ -145,11 +136,8 @@ class FileUtils {
     static async createDirectory(path) {
         return new Promise((resolve, reject) => {
             fs.mkdir(path, err => {
-                if (err) {
-                    if (err.code === 'EEXIST') return resolve();
-                    else return reject(err);
-                }
-                resolve();
+                if (err) reject(err);
+                else resolve();
             });
         });
     }
@@ -170,7 +158,6 @@ class FileUtils {
 }
 
 class WindowUtils extends Module {
-
     bindings() {
         this.openDevTools = this.openDevTools.bind(this);
         this.executeJavascript = this.executeJavascript.bind(this);
@@ -194,16 +181,20 @@ class WindowUtils extends Module {
     }
 
     injectScript(fpath, variable) {
-        console.log(`Injecting: ${fpath}`);
+        return WindowUtils.injectScript(this.window, fpath, variable);
+    }
+
+    static injectScript(window, fpath, variable) {
+        // console.log(`Injecting: ${fpath}`);
 
         const escaped_path = fpath.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
         const escaped_variable = variable ? variable.replace(/\\/g, '\\\\').replace(/"/g, '\\"') : null;
 
-        if (variable) this.executeJavascript(`window["${escaped_variable}"] = require("${escaped_path}");`);
-        else this.executeJavascript(`require("${escaped_path}");`);
+        if (variable) window.executeJavaScript(`window["${escaped_variable}"] = require("${escaped_path}");`);
+        else window.executeJavaScript(`require("${escaped_path}");`);
     }
 
-    events(event, callback) {
+    on(event, callback) {
         this.webContents.on(event, callback);
     }
 
@@ -211,7 +202,6 @@ class WindowUtils extends Module {
         channel = channel.startsWith('bd-') ? channel : `bd-${channel}`;
         this.webContents.send(channel, message);
     }
-
 }
 
 module.exports = {
diff --git a/csseditor/src/Editor.vue b/csseditor/src/Editor.vue
index d369aa61..2eb8de54 100644
--- a/csseditor/src/Editor.vue
+++ b/csseditor/src/Editor.vue
@@ -33,18 +33,18 @@
 </template>
 
 <script>
-    import '../../node_modules/codemirror/addon/scroll/simplescrollbars.js';
-    import '../../node_modules/codemirror/mode/css/css.js';
-    import '../../node_modules/codemirror/addon/hint/css-hint.js';
-    import '../../node_modules/codemirror/addon/search/search.js';
-    import '../../node_modules/codemirror/addon/search/searchcursor.js';
-    import '../../node_modules/codemirror/addon/search/jump-to-line.js';
-    import '../../node_modules/codemirror/addon/dialog/dialog.js';
-    import '../../node_modules/codemirror/addon/hint/show-hint.js';
-
     import BDIpc from './BDIpc';
 
-    const { remote } = window.require('electron');
+    import { remote } from 'electron';
+
+    import 'codemirror/addon/scroll/simplescrollbars.js';
+    import 'codemirror/mode/css/css.js';
+    import 'codemirror/addon/hint/css-hint.js';
+    import 'codemirror/addon/search/search.js';
+    import 'codemirror/addon/search/searchcursor.js';
+    import 'codemirror/addon/search/jump-to-line.js';
+    import 'codemirror/addon/dialog/dialog.js';
+    import 'codemirror/addon/hint/show-hint.js';
 
     const ExcludedIntelliSenseTriggerKeys = {
         '8': 'backspace',

From 74e3605ec64e0bd91ac37afb51b728f1bf45f6c5 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 21 Mar 2018 20:47:46 +0000
Subject: [PATCH 07/23] Get version from package.json

---
 client/src/builtin/EmoteModule.js |  2 ++
 core/src/main.js                  | 28 ++++++++++++++++------------
 core/src/modules/config.js        |  5 +++++
 gulpfile.js                       | 10 +++++++++-
 4 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/client/src/builtin/EmoteModule.js b/client/src/builtin/EmoteModule.js
index 7c901607..df3e2337 100644
--- a/client/src/builtin/EmoteModule.js
+++ b/client/src/builtin/EmoteModule.js
@@ -7,10 +7,12 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
 */
+
 import { FileUtils, ClientLogger as Logger } from 'common';
 import { Events, Globals, WebpackModules, ReactComponents, MonkeyPatch } from 'modules';
 import { DOM, VueInjector, Reflection } from 'ui';
 import EmoteComponent from './EmoteComponent.vue';
+
 let emotes = null;
 const emotesEnabled = true;
 
diff --git a/core/src/main.js b/core/src/main.js
index 8aad0c90..3f58fd1c 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -10,9 +10,9 @@
 
 const path = require('path');
 const sass = require('node-sass');
+const { BrowserWindow, dialog } = require('electron');
 
 const { FileUtils, BDIpc, Config, WindowUtils, CSSEditor, Database } = require('./modules');
-const { BrowserWindow, dialog } = require('electron');
 
 const tests = true;
 
@@ -34,6 +34,8 @@ const _pluginPath = path.resolve(_extPath, 'plugins');
 const _themePath = path.resolve(_extPath, 'themes');
 const _modulePath = path.resolve(_extPath, 'modules');
 
+const version = require(path.resolve(_basePath, 'package.json')).version;
+
 const paths = [
     { id: 'base', path: _basePath },
     { id: 'cs', path: _clientScript },
@@ -46,7 +48,7 @@ const paths = [
 ];
 
 const globals = {
-    version: '2.0.0a',
+    version,
     paths
 };
 
@@ -115,7 +117,7 @@ class BetterDiscord {
         this.ignite = this.ignite.bind(this);
 
         this.config = new Config(args || globals);
-        this.dbInstance = new Database(this.config.paths.find(path => path.id === 'data').path);
+        this.dbInstance = new Database(this.config.getPath('data'));
         this.comms = new Comms(this);
 
         this.init();
@@ -124,12 +126,19 @@ class BetterDiscord {
     async init() {
         await this.waitForWindowUtils();
 
-        await FileUtils.ensureDirectory(this.config.paths.find(path => path.id === 'ext').path);
+        if (!tests) {
+            const basePath = this.config.getPath('base');
+            const files = await FileUtils.listDirectory(basePath);
+            const latestCs = FileUtils.resolveLatest(files, file => file.endsWith('.js') && file.startsWith('client.'), file => file.replace('client.', '').replace('.js', ''), 'client.', '.js');
+            this.config.getPath('cs', true).path = path.resolve(basePath, latestCs);
+        }
 
-        this.csseditor = new CSSEditor(this, this.config.paths.find(path => path.id === 'csseditor').path);
+        await FileUtils.ensureDirectory(this.config.getPath('ext'));
+
+        this.csseditor = new CSSEditor(this, this.config.getPath('csseditor'));
 
         this.windowUtils.on('did-get-response-details', () => this.ignite());
-        this.windowUtils.on('did-finish-load', e => this.injectScripts(true));
+        this.windowUtils.on('did-finish-load', () => this.injectScripts(true));
 
         this.windowUtils.on('did-navigate-in-page', (event, url, isMainFrame) => {
             this.windowUtils.send('did-navigate-in-page', { event, url, isMainFrame });
@@ -189,12 +198,7 @@ class BetterDiscord {
      */
     async injectScripts(reload = false) {
         console.log(`RELOAD? ${reload}`);
-        if (!tests) {
-            const files = await FileUtils.listDirectory(this.config.paths.find(path => path.id === 'base').path);
-            const latestCs = FileUtils.resolveLatest(files, file => file.endsWith('.js') && file.startsWith('client.'), file => file.replace('client.', '').replace('.js', ''), 'client.', '.js');
-            this.config.paths.find(path => path.id === 'cs').path = path.resolve(this.config.paths.find(path => path.id === 'base').path, latestCs);
-        }
-        return this.windowUtils.injectScript(this.config.paths.find(path => path.id === 'cs').path);
+        return this.windowUtils.injectScript(this.config.getPath('cs'));
     }
 
 }
diff --git a/core/src/modules/config.js b/core/src/modules/config.js
index 417de899..b9df602b 100644
--- a/core/src/modules/config.js
+++ b/core/src/modules/config.js
@@ -20,6 +20,11 @@ class Config extends Module {
         return this.args.paths;
     }
 
+    getPath(id, full) {
+        const path = this.paths.find(path => path.id === id);
+        return full ? path : path.path;
+    }
+
     get config() {
         return {
             version: this.version,
diff --git a/gulpfile.js b/gulpfile.js
index 68f9401d..1640468f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -8,10 +8,18 @@ const
     rename = require('gulp-rename'),
     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;
+    return fs.writeFileSync('./release/package.json', JSON.stringify(mainpkg, null, 2));
+};
+
 const client = function() {
     return pump([
         gulp.src('./client/dist/*.client.js'),
@@ -65,5 +73,5 @@ const node_sass_bindings = function() {
 };
 
 gulp.task('release', function () {
-    del(['./release/**/*']).then(() => merge(client(), core(), sparkplug(), core_modules(), index(), cssEditor(), deps(), node_sass_bindings()));
+    del(['./release/**/*']).then(() => merge(releasepkg(), client(), core(), sparkplug(), core_modules(), index(), cssEditor(), deps(), node_sass_bindings()));
 });

From 8a9c8edf39abf1b47db2c08f068c6f225995de49 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 21 Mar 2018 20:48:36 +0000
Subject: [PATCH 08/23] Add patcher to the plugin API and fix error when
 rendering system messages

---
 client/src/modules/patcher.js           | 15 +++++++++---
 client/src/modules/plugin.js            |  6 ++++-
 client/src/modules/pluginapi.js         | 31 ++++++++++++++++++++++++-
 client/src/ui/profilebadges.js          |  4 +++-
 tests/ext/plugins/Patcher Test/index.js | 15 ++++++------
 5 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/client/src/modules/patcher.js b/client/src/modules/patcher.js
index 55e8ee80..ac4d19b7 100644
--- a/client/src/modules/patcher.js
+++ b/client/src/modules/patcher.js
@@ -5,14 +5,16 @@
  * https://github.com/JsSucks - 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. 
+ * LICENSE file in the root directory of this source tree.
 */
 
 import { WebpackModules } from './webpackmodules';
 import { ClientLogger as Logger, Utils } from 'common';
 
 export class Patcher {
+
     static get patches() { return this._patches || (this._patches = {}) }
+
     static getPatchesByCaller(id) {
         const patches = [];
         for (const patch in this.patches) {
@@ -22,16 +24,21 @@ export class Patcher {
         }
         return patches;
     }
+
     static unpatchAll(patches) {
+        if (typeof patches === 'string')
+            patches = this.getPatchesByCaller(patches);
+
         for (const patch of patches) {
             for (const child of patch.children) {
                 child.unpatch();
             }
         }
     }
+
     static resolveModule(module) {
         if (module instanceof Function || (module instanceof Object && !(module instanceof Array))) return module;
-        if ('string' === typeof module) return WebpackModules.getModuleByName(module);
+        if (typeof module === 'string') return WebpackModules.getModuleByName(module);
         if (module instanceof Array) return WebpackModules.getModuleByProps(module);
         return null;
     }
@@ -99,10 +106,12 @@ export class Patcher {
     static before() { return this.pushChildPatch(...arguments, 'before') }
     static after() { return this.pushChildPatch(...arguments, 'after') }
     static instead() { return this.pushChildPatch(...arguments, 'instead') }
+
     static pushChildPatch(caller, unresolvedModule, functionName, callback, displayName, type = 'after') {
         const module = this.resolveModule(unresolvedModule);
         if (!module || !module[functionName] || !(module[functionName] instanceof Function)) return null;
-        displayName = 'string' === typeof unresolvedModule ? unresolvedModule : displayName || module.displayName || module.name || module.constructor.displayName || module.constructor.name;
+        displayName = typeof unresolvedModule === 'string' ? unresolvedModule :
+            displayName || module.displayName || module.name || module.constructor.displayName || module.constructor.name;
         const patchId = `${displayName}:${functionName}:${caller}`;
 
         const patch = this.patches[patchId] || this.pushPatch(caller, patchId, module, functionName);
diff --git a/client/src/modules/plugin.js b/client/src/modules/plugin.js
index dcf26bef..039ba05e 100644
--- a/client/src/modules/plugin.js
+++ b/client/src/modules/plugin.js
@@ -18,8 +18,12 @@ export default class Plugin extends Content {
     get start() { return this.enable }
     get stop() { return this.disable }
 
+    reload() {
+        return PluginManager.reloadPlugin(this);
+    }
+
     unload() {
-        PluginManager.unloadPlugin(this);
+        return PluginManager.unloadPlugin(this);
     }
 
 }
diff --git a/client/src/modules/pluginapi.js b/client/src/modules/pluginapi.js
index 670a407c..38284465 100644
--- a/client/src/modules/pluginapi.js
+++ b/client/src/modules/pluginapi.js
@@ -388,10 +388,39 @@ export default class PluginApi {
     get ReactComponents() {
         return ReactComponents;
     }
+
     get Reflection() {
         return Reflection;
     }
-    get MonkeyPatch() {
+
+    /**
+     * Patcher
+     */
+
+    get patches() {
+        return Patcher.getPatchesByCaller(this.plugin.id);
+    }
+    patchBefore(...args) { return this.pushChildPatch(...args, 'before') }
+    patchAfter(...args) { return this.pushChildPatch(...args, 'after') }
+    patchInstead(...args) { return this.pushChildPatch(...args, 'instead') }
+    pushChildPatch(...args) {
+        return Patcher.pushChildPatch(this.plugin.id, ...args);
+    }
+    unpatchAll(patches) {
+        return Patcher.unpatchAll(patches || this.plugin.id);
+    }
+    get Patcher() {
+        return Object.defineProperty({
+            before: this.patchBefore.bind(this),
+            after: this.patchAfter.bind(this),
+            instead: this.patchInstead.bind(this),
+            pushChildPatch: this.pushChildPatch.bind(this),
+            unpatchAll: this.unpatchAll.bind(this),
+        }, 'patches', {
+            get: () => this.patches
+        });
+    }
+    get monkeyPatch() {
         return module => MonkeyPatch(this.plugin.id, module);
     }
 
diff --git a/client/src/ui/profilebadges.js b/client/src/ui/profilebadges.js
index 9b43bb9b..008bb448 100644
--- a/client/src/ui/profilebadges.js
+++ b/client/src/ui/profilebadges.js
@@ -59,7 +59,9 @@ export default class extends EventListener {
         const c = contributors.find(c => c.id === msgGroup.dataset.authorId);
         if (!c) return;
         const root = document.createElement('span');
-        const wrapperParent = msgGroup.querySelector('.username-wrapper').parentElement;
+        const usernameWrapper = msgGroup.querySelector('.username-wrapper');
+        if (!usernameWrapper) return;
+        const wrapperParent = usernameWrapper.parentElement;
         if (!wrapperParent || wrapperParent.children.length < 2) return;
         wrapperParent.insertBefore(root, wrapperParent.children[1]);
         const { developer, contributor, webdev } = c;
diff --git a/tests/ext/plugins/Patcher Test/index.js b/tests/ext/plugins/Patcher Test/index.js
index 8c7eefaf..7f280b5d 100644
--- a/tests/ext/plugins/Patcher Test/index.js	
+++ b/tests/ext/plugins/Patcher Test/index.js	
@@ -1,26 +1,25 @@
 module.exports = (Plugin, Api, Vendor) => {
 
-    const { ReactComponents } = Api;
+    const { Logger, ReactComponents, Patcher, monkeyPatch } = Api;
 
     return class extends Plugin {
-        test() {
-            
-        }
         onStart() {
             this.patchMessage();
             return true;
         }
+
         async patchMessage() {
             const Message = await ReactComponents.getComponent('Message');
-            this.unpatchTest = Api.MonkeyPatch(Message.component.prototype).after('render', () => {
-                console.log('MESSAGE RENDER!');
+            monkeyPatch(Message.component.prototype).after('render', e => {
+                Logger.log('MESSAGE RENDER!', e);
             });
         }
 
         onStop() {
-            this.unpatchTest(); // The automatic unpatcher is not there yet
+            // The automatic unpatcher is not there yet
+            Patcher.unpatchAll();
             return true;
         }
     }
-}
 
+};

From aa933d9a09ef3ff1c898bf6423af739c677269ab Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 21 Mar 2018 20:52:42 +0000
Subject: [PATCH 09/23] Refactor IPC

---
 client/src/modules/csseditor.js |  10 +--
 client/src/modules/database.js  |   3 +-
 client/src/modules/globals.js   |   2 +-
 client/src/modules/pluginapi.js |   2 +-
 common/modules/bdipc.js         | 144 +++++++++++++++++++++++++++-----
 common/modules/common.js        |   2 +-
 common/modules/logger.js        |   2 +-
 core/src/main.js                |  52 ++++++------
 core/src/modules/bdipc.js       | 100 +++++++++++++++++++---
 core/src/modules/csseditor.js   |  65 +++++++-------
 core/src/modules/utils.js       |  14 ++--
 csseditor/src/Editor.vue        |  30 +++----
 12 files changed, 300 insertions(+), 126 deletions(-)

diff --git a/client/src/modules/csseditor.js b/client/src/modules/csseditor.js
index a430bcbc..ebc17c16 100644
--- a/client/src/modules/csseditor.js
+++ b/client/src/modules/csseditor.js
@@ -35,7 +35,7 @@ export default new class {
      * Init css editor
      */
     init() {
-        ClientIPC.on('bd-get-scss', () => this.sendToEditor('set-scss', { scss: this.scss }));
+        ClientIPC.on('bd-get-scss', () => this.scss, true);
         ClientIPC.on('bd-update-scss', (e, scss) => this.updateScss(scss));
         ClientIPC.on('bd-save-csseditor-bounds', (e, bounds) => this.saveEditorBounds(bounds));
 
@@ -49,7 +49,7 @@ export default new class {
             this.sendToEditor('set-liveupdate', event.value);
         });
 
-        ClientIPC.on('bd-get-liveupdate', () => this.sendToEditor('set-liveupdate', this.liveupdate.value));
+        ClientIPC.on('bd-get-liveupdate', () => this.liveupdate.value, true);
         ClientIPC.on('bd-set-liveupdate', (e, value) => this.liveupdate.value = value);
 
         this.watchfilessetting = Settings.getSetting('css', 'default', 'watch-files');
@@ -73,7 +73,7 @@ export default new class {
      */
     async updateScss(scss, sendSource) {
         if (sendSource)
-            this.sendToEditor('set-scss', { scss });
+            this.sendToEditor('set-scss', scss);
 
         if (!scss) {
             this._scss = this.css = '';
@@ -137,7 +137,7 @@ export default new class {
      * @param {any} data
      */
     async sendToEditor(channel, data) {
-        return await ClientIPC.send('sendToCssEditor', { channel, data });
+        return ClientIPC.sendToCssEditor(channel, data);
     }
 
     /**
@@ -168,7 +168,7 @@ export default new class {
      */
     setState(scss, css, files, err) {
         this._scss = scss;
-        this.sendToEditor('set-scss', { scss });
+        this.sendToEditor('set-scss', scss);
         this.css = css;
         this.files = files;
         this.error = err;
diff --git a/client/src/modules/database.js b/client/src/modules/database.js
index 1405b4aa..d926bb9b 100644
--- a/client/src/modules/database.js
+++ b/client/src/modules/database.js
@@ -8,7 +8,7 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { ClientIPC } from 'bdipc';
+import { ClientIPC } from 'common';
 
 export default class {
 
@@ -42,4 +42,5 @@ export default class {
             throw err;
         }
     }
+
 }
diff --git a/client/src/modules/globals.js b/client/src/modules/globals.js
index 4971ec2a..bb4792b4 100644
--- a/client/src/modules/globals.js
+++ b/client/src/modules/globals.js
@@ -9,7 +9,7 @@
 */
 
 import sparkplug from 'sparkplug';
-import { ClientIPC } from 'bdipc';
+import { ClientIPC } from 'common';
 import Module from './module';
 import Events from './events';
 
diff --git a/client/src/modules/pluginapi.js b/client/src/modules/pluginapi.js
index 38284465..dbdc74ce 100644
--- a/client/src/modules/pluginapi.js
+++ b/client/src/modules/pluginapi.js
@@ -20,7 +20,7 @@ import { SettingsSet, SettingsCategory, Setting, SettingsScheme } from 'structs'
 import { BdMenuItems, Modals, DOM, Reflection } from 'ui';
 import DiscordApi from './discordapi';
 import { ReactComponents } from './reactcomponents';
-import { MonkeyPatch } from './patcher';
+import { Patcher, MonkeyPatch } from './patcher';
 
 export default class PluginApi {
 
diff --git a/common/modules/bdipc.js b/common/modules/bdipc.js
index 97d598b4..02ab2caf 100644
--- a/common/modules/bdipc.js
+++ b/common/modules/bdipc.js
@@ -8,51 +8,153 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-const { ipcRenderer, ipcMain } = require('electron');
+import { ipcRenderer } from 'electron';
 
-export class ClientIPC {
-    static on(channel, cb) {
-        ipcRenderer.on(channel, (event, message) => cb(event, message));
+const callbacks = new WeakMap();
+
+export default new class ClientIPC {
+
+    constructor() {
+        this.on('ping', () => 'pong', true);
     }
 
-    static async send(channel, message) {
+    /**
+     * Adds an IPC event listener.
+     * @param {String} channel The channel to listen on
+     * @param {Function} callback A function that will be called when a message is received
+     * @param {Boolean} reply Whether to automatically reply to the message with the callback's return value
+     * @return {Promise}
+     */
+    on(channel, callback, reply) {
         channel = channel.startsWith('bd-') ? channel : `bd-${channel}`;
-        const __eid = Date.now().toString();
-        ipcRenderer.send(channel, Object.assign(message ? message : {}, { __eid }));
+
+        const boundCallback = async (event, args) => {
+            const ipcevent = new BDIpcEvent(event, args);
+            try {
+                const r = callback(ipcevent, ipcevent.message);
+                if (reply) ipcevent.reply(await r);
+            } catch (err) {
+                console.error('Error in IPC callback:', err);
+                if (reply) ipcevent.reject(err);
+            }
+        };
+
+        callbacks.set(callback, boundCallback);
+        ipcRenderer.on(channel, boundCallback);
+    }
+
+    off(channel, callback) {
+        ipcRenderer.removeListener(channel, callbacks.get(callback));
+    }
+
+    /**
+     * Sends a message to the main process and returns a promise that is resolved when the main process replies.
+     * @param {String} channel The channel to send a message to
+     * @param {Any} message Data to send to the main process
+     * @param {Boolean} error Whether to mark the message as an error
+     * @return {Promise}
+     */
+    async send(channel, message, error) {
+        channel = channel.startsWith('bd-') ? channel : `bd-${channel}`;
+
+        const eid = 'bd-' + Date.now().toString();
+        ipcRenderer.send(channel, { eid, message, error });
+
         return new Promise((resolve, reject) => {
-            ipcRenderer.once(__eid, (event, arg) => {
-                if (arg.err) {
-                    return reject(arg.err);
-                }
-                resolve(arg);
+            ipcRenderer.once(eid, (event, arg) => {
+                if (arg.error) reject(arg.message);
+                else resolve(arg.message);
             });
         });
     }
+
+    /**
+     * Sends a message to the Discord window and returns a promise that is resolved when it replies.
+     * @param {String} channel The channel to send a message to
+     * @param {Any} message Data to send to the renderer process
+     * @return {Promise}
+     */
+    sendToDiscord(channel, message) {
+        return this.send('bd-sendToDiscord', {
+            channel, message
+        });
+    }
+
+    /**
+     * Sends a message to the CSS editor window and returns a promise that is resolved when it replies.
+     * @param {String} channel The channel to send a message to
+     * @param {Any} message Data to send to the CSS editor window
+     * @return {Promise}
+     */
+    sendToCssEditor(channel, message) {
+        return this.send('bd-sendToCssEditor', {
+            channel, message
+        });
+    }
+
+    ping() {
+        return this.send('ping');
+    }
+
+    getConfig() {
+        return this.send('getConfig');
+    }
+
+    showOpenDialog(options) {
+        return this.send('native-open', options);
+    }
+
+    compileSass(options) {
+        return this.send('compileSass', options);
+    }
+
+    dba(command) {
+        return this.send('dba', command);
+    }
+
 }
 
+/**
+ * An IPC event.
+ */
 class BDIpcEvent {
 
     constructor(event, args) {
         this.args = args;
         this.ipcEvent = event;
+        this.replied = false;
     }
 
     bindings() {
-        this.send = this.send.bind(this);
         this.reply = this.reply.bind(this);
     }
 
-    send(message) {
-        this.ipcEvent.sender.send(this.args.__eid, message);
+    /**
+     * Sends a message back to the message's sender.
+     * @param {Any} message Data to send to this message's sender
+     */
+    get send() { return this.reply }
+    reply(message, error) {
+        if (this.replied)
+            throw {message: 'This message has already been replied to.'};
+
+        this.replied = true;
+        return ClientIPC.send(this.eid, message, error);
     }
 
-    reply(message) {
-        this.send(message);
+    reject(err) {
+        return this.reply(err, true);
     }
-}
 
-export class CoreIPC {
-    static on(channel, cb) {
-        ipcMain.on(channel, (event, args) => cb(new BDIpcEvent(event, args)));
+    get message() {
+        return this.args.message;
+    }
+
+    get error() {
+        return this.args.error;
+    }
+
+    get eid() {
+        return this.args.eid;
     }
 }
diff --git a/common/modules/common.js b/common/modules/common.js
index 0305c577..41865a34 100644
--- a/common/modules/common.js
+++ b/common/modules/common.js
@@ -1,4 +1,4 @@
-export { ClientIPC } from './bdipc';
+export { default as ClientIPC } from './bdipc';
 export * from './utils';
 export { ClientLogger } from './logger';
 export { default as AsyncEventEmitter } from './async-eventemitter';
diff --git a/common/modules/logger.js b/common/modules/logger.js
index 78f4cee0..6f21848d 100644
--- a/common/modules/logger.js
+++ b/common/modules/logger.js
@@ -21,7 +21,7 @@ export const logLevels = {
     'info': 'info'
 };
 
-export class Logger {
+export default class Logger {
 
     constructor(file) {
         this.logs = [];
diff --git a/core/src/main.js b/core/src/main.js
index 3f58fd1c..baf0f5f3 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -60,48 +60,48 @@ class Comms {
     }
 
     initListeners() {
-        BDIpc.on('bd-getConfig', o => o.reply(this.bd.config.config));
+        BDIpc.on('ping', () => 'pong', true);
 
-        BDIpc.on('bd-sendToDiscord', event => this.bd.windowUtils.send(event.args.channel, event.args.message));
+        BDIpc.on('bd-getConfig', () => this.bd.config.config, true);
 
-        BDIpc.on('bd-openCssEditor', o => this.bd.csseditor.openEditor(o));
-        // BDIpc.on('bd-setScss', o => this.bd.csseditor.setSCSS(o.args.scss));
-        BDIpc.on('bd-sendToCssEditor', o => this.bd.csseditor.send(o.args.channel, o.args.data));
+        BDIpc.on('bd-sendToDiscord', (event, m) => this.sendToDiscord(m.channel, m.message), true);
 
-        BDIpc.on('bd-native-open', o => {
-            dialog.showOpenDialog(BrowserWindow.fromWebContents(o.ipcEvent.sender), o.args, filenames => {
-                o.reply(filenames);
+        BDIpc.on('bd-openCssEditor', (event, options) => this.bd.csseditor.openEditor(options), true);
+        BDIpc.on('bd-sendToCssEditor', (event, m) => this.sendToCssEditor(m.channel, m.message), true);
+
+        BDIpc.on('bd-native-open', (event, options) => {
+            dialog.showOpenDialog(BrowserWindow.fromWebContents(event.ipcEvent.sender), options, filenames => {
+                event.reply(filenames);
             });
         });
 
-        BDIpc.on('bd-compileSass', o => {
-            if (!o.args.path && !o.args.data) return o.reply('');
-            if (typeof o.args.path === 'string' && typeof o.args.data === 'string') {
-                o.args.data = `${o.args.data} @import '${o.args.path.replace(/\\/g, '\\\\').replace(/'/g, '\\\'')}';`;
-                o.args.path = undefined;
+        BDIpc.on('bd-compileSass', (event, options) => {
+            if (typeof options.path === 'string' && typeof options.data === 'string') {
+                options.data = `${options.data} @import '${options.path.replace(/\\/g, '\\\\').replace(/'/g, '\\\'')}';`;
+                options.path = undefined;
             }
 
-            sass.render(o.args, (err, result) => {
-                if (err) return o.reply({ err });
-                else o.reply(result);
+            sass.render(options, (err, result) => {
+                if (err) event.reject(err);
+                else event.reply(result);
             });
         });
 
-        BDIpc.on('bd-dba', o => {
-            (async () => {
-                try {
-                    o.reply(await this.bd.dbInstance.exec(o.args));
-                } catch (err) {
-                    o.reply({ err });
-                }
-            })();
-        });
+        BDIpc.on('bd-dba', (event, options) => this.bd.dbInstance.exec(options), true);
     }
 
     async send(channel, message) {
         BDIpc.send(channel, message);
     }
 
+    async sendToDiscord(channel, message) {
+        return this.bd.windowUtils.send(channel, message);
+    }
+
+    async sendToCssEditor(channel, message) {
+        return this.bd.csseditor.send(channel, message);
+    }
+
 }
 
 class BetterDiscord {
@@ -156,7 +156,7 @@ class BetterDiscord {
                 const windows = BrowserWindow.getAllWindows();
 
                 for (let window of windows) {
-                    BetterDiscord.ignite(window);
+                    if (window) BetterDiscord.ignite(window);
                 }
 
                 if (windows.length === 1 && windows[0].webContents.getURL().includes('discordapp.com')) {
diff --git a/core/src/modules/bdipc.js b/core/src/modules/bdipc.js
index 7cfcdb31..de9a9599 100644
--- a/core/src/modules/bdipc.js
+++ b/core/src/modules/bdipc.js
@@ -8,36 +8,114 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+const { ipcMain } = require('electron');
+
 const { Module } = require('./modulebase');
 
-const { ipcMain } = require('electron');
+const callbacks = new WeakMap();
+
+/**
+ * The IPC module used in the main process.
+ */
+class BDIpc {
+
+    /**
+     * Adds an IPC event listener.
+     * @param {String} channel The channel to listen on
+     * @param {Function} callback A function that will be called when a message is received
+     * @param {Boolean} reply Whether to automatically reply to the message with the callback's return value
+     * @return {Promise}
+     */
+    static on(channel, callback, reply) {
+        channel = channel.startsWith('bd-') ? channel : `bd-${channel}`;
+
+        const boundCallback = async (event, args) => {
+            const ipcevent = new BDIpcEvent(event, args);
+            try {
+                const r = callback(ipcevent, ipcevent.message);
+                if (reply) ipcevent.reply(await r);
+            } catch (err) {
+                console.error('Error in IPC callback:', err);
+                if (reply) ipcevent.reject(err);
+            }
+        };
+
+        callbacks.set(callback, boundCallback);
+        ipcMain.on(channel, boundCallback);
+    }
+
+    static off(channel, callback) {
+        ipcMain.removeListener(channel, callbacks.get(callback));
+    }
+
+    /**
+     * Sends a message to the main process and returns a promise that is resolved when the main process replies.
+     * @param {BrowserWindow} window The window to send a message to
+     * @param {String} channel The channel to send a message to
+     * @param {Any} message Data to send to the main process
+     * @param {Boolean} error Whether to mark the message as an error
+     * @return {Promise}
+     */
+    static send(window, channel, message, error) {
+        channel = channel.startsWith('bd-') ? channel : `bd-${channel}`;
+
+        const eid = 'bd-' + Date.now().toString();
+        window.send(channel, { eid, message, error });
+
+        return new Promise((resolve, reject) => {
+            ipcMain.once(eid, (event, arg) => {
+                if (arg.error) reject(arg.message);
+                else resolve(arg.message);
+            });
+        });
+    }
+
+    static ping(window) {
+        return this.send(window, 'ping');
+    }
+
+}
 
 class BDIpcEvent extends Module {
 
     constructor(event, args) {
         super(args);
         this.ipcEvent = event;
+        this.replied = false;
     }
 
     bindings() {
-        this.send = this.send.bind(this);
         this.reply = this.reply.bind(this);
     }
 
-    send(message) {
-        this.ipcEvent.sender.send(this.args.__eid, message);
+    /**
+     * Sends a message back to the message's sender.
+     * @param {Any} message Data to send to this message's sender
+     */
+    reply(message, error) {
+        if (this.replied)
+            throw {message: 'This message has already been replied to.'};
+
+        this.replied = true;
+        return BDIpc.send(this.ipcEvent.sender, this.eid, message, error);
     }
 
-    reply(message) {
-        this.send(message);
+    reject(err) {
+        return this.reply(err, true);
     }
 
-}
-
-class BDIpc {
-    static on(channel, cb) {
-        ipcMain.on(channel, (event, args) => cb(new BDIpcEvent(event, args)));
+    get message() {
+        return this.args.message;
     }
+
+    get error() {
+        return this.args.error;
+    }
+
+    get eid() {
+        return this.args.eid;
+    }
+
 }
 
 module.exports = { BDIpc };
diff --git a/core/src/modules/csseditor.js b/core/src/modules/csseditor.js
index 9e50d053..b4920405 100644
--- a/core/src/modules/csseditor.js
+++ b/core/src/modules/csseditor.js
@@ -13,6 +13,7 @@ const { BrowserWindow } = require('electron');
 
 const { Module } = require('./modulebase');
 const { WindowUtils } = require('./utils');
+const { BDIpc } = require('./bdipc');
 
 class CSSEditor extends Module {
 
@@ -23,46 +24,40 @@ class CSSEditor extends Module {
     }
 
     /**
-     * Opens an editor and replies to an IPC event.
-     * @param {BDIpcEvent} event
+     * Opens an editor.
+     * @return {Promise}
      */
-    openEditor(o) {
-        if (this.editor) {
-            if (this.editor.isFocused()) return;
+    openEditor(options) {
+        return new Promise((resolve, reject) => {
+            if (this.editor) {
+                if (this.editor.isFocused()) return;
 
-            this.editor.focus();
-            this.editor.flashFrame(true);
-            o.reply(true);
-            return;
-        }
+                this.editor.focus();
+                this.editor.flashFrame(true);
+                return resolve(true);
+            }
 
-        const options = Object.assign({}, this.options, o.message);
+            options = Object.assign({}, this.options, options);
 
-        this.editor = new BrowserWindow(options);
-        this.editor.loadURL('about:blank');
-        this.editor.setSheetOffset(33);
-        this.editorUtils = new WindowUtils({ window: this.editor });
+            this.editor = new BrowserWindow(options);
+            this.editor.loadURL('about:blank');
+            this.editor.setSheetOffset(33);
+            this.editorUtils = new WindowUtils({ window: this.editor });
 
-        this.editor.on('close', () => {
-            this.bd.windowUtils.send('bd-save-csseditor-bounds', this.editor.getBounds());
-            this.editor = null;
-        });
+            this.editor.on('close', () => {
+                this.bd.windowUtils.send('bd-save-csseditor-bounds', this.editor.getBounds());
+                this.editor = null;
+            });
 
-        this.editor.once('ready-to-show', () => {
-            this.editor.show();
-        });
+            this.editor.once('ready-to-show', () => {
+                this.editor.show();
+            });
 
-        this.editor.webContents.on('did-finish-load', () => {
-            this.editorUtils.injectScript(path.join(this.editorPath, 'csseditor.js'));
-            o.reply(true);
-        });
-    }
-
-    /**
-     * Sets the SCSS in the editor.
-     */
-    setSCSS(scss) {
-        this.send('set-scss', scss);
+            this.editor.webContents.on('did-finish-load', () => {
+                this.editorUtils.injectScript(path.join(this.editorPath, 'csseditor.js'));
+                resolve(true);
+            });
+        })
     }
 
     /**
@@ -71,8 +66,8 @@ class CSSEditor extends Module {
      * @param {Any} data
      */
     send(channel, data) {
-        if (!this.editor) return;
-        this.editor.webContents.send(channel, data);
+        if (!this.editor) throw {message: 'The CSS editor is not open.'};
+        return BDIpc.send(this.editor, channel, data);
     }
 
     /**
diff --git a/core/src/modules/utils.js b/core/src/modules/utils.js
index 12c205f1..c41c2400 100644
--- a/core/src/modules/utils.js
+++ b/core/src/modules/utils.js
@@ -14,6 +14,7 @@ const path = require('path');
 const fs = require('fs');
 
 const { Module } = require('./modulebase');
+const { BDIpc } = require('./bdipc');
 
 class Utils {
     static async tryParseJson(jsonString) {
@@ -177,7 +178,7 @@ class WindowUtils extends Module {
     }
 
     executeJavascript(script) {
-        this.webContents.executeJavaScript(script);
+        return this.webContents.executeJavaScript(script);
     }
 
     injectScript(fpath, variable) {
@@ -185,13 +186,15 @@ class WindowUtils extends Module {
     }
 
     static injectScript(window, fpath, variable) {
-        // console.log(`Injecting: ${fpath}`);
+        window = window.webContents || window;
+        if (!window) return;
+        // console.log(`Injecting: ${fpath} to`, window);
 
         const escaped_path = fpath.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
         const escaped_variable = variable ? variable.replace(/\\/g, '\\\\').replace(/"/g, '\\"') : null;
 
-        if (variable) window.executeJavaScript(`window["${escaped_variable}"] = require("${escaped_path}");`);
-        else window.executeJavaScript(`require("${escaped_path}");`);
+        if (variable) return window.executeJavaScript(`window["${escaped_variable}"] = require("${escaped_path}");`);
+        else return window.executeJavaScript(`require("${escaped_path}");`);
     }
 
     on(event, callback) {
@@ -199,8 +202,7 @@ class WindowUtils extends Module {
     }
 
     send(channel, message) {
-        channel = channel.startsWith('bd-') ? channel : `bd-${channel}`;
-        this.webContents.send(channel, message);
+        return BDIpc.send(this.window, channel, message);
     }
 }
 
diff --git a/csseditor/src/Editor.vue b/csseditor/src/Editor.vue
index 2eb8de54..66d68f5f 100644
--- a/csseditor/src/Editor.vue
+++ b/csseditor/src/Editor.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-    import BDIpc from './BDIpc';
+    import ClientIPC from 'bdipc';
 
     import { remote } from 'electron';
 
@@ -131,42 +131,38 @@
             }
         },
         created() {
-            BDIpc.on('set-scss', (_, data) => {
-                if (data.error) {
-                    console.log(data.error);
-                    return;
-                }
-                console.log(data);
-                this.setScss(data.scss);
-            });
+            ClientIPC.on('set-scss', (_, scss) => this.setScss(scss));
 
-            BDIpc.on('scss-error', (_, err) => {
+            ClientIPC.on('scss-error', (_, err) => {
                 this.error = err;
                 this.$forceUpdate();
                 if (err)
                     console.error('SCSS parse error:', err);
             });
 
-            BDIpc.on('set-liveupdate', (e, liveUpdate) => this.liveUpdate = liveUpdate);
+            ClientIPC.on('set-liveupdate', (e, liveUpdate) => this.liveUpdate = liveUpdate);
         },
         mounted() {
             this.codemirror.on('keyup', this.cmOnKeyUp);
-            BDIpc.sendToDiscord('get-scss');
-            BDIpc.sendToDiscord('get-liveupdate');
+
+            (async () => {
+                this.setScss(await ClientIPC.sendToDiscord('get-scss'));
+                this.liveUpdate = await ClientIPC.sendToDiscord('get-liveupdate');
+            })();
         },
         watch: {
             liveUpdate(liveUpdate) {
-                BDIpc.sendToDiscord('set-liveupdate', liveUpdate);
+                ClientIPC.sendToDiscord('set-liveupdate', liveUpdate);
             }
         },
         methods: {
             save() {
                 const scss = this.codemirror.getValue();
-                BDIpc.sendToDiscord('save-scss', scss);
+                ClientIPC.sendToDiscord('save-scss', scss);
             },
             update() {
                 const scss = this.codemirror.getValue();
-                BDIpc.sendToDiscord('update-scss', scss);
+                ClientIPC.sendToDiscord('update-scss', scss);
             },
             toggleaot() {
                 this.alwaysOnTop = !this.alwaysOnTop;
@@ -180,7 +176,7 @@
                 this.codemirror.setValue(scss || '');
             },
             cmOnChange(value) {
-                if(this.liveUpdate) BDIpc.sendToDiscord('update-scss', value);
+                if(this.liveUpdate) ClientIPC.sendToDiscord('update-scss', value);
             },
             cmOnKeyUp(editor, event) {
                 if (event.ctrlKey) return;

From a85422f29e81bc2afb0a2a30b64dc51f63c74f45 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 21 Mar 2018 21:07:57 +0000
Subject: [PATCH 10/23] Fix tooltips and add Vue to vendor

---
 client/src/modules/vendor.js                  |  8 ++++
 .../styles/partials/bdsettings/tooltips.scss  | 45 ++++++++++++++++---
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/client/src/modules/vendor.js b/client/src/modules/vendor.js
index 29d5a804..4b5c2d58 100644
--- a/client/src/modules/vendor.js
+++ b/client/src/modules/vendor.js
@@ -11,6 +11,7 @@
 import { WebpackModules } from './webpackmodules';
 import jQuery from 'jquery';
 import lodash from 'lodash';
+import Vue from 'vue';
 
 export { jQuery as $ };
 
@@ -35,4 +36,11 @@ export default class {
         return WebpackModules.getModuleByName('Moment');
     }
 
+    /**
+     * Vue
+     */
+    static get Vue() {
+        return Vue;
+    }
+
 }
diff --git a/client/src/styles/partials/bdsettings/tooltips.scss b/client/src/styles/partials/bdsettings/tooltips.scss
index 3eaa12d4..f8db8cd2 100644
--- a/client/src/styles/partials/bdsettings/tooltips.scss
+++ b/client/src/styles/partials/bdsettings/tooltips.scss
@@ -19,7 +19,6 @@ bd-tooltips {
     position: absolute;
     word-wrap: break-word;
     z-index: 9001;
-    margin-bottom: 10px;
 
     .bd-tooltip-arrow {
         border: 5px solid transparent;
@@ -27,10 +26,46 @@ bd-tooltips {
         height: 0;
         pointer-events: none;
         width: 0;
-        border-top-color: #000;
-        left: 50%;
-        margin-left: -5px;
         position: absolute;
-        top: 100%;
+    }
+
+    &[x-placement^="top"] {
+        margin-bottom: 10px;
+
+        .bd-tooltip-arrow {
+            margin-left: -5px;
+            border-top-color: #000;
+            bottom: -10px;
+        }
+    }
+
+    &[x-placement^="bottom"] {
+        margin-top: 10px;
+
+        .bd-tooltip-arrow {
+            border-width: 0 5px 5px 5px;
+            top: -5px;
+            border-bottom-color: #000;
+        }
+    }
+
+    &[x-placement^="right"] {
+        margin-left: 10px;
+
+        .bd-tooltip-arrow {
+            border-width: 5px 5px 5px 0;
+            left: -5px;
+            border-right-color: #000;
+        }
+    }
+
+    &[x-placement^="left"] {
+        margin-right: 10px;
+
+        .bd-tooltip-arrow {
+            border-width: 5px 0 5px 5px;
+            right: -5px;
+            border-left-color: #000;
+        }
     }
 }

From 33adb929029aadaacd4b543481caeb997c452217 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Wed, 21 Mar 2018 22:24:23 +0000
Subject: [PATCH 11/23] Add updater view

---
 client/src/modules/updater.js                 | 24 +++++--
 .../styles/partials/bdsettings/button.scss    |  6 +-
 .../src/styles/partials/bdsettings/index.scss |  1 +
 .../styles/partials/bdsettings/updater.scss   |  6 ++
 client/src/ui/bdmenu.js                       |  9 ++-
 client/src/ui/components/BdSettings.vue       |  5 +-
 client/src/ui/components/bd/CssEditor.vue     |  4 +-
 client/src/ui/components/bd/UpdaterView.vue   | 70 +++++++++++++++++++
 client/src/ui/components/bd/index.js          |  1 +
 9 files changed, 110 insertions(+), 16 deletions(-)
 create mode 100644 client/src/styles/partials/bdsettings/updater.scss
 create mode 100644 client/src/ui/components/bd/UpdaterView.vue

diff --git a/client/src/modules/updater.js b/client/src/modules/updater.js
index 435fba9e..0b79fb8e 100644
--- a/client/src/modules/updater.js
+++ b/client/src/modules/updater.js
@@ -16,8 +16,10 @@ import { ClientLogger as Logger } from 'common';
 export default new class {
 
     constructor() {
-        window.updater = this;
         this.updatesAvailable = false;
+        this.latestVersion = undefined;
+        this.error = undefined;
+
         this.init = this.init.bind(this);
         this.checkForUpdates = this.checkForUpdates.bind(this);
     }
@@ -37,9 +39,18 @@ export default new class {
      * Installs an update.
      * TODO
      */
-    update() {
-        this.updatesAvailable = false;
-        Events.emit('update-check-end');
+    async update() {
+        try {
+            await new Promise(resolve => setTimeout(resolve, 5000));
+
+            this.updatesAvailable = false;
+            this.latestVersion = Globals.version;
+            Events.emit('update-check-end');
+        } catch (err) {
+            this.error = err;
+            this.checkForUpdates();
+            throw err;
+        }
     }
 
     /**
@@ -58,10 +69,11 @@ export default new class {
                 cache: false,
                 success: e => {
                     try {
+                        this.latestVersion = e.version;
                         Events.emit('update-check-end');
-                        Logger.info('Updater', `Latest Version: ${e.version} - Current Version: ${Globals.getObject('version')}`);
+                        Logger.info('Updater', `Latest Version: ${e.version} - Current Version: ${Globals.version}`);
 
-                        if (e.version !== Globals.getObject('version')) {
+                        if (this.latestVersion !== Globals.version) {
                             this.updatesAvailable = true;
                             Events.emit('updates-available');
                             resolve(true);
diff --git a/client/src/styles/partials/bdsettings/button.scss b/client/src/styles/partials/bdsettings/button.scss
index 5cb54504..635b17da 100644
--- a/client/src/styles/partials/bdsettings/button.scss
+++ b/client/src/styles/partials/bdsettings/button.scss
@@ -52,12 +52,12 @@
 
         .bd-settings-button-btn {
             background-image: $logoBigBw;
+            background-size: 100% 100%;
             filter: none;
             opacity: 1;
             width: 130px;
-            height: 80px;
-            background-size: 100% 100%;
-            margin-left: 20px;
+            height: 43px;
+            margin: 18px 0 17px 20px;
             cursor: default;
         }
     }
diff --git a/client/src/styles/partials/bdsettings/index.scss b/client/src/styles/partials/bdsettings/index.scss
index ad0fe545..8d498189 100644
--- a/client/src/styles/partials/bdsettings/index.scss
+++ b/client/src/styles/partials/bdsettings/index.scss
@@ -4,3 +4,4 @@
 @import './card.scss';
 @import './tooltips.scss';
 @import './settings-schemes.scss';
+@import './updater.scss';
diff --git a/client/src/styles/partials/bdsettings/updater.scss b/client/src/styles/partials/bdsettings/updater.scss
new file mode 100644
index 00000000..3013f784
--- /dev/null
+++ b/client/src/styles/partials/bdsettings/updater.scss
@@ -0,0 +1,6 @@
+.bd-updaterview {
+    p {
+        margin: 0 0 10px;
+        color: #ffffff;
+    }
+}
diff --git a/client/src/ui/bdmenu.js b/client/src/ui/bdmenu.js
index 0eb3a019..6ee898e4 100644
--- a/client/src/ui/bdmenu.js
+++ b/client/src/ui/bdmenu.js
@@ -8,17 +8,22 @@
  * LICENSE file in the root directory of this source tree.
 */
 
+import { Events } from 'modules';
 import { Utils } from 'common';
 
 let items = 0;
 
-const BdMenuItems = new class {
+export const BdMenuItems = new class {
 
     constructor() {
         window.bdmenu = this;
 
         this.items = [];
 
+        const updater = this.add({category: 'Updates', contentid: 'updater', text: 'Updates available!', hidden: true});
+        Events.on('update-check-end', () => updater.hidden = true);
+        Events.on('updates-available', () => updater.hidden = false);
+
         this.addSettingsSet('Internal', 'core', 'Core');
         this.addSettingsSet('Internal', 'ui', 'UI');
         this.addSettingsSet('Internal', 'emotes', 'Emotes');
@@ -82,5 +87,3 @@ const BdMenuItems = new class {
     }
 
 };
-
-export { BdMenuItems };
diff --git a/client/src/ui/components/BdSettings.vue b/client/src/ui/components/BdSettings.vue
index cf6fc888..f2bc4afc 100644
--- a/client/src/ui/components/BdSettings.vue
+++ b/client/src/ui/components/BdSettings.vue
@@ -49,6 +49,7 @@
                     <CssEditorView v-if="item.contentid === 'css'" />
                     <PluginsView v-if="item.contentid === 'plugins'" />
                     <ThemesView v-if="item.contentid === 'themes'" />
+                    <UpdaterView v-if="item.contentid === 'updater'" />
                 </div>
             </ContentColumn>
         </SidebarView>
@@ -60,7 +61,7 @@
     import { Settings } from 'modules';
     import { BdMenuItems } from 'ui';
     import { SidebarView, Sidebar, SidebarItem, ContentColumn } from './sidebar';
-    import { SettingsWrapper, SettingsPanel, CssEditorView, PluginsView, ThemesView } from './bd';
+    import { SettingsWrapper, SettingsPanel, CssEditorView, PluginsView, ThemesView, UpdaterView } from './bd';
     import { SvgX, MiGithubCircle, MiWeb, MiClose, MiTwitterCircle } from './common';
 
     export default {
@@ -79,7 +80,7 @@
         props: ['active', 'close'],
         components: {
             SidebarView, Sidebar, SidebarItem, ContentColumn,
-            SettingsWrapper, SettingsPanel, CssEditorView, PluginsView, ThemesView,
+            SettingsWrapper, SettingsPanel, CssEditorView, PluginsView, ThemesView, UpdaterView,
             MiGithubCircle, MiWeb, MiClose, MiTwitterCircle
         },
         computed: {
diff --git a/client/src/ui/components/bd/CssEditor.vue b/client/src/ui/components/bd/CssEditor.vue
index 43840997..90e9c6dd 100644
--- a/client/src/ui/components/bd/CssEditor.vue
+++ b/client/src/ui/components/bd/CssEditor.vue
@@ -11,9 +11,9 @@
 <template>
     <SettingsWrapper headertext="CSS Editor">
         <div class="bd-css-editor">
-            <div v-if="CssEditor.error" class="bd-form-item">
+            <div v-if="error" class="bd-form-item">
                 <h5 style="margin-bottom: 10px;">Compiler error</h5>
-                <div class="bd-err bd-pre-wrap"><div class="bd-pre">{{ CssEditor.error.formatted }}</div></div>
+                <div class="bd-err bd-pre-wrap"><div class="bd-pre">{{ error.formatted }}</div></div>
                 <div class="bd-form-divider"></div>
             </div>
 
diff --git a/client/src/ui/components/bd/UpdaterView.vue b/client/src/ui/components/bd/UpdaterView.vue
new file mode 100644
index 00000000..71001744
--- /dev/null
+++ b/client/src/ui/components/bd/UpdaterView.vue
@@ -0,0 +1,70 @@
+/**
+ * BetterDiscord Updater View 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>
+    <SettingsWrapper headertext="Updates">
+        <div class="bd-flex bd-flex-col bd-updaterview">
+            <div v-if="error" class="bd-form-item">
+                <h5 style="margin-bottom: 10px;">Error installing updates</h5>
+                <div class="bd-err bd-pre-wrap"><div class="bd-pre">{{ error.formatted }}</div></div>
+                <div class="bd-form-divider"></div>
+            </div>
+
+            <template v-if="updatesAvailable">
+                <p>Version {{ newVersion }} is available. You are currently running version {{ currentVersion }}.</p>
+                <FormButton :onClick="install" :loading="updating">Install</FormButton>
+            </template>
+            <template v-else>
+                <p>You're all up to date!</p>
+            </template>
+        </div>
+    </SettingsWrapper>
+</template>
+
+<script>
+    import { Globals, Updater } from 'modules';
+    import { ClientLogger as Logger } from 'common';
+    import SettingsWrapper from './SettingsWrapper.vue';
+    import { FormButton } from '../common';
+
+    export default {
+        data() {
+            return {
+                currentVersion: Globals.version,
+                updating: false,
+                updater: Updater
+            };
+        },
+        components: {
+            SettingsWrapper,
+            FormButton
+        },
+        computed: {
+            updatesAvailable() {
+                return this.updater.updatesAvailable;
+            },
+            newVersion() {
+                return this.updater.latestVersion;
+            },
+            error() {
+                return this.updater.error;
+            }
+        },
+        methods: {
+            async install() {
+                this.updating = true;
+                try {
+                    await this.updater.update();
+                } catch (err) {}
+                this.updating = false;
+            }
+        }
+    }
+</script>
diff --git a/client/src/ui/components/bd/index.js b/client/src/ui/components/bd/index.js
index 0c460f6d..532c5478 100644
--- a/client/src/ui/components/bd/index.js
+++ b/client/src/ui/components/bd/index.js
@@ -3,5 +3,6 @@ export { default as SettingsPanel } from './SettingsPanel.vue';
 export { default as CssEditorView } from './CssEditor.vue';
 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';

From 0f805d57e3835f92cb355d314607b99c87eae443 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Thu, 22 Mar 2018 02:13:32 +0000
Subject: [PATCH 12/23] More comments

---
 client/src/builtin/EmoteModule.js     | 22 +++++--
 client/src/modules/content.js         | 27 ++++-----
 client/src/modules/contentmanager.js  | 82 ++++++++++-----------------
 client/src/modules/csseditor.js       | 51 +++++++++--------
 client/src/modules/eventhook.js       |  2 +-
 client/src/modules/globals.js         | 32 +++++------
 client/src/modules/pluginmanager.js   | 36 ++++++------
 client/src/modules/reactcomponents.js | 16 +++++-
 client/src/modules/thememanager.js    |  4 +-
 client/src/modules/webpackmodules.js  |  4 --
 client/src/plugins/TimeStamps.js      |  3 -
 client/src/plugins/index.js           |  0
 12 files changed, 134 insertions(+), 145 deletions(-)
 delete mode 100644 client/src/plugins/TimeStamps.js
 delete mode 100644 client/src/plugins/index.js

diff --git a/client/src/builtin/EmoteModule.js b/client/src/builtin/EmoteModule.js
index df3e2337..6de5693b 100644
--- a/client/src/builtin/EmoteModule.js
+++ b/client/src/builtin/EmoteModule.js
@@ -8,27 +8,33 @@
  * LICENSE file in the root directory of this source tree.
 */
 
-import { FileUtils, ClientLogger as Logger } from 'common';
 import { Events, Globals, WebpackModules, ReactComponents, MonkeyPatch } from 'modules';
 import { DOM, VueInjector, Reflection } from 'ui';
+import { FileUtils, ClientLogger as Logger } from 'common';
+import path from 'path';
 import EmoteComponent from './EmoteComponent.vue';
 
 let emotes = null;
 const emotesEnabled = true;
 
 export default class {
+
     static get searchCache() {
         return this._searchCache || (this._searchCache = {});
     }
+
     static get emoteDb() {
         return emotes;
     }
+
     static get React() {
         return WebpackModules.getModuleByName('React');
     }
+
     static get ReactDOM() {
         return WebpackModules.getModuleByName('ReactDOM');
     }
+
     static processMarkup(markup) {
         if (!emotesEnabled) return markup; // TODO Get it from setttings
         const newMarkup = [];
@@ -94,13 +100,20 @@ export default class {
     }
 
     static async observe() {
-        const dataPath = Globals.getObject('paths').find(path => path.id === 'data').path;
+        const dataPath = Globals.getPath('data');
+        try {
+            emotes = await FileUtils.readJsonFromFile(path.join(dataPath, 'emotes.json'));
+        } 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 {
-            emotes = await FileUtils.readJsonFromFile(dataPath + '/emotes.json');
             const Message = await ReactComponents.getComponent('Message');
             this.unpatchRender = MonkeyPatch('BD:EmoteModule', Message.component.prototype).after('render', (component, args, retVal) => {
                 try {
-                    const markup = this.findByProp(retVal, 'className', 'markup'); // First child has all the actual text content, second is the edited timestamp
+                    // 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]);
                 } catch (err) {
@@ -180,4 +193,5 @@ export default class {
             }
         });
     }
+
 }
diff --git a/client/src/modules/content.js b/client/src/modules/content.js
index fdc6c463..ce2047fd 100644
--- a/client/src/modules/content.js
+++ b/client/src/modules/content.js
@@ -59,6 +59,7 @@ export default class Content {
 
     /**
      * Opens a settings modal for this content.
+     * @return {Modal}
      */
     showSettingsModal() {
         return Modals.contentSettings(this);
@@ -73,16 +74,10 @@ export default class Content {
 
     /**
      * Saves the content's current configuration.
+     * @return {Promise}
      */
     async saveConfiguration() {
         try {
-            /*
-            await FileUtils.writeFile(`${this.contentPath}/user.config.json`, JSON.stringify({
-                enabled: this.enabled,
-                config: this.settings.strip().settings,
-                data: this.data
-            }));
-            */
             Database.insertOrUpdate({ type: 'contentconfig', $or: [{ id: this.id }, { name: this.name }] }, {
                 type: 'contentconfig',
                 id: this.id,
@@ -143,15 +138,6 @@ export default class Content {
         return this.events.on(...args);
     }
 
-    /**
-     * Removes an event listener.
-     * @param {String} event The event to remove the listener from
-     * @param {Function} callback The bound callback (optional)
-     */
-    off(...args) {
-        return this.events.removeListener(...args);
-    }
-
     /**
      * Adds an event listener that removes itself when called, therefore only being called once.
      * @param {String} event The event to add the listener to
@@ -162,6 +148,15 @@ export default class Content {
         return this.events.once(...args);
     }
 
+    /**
+     * Removes an event listener.
+     * @param {String} event The event to remove the listener from
+     * @param {Function} callback The bound callback (optional)
+     */
+    off(...args) {
+        return this.events.removeListener(...args);
+    }
+
     /**
      * Emits an event.
      * @param {String} event The event to emit
diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index 2826120c..55fcb18e 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -24,31 +24,31 @@ import Combokeys from 'combokeys';
 export default class {
 
     /**
-     * Any errors that happened
-     * returns {Array}
+     * Any errors that happened.
+     * @return {Array}
      */
     static get errors() {
         return this._errors || (this._errors = []);
     }
 
     /**
-     * Locallly stored content
-     * returns {Array}
+     * Locally stored content.
+     * @return {Array}
      */
     static get localContent() {
         return this._localContent ? this._localContent : (this._localContent = []);
     }
 
     /**
-     * Local path for content
-     * returns {String}
+     * Local path for content.
+     * @return {String}
      */
     static get contentPath() {
         return Globals.getPath(this.pathId);
     }
 
     /**
-     * Load all locally stored content
+     * Load all locally stored content.
      * @param {bool} suppressErrors Suppress any errors that occur during loading of content
      */
     static async loadAllContent(suppressErrors = false) {
@@ -83,8 +83,6 @@ export default class {
                 });
                 this._errors = [];
             }
-
-            return this.localContent;
         } catch (err) {
             throw err;
         }
@@ -150,8 +148,6 @@ export default class {
                 });
                 this._errors = [];
             }
-
-            return this.localContent;
         } catch (err) {
             throw err;
         }
@@ -169,15 +165,12 @@ export default class {
 
             await FileUtils.directoryExists(contentPath);
 
-            if (!reload) {
-                const loaded = this.localContent.find(content => content.contentPath === contentPath);
-                if (loaded) {
-                    throw { 'message': `Attempted to load already loaded user content: ${path}` };
-                }
-            }
+            if (!reload && this.getContentByPath(contentPath))
+                throw { 'message': `Attempted to load already loaded user content: ${path}` };
 
-            const readConfig = await this.readConfig(contentPath);
-            const mainPath = path.join(contentPath, readConfig.main);
+            const configPath = path.resolve(contentPath, 'config.json');
+            const readConfig = await FileUtils.readJsonFromFile(configPath);
+            const mainPath = path.join(contentPath, readConfig.main || 'index.js');
 
             const defaultConfig = new SettingsSet({
                 settings: readConfig.defaultConfig,
@@ -191,17 +184,15 @@ export default class {
             };
 
             try {
-                //const readUserConfig = await this.readUserConfig(contentPath);
-                const readUserConfig = await Database.find({ type: 'contentconfig', name: readConfig.info.name });
+                const id = readConfig.info.id || readConfig.info.name.toLowerCase().replace(/[^a-zA-Z0-9-]/g, '-').replace(/--/g, '-');
+                const readUserConfig = await Database.find({ type: 'contentconfig', id });
                 if (readUserConfig.length) {
                     userConfig.enabled = readUserConfig[0].enabled || false;
-                    // await userConfig.config.merge({ settings: readUserConfig.config });
-                    // userConfig.config.setSaved();
-                    // userConfig.config = userConfig.config.clone({ settings: readUserConfig.config });
                     userConfig.config = readUserConfig[0].config;
                     userConfig.data = readUserConfig[0].data || {};
                 }
-            } catch (err) { /*We don't care if this fails it either means that user config doesn't exist or there's something wrong with it so we revert to default config*/
+            } catch (err) {
+                // We don't care if this fails it either means that user config doesn't exist or there's something wrong with it so we revert to default config
                 Logger.info(this.moduleName, `Failed reading config for ${this.contentType} ${readConfig.info.name} in ${dirName}`);
                 Logger.err(this.moduleName, err);
             }
@@ -244,9 +235,10 @@ export default class {
     }
 
     /**
-     * Unload content
-     * @param {any} content Content to unload
-     * @param {bool} reload Whether to reload the content after
+     * Unload content.
+     * @param {Content|String} content Content to unload
+     * @param {Boolean} reload Whether to reload the content after
+     * @return {Content}
      */
     static async unloadContent(content, reload) {
         content = this.findContent(content);
@@ -275,34 +267,18 @@ export default class {
     }
 
     /**
-     * Reload content
-     * @param {any} content Content to reload
+     * Reload content.
+     * @param {Content|String} content Content to reload
+     * @return {Content}
      */
     static reloadContent(content) {
         return this.unloadContent(content, true);
     }
 
-    /**
-     * Read content config file
-     * @param {any} configPath Config file path
-     */
-    static async readConfig(configPath) {
-        configPath = path.resolve(configPath, 'config.json');
-        return FileUtils.readJsonFromFile(configPath);
-    }
-
-    /**
-     * Read content user config file
-     * @param {any} configPath User config file path
-     */
-    static async readUserConfig(configPath) {
-        configPath = path.resolve(configPath, 'user.config.json');
-        return FileUtils.readJsonFromFile(configPath);
-    }
-
     /**
      * Checks if the passed object is an instance of this content type.
-     * @param {any} content Object to check
+     * @param {Any} content Object to check
+     * @return {Boolean}
      */
     static isThisContent(content) {
         return content instanceof Content;
@@ -318,8 +294,9 @@ export default class {
 
     /**
      * Wildcard content finder
-     * @param {any} wild Content ID / directory name / path / name
-     * @param {bool} nonunique Allow searching attributes that may not be unique
+     * @param {String} wild Content ID / directory name / path / name
+     * @param {Boolean} nonunique Allow searching attributes that may not be unique
+     * @return {Content}
      */
     static findContent(wild, nonunique) {
         if (this.isThisContent(wild)) return wild;
@@ -338,7 +315,8 @@ export default class {
 
     /**
      * Wait for content to load
-     * @param {any} content_id
+     * @param {String} content_id
+     * @return {Promise}
      */
     static waitForContent(content_id) {
         return new Promise((resolve, reject) => {
diff --git a/client/src/modules/csseditor.js b/client/src/modules/csseditor.js
index ebc17c16..5dbd1846 100644
--- a/client/src/modules/csseditor.js
+++ b/client/src/modules/csseditor.js
@@ -32,7 +32,7 @@ export default new class {
     }
 
     /**
-     * Init css editor
+     * Init css editor.
      */
     init() {
         ClientIPC.on('bd-get-scss', () => this.scss, true);
@@ -60,16 +60,16 @@ export default new class {
     }
 
     /**
-     * Show css editor, flashes if already visible
+     * Show css editor, flashes if already visible.
      */
     async show() {
         await ClientIPC.send('openCssEditor', this.editor_bounds);
     }
 
     /**
-     * Update css in client
-     * @param {String} scss scss to compile
-     * @param {bool} sendSource send to css editor instance
+     * Update css in client.
+     * @param {String} scss SCSS to compile
+     * @param {bool} sendSource Whether to send to css editor instance
      */
     async updateScss(scss, sendSource) {
         if (sendSource)
@@ -97,15 +97,15 @@ export default new class {
     }
 
     /**
-     * Save css to file
+     * Save css to file.
      */
     async save() {
         Settings.saveSettings();
     }
 
     /**
-     * Save current editor bounds
-     * @param {Rectangle} bounds editor bounds
+     * Save current editor bounds.
+     * @param {Rectangle} bounds Editor bounds
      */
     saveEditorBounds(bounds) {
         this.editor_bounds = bounds;
@@ -113,8 +113,8 @@ export default new class {
     }
 
     /**
-     * Send scss to core for compilation
-     * @param {String} scss scss string
+     * Send SCSS to core for compilation.
+     * @param {String} scss SCSS string
      */
     async compile(scss) {
         return await ClientIPC.send('bd-compileSass', {
@@ -124,7 +124,7 @@ export default new class {
     }
 
     /**
-     * Recompile the current SCSS
+     * Recompile the current SCSS.
      * @return {Promise}
      */
     async recompile() {
@@ -132,16 +132,18 @@ export default new class {
     }
 
     /**
-     * Send data to open editor
-     * @param {any} channel
-     * @param {any} data
+     * Send data to open editor.
+     * @param {String} channel
+     * @param {Any} data
+     * @return {Promise}
      */
     async sendToEditor(channel, data) {
         return ClientIPC.sendToCssEditor(channel, data);
     }
 
     /**
-     * Opens an SCSS file in a system editor
+     * Opens an SCSS file in a system editor.
+     * @return {Promise}
      */
     async openSystemEditor() {
         try {
@@ -160,7 +162,8 @@ export default new class {
             throw {message: 'Failed to open system editor.'};
     }
 
-    /** Set current state
+    /**
+     * Set current state
      * @param {String} scss Current uncompiled SCSS
      * @param {String} css Current compiled CSS
      * @param {String} files Files imported in the SCSS
@@ -175,29 +178,28 @@ export default new class {
     }
 
     /**
-     * Current uncompiled scss
+     * Current uncompiled scss.
      */
     get scss() {
         return this._scss || '';
     }
 
     /**
-     * Set current scss
+     * Set current scss.
      */
     set scss(scss) {
         this.updateScss(scss, true);
     }
 
     /**
-     * Current compiled css
+     * Current compiled css.
      */
     get css() {
         return this._css || '';
     }
 
     /**
-     * Inject compiled css to head
-     * {DOM}
+     * Inject compiled css to head.
      */
     set css(css) {
         this._css = css;
@@ -205,15 +207,14 @@ export default new class {
     }
 
     /**
-     * Current error
+     * Current error.
      */
     get error() {
         return this._error || undefined;
     }
 
     /**
-     * Set current error
-     * {DOM}
+     * Set current error.
      */
     set error(err) {
         this._error = err;
@@ -293,7 +294,7 @@ export default new class {
 
     /**
      * Checks if the system editor's file exists.
-     * @return {Boolean}
+     * @return {Promise}
      */
     async fileExists() {
         try {
diff --git a/client/src/modules/eventhook.js b/client/src/modules/eventhook.js
index d6ba83b4..c2665e18 100644
--- a/client/src/modules/eventhook.js
+++ b/client/src/modules/eventhook.js
@@ -52,7 +52,7 @@ export default class extends EventListener {
 
     /**
      * Discord emit overload
-     * @param {any} e
+     * @param {any} event
      * @param {any} action
      * @param {any} data
      */
diff --git a/client/src/modules/globals.js b/client/src/modules/globals.js
index bb4792b4..6b0312f4 100644
--- a/client/src/modules/globals.js
+++ b/client/src/modules/globals.js
@@ -29,26 +29,24 @@ export default new class extends Module {
         this.getObject = this.getObject.bind(this);
     }
 
-    first() {
-        (async() => {
-            const config = await ClientIPC.send('getConfig');
-            this.setState({ config });
+    async first() {
+        const config = await ClientIPC.send('getConfig');
+        this.setState({ config });
 
-            // This is for Discord to stop error reporting :3
-            window.BetterDiscord = {
-                version: config.version,
-                v: config.version
-            };
-            window.jQuery = {};
+        // This is for Discord to stop error reporting :3
+        window.BetterDiscord = {
+            version: config.version,
+            v: config.version
+        };
+        window.jQuery = {};
 
-            if (sparkplug.bd) {
-                this.setState({ bd: sparkplug.bd });
-                sparkplug.bd.setWS = this.setWS;
-            }
+        if (sparkplug.bd) {
+            this.setState({ bd: sparkplug.bd });
+            sparkplug.bd.setWS = this.setWS;
+        }
 
-            Events.emit('global-ready');
-            Events.emit('socket-created', this.state.wsHook);
-        })();
+        Events.emit('global-ready');
+        Events.emit('socket-created', this.state.wsHook);
     }
 
     setWS(wSocket) {
diff --git a/client/src/modules/pluginmanager.js b/client/src/modules/pluginmanager.js
index 9275eda2..181335a0 100644
--- a/client/src/modules/pluginmanager.js
+++ b/client/src/modules/pluginmanager.js
@@ -90,9 +90,7 @@ export default class extends ContentManager {
             for (const [key, value] of Object.entries(dependencies)) {
                 const extModule = ExtModuleManager.findModule(key);
                 if (!extModule) {
-                    throw {
-                        'message': `Dependency: ${key}:${value} is not loaded`
-                    };
+                    throw {message: `Dependency ${key}:${value} is not loaded.`};
                 }
                 deps[key] = extModule.__require;
             }
@@ -121,24 +119,24 @@ export default class extends ContentManager {
     static get unloadPlugin() { return this.unloadContent }
     static get reloadPlugin() { return this.reloadContent }
 
-    static stopPlugin(name) {
-        const plugin = name instanceof Plugin ? name : this.getPluginByName(name);
-        try {
-            if (plugin) return plugin.stop();
-        } catch (err) {
-           // Logger.err('PluginManager', err);
-        }
-        return true; //Return true anyways since plugin doesn't exist
+    /**
+     * Stops a plugin.
+     * @param {Plugin|String} plugin
+     * @return {Promise}
+     */
+    static stopPlugin(plugin) {
+        plugin = this.isPlugin(plugin) ? plugin : this.getPluginById(plugin);
+        return plugin.stop();
     }
 
-    static startPlugin(name) {
-        const plugin = name instanceof Plugin ? name : this.getPluginByName(name);
-        try {
-            if (plugin) return plugin.start();
-        } catch (err) {
-           // Logger.err('PluginManager', err);
-        }
-        return true; //Return true anyways since plugin doesn't exist
+    /**
+     * Starts a plugin.
+     * @param {Plugin|String} plugin
+     * @return {Promise}
+     */
+    static startPlugin(plugin) {
+        plugin = this.isPlugin(plugin) ? plugin : this.getPluginById(plugin);
+        return plugin.start();
     }
 
     static get isPlugin() { return this.isThisContent }
diff --git a/client/src/modules/reactcomponents.js b/client/src/modules/reactcomponents.js
index c0ed473c..4ba8137b 100644
--- a/client/src/modules/reactcomponents.js
+++ b/client/src/modules/reactcomponents.js
@@ -6,7 +6,7 @@
  * https://github.com/JsSucks - 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. 
+ * LICENSE file in the root directory of this source tree.
 */
 
 import { MonkeyPatch, Patcher } from './patcher';
@@ -19,6 +19,7 @@ class Helpers {
     static get plannedActions() {
         return this._plannedActions || (this._plannedActions = new Map());
     }
+
     static recursiveArray(parent, key, count = 1) {
         let index = 0;
         function* innerCall(parent, key) {
@@ -34,13 +35,15 @@ class Helpers {
 
         return innerCall(parent, key);
     }
+
     static recursiveArrayCount(parent, key) {
         let count = 0;
         // eslint-disable-next-line no-empty-pattern
-        for (let { } of this.recursiveArray(parent, key))
+        for (let {} of this.recursiveArray(parent, key))
             ++count;
         return this.recursiveArray(parent, key, count);
     }
+
     static get recursiveChildren() {
         return function* (parent, key, index = 0, count = 1) {
             const item = parent[key];
@@ -52,12 +55,14 @@ class Helpers {
             }
         }
     }
+
     static returnFirst(iterator, process) {
         for (let child of iterator) {
             const retVal = process(child);
             if (retVal !== undefined) return retVal;
         }
     }
+
     static getFirstChild(rootParent, rootKey, selector) {
         const getDirectChild = (item, selector) => {
             if (item && item.props && item.props.children) {
@@ -116,11 +121,13 @@ class Helpers {
         };
         return this.returnFirst(this.recursiveChildren(rootParent, rootKey), checkFilter.bind(null, selector)) || {};
     }
+
     static parseSelector(selector) {
         if (selector.startsWith('.')) return { className: selector.substr(1) }
         if (selector.startsWith('#')) return { id: selector.substr(1) }
         return {}
     }
+
     static 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);
@@ -132,6 +139,7 @@ class Helpers {
         }
         return null;
     }
+
     static findProp(obj, what) {
         if (obj.hasOwnProperty(what)) return obj[what];
         if (obj.props && !obj.children) return this.findProp(obj.props, what);
@@ -144,6 +152,7 @@ class Helpers {
         }
         return null;
     }
+
     static get ReactDOM() {
         return WebpackModules.getModuleByName('ReactDOM');
     }
@@ -155,12 +164,15 @@ class ReactComponent {
         this._component = component;
         this._retVal = retVal;
     }
+
     get id() {
         return this._id;
     }
+
     get component() {
         return this._component;
     }
+
     get retVal() {
         return this._retVal;
     }
diff --git a/client/src/modules/thememanager.js b/client/src/modules/thememanager.js
index dfaf7a37..2ddf8bd8 100644
--- a/client/src/modules/thememanager.js
+++ b/client/src/modules/thememanager.js
@@ -62,11 +62,11 @@ export default class ThemeManager extends ContentManager {
     }
 
     static enableTheme(theme) {
-        theme.enable();
+        return theme.enable();
     }
 
     static disableTheme(theme) {
-        theme.disable();
+        return theme.disable();
     }
 
     static get isTheme() { return this.isThisContent }
diff --git a/client/src/modules/webpackmodules.js b/client/src/modules/webpackmodules.js
index 71b03ecd..59bcf371 100644
--- a/client/src/modules/webpackmodules.js
+++ b/client/src/modules/webpackmodules.js
@@ -91,7 +91,6 @@ const KnownModules = {
     UserActivityStore: Filters.byProperties(['getActivity']),
     UserNameResolver: Filters.byProperties(['getName']),
 
-
     /* Emoji Store and Utils */
     EmojiInfo: Filters.byProperties(['isEmojiDisabled']),
     EmojiUtils: Filters.byProperties(['getGuildEmoji']),
@@ -102,7 +101,6 @@ const KnownModules = {
     InviteResolver: Filters.byProperties(['findInvite']),
     InviteActions: Filters.byProperties(['acceptInvite']),
 
-
     /* Discord Objects & Utils */
     DiscordConstants: Filters.byProperties(["Permissions", "ActivityTypes", "StatusTypes"]),
     Permissions: Filters.byProperties(['getHighestRole']),
@@ -128,7 +126,6 @@ const KnownModules = {
     ExperimentsManager: Filters.byProperties(['isDeveloper']),
     CurrentExperiment: Filters.byProperties(['getExperimentId']),
 
-
     /* Images, Avatars and Utils */
     ImageResolver: Filters.byProperties(["getUserAvatarURL"]),
     ImageUtils: Filters.byProperties(['getSizedImageSrc']),
@@ -182,7 +179,6 @@ const KnownModules = {
     URLParser: Filters.byProperties(['Url', 'parse']),
     ExtraURLs: Filters.byProperties(['getArticleURL']),
 
-
     /* DOM/React Components */
     /* ==================== */
     UserSettingsWindow: Filters.byProperties(['open', 'updateAccount']),
diff --git a/client/src/plugins/TimeStamps.js b/client/src/plugins/TimeStamps.js
deleted file mode 100644
index 3509c96a..00000000
--- a/client/src/plugins/TimeStamps.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default class {
-
-}
diff --git a/client/src/plugins/index.js b/client/src/plugins/index.js
deleted file mode 100644
index e69de29b..00000000

From ebff286c31767f48742f62fdcd934316b73439b1 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Thu, 22 Mar 2018 02:19:25 +0000
Subject: [PATCH 13/23] Add release build configuration

---
 client/package.json                    |   3 +-
 client/src/index.js                    |   4 +-
 client/webpack.config.js               |  10 -
 client/webpack.production.config.js    |  65 +++
 core/src/main.js                       |   2 +-
 csseditor/package.json                 |   3 +-
 csseditor/webpack.production.config.js |  44 ++
 gulpfile.js                            |   4 +-
 package-lock.json                      | 712 +++++++++++++++++++++++--
 package.json                           |   5 +-
 10 files changed, 791 insertions(+), 61 deletions(-)
 create mode 100644 client/webpack.production.config.js
 create mode 100644 csseditor/webpack.production.config.js

diff --git a/client/package.json b/client/package.json
index 237c6e98..6fb49e30 100644
--- a/client/package.json
+++ b/client/package.json
@@ -17,6 +17,7 @@
   "private": false,
   "scripts": {
     "build": "webpack --progress --colors",
-    "watch": "webpack --progress --colors --watch"
+    "watch": "webpack --progress --colors --watch",
+    "release": "webpack --progress --colors --config=webpack.production.config.js"
   }
 }
diff --git a/client/src/index.js b/client/src/index.js
index 58c3da93..9e2f3ab3 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -16,13 +16,13 @@ import { EmoteModule } from 'builtin';
 import electron from 'electron';
 import path from 'path';
 
-const tests = true;
+const tests = typeof PRODUCTION !== 'undefined';
 const ignoreExternal = false;
 
 class BetterDiscord {
 
     constructor() {
-        Logger.file = tests ? path.join(__dirname, '..', '..', 'tests', 'log.txt') : path.join(__dirname, 'log.txt');
+        Logger.file = tests ? path.resolve(__dirname, '..', '..', 'tests', 'log.txt') : path.join(__dirname, 'log.txt');
         Logger.log('main', 'BetterDiscord starting');
 
         this._bd = {
diff --git a/client/webpack.config.js b/client/webpack.config.js
index 3bca7afb..e88c1cea 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -55,14 +55,4 @@ module.exports = {
         __filename: false,
         __dirname: false
     }
-    /* resolve: {
-        alias: {
-            'momentjs': 'vendor/moment.min.js'
-        },
-        modules: [
-            path.resolve('./node_modules'),
-            path.resolve(__dirname, '..'),
-            path.resolve(__dirname, '..', 'node_modules')
-        ]
-    } */
 };
diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js
new file mode 100644
index 00000000..1c9c4a76
--- /dev/null
+++ b/client/webpack.production.config.js
@@ -0,0 +1,65 @@
+const path = require('path');
+const webpack = require('webpack');
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+
+const jsLoader = {
+    test: /\.(js|jsx)$/,
+    exclude: /node_modules/,
+    loader: 'babel-loader',
+    query: {
+        presets: ['react']
+    }
+};
+
+const vueLoader = {
+    test: /\.(vue)$/,
+    loader: 'vue-loader'
+};
+
+const scssLoader = {
+    test: /\.scss$/,
+    exclude: /node_modules/,
+    loader: ['css-loader', 'sass-loader']
+};
+
+module.exports = {
+    entry: './src/index.js',
+    output: {
+        path: path.resolve(__dirname, 'dist'),
+        filename: 'betterdiscord.client-release.js'
+    },
+    module: {
+        loaders: [jsLoader, vueLoader, scssLoader]
+    },
+    externals: {
+        electron: 'window.require("electron")',
+        fs: 'window.require("fs")',
+        path: 'window.require("path")',
+        sparkplug: 'require("./sparkplug")'
+    },
+    resolve: {
+        alias: {
+            vue$: path.resolve('..', 'node_modules', 'vue', 'dist', 'vue.esm.js')
+        },
+        modules: [
+            path.resolve('..', 'node_modules'),
+            path.resolve('..', 'common', 'modules'),
+            path.resolve('src', 'modules'),
+            path.resolve('src', 'ui'),
+            path.resolve('src', 'plugins'),
+            path.resolve('src', 'structs'),
+            path.resolve('src', 'builtin')
+        ]
+    },
+    node: {
+        process: false,
+        __filename: false,
+        __dirname: false
+    },
+    plugins: [
+        new webpack.DefinePlugin({
+            PRODUCTION: JSON.stringify(true)
+        }),
+        new UglifyJsPlugin()
+    ]
+};
diff --git a/core/src/main.js b/core/src/main.js
index baf0f5f3..d66c5465 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -14,7 +14,7 @@ const { BrowserWindow, dialog } = require('electron');
 
 const { FileUtils, BDIpc, Config, WindowUtils, CSSEditor, Database } = require('./modules');
 
-const tests = true;
+const tests = typeof PRODUCTION === 'undefined';
 
 const _basePath = tests ? path.resolve(__dirname, '..', '..') : __dirname;
 const _baseDataPath = tests ? path.resolve(_basePath, 'tests') : _basePath;
diff --git a/csseditor/package.json b/csseditor/package.json
index 98d964ba..acdd5935 100644
--- a/csseditor/package.json
+++ b/csseditor/package.json
@@ -17,6 +17,7 @@
   "private": false,
   "scripts": {
     "build": "webpack --progress --colors",
-    "watch": "webpack --progress --colors --watch"
+    "watch": "webpack --progress --colors --watch",
+    "release": "webpack --progress --colors --config=webpack.production.config.js"
   }
 }
diff --git a/csseditor/webpack.production.config.js b/csseditor/webpack.production.config.js
new file mode 100644
index 00000000..c7bba6f8
--- /dev/null
+++ b/csseditor/webpack.production.config.js
@@ -0,0 +1,44 @@
+const path = require('path');
+const webpack = require('webpack');
+const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+
+const vueLoader = {
+    test: /\.(vue)$/,
+    exclude: /node_modules/,
+    loader: 'vue-loader'
+};
+
+const scssLoader = {
+    test: /\.(css|scss)$/,
+    loader: ['css-loader', 'sass-loader']
+};
+
+module.exports = {
+    entry: './src/index.js',
+    output: {
+        path: path.resolve(__dirname, 'dist'),
+        filename: 'csseditor.js'
+    },
+    module: {
+        loaders: [vueLoader, scssLoader]
+    },
+    externals: {
+        electron: 'window.require("electron")',
+        fs: 'window.require("fs")'
+    },
+    resolve: {
+        alias: {
+            vue$: path.resolve('..', 'node_modules', 'vue', 'dist', 'vue.esm.js')
+        },
+        modules: [
+            path.resolve('..', 'node_modules'),
+            path.resolve('..', 'common', 'modules')
+        ]
+    },
+    plugins: [
+        new webpack.DefinePlugin({
+            PRODUCTION: JSON.stringify(true)
+        }),
+        new UglifyJsPlugin()
+    ]
+};
diff --git a/gulpfile.js b/gulpfile.js
index 1640468f..1335ff61 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -6,6 +6,7 @@ const
     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');
@@ -22,7 +23,7 @@ const releasepkg = function() {
 
 const client = function() {
     return pump([
-        gulp.src('./client/dist/*.client.js'),
+        gulp.src('./client/dist/*.client-release.js'),
         rename(`client.${clientpkg.version}.js`),
         gulp.dest('./release')
     ]);
@@ -31,6 +32,7 @@ const client = function() {
 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')
     ]);
diff --git a/package-lock.json b/package-lock.json
index 72858dc1..429ea27f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1496,6 +1496,45 @@
       "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
       "dev": true
     },
+    "cacache": {
+      "version": "10.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz",
+      "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1",
+        "chownr": "1.0.1",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "lru-cache": "4.1.2",
+        "mississippi": "2.0.0",
+        "mkdirp": "0.5.1",
+        "move-concurrently": "1.0.1",
+        "promise-inflight": "1.0.1",
+        "rimraf": "2.6.2",
+        "ssri": "5.3.0",
+        "unique-filename": "1.1.0",
+        "y18n": "4.0.0"
+      },
+      "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==",
+          "dev": true,
+          "requires": {
+            "pseudomap": "1.0.2",
+            "yallist": "2.1.2"
+          }
+        },
+        "y18n": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "dev": true
+        }
+      }
+    },
     "cache-base": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
@@ -1670,6 +1709,12 @@
         }
       }
     },
+    "chownr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
+      "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
+      "dev": true
+    },
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -2136,6 +2181,20 @@
       "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=",
       "dev": true
     },
+    "copy-concurrently": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+      "dev": true,
+      "requires": {
+        "aproba": "1.2.0",
+        "fs-write-stream-atomic": "1.0.10",
+        "iferr": "0.1.5",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "run-queue": "1.0.3"
+      }
+    },
     "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
@@ -2403,6 +2462,12 @@
         "array-find-index": "1.0.2"
       }
     },
+    "cyclist": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
+      "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+      "dev": true
+    },
     "d": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
@@ -2671,6 +2736,12 @@
         "domelementtype": "1.3.0"
       }
     },
+    "duplexer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
+      "dev": true
+    },
     "duplexer2": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
@@ -2680,6 +2751,65 @@
         "readable-stream": "1.1.14"
       }
     },
+    "duplexify": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz",
+      "integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.4.1",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.5",
+        "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"
+          }
+        },
+        "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.5",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
+          "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.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": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        }
+      }
+    },
     "ecc-jsbn": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
@@ -3204,6 +3334,21 @@
         "es5-ext": "0.10.38"
       }
     },
+    "event-stream": {
+      "version": "3.3.4",
+      "resolved": "http://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
+      "dev": true,
+      "requires": {
+        "duplexer": "0.1.1",
+        "from": "0.1.7",
+        "map-stream": "0.1.0",
+        "pause-stream": "0.0.11",
+        "split": "0.3.3",
+        "stream-combiner": "0.0.4",
+        "through": "2.3.8"
+      }
+    },
     "events": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
@@ -3688,6 +3833,54 @@
       "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=",
       "dev": true
     },
+    "flush-write-stream": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
+      "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.5"
+      },
+      "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.5",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
+          "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.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": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        }
+      }
+    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -3733,6 +3926,60 @@
         "map-cache": "0.2.2"
       }
     },
+    "from": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
+      "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=",
+      "dev": true
+    },
+    "from2": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.5"
+      },
+      "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.5",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
+          "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.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": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        }
+      }
+    },
     "fs-extra": {
       "version": "0.30.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
@@ -3746,6 +3993,18 @@
         "rimraf": "2.6.2"
       }
     },
+    "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",
+      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "iferr": "0.1.5",
+        "imurmurhash": "0.1.4",
+        "readable-stream": "1.1.14"
+      }
+    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -5315,6 +5574,16 @@
         }
       }
     },
+    "gulp-inject-string": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/gulp-inject-string/-/gulp-inject-string-1.1.1.tgz",
+      "integrity": "sha512-Q25r/25DMxCEknj4nqHhpDWFGvQQNcZwnheiDIOWhOqcSUtagbidEGe3HANUdokiiIjqkTVIyIg9hP64LKh5Tw==",
+      "dev": true,
+      "requires": {
+        "event-stream": "3.3.4",
+        "plugin-error": "0.1.2"
+      }
+    },
     "gulp-merge": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/gulp-merge/-/gulp-merge-0.1.1.tgz",
@@ -5986,6 +6255,12 @@
       "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
       "dev": true
     },
+    "iferr": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+      "dev": true
+    },
     "ignore": {
       "version": "3.3.7",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
@@ -7022,6 +7297,12 @@
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
     },
+    "map-stream": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=",
+      "dev": true
+    },
     "map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
@@ -7221,6 +7502,87 @@
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
       "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
+    "mississippi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz",
+      "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==",
+      "dev": true,
+      "requires": {
+        "concat-stream": "1.6.0",
+        "duplexify": "3.5.4",
+        "end-of-stream": "1.4.1",
+        "flush-write-stream": "1.0.3",
+        "from2": "2.3.0",
+        "parallel-transform": "1.1.0",
+        "pump": "2.0.1",
+        "pumpify": "1.4.0",
+        "stream-each": "1.2.2",
+        "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",
+          "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.5",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
+          "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.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": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "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.5",
+            "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
+        }
+      }
+    },
     "mixin-deep": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.0.tgz",
@@ -7268,6 +7630,20 @@
         "minimist": "0.0.8"
       }
     },
+    "move-concurrently": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+      "dev": true,
+      "requires": {
+        "aproba": "1.2.0",
+        "copy-concurrently": "1.0.5",
+        "fs-write-stream-atomic": "1.0.10",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2",
+        "run-queue": "1.0.3"
+      }
+    },
     "ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -8086,6 +8462,55 @@
       "integrity": "sha1-AQEhG6pwxLykoPY/Igbpe3368lg=",
       "dev": true
     },
+    "parallel-transform": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
+      "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+      "dev": true,
+      "requires": {
+        "cyclist": "0.2.2",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.5"
+      },
+      "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.5",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.5.tgz",
+          "integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
+          "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.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": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        }
+      }
+    },
     "param-case": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
@@ -8241,6 +8666,15 @@
         }
       }
     },
+    "pause-stream": {
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
+      "dev": true,
+      "requires": {
+        "through": "2.3.8"
+      }
+    },
     "pbkdf2": {
       "version": "3.0.14",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz",
@@ -9096,6 +9530,12 @@
         "through2": "0.2.3"
       }
     },
+    "promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "dev": true
+    },
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -9141,6 +9581,17 @@
         }
       }
     },
+    "pumpify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz",
+      "integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==",
+      "dev": true,
+      "requires": {
+        "duplexify": "3.5.4",
+        "inherits": "2.0.3",
+        "pump": "2.0.1"
+      }
+    },
     "punycode": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -9653,6 +10104,15 @@
         "is-promise": "2.1.0"
       }
     },
+    "run-queue": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+      "dev": true,
+      "requires": {
+        "aproba": "1.2.0"
+      }
+    },
     "rx-lite": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
@@ -9712,6 +10172,35 @@
       "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
       "dev": true
     },
+    "schema-utils": {
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz",
+      "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==",
+      "dev": true,
+      "requires": {
+        "ajv": "6.3.0",
+        "ajv-keywords": "3.1.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.3.0.tgz",
+          "integrity": "sha1-FlCkERTvAFdMrBC4Ay2PTBSBLac=",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "1.0.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz",
+          "integrity": "sha1-rCsnk5xUPpXSwG5/f1wnvkqlQ74=",
+          "dev": true
+        }
+      }
+    },
     "scss-tokenizer": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
@@ -9742,6 +10231,12 @@
       "integrity": "sha1-kM/xnQLgcCf9dn9erT57ldHnOAw=",
       "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=",
+      "dev": true
+    },
     "set-blocking": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -10090,6 +10585,15 @@
       "integrity": "sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0=",
       "dev": true
     },
+    "split": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
+      "dev": true,
+      "requires": {
+        "through": "2.3.8"
+      }
+    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -10141,6 +10645,15 @@
         "tweetnacl": "0.14.5"
       }
     },
+    "ssri": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz",
+      "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -10304,12 +10817,42 @@
         }
       }
     },
+    "stream-combiner": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
+      "dev": true,
+      "requires": {
+        "duplexer": "0.1.1"
+      }
+    },
     "stream-consume": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz",
       "integrity": "sha1-pB6tGm1ggc63n2WwYZAbbY89HQ8=",
       "dev": true
     },
+    "stream-each": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz",
+      "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==",
+      "dev": true,
+      "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-http": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.0.tgz",
@@ -10367,6 +10910,12 @@
         }
       }
     },
+    "stream-shift": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+      "dev": true
+    },
     "strict-uri-encode": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
@@ -10885,51 +11434,27 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
       "dev": true
     },
-    "uglify-js": {
-      "version": "2.8.29",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
-      "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+    "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": {
-        "source-map": "0.5.7",
-        "uglify-to-browserify": "1.0.2",
-        "yargs": "3.10.0"
+        "commander": "2.13.0",
+        "source-map": "0.6.1"
       },
       "dependencies": {
-        "camelcase": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
-          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+        "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
         },
-        "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"
-          }
-        },
-        "wordwrap": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
-          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+        "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
-        },
-        "yargs": {
-          "version": "3.10.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
-          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
-          "dev": true,
-          "requires": {
-            "camelcase": "1.2.1",
-            "cliui": "2.1.0",
-            "decamelize": "1.2.0",
-            "window-size": "0.1.0"
-          }
         }
       }
     },
@@ -10941,14 +11466,27 @@
       "optional": true
     },
     "uglifyjs-webpack-plugin": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
-      "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
+      "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==",
       "dev": true,
       "requires": {
-        "source-map": "0.5.7",
-        "uglify-js": "2.8.29",
-        "webpack-sources": "1.1.0"
+        "cacache": "10.0.4",
+        "find-cache-dir": "1.0.0",
+        "schema-utils": "0.4.5",
+        "serialize-javascript": "1.4.0",
+        "source-map": "0.6.1",
+        "uglify-es": "3.3.9",
+        "webpack-sources": "1.1.0",
+        "worker-farm": "1.6.0"
+      },
+      "dependencies": {
+        "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
+        }
       }
     },
     "unc-path-regex": {
@@ -11009,6 +11547,24 @@
       "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
       "dev": true
     },
+    "unique-filename": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz",
+      "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=",
+      "dev": true,
+      "requires": {
+        "unique-slug": "2.0.0"
+      }
+    },
+    "unique-slug": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz",
+      "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=",
+      "dev": true,
+      "requires": {
+        "imurmurhash": "0.1.4"
+      }
+    },
     "unique-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz",
@@ -11775,12 +12331,71 @@
             "has-flag": "2.0.0"
           }
         },
+        "uglify-js": {
+          "version": "2.8.29",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+          "dev": true,
+          "requires": {
+            "source-map": "0.5.7",
+            "uglify-to-browserify": "1.0.2",
+            "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",
+              "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+              "dev": true,
+              "requires": {
+                "camelcase": "1.2.1",
+                "cliui": "2.1.0",
+                "decamelize": "1.2.0",
+                "window-size": "0.1.0"
+              }
+            }
+          }
+        },
+        "uglifyjs-webpack-plugin": {
+          "version": "0.4.6",
+          "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
+          "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
+          "dev": true,
+          "requires": {
+            "source-map": "0.5.7",
+            "uglify-js": "2.8.29",
+            "webpack-sources": "1.1.0"
+          }
+        },
         "which-module": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
           "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
           "dev": true
         },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true
+        },
         "yargs": {
           "version": "8.0.2",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
@@ -11870,6 +12485,15 @@
       "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
       "dev": true
     },
+    "worker-farm": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
+      "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
+      "dev": true,
+      "requires": {
+        "errno": "0.1.7"
+      }
+    },
     "wrap-ansi": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
diff --git a/package.json b/package.json
index b61b6ec9..29c6f837 100644
--- a/package.json
+++ b/package.json
@@ -38,6 +38,7 @@
     "gulp": "^3.9.1",
     "gulp-babel": "^7.0.0",
     "gulp-copy": "^1.1.0",
+    "gulp-inject-string": "^1.1.1",
     "gulp-merge": "^0.1.1",
     "gulp-npm-copy-deps": "^1.0.2",
     "gulp-plumber": "^1.2.0",
@@ -49,6 +50,7 @@
     "node-gyp": "^3.6.2",
     "pump": "^2.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",
@@ -71,6 +73,7 @@
     "lint": "eslint -f unix client/src core/src csseditor/src",
     "test": "npm run build && npm run lint",
     "build_node-sass": "node scripts/build-node-sass.js",
-    "release": "npm run lint && npm run build && gulp release"
+    "build_release": "npm run release --prefix client && npm run build --prefix core && npm run release --prefix csseditor && npm run build --prefix installer",
+    "release": "npm run lint && npm run build_release && gulp release"
   }
 }

From 5e8e9fa19fa8e804efb8fd556091109ad164e978 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Thu, 22 Mar 2018 02:37:30 +0000
Subject: [PATCH 14/23] CSS editor fixes

---
 common/modules/bdipc.js                |  4 +++-
 csseditor/src/BDIpc.js                 | 28 --------------------------
 csseditor/webpack.production.config.js |  2 +-
 gulpfile.js                            |  3 ++-
 4 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 csseditor/src/BDIpc.js

diff --git a/common/modules/bdipc.js b/common/modules/bdipc.js
index 02ab2caf..09b808af 100644
--- a/common/modules/bdipc.js
+++ b/common/modules/bdipc.js
@@ -12,7 +12,7 @@ import { ipcRenderer } from 'electron';
 
 const callbacks = new WeakMap();
 
-export default new class ClientIPC {
+const ClientIPC = new class ClientIPC {
 
     constructor() {
         this.on('ping', () => 'pong', true);
@@ -114,6 +114,8 @@ export default new class ClientIPC {
 
 }
 
+export default ClientIPC;
+
 /**
  * An IPC event.
  */
diff --git a/csseditor/src/BDIpc.js b/csseditor/src/BDIpc.js
deleted file mode 100644
index 711a669b..00000000
--- a/csseditor/src/BDIpc.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const { ipcRenderer } = window.require('electron');
-
-export default class {
-
-    static on(channel, cb) {
-        ipcRenderer.on(channel, (event, args) => cb(event, args));
-    }
-
-    static async send(channel, message) {
-        const __eid = Date.now().toString();
-        ipcRenderer.send(
-            channel.startsWith('bd-') ? channel: `bd-${channel}`,
-            message === undefined ? { __eid } : Object.assign(message, { __eid })
-        );
-
-        return new Promise((resolve, reject) => {
-            ipcRenderer.once(__eid, (event, arg) => {
-                if (arg.err) return reject(arg);
-                resolve(arg);
-            });
-        });
-    }
-
-    static sendToDiscord(channel, message) {
-        this.send('bd-sendToDiscord', { channel, message });
-    }
-
-}
diff --git a/csseditor/webpack.production.config.js b/csseditor/webpack.production.config.js
index c7bba6f8..8d2cd354 100644
--- a/csseditor/webpack.production.config.js
+++ b/csseditor/webpack.production.config.js
@@ -17,7 +17,7 @@ module.exports = {
     entry: './src/index.js',
     output: {
         path: path.resolve(__dirname, 'dist'),
-        filename: 'csseditor.js'
+        filename: 'csseditor-release.js'
     },
     module: {
         loaders: [vueLoader, scssLoader]
diff --git a/gulpfile.js b/gulpfile.js
index 1335ff61..a6d5a2d2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -58,7 +58,8 @@ const index = function() {
 
 const cssEditor = function() {
     return pump([
-        gulp.src('./csseditor/dist/**/*'),
+        gulp.src('./csseditor/dist/csseditor-release.js'),
+        rename('csseditor.js'),
         copy('release/csseditor', { prefix: 2 })
     ]);
 };

From db6be20864b1c6c19a6107058b25aba78d17c5cf Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Thu, 22 Mar 2018 16:25:06 +0000
Subject: [PATCH 15/23] Use correct path for logs

---
 client/src/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/index.js b/client/src/index.js
index 9e2f3ab3..759ed8ce 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -16,7 +16,7 @@ import { EmoteModule } from 'builtin';
 import electron from 'electron';
 import path from 'path';
 
-const tests = typeof PRODUCTION !== 'undefined';
+const tests = typeof PRODUCTION === 'undefined';
 const ignoreExternal = false;
 
 class BetterDiscord {

From 6d46ac67de1ef4d3253231e8ee6b11d255da8afc Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Thu, 22 Mar 2018 16:27:53 +0000
Subject: [PATCH 16/23] Remove SimplerFlat

---
 tests/ext/themes/SimplerFlat/.DS_Store   | Bin 6148 -> 0 bytes
 tests/ext/themes/SimplerFlat/config.json | 198 ----------
 tests/ext/themes/SimplerFlat/index.scss  | 479 -----------------------
 tests/ext/themes/SimplerFlat/vars.scss   |  40 --
 4 files changed, 717 deletions(-)
 delete mode 100644 tests/ext/themes/SimplerFlat/.DS_Store
 delete mode 100644 tests/ext/themes/SimplerFlat/config.json
 delete mode 100644 tests/ext/themes/SimplerFlat/index.scss
 delete mode 100644 tests/ext/themes/SimplerFlat/vars.scss

diff --git a/tests/ext/themes/SimplerFlat/.DS_Store b/tests/ext/themes/SimplerFlat/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

diff --git a/tests/ext/themes/SimplerFlat/config.json b/tests/ext/themes/SimplerFlat/config.json
deleted file mode 100644
index 051a5f53..00000000
--- a/tests/ext/themes/SimplerFlat/config.json
+++ /dev/null
@@ -1,198 +0,0 @@
-{
-    "info": {
-        "name": "SimplerFlat",
-        "authors": [ "Qwerasd" ],
-        "version": 1.02,
-        "description": "SimplerFlat is a solid colored dark flat theme with customizable colors.",
-        "type": "sass"
-    },
-    "main": "index.scss",
-    "defaultConfig": [
-        {
-            "category": "not default",
-            "category_name":  "not default", 
-            "type":  "drawer", 
-            "settings": [
-                {
-                    "id": "color-light",
-                    "type": "color",
-                    "value": "#3E3E3E",
-                    "text": "Light Color",
-                    "hint": "The color of things that are lighter than the chat panel."
-                },
-                {
-                    "id": "color-medium",
-                    "type": "color",
-                    "value": "#2E2E2E",
-                    "text": "Medium Color",
-                    "hint": "The color of the chat panel."
-                },
-                {
-                    "id": "color-dark",
-                    "type": "color",
-                    "value": "#1E1E1E",
-                    "text": "Dark Color",
-                    "hint": "The color of the channels, and members panels."
-                },
-                {
-                    "id": "color-very-dark",
-                    "type": "color",
-                    "value": "#0E0E0E",
-                    "text": "Very Dark Color",
-                    "hint": "The color of the guilds sidebar."
-                },
-                {
-                    "id": "main-color",
-                    "type": "color",
-                    "value": "#00FAFA",
-                    "text": "Accent Color",
-                    "hint": "For when a little bit of sophistication is required."
-                },
-                {
-                    "id": "main-text-color",
-                    "type": "color",
-                    "value": "#FAFAFA",
-                    "text": "Text Color",
-                    "hint": "Most text will be this color."
-                },
-                {
-                    "id": "chat-text-color",
-                    "type": "color",
-                    "value": "#FFFFFF",
-                    "text": "Chat Color",
-                    "hint": "Text in the chat pane will be this color."
-                },
-                {
-                    "id": "code-text-color",
-                    "type": "color",
-                    "value": "#CCCCCC",
-                    "text": "Code Color",
-                    "hint": "Non syntax-highlighted code in codeblocks will be this color."
-                },
-                {
-                    "id": "tint-color",
-                    "type": "color",
-                    "value": "#00FAFA",
-                    "text": "Tint Color",
-                    "hint": "Tint all of the background colors using this color."
-                },
-                {
-                    "id": "tint-strength",
-                    "type": "slider",
-                    "value": 0,
-                    "min": 0,
-                    "max": 100,
-                    "step": 0.5,
-                    "unit": "%",
-                    "multi": "0.5",
-                    "text": "Tint Strength",
-                    "hint": "How strongly to tint the background colors."
-                },
-                {
-                    "id": "collapsing-panels",
-                    "type": "bool",
-                    "value": false,
-                    "text": "Collapsing Side Panels",
-                    "hint": "Fancy channels and members panels that hide themselves when not needed."
-                },
-                {
-                    "id": "compact-server-list",
-                    "type": "bool",
-                    "value": false,
-                    "text": "Compact Server List",
-                    "hint": "Squishes together your servers so that they take up less space."
-                }
-            ]
-        }
-    ],
-     "configSchemes": [
-        {
-            "id": "default",
-            "name": "Default Colors",
-            "hint": "The basic colors -- good for tinting.",
-            "settings": [
-                {
-                    "category": "default",
-                    "settings": [
-                        {
-                            "id": "color-light",
-                            "value": "#3E3E3E"
-                        },
-                        {
-                            "id": "color-medium",
-                            "value": "#2E2E2E"
-                        },
-                        {
-                            "id": "color-dark",
-                            "value": "#1E1E1E"
-                        },
-                        {
-                            "id": "color-very-dark",
-                            "value": "#0E0E0E"
-                        },
-                        {
-                            "id": "main-color",
-                            "value": "#00FAFA"
-                        },
-                        {
-                            "id": "main-text-color",
-                            "value": "#FAFAFA"
-                        },
-                        {
-                            "id": "chat-text-color",
-                            "value": "#FFFFFF"
-                        },
-                        {
-                            "id": "code-text-color",
-                            "value": "#CCCCCC"
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "id": "high-contrast",
-            "name": "High Contrast",
-            "hint": "Very high contrast scheme.",
-            "settings": [
-                {
-                    "category": "default",
-                    "settings": [
-                        {
-                            "id": "color-light",
-                            "value": "#CCCCCC"
-                        },
-                        {
-                            "id": "color-medium",
-                            "value": "#000000"
-                        },
-                        {
-                            "id": "color-dark",
-                            "value": "#000000"
-                        },
-                        {
-                            "id": "color-very-dark",
-                            "value": "#000000"
-                        },
-                        {
-                            "id": "main-color",
-                            "value": "#FFFFFF"
-                        },
-                        {
-                            "id": "main-text-color",
-                            "value": "#FFFFFF"
-                        },
-                        {
-                            "id": "chat-text-color",
-                            "value": "#FFFFFF"
-                        },
-                        {
-                            "id": "code-text-color",
-                            "value": "#FFFFFF"
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
diff --git a/tests/ext/themes/SimplerFlat/index.scss b/tests/ext/themes/SimplerFlat/index.scss
deleted file mode 100644
index 5917675f..00000000
--- a/tests/ext/themes/SimplerFlat/index.scss
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
-SimplerFlat | Copyright © 2018, Qwerasd | All rights reserved | DO NOT DISTRIBUTE
-*/
-
-@import 'vars';
-
-
-
-
-/* Panel colors */
-
-    /* Center panel */
-
-.chat, .messages-wrapper, .chat>.content, .chat form, .chat div[class^="titleWrapper"]>div, div[class^="typing"] {
-    background-color: $color-medium!important;
-}
-
-    /* User list panel */
-
-.channel-members-wrap, .channel-members {
-    background-color: $color-dark!important;
-}
-
-    /* Channel list panel */
-
-div[class^="channels"], div[class^="channels"]>div[class^="flex"] {
-    background-color: $color-dark!important;
-}
-
-.guild {
-    background-color: transparent!important;
-}
-
-.guilds-add {
-    background-color: $color-very-dark!important;
-}
-
-.guilds-add, .guilds-add-inner {
-    color: $color-light!important;
-    border-color: $color-light!important;
-}
-
-    /* Guilds list panel */
-
-div#app-mount[class^="appMount"], div.guilds-wrapper {
-    background-color: $color-very-dark;
-}
-
-.app.flex-vertical>div[class^="layers-"], 
-.app.flex-vertical>div[class^="layers-"]>div[class^="layer-"],
-.app.flex-vertical>div[class^="layers-"]>div[class^="layer-"]>div[class^="flex-"] {
-    background-color: $color-very-dark;
-}
-
-
-    /* Right settings panel */
-
-.ui-standard-sidebar-view .content-region {
-    background-color: $color-medium!important;
-}
-
-    /* Left settings panel */
-
-.ui-standard-sidebar-view .sidebar-region {
-    background-color: $color-dark!important;
-}
-
-    /* Friends panel */
-
-#friends, #friends>div {
-    background-color: $color-medium!important;
-}
-
-    /* Context menus */
-
-div[class^="contextMenu"] {
-    background-color: $color-dark!important;
-}
-
-div[class^="contextMenu"] div[class^="itemGroup"] div[class^="item"] {
-    background-color: $color-dark!important;
-}
-
-div[class^="contextMenu"] div[class^="itemGroup"] div[class^="item"]:hover {
-    background-color: $color-very-dark!important;
-}
-
-    /* nochannel */
-
-div[class^="noChannel"] {
-    background-color: $color-medium!important;
-}
-
-    /* cards */
-
-div[class^="row"]>div[class^="flex"]:before {
-    background-color: $color-dark!important;
-    border-color: $color-very-dark!important;
-}
-
-    /* modals */
-
-div[class^="theme-light wrapper"] {
-    background: transparent;
-}
-
-.form-header header, div[class^="blurb"], div[class^="expireText"] {
-    color: $main-text-color!important;
-}
-
-div[class^="modal-"] form {
-    border-radius: 5px;
-}
-
-div[class^="modal-"] form, .form-header, .form-inner {
-    background-color: $color-medium!important;
-}
-
-div[class^="modal-"] form>div:last-child, .form-actions {
-    background-color: $color-dark!important;
-}
-
-    /* themed popouts */
-
-.themed-popout {
-    background-color: $color-dark!important;
-}
-
-.themed-popout .header, .messages-popout .message-group {
-    background-color: $color-medium!important;
-}
-
-    /* search results */
-
-.search-results-wrap {
-    background-color: $color-medium!important;
-}
-
-.search-header {
-    background-color: $color-dark!important;
-}
-
-.search-result-message.hit {
-    background-color: $color-dark!important;
-    box-shadow: none!important;
-}
-
-.search-results-wrap .channel-separator .channel-name, .search-result:before, .search-result:after {
-    background: transparent!important;
-}
-
-.message-group:hover .action-buttons {
-    background: transparent!important;
-    box-shadow: none!important;
-}
-
-.action-buttons>div {
-    background-color: $color-light!important;
-    color: $color-very-dark!important;
-    border-radius: 3px;
-}
-
-.action-buttons>div>.text {
-    color: $color-very-dark!important;
-}
-
-    /* Various other things */
-
-.popout>div>div[class^="body"], .popout>div>div[class^="footer"] {
-    background-color: $color-dark!important;
-}
-
-    /* Scroll bars */
-
-.scroller-wrap .scroller::-webkit-scrollbar-track-piece, .bd-scroller-wrap .bd-scroller::-webkit-scrollbar-track-piece {
-    background-color: $color-medium!important;
-    background-clip:padding-box;
-    border:3px solid $color-light!important;
-    border-radius:7px;
-}
-
-.scroller-wrap .scroller::-webkit-scrollbar-thumb, .bd-scroller-wrap .bd-scroller::-webkit-scrollbar-thumb {
-    background-clip:padding-box;
-    background-color:$color-dark!important;
-    border:3px solid $color-light!important;
-    border-radius:7px;
-}
-
-
-/* Other bits and bobs */
-
-div[class^="searchBar"], .searchBar-YMJBu9 {
-    background-color: $color-light!important;
-}
-
-/* message inside modal */
-
-form div[class^="message"] {
-    background-color: $color-dark!important;
-}
-
-/* new messages divider */
-
-.messages .divider span {
-    background-color: $color-medium!important;
-}
-
-/* Command autosuggest */
-
-div[class^="autocomplete-"] {
-    background-color: $color-dark!important;
-}
-
-div[class^="selectorSelected"] {
-    background-color: $color-medium!important;
-}
-
-/* Code blocks */
-
-.markup pre, .markup code {
-    background-color: $color-dark!important;
-    border-color: $color-very-dark!important;
-}
-
-/* message accessories */
-
-.message .accessory>div {
-    background-color: $color-dark;
-}
-
-
-/* Text stuff */
-
-.app :not(div[class^="channels"]) :not(code):not(.kawaii-linenumbers):not(li):not(span):not(.user-name):not(.member-username):not(.markup):not(form):not(textarea):not(button):not(.guild):not(a):not(.discord-tag):not(.username):not(.discriminator):not(.ui-button-contents) {
-    color:$main-text-color!important;
-}
-
-:not(code):not(kawaii-linenumbers):not(li):not(span):not(.markup):not(form):not(textarea) {
-    font-family:$global-font, Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
-}
-
-.markup,form,textarea {
-    color:$chat-text-color!important;
-    font-family:$chat-font, Whitney, Helvetica Neue, Helvetica, Arial, sans-serif;
-}
-
-.markup {
-font-size:$chat-font-size!important;
-}
-
-div[class^="ace_"] {
-    font-family: $code-font, monospace!important;
-}
-
-code,code span,.kawaii-linenumbers,.kawaii-linenumbers li {
-    font-family: $code-font, Whitney, Helvetica Neue, Helvetica, Arial, sans-serif!important;
-    font-size: $code-font-size!important;
-    font-weight: $code-font-weight!important;
-}
-
-code,.kawaii-linenumbers {
-    color:$code-text-color!important;
-}
-
-
-/* Emoji Picker */
-
-div[class^="emojiPicker-"] div[class^="stickyHeader-"] {
-    background: transparent;
-}
-
-div[class^="emojiPicker-"] {
-    background-color: $color-light;
-}
-
-.search-bar.search-bar-light {
-    background-color: $color-light;
-}
-
-.search-bar.search-bar-light input, .search-bar.search-bar-light input::-webkit-input-placeholder {
-    color: $main-text-color;
-}
-
-.search-bar.search-bar-light input::-webkit-input-placeholder {
-    opacity: 0.6;
-}
-
-.search-bar-light .search-bar-icon .icon {
-    filter: invert(100%);
-}
-
-div[class^="emojiPicker-"] div[class^="scroller-"]::-webkit-scrollbar-track-piece {
-    background-color: $color-medium;
-    background-clip:padding-box;
-    border-radius:7px;
-}
-
-div[class^="emojiPicker-"] div[class^="scroller-"]::-webkit-scrollbar-thumb {
-    background-clip:padding-box;
-    background-color:$color-dark!important;
-    border: none!important;
-    border-radius:7px;
-}
-
-/* Emoji drop shadow so that dark emojis are visible on the dark background */
-
-.message-group .emoji {
-    filter: drop-shadow(0px 0px 1px #FFF);
-}
-
-
-/* BD button */
-
-.bd-settings-wrapper .bd-settings-button:not(.bd-active) {
-    background-color: $color-very-dark;
-}
-
-/* BD interface */
-
-
-    /*sidebar*/
-
-.bd-sidebar-view .bd-sidebar-region {
-    background-color: $color-dark;
-}
-
-    /*content*/
-
-.bd-sidebar-view .bd-content-region {
-    background-color: $color-medium;
-}
-
-    /*modals*/
-
-.bd-modal .bd-modal-inner {
-    background-color: $color-medium;
-}
-
-    /*color picker*/
-
-.bd-form-colourpicker .vc-chrome {
-    z-index: 1;
-    
-    & .vc-chrome-body {
-        background-color: $color-medium;
-    }
-}
-
-
-
-/* Channel List stuff */
-
-*[class^="colorUnread"] {
-    color: $main-color;
-}
-
-div[class^="wrapperHovered"] div[class^="content"] {
-    background-color: $color-very-dark;
-}
-
-*[class^="colorHovered"], *[class^="colorSelected"] {
-    color: #FFFFFF;
-    opacity: 0.8;
-}
-
-div[class^="nameUnread"] {
-    color: $main-color;
-}
-
-
-/** Collapsing stuff **/
-
-@if $collapsing-panels {
-
-    /* Channels list */
-
-    div[class^="channels"]:not(:hover) {
-        width: 3em;
-    }
-
-    .channel.private a {
-        padding-left: 0.4em;
-        margin-left: 0px;
-    }
-
-    .private-channels .search-bar, .private-channels .btn-friends, .private-channels header {
-        overflow: hidden;
-        transition: height 0.3s;
-    }
-
-    .private-channels:not(:hover) .search-bar, .private-channels:not(:hover) .btn-friends, .private-channels:not(:hover) header {
-        height: 0px;
-        font-size: 0px;
-    }
-
-    div[class^="wrapperDefaultVoice"]+div, div[class^="wrapperHoveredVoice"]+div, div[class^="wrapperSelectedVoice"]+div {
-        padding-left: 0.5em;
-    }
-
-
-/* Foldaway channel members sidebar */
-
-    .channel-members-wrap {
-        min-width:1px;
-    }
-
-    .channel-members-wrap:not(:hover) {
-        width: 1px;
-    }
-
-    .channel-members {
-        padding-top:0;
-        padding-bottom:0;
-        width: 100%;
-    }
-}
-
-/* Compact Server List */
-
-@if $compact-server-list {
-
-    .guilds-wrapper .guilds .guild.selected:before {
-        margin-top: -10px;
-    }
-
-    .guilds-wrapper .guilds .guild.selected {
-        z-index: 2;
-        transform: scale(1.2);
-        margin: 10px;
-        margin-left: 5px;
-    }
-
-    .guilds-wrapper .guilds .guild.unread:not(.selected)::before {
-        margin-top: 1px;
-        height: 15px;
-        border-radius: 10px;
-    }
-
-    .guilds-wrapper .guilds .guild:not(.guilds-add) {
-        height: 30px;
-    }
-
-    .guilds-wrapper .guilds .guild:first-child {
-        height: 50px;
-    }
-
-    .guilds-wrapper .guilds .guild.selected::before {
-        animation: selectserver 0.4s cubic-bezier(1, 0, 1, 0);
-        -webkit-animation: selectserver 0.4s cubic-bezier(1, 0, 1, 0);
-    }
-
-    .guilds-wrapper .guilds .guild:not(:first-child):not(.selected) div:not(.badge) {
-        transition: height 0.5s;
-        -webkit-transition: height 0.5s;
-    }
-
-    .guilds-wrapper .guilds .guild:not(:first-child):not(.selected):hover div:not(.badge) {
-        height: 50px;
-        transform: scale(1.2);
-        -webkit-transform: scale(1.2);
-        transition: height 0.5s;
-        -webkit-transition: height 0.5s;
-        margin-bottom: 0px;
-    }
-
-    .guilds-wrapper .guilds .guild:not(:first-child):not(.selected):hover {
-        z-index: 3;
-    }
-
-    .guilds-wrapper .guilds .guild .badge {
-        bottom: 14px;
-    }
-
-    .guilds-wrapper .guilds .guild:not(:first-child):not(.selected):hover .badge {
-        transform:scale(1.35);
-        bottom: 19px;
-        right: -7px;
-    }
-}
diff --git a/tests/ext/themes/SimplerFlat/vars.scss b/tests/ext/themes/SimplerFlat/vars.scss
deleted file mode 100644
index 994ba0f4..00000000
--- a/tests/ext/themes/SimplerFlat/vars.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-/* Theme */
-$main-color: #00FAFA !default; /*Main general theme color (#00FAFA Light Cyan by default)*/
-
-/* Text */
-$main-text-color: #FAFAFA !default; /*The colour of text onscreen in most places (#FAFAFA light grey by default)*/
-$chat-text-color: #FFFFFF !default; /*The chat will be this color*/
-$code-text-color: #CCCCCC !default; /*The non-syntax hilighted bits in code blocks will be this color*/
-
-/* Background */
-$color-light: #3E3E3E !default; /*These are all colors used in the background*/
-$color-medium: #2E2E2E !default;
-$color-dark: #1E1E1E !default;
-$color-very-dark: #0E0E0E !default;
-
-/* Tinting */
-
-$tint-color: $main-color !default;
-$tint-strength: 0% !default;
-
-/* Font */
-$global-font: 'Whitney' !default; /*This font will appear most places*/
-$chat-font: 'Whitney' !default; /*This font will appear in the main chat*/
-$chat-font-size: 15px !default;
-$code-font: monospace !default; /*This will appear in code blocks*/
-$code-font-size: 14px !default;
-$code-font-weight: 700 !default;
-
-/* other */
-
-$collapsing-panels: false !default;
-$compact-server-list: false !default;
-
-/* do some stuff with the vars */
-
-$color-light: mix($tint-color, $color-light, $tint-strength);
-$color-medium: mix($tint-color, $color-medium, $tint-strength);
-$color-dark: mix($tint-color, $color-dark, $tint-strength);
-$color-very-dark: mix($tint-color, $color-very-dark, $tint-strength);

From a3eeee9b57221c10ebf8c1da88262b252deca108 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Thu, 22 Mar 2018 16:38:09 +0000
Subject: [PATCH 17/23] =?UTF-8?q?Store=20content=20config=20with=20it?=
 =?UTF-8?q?=E2=80=99s=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/modules/content.js        |  5 ++---
 client/src/modules/contentmanager.js | 25 +++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/client/src/modules/content.js b/client/src/modules/content.js
index ce2047fd..ebd85c33 100644
--- a/client/src/modules/content.js
+++ b/client/src/modules/content.js
@@ -78,10 +78,9 @@ export default class Content {
      */
     async saveConfiguration() {
         try {
-            Database.insertOrUpdate({ type: 'contentconfig', $or: [{ id: this.id }, { name: this.name }] }, {
-                type: 'contentconfig',
+            Database.insertOrUpdate({ type: `${this.type}-config`, id: this.id }, {
+                type: `${this.type}-config`,
                 id: this.id,
-                name: this.name,
                 enabled: this.enabled,
                 config: this.settings.strip().settings,
                 data: this.data
diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index 55fcb18e..8316da2d 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -39,6 +39,27 @@ export default class {
         return this._localContent ? this._localContent : (this._localContent = []);
     }
 
+    /**
+     * The type of content this content manager manages.
+     */
+    static get contentType() {
+        return undefined;
+    }
+
+    /**
+     * The name of this content manager.
+     */
+    static get moduleName() {
+        return undefined;
+    }
+
+    /**
+     * The path used to store this content manager's content.
+     */
+    static get pathId() {
+        return undefined;
+    }
+
     /**
      * Local path for content.
      * @return {String}
@@ -100,7 +121,7 @@ export default class {
             const directories = await FileUtils.listDirectory(this.contentPath);
 
             for (let dir of directories) {
-                // If content is already loaded this should resolve.
+                // If content is already loaded this should resolve
                 if (this.getContentByDirName(dir)) continue;
 
                 try {
@@ -185,7 +206,7 @@ export default class {
 
             try {
                 const id = readConfig.info.id || readConfig.info.name.toLowerCase().replace(/[^a-zA-Z0-9-]/g, '-').replace(/--/g, '-');
-                const readUserConfig = await Database.find({ type: 'contentconfig', id });
+                const readUserConfig = await Database.find({ type: `${this.contentType}-config`, id });
                 if (readUserConfig.length) {
                     userConfig.enabled = readUserConfig[0].enabled || false;
                     userConfig.config = readUserConfig[0].config;

From eaeae7ad9808da3d3e4e3c13ba709df296ddec8a Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Thu, 22 Mar 2018 16:41:20 +0000
Subject: [PATCH 18/23] Use a warning when settings failed to load

---
 client/src/modules/contentmanager.js | 3 +--
 client/src/modules/settings.js       | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/src/modules/contentmanager.js b/client/src/modules/contentmanager.js
index 8316da2d..88771d21 100644
--- a/client/src/modules/contentmanager.js
+++ b/client/src/modules/contentmanager.js
@@ -214,8 +214,7 @@ export default class {
                 }
             } catch (err) {
                 // We don't care if this fails it either means that user config doesn't exist or there's something wrong with it so we revert to default config
-                Logger.info(this.moduleName, `Failed reading config for ${this.contentType} ${readConfig.info.name} in ${dirName}`);
-                Logger.err(this.moduleName, err);
+                Logger.warn(this.moduleName, [`Failed reading config for ${this.contentType} ${readConfig.info.name} in ${dirName}`, err]);
             }
 
             userConfig.config = defaultConfig.clone({ settings: userConfig.config });
diff --git a/client/src/modules/settings.js b/client/src/modules/settings.js
index f382ec0d..88d4269c 100644
--- a/client/src/modules/settings.js
+++ b/client/src/modules/settings.js
@@ -61,7 +61,7 @@ export default new class Settings {
         } catch (err) {
             // There was an error loading settings
             // This probably means that the user doesn't have any settings yet
-            Logger.err('Settings', err);
+            Logger.warn('Settings', ['Failed to load internal settings', err]);
         }
     }
 

From 66eee86eb3f2aa244390bcc011d240c6ec2000bc Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Thu, 22 Mar 2018 16:46:42 +0000
Subject: [PATCH 19/23] Fix cloning settings sets with schemes

---
 client/src/structs/settings/settingsscheme.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/client/src/structs/settings/settingsscheme.js b/client/src/structs/settings/settingsscheme.js
index 2d4a14f6..d0201660 100644
--- a/client/src/structs/settings/settingsscheme.js
+++ b/client/src/structs/settings/settingsscheme.js
@@ -15,12 +15,6 @@ export default class SettingsScheme {
     constructor(args) {
         this.args = args.args || args;
 
-        this.args.settings = this.settings.map(({ category, settings }) => ({
-            category, settings: settings.map(({ id, value }) => ({
-                id, value
-            }))
-        }));
-
         Object.freeze(this);
     }
 

From 6bb8c1885763916bb2723d6a4bf792a2cc4ffedc Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Thu, 22 Mar 2018 17:13:47 +0000
Subject: [PATCH 20/23] Update repository URL

---
 client/package.json    | 2 +-
 core/package.json      | 2 +-
 csseditor/package.json | 2 +-
 installer/package.json | 2 +-
 package.json           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/package.json b/client/package.json
index 6fb49e30..e1d5d03c 100644
--- a/client/package.json
+++ b/client/package.json
@@ -12,7 +12,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/Jiiks/BetterDiscordApp.git"
+    "url": "https://github.com/JsSucks/BetterDiscordApp.git"
   },
   "private": false,
   "scripts": {
diff --git a/core/package.json b/core/package.json
index 99f75df3..a6151d2d 100644
--- a/core/package.json
+++ b/core/package.json
@@ -12,7 +12,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/Jiiks/BetterDiscordApp.git"
+    "url": "https://github.com/JsSucks/BetterDiscordApp.git"
   },
   "private": false,
   "scripts": {
diff --git a/csseditor/package.json b/csseditor/package.json
index acdd5935..1692bb58 100644
--- a/csseditor/package.json
+++ b/csseditor/package.json
@@ -12,7 +12,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/Jiiks/BetterDiscordApp.git"
+    "url": "https://github.com/JsSucks/BetterDiscordApp.git"
   },
   "private": false,
   "scripts": {
diff --git a/installer/package.json b/installer/package.json
index 0cfd724f..89ba35ff 100644
--- a/installer/package.json
+++ b/installer/package.json
@@ -12,7 +12,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/Jiiks/BetterDiscordApp.git"
+    "url": "https://github.com/JsSucks/BetterDiscordApp.git"
   },
   "private": false,
   "scripts": {
diff --git a/package.json b/package.json
index 29c6f837..7d86c9fd 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/Jiiks/BetterDiscordApp.git"
+    "url": "https://github.com/JsSucks/BetterDiscordApp.git"
   },
   "private": false,
   "dependencies": {

From ddfd0653acece76040f800e8f563d25e56ad4912 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Sat, 24 Mar 2018 16:06:34 +0000
Subject: [PATCH 21/23] Fix emote injection

---
 client/src/ui/vueinjector.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/ui/vueinjector.js b/client/src/ui/vueinjector.js
index 97371af9..e1703f99 100644
--- a/client/src/ui/vueinjector.js
+++ b/client/src/ui/vueinjector.js
@@ -16,7 +16,7 @@ export default class {
      * Creates a new Vue object and mounts it in the passed element.
      * @param {HTMLElement} root The element to mount the new Vue object at
      * @param {Object} options Options to pass to Vue
-     * @param {BdNode} bdnode The element to append to
+     * @param {BdNode} bdnode The element to append
      * @return {Vue}
      */
     static inject(root, options, bdnode) {
@@ -24,7 +24,7 @@ export default class {
 
         const vue = new Vue(options);
 
-        vue.$mount(bdnode || root);
+        vue.$mount(bdnode ? bdnode.element : root);
         return vue;
     }
 

From 9e229a1c0f467367e15cb6f60767a9439c2e2dcf Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Sat, 24 Mar 2018 16:13:24 +0000
Subject: [PATCH 22/23] Cleanup profile badges

---
 client/src/ui/profilebadges.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/client/src/ui/profilebadges.js b/client/src/ui/profilebadges.js
index 008bb448..41905b79 100644
--- a/client/src/ui/profilebadges.js
+++ b/client/src/ui/profilebadges.js
@@ -64,11 +64,10 @@ export default class extends EventListener {
         const wrapperParent = usernameWrapper.parentElement;
         if (!wrapperParent || wrapperParent.children.length < 2) return;
         wrapperParent.insertBefore(root, wrapperParent.children[1]);
-        const { developer, contributor, webdev } = c;
         VueInjector.inject(root, {
             components: { BdMessageBadge },
-            data: { developer, contributor, webdev },
-            template: '<BdMessageBadge :developer="developer" :webdev="webdev" :contributor="contributor" />'
+            data: { c },
+            template: '<BdMessageBadge :developer="c.developer" :webdev="c.webdev" :contributor="c.contributor" />'
         });
     }
 
@@ -79,11 +78,10 @@ export default class extends EventListener {
         if (!memberUsername) return;
         const root = document.createElement('span');
         memberUsername.append(root);
-        const { developer, contributor, webdev } = c;
         VueInjector.inject(root, {
             components: { BdMessageBadge },
-            data: { developer, contributor, webdev },
-            template: '<BdMessageBadge :developer="developer" :webdev="webdev" :contributor="contributor" />'
+            data: { c },
+            template: '<BdMessageBadge :developer="c.developer" :webdev="c.webdev" :contributor="c.contributor" />'
         });
     }
 
@@ -100,8 +98,6 @@ export default class extends EventListener {
                 root = document.querySelector('[class*="headerInfo"]');
             }
 
-            const { developer, contributor, webdev } = c;
-
             VueInjector.inject(root, {
                 components: { BdBadge },
                 data: { hasBadges, c },

From 545b72cc3ee0223b116426e542b04b37f3257569 Mon Sep 17 00:00:00 2001
From: Samuel Elliott <samuelthomas2774@users.noreply.github.com>
Date: Sun, 25 Mar 2018 02:18:40 +0100
Subject: [PATCH 23/23] Refactor logger (use util.inspect) and fix CSS editor
 not awaiting settings saving

---
 client/src/modules/csseditor.js     | 10 ++++++----
 client/webpack.config.js            |  1 +
 client/webpack.production.config.js |  1 +
 common/modules/logger.js            | 20 +++++---------------
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/client/src/modules/csseditor.js b/client/src/modules/csseditor.js
index 5dbd1846..ac3fdbc4 100644
--- a/client/src/modules/csseditor.js
+++ b/client/src/modules/csseditor.js
@@ -42,7 +42,7 @@ export default new class {
         ClientIPC.on('bd-save-scss', async (e, scss) => {
             await this.updateScss(scss);
             await this.save();
-        });
+        }, true);
 
         this.liveupdate = Settings.getSetting('css', 'default', 'live-update');
         this.liveupdate.on('setting-updated', event => {
@@ -98,18 +98,20 @@ export default new class {
 
     /**
      * Save css to file.
+     * @return {Promise}
      */
-    async save() {
-        Settings.saveSettings();
+    save() {
+        return Settings.saveSettings();
     }
 
     /**
      * Save current editor bounds.
      * @param {Rectangle} bounds Editor bounds
+     * @return {Promise}
      */
     saveEditorBounds(bounds) {
         this.editor_bounds = bounds;
-        Settings.saveSettings();
+        return Settings.saveSettings();
     }
 
     /**
diff --git a/client/webpack.config.js b/client/webpack.config.js
index e88c1cea..8821001e 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -34,6 +34,7 @@ module.exports = {
         electron: 'window.require("electron")',
         fs: 'window.require("fs")',
         path: 'window.require("path")',
+        node_utils: 'window.require("util")',
         sparkplug: 'require("../../core/dist/sparkplug")'
     },
     resolve: {
diff --git a/client/webpack.production.config.js b/client/webpack.production.config.js
index 1c9c4a76..e200a115 100644
--- a/client/webpack.production.config.js
+++ b/client/webpack.production.config.js
@@ -35,6 +35,7 @@ module.exports = {
         electron: 'window.require("electron")',
         fs: 'window.require("fs")',
         path: 'window.require("path")',
+        node_utils: 'window.require("util")',
         sparkplug: 'require("./sparkplug")'
     },
     resolve: {
diff --git a/common/modules/logger.js b/common/modules/logger.js
index 6f21848d..8c12fef8 100644
--- a/common/modules/logger.js
+++ b/common/modules/logger.js
@@ -10,6 +10,7 @@
 
 import { Vendor } from 'modules';
 import { FileUtils } from './utils';
+import node_utils from 'node_utils';
 
 export const logLevels = {
     'log': 'log',
@@ -35,26 +36,15 @@ export default class Logger {
 
     log(module, message, level = 'log') {
         level = Logger.parseLevel(level);
-        if (typeof message === 'object' && !(message instanceof Array)) {
-            console[level]('[%cBetter%cDiscord:%s]', 'color: #3E82E5', '', `${module}${level === 'debug' ? '|DBG' : ''}`, message);
-            let message_string = message.toString();
-            if (message_string === '[object Object]')
-                message_string += ' ' + JSON.stringify(message, null, 4);
-
-            this.logs.push(`${level.toUpperCase()} : [${Logger.timestamp}|${module}] ${message_string}${message_string === '[object Object]' ? ' ' + JSON.stringify(message, null, 4) : ''}`);
-
-            if (this.file)
-                FileUtils.appendToFile(this.file, `${level.toUpperCase()} : [${Logger.timestamp}|${module}] ${message_string}${message_string === '[object Object]' ? ' ' + JSON.stringify(message, null, 4) : ''}\n`);
-
-            return;
-        }
 
         message = typeof message === 'object' && message instanceof Array ? message : [message];
         console[level]('[%cBetter%cDiscord:%s]', 'color: #3E82E5', '', `${module}${level === 'debug' ? '|DBG' : ''}`, ...message);
-        this.logs.push(`${level.toUpperCase()} : [${Logger.timestamp}|${module}] ${message.join(' ')}`);
+
+        const message_string = message.map(m => typeof m === 'string' ? m : node_utils.inspect(m)).join(' ');
+        this.logs.push(`${level.toUpperCase()} : [${Logger.timestamp}|${module}] ${message_string}`);
 
         if (this.file)
-            FileUtils.appendToFile(this.file, `${level.toUpperCase()} : [${Logger.timestamp}|${module}] ${message.join(' ')}\n`);
+            FileUtils.appendToFile(this.file, `${level.toUpperCase()} : [${Logger.timestamp}|${module}] ${message_string}\n`);
     }
 
     logError(err) {