From a5e57cd52cba5b8df2200f44423d44ed321a5485 Mon Sep 17 00:00:00 2001
From: Maya <maya@f-list.net>
Date: Thu, 3 Jan 2019 18:38:17 +0100
Subject: [PATCH] 3.0.10

---
 bbcode/Editor.vue                             |   13 +-
 bbcode/core.ts                                |    3 +-
 bbcode/parser.ts                              |    6 +-
 bbcode/standard.ts                            |   11 +-
 chat/ChannelList.vue                          |    6 +-
 chat/ChannelTagView.vue                       |   16 +-
 chat/CharacterSearch.vue                      |   56 +-
 chat/Chat.vue                                 |   21 +-
 chat/ChatView.vue                             |   63 +-
 chat/CommandHelp.vue                          |    3 +-
 chat/ConversationSettings.vue                 |   17 +-
 chat/ConversationView.vue                     |   74 +-
 chat/Logs.vue                                 |  168 +-
 chat/ManageChannel.vue                        |    3 +-
 chat/RecentConversations.vue                  |   40 +-
 chat/ReportDialog.vue                         |   34 +-
 chat/SettingsView.vue                         |   43 +-
 chat/Sidebar.vue                              |    3 +-
 chat/StatusSwitcher.vue                       |   15 +-
 chat/UserList.vue                             |    6 +-
 chat/UserMenu.vue                             |   38 +-
 chat/WebSocket.ts                             |    4 +
 chat/bbcode.ts                                |   13 +-
 chat/conversations.ts                         |   53 +-
 chat/core.ts                                  |    1 -
 chat/interfaces.ts                            |   44 +-
 chat/localize.ts                              |   20 +-
 chat/message_view.ts                          |   63 +-
 chat/profile_api.ts                           |   41 +-
 chat/vue-raven.ts                             |    2 +-
 components/Dropdown.vue                       |    7 +-
 components/FilterableSelect.vue               |   19 +-
 components/Modal.vue                          |    8 +-
 components/character_link.vue                 |    3 +-
 components/character_select.vue               |    3 +-
 components/custom_dialog.ts                   |    2 +
 components/date_display.vue                   |   10 +-
 components/form_group.vue                     |    3 +-
 components/form_group_inputgroup.vue          |    3 +-
 components/simple_pager.vue                   |   11 +-
 components/tabs.ts                            |   17 +-
 electron/Index.vue                            |   18 +-
 electron/Window.vue                           |   37 +-
 electron/chat.ts                              |   49 +-
 electron/filesystem.ts                        |    4 +-
 electron/importer.ts                          |    2 +-
 electron/main.ts                              |    5 +-
 electron/package.json                         |    2 +-
 electron/tsconfig-main.json                   |    3 +-
 electron/tsconfig-renderer.json               |    3 +-
 electron/webpack.config.js                    |    6 +-
 fchat/characters.ts                           |    6 +-
 fchat/connection.ts                           |    5 +-
 fchat/interfaces.ts                           |    7 +-
 interfaces.ts                                 |   99 ++
 mobile/Index.vue                              |   32 +-
 mobile/android/app/.gitignore                 |    1 +
 mobile/android/app/build.gradle               |   12 +-
 .../src/main/kotlin/net/f_list/fchat/File.kt  |    3 +-
 .../kotlin/net/f_list/fchat/MainActivity.kt   |    4 +-
 .../kotlin/net/f_list/fchat/Notifications.kt  |    2 +-
 mobile/ios/F-Chat/ViewController.swift        |    5 +-
 mobile/ios/F-Chat/www                         |    0
 mobile/package.json                           |    2 +-
 mobile/tsconfig.json                          |   13 +-
 mobile/webpack.config.js                      |    6 +-
 package.json                                  |   46 +-
 scss/_chat.scss                               |    5 +-
 scss/_core.scss                               |    2 -
 scss/_flist_overrides.scss                    |   22 +
 scss/_functions.scss                          |    4 +
 scss/fa.scss                                  |   10 +-
 scss/themes/variables/_dark_derived.scss      |    2 +-
 scss/themes/variables/_default_derived.scss   |    4 +-
 scss/themes/variables/_light_derived.scss     |    2 +-
 site/character_page/character_page.vue        |   38 +-
 site/character_page/contact_method.vue        |    3 +-
 site/character_page/context_menu.ts           |   17 +-
 site/character_page/copy_custom_dialog.vue    |   22 +-
 site/character_page/copy_custom_menu.vue      |   12 +-
 site/character_page/delete_dialog.vue         |    5 +-
 site/character_page/duplicate_dialog.vue      |    9 +-
 site/character_page/friend_dialog.vue         |   15 +-
 site/character_page/friends.vue               |    3 +-
 site/character_page/groups.vue                |    3 +-
 site/character_page/guestbook.vue             |   15 +-
 site/character_page/guestbook_post.vue        |    7 +-
 site/character_page/images.vue                |    8 +-
 site/character_page/infotag.vue               |    3 +-
 site/character_page/infotags.vue              |    9 +-
 site/character_page/interfaces.ts             |   90 +-
 site/character_page/kink.vue                  |    3 +-
 site/character_page/kinks.vue                 |   34 +-
 site/character_page/memo_dialog.vue           |   35 +-
 site/character_page/report_dialog.vue         |   15 +-
 site/character_page/sidebar.vue               |   55 +-
 site/utils.ts                                 |    1 -
 tslint.json                                   |    4 +-
 tslint/vuePropsRule.js                        |   53 +-
 webchat/logs.ts                               |   22 +-
 webchat/package.json                          |    2 +-
 webchat/tsconfig.json                         |    6 +-
 webchat/webpack.config.js                     |    6 +-
 yarn.lock                                     | 1566 ++++++++---------
 104 files changed, 1797 insertions(+), 1653 deletions(-)
 create mode 100644 interfaces.ts
 mode change 100644 => 120000 mobile/ios/F-Chat/www

diff --git a/bbcode/Editor.vue b/bbcode/Editor.vue
index 41e6083..1807ac4 100644
--- a/bbcode/Editor.vue
+++ b/bbcode/Editor.vue
@@ -5,7 +5,7 @@
             style="border-bottom-left-radius:0;border-bottom-right-radius:0" v-if="hasToolbar">
             <i class="fa fa-code"></i>
         </a>
-        <div class="bbcode-toolbar btn-toolbar" role="toolbar" :style="showToolbar ? 'display:flex' : ''" @mousedown.stop.prevent
+        <div class="bbcode-toolbar btn-toolbar" role="toolbar" :style="showToolbar ? {display: 'flex'} : undefined" @mousedown.stop.prevent
             v-if="hasToolbar" style="flex:1 51%">
             <div class="btn-group" style="flex-wrap:wrap">
                 <div class="btn btn-light btn-sm" v-for="button in buttons" :title="button.title" @click.prevent.stop="apply(button)">
@@ -21,7 +21,7 @@
         <div class="bbcode-editor-text-area" style="order:100;width:100%;">
             <textarea ref="input" v-model="text" @input="onInput" v-show="!preview" :maxlength="maxlength" :placeholder="placeholder"
                 :class="finalClasses" @keyup="onKeyUp" :disabled="disabled" @paste="onPaste" @keypress="$emit('keypress', $event)"
-                :style="hasToolbar ? 'border-top-left-radius:0' : ''"@keydown="onKeyDown"></textarea>
+                :style="hasToolbar ? {'border-top-left-radius': 0} : undefined" @keydown="onKeyDown"></textarea>
             <textarea ref="sizer"></textarea>
             <div class="bbcode-preview" v-show="preview">
                 <div class="bbcode-preview-warnings">
@@ -36,9 +36,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Hook, Prop, Watch} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop, Watch} from 'vue-property-decorator';
     import {BBCodeElement} from '../chat/bbcode';
     import {getKey} from '../chat/common';
     import {Keys} from '../keys';
@@ -82,6 +81,7 @@
         //tslint:disable:strict-boolean-expressions
         private resizeListener!: () => void;
 
+        @Hook('created')
         created(): void {
             this.parser = new CoreBBCodeParser();
             this.resizeListener = () => {
@@ -91,6 +91,7 @@
             };
         }
 
+        @Hook('mounted')
         mounted(): void {
             this.element = <HTMLTextAreaElement>this.$refs['input'];
             const styles = getComputedStyle(this.element);
@@ -113,8 +114,10 @@
             this.resize();
             window.addEventListener('resize', this.resizeListener);
         }
+
         //tslint:enable
 
+        @Hook('destroyed')
         destroyed(): void {
             window.removeEventListener('resize', this.resizeListener);
         }
@@ -189,7 +192,7 @@
             // Allow emitted variations for custom buttons.
             this.$once('insert', (startText: string, endText: string) => this.applyText(startText, endText));
             if(button.handler !== undefined)
-                return <void>button.handler.call(this, this);
+                return button.handler.call(this, this);
             if(button.startText === undefined)
                 button.startText = `[${button.tag}]`;
             if(button.endText === undefined)
diff --git a/bbcode/core.ts b/bbcode/core.ts
index 846e0ea..766a7be 100644
--- a/bbcode/core.ts
+++ b/bbcode/core.ts
@@ -72,9 +72,8 @@ export class CoreBBCodeParser extends BBCodeParser {
             a.textContent = display;
             element.appendChild(a);
             const span = document.createElement('span');
-            span.className = 'link-domain';
+            span.className = 'link-domain bbcode-pseudo';
             span.textContent = ` [${domain(url)}]`;
-            (<HTMLElement & {bbcodeHide: true}>span).bbcodeHide = true;
             element.appendChild(span);
             return element;
         }));
diff --git a/bbcode/parser.ts b/bbcode/parser.ts
index 778424c..fe9a4ee 100644
--- a/bbcode/parser.ts
+++ b/bbcode/parser.ts
@@ -166,10 +166,14 @@ export class BBCodeParser {
                     if(tag instanceof BBCodeTextTag) {
                         i = this.parse(input, i + 1, tag, undefined, isAllowed);
                         element = tag.createElement(this, parent, param, input.substring(mark, input.lastIndexOf('[', i)));
+                        if(element === undefined) parent.appendChild(document.createTextNode(input.substring(tagStart, i + 1)));
                     } else {
                         element = tag.createElement(this, parent, param, '');
+                        if(element === undefined) parent.appendChild(document.createTextNode(input.substring(tagStart, i + 1)));
                         if(!tag.noClosingTag)
                             i = this.parse(input, i + 1, tag, element !== undefined ? element : parent, isAllowed);
+                        if(element === undefined)
+                            parent.appendChild(document.createTextNode(input.substring(input.lastIndexOf('[', i), i + 1)));
                     }
                     mark = i + 1;
                     this._currentTag = currentTag;
@@ -182,7 +186,7 @@ export class BBCodeParser {
                             parent.appendChild(document.createTextNode(input.substring(mark, selfAllowed ? tagStart : i + 1)));
                         return i;
                     } else if(!selfAllowed)
-                        return tagStart - 1;
+                        return mark - 1;
                      else if(isAllowed(tagKey))
                          this.warning(`Unexpected closing ${tagKey} tag. Needed ${self} tag instead.`);
                 } else if(isAllowed(tagKey)) this.warning(`Found closing ${tagKey} tag that was never opened.`);
diff --git a/bbcode/standard.ts b/bbcode/standard.ts
index 30fcd50..fb43895 100644
--- a/bbcode/standard.ts
+++ b/bbcode/standard.ts
@@ -1,15 +1,8 @@
+import {InlineImage} from '../interfaces';
 import {CoreBBCodeParser} from './core';
 import {InlineDisplayMode} from './interfaces';
 import {BBCodeCustomTag, BBCodeSimpleTag, BBCodeTextTag} from './parser';
 
-interface InlineImage {
-    id: number
-    hash: string
-    extension: string
-    nsfw: boolean
-    name?: string
-}
-
 interface StandardParserSettings {
     siteDomain: string
     staticDomain: string
@@ -29,7 +22,7 @@ export class StandardBBCodeParser extends CoreBBCodeParser {
         const outerEl = this.createElement('div');
         const el = this.createElement('img');
         el.className = 'inline-image';
-        el.title = el.alt = inline.name!;
+        el.title = el.alt = inline.name;
         el.src = `${this.settings.staticDomain}images/charinline/${p1}/${p2}/${inline.hash}.${inline.extension}`;
         outerEl.appendChild(el);
         return outerEl;
diff --git a/chat/ChannelList.vue b/chat/ChannelList.vue
index d2c725d..67dd0b4 100644
--- a/chat/ChannelList.vue
+++ b/chat/ChannelList.vue
@@ -12,7 +12,7 @@
                         <span class="fa fa-2x" :class="{'fa-sort-amount-down': sortCount, 'fa-sort-alpha-down': !sortCount}"></span>
                     </a>
                 </div>
-                <div style="overflow: auto;" v-show="tab == 0">
+                <div style="overflow: auto;" v-show="tab === '0'">
                     <div v-for="channel in officialChannels" :key="channel.id">
                         <label :for="channel.id">
                             <input type="checkbox" :checked="channel.isJoined" :id="channel.id" @click.prevent="setJoined(channel)"/>
@@ -20,7 +20,7 @@
                         </label>
                     </div>
                 </div>
-                <div style="overflow: auto;" v-show="tab == 1">
+                <div style="overflow: auto;" v-show="tab === '1'">
                     <div v-for="channel in openRooms" :key="channel.id">
                         <label :for="channel.id">
                             <input type="checkbox" :checked="channel.isJoined" :id="channel.id" @click.prevent="setJoined(channel)"/>
@@ -42,7 +42,7 @@
 </template>
 
 <script lang="ts">
-    import Component from 'vue-class-component';
+    import {Component} from '@f-list/vue-ts';
     import CustomDialog from '../components/custom_dialog';
     import Modal from '../components/Modal.vue';
     import Tabs from '../components/tabs';
diff --git a/chat/ChannelTagView.vue b/chat/ChannelTagView.vue
index 5894ba1..040cb0d 100644
--- a/chat/ChannelTagView.vue
+++ b/chat/ChannelTagView.vue
@@ -1,11 +1,14 @@
 <template>
-    <a href="#" @click.prevent="joinChannel" :disabled="channel && channel.isJoined"><span class="fa fa-hashtag"></span>{{displayText}}</a>
+    <a href="#" @click.prevent="joinChannel()" :disabled="channel && channel.isJoined">
+        <span class="fa fa-hashtag"></span>
+        <template v-if="channel">{{channel.name}}<span class="bbcode-pseudo"> ({{channel.memberCount}})</span></template>
+        <template v-else>{{text}}</template>
+    </a>
 </template>
 
 <script lang="ts">
+    import {Component, Hook, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
     import core from './core';
     import {Channel} from './interfaces';
 
@@ -16,6 +19,7 @@
         @Prop({required: true})
         readonly text!: string;
 
+        @Hook('mounted')
         mounted(): void {
             core.channels.requestChannelsIfNeeded(300000);
         }
@@ -23,10 +27,8 @@
         joinChannel(): void {
             if(this.channel === undefined || !this.channel.isJoined)
                 core.channels.join(this.id);
-        }
-
-        get displayText(): string {
-            return this.channel !== undefined ? `${this.channel.name} (${this.channel.memberCount})` : this.text;
+            const channel = core.conversations.byKey(`#${this.id}`);
+            if(channel !== undefined) channel.show();
         }
 
         get channel(): Channel.ListItem | undefined {
diff --git a/chat/CharacterSearch.vue b/chat/CharacterSearch.vue
index ffbe8fd..303785b 100644
--- a/chat/CharacterSearch.vue
+++ b/chat/CharacterSearch.vue
@@ -1,5 +1,5 @@
 <template>
-    <modal :action="l('characterSearch.action')" @submit.prevent="submit" dialogClass="w-100"
+    <modal :action="l('characterSearch.action')" @submit.prevent="submit()" dialogClass="w-100"
         :buttonText="results ? l('characterSearch.again') : undefined" class="character-search">
         <div v-if="options && !results">
             <div v-show="error" class="alert alert-danger">{{error}}</div>
@@ -7,7 +7,7 @@
                 :title="l('characterSearch.kinks')" :filterFunc="filterKink" :options="options.kinks">
                 <template slot-scope="s">{{s.option.name}}</template>
             </filterable-select>
-            <filterable-select v-for="item in ['genders', 'orientations', 'languages', 'furryprefs', 'roles', 'positions']" :multiple="true"
+            <filterable-select v-for="item in listItems" :multiple="true"
                 v-model="data[item]" :placeholder="l('filter')" :title="l('characterSearch.' + item)" :options="options[item]" :key="item">
             </filterable-select>
         </div>
@@ -26,8 +26,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Hook} from '@f-list/vue-ts';
     import Axios from 'axios';
-    import Component from 'vue-class-component';
     import CustomDialog from '../components/custom_dialog';
     import FilterableSelect from '../components/FilterableSelect.vue';
     import Modal from '../components/Modal.vue';
@@ -39,7 +39,7 @@
     import UserView from './user_view';
 
     type Options = {
-        kinks: {id: number, name: string, description: string}[],
+        kinks: Kink[],
         listitems: {id: string, name: string, value: string}[]
     };
 
@@ -55,35 +55,30 @@
         return 0;
     }
 
+    interface Data {
+        kinks: Kink[]
+        genders: string[]
+        orientations: string[]
+        languages: string[]
+        furryprefs: string[]
+        roles: string[]
+        positions: string[]
+    }
+
     @Component({
         components: {modal: Modal, user: UserView, 'filterable-select': FilterableSelect, bbcode: BBCodeView}
     })
     export default class CharacterSearch extends CustomDialog {
-        //tslint:disable:no-null-keyword
         l = l;
         kinksFilter = '';
         error = '';
-        results: Character[] | null = null;
+        results: Character[] | undefined;
         characterImage = characterImage;
-        options: {
-            kinks: Kink[]
-            genders: string[]
-            orientations: string[]
-            languages: string[]
-            furryprefs: string[]
-            roles: string[]
-            positions: string[]
-        } | null = null;
-        data: {[key: string]: (string | Kink)[]} = {
-            kinks: <Kink[]>[],
-            genders: <string[]>[],
-            orientations: <string[]>[],
-            languages: <string[]>[],
-            furryprefs: <string[]>[],
-            roles: <string[]>[],
-            positions: <string[]>[]
-        };
+        options!: Data;
+        data: Data = {kinks: [], genders: [], orientations: [], languages: [], furryprefs: [], roles: [], positions: []};
+        listItems: ReadonlyArray<keyof Data> = ['genders', 'orientations', 'languages', 'furryprefs', 'roles', 'positions'];
 
+        @Hook('created')
         async created(): Promise<void> {
             if(options === undefined)
                 options = <Options | undefined>(await Axios.get('https://www.f-list.net/json/api/mapping-list.php')).data;
@@ -99,6 +94,7 @@
             });
         }
 
+        @Hook('mounted')
         mounted(): void {
             core.connection.onMessage('ERR', (data) => {
                 switch(data.number) {
@@ -129,15 +125,17 @@
         }
 
         submit(): void {
-            if(this.results !== null) {
-                this.results = null;
+            if(this.results !== undefined) {
+                this.results = undefined;
                 return;
             }
             this.error = '';
             const data: Connection.ClientCommands['FKS'] & {[key: string]: (string | number)[]} = {kinks: []};
-            for(const key in this.data)
-                if(this.data[key].length > 0)
-                    data[key] = key === 'kinks' ? (<Kink[]>this.data[key]).map((x) => x.id) : (<string[]>this.data[key]);
+            for(const key in this.data) {
+                const item = this.data[<keyof Data>key];
+                if(item.length > 0)
+                    data[key] = key === 'kinks' ? (<Kink[]>item).map((x) => x.id) : (<string[]>item);
+            }
             core.connection.send('FKS', data);
         }
     }
diff --git a/chat/Chat.vue b/chat/Chat.vue
index e419604..ebd65de 100644
--- a/chat/Chat.vue
+++ b/chat/Chat.vue
@@ -4,7 +4,7 @@
             <div class="alert alert-danger" v-show="error">{{error}}</div>
             <h3 class="card-header" style="margin-top:0;display:flex">
                 {{l('title')}}
-                <a href="#" @click.prevent="$refs['logsDialog'].show()" class="btn" style="flex:1;text-align:right">
+                <a href="#" @click.prevent="showLogs()" class="btn" style="flex:1;text-align:right">
                     <span class="fa fa-file-alt"></span> <span class="btn-text">{{l('logs.title')}}</span>
                 </a>
             </h3>
@@ -32,9 +32,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Hook, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
     import Modal from '../components/Modal.vue';
     import Channels from '../fchat/channels';
     import Characters from '../fchat/characters';
@@ -46,7 +45,7 @@
     import l from './localize';
     import Logs from './Logs.vue';
 
-    type BBCodeNode = Node & {bbcodeTag?: string, bbcodeParam?: string, bbcodeHide?: boolean};
+    type BBCodeNode = Node & {bbcodeTag?: string, bbcodeParam?: string};
 
     function copyNode(str: string, node: BBCodeNode, end: Node, range: Range, flags: {endFound?: true}): string {
         if(node === end) flags.endFound = true;
@@ -54,7 +53,7 @@
             str = `[${node.bbcodeTag}${node.bbcodeParam !== undefined ? `=${node.bbcodeParam}` : ''}]${str}[/${node.bbcodeTag}]`;
         if(node.nextSibling !== null && !flags.endFound) {
             if(node instanceof HTMLElement && getComputedStyle(node).display === 'block') str += '\r\n';
-            str += scanNode(node.nextSibling!, end, range, flags);
+            str += scanNode(node.nextSibling, end, range, flags);
         }
         if(node.parentElement === null) return str;
         return copyNode(str, node.parentNode!, end, range, flags);
@@ -62,7 +61,7 @@
 
     function scanNode(node: BBCodeNode, end: Node, range: Range, flags: {endFound?: true}, hide?: boolean): string {
         let str = '';
-        hide = hide || node.bbcodeHide;
+        hide = hide || node instanceof HTMLElement && node.classList.contains('bbcode-pseudo');
         if(node === end) flags.endFound = true;
         if(node.bbcodeTag !== undefined) str += `[${node.bbcodeTag}${node.bbcodeParam !== undefined ? `=${node.bbcodeParam}` : ''}]`;
         if(node instanceof Text) str += node === range.endContainer ? node.nodeValue!.substr(0, range.endOffset) : node.nodeValue;
@@ -91,6 +90,7 @@
         l = l;
         copyPlain = false;
 
+        @Hook('mounted')
         mounted(): void {
             document.title = l('title', core.connection.character);
             document.addEventListener('copy', ((e: ClipboardEvent) => {
@@ -102,10 +102,11 @@
                 if(selection === null || selection.isCollapsed) return;
                 const range = selection.getRangeAt(0);
                 let start = range.startContainer, end = range.endContainer;
-                let startValue: string;
+                let startValue = '';
                 if(start instanceof HTMLElement) {
                     start = start.childNodes[range.startOffset];
-                    startValue = start instanceof HTMLImageElement ? start.alt : scanNode(start.firstChild!, end, range, {});
+                    if(<Node | undefined>start === undefined) start = range.startContainer;
+                    else startValue = start instanceof HTMLImageElement ? start.alt : scanNode(start.firstChild!, end, range, {});
                 } else
                     startValue = start.nodeValue!.substring(range.startOffset, start === range.endContainer ? range.endOffset : undefined);
                 if(end instanceof HTMLElement && range.endOffset > 0) end = end.childNodes[range.endOffset - 1];
@@ -157,6 +158,10 @@
             (<Modal>this.$refs['reconnecting']).hide();
         }
 
+        showLogs(): void {
+            (<Logs>this.$refs['logsDialog']).show();
+        }
+
         async connect(): Promise<void> {
             this.connecting = true;
             await core.notifications.initSounds(['attention', 'login', 'logout', 'modalert', 'newnote']);
diff --git a/chat/ChatView.vue b/chat/ChatView.vue
index 0c97ae3..0b3f014 100644
--- a/chat/ChatView.vue
+++ b/chat/ChatView.vue
@@ -1,24 +1,23 @@
 <template>
-    <div style="height:100%; display: flex; position: relative;" id="chatView" @click="$refs['userMenu'].handleEvent($event)"
-        @contextmenu="$refs['userMenu'].handleEvent($event)" @touchstart.passive="$refs['userMenu'].handleEvent($event)"
-        @touchend="$refs['userMenu'].handleEvent($event)">
+    <div style="height:100%; display: flex; position: relative;" id="chatView" @click="userMenuHandle" @contextmenu="userMenuHandle" @touchstart.passive="userMenuHandle"
+        @touchend="userMenuHandle">
         <sidebar id="sidebar" :label="l('chat.menu')" icon="fa-bars">
             <img :src="characterImage(ownCharacter.name)" v-if="showAvatars" style="float:left;margin-right:5px;width:60px"/>
             <a target="_blank" :href="ownCharacterLink" class="btn" style="margin-right:5px">{{ownCharacter.name}}</a>
-            <a href="#" @click.prevent="logOut" class="btn"><i class="fas fa-sign-out-alt"></i>{{l('chat.logout')}}</a><br/>
+            <a href="#" @click.prevent="logOut()" class="btn"><i class="fas fa-sign-out-alt"></i>{{l('chat.logout')}}</a><br/>
             <div>
                 {{l('chat.status')}}
-                <a href="#" @click.prevent="$refs['statusDialog'].show()" class="btn">
+                <a href="#" @click.prevent="showStatus()" class="btn">
                     <span class="fas fa-fw" :class="getStatusIcon(ownCharacter.status)"></span>{{l('status.' + ownCharacter.status)}}
                 </a>
             </div>
             <div style="clear:both">
-                <a href="#" @click.prevent="$refs['searchDialog'].show()" class="btn"><span class="fas fa-search"></span>
+                <a href="#" @click.prevent="showSearch()" class="btn"><span class="fas fa-search"></span>
                     {{l('characterSearch.open')}}</a>
             </div>
-            <div><a href="#" @click.prevent="$refs['settingsDialog'].show()" class="btn"><span class="fas fa-cog"></span>
+            <div><a href="#" @click.prevent="showSettings()" class="btn"><span class="fas fa-cog"></span>
                 {{l('settings.open')}}</a></div>
-            <div><a href="#" @click.prevent="$refs['recentDialog'].show()" class="btn"><span class="fas fa-history"></span>
+            <div><a href="#" @click.prevent="showRecent()" class="btn"><span class="fas fa-history"></span>
                 {{l('chat.recentConversations')}}</a></div>
             <div class="list-group conversation-nav">
                 <a :class="getClasses(conversations.consoleTab)" href="#" @click.prevent="conversations.consoleTab.show()"
@@ -47,7 +46,7 @@
                     </div>
                 </a>
             </div>
-            <a href="#" @click.prevent="$refs['channelsDialog'].show()" class="btn"><span class="fas fa-list"></span>
+            <a href="#" @click.prevent="showChannels()" class="btn"><span class="fas fa-list"></span>
                 {{l('chat.channels')}}</a>
             <div class="list-group conversation-nav" ref="channelConversations">
                 <a v-for="conversation in conversations.channelConversations" href="#" @click.prevent="conversation.show()"
@@ -62,7 +61,7 @@
                 </a>
             </div>
         </sidebar>
-        <div style="width: 100%; display:flex; flex-direction:column;">
+        <div style="display:flex;flex-direction:column;flex:1;min-width:0">
             <div id="quick-switcher" class="list-group">
                 <a :class="getClasses(conversations.consoleTab)" href="#" @click.prevent="conversations.consoleTab.show()"
                     class="list-group-item list-group-item-action">
@@ -95,10 +94,10 @@
 </template>
 
 <script lang="ts">
+    import {Component, Hook} from '@f-list/vue-ts';
     //tslint:disable-next-line:no-require-imports
     import Sortable = require('sortablejs');
     import Vue from 'vue';
-    import Component from 'vue-class-component';
     import {Keys} from '../keys';
     import ChannelList from './ChannelList.vue';
     import CharacterSearch from './CharacterSearch.vue';
@@ -139,22 +138,23 @@
         focusListener!: () => void;
         blurListener!: () => void;
 
+        @Hook('mounted')
         mounted(): void {
             this.keydownListener = (e: KeyboardEvent) => this.onKeyDown(e);
             window.addEventListener('keydown', this.keydownListener);
             this.setFontSize(core.state.settings.fontSize);
-            Sortable.create(this.$refs['privateConversations'], {
+            Sortable.create(<HTMLElement>this.$refs['privateConversations'], {
                 animation: 50,
-                onEnd: async(e: {oldIndex: number, newIndex: number}) => {
+                onEnd: async(e) => {
                     if(e.oldIndex === e.newIndex) return;
-                    return core.conversations.privateConversations[e.oldIndex].sort(e.newIndex);
+                    return core.conversations.privateConversations[e.oldIndex!].sort(e.newIndex!);
                 }
             });
-            Sortable.create(this.$refs['channelConversations'], {
+            Sortable.create(<HTMLElement>this.$refs['channelConversations'], {
                 animation: 50,
-                onEnd: async(e: {oldIndex: number, newIndex: number}) => {
+                onEnd: async(e) => {
                     if(e.oldIndex === e.newIndex) return;
-                    return core.conversations.channelConversations[e.oldIndex].sort(e.newIndex);
+                    return core.conversations.channelConversations[e.oldIndex!].sort(e.newIndex!);
                 }
             });
             const ownCharacter = core.characters.ownCharacter;
@@ -175,7 +175,7 @@
             window.addEventListener('blur', this.blurListener = () => {
                 core.notifications.isInBackground = true;
                 if(idleTimer !== undefined) clearTimeout(idleTimer);
-                if(core.state.settings.idleTimer > 0)
+                if(core.state.settings.idleTimer > 0 && core.characters.ownCharacter.status !== 'dnd')
                     idleTimer = window.setTimeout(() => {
                         lastUpdate = Date.now();
                         idleStatus = {status: ownCharacter.status, statusmsg: ownCharacter.statusText};
@@ -195,6 +195,7 @@
             });
         }
 
+        @Hook('destroyed')
         destroyed(): void {
             window.removeEventListener('keydown', this.keydownListener);
             window.removeEventListener('focus', this.focusListener);
@@ -204,7 +205,7 @@
         needsReply(conversation: Conversation): boolean {
             if(!core.state.settings.showNeedsReply) return false;
             for(let i = conversation.messages.length - 1; i >= 0; --i) {
-                const sender = conversation.messages[i].sender;
+                const sender = (<Partial<Conversation.ChatMessage>>conversation.messages[i]).sender;
                 if(sender !== undefined)
                     return sender !== core.characters.ownCharacter;
             }
@@ -268,6 +269,30 @@
             if(confirm(l('chat.confirmLeave'))) core.connection.close();
         }
 
+        showSettings(): void {
+            (<SettingsView>this.$refs['settingsDialog']).show();
+        }
+
+        showSearch(): void {
+            (<CharacterSearch>this.$refs['searchDialog']).show();
+        }
+
+        showRecent(): void {
+            (<RecentConversations>this.$refs['recentDialog']).show();
+        }
+
+        showChannels(): void {
+            (<ChannelList>this.$refs['channelsDialog']).show();
+        }
+
+        showStatus(): void {
+            (<StatusSwitcher>this.$refs['statusDialog']).show();
+        }
+
+        userMenuHandle(e: MouseEvent | TouchEvent): void {
+            (<UserMenu>this.$refs['userMenu']).handleEvent(e);
+        }
+
         get showAvatars(): boolean {
             return core.state.settings.showAvatars;
         }
diff --git a/chat/CommandHelp.vue b/chat/CommandHelp.vue
index 85cdbb6..eb9afcb 100644
--- a/chat/CommandHelp.vue
+++ b/chat/CommandHelp.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script lang="ts">
-    import Component from 'vue-class-component';
+    import {Component, Hook} from '@f-list/vue-ts';
     import CustomDialog from '../components/custom_dialog';
     import Modal from '../components/Modal.vue';
     import core from './core';
@@ -55,6 +55,7 @@
             return this.commands.filter((x) => filter.test(x.name));
         }
 
+        @Hook('mounted')
         mounted(): void {
             const permissions = core.connection.vars.permissions;
             for(const key in commands) {
diff --git a/chat/ConversationSettings.vue b/chat/ConversationSettings.vue
index f433c4f..12b2726 100644
--- a/chat/ConversationSettings.vue
+++ b/chat/ConversationSettings.vue
@@ -1,5 +1,5 @@
 <template>
-    <modal :action="l('conversationSettings.action', conversation.name)" @submit="submit" ref="dialog" @close="init()" dialogClass="w-100"
+    <modal :action="l('conversationSettings.action', conversation.name)" @submit="submit" ref="dialog" @open="load()" dialogClass="w-100"
         :buttonText="l('conversationSettings.save')">
         <div class="form-group">
             <label class="control-label" :for="'notify' + conversation.key">{{l('conversationSettings.notify')}}</label>
@@ -39,8 +39,7 @@
 </template>
 
 <script lang="ts">
-    import Component from 'vue-class-component';
-    import {Prop, Watch} from 'vue-property-decorator';
+    import {Component, Prop} from '@f-list/vue-ts';
     import CustomDialog from '../components/custom_dialog';
     import Modal from '../components/Modal.vue';
     import {Conversation} from './interfaces';
@@ -60,23 +59,13 @@
         joinMessages!: Conversation.Setting;
         defaultHighlights!: boolean;
 
-        constructor() {
-            super();
-            this.init();
-        }
-
-        init = function(this: ConversationSettings): void {
+        load(): void {
             const settings = this.conversation.settings;
             this.notify = settings.notify;
             this.highlight = settings.highlight;
             this.highlightWords = settings.highlightWords.join(',');
             this.joinMessages = settings.joinMessages;
             this.defaultHighlights = settings.defaultHighlights;
-        };
-
-        @Watch('conversation')
-        conversationChanged(): void {
-            this.init();
         }
 
         submit(): void {
diff --git a/chat/ConversationView.vue b/chat/ConversationView.vue
index f9f2ae7..ad26b29 100644
--- a/chat/ConversationView.vue
+++ b/chat/ConversationView.vue
@@ -1,17 +1,17 @@
 <template>
     <div style="height:100%;display:flex;flex-direction:column;flex:1;margin:0 5px;position:relative" id="conversation">
-        <div style="display:flex" v-if="conversation.character" class="header">
+        <div style="display:flex" v-if="isPrivate(conversation)" class="header">
             <img :src="characterImage" style="height:60px;width:60px;margin-right:10px" v-if="settings.showAvatars"/>
             <div style="flex:1;position:relative;display:flex;flex-direction:column">
                 <div>
                     <user :character="conversation.character"></user>
-                    <a href="#" @click.prevent="$refs['logsDialog'].show()" class="btn">
+                    <a href="#" @click.prevent="showLogs()" class="btn">
                         <span class="fa fa-file-alt"></span> <span class="btn-text">{{l('logs.title')}}</span>
                     </a>
-                    <a href="#" @click.prevent="$refs['settingsDialog'].show()" class="btn">
+                    <a href="#" @click.prevent="showSettings()" class="btn">
                         <span class="fa fa-cog"></span> <span class="btn-text">{{l('conversationSettings.title')}}</span>
                     </a>
-                    <a href="#" @click.prevent="reportDialog.report();" class="btn">
+                    <a href="#" @click.prevent="reportDialog.report()" class="btn">
                         <span class="fa fa-exclamation-triangle"></span><span class="btn-text">{{l('chat.report')}}</span></a>
                 </div>
                 <div style="overflow:auto;max-height:50px">
@@ -20,7 +20,7 @@
                 </div>
             </div>
         </div>
-        <div v-else-if="conversation.channel" class="header">
+        <div v-else-if="isChannel(conversation)" class="header">
             <div style="display: flex; align-items: center;">
                 <div style="flex: 1;">
                     <span v-show="conversation.channel.id.substr(0, 4) !== 'adh-'" class="fa fa-star" :title="l('channel.official')"
@@ -30,33 +30,33 @@
                         <span class="fa" :class="{'fa-chevron-down': !descriptionExpanded, 'fa-chevron-up': descriptionExpanded}"></span>
                         <span class="btn-text">{{l('channel.description')}}</span>
                     </a>
-                    <a href="#" @click.prevent="$refs['manageDialog'].show()" v-show="isChannelMod" class="btn">
+                    <a href="#" @click.prevent="showManage()" v-show="isChannelMod" class="btn">
                         <span class="fa fa-edit"></span> <span class="btn-text">{{l('manageChannel.open')}}</span>
                     </a>
-                    <a href="#" @click.prevent="$refs['logsDialog'].show()" class="btn">
+                    <a href="#" @click.prevent="showLogs()" class="btn">
                         <span class="fa fa-file-alt"></span> <span class="btn-text">{{l('logs.title')}}</span>
                     </a>
-                    <a href="#" @click.prevent="$refs['settingsDialog'].show()" class="btn">
+                    <a href="#" @click.prevent="showSettings()" class="btn">
                         <span class="fa fa-cog"></span> <span class="btn-text">{{l('conversationSettings.title')}}</span>
                     </a>
-                    <a href="#" @click.prevent="reportDialog.report();" class="btn">
+                    <a href="#" @click.prevent="reportDialog.report()" class="btn">
                         <span class="fa fa-exclamation-triangle"></span><span class="btn-text">{{l('chat.report')}}</span></a>
                 </div>
                 <ul class="nav nav-pills mode-switcher">
                     <li v-for="mode in modes" class="nav-item">
-                        <a :class="{active: conversation.mode == mode, disabled: conversation.channel.mode != 'both'}"
+                        <a :class="isChannel(conversation) ? {active: conversation.mode == mode, disabled: conversation.channel.mode != 'both'} : undefined"
                             class="nav-link" href="#" @click.prevent="setMode(mode)">{{l('channel.mode.' + mode)}}</a>
                     </li>
                 </ul>
             </div>
             <div style="z-index:5;position:absolute;left:0;right:0;max-height:60%;overflow:auto"
-                :style="'display:' + (descriptionExpanded ? 'block' : 'none')" class="bg-solid-text border-bottom">
+                :style="{display: descriptionExpanded ? 'block' : 'none'}" class="bg-solid-text border-bottom">
                 <bbcode :text="conversation.channel.description"></bbcode>
             </div>
         </div>
         <div v-else class="header" style="display:flex;align-items:center">
             <h4>{{l('chat.consoleTab')}}</h4>
-            <a href="#" @click.prevent="$refs['logsDialog'].show()" class="btn">
+            <a href="#" @click.prevent="showLogs()" class="btn">
                 <span class="fa fa-file-alt"></span> <span class="btn-text">{{l('logs.title')}}</span>
             </a>
         </div>
@@ -64,31 +64,32 @@
             <div class="input-group-prepend">
                 <div class="input-group-text"><span class="fas fa-search"></span></div>
             </div>
-            <input v-model="searchInput" @keydown.esc="hideSearch" @keypress="lastSearchInput = Date.now()"
+            <input v-model="searchInput" @keydown.esc="hideSearch()" @keypress="lastSearchInput = Date.now()"
                 :placeholder="l('chat.search')" ref="searchField" class="form-control"/>
             <a class="btn btn-sm btn-light" style="position:absolute;right:5px;top:50%;transform:translateY(-50%);line-height:0;z-index:10"
                 @click="hideSearch"><i class="fas fa-times"></i></a>
         </div>
-        <div class="border-top messages" :class="'messages-' + conversation.mode" ref="messages" @scroll="onMessagesScroll"
-            style="flex:1;overflow:auto;margin-top:2px;position:relative">
+        <div class="border-top messages" :class="isChannel(conversation) ? 'messages-' + conversation.mode : undefined" ref="messages"
+            @scroll="onMessagesScroll" style="flex:1;overflow:auto;margin-top:2px">
             <template v-for="message in messages">
-                <message-view :message="message" :channel="conversation.channel" :key="message.id"
+                <message-view :message="message" :channel="isChannel(conversation) ? conversation.channel : undefined" :key="message.id"
                     :classes="message == conversation.lastRead ? 'last-read' : ''">
                 </message-view>
-                <span v-if="message.sfc && message.sfc.action == 'report'" :key="'r' + message.id">
+                <span v-if="hasSFC(message) && message.sfc.action === 'report'" :key="'r' + message.id">
                     <a :href="'https://www.f-list.net/fchat/getLog.php?log=' + message.sfc.logid"
                         v-if="message.sfc.logid" target="_blank">{{l('events.report.viewLog')}}</a>
                     <span v-else>{{l('events.report.noLog')}}</span>
                     <span v-show="!message.sfc.confirmed">
-                        | <a href="#" @click.prevent="acceptReport(message.sfc)">{{l('events.report.confirm')}}</a>
+                        | <a href="#" @click.prevent="message.sfc.action === 'report' && acceptReport(message.sfc)">{{l('events.report.confirm')}}</a>
                     </span>
                 </span>
             </template>
         </div>
         <bbcode-editor v-model="conversation.enteredText" @keydown="onKeyDown" :extras="extraButtons" @input="keepScroll"
-            :classes="'form-control chat-text-box' + (conversation.isSendingAds ? ' ads-text-box' : '')" :hasToolbar="settings.bbCodeBar"
-            ref="textBox" style="position:relative;margin-top:5px" :maxlength="conversation.maxMessageLength">
-            <span v-if="conversation.typingStatus && conversation.typingStatus !== 'clear'" class="chat-info-text">
+            :classes="'form-control chat-text-box' + (isChannel(conversation) && conversation.isSendingAds ? ' ads-text-box' : '')"
+            :hasToolbar="settings.bbCodeBar" ref="textBox" style="position:relative;margin-top:5px"
+            :maxlength="isChannel(conversation) || isPrivate(conversation) ? conversation.maxMessageLength : undefined">
+            <span v-if="isPrivate(conversation) && conversation.typingStatus !== 'clear'" class="chat-info-text">
                 {{l('chat.typing.' + conversation.typingStatus, conversation.name)}}
             </span>
             <div v-show="conversation.infoText" class="chat-info-text">
@@ -100,10 +101,10 @@
                 <span class="redText" style="flex:1;margin-left:5px">{{conversation.errorText}}</span>
             </div>
             <div class="bbcode-editor-controls">
-                <div v-show="conversation.maxMessageLength" style="margin-right:5px">
+                <div v-if="isChannel(conversation) || isPrivate(conversation)" style="margin-right:5px">
                     {{getByteLength(conversation.enteredText)}} / {{conversation.maxMessageLength}}
                 </div>
-                <ul class="nav nav-pills send-ads-switcher" v-if="conversation.channel"
+                <ul class="nav nav-pills send-ads-switcher" v-if="isChannel(conversation)"
                     style="position:relative;z-index:10;margin-right:5px">
                     <li class="nav-item">
                         <a href="#" :class="{active: !conversation.isSendingAds, disabled: conversation.channel.mode != 'both'}"
@@ -120,14 +121,13 @@
         <command-help ref="helpDialog"></command-help>
         <settings ref="settingsDialog" :conversation="conversation"></settings>
         <logs ref="logsDialog" :conversation="conversation"></logs>
-        <manage-channel ref="manageDialog" :channel="conversation.channel" v-if="conversation.channel"></manage-channel>
+        <manage-channel ref="manageDialog" v-if="isChannel(conversation)" :channel="conversation.channel"></manage-channel>
     </div>
 </template>
 
 <script lang="ts">
+    import {Component, Hook, Prop, Watch} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop, Watch} from 'vue-property-decorator';
     import {EditorButton, EditorSelection} from '../bbcode/editor';
     import {isShowing as anyDialogsShown} from '../components/Modal.vue';
     import {Keys} from '../keys';
@@ -177,7 +177,10 @@
         ignoreScroll = false;
         adCountdown = 0;
         adsMode = l('channel.mode.ads');
+        isChannel = Conversation.isChannel;
+        isPrivate = Conversation.isPrivate;
 
+        @Hook('mounted')
         mounted(): void {
             this.extraButtons = [{
                 title: 'Help\n\nClick this button for a quick overview of slash commands.',
@@ -218,6 +221,7 @@
             });
         }
 
+        @Hook('destroyed')
         destroyed(): void {
             window.removeEventListener('resize', this.resizeHandler);
             window.removeEventListener('keydown', this.keydownHandler);
@@ -234,7 +238,7 @@
             return core.conversations.selectedConversation;
         }
 
-        get messages(): ReadonlyArray<Conversation.Message> {
+        get messages(): ReadonlyArray<Conversation.Message | Conversation.SFCMessage> {
             if(this.search === '') return this.conversation.messages;
             const filter = new RegExp(this.search.replace(/[^\w]/gi, '\\$&'), 'i');
             return this.conversation.messages.filter((x) => filter.test(x.text));
@@ -361,6 +365,22 @@
             }
         }
 
+        showLogs(): void {
+            (<Logs>this.$refs['logsDialog']).show();
+        }
+
+        showSettings(): void {
+            (<ConversationSettings>this.$refs['settingsDialog']).show();
+        }
+
+        showManage(): void {
+            (<ManageChannel>this.$refs['manageDialog']).show();
+        }
+
+        hasSFC(message: Conversation.Message): message is Conversation.SFCMessage {
+            return (<Partial<Conversation.SFCMessage>>message).sfc !== undefined;
+        }
+
         get characterImage(): string {
             return characterImage(this.conversation.name);
         }
diff --git a/chat/Logs.vue b/chat/Logs.vue
index 342efb9..55a70cc 100644
--- a/chat/Logs.vue
+++ b/chat/Logs.vue
@@ -38,7 +38,7 @@
             <label for="date" class="col-sm-2 col-form-label">{{l('logs.date')}}</label>
             <div class="col-sm-8 col-10 col-xl-9">
                 <select class="form-control" v-model="selectedDate" id="date" @change="loadMessages">
-                    <option :value="null">{{l('logs.allDates')}}</option>
+                    <option :value="undefined">{{l('logs.allDates')}}</option>
                     <option v-for="date in dates" :value="date.getTime()">{{formatDate(date)}}</option>
                 </select>
             </div>
@@ -47,8 +47,8 @@
                     class="fa fa-download"></span></button>
             </div>
         </div>
-        <div class="messages-both" style="overflow:auto" ref="messages" tabindex="-1" @scroll="onMessagesScroll">
-            <message-view v-for="message in filteredMessages" :message="message" :key="message.id"></message-view>
+        <div class="messages messages-both" style="overflow:auto;overscroll-behavior:none;" ref="messages" tabindex="-1" @scroll="onMessagesScroll">
+            <message-view v-for="message in displayedMessages" :message="message" :key="message.id" :logs="true"></message-view>
         </div>
         <div class="input-group" style="flex-shrink:0">
             <div class="input-group-prepend">
@@ -60,9 +60,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Hook, Prop, Watch} from '@f-list/vue-ts';
     import {format} from 'date-fns';
-    import Component from 'vue-class-component';
-    import {Prop, Watch} from 'vue-property-decorator';
     import CustomDialog from '../components/custom_dialog';
     import FilterableSelect from '../components/FilterableSelect.vue';
     import Modal from '../components/Modal.vue';
@@ -86,13 +85,12 @@
         components: {modal: Modal, 'message-view': MessageView, 'filterable-select': FilterableSelect}
     })
     export default class Logs extends CustomDialog {
-        //tslint:disable:no-null-keyword
         @Prop()
         readonly conversation?: Conversation;
-        selectedConversation: LogInterface.Conversation | null = null;
-        dates: ReadonlyArray<Date> = [];
-        selectedDate: string | null = null;
         conversations: LogInterface.Conversation[] = [];
+        selectedConversation: LogInterface.Conversation | undefined;
+        dates: ReadonlyArray<Date> = [];
+        selectedDate: string | undefined;
         l = l;
         filter = '';
         messages: ReadonlyArray<Conversation.Message> = [];
@@ -103,6 +101,14 @@
         showFilters = true;
         canZip = core.logs.canZip;
         dateOffset = -1;
+        windowStart = 0;
+        windowEnd = 0;
+        resizeListener = async() => this.onMessagesScroll();
+
+        get displayedMessages(): ReadonlyArray<Conversation.Message> {
+            if(this.selectedDate !== undefined) return this.filteredMessages;
+            return this.filteredMessages.slice(this.windowStart, this.windowEnd);
+        }
 
         get filteredMessages(): ReadonlyArray<Conversation.Message> {
             if(this.filter.length === 0) return this.messages;
@@ -111,35 +117,42 @@
                 (x) => filter.test(x.text) || x.type !== Conversation.Message.Type.Event && filter.test(x.sender.name));
         }
 
+        @Hook('mounted')
         async mounted(): Promise<void> {
             this.characters = await core.logs.getAvailableCharacters();
-            await this.loadCharacter();
-            return this.conversationChanged();
+            window.addEventListener('resize', this.resizeListener);
+        }
+
+        @Hook('beforeDestroy')
+        beforeDestroy(): void {
+            window.removeEventListener('resize', this.resizeListener);
         }
 
         async loadCharacter(): Promise<void> {
+            this.selectedConversation = undefined;
+            return this.loadConversations();
+        }
+
+        async loadConversations(): Promise<void> {
             if(this.selectedCharacter === '') return;
             this.conversations = (await core.logs.getConversations(this.selectedCharacter)).slice();
             this.conversations.sort((x, y) => (x.name < y.name ? -1 : (x.name > y.name ? 1 : 0)));
-            this.selectedConversation = null;
         }
 
-        filterConversation(filter: RegExp, conversation: {key: string, name: string}): boolean {
+        async loadDates(): Promise<void> {
+            this.dates = this.selectedConversation === undefined ? [] :
+                (await core.logs.getLogDates(this.selectedCharacter, this.selectedConversation.key)).slice().reverse();
+        }
+
+        filterConversation(filter: RegExp, conversation: LogInterface.Conversation): boolean {
             return filter.test(conversation.name);
         }
 
-        @Watch('conversation')
-        async conversationChanged(): Promise<void> {
-            if(this.conversation === undefined) return;
-            //tslint:disable-next-line:strict-boolean-expressions
-            this.selectedConversation = this.conversations.filter((x) => x.key === this.conversation!.key)[0] || null;
-        }
-
         @Watch('selectedConversation')
-        async conversationSelected(): Promise<void> {
-            this.dates = this.selectedConversation === null ? [] :
-                (await core.logs.getLogDates(this.selectedCharacter, this.selectedConversation.key)).slice().reverse();
-            this.selectedDate = null;
+        async conversationSelected(oldValue: Conversation | undefined, newValue: Conversation | undefined): Promise<void> {
+            if(oldValue !== undefined && newValue !== undefined && oldValue.key === newValue.key) return;
+            await this.loadDates();
+            this.selectedDate = undefined;
             this.dateOffset = -1;
             this.filter = '';
             await this.loadMessages();
@@ -147,9 +160,18 @@
 
         @Watch('filter')
         onFilterChanged(): void {
+            if(this.selectedDate === undefined) {
+                this.windowEnd = this.filteredMessages.length;
+                this.windowStart = this.windowEnd - 50;
+            }
             this.$nextTick(async() => this.onMessagesScroll());
         }
 
+        @Watch('showFilters')
+        async onFilterToggle(): Promise<void> {
+            return this.onMessagesScroll();
+        }
+
         download(file: string, logs: string): void {
             const a = document.createElement('a');
             a.href = logs;
@@ -164,13 +186,13 @@
         }
 
         downloadDay(): void {
-            if(this.selectedConversation === null || this.selectedDate === null || this.messages.length === 0) return;
+            if(this.selectedConversation === undefined || this.selectedDate === undefined || this.messages.length === 0) return;
             const name = `${this.selectedConversation.name}-${formatDate(new Date(this.selectedDate))}.txt`;
             this.download(name, `data:${encodeURIComponent(name)},${encodeURIComponent(getLogs(this.messages))}`);
         }
 
         async downloadConversation(): Promise<void> {
-            if(this.selectedConversation === null) return;
+            if(this.selectedConversation === undefined) return;
             const zip = new Zip();
             for(const date of this.dates) {
                 const messages = await core.logs.getLogs(this.selectedCharacter, this.selectedConversation.key, date);
@@ -195,14 +217,17 @@
 
         async onOpen(): Promise<void> {
             if(this.selectedCharacter !== '') {
-                this.conversations = (await core.logs.getConversations(this.selectedCharacter)).slice();
-                this.conversations.sort((x, y) => (x.name < y.name ? -1 : (x.name > y.name ? 1 : 0)));
-                this.dates = this.selectedConversation === null ? [] :
-                    (await core.logs.getLogDates(this.selectedCharacter, this.selectedConversation.key)).slice().reverse();
-                await this.loadMessages();
+                await this.loadConversations();
+                if(this.conversation !== undefined)
+                    this.selectedConversation = this.conversations.filter((x) => x.key === this.conversation!.key)[0];
+                else {
+                    await this.loadDates();
+                    await this.loadMessages();
+                }
             }
             this.keyDownListener = (e) => {
                 if(getKey(e) === Keys.KeyA && (e.ctrlKey || e.metaKey) && !e.altKey && !e.shiftKey) {
+                    if((<HTMLElement>e.target).tagName.toLowerCase() === 'input') return;
                     e.preventDefault();
                     const selection = document.getSelection();
                     if(selection === null) return;
@@ -223,36 +248,69 @@
             window.removeEventListener('keydown', this.keyDownListener!);
         }
 
-        async loadMessages(): Promise<ReadonlyArray<Conversation.Message>> {
-            if(this.selectedConversation === null)
-                return this.messages = [];
-            if(this.selectedDate !== null) {
+        async loadMessages(): Promise<void> {
+            if(this.selectedConversation === undefined) this.messages = [];
+            else if(this.selectedDate !== undefined) {
                 this.dateOffset = -1;
-                return this.messages = await core.logs.getLogs(this.selectedCharacter, this.selectedConversation.key,
-                    new Date(this.selectedDate));
-            }
-            if(this.dateOffset === -1) {
+                this.messages = await core.logs.getLogs(this.selectedCharacter, this.selectedConversation.key, new Date(this.selectedDate));
+            } else if(this.dateOffset === -1) {
                 this.messages = [];
                 this.dateOffset = 0;
-            }
-            this.$nextTick(async() => this.onMessagesScroll());
-            return this.messages;
+                this.windowStart = 0;
+                this.windowEnd = 0;
+                this.lastScroll = -1;
+                this.lockScroll = false;
+                this.$nextTick(async() => this.onMessagesScroll());
+            } else return this.onMessagesScroll();
         }
 
-        async onMessagesScroll(): Promise<void> {
+        lockScroll = false;
+        lastScroll = -1;
+
+        async onMessagesScroll(ev?: Event): Promise<void> {
             const list = <HTMLElement | undefined>this.$refs['messages'];
-            if(this.selectedConversation === null || this.selectedDate !== null || list === undefined || list.scrollTop > 15
-                || !this.dialog.isShown || this.dateOffset >= this.dates.length) return;
-            const messages = await core.logs.getLogs(this.selectedCharacter, this.selectedConversation.key,
-                this.dates[this.dateOffset++]);
-            this.messages = messages.concat(this.messages);
-            const noOverflow = list.offsetHeight === list.scrollHeight;
-            const firstMessage = <HTMLElement>list.firstElementChild!;
-            this.$nextTick(() => {
-                if(list.offsetHeight === list.scrollHeight) return this.onMessagesScroll();
-                else if(noOverflow) setTimeout(() => list.scrollTop = list.scrollHeight, 0);
-                else setTimeout(() => list.scrollTop = firstMessage.offsetTop, 0);
-            });
+            if(this.lockScroll) return;
+            if(list === undefined || ev !== undefined && Math.abs(list.scrollTop - this.lastScroll) < 50) return;
+            this.lockScroll = true;
+            function getTop(index: number): number {
+                return (<HTMLElement>list!.children[index]).offsetTop;
+            }
+            while(this.selectedConversation !== undefined && this.selectedDate === undefined && this.dialog.isShown) {
+                const oldHeight = list.scrollHeight, oldTop = list.scrollTop;
+                const oldFirst = this.displayedMessages[0];
+                const oldEnd = this.windowEnd;
+                const length = this.displayedMessages.length;
+                const oldTotal = this.filteredMessages.length;
+                let loaded = false;
+                if(length <= 20 || getTop(20) > list.scrollTop)
+                    this.windowStart -= 50;
+                else if(length > 100 && getTop(100) < list.scrollTop)
+                    this.windowStart += 50;
+                else if(length >= 100 && getTop(length - 100) > list.scrollTop + list.offsetHeight)
+                    this.windowEnd -= 50;
+                else if(getTop(length - 20) < list.scrollTop + list.offsetHeight)
+                    this.windowEnd += 50;
+                if(this.windowStart <= 0 && this.dateOffset < this.dates.length) {
+                    const messages = await core.logs.getLogs(this.selectedCharacter, this.selectedConversation.key,
+                        this.dates[this.dateOffset++]);
+                    this.messages = messages.concat(this.messages);
+                    const addedTotal = this.filteredMessages.length - oldTotal;
+                    this.windowStart += addedTotal;
+                    this.windowEnd += addedTotal;
+                    loaded = true;
+                }
+                this.windowStart = Math.max(this.windowStart, 0);
+                this.windowEnd = Math.min(this.windowEnd, this.filteredMessages.length);
+                if(this.displayedMessages[0] !== oldFirst) {
+                    list.style.overflow = 'hidden';
+                    await this.$nextTick();
+                    list.scrollTop = oldTop + list.scrollHeight - oldHeight;
+                    list.style.overflow = 'auto';
+                } else if(this.windowEnd === oldEnd && !loaded) break;
+                else await this.$nextTick();
+            }
+            this.lastScroll = list.scrollTop;
+            this.lockScroll = false;
         }
     }
 </script>
diff --git a/chat/ManageChannel.vue b/chat/ManageChannel.vue
index b9a0020..52b3b17 100644
--- a/chat/ManageChannel.vue
+++ b/chat/ManageChannel.vue
@@ -38,8 +38,7 @@
 </template>
 
 <script lang="ts">
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
+    import {Component, Prop} from '@f-list/vue-ts';
     import CustomDialog from '../components/custom_dialog';
     import Modal from '../components/Modal.vue';
     import {Editor} from './bbcode';
diff --git a/chat/RecentConversations.vue b/chat/RecentConversations.vue
index cb2c59a..f6f2bb3 100644
--- a/chat/RecentConversations.vue
+++ b/chat/RecentConversations.vue
@@ -1,18 +1,25 @@
 <template>
     <modal :buttons="false" :action="l('chat.recentConversations')" dialogClass="w-100 modal-lg">
-        <div style="display:flex; flex-direction:column; max-height:500px; flex-wrap:wrap;">
-            <div v-for="recent in recentConversations" style="margin: 3px;">
-                <user-view v-if="recent.character" :character="getCharacter(recent.character)"></user-view>
-                <channel-view v-else :id="recent.channel" :text="recent.name"></channel-view>
+        <tabs style="flex-shrink:0;margin-bottom:10px" v-model="selectedTab"
+            :tabs="[l('chat.pms'), l('chat.channels')]"></tabs>
+        <div>
+            <div v-show="selectedTab === '0'" class="recent-conversations">
+                <user-view v-for="recent in recentPrivate" v-if="recent.character"
+                    :key="recent.character" :character="getCharacter(recent.character)"></user-view>
+            </div>
+            <div v-show="selectedTab === '1'" class="recent-conversations">
+                <channel-view v-for="recent in recentChannels" :key="recent.channel" :id="recent.channel"
+                    :text="recent.name"></channel-view>
             </div>
         </div>
     </modal>
 </template>
 
 <script lang="ts">
-    import Component from 'vue-class-component';
+    import {Component} from '@f-list/vue-ts';
     import CustomDialog from '../components/custom_dialog';
     import Modal from '../components/Modal.vue';
+    import Tabs from '../components/tabs';
     import ChannelView from './ChannelTagView.vue';
     import core from './core';
     import {Character, Conversation} from './interfaces';
@@ -20,17 +27,34 @@
     import UserView from './user_view';
 
     @Component({
-        components: {'user-view': UserView, 'channel-view': ChannelView, modal: Modal}
+        components: {'user-view': UserView, 'channel-view': ChannelView, modal: Modal, tabs: Tabs}
     })
     export default class RecentConversations extends CustomDialog {
         l = l;
+        selectedTab = '0';
 
-        get recentConversations(): ReadonlyArray<Conversation.RecentConversation> {
+        get recentPrivate(): ReadonlyArray<Conversation.RecentPrivateConversation> {
             return core.conversations.recent;
         }
 
+        get recentChannels(): ReadonlyArray<Conversation.RecentChannelConversation> {
+            return core.conversations.recentChannels;
+        }
+
         getCharacter(name: string): Character {
             return core.characters.get(name);
         }
     }
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss">
+    .recent-conversations {
+        display: flex;
+        flex-direction: column;
+        max-height: 500px;
+        flex-wrap: wrap;
+        & > * {
+            margin: 3px;
+        }
+    }
+</style>
\ No newline at end of file
diff --git a/chat/ReportDialog.vue b/chat/ReportDialog.vue
index 9069fcb..adf3fd4 100644
--- a/chat/ReportDialog.vue
+++ b/chat/ReportDialog.vue
@@ -1,19 +1,21 @@
 <template>
-    <modal :action="l('chat.report')" @submit.prevent="submit" :disabled="submitting">
+    <modal :action="l('chat.report')" @submit.prevent="submit()" :disabled="submitting" dialogClass="modal-lg">
         <div class="alert alert-danger" v-show="error">{{error}}</div>
-        <h4>{{reporting}}</h4>
-        <span v-show="!character">{{l('chat.report.channel.description')}}</span>
         <div ref="caption"></div>
         <br/>
         <div class="form-group">
-            <label>{{l('chat.report.text')}}</label>
+            <h6>{{l('chat.report.conversation')}}</h6>
+            <p>{{conversation}}</p>
+            <h6>{{l('chat.report.reporting')}}</h6>
+            <p>{{character ? character.name : l('chat.report.general')}}</p>
+            <h6>{{l('chat.report.text')}}</h6>
             <textarea class="form-control" v-model="text"></textarea>
         </div>
     </modal>
 </template>
 
 <script lang="ts">
-    import Component from 'vue-class-component';
+    import {Component, Hook} from '@f-list/vue-ts';
     import CustomDialog from '../components/custom_dialog';
     import Modal from '../components/Modal.vue';
     import BBCodeParser, {BBCodeElement} from './bbcode';
@@ -26,35 +28,31 @@
         components: {modal: Modal}
     })
     export default class ReportDialog extends CustomDialog {
-        //tslint:disable:no-null-keyword
-        character: Character | null = null;
+        character: Character | undefined;
         text = '';
         l = l;
         error = '';
         submitting = false;
 
+        @Hook('mounted')
         mounted(): void {
             (<Element>this.$refs['caption']).appendChild(new BBCodeParser().parseEverything(l('chat.report.description')));
         }
 
+        @Hook('beforeDestroy')
         beforeDestroy(): void {
             (<BBCodeElement>(<Element>this.$refs['caption']).firstChild).cleanup!();
         }
 
-        get reporting(): string {
-            const conversation = core.conversations.selectedConversation;
-            const isChannel = !Conversation.isPrivate(conversation);
-            if(isChannel && this.character === null) return l('chat.report.channel', conversation.name);
-            if(this.character === null) return '';
-            const key = `chat.report.${(isChannel ? 'channel.user' : 'private')}`;
-            return l(key, this.character.name, conversation.name);
+        get conversation(): string {
+            return core.conversations.selectedConversation.name;
         }
 
         report(character?: Character): void {
             this.error = '';
             this.text = '';
             const current = core.conversations.selectedConversation;
-            this.character = character !== undefined ? character : Conversation.isPrivate(current) ? current.character : null;
+            this.character = character !== undefined ? character : Conversation.isPrivate(current) ? current.character : undefined;
             this.show();
         }
 
@@ -64,7 +62,7 @@
             const log = conversation.reportMessages.map((x) => messageToString(x));
             const tab = (Conversation.isChannel(conversation) ? `${conversation.name} (${conversation.channel.id})`
                 : Conversation.isPrivate(conversation) ? `Conversation with ${conversation.name}` : 'Console');
-            const text = (this.character !== null ? `Reporting user: [user]${this.character.name}[/user] | ` : '') + this.text;
+            const text = (this.character !== undefined ? `Reporting user: [user]${this.character.name}[/user] | ` : '') + this.text;
             const data = {
                 character: core.connection.character,
                 reportText: this.text,
@@ -73,10 +71,10 @@
                 text: true,
                 reportUser: <string | undefined>undefined
             };
-            if(this.character !== null) data.reportUser = this.character.name;
+            if(this.character !== undefined) data.reportUser = this.character.name;
             try {
                 this.submitting = true;
-                const report = <{log_id?: number}>(await core.connection.queryApi('report-submit.php', data));
+                const report = (await core.connection.queryApi<{log_id?: number}>('report-submit.php', data));
                 //tslint:disable-next-line:strict-boolean-expressions
                 if(!report.log_id) return;
                 core.connection.send('SFC', {action: 'report', logid: report.log_id, report: text, tab: conversation.name});
diff --git a/chat/SettingsView.vue b/chat/SettingsView.vue
index 47a776d..1a6c600 100644
--- a/chat/SettingsView.vue
+++ b/chat/SettingsView.vue
@@ -1,8 +1,8 @@
 <template>
-    <modal :action="l('settings.action')" @submit="submit" @close="init()" id="settings" dialogClass="w-100">
+    <modal :action="l('settings.action')" @submit="submit" @open="load()" id="settings" dialogClass="w-100">
         <tabs style="flex-shrink:0;margin-bottom:10px" v-model="selectedTab"
-            :tabs="[l('settings.tabs.general'), l('settings.tabs.notifications'), l('settings.tabs.import')]"></tabs>
-        <div v-show="selectedTab == 0">
+            :tabs="[l('settings.tabs.general'), l('settings.tabs.notifications'), l('settings.tabs.hideAds'), l('settings.tabs.import')]"></tabs>
+        <div v-show="selectedTab === '0'">
             <div class="form-group">
                 <label class="control-label" for="disallowedTags">{{l('settings.disallowedTags')}}</label>
                 <input id="disallowedTags" class="form-control" v-model="disallowedTags"/>
@@ -70,7 +70,7 @@
                 <input id="fontSize" type="number" min="10" max="24" class="form-control" v-model="fontSize"/>
             </div>
         </div>
-        <div v-show="selectedTab == 1">
+        <div v-show="selectedTab === '1'">
             <div class="form-group">
                 <label class="control-label" for="playSound">
                     <input type="checkbox" id="playSound" v-model="playSound"/>
@@ -118,7 +118,16 @@
                 </label>
             </div>
         </div>
-        <div v-show="selectedTab == 2" style="display:flex;padding-top:10px">
+        <div v-show="selectedTab === '2'">
+            <template v-if="hidden.length">
+                <div v-for="(user, i) in hidden">
+                    <span class="fa fa-times" style="cursor:pointer" @click.stop="hidden.splice(i, 1)"></span>
+                    {{user}}
+                </div>
+            </template>
+            <template v-else>{{l('settings.hideAds.empty')}}</template>
+        </div>
+        <div v-show="selectedTab === '3'" style="display:flex;padding-top:10px">
             <select id="import" class="form-control" v-model="importCharacter" style="flex:1;margin-right:10px">
                 <option value="">{{l('settings.import.selectCharacter')}}</option>
                 <option v-for="character in availableImports" :value="character">{{character}}</option>
@@ -129,7 +138,7 @@
 </template>
 
 <script lang="ts">
-    import Component from 'vue-class-component';
+    import {Component} from '@f-list/vue-ts';
     import CustomDialog from '../components/custom_dialog';
     import Modal from '../components/Modal.vue';
     import Tabs from '../components/tabs';
@@ -166,16 +175,7 @@
         colorBookmarks!: boolean;
         bbCodeBar!: boolean;
 
-        constructor() {
-            super();
-            this.init();
-        }
-
-        async created(): Promise<void> {
-            this.availableImports = (await core.settingsStore.getAvailableCharacters()).filter((x) => x !== core.connection.character);
-        }
-
-        init = function(this: SettingsView): void {
+        async load(): Promise<void> {
             const settings = core.state.settings;
             this.playSound = settings.playSound;
             this.clickOpensMessage = settings.clickOpensMessage;
@@ -197,7 +197,8 @@
             this.enterSend = settings.enterSend;
             this.colorBookmarks = settings.colorBookmarks;
             this.bbCodeBar = settings.bbCodeBar;
-        };
+            this.availableImports = (await core.settingsStore.getAvailableCharacters()).filter((x) => x !== core.connection.character);
+        }
 
         async doImport(): Promise<void> {
             if(!confirm(l('settings.import.confirm', this.importCharacter, core.connection.character))) return;
@@ -209,9 +210,11 @@
             await importKey('pinned');
             await importKey('modes');
             await importKey('conversationSettings');
-            this.init();
-            core.reloadSettings();
-            core.conversations.reloadSettings();
+            core.connection.close(false);
+        }
+
+        get hidden(): string[] {
+            return core.state.hiddenUsers;
         }
 
         async submit(): Promise<void> {
diff --git a/chat/Sidebar.vue b/chat/Sidebar.vue
index f46fef3..dfbb752 100644
--- a/chat/Sidebar.vue
+++ b/chat/Sidebar.vue
@@ -15,9 +15,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop, Watch} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop, Watch} from 'vue-property-decorator';
 
     @Component
     export default class Sidebar extends Vue {
diff --git a/chat/StatusSwitcher.vue b/chat/StatusSwitcher.vue
index 5ae1bd4..9bed284 100644
--- a/chat/StatusSwitcher.vue
+++ b/chat/StatusSwitcher.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script lang="ts">
-    import Component from 'vue-class-component';
+    import {Component} from '@f-list/vue-ts';
     import CustomDialog from '../components/custom_dialog';
     import Dropdown from '../components/Dropdown.vue';
     import Modal from '../components/Modal.vue';
@@ -36,16 +36,15 @@
         components: {modal: Modal, editor: Editor, dropdown: Dropdown}
     })
     export default class StatusSwitcher extends CustomDialog {
-        //tslint:disable:no-null-keyword
-        selectedStatus: Character.Status | null = null;
-        enteredText: string | null = null;
+        selectedStatus: Character.Status | undefined;
+        enteredText: string | undefined;
         statuses = userStatuses;
         l = l;
         getByteLength = getByteLength;
         getStatusIcon = getStatusIcon;
 
         get status(): Character.Status {
-            return this.selectedStatus !== null ? this.selectedStatus : this.character.status;
+            return this.selectedStatus !== undefined ? this.selectedStatus : this.character.status;
         }
 
         set status(status: Character.Status) {
@@ -53,7 +52,7 @@
         }
 
         get text(): string {
-            return this.enteredText !== null ? this.enteredText : this.character.statusText;
+            return this.enteredText !== undefined ? this.enteredText : this.character.statusText;
         }
 
         set text(text: string) {
@@ -69,8 +68,8 @@
         }
 
         reset(): void {
-            this.selectedStatus = null;
-            this.enteredText = null;
+            this.selectedStatus = undefined;
+            this.enteredText = undefined;
         }
     }
 </script>
\ No newline at end of file
diff --git a/chat/UserList.vue b/chat/UserList.vue
index 1267ba1..f52b652 100644
--- a/chat/UserList.vue
+++ b/chat/UserList.vue
@@ -1,7 +1,7 @@
 <template>
     <sidebar id="user-list" :label="l('users.title')" icon="fa-users" :right="true" :open="expanded">
         <tabs style="flex-shrink:0" :tabs="channel ? [l('users.friends'), l('users.members')] : [l('users.friends')]" v-model="tab"></tabs>
-        <div class="users" style="padding-left:10px" v-show="tab == 0">
+        <div class="users" style="padding-left:10px" v-show="tab === '0'">
             <h4>{{l('users.friends')}}</h4>
             <div v-for="character in friends" :key="character.name">
                 <user :character="character" :showStatus="true" :bookmark="false"></user>
@@ -11,7 +11,7 @@
                 <user :character="character" :showStatus="true" :bookmark="false"></user>
             </div>
         </div>
-        <div v-if="channel" style="padding-left:5px;flex:1;display:flex;flex-direction:column" v-show="tab == 1">
+        <div v-if="channel" style="padding-left:5px;flex:1;display:flex;flex-direction:column" v-show="tab === '1'">
             <div class="users" style="flex:1;padding-left:5px">
                 <h4>{{l('users.memberCount', channel.sortedMembers.length)}}</h4>
                 <div v-for="member in filteredMembers" :key="member.character.name">
@@ -29,8 +29,8 @@
 </template>
 
 <script lang="ts">
+    import {Component} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
     import Tabs from '../components/tabs';
     import core from './core';
     import {Channel, Character, Conversation} from './interfaces';
diff --git a/chat/UserMenu.vue b/chat/UserMenu.vue
index 1885b90..8d2bd5d 100644
--- a/chat/UserMenu.vue
+++ b/chat/UserMenu.vue
@@ -8,7 +8,7 @@
                 {{l('status.' + character.status)}}
             </div>
             <bbcode id="userMenuStatus" :text="character.statusText" v-show="character.statusText" class="list-group-item"
-            style="max-height:200px;overflow:auto;clear:both"></bbcode>
+                style="max-height:200px;overflow:auto;clear:both"></bbcode>
             <a tabindex="-1" :href="profileLink" target="_blank" v-if="showProfileFirst" class="list-group-item list-group-item-action">
                 <span class="fa fa-fw fa-user"></span>{{l('user.profile')}}</a>
             <a tabindex="-1" href="#" @click.prevent="openConversation(true)" class="list-group-item list-group-item-action">
@@ -17,19 +17,19 @@
                 <span class="fa fa-fw fa-plus"></span>{{l('user.message')}}</a>
             <a tabindex="-1" :href="profileLink" target="_blank" v-if="!showProfileFirst" class="list-group-item list-group-item-action">
                 <span class="fa fa-fw fa-user"></span>{{l('user.profile')}}</a>
-            <a tabindex="-1" href="#" @click.prevent="showMemo" class="list-group-item list-group-item-action">
+            <a tabindex="-1" href="#" @click.prevent="showMemo()" class="list-group-item list-group-item-action">
                 <span class="far fa-fw fa-sticky-note"></span>{{l('user.memo')}}</a>
-            <a tabindex="-1" href="#" @click.prevent="setBookmarked" class="list-group-item list-group-item-action">
+            <a tabindex="-1" href="#" @click.prevent="setBookmarked()" class="list-group-item list-group-item-action">
                 <span class="far fa-fw fa-bookmark"></span>{{l('user.' + (character.isBookmarked ? 'unbookmark' : 'bookmark'))}}</a>
-            <a tabindex="-1" href="#" @click.prevent="setIgnored" class="list-group-item list-group-item-action">
-                <span class="fa fa-fw fa-minus-circle"></span>{{l('user.' + (character.isIgnored ? 'unignore' : 'ignore'))}}</a>
-            <a tabindex="-1" href="#" @click.prevent="setHidden" class="list-group-item list-group-item-action" v-show="!isChatOp">
+            <a tabindex="-1" href="#" @click.prevent="setHidden()" class="list-group-item list-group-item-action" v-show="!isChatOp">
                 <span class="fa fa-fw fa-eye-slash"></span>{{l('user.' + (isHidden ? 'unhide' : 'hide'))}}</a>
-            <a tabindex="-1" href="#" @click.prevent="report" class="list-group-item list-group-item-action">
+            <a tabindex="-1" href="#" @click.prevent="report()" class="list-group-item list-group-item-action" style="border-top-width:1px">
                 <span class="fa fa-fw fa-exclamation-triangle"></span>{{l('user.report')}}</a>
-            <a tabindex="-1" href="#" @click.prevent="channelKick" class="list-group-item list-group-item-action" v-show="isChannelMod">
+            <a tabindex="-1" href="#" @click.prevent="setIgnored()" class="list-group-item list-group-item-action">
+                <span class="fa fa-fw fa-minus-circle"></span>{{l('user.' + (character.isIgnored ? 'unignore' : 'ignore'))}}</a>
+            <a tabindex="-1" href="#" @click.prevent="channelKick()" class="list-group-item list-group-item-action" v-show="isChannelMod">
                 <span class="fa fa-fw fa-ban"></span>{{l('user.channelKick')}}</a>
-            <a tabindex="-1" href="#" @click.prevent="chatKick" style="color:#f00" class="list-group-item list-group-item-action"
+            <a tabindex="-1" href="#" @click.prevent="chatKick()" style="color:#f00" class="list-group-item list-group-item-action"
                 v-show="isChatOp"><span class="fas fa-fw fa-trash"></span>{{l('user.chatKick')}}</a>
         </div>
         <modal :action="l('user.memo.action')" ref="memo" :disabled="memoLoading" @submit="updateMemo" dialogClass="w-100">
@@ -40,9 +40,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
     import Modal from '../components/Modal.vue';
     import {BBCodeView} from './bbcode';
     import {characterImage, errorToString, getByteLength, profileLink} from './common';
@@ -55,17 +54,16 @@
         components: {bbcode: BBCodeView, modal: Modal}
     })
     export default class UserMenu extends Vue {
-        //tslint:disable:no-null-keyword
         @Prop({required: true})
         readonly reportDialog!: ReportDialog;
         l = l;
         showContextMenu = false;
         getByteLength = getByteLength;
-        character: Character | null = null;
+        character: Character | undefined;
         position = {left: '', top: ''};
-        characterImage: string | null = null;
+        characterImage: string | undefined;
         touchedElement: HTMLElement | undefined;
-        channel: Channel | null = null;
+        channel: Channel | undefined;
         memo = '';
         memoId = 0;
         memoLoading = false;
@@ -107,7 +105,7 @@
             this.memo = '';
             (<Modal>this.$refs['memo']).show();
             try {
-                const memo = <{note: string | null, id: number}>await core.connection.queryApi('character-memo-get2.php',
+                const memo = await core.connection.queryApi<{note: string | null, id: number}>('character-memo-get2.php',
                     {target: this.character!.name});
                 this.memoId = memo.id;
                 this.memo = memo.note !== null ? memo.note : '';
@@ -123,7 +121,7 @@
         }
 
         get isChannelMod(): boolean {
-            if(this.channel === null) return false;
+            if(this.channel === undefined) return false;
             if(core.characters.ownCharacter.isChatOp) return true;
             const member = this.channel.members[core.connection.character];
             return member !== undefined && member.rank > Channel.Rank.Member;
@@ -189,9 +187,9 @@
         }
 
         private openMenu(touch: MouseEvent | Touch, character: Character, channel: Channel | undefined): void {
-            this.channel = channel !== undefined ? channel : null;
+            this.channel = channel;
             this.character = character;
-            this.characterImage = null;
+            this.characterImage = undefined;
             this.showContextMenu = true;
             this.position = {left: `${touch.clientX}px`, top: `${touch.clientY}px`};
             this.$nextTick(() => {
@@ -212,7 +210,7 @@
     }
 
     #userMenu .list-group-item-action {
-        border-top: 0;
+        border-top-width: 0;
         z-index: -1;
     }
 </style>
\ No newline at end of file
diff --git a/chat/WebSocket.ts b/chat/WebSocket.ts
index 934a5e9..087ca4b 100644
--- a/chat/WebSocket.ts
+++ b/chat/WebSocket.ts
@@ -9,6 +9,10 @@ export default class Socket implements WebSocketConnection {
         this.socket = new WebSocket(Socket.host);
     }
 
+    get readyState(): WebSocketConnection.ReadyState {
+        return this.socket.readyState;
+    }
+
     close(): void {
         this.socket.close();
     }
diff --git a/chat/bbcode.ts b/chat/bbcode.ts
index 7a315e1..a80665c 100644
--- a/chat/bbcode.ts
+++ b/chat/bbcode.ts
@@ -24,7 +24,6 @@ export const BBCodeView: Component = {
                 if(element.cleanup !== undefined) element.cleanup();
             }
         };
-        context.data.staticClass = `bbcode${context.data.staticClass !== undefined ? ` ${context.data.staticClass}` : ''}`;
         const vnode = createElement('span', context.data);
         vnode.key = context.props.text;
         return vnode;
@@ -84,18 +83,22 @@ export default class BBCodeParser extends CoreBBCodeParser {
             return img;
         }));
         this.addTag(new BBCodeTextTag('session', (parser, parent, param, content) => {
+            const root = parser.createElement('span');
             const el = parser.createElement('span');
-            parent.appendChild(el);
+            parent.appendChild(root);
+            root.appendChild(el);
             const view = new ChannelView({el, propsData: {id: content, text: param}});
             this.cleanup.push(view);
-            return el;
+            return root;
         }));
         this.addTag(new BBCodeTextTag('channel', (parser, parent, _, content) => {
+            const root = parser.createElement('span');
             const el = parser.createElement('span');
-            parent.appendChild(el);
+            parent.appendChild(root);
+            root.appendChild(el);
             const view = new ChannelView({el, propsData: {id: content, text: content}});
             this.cleanup.push(view);
-            return el;
+            return root;
         }));
     }
 
diff --git a/chat/conversations.ts b/chat/conversations.ts
index 7180ca0..9043138 100644
--- a/chat/conversations.ts
+++ b/chat/conversations.ts
@@ -2,7 +2,7 @@ import {queuedJoin} from '../fchat/channels';
 import {decodeHTML} from '../fchat/common';
 import {characterImage, ConversationSettings, EventMessage, Message, messageToString} from './common';
 import core from './core';
-import {Channel, Character, Connection, Conversation as Interfaces} from './interfaces';
+import {Channel, Character, Conversation as Interfaces} from './interfaces';
 import l from './localize';
 import {CommandContext, isAction, isCommand, isWarn, parse as parseCommand} from './slash_commands';
 import MessageType = Interfaces.Message.Type;
@@ -353,7 +353,8 @@ class State implements Interfaces.State {
     channelMap: {[key: string]: ChannelConversation | undefined} = {};
     consoleTab!: ConsoleConversation;
     selectedConversation: Conversation = this.consoleTab;
-    recent: Interfaces.RecentConversation[] = [];
+    recent: Interfaces.RecentPrivateConversation[] = [];
+    recentChannels: Interfaces.RecentChannelConversation[] = [];
     pinned!: {channels: string[], private: string[]};
     settings!: {[key: string]: Interfaces.Settings};
     modes!: {[key: string]: Channel.Mode | undefined};
@@ -371,13 +372,18 @@ class State implements Interfaces.State {
         conv = new PrivateConversation(character);
         this.privateConversations.push(conv);
         this.privateMap[key] = conv;
-        state.addRecent(conv); //tslint:disable-line:no-floating-promises
+        const index = this.recent.findIndex((c) => c.character === conv!.name);
+        if(index !== -1) this.recent.splice(index, 1);
+        if(this.recent.length >= 50) this.recent.pop();
+        this.recent.unshift({character: conv.name});
+        core.settingsStore.set('recent', this.recent); //tslint:disable-line:no-floating-promises
         return conv;
     }
 
     byKey(key: string): Conversation | undefined {
         if(key === '_') return this.consoleTab;
-        return (key[0] === '#' ? this.channelMap : this.privateMap)[key];
+        key = key.toLowerCase();
+        return key[0] === '#' ? this.channelMap[key.substr(1)] : this.privateMap[key];
     }
 
     async savePinned(): Promise<void> {
@@ -395,25 +401,6 @@ class State implements Interfaces.State {
         await core.settingsStore.set('conversationSettings', this.settings);
     }
 
-    async addRecent(conversation: Conversation): Promise<void> {
-        const remove = <T extends Interfaces.RecentConversation>(predicate: (item: T) => boolean) => {
-            for(let i = 0; i < this.recent.length; ++i)
-                if(predicate(<T>this.recent[i])) {
-                    this.recent.splice(i, 1);
-                    break;
-                }
-        };
-        if(Interfaces.isChannel(conversation)) {
-            remove<Interfaces.RecentChannelConversation>((c) => c.channel === conversation.channel.id);
-            this.recent.unshift({channel: conversation.channel.id, name: conversation.channel.name});
-        } else {
-            remove<Interfaces.RecentPrivateConversation>((c) => c.character === conversation.name);
-            state.recent.unshift({character: conversation.name});
-        }
-        if(this.recent.length >= 50) this.recent.pop();
-        await core.settingsStore.set('recent', this.recent);
-    }
-
     show(conversation: Conversation): void {
         this.selectedConversation.onHide();
         conversation.unread = Interfaces.UnreadState.None;
@@ -429,13 +416,14 @@ class State implements Interfaces.State {
         for(const conversation of this.privateConversations)
             conversation._isPinned = this.pinned.private.indexOf(conversation.name) !== -1;
         this.recent = await core.settingsStore.get('recent') || [];
+        this.recentChannels = await core.settingsStore.get('recentChannels') || [];
         const settings = <{[key: string]: ConversationSettings}> await core.settingsStore.get('conversationSettings') || {};
         for(const key in settings) {
             const settingsItem = new ConversationSettings();
             for(const itemKey in settings[key])
                 settingsItem[<keyof ConversationSettings>itemKey] = settings[key][<keyof ConversationSettings>itemKey];
             settings[key] = settingsItem;
-            const conv = (key[0] === '#' ? this.channelMap : this.privateMap)[key];
+            const conv = this.byKey(key);
             if(conv !== undefined) conv._settings = settingsItem;
         }
         this.settings = settings;
@@ -494,7 +482,11 @@ export default function(this: void): Interfaces.State {
                 const conv = new ChannelConversation(channel);
                 state.channelMap[channel.id] = conv;
                 state.channelConversations.push(conv);
-                await state.addRecent(conv);
+                const index = state.recentChannels.findIndex((c) => c.channel === channel.id);
+                if(index !== -1) state.recentChannels.splice(index, 1);
+                if(state.recentChannels.length >= 50) state.recentChannels.pop();
+                state.recentChannels.unshift({channel: channel.id, name: conv.channel.name});
+                core.settingsStore.set('recentChannels', state.recentChannels); //tslint:disable-line:no-floating-promises
             } else {
                 const conv = state.channelMap[channel.id];
                 if(conv === undefined) return;
@@ -548,6 +540,8 @@ export default function(this: void): Interfaces.State {
                 characterImage(data.character), 'attention');
             if(conversation !== state.selectedConversation || !state.windowFocused) conversation.unread = Interfaces.UnreadState.Mention;
             message.isHighlight = true;
+            await state.consoleTab.addMessage(new EventMessage(l('events.highlight', `[user]${data.character}[/user]`, results[0],
+                `[session=${conversation.name}]${data.channel}[/session]`), time));
         } else if(conversation.settings.notify === Interfaces.Setting.True) {
             await core.notifications.notify(conversation, conversation.name, messageToString(message),
                 characterImage(data.character), 'attention');
@@ -655,7 +649,9 @@ export default function(this: void): Interfaces.State {
 
     connection.onMessage('IGN', async(data, time) => {
         if(data.action !== 'add' && data.action !== 'delete') return;
-        return addEventMessage(new EventMessage(l(`events.ignore_${data.action}`, data.character), time));
+        const text = l(`events.ignore_${data.action}`, data.character);
+        state.selectedConversation.infoText = text;
+        return addEventMessage(new EventMessage(text, time));
     });
     connection.onMessage('RTB', async(data, time) => {
         let url = 'https://www.f-list.net/';
@@ -711,8 +707,7 @@ export default function(this: void): Interfaces.State {
         if(data.type === 'note')
             await core.notifications.notify(state.consoleTab, character, text, characterImage(character), 'newnote');
     });
-    type SFCMessage = (Interfaces.Message & {sfc: Connection.ServerCommands['SFC'] & {confirmed?: true}});
-    const sfcList: SFCMessage[] = [];
+    const sfcList: Interfaces.SFCMessage[] = [];
     connection.onMessage('SFC', async(data, time) => {
         let text: string, message: Interfaces.Message;
         if(data.action === 'report') {
@@ -721,7 +716,7 @@ export default function(this: void): Interfaces.State {
                 await core.notifications.notify(state.consoleTab, data.character, text, characterImage(data.character), 'modalert');
             message = new EventMessage(text, time);
             safeAddMessage(sfcList, message, 500);
-            (<SFCMessage>message).sfc = data;
+            (<Interfaces.SFCMessage>message).sfc = data;
         } else {
             text = l('events.report.confirmed', `[user]${data.moderator}[/user]`, `[user]${data.character}[/user]`);
             for(const item of sfcList)
diff --git a/chat/core.ts b/chat/core.ts
index 2be4f96..13a581b 100644
--- a/chat/core.ts
+++ b/chat/core.ts
@@ -104,7 +104,6 @@ export interface Core {
     register(module: 'conversations', state: Conversation.State): void
     register(module: 'channels', state: Channel.State): void
     register(module: 'characters', state: Character.State): void
-    reloadSettings(): void
     watch<T>(getter: (this: VueState) => T, callback: WatchHandler<T>): void
 }
 
diff --git a/chat/interfaces.ts b/chat/interfaces.ts
index 3435127..1ab53be 100644
--- a/chat/interfaces.ts
+++ b/chat/interfaces.ts
@@ -1,36 +1,34 @@
 //tslint:disable:no-shadowed-variable
-declare global {
-    interface Function {
-        //tslint:disable-next-line:ban-types no-any
-        bind<T extends Function>(this: T, thisArg: any): T;
-        //tslint:disable-next-line:ban-types no-any
-        bind<T, TReturn>(this: (t: T) => TReturn, thisArg: any, arg: T): () => TReturn;
-    }
-}
+import {Connection} from '../fchat';
 
 import {Channel, Character} from '../fchat/interfaces';
 export {Connection, Channel, Character} from '../fchat/interfaces';
-export const userStatuses = ['online', 'looking', 'away', 'busy', 'dnd'];
-export const channelModes = ['chat', 'ads', 'both'];
+export const userStatuses: ReadonlyArray<Character.Status> = ['online', 'looking', 'away', 'busy', 'dnd'];
+export const channelModes: ReadonlyArray<Channel.Mode> = ['chat', 'ads', 'both'];
 
 export namespace Conversation {
-    export interface EventMessage {
-        readonly type: Message.Type.Event,
-        readonly text: string,
+    interface BaseMessage {
+        readonly id: number
+        readonly type: Message.Type
+        readonly text: string
         readonly time: Date
-        readonly sender?: undefined
     }
 
-    export interface ChatMessage {
-        readonly type: Message.Type,
-        readonly sender: Character,
-        readonly text: string,
-        readonly time: Date
+    export interface EventMessage extends BaseMessage {
+        readonly type: Message.Type.Event
+    }
+
+    export interface ChatMessage extends BaseMessage {
         readonly isHighlight: boolean
+        readonly sender: Character
     }
 
     export type Message = EventMessage | ChatMessage;
 
+    export interface SFCMessage extends EventMessage {
+        sfc: Connection.ServerCommands['SFC'] & {confirmed?: true}
+    }
+
     export namespace Message {
         export enum Type {
             Message,
@@ -44,7 +42,6 @@ export namespace Conversation {
 
     export type RecentChannelConversation = {readonly channel: string, readonly name: string};
     export type RecentPrivateConversation = {readonly character: string};
-    export type RecentConversation = RecentChannelConversation | RecentPrivateConversation;
 
     export type TypingStatus = 'typing' | 'paused' | 'clear';
 
@@ -79,12 +76,12 @@ export namespace Conversation {
         readonly privateConversations: ReadonlyArray<PrivateConversation>
         readonly channelConversations: ReadonlyArray<ChannelConversation>
         readonly consoleTab: Conversation
-        readonly recent: ReadonlyArray<RecentConversation>
+        readonly recent: ReadonlyArray<RecentPrivateConversation>
+        readonly recentChannels: ReadonlyArray<RecentChannelConversation>
         readonly selectedConversation: Conversation
         readonly hasNew: boolean;
         byKey(key: string): Conversation | undefined
         getPrivate(character: Character): PrivateConversation
-        reloadSettings(): void
     }
 
     export enum Setting {
@@ -142,7 +139,8 @@ export namespace Settings {
         pinned: {channels: string[], private: string[]},
         conversationSettings: {[key: string]: Conversation.Settings | undefined}
         modes: {[key: string]: Channel.Mode | undefined}
-        recent: Conversation.RecentConversation[]
+        recent: Conversation.RecentPrivateConversation[]
+        recentChannels: Conversation.RecentChannelConversation[]
         hiddenUsers: string[]
     };
 
diff --git a/chat/localize.ts b/chat/localize.ts
index 35b9444..e8725ad 100644
--- a/chat/localize.ts
+++ b/chat/localize.ts
@@ -91,6 +91,7 @@ const strings: {[key: string]: string | undefined} = {
     'logs.corruption.mobile': 'Log corruption has been detected. This is usually caused by a crash/force close or power loss mid-write. Will now attempt to fix corrupted logs.',
     'logs.corruption.mobile.success': 'Your logs have been fixed.',
     'logs.corruption.mobile.error': 'Unable to fix corrupted logs. Please clear the application data or reinstall the app.',
+    'logs.corruption.web': 'Error reading logs from browser storage. If this issue persists, please clear your stored browser data for F-Chat.',
     'user.profile': 'Profile',
     'user.message': 'Open conversation',
     'user.messageJump': 'View conversation',
@@ -111,10 +112,9 @@ const strings: {[key: string]: string | undefined} = {
     'users.members': 'Members',
     'users.memberCount': '{0} Members',
     'chat.report': 'Alert Staff',
-    'chat.report.description': `
-[color=red]Before you alert the moderators, PLEASE READ:[/color]
+    'chat.report.description': `[color=red]Before you alert the moderators, PLEASE READ:[/color]
 If you're just having personal trouble with someone, right-click their name and ignore them.
-Please make sure what you're reporting is a violation of the site's [url=https://wiki.f-list.net/Code_of_Conduct]Code of Conduct[/url] otherwise nothing will be done.
+Please make sure what you're reporting is a violation of the site's [url=https://wiki.f-list.net/Code_of_Conduct]Code of Conduct[/url], otherwise nothing will be done.
 
 This tool is intended for chat moderation. If you have a question, please visit our [url=https://wiki.f-list.net/Frequently_Asked_Questions]FAQ[/url] first, and if that doesn't help, join [session=Helpdesk]Helpdesk[/session] and ask your question there.
 
@@ -123,25 +123,26 @@ If your problem lies anywhere outside of the chat, please send in a Ticket inste
 For a more comprehensive guide as how and when to report another user, please [url=https://wiki.f-list.net/How_to_Report_a_User]consult this page.[/url]
 
 Please provide a brief summary of your problem and the rules that have been violated.
-[color=red]DO NOT PASTE LOGS INTO THIS FIELD.
+[color=red]DO NOT PASTE LOGS INTO THE "REPORT TEXT" FIELD.
 SELECT THE TAB YOU WISH TO REPORT, LOGS ARE AUTOMATICALLY ATTACHED[/color]`,
-    'chat.report.channel.user': 'Reporting user {0} in channel {1}',
-    'chat.report.channel': 'General report for channel {0}',
-    'chat.report.channel.description': 'If you wish to report a specific user, please right-click them and select "Report".',
-    'chat.report.private': 'Reporting private conversation with user {0}',
+    'chat.report.conversation': 'Reporting tab',
+    'chat.report.reporting': 'Reporting user',
+    'chat.report.general': 'No one in particular. If you wish to report a specific user, please right-click them and select "Report".',
     'chat.report.text': 'Report text',
     'chat.recentConversations': 'Recent conversations',
     'settings.tabs.general': 'General',
     'settings.tabs.notifications': 'Notifications',
+    'settings.tabs.hideAds': 'Hidden users',
     'settings.tabs.import': 'Import',
     'settings.open': 'Settings',
     'settings.action': 'Change settings',
+    'settings.hideAds.empty': `You aren't currently hiding the ads of any users.`,
     'settings.import': 'Import settings',
     'settings.import.selectCharacter': 'Select a character',
     'settings.import.confirm': `You are importing settings from your character {0}.
 This will overwrite any and all settings, pinned conversations and conversation settings of character {1}.
 Logs and recent conversations will not be touched.
-You may need to log out and back in for some settings to take effect.
+You will be logged out. Once you log back in, the settings will have been imported.
 Are you sure?`,
     'settings.playSound': 'Play notification sounds',
     'settings.notifications': 'Show desktop/push notifications',
@@ -258,6 +259,7 @@ Once this process has started, do not interrupt it or your logs will get corrupt
     'events.ignore_add': 'You are now ignoring {0}\'s messages. Should they go around this by any means, please report it using the Alert Staff button.',
     'events.ignore_delete': '{0} is now allowed to send you messages again.',
     'events.uptime': 'Server has been running since {0}, with currently {1} channels and {2} users, a total of {3} accepted connections, and {4} maximum users.',
+    'events.highlight': '{0} said "{1}" in {2}',
     'commands.unknown': 'Unknown command. For a list of valid commands, please click the ? button.',
     'commands.badContext': 'This command cannot be used here. Please use the Help (click the ? button) if you need further information.',
     'commands.tooFewParams': 'This command requires more parameters. Please use the Help (click the ? button) if you need further information.',
diff --git a/chat/message_view.ts b/chat/message_view.ts
index 26d61db..add358d 100644
--- a/chat/message_view.ts
+++ b/chat/message_view.ts
@@ -1,58 +1,57 @@
-import {Component, CreateElement, RenderContext, VNode, VNodeChildrenArrayContents} from 'vue';
+import {Component, Prop} from '@f-list/vue-ts';
+import {CreateElement, default as Vue, VNode, VNodeChildrenArrayContents} from 'vue';
 import {Channel} from '../fchat';
 import {BBCodeView} from './bbcode';
 import {formatTime} from './common';
 import core from './core';
 import {Conversation} from './interfaces';
 import UserView from './user_view';
-//  TODO convert this to single-file once Vue supports it for functional components.
-// template:
-// <span>[{{formatTime(message.time)}}]</span>
-// <span v-show="message.type == MessageTypes.Action">*</span>
-// <span><user :character="message.sender" :reportDialog="$refs['reportDialog']"></user></span>
-// <span v-show="message.type == MessageTypes.Message">:</span>
-// <bbcode :text="message.text"></bbcode>
 
 const userPostfix: {[key: number]: string | undefined} = {
     [Conversation.Message.Type.Message]: ': ',
     [Conversation.Message.Type.Ad]: ': ',
     [Conversation.Message.Type.Action]: ''
 };
-//tslint:disable-next-line:variable-name
-const MessageView: Component = {
-    functional: true,
-    render(createElement: CreateElement,
-           context: RenderContext<{message: Conversation.Message, classes?: string, channel?: Channel}>): VNode {
-        const message = context.props.message;
+@Component({
+    render(this: MessageView, createElement: CreateElement): VNode {
+        const message = this.message;
         const children: VNodeChildrenArrayContents =
             [createElement('span', {staticClass: 'message-time'}, `[${formatTime(message.time)}] `)];
         const separators = core.connection.isOpen ? core.state.settings.messageSeparators : false;
         /*tslint:disable-next-line:prefer-template*///unreasonable here
         let classes = `message message-${Conversation.Message.Type[message.type].toLowerCase()}` + (separators ? ' message-block' : '') +
             (message.type !== Conversation.Message.Type.Event && message.sender.name === core.connection.character ? ' message-own' : '') +
-            ((context.props.classes !== undefined) ? ` ${context.props.classes}` : '');
+            ((this.classes !== undefined) ? ` ${this.classes}` : '');
         if(message.type !== Conversation.Message.Type.Event) {
             children.push((message.type === Conversation.Message.Type.Action) ? '*' : '',
-                createElement(UserView, {props: {character: message.sender, channel: context.props.channel}}),
+                createElement(UserView, {props: {character: message.sender, channel: this.channel}}),
                 userPostfix[message.type] !== undefined ? userPostfix[message.type]! : ' ');
             if(message.isHighlight) classes += ' message-highlight';
         }
-        children.push(createElement(BBCodeView,
-            {props: {unsafeText: message.text, afterInsert: message.type === Conversation.Message.Type.Ad ? (elm: HTMLElement) => {
-            setImmediate(() => {
-                elm = elm.parentElement!;
-                if(elm.scrollHeight > elm.offsetHeight) {
-                    const expand = document.createElement('div');
-                    expand.className = 'expand fas fa-caret-down';
-                    expand.addEventListener('click', function(): void { this.parentElement!.className += ' expanded'; });
-                    elm.appendChild(expand);
-                }
-            });
-        } : undefined}}));
+        const isAd = message.type === Conversation.Message.Type.Ad && !this.logs;
+        children.push(createElement(BBCodeView, {props: {unsafeText: message.text, afterInsert: isAd ? (elm: HTMLElement) => {
+                    setImmediate(() => {
+                        elm = elm.parentElement!;
+                        if(elm.scrollHeight > elm.offsetHeight) {
+                            const expand = document.createElement('div');
+                            expand.className = 'expand fas fa-caret-down';
+                            expand.addEventListener('click', function(): void { this.parentElement!.className += ' expanded'; });
+                            elm.appendChild(expand);
+                        }
+                    });
+                } : undefined}}));
         const node = createElement('div', {attrs: {class: classes}}, children);
-        node.key = context.data.key;
+        node.key = message.id;
         return node;
     }
-};
-
-export default MessageView;
\ No newline at end of file
+})
+export default class MessageView extends Vue {
+    @Prop({required: true})
+    readonly message!: Conversation.Message;
+    @Prop
+    readonly classes?: string;
+    @Prop
+    readonly channel?: Channel;
+    @Prop
+    readonly logs?: true;
+}
\ No newline at end of file
diff --git a/chat/profile_api.ts b/chat/profile_api.ts
index 67c37b4..e22b096 100644
--- a/chat/profile_api.ts
+++ b/chat/profile_api.ts
@@ -8,10 +8,13 @@ import CharacterSelect from '../components/character_select.vue';
 import {setCharacters} from '../components/character_select/character_list';
 import DateDisplay from '../components/date_display.vue';
 import SimplePager from '../components/simple_pager.vue';
+import {
+    Character as CharacterInfo, CharacterImage, CharacterImageOld, CharacterInfotag, CharacterSettings, KinkChoice
+} from '../interfaces';
 import {registerMethod, Store} from '../site/character_page/data_store';
 import {
-    Character, CharacterCustom, CharacterFriend, CharacterImage, CharacterImageOld, CharacterInfo, CharacterInfotag, CharacterKink,
-    CharacterSettings, Friend, FriendRequest, FriendsByCharacter, GuestbookState, KinkChoice, KinkChoiceFull, SharedKinks
+    Character, CharacterFriend, CharacterKink, Friend, FriendRequest, FriendsByCharacter, GuestbookState, KinkChoiceFull,
+    SharedKinks
 } from '../site/character_page/interfaces';
 import '../site/directives/vue-select'; //tslint:disable-line:no-import-side-effect
 import * as Utils from '../site/utils';
@@ -25,40 +28,39 @@ const parserSettings = {
 };
 
 async function characterData(name: string | undefined): Promise<Character> {
-    const data = await core.connection.queryApi('character-data.php', {name}) as CharacterInfo & {
+    const data = await core.connection.queryApi<CharacterInfo & {
         badges: string[]
         customs_first: boolean
         character_list: {id: number, name: string}[]
         current_user: {inline_mode: number, animated_icons: boolean}
-        custom_kinks: {[key: number]: {choice: 'fave' | 'yes' | 'maybe' | 'no', name: string, description: string, children: number[]}}
+        custom_kinks: {
+            [key: number]:
+                {id: number, choice: 'favorite' | 'yes' | 'maybe' | 'no', name: string, description: string, children: number[]}
+        }
         custom_title: string
+        images: CharacterImage[]
         kinks: {[key: string]: string}
         infotags: {[key: string]: string}
         memo?: {id: number, memo: string}
         settings: CharacterSettings,
         timezone: number
-    };
+    }>('character-data.php', {name});
     const newKinks: {[key: string]: KinkChoiceFull} = {};
     for(const key in data.kinks)
         newKinks[key] = <KinkChoiceFull>(<string>data.kinks[key] === 'fave' ? 'favorite' : data.kinks[key]);
-    const newCustoms: CharacterCustom[] = [];
     for(const key in data.custom_kinks) {
         const custom = data.custom_kinks[key];
-        newCustoms.push({
-            id: parseInt(key, 10),
-            choice: custom.choice === 'fave' ? 'favorite' : custom.choice,
-            name: custom.name,
-            description: custom.description
-        });
+        if((<'fave'>custom.choice) === 'fave') custom.choice = 'favorite';
+        custom.id = parseInt(key, 10);
         for(const childId of custom.children)
-            newKinks[childId] = parseInt(key, 10);
+            newKinks[childId] = custom.id;
     }
+    (<any>data.settings).block_bookmarks = (<any>data.settings).prevent_bookmarks; //tslint:disable-line:no-any
     const newInfotags: {[key: string]: CharacterInfotag} = {};
     for(const key in data.infotags) {
         const characterInfotag = data.infotags[key];
         const infotag = Store.kinks.infotags[key];
         if(infotag === undefined) continue;
-
         newInfotags[key] = infotag.type === 'list' ? {list: parseInt(characterInfotag, 10)} : {string: characterInfotag};
     }
     parserSettings.inlineDisplayMode = data.current_user.inline_mode;
@@ -73,13 +75,14 @@ async function characterData(name: string | undefined): Promise<Character> {
             created_at: data.created_at,
             updated_at: data.updated_at,
             views: data.views,
-            image_count: data.images!.length,
+            image_count: data.images.length,
             inlines: data.inlines,
             kinks: newKinks,
-            customs: newCustoms,
+            customs: data.custom_kinks,
             infotags: newInfotags,
             online_chat: false,
-            timezone: data.timezone
+            timezone: data.timezone,
+            deleted: false
         },
         memo: data.memo,
         character_list: data.character_list,
@@ -97,7 +100,7 @@ function contactMethodIconUrl(name: string): string {
 async function fieldsGet(): Promise<void> {
     if(Store.kinks !== undefined) return; //tslint:disable-line:strict-type-predicates
     try {
-        const fields = (await(Axios.get(`${Utils.siteDomain}json/api/mapping-list.php`))).data as SharedKinks & {
+        const fields = (await (Axios.get(`${Utils.siteDomain}json/api/mapping-list.php`))).data as SharedKinks & {
             kinks: {[key: string]: {group_id: number}}
             infotags: {[key: string]: {list: string, group_id: string}}
         };
@@ -221,7 +224,7 @@ export function init(characters: {[key: string]: number}): void {
         core.connection.queryApi<void>('friend-remove.php', {source_id: friend.source.id, dest_id: friend.target.id}));
     registerMethod('friendRequestAccept', async(req: FriendRequest) => {
         await core.connection.queryApi('request-accept.php', {request_id: req.id});
-        return { id: undefined!, source: req.target, target: req.source, createdAt: Date.now() / 1000 };
+        return {id: undefined!, source: req.target, target: req.source, createdAt: Date.now() / 1000};
     });
     registerMethod('friendRequestCancel', async(req: FriendRequest) =>
         core.connection.queryApi<void>('request-cancel.php', {request_id: req.id}));
diff --git a/chat/vue-raven.ts b/chat/vue-raven.ts
index 197eaeb..f5bad8f 100644
--- a/chat/vue-raven.ts
+++ b/chat/vue-raven.ts
@@ -25,7 +25,7 @@ function VueRaven(this: void, raven: Raven.RavenStatic): Raven.RavenStatic {
             }
         });
 
-        if(typeof oldOnError === 'function') oldOnError.call(this, error, vm);
+        if(typeof oldOnError === 'function') oldOnError.call(this, error, vm, info);
         else console.log(error);
     };
 
diff --git a/components/Dropdown.vue b/components/Dropdown.vue
index 47cc6de..f053771 100644
--- a/components/Dropdown.vue
+++ b/components/Dropdown.vue
@@ -6,7 +6,7 @@
                 <slot name="title" style="flex:1"></slot>
             </div>
         </a>
-        <div class="dropdown-menu" :style="open ? 'display:block' : ''" @mousedown.stop.prevent @click="isOpen = false"
+        <div class="dropdown-menu" :style="open ? {display: 'block'} : undefined" @mousedown.stop.prevent @click="isOpen = false"
             ref="menu">
             <slot></slot>
         </div>
@@ -14,9 +14,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop, Watch} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop, Watch} from 'vue-property-decorator';
 
     @Component
     export default class Dropdown extends Vue {
@@ -35,7 +34,7 @@
                 menu.style.cssText = '';
                 return;
             }
-            let element: HTMLElement | null = this.$el;
+            let element = <HTMLElement | null>this.$el;
             while(element !== null) {
                 if(getComputedStyle(element).position === 'fixed') {
                     menu.style.display = 'block';
diff --git a/components/FilterableSelect.vue b/components/FilterableSelect.vue
index 1027494..a86fcc1 100644
--- a/components/FilterableSelect.vue
+++ b/components/FilterableSelect.vue
@@ -4,12 +4,13 @@
         <slot v-else slot="title" :option="selected">{{label}}</slot>
 
         <div style="padding:10px;">
-            <input v-model="filter" class="form-control" :placeholder="placeholder" @mousedown.stop @focus="keepOpen = true"  @blur="keepOpen = false"/>
+            <input v-model="filter" class="form-control" :placeholder="placeholder" @mousedown.stop @focus="keepOpen = true"
+                @blur="keepOpen = false"/>
         </div>
         <div class="dropdown-items">
             <template v-if="multiple">
                 <a href="#" @click.stop="select(option)" v-for="option in filtered" class="dropdown-item">
-                    <input type="checkbox" :checked="selected.indexOf(option) !== -1"/>
+                    <input type="checkbox" :checked="isSelected(option)"/>
                     <slot :option="option">{{option}}</slot>
                 </a>
             </template>
@@ -23,16 +24,14 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop, Watch} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop, Watch} from 'vue-property-decorator';
     import Dropdown from '../components/Dropdown.vue';
 
     @Component({
         components: {dropdown: Dropdown}
     })
     export default class FilterableSelect extends Vue {
-        //tslint:disable:no-null-keyword
         @Prop()
         readonly placeholder?: string;
         @Prop({required: true})
@@ -46,11 +45,11 @@
         @Prop()
         readonly title?: string;
         filter = '';
-        selected: object | object[] | null = this.value !== undefined ? this.value : (this.multiple !== undefined ? [] : null);
+        selected: object | object[] | undefined = this.value !== undefined ? this.value : (this.multiple !== undefined ? [] : undefined);
         keepOpen = false;
 
         @Watch('value')
-        watchValue(newValue: object | object[] | null): void {
+        watchValue(newValue: object | object[] | undefined): void {
             this.selected = newValue;
         }
 
@@ -67,13 +66,17 @@
             this.$emit('input', this.selected);
         }
 
+        isSelected(option: object): boolean {
+            return (<object[]>this.selected).indexOf(option) !== -1;
+        }
+
         get filtered(): object[] {
             return this.options.filter((x) => this.filterFunc(this.filterRegex, x));
         }
 
         get label(): string | undefined {
             return this.multiple !== undefined ? `${this.title} - ${(<object[]>this.selected).length}` :
-                (this.selected !== null ? this.selected.toString() : this.title);
+                (this.selected !== undefined ? this.selected.toString() : this.title);
         }
 
         get filterRegex(): RegExp {
diff --git a/components/Modal.vue b/components/Modal.vue
index 04a7cec..f2af45c 100644
--- a/components/Modal.vue
+++ b/components/Modal.vue
@@ -1,7 +1,7 @@
 <template>
     <span v-show="isShown">
-        <div class="modal" @click.self="hideWithCheck" style="display:flex">
-            <div class="modal-dialog" :class="dialogClass" style="display:flex;align-items:center">
+        <div class="modal" @click.self="hideWithCheck()" style="display:flex;justify-content:center">
+            <div class="modal-dialog" :class="dialogClass" style="display:flex;align-items:center;margin-left:0;margin-right:0">
                 <div class="modal-content" style="max-height:100%">
                     <div class="modal-header" style="flex-shrink:0">
                         <h4 class="modal-title">
@@ -26,9 +26,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Hook, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
     import {getKey} from '../chat/common';
     import {Keys} from '../keys';
 
@@ -95,6 +94,7 @@
             this.hide();
         }
 
+        @Hook('beforeDestroy')
         beforeDestroy(): void {
             if(this.isShown) this.hide();
         }
diff --git a/components/character_link.vue b/components/character_link.vue
index a5bb4f3..aeafdb5 100644
--- a/components/character_link.vue
+++ b/components/character_link.vue
@@ -6,9 +6,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
     import * as Utils from '../site/utils';
 
     @Component
diff --git a/components/character_select.vue b/components/character_select.vue
index c88782d..7b0ab6c 100644
--- a/components/character_select.vue
+++ b/components/character_select.vue
@@ -6,9 +6,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
     import {getCharacters} from './character_select/character_list';
 
     interface SelectItem {
diff --git a/components/custom_dialog.ts b/components/custom_dialog.ts
index 9eca897..0f80189 100644
--- a/components/custom_dialog.ts
+++ b/components/custom_dialog.ts
@@ -1,6 +1,8 @@
+import {Component} from '@f-list/vue-ts';
 import Vue from 'vue';
 import Modal from './Modal.vue';
 
+@Component
 export default class CustomDialog extends Vue {
     protected get dialog(): Modal {
         return <Modal>this.$children[0];
diff --git a/components/date_display.vue b/components/date_display.vue
index d49d3fd..afd860b 100644
--- a/components/date_display.vue
+++ b/components/date_display.vue
@@ -3,10 +3,9 @@
 </template>
 
 <script lang="ts">
+    import {Component, Hook, Prop, Watch} from '@f-list/vue-ts';
     import {distanceInWordsToNow, format} from 'date-fns';
-    import Vue, {ComponentOptions} from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
+    import Vue from 'vue';
     import {Settings} from '../site/utils';
 
     @Component
@@ -16,8 +15,9 @@
         primary: string | undefined;
         secondary: string | undefined;
 
-        constructor(options?: ComponentOptions<Vue>) {
-            super(options);
+        @Hook('mounted')
+        @Watch('time')
+        update(): void {
             if(this.time === null || this.time === 0)
                 return;
             const date = isNaN(+this.time) ? new Date(`${this.time}+00:00`) : new Date(+this.time * 1000);
diff --git a/components/form_group.vue b/components/form_group.vue
index 53e6388..6797b80 100644
--- a/components/form_group.vue
+++ b/components/form_group.vue
@@ -14,9 +14,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
 
     @Component
     export default class FormGroup extends Vue {
diff --git a/components/form_group_inputgroup.vue b/components/form_group_inputgroup.vue
index 7c1f22e..b3cec99 100644
--- a/components/form_group_inputgroup.vue
+++ b/components/form_group_inputgroup.vue
@@ -17,9 +17,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
 
     @Component
     export default class FormGroupInputgroup extends Vue {
diff --git a/components/simple_pager.vue b/components/simple_pager.vue
index 0866df0..2a00c45 100644
--- a/components/simple_pager.vue
+++ b/components/simple_pager.vue
@@ -2,21 +2,21 @@
     <div class="d-flex w-100 my-2 justify-content-between">
         <div>
             <slot name="previous" v-if="!routed">
-                <a class="btn btn-secondary" :class="{'disabled': !prev}" role="button" @click.prevent="previousPage">
+                <a class="btn btn-secondary" :class="{'disabled': !prev}" role="button" @click.prevent="previousPage()">
                     <span aria-hidden="true">&larr;</span> {{prevLabel}}
                 </a>
             </slot>
-            <router-link v-if="routed" :to="prevRoute" class="btn btn-secondary" :class="{'disabled': !prev}" role="button">
+            <router-link v-else :to="prevRoute" class="btn btn-secondary" :class="{'disabled': !prev}" role="button">
                 <span aria-hidden="true">&larr;</span> {{prevLabel}}
             </router-link>
         </div>
         <div>
             <slot name="next" v-if="!routed">
-                <a class="btn btn-secondary" :class="{'disabled': !next}" role="button" @click.prevent="nextPage">
+                <a class="btn btn-secondary" :class="{'disabled': !next}" role="button" @click.prevent="nextPage()">
                     {{nextLabel}} <span aria-hidden="true">&rarr;</span>
                 </a>
             </slot>
-            <router-link v-if="routed" :to="nextRoute" class="btn btn-secondary" :class="{'disabled': !next}" role="button">
+            <router-link v-else :to="nextRoute" class="btn btn-secondary" :class="{'disabled': !next}" role="button">
                 {{nextLabel}} <span aria-hidden="true">&rarr;</span>
             </router-link>
         </div>
@@ -24,10 +24,9 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop} from '@f-list/vue-ts';
     import cloneDeep = require('lodash/cloneDeep'); //tslint:disable-line:no-require-imports
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
 
     type ParamDictionary = {[key: string]: number | undefined};
     interface RouteParams {
diff --git a/components/tabs.ts b/components/tabs.ts
index ffc1f3b..e15dfb7 100644
--- a/components/tabs.ts
+++ b/components/tabs.ts
@@ -6,9 +6,9 @@ const Tabs = Vue.extend({
     render(this: Vue & {readonly value?: string, _v?: string, selected?: string, tabs: {readonly [key: string]: string}},
            createElement: CreateElement): VNode {
         let children: {[key: string]: string | VNode | undefined};
-        if(<VNode[] | undefined>this.$slots['default'] !== undefined) {
+        if(this.$slots['default'] !== undefined) {
             children = {};
-            this.$slots['default'].forEach((child, i) => {
+            this.$slots['default']!.forEach((child, i) => {
                 if(child.context !== undefined) children[child.key !== undefined ? child.key : i] = child;
             });
         } else children = this.tabs;
@@ -19,14 +19,11 @@ const Tabs = Vue.extend({
             this.$emit('input', this._v = keys[0]);
         if(this.selected !== this._v && children[this.selected!] !== undefined)
             this.$emit('input', this._v = this.selected);
-        return createElement('ul', {staticClass: 'nav nav-tabs'}, keys.map((key) => createElement('li', {staticClass: 'nav-item'},
-            [createElement('a', {
-                staticClass: 'nav-link', class: {active: this._v === key}, on: {
-                    click: () => {
-                        this.$emit('input', key);
-                    }
-                }
-            }, [children[key]!])])));
+        return createElement('div', {staticClass: 'nav-tabs-scroll'},
+            [createElement('ul', {staticClass: 'nav nav-tabs'}, keys.map((key) => createElement('li', {staticClass: 'nav-item'},
+                [createElement('a', {
+                    staticClass: 'nav-link', class: {active: this._v === key}, on: { click: () => this.$emit('input', key) }
+                }, [children[key]!])])))]);
     }
 });
 
diff --git a/electron/Index.vue b/electron/Index.vue
index 76dbd7f..7fa5882 100644
--- a/electron/Index.vue
+++ b/electron/Index.vue
@@ -10,18 +10,18 @@
                     </div>
                     <div class="form-group">
                         <label class="control-label" for="account">{{l('login.account')}}</label>
-                        <input class="form-control" id="account" v-model="settings.account" @keypress.enter="login" :disabled="loggingIn"/>
+                        <input class="form-control" id="account" v-model="settings.account" @keypress.enter="login()" :disabled="loggingIn"/>
                     </div>
                     <div class="form-group">
                         <label class="control-label" for="password">{{l('login.password')}}</label>
-                        <input class="form-control" type="password" id="password" v-model="password" @keypress.enter="login" :disabled="loggingIn"/>
+                        <input class="form-control" type="password" id="password" v-model="password" @keypress.enter="login()" :disabled="loggingIn"/>
                     </div>
                     <div class="form-group" v-show="showAdvanced">
                         <label class="control-label" for="host">{{l('login.host')}}</label>
                         <div class="input-group">
-                            <input class="form-control" id="host" v-model="settings.host" @keypress.enter="login" :disabled="loggingIn"/>
+                            <input class="form-control" id="host" v-model="settings.host" @keypress.enter="login()" :disabled="loggingIn"/>
                             <div class="input-group-append">
-                                <button class="btn btn-outline-secondary" @click="resetHost"><span class="fas fa-undo-alt"></span></button>
+                                <button class="btn btn-outline-secondary" @click="resetHost()"><span class="fas fa-undo-alt"></span></button>
                             </div>
                         </div>
                     </div>
@@ -65,6 +65,7 @@
 </template>
 
 <script lang="ts">
+    import {Component, Hook} from '@f-list/vue-ts';
     import Axios from 'axios';
     import * as electron from 'electron';
     import log from 'electron-log'; //tslint:disable-line:match-default-export-name
@@ -74,7 +75,6 @@
     import * as Raven from 'raven-js';
     import {promisify} from 'util';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
     import Chat from '../chat/Chat.vue';
     import {getKey, Settings} from '../chat/common';
     import core, {init as initCore} from '../chat/core';
@@ -109,15 +109,14 @@
         components: {chat: Chat, modal: Modal, characterPage: CharacterPage}
     })
     export default class Index extends Vue {
-        //tslint:disable:no-null-keyword
         showAdvanced = false;
         saveLogin = false;
         loggingIn = false;
         password = '';
         character: string | undefined;
-        characters: string[] | null = null;
+        characters: string[] | undefined;
         error = '';
-        defaultCharacter: string | null = null;
+        defaultCharacter: string | undefined;
         l = l;
         settings!: GeneralSettings;
         importProgress = 0;
@@ -125,6 +124,7 @@
         fixCharacters: ReadonlyArray<string> = [];
         fixCharacter = '';
 
+        @Hook('created')
         async created(): Promise<void> {
             if(this.settings.account.length > 0) this.saveLogin = true;
             keyStore.getPassword(this.settings.account)
@@ -192,8 +192,8 @@
                 });
                 connection.onEvent('closed', () => {
                     if(this.character === undefined) return;
+                    electron.ipcRenderer.send('disconnect', this.character);
                     this.character = undefined;
-                    electron.ipcRenderer.send('disconnect', connection.character);
                     parent.send('disconnect', webContents.id);
                     Raven.setUserContext();
                 });
diff --git a/electron/Window.vue b/electron/Window.vue
index a984701..dd43d47 100644
--- a/electron/Window.vue
+++ b/electron/Window.vue
@@ -18,14 +18,14 @@
                     </a>
                 </li>
                 <li v-show="canOpenTab" class="addTab nav-item" id="addTab">
-                    <a href="#" @click.prevent="addTab" class="nav-link"><i class="fa fa-plus"></i></a>
+                    <a href="#" @click.prevent="addTab()" class="nav-link"><i class="fa fa-plus"></i></a>
                 </li>
             </ul>
             <div style="flex:1;display:flex;justify-content:flex-end;-webkit-app-region:drag" class="btn-group"
                 id="windowButtons">
-                <i class="far fa-window-minimize btn btn-light" @click.stop="minimize"></i>
-                <i class="far btn btn-light" :class="'fa-window-' + (isMaximized ? 'restore' : 'maximize')" @click="maximize"></i>
-                <span class="btn btn-light" @click.stop="close">
+                <i class="far fa-window-minimize btn btn-light" @click.stop="minimize()"></i>
+                <i class="far btn btn-light" :class="'fa-window-' + (isMaximized ? 'restore' : 'maximize')" @click="maximize()"></i>
+                <span class="btn btn-light" @click.stop="close()">
                     <i class="fa fa-times fa-lg"></i>
                 </span>
             </div>
@@ -36,12 +36,12 @@
 <script lang="ts">
     import Sortable = require('sortablejs'); //tslint:disable-line:no-require-imports
 
+    import {Component, Hook} from '@f-list/vue-ts';
     import * as electron from 'electron';
     import * as fs from 'fs';
     import * as path from 'path';
     import * as url from 'url';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
     import l from '../chat/localize';
     import {GeneralSettings} from './common';
 
@@ -71,10 +71,9 @@
 
     @Component
     export default class Window extends Vue {
-        //tslint:disable:no-null-keyword
         settings!: GeneralSettings;
         tabs: Tab[] = [];
-        activeTab: Tab | null = null;
+        activeTab: Tab | undefined;
         tabMap: {[key: number]: Tab} = {};
         isMaximized = browserWindow.isMaximized();
         canOpenTab = true;
@@ -83,6 +82,7 @@
         platform = process.platform;
         lockTab = false;
 
+        @Hook('mounted')
         mounted(): void {
             this.addTab();
             electron.ipcRenderer.on('settings', (_: Event, settings: GeneralSettings) => this.settings = settings);
@@ -105,7 +105,6 @@
                     tab.hasNew = false;
                     electron.ipcRenderer.send('has-new', this.tabs.reduce((cur, t) => cur || t.hasNew, false));
                 }
-                electron.ipcRenderer.send('disconnect', tab.user);
                 tab.user = undefined;
                 tab.tray.setToolTip(l('title'));
                 tab.tray.setContextMenu(electron.remote.Menu.buildFromTemplate(this.createTrayMenu(tab)));
@@ -115,14 +114,8 @@
                 tab.hasNew = hasNew;
                 electron.ipcRenderer.send('has-new', this.tabs.reduce((cur, t) => cur || t.hasNew, false));
             });
-            browserWindow.on('maximize', () => {
-                this.isMaximized = true;
-                this.activeTab!.view.setBounds(getWindowBounds());
-            });
-            browserWindow.on('unmaximize', () => {
-                this.isMaximized = false;
-                this.activeTab!.view.setBounds(getWindowBounds());
-            });
+            browserWindow.on('maximize', () => this.isMaximized = true);
+            browserWindow.on('unmaximize', () => this.isMaximized = false);
             electron.ipcRenderer.on('switch-tab', (_: Event) => {
                 const index = this.tabs.indexOf(this.activeTab!);
                 this.show(this.tabs[index + 1 === this.tabs.length ? 0 : index + 1]);
@@ -133,12 +126,12 @@
             document.addEventListener('click', () => this.activeTab!.view.webContents.focus());
             window.addEventListener('focus', () => this.activeTab!.view.webContents.focus());
 
-            Sortable.create(this.$refs['tabs'], {
+            Sortable.create(<HTMLElement>this.$refs['tabs'], {
                 animation: 50,
-                onEnd: (e: {oldIndex: number, newIndex: number}) => {
+                onEnd: (e) => {
                     if(e.oldIndex === e.newIndex) return;
-                    const tab = this.tabs.splice(e.oldIndex, 1)[0];
-                    this.tabs.splice(e.newIndex, 0, tab);
+                    const tab = this.tabs.splice(e.oldIndex!, 1)[0];
+                    this.tabs.splice(e.newIndex!, 0, tab);
                 },
                 onMove: (e: {related: HTMLElement}) => e.related.id !== 'addTab',
                 filter: '.addTab'
@@ -163,7 +156,7 @@
         }
 
         destroyAllTabs(): void {
-            browserWindow.setBrowserView(null!);
+            browserWindow.setBrowserView(null!); //tslint:disable-line:no-null-keyword
             this.tabs.forEach(destroyTab);
             this.tabs = [];
         }
@@ -230,7 +223,7 @@
             electron.ipcRenderer.send('has-new', this.tabs.reduce((cur, t) => cur || t.hasNew, false));
             delete this.tabMap[tab.view.webContents.id];
             if(this.tabs.length === 0) {
-                browserWindow.setBrowserView(null!);
+                browserWindow.setBrowserView(null!); //tslint:disable-line:no-null-keyword
                 if(process.env.NODE_ENV === 'production') browserWindow.close();
             } else if(this.activeTab === tab) this.show(this.tabs[0]);
             destroyTab(tab);
diff --git a/electron/chat.ts b/electron/chat.ts
index 71a6db3..b786265 100644
--- a/electron/chat.ts
+++ b/electron/chat.ts
@@ -49,19 +49,17 @@ document.addEventListener('keydown', (e: KeyboardEvent) => {
 
 process.env.SPELLCHECKER_PREFER_HUNSPELL = '1';
 const sc = nativeRequire<{
-    Spellchecker: {
-        new(): {
-            add(word: string): void
-            remove(word: string): void
-            isMisspelled(x: string): boolean
-            setDictionary(name: string | undefined, dir: string): void
-            getCorrectionsForMisspelling(word: string): ReadonlyArray<string>
-        }
+    Spellchecker: new() => {
+        add(word: string): void
+        remove(word: string): void
+        isMisspelled(x: string): boolean
+        setDictionary(name: string | undefined, dir: string): void
+        getCorrectionsForMisspelling(word: string): ReadonlyArray<string>
     }
 }>('spellchecker/build/Release/spellchecker.node');
 const spellchecker = new sc.Spellchecker();
 
-Axios.defaults.params = { __fchat: `desktop/${electron.remote.app.getVersion()}` };
+Axios.defaults.params = {__fchat: `desktop/${electron.remote.app.getVersion()}`};
 
 if(process.env.NODE_ENV === 'production') {
     setupRaven('https://a9239b17b0a14f72ba85e8729b9d1612@sentry.f-list.net/2', electron.remote.app.getVersion());
@@ -72,30 +70,23 @@ if(process.env.NODE_ENV === 'production') {
     });
 }
 let browser: string | undefined;
+
 function openIncognito(url: string): void {
     if(browser === undefined)
         try { //tslint:disable-next-line:max-line-length
             browser = execSync(`FOR /F "skip=2 tokens=3" %A IN ('REG QUERY HKCU\\Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\http\\UserChoice /v ProgId') DO @(echo %A)`)
-                .toString().trim();
+                .toString().trim().toLowerCase();
         } catch(e) {
             console.error(e);
         }
-    switch(browser) {
-        case 'FirefoxURL':
-            exec(`start firefox.exe -private-window ${url}`);
-            break;
-        case 'ChromeHTML':
-            exec(`start chrome.exe -incognito ${url}`);
-            break;
-        case 'VivaldiHTM':
-            exec(`start vivaldi.exe -incognito ${url}`);
-            break;
-        case 'OperaStable':
-            exec(`start opera.exe -private ${url}`);
-            break;
-        default:
-            exec(`start iexplore.exe -private ${url}`);
-    }
+    const commands  = {
+        chrome: 'chrome.exe -incognito', firefox: 'firefox.exe -private-window', vivaldi: 'vivaldi.exe -incognito',
+        opera: 'opera.exe -private'
+    };
+    let start = 'iexplore.exe -private';
+    for(const key in commands)
+        if(browser!.indexOf(key) !== -1) start = commands[<keyof typeof commands>key];
+    exec(`start ${start} ${url}`);
 }
 
 const webContents = electron.remote.getCurrentWebContents();
@@ -172,14 +163,16 @@ webContents.on('context-menu', (_, props) => {
 });
 
 let dictDir = path.join(electron.remote.app.getPath('userData'), 'spellchecker');
-if(process.platform === 'win32')
-   exec(`for /d %I in ("${dictDir}") do @echo %~sI`, (_, stdout) => { dictDir = stdout.trim(); });
+if(process.platform === 'win32') //get the path in DOS (8-character) format as special characters cause problems otherwise
+    exec(`for /d %I in ("${dictDir}") do @echo %~sI`, (_, stdout) => dictDir = stdout.trim());
 electron.webFrame.setSpellCheckProvider('', false, {spellCheck: (text) => !spellchecker.isMisspelled(text)});
+
 function onSettings(s: GeneralSettings): void {
     settings = s;
     spellchecker.setDictionary(s.spellcheckLang, dictDir);
     for(const word of s.customDictionary) spellchecker.add(word);
 }
+
 electron.ipcRenderer.on('settings', (_: Event, s: GeneralSettings) => onSettings(s));
 
 const params = <{[key: string]: string | undefined}>qs.parse(window.location.search.substr(1));
diff --git a/electron/filesystem.ts b/electron/filesystem.ts
index 42f0b58..3e183ee 100644
--- a/electron/filesystem.ts
+++ b/electron/filesystem.ts
@@ -290,7 +290,7 @@ export class Logs implements Logging {
     async getAvailableCharacters(): Promise<ReadonlyArray<string>> {
         const baseDir = core.state.generalSettings!.logDirectory;
         mkdir(baseDir);
-        return (fs.readdirSync(baseDir)).filter((x) => fs.lstatSync(path.join(baseDir, x)).isDirectory());
+        return (fs.readdirSync(baseDir)).filter((x) => fs.statSync(path.join(baseDir, x)).isDirectory());
     }
 }
 
@@ -312,7 +312,7 @@ export class SettingsStore implements Settings.Store {
 
     async getAvailableCharacters(): Promise<ReadonlyArray<string>> {
         const baseDir = core.state.generalSettings!.logDirectory;
-        return (fs.readdirSync(baseDir)).filter((x) => fs.lstatSync(path.join(baseDir, x)).isDirectory());
+        return (fs.readdirSync(baseDir)).filter((x) => fs.statSync(path.join(baseDir, x)).isDirectory());
     }
 
     async set<K extends keyof Settings.Keys>(key: K, value: Settings.Keys[K]): Promise<void> {
diff --git a/electron/importer.ts b/electron/importer.ts
index 65a1065..1f43b67 100644
--- a/electron/importer.ts
+++ b/electron/importer.ts
@@ -184,7 +184,7 @@ export async function importCharacter(ownCharacter: string, progress: (progress:
         progress(i / subdirs.length);
         const subdir = subdirs[i];
         const subdirPath = path.join(dir, subdir);
-        if(subdir === '!Notifications' || subdir === 'Global' || !fs.lstatSync(subdirPath).isDirectory()) continue;
+        if(subdir === '!Notifications' || subdir === 'Global' || !fs.statSync(subdirPath).isDirectory()) continue;
 
         const channelMarker = subdir.indexOf('(');
         let key: string, name: string;
diff --git a/electron/main.ts b/electron/main.ts
index fee4a03..835527d 100644
--- a/electron/main.ts
+++ b/electron/main.ts
@@ -381,7 +381,10 @@ function onReady(): void {
         settings.customDictionary.splice(settings.customDictionary.indexOf(word), 1);
         setGeneralSettings(settings);
     });
-    electron.ipcMain.on('disconnect', (_: Event, character: string) => characters.splice(characters.indexOf(character), 1));
+    electron.ipcMain.on('disconnect', (_: Event, character: string) => {
+        const index = characters.indexOf(character);
+        if(index !== -1) characters.splice(index, 1);
+    });
     const emptyBadge = electron.nativeImage.createEmpty();
     //tslint:disable-next-line:no-require-imports
     const badge = electron.nativeImage.createFromPath(path.join(__dirname, <string>require('./build/badge.png')));
diff --git a/electron/package.json b/electron/package.json
index 8d62200..03b4ff1 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fchat",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "author": "The F-List Team",
   "description": "F-List.net Chat Client",
   "main": "main.js",
diff --git a/electron/tsconfig-main.json b/electron/tsconfig-main.json
index ec9c396..3f40310 100644
--- a/electron/tsconfig-main.json
+++ b/electron/tsconfig-main.json
@@ -1,10 +1,9 @@
 {
   "compilerOptions": {
-    "target": "es6",
+    "target": "es2017",
     "module": "commonjs",
     "sourceMap": true,
     "allowJs": true,
-    "outDir": "build",
     "noEmitHelpers": true,
     "importHelpers": true,
     "forceConsistentCasingInFileNames": true,
diff --git a/electron/tsconfig-renderer.json b/electron/tsconfig-renderer.json
index 8943c76..af84930 100644
--- a/electron/tsconfig-renderer.json
+++ b/electron/tsconfig-renderer.json
@@ -1,11 +1,10 @@
 {
   "compilerOptions": {
-    "target": "es6",
+    "target": "es2017",
     "module": "commonjs",
     "sourceMap": true,
     "experimentalDecorators": true,
     "allowJs": true,
-    "outDir": "build",
     "noEmitHelpers": true,
     "importHelpers": true,
     "forceConsistentCasingInFileNames": true,
diff --git a/electron/webpack.config.js b/electron/webpack.config.js
index 14d9e5a..cca8830 100644
--- a/electron/webpack.config.js
+++ b/electron/webpack.config.js
@@ -1,8 +1,9 @@
 const path = require('path');
 const fs = require('fs');
-const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
+const ForkTsCheckerWebpackPlugin = require('@f-list/fork-ts-checker-webpack-plugin');
 const OptimizeCssAssetsPlugin = require('optimize-css-assets-webpack-plugin');
 const VueLoaderPlugin = require('vue-loader/lib/plugin');
+const vueTransformer = require('@f-list/vue-ts/transform').default;
 
 const mainConfig = {
     entry: [path.join(__dirname, 'main.ts'), path.join(__dirname, 'package.json')],
@@ -69,7 +70,8 @@ const mainConfig = {
                 options: {
                     appendTsSuffixTo: [/\.vue$/],
                     configFile: __dirname + '/tsconfig-renderer.json',
-                    transpileOnly: true
+                    transpileOnly: true,
+                    getCustomTransformers: () => ({before: [vueTransformer]})
                 }
             },
             {test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file-loader'},
diff --git a/fchat/characters.ts b/fchat/characters.ts
index 9395012..eafc0c8 100644
--- a/fchat/characters.ts
+++ b/fchat/characters.ts
@@ -59,9 +59,9 @@ export default function(this: void, connection: Connection): Interfaces.State {
     connection.onEvent('connecting', async(isReconnect) => {
         state.friends = [];
         state.bookmarks = [];
-        state.bookmarkList = (<{characters: string[]}>await connection.queryApi('bookmark-list.php')).characters;
-        state.friendList = ((<{friends: {source: string, dest: string, last_online: number}[]}>await connection.queryApi('friend-list.php'))
-            .friends).map((x) => x.dest);
+        state.bookmarkList = (await connection.queryApi<{characters: string[]}>('bookmark-list.php')).characters;
+        state.friendList = (await connection.queryApi<{friends: {source: string, dest: string, last_online: number}[]}>('friend-list.php'))
+            .friends.map((x) => x.dest);
         if(isReconnect && (<Character | undefined>state.ownCharacter) !== undefined)
             reconnectStatus = {status: state.ownCharacter.status, statusmsg: state.ownCharacter.statusText};
         for(const key in state.characters) {
diff --git a/fchat/connection.ts b/fchat/connection.ts
index 035e3de..739615b 100644
--- a/fchat/connection.ts
+++ b/fchat/connection.ts
@@ -86,11 +86,12 @@ export default class Connection implements Interfaces.Connection {
         this.reconnectDelay = this.reconnectDelay >= 30000 ? 60000 : this.reconnectDelay >= 10000 ? 30000 : 10000;
     }
 
-    close(): void {
+    close(keepState: boolean = true): void {
         if(this.reconnectTimer !== undefined) clearTimeout(this.reconnectTimer);
         this.reconnectTimer = undefined;
         this.cleanClose = true;
         if(this.socket !== undefined) this.socket.close();
+        if(!keepState) this.character = '';
     }
 
     get isOpen(): boolean {
@@ -143,7 +144,7 @@ export default class Connection implements Interfaces.Connection {
     }
 
     send<K extends keyof Interfaces.ClientCommands>(command: K, data?: Interfaces.ClientCommands[K]): void {
-        if(this.socket !== undefined)
+        if(this.socket !== undefined && this.socket.readyState === WebSocketConnection.ReadyState.OPEN)
             this.socket.send(<string>command + (data !== undefined ? ` ${JSON.stringify(data)}` : ''));
     }
 
diff --git a/fchat/interfaces.ts b/fchat/interfaces.ts
index 9bb2294..d6e3cf4 100644
--- a/fchat/interfaces.ts
+++ b/fchat/interfaces.ts
@@ -138,7 +138,7 @@ export namespace Connection {
         readonly vars: Vars
         readonly isOpen: boolean
         connect(character: string): void
-        close(): void
+        close(keepState?: boolean): void
         onMessage<K extends keyof ServerCommands>(type: K, handler: CommandHandler<K>): void
         offMessage<K extends keyof ServerCommands>(type: K, handler: CommandHandler<K>): void
         onEvent(type: EventType, handler: EventHandler): void
@@ -232,6 +232,10 @@ export namespace Channel {
 
 export type Channel = Channel.Channel;
 
+export namespace WebSocketConnection {
+    export enum ReadyState { CONNECTING, OPEN, CLOSING, CLOSED }
+}
+
 export interface WebSocketConnection {
     close(): void
     onMessage(handler: (message: string) => Promise<void>): void
@@ -239,4 +243,5 @@ export interface WebSocketConnection {
     onClose(handler: () => void): void
     onError(handler: (error: Error) => void): void
     send(message: string): void
+    readyState: WebSocketConnection.ReadyState
 }
\ No newline at end of file
diff --git a/interfaces.ts b/interfaces.ts
new file mode 100644
index 0000000..e8717b2
--- /dev/null
+++ b/interfaces.ts
@@ -0,0 +1,99 @@
+export interface SimpleCharacter {
+    id: number
+    name: string
+    deleted: boolean
+}
+
+export interface InlineImage {
+    id: number
+    name: string
+    hash: string
+    extension: string
+    nsfw: boolean
+}
+
+export type CharacterImage = CharacterImageOld | CharacterImageNew;
+
+export interface CharacterImageNew {
+    id: number
+    extension: string
+    description: string
+    hash: string
+    sort_order: number | null
+}
+
+export interface CharacterImageOld {
+    id: number
+    extension: string
+    hash: string
+    height: number
+    width: number
+    description: string
+    sort_order: number | null
+    url: string
+}
+
+export type InfotagType = 'number' | 'text' | 'list';
+
+export interface CharacterInfotag {
+    list?: number
+    string?: string
+    number?: number
+}
+
+export interface Infotag {
+    id: number
+    name: string
+    type: InfotagType
+    search_field: string
+    validator: string
+    allow_legacy: boolean
+    infotag_group: string
+    list?: number
+}
+
+export interface Character extends SimpleCharacter {
+    id: number
+    name: string
+    title: string
+    description: string
+    kinks: {[key: string]: KinkChoice | number | undefined}
+    inlines: {[key: string]: InlineImage}
+    customs: {[key: string]: CustomKink | undefined}
+    infotags: {[key: number]: CharacterInfotag | undefined}
+    created_at: number
+    updated_at: number
+    views: number
+    last_online_at?: number
+    timezone?: number
+    image_count?: number
+    online_chat?: boolean
+}
+
+export type KinkChoice = 'favorite' | 'yes' | 'maybe' | 'no';
+
+export interface CharacterSettings {
+    readonly customs_first: boolean
+    readonly show_friends: boolean
+    readonly show_badges: boolean
+    readonly guestbook: boolean
+    readonly block_bookmarks: boolean
+    readonly public: boolean
+    readonly moderate_guestbook: boolean
+    readonly hide_timezone: boolean
+    readonly hide_contact_details: boolean
+}
+
+export interface Kink {
+    id: number
+    name: string
+    description: string
+    kink_group: number
+}
+
+export interface CustomKink {
+    id: number
+    name: string
+    choice: KinkChoice
+    description: string
+}
\ No newline at end of file
diff --git a/mobile/Index.vue b/mobile/Index.vue
index 3a8d4aa..aa6a977 100644
--- a/mobile/Index.vue
+++ b/mobile/Index.vue
@@ -10,16 +10,16 @@
                     </div>
                     <div class="form-group">
                         <label class="control-label" for="account">{{l('login.account')}}</label>
-                        <input class="form-control" id="account" v-model="settings.account" @keypress.enter="login" :disabled="loggingIn"/>
+                        <input class="form-control" id="account" v-model="settings.account" @keypress.enter="login()" :disabled="loggingIn"/>
                     </div>
                     <div class="form-group">
                         <label class="control-label" for="password">{{l('login.password')}}</label>
-                        <input class="form-control" type="password" id="password" v-model="settings.password" @keypress.enter="login" :disabled="loggingIn"/>
+                        <input class="form-control" type="password" id="password" v-model="settings.password" @keypress.enter="login()" :disabled="loggingIn"/>
                     </div>
                     <div class="form-group" v-show="showAdvanced">
                         <label class="control-label" for="host">{{l('login.host')}}</label>
                         <div class="input-group">
-                            <input class="form-control" id="host" v-model="settings.host" @keypress.enter="login" :disabled="loggingIn"/>
+                            <input class="form-control" id="host" v-model="settings.host" @keypress.enter="login()" :disabled="loggingIn"/>
                             <div class="input-group-append">
                                 <button class="btn btn-outline-secondary" @click="resetHost"><span class="fas fa-undo-alt"></span></button>
                             </div>
@@ -40,7 +40,7 @@
                         <label for="save"><input type="checkbox" id="save" v-model="saveLogin"/> {{l('login.save')}}</label>
                     </div>
                     <div class="form-group" style="text-align:right">
-                        <button class="btn btn-primary" @click="login" :disabled="loggingIn">
+                        <button class="btn btn-primary" @click="login()" :disabled="loggingIn">
                             {{l(loggingIn ? 'login.working' : 'login.submit')}}
                         </button>
                     </div>
@@ -57,11 +57,11 @@
 </template>
 
 <script lang="ts">
+    import {Component, Hook} from '@f-list/vue-ts';
     import Axios from 'axios';
     import * as qs from 'qs';
     import * as Raven from 'raven-js';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
     import Chat from '../chat/Chat.vue';
     import core, {init as initCore} from '../chat/core';
     import l from '../chat/localize';
@@ -94,18 +94,18 @@
         components: {chat: Chat, modal: Modal, characterPage: CharacterPage}
     })
     export default class Index extends Vue {
-        //tslint:disable:no-null-keyword
         showAdvanced = false;
         saveLogin = false;
         loggingIn = false;
-        characters: ReadonlyArray<string> | null = null;
+        characters?: ReadonlyArray<string>;
         error = '';
-        defaultCharacter: string | null = null;
+        defaultCharacter?: string;
         settingsStore = new SettingsStore();
         l = l;
-        settings: GeneralSettings | null = null;
+        settings!: GeneralSettings;
         profileName = '';
 
+        @Hook('created')
         async created(): Promise<void> {
             document.addEventListener('open-profile', (e: Event) => {
                 const profileViewer = <Modal>this.$refs['profileViewer'];
@@ -123,13 +123,13 @@
         }
 
         resetHost(): void {
-            this.settings!.host = new GeneralSettings().host;
+            this.settings.host = new GeneralSettings().host;
         }
 
         get styling(): string {
-            if(window.NativeView !== undefined) window.NativeView.setTheme(this.settings!.theme);
+            if(window.NativeView !== undefined) window.NativeView.setTheme(this.settings.theme);
             //tslint:disable-next-line:no-require-imports
-            return `<style>${require('../scss/fa.scss')}${require(`../scss/themes/chat/${this.settings!.theme}.scss`)}</style>`;
+            return `<style>${require('../scss/fa.scss')}${require(`../scss/themes/chat/${this.settings.theme}.scss`)}</style>`;
         }
 
         async login(): Promise<void> {
@@ -138,17 +138,17 @@
             try {
                 const data = <{ticket?: string, error: string, characters: {[key: string]: number}, default_character: number}>
                     (await Axios.post('https://www.f-list.net/json/getApiTicket.php', qs.stringify({
-                        account: this.settings!.account, password: this.settings!.password, no_friends: true, no_bookmarks: true,
+                        account: this.settings.account, password: this.settings.password, no_friends: true, no_bookmarks: true,
                         new_character_list: true
                     }))).data;
                 if(data.error !== '') {
                     this.error = data.error;
                     return;
                 }
-                if(this.saveLogin) await setGeneralSettings(this.settings!);
-                Socket.host = this.settings!.host;
+                if(this.saveLogin) await setGeneralSettings(this.settings);
+                Socket.host = this.settings.host;
                 const connection = new Connection('F-Chat 3.0 (Mobile)', appVersion, Socket,
-                    this.settings!.account, this.settings!.password);
+                    this.settings.account, this.settings.password);
                 connection.onEvent('connected', () => {
                     Raven.setUserContext({username: core.connection.character});
                     document.addEventListener('backbutton', confirmBack);
diff --git a/mobile/android/app/.gitignore b/mobile/android/app/.gitignore
index 956c004..2bdf0f6 100644
--- a/mobile/android/app/.gitignore
+++ b/mobile/android/app/.gitignore
@@ -1,2 +1,3 @@
 /build
+/debug
 /release
\ No newline at end of file
diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index 0f72b88..10f62a1 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-	compileSdkVersion 27
-	buildToolsVersion "27.0.3"
+	compileSdkVersion 28
+	buildToolsVersion "28.0.3"
 	defaultConfig {
 		applicationId "net.f_list.fchat"
-		minSdkVersion 19
+		minSdkVersion 21
 		targetSdkVersion 27
-		versionCode 20
-		versionName "3.0.9"
+		versionCode 21
+		versionName "3.0.10"
 	}
 	buildTypes {
 		release {
@@ -20,7 +20,7 @@ android {
 }
 
 dependencies {
-	compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+	implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {
 	mavenCentral()
diff --git a/mobile/android/app/src/main/kotlin/net/f_list/fchat/File.kt b/mobile/android/app/src/main/kotlin/net/f_list/fchat/File.kt
index b20a8b7..a7f82f9 100644
--- a/mobile/android/app/src/main/kotlin/net/f_list/fchat/File.kt
+++ b/mobile/android/app/src/main/kotlin/net/f_list/fchat/File.kt
@@ -5,6 +5,7 @@ import android.webkit.JavascriptInterface
 import org.json.JSONArray
 import java.io.File
 import java.io.FileOutputStream
+import java.io.RandomAccessFile
 import java.util.*
 
 class File(private val ctx: Context) {
@@ -12,7 +13,7 @@ class File(private val ctx: Context) {
 	fun read(name: String): String? {
 		val file = File(ctx.filesDir, name)
 		if(!file.exists()) return null
-		Scanner(file).useDelimiter("\\Z").use { return it.next() }
+		return file.readText()
 	}
 
 	@JavascriptInterface
diff --git a/mobile/android/app/src/main/kotlin/net/f_list/fchat/MainActivity.kt b/mobile/android/app/src/main/kotlin/net/f_list/fchat/MainActivity.kt
index fc69598..c70fbf6 100644
--- a/mobile/android/app/src/main/kotlin/net/f_list/fchat/MainActivity.kt
+++ b/mobile/android/app/src/main/kotlin/net/f_list/fchat/MainActivity.kt
@@ -118,7 +118,7 @@ class MainActivity : Activity() {
 		}
 		val view = EditText(this)
 		view.hint = "Enter character name"
-		AlertDialog.Builder(this).setView(view).setPositiveButton("OK", { _, _ ->
+		AlertDialog.Builder(this).setView(view).setPositiveButton("OK") { _, _ ->
 			val file = java.io.File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS), "test.zip")
 			val dest = FileOutputStream(file)
 			val out = ZipOutputStream(dest)
@@ -126,7 +126,7 @@ class MainActivity : Activity() {
 			out.close()
 			val downloadManager = getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
 			downloadManager.addCompletedDownload(file.name, file.name, false, "text/plain", file.absolutePath, file.length(), true)
-		}).setNegativeButton("Cancel", { dialog, _ -> dialog.dismiss() }).setTitle("DEBUG").show()
+		}.setNegativeButton("Cancel") { dialog, _ -> dialog.dismiss() }.setTitle("DEBUG").show()
 	}
 
 	override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
diff --git a/mobile/android/app/src/main/kotlin/net/f_list/fchat/Notifications.kt b/mobile/android/app/src/main/kotlin/net/f_list/fchat/Notifications.kt
index be81905..68c4b1f 100644
--- a/mobile/android/app/src/main/kotlin/net/f_list/fchat/Notifications.kt
+++ b/mobile/android/app/src/main/kotlin/net/f_list/fchat/Notifications.kt
@@ -22,7 +22,7 @@ class Notifications(private val ctx: Context) {
 	init {
 		if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
 			val manager = ctx.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager;
-			manager.createNotificationChannel(NotificationChannel("messages", ctx.getString(R.string.channel_messages), NotificationManager.IMPORTANCE_DEFAULT))
+			manager.createNotificationChannel(NotificationChannel("messages", ctx.getString(R.string.channel_messages), NotificationManager.IMPORTANCE_HIGH))
 		}
 	}
 
diff --git a/mobile/ios/F-Chat/ViewController.swift b/mobile/ios/F-Chat/ViewController.swift
index e26dc09..3008f17 100644
--- a/mobile/ios/F-Chat/ViewController.swift
+++ b/mobile/ios/F-Chat/ViewController.swift
@@ -87,7 +87,10 @@ class ViewController: UIViewController, WKNavigationDelegate, WKUIDelegate {
             let start = str.index(of: ",")!
             let file = FileManager.default.temporaryDirectory.appendingPathComponent(str[str.index(str.startIndex, offsetBy: 5)..<start].removingPercentEncoding!)
             try! str.suffix(from: str.index(after: start)).removingPercentEncoding!.write(to: file, atomically: false, encoding: .utf8)
-            self.present(UIActivityViewController(activityItems: [file], applicationActivities: nil), animated: true, completion: nil)
+            let controller = UIActivityViewController(activityItems: [file], applicationActivities: nil)
+            controller.popoverPresentationController?.sourceView = webView
+            controller.popoverPresentationController?.sourceRect = CGRect(origin: webView.bounds.origin, size: CGSize(width: 0, height: 0))
+            self.present(controller, animated: true, completion: nil)
             return
         }
         let match = profileRegex.matches(in: str, range: NSRange(location: 0, length: str.count))
diff --git a/mobile/ios/F-Chat/www b/mobile/ios/F-Chat/www
deleted file mode 100644
index 933a599..0000000
--- a/mobile/ios/F-Chat/www
+++ /dev/null
@@ -1 +0,0 @@
-../../www
\ No newline at end of file
diff --git a/mobile/ios/F-Chat/www b/mobile/ios/F-Chat/www
new file mode 120000
index 0000000..933a599
--- /dev/null
+++ b/mobile/ios/F-Chat/www
@@ -0,0 +1 @@
+../../www
\ No newline at end of file
diff --git a/mobile/package.json b/mobile/package.json
index 0acc5a5..3087b51 100644
--- a/mobile/package.json
+++ b/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "net.f_list.fchat",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "displayName": "F-Chat",
   "author": "The F-List Team",
   "description": "F-List.net Chat Client",
diff --git a/mobile/tsconfig.json b/mobile/tsconfig.json
index 463f983..cdd506c 100644
--- a/mobile/tsconfig.json
+++ b/mobile/tsconfig.json
@@ -1,16 +1,10 @@
 {
   "compilerOptions": {
-    "target": "es5",
-    "lib": [
-      "dom",
-      "es5",
-      "es2015.promise"
-    ],
+    "target": "es6",
     "module": "commonjs",
     "sourceMap": true,
     "experimentalDecorators": true,
     "allowJs": true,
-    "outDir": "build",
     "noEmitHelpers": true,
     "importHelpers": true,
     "forceConsistentCasingInFileNames": true,
@@ -18,8 +12,5 @@
     "noUnusedLocals": true,
     "noUnusedParameters": true
   },
-  "include": ["chat.ts", "../**/*.d.ts"],
-  "exclude": [
-    "node_modules"
-  ]
+  "include": ["chat.ts", "../**/*.d.ts"]
 }
\ No newline at end of file
diff --git a/mobile/webpack.config.js b/mobile/webpack.config.js
index 26d5db2..9d124ea 100644
--- a/mobile/webpack.config.js
+++ b/mobile/webpack.config.js
@@ -1,6 +1,7 @@
 const path = require('path');
-const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
+const ForkTsCheckerWebpackPlugin = require('@f-list/fork-ts-checker-webpack-plugin');
 const VueLoaderPlugin = require('vue-loader/lib/plugin');
+const vueTransformer = require('@f-list/vue-ts/transform').default;
 
 const config = {
     entry: {
@@ -19,7 +20,8 @@ const config = {
                 options: {
                     appendTsSuffixTo: [/\.vue$/],
                     configFile: __dirname + '/tsconfig.json',
-                    transpileOnly: true
+                    transpileOnly: true,
+                    getCustomTransformers: () => ({before: [vueTransformer]})
                 }
             },
             {
diff --git a/package.json b/package.json
index df10166..70baf03 100644
--- a/package.json
+++ b/package.json
@@ -5,42 +5,40 @@
   "description": "F-List Exported",
   "license": "MIT",
   "devDependencies": {
-    "@fortawesome/fontawesome-free-webfonts": "^1.0.6",
-    "@types/lodash": "^4.14.116",
-    "@types/node": "^10.11.2",
-    "@types/sortablejs": "^1.3.31",
+    "@f-list/fork-ts-checker-webpack-plugin": "^0.5.2",
+    "@f-list/vue-ts": "^1.0.2",
+    "@fortawesome/fontawesome-free": "^5.6.1",
+    "@types/lodash": "^4.14.119",
+    "@types/sortablejs": "^1.7.0",
     "axios": "^0.18.0",
     "bootstrap": "^4.1.3",
-    "css-loader": "^1.0.0",
-    "date-fns": "^1.28.5",
-    "electron": "^3.0.2",
+    "css-loader": "^2.0.1",
+    "date-fns": "^1.30.1",
+    "electron": "3.0.13",
     "electron-log": "^2.2.17",
-    "electron-packager": "^12.1.2",
+    "electron-packager": "^13.0.1",
     "electron-rebuild": "^1.8.2",
-    "extract-loader": "^3.0.0",
+    "extract-loader": "^3.1.0",
     "file-loader": "^2.0.0",
-    "fork-ts-checker-webpack-plugin": "^0.4.9",
     "lodash": "^4.17.11",
-    "node-sass": "^4.9.3",
+    "node-sass": "^4.11.0",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "qs": "^6.5.1",
+    "qs": "^6.6.0",
     "raven-js": "^3.27.0",
     "sass-loader": "^7.1.0",
-    "sortablejs": "^1.6.0",
-    "style-loader": "^0.23.0",
-    "ts-loader": "^5.2.1",
-    "tslib": "^1.7.1",
-    "tslint": "^5.7.0",
-    "typescript": "^3.1.1",
-    "vue": "^2.5.17",
-    "vue-class-component": "^6.0.0",
+    "sortablejs": "^1.8.0-rc1",
+    "style-loader": "^0.23.1",
+    "ts-loader": "^5.3.1",
+    "tslib": "^1.9.3",
+    "tslint": "^5.12.0",
+    "typescript": "^3.2.2",
+    "vue": "^2.5.21",
     "vue-loader": "^15.4.2",
-    "vue-property-decorator": "^7.1.1",
-    "vue-template-compiler": "^2.5.17",
-    "webpack": "^4.20.2"
+    "vue-template-compiler": "^2.5.21",
+    "webpack": "^4.27.1"
   },
   "dependencies": {
-    "keytar": "^4.2.1",
+    "keytar": "^4.3.0",
     "spellchecker": "^3.5.0"
   },
   "optionalDependencies": {
diff --git a/scss/_chat.scss b/scss/_chat.scss
index 71f28d8..cdcc64d 100644
--- a/scss/_chat.scss
+++ b/scss/_chat.scss
@@ -165,7 +165,6 @@
 
 .message {
   word-wrap: break-word;
-  word-break: break-word;
   padding-bottom: 1px;
 }
 
@@ -185,6 +184,10 @@
   color: color-yiq(theme-color("danger"));
 }
 
+.messages {
+  position: relative;
+}
+
 .messages-both {
   .message-ad {
     background-color: theme-color-level("info", -4);
diff --git a/scss/_core.scss b/scss/_core.scss
index e546ccd..f802c13 100644
--- a/scss/_core.scss
+++ b/scss/_core.scss
@@ -46,8 +46,6 @@
   overflow-wrap: break-word;
   word-wrap: break-word;
 
-  word-break: break-word; // Non standard form used in some browsers.
-
   -ms-hyphens: auto;
   -moz-hyphens: auto;
   -webkit-hyphens: auto;
diff --git a/scss/_flist_overrides.scss b/scss/_flist_overrides.scss
index 87c31c9..a84300f 100644
--- a/scss/_flist_overrides.scss
+++ b/scss/_flist_overrides.scss
@@ -11,6 +11,28 @@ hr {
   font-weight: bold;
 }
 
+.nav-tabs-scroll {
+  overflow-x: auto;
+
+  .nav-tabs {
+    flex-wrap: nowrap;
+
+    .nav-item {
+      flex-shrink: 0;
+    }
+  }
+}
+
+sub {
+  position: static;
+  vertical-align: sub;
+}
+
+sup {
+  position: static;
+  vertical-align: super;
+}
+
 $theme-is-dark: false !default;
 
 // HACK: Bootstrap offers no way to override these by default, and they are SUPER bright.
diff --git a/scss/_functions.scss b/scss/_functions.scss
index 85d1424..c25473c 100644
--- a/scss/_functions.scss
+++ b/scss/_functions.scss
@@ -4,4 +4,8 @@
 
 @function theme-color-border($color-name: "primary") {
   @return theme-color-level($color-name, -9);
+}
+
+@mixin text-outline($color) {
+  text-shadow: $color 1px 0, $color -1px 0, $color 0 1px, $color 0 -1px, $color 1px 1px, $color -1px 1px, $color 1px -1px, $color -1px -1px;
 }
\ No newline at end of file
diff --git a/scss/fa.scss b/scss/fa.scss
index 5b88960..ab5f9ab 100644
--- a/scss/fa.scss
+++ b/scss/fa.scss
@@ -1,5 +1,5 @@
-$fa-font-path: "~@fortawesome/fontawesome-free-webfonts/webfonts" !default;
-@import "~@fortawesome/fontawesome-free-webfonts/scss/fontawesome.scss";
-@import "~@fortawesome/fontawesome-free-webfonts/scss/fa-solid.scss";
-@import "~@fortawesome/fontawesome-free-webfonts/scss/fa-regular.scss";
-@import "~@fortawesome/fontawesome-free-webfonts/scss/fa-brands.scss";
\ No newline at end of file
+$fa-font-path: "~@fortawesome/fontawesome-free/webfonts" !default;
+@import "~@fortawesome/fontawesome-free/scss/fontawesome.scss";
+@import "~@fortawesome/fontawesome-free/scss/solid.scss";
+@import "~@fortawesome/fontawesome-free/scss/regular.scss";
+@import "~@fortawesome/fontawesome-free/scss/brands.scss";
\ No newline at end of file
diff --git a/scss/themes/variables/_dark_derived.scss b/scss/themes/variables/_dark_derived.scss
index fa1b463..63becd5 100644
--- a/scss/themes/variables/_dark_derived.scss
+++ b/scss/themes/variables/_dark_derived.scss
@@ -1,5 +1,5 @@
 $blue-color: #06f;
 
 .blackText {
-  text-shadow: $gray-600 1px 1px, $gray-600 -1px 1px, $gray-600 1px -1px, $gray-600 -1px -1px;
+  @include text-outline($gray-600);
 }
\ No newline at end of file
diff --git a/scss/themes/variables/_default_derived.scss b/scss/themes/variables/_default_derived.scss
index f9dfb61..a4270d6 100644
--- a/scss/themes/variables/_default_derived.scss
+++ b/scss/themes/variables/_default_derived.scss
@@ -1,9 +1,9 @@
 .purpleText {
-  text-shadow: #306 1px 1px, #306 -1px 1px, #306 1px -1px, #306 -1px -1px;
+  @include text-outline(#306);
 }
 
 .blackText {
-  text-shadow: $gray-600 1px 1px, $gray-600 -1px 1px, $gray-600 1px -1px, $gray-600 -1px -1px;
+  @include text-outline($gray-600);
 }
 
 $blue-color: #06f;
\ No newline at end of file
diff --git a/scss/themes/variables/_light_derived.scss b/scss/themes/variables/_light_derived.scss
index 8ee46a9..e0b69f8 100644
--- a/scss/themes/variables/_light_derived.scss
+++ b/scss/themes/variables/_light_derived.scss
@@ -1,3 +1,3 @@
 .whiteText {
-  text-shadow: $gray-600 1px 1px 1px, $gray-600 -1px 1px 1px, $gray-600 1px -1px 1px, $gray-600 -1px -1px 1px;
+  @include text-outline($gray-600);
 }
\ No newline at end of file
diff --git a/site/character_page/character_page.vue b/site/character_page/character_page.vue
index 02295c8..3b8b10c 100644
--- a/site/character_page/character_page.vue
+++ b/site/character_page/character_page.vue
@@ -1,7 +1,9 @@
 <template>
     <div class="row character-page" id="pageBody">
-        <div class="alert alert-info" v-show="loading" style="margin:0 15px;flex:1">Loading character information.</div>
-        <div class="alert alert-danger" v-show="error" style="margin:0 15px;flex:1">{{error}}</div>
+        <div class="col-12" style="min-height:0">
+            <div class="alert alert-info" v-show="loading">Loading character information.</div>
+            <div class="alert alert-danger" v-show="error">{{error}}</div>
+        </div>
         <div class="col-md-4 col-lg-3 col-xl-2" v-if="!loading && character">
             <sidebar :character="character" @memo="memo" @bookmarked="bookmarked" :oldApi="oldApi"></sidebar>
         </div>
@@ -33,25 +35,25 @@
                         </div>
                         <div class="card-body">
                             <div class="tab-content">
-                                <div role="tabpanel" class="tab-pane" :class="{active: tab == 0}" id="overview">
+                                <div role="tabpanel" class="tab-pane" :class="{active: tab === '0'}" id="overview">
                                     <div v-bbcode="character.character.description" style="margin-bottom: 10px"></div>
                                     <character-kinks :character="character" :oldApi="oldApi" ref="tab0"></character-kinks>
                                 </div>
-                                <div role="tabpanel" class="tab-pane" :class="{active: tab == 1}" id="infotags">
+                                <div role="tabpanel" class="tab-pane" :class="{active: tab === '1'}" id="infotags">
                                     <character-infotags :character="character" ref="tab1"></character-infotags>
                                 </div>
-                                <div role="tabpanel" class="tab-pane" id="groups" :class="{active: tab == 2}" v-if="!oldApi">
+                                <div role="tabpanel" class="tab-pane" id="groups" :class="{active: tab === '2'}" v-if="!oldApi">
                                     <character-groups :character="character" ref="tab2"></character-groups>
                                 </div>
-                                <div role="tabpanel" class="tab-pane" id="images" :class="{active: tab == 3}">
+                                <div role="tabpanel" class="tab-pane" id="images" :class="{active: tab === '3'}">
                                     <character-images :character="character" ref="tab3" :use-preview="imagePreview"></character-images>
                                 </div>
-                                <div v-if="character.settings.guestbook" role="tabpanel" class="tab-pane" :class="{active: tab == 4}"
+                                <div v-if="character.settings.guestbook" role="tabpanel" class="tab-pane" :class="{active: tab === '4'}"
                                     id="guestbook">
                                     <character-guestbook :character="character" :oldApi="oldApi" ref="tab4"></character-guestbook>
                                 </div>
                                 <div v-if="character.is_self || character.settings.show_friends" role="tabpanel" class="tab-pane"
-                                    :class="{active: tab == 5}" id="friends">
+                                    :class="{active: tab === '5'}" id="friends">
                                     <character-friends :character="character" ref="tab5"></character-friends>
                                 </div>
                             </div>
@@ -64,9 +66,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Hook, Prop, Watch} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop, Watch} from 'vue-property-decorator';
     import {standardParser} from '../../bbcode/standard';
     import * as Utils from '../utils';
     import {methods, Store} from './data_store';
@@ -99,29 +100,30 @@
         }
     })
     export default class CharacterPage extends Vue {
-        //tslint:disable:no-null-keyword
         @Prop()
-        private readonly name?: string;
+        readonly name?: string;
         @Prop()
-        private readonly characterid?: number;
+        readonly characterid?: number;
         @Prop({required: true})
-        private readonly authenticated!: boolean;
+        readonly authenticated!: boolean;
         @Prop()
         readonly oldApi?: true;
         @Prop()
         readonly imagePreview?: true;
-        private shared: SharedStore = Store;
-        private character: Character | null = null;
+        shared: SharedStore = Store;
+        character: Character | undefined;
         loading = true;
         error = '';
         tab = '0';
 
+        @Hook('beforeMount')
         beforeMount(): void {
             this.shared.authenticated = this.authenticated;
         }
 
+        @Hook('mounted')
         async mounted(): Promise<void> {
-            if(this.character === null) await this._getCharacter();
+            if(this.character === undefined) await this._getCharacter();
         }
 
         @Watch('tab')
@@ -147,7 +149,7 @@
 
         private async _getCharacter(): Promise<void> {
             this.error = '';
-            this.character = null;
+            this.character = undefined;
             if(this.name === undefined || this.name.length === 0)
                 return;
             try {
diff --git a/site/character_page/contact_method.vue b/site/character_page/contact_method.vue
index 7c8a11e..673cfef 100644
--- a/site/character_page/contact_method.vue
+++ b/site/character_page/contact_method.vue
@@ -12,9 +12,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
     import {formatContactLink, formatContactValue} from './contact_utils';
     import {methods, Store} from './data_store';
 
diff --git a/site/character_page/context_menu.ts b/site/character_page/context_menu.ts
index e540540..2024605 100644
--- a/site/character_page/context_menu.ts
+++ b/site/character_page/context_menu.ts
@@ -1,12 +1,13 @@
+import {Component} from '@f-list/vue-ts';
 import Vue from 'vue';
 
+@Component
 export default abstract class ContextMenu extends Vue {
-    //tslint:disable:no-null-keyword
     abstract propName: string;
     showMenu = false;
-    private position = {left: 0, top: 0};
-    private selectedItem: HTMLElement | null = null;
-    private touchTimer = 0;
+    position = {left: 0, top: 0};
+    selectedItem: HTMLElement | undefined;
+    touchTimer = 0;
 
     abstract itemSelected(element: HTMLElement): void;
 
@@ -16,7 +17,7 @@ export default abstract class ContextMenu extends Vue {
 
     hideMenu(): void {
         this.showMenu = false;
-        this.selectedItem = null;
+        this.selectedItem = undefined;
     }
 
     bindOffclick(): void {
@@ -40,7 +41,7 @@ export default abstract class ContextMenu extends Vue {
         this.position = {left, top};
     }
 
-    protected innerClick(): void {
+    innerClick(): void {
         this.itemSelected(this.selectedItem!);
         this.hideMenu();
     }
@@ -84,8 +85,8 @@ export default abstract class ContextMenu extends Vue {
         });
     }
 
-    get positionText(): string {
-        return `left: ${this.position.left}px; top: ${this.position.top}px;`;
+    get positionStyle(): object {
+        return {left: `${this.position.left}px`, top: `${this.position.top}px;`};
     }
 
 }
\ No newline at end of file
diff --git a/site/character_page/copy_custom_dialog.vue b/site/character_page/copy_custom_dialog.vue
index 69250da..823ed7d 100644
--- a/site/character_page/copy_custom_dialog.vue
+++ b/site/character_page/copy_custom_dialog.vue
@@ -1,11 +1,11 @@
 <template>
-    <modal id="copyCustomDialog" action="Copy Custom Kink" :disabled="!valid || submitting" @submit.prevent="copyCustom">
+    <modal id="copyCustomDialog" action="Copy Custom Kink" :disabled="!valid || submitting" @submit.prevent="copyCustom()">
         <form-group field="name" :errors="formErrors" label="Name" id="copyCustomName">
-            <input type="text" class="form-control" maxlength="30" required v-model="name" id="copyCustomName"
-                slot-scope="props" :class="props.cls"/>
+            <input type="text" class="form-control" maxlength="30" required v-model="name" slot-scope="props" id="copyCustomName"
+                :class="props.cls"/>
         </form-group>
         <form-group field="description" :errors="formErrors" label="Description" id="copyCustomDescription">
-            <input type="text" class="form-control" max-length="250" id="copyCustomDescription" v-model="description" required
+            <input type="text" class="form-control" max-length="250" v-model="description" required id="copyCustomDescription"
                 slot-scope="props" :class="props.cls"/>
         </form-group>
         <form-group field="choice" :errors="formErrors" label="Choice" id="copyCustomChoice">
@@ -17,28 +17,28 @@
             </select>
         </form-group>
         <form-group field="target" :errors="formErrors" label="Target Character" id="copyCustomTarget">
-            <character-select id="copyCustomTarget" v-model="target" slot-scope="props" :class="props.cls"></character-select>
+            <character-select v-model="target" slot-scope="props" :class="props.cls" id="copyCustomTarget"></character-select>
         </form-group>
     </modal>
 </template>
 
 <script lang="ts">
-    import Component from 'vue-class-component';
+    import {Component} from '@f-list/vue-ts';
     import CustomDialog from '../../components/custom_dialog';
     import FormGroup from '../../components/form_group.vue';
     import Modal from '../../components/Modal.vue';
+    import {KinkChoice} from '../../interfaces';
     import * as Utils from '../utils';
     import {methods} from './data_store';
-    import {KinkChoice} from './interfaces';
 
     @Component({
         components: {'form-group': FormGroup, modal: Modal}
     })
     export default class CopyCustomDialog extends CustomDialog {
-        private name = '';
-        private description = '';
-        private choice: KinkChoice = 'favorite';
-        private target = Utils.Settings.defaultCharacter;
+        name = '';
+        description = '';
+        choice: KinkChoice = 'favorite';
+        target = Utils.Settings.defaultCharacter;
         formErrors = {};
         submitting = false;
 
diff --git a/site/character_page/copy_custom_menu.vue b/site/character_page/copy_custom_menu.vue
index be12e72..0a36614 100644
--- a/site/character_page/copy_custom_menu.vue
+++ b/site/character_page/copy_custom_menu.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
-        <ul class="dropdown-menu" role="menu" @click="innerClick($event)" @touchstart="innerClick($event)" @touchend="innerClick($event)"
-            style="position: fixed; display: block;" :style="positionText" ref="menu" v-show="showMenu">
+        <ul class="dropdown-menu" role="menu" @click="innerClick" @touchstart="innerClick" @touchend="innerClick"
+            style="position: fixed; display: block;" :style="positionStyle" ref="menu" v-show="showMenu">
             <li><a class="dropdown-item" href="#">Copy Custom</a></li>
         </ul>
         <copy-dialog ref="copy-dialog"></copy-dialog>
@@ -9,15 +9,12 @@
 </template>
 
 <script lang="ts">
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
+    import {Component, Hook, Prop} from '@f-list/vue-ts';
     import ContextMenu from './context_menu';
     import CopyCustomDialog from './copy_custom_dialog.vue';
 
     @Component({
-        components: {
-            'copy-dialog': CopyCustomDialog
-        }
+        components: {'copy-dialog': CopyCustomDialog}
     })
     export default class CopyCustomMenu extends ContextMenu {
         @Prop({required: true})
@@ -35,6 +32,7 @@
             (<CopyCustomDialog>this.$refs['copy-dialog']).showDialog(name, description);
         }
 
+        @Hook('mounted')
         mounted(): void {
             this.bindOffclick();
         }
diff --git a/site/character_page/delete_dialog.vue b/site/character_page/delete_dialog.vue
index dd0f647..0fcc236 100644
--- a/site/character_page/delete_dialog.vue
+++ b/site/character_page/delete_dialog.vue
@@ -1,13 +1,12 @@
 <template>
-    <modal id="deleteDialog" :action="'Delete character' + name" :disabled="deleting" @submit.prevent="deleteCharacter">
+    <modal id="deleteDialog" :action="'Delete character' + name" :disabled="deleting" @submit.prevent="deleteCharacter()">
         Are you sure you want to permanently delete {{ name }}?<br/>
         Character deletion cannot be undone for any reason.
     </modal>
 </template>
 
 <script lang="ts">
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
+    import {Component, Prop} from '@f-list/vue-ts';
     import CustomDialog from '../../components/custom_dialog';
     import Modal from '../../components/Modal.vue';
     import * as Utils from '../utils';
diff --git a/site/character_page/duplicate_dialog.vue b/site/character_page/duplicate_dialog.vue
index 721512d..91c1e56 100644
--- a/site/character_page/duplicate_dialog.vue
+++ b/site/character_page/duplicate_dialog.vue
@@ -1,5 +1,5 @@
 <template>
-    <modal id="duplicateDialog" :action="'Duplicate character' + name" :disabled="duplicating || checking" @submit.prevent="duplicate">
+    <modal id="duplicateDialog" :action="'Duplicate character' + name" :disabled="duplicating || checking" @submit.prevent="duplicate()">
         <p>This will duplicate the character, kinks, infotags, customs, subkinks and images. Guestbook
             entries, friends, groups, and bookmarks are not duplicated.</p>
         <div class="form-row mb-2">
@@ -17,8 +17,7 @@
 </template>
 
 <script lang="ts">
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
+    import {Component, Prop} from '@f-list/vue-ts';
     import CustomDialog from '../../components/custom_dialog';
     import FormGroupInputgroup from '../../components/form_group_inputgroup.vue';
     import Modal from '../../components/Modal.vue';
@@ -31,10 +30,10 @@
     })
     export default class DuplicateDialog extends CustomDialog {
         @Prop({required: true})
-        private readonly character!: Character;
+        readonly character!: Character;
 
         errors: {[key: string]: string} = {};
-        private newName = '';
+        newName = '';
         valid = false;
 
         checking = false;
diff --git a/site/character_page/friend_dialog.vue b/site/character_page/friend_dialog.vue
index add9bc1..85a1c71 100644
--- a/site/character_page/friend_dialog.vue
+++ b/site/character_page/friend_dialog.vue
@@ -1,5 +1,5 @@
 <template>
-    <Modal id="memoDialog" :action="'Friends for ' + name" :buttons="false" dialog-class="modal-dialog-centered modal-lg">
+    <Modal :action="'Friends for ' + name" :buttons="false" dialog-class="modal-dialog-centered modal-lg">
         <div v-show="loading" class="alert alert-info">Loading friend information.</div>
         <div v-show="error" class="alert alert-danger">{{error}}</div>
         <template v-if="!loading">
@@ -79,8 +79,7 @@
 </template>
 
 <script lang="ts">
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
+    import {Component, Prop} from '@f-list/vue-ts';
     import CustomDialog from '../../components/custom_dialog';
     import Modal from '../../components/Modal.vue';
     import * as Utils from '../utils';
@@ -92,13 +91,13 @@
     })
     export default class FriendDialog extends CustomDialog {
         @Prop({required: true})
-        private readonly character!: Character;
+        readonly character!: Character;
 
-        private ourCharacter = Utils.Settings.defaultCharacter;
+        ourCharacter = Utils.Settings.defaultCharacter;
 
-        private incoming: FriendRequest[] = [];
-        private pending: FriendRequest[] = [];
-        private existing: Friend[] = [];
+        incoming: FriendRequest[] = [];
+        pending: FriendRequest[] = [];
+        existing: Friend[] = [];
 
         requesting = false;
         loading = true;
diff --git a/site/character_page/friends.vue b/site/character_page/friends.vue
index f45e4b5..c42cc1b 100644
--- a/site/character_page/friends.vue
+++ b/site/character_page/friends.vue
@@ -11,9 +11,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
     import * as Utils from '../utils';
     import {methods} from './data_store';
     import {Character, CharacterFriend} from './interfaces';
diff --git a/site/character_page/groups.vue b/site/character_page/groups.vue
index 0816dfa..95ffc98 100644
--- a/site/character_page/groups.vue
+++ b/site/character_page/groups.vue
@@ -11,9 +11,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
     import * as Utils from '../utils';
     import {methods} from './data_store';
     import {Character, CharacterGroup} from './interfaces';
diff --git a/site/character_page/guestbook.vue b/site/character_page/guestbook.vue
index 1179eb3..26abd0b 100644
--- a/site/character_page/guestbook.vue
+++ b/site/character_page/guestbook.vue
@@ -26,9 +26,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop, Watch} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop, Watch} from 'vue-property-decorator';
     import * as Utils from '../utils';
     import {methods, Store} from './data_store';
     import {Character, GuestbookPost} from './interfaces';
@@ -36,13 +35,11 @@
     import GuestbookPostView from './guestbook_post.vue';
 
     @Component({
-        components: {
-            'guestbook-post': GuestbookPostView
-        }
+        components: {'guestbook-post': GuestbookPostView}
     })
     export default class GuestbookView extends Vue {
         @Prop({required: true})
-        private readonly character!: Character;
+        readonly character!: Character;
         @Prop()
         readonly oldApi?: true;
         loading = true;
@@ -51,11 +48,11 @@
 
         posts: GuestbookPost[] = [];
 
-        private unapprovedOnly = false;
-        private page = 1;
+        unapprovedOnly = false;
+        page = 1;
         hasNextPage = false;
         canEdit = false;
-        private newPost = {
+        newPost = {
             posting: false,
             privatePost: false,
             character: Utils.Settings.defaultCharacter,
diff --git a/site/character_page/guestbook_post.vue b/site/character_page/guestbook_post.vue
index 4041210..8b7c02f 100644
--- a/site/character_page/guestbook_post.vue
+++ b/site/character_page/guestbook_post.vue
@@ -48,9 +48,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
     import CharacterLink from '../../components/character_link.vue';
     import DateDisplay from '../../components/date_display.vue';
     import * as Utils from '../utils';
@@ -62,13 +61,13 @@
     })
     export default class GuestbookPostView extends Vue {
         @Prop({required: true})
-        private readonly post!: GuestbookPost;
+        readonly post!: GuestbookPost;
         @Prop({required: true})
         readonly canEdit!: boolean;
 
         replying = false;
         replyBox = false;
-        private replyMessage = this.post.reply;
+        replyMessage = this.post.reply;
 
         approving = false;
         deleting = false;
diff --git a/site/character_page/images.vue b/site/character_page/images.vue
index 8812e80..873727d 100644
--- a/site/character_page/images.vue
+++ b/site/character_page/images.vue
@@ -10,19 +10,19 @@
         </template>
         <div v-if="!loading && !images.length" class="alert alert-info">No images.</div>
         <div class="image-preview" v-show="previewImage" @click="previewImage = ''">
-            <img :src="previewImage" />
+            <img :src="previewImage"/>
             <div class="modal-backdrop show"></div>
         </div>
     </div>
 </template>
 
 <script lang="ts">
+    import {Component, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
+    import {CharacterImage} from '../../interfaces';
     import * as Utils from '../utils';
     import {methods} from './data_store';
-    import {Character, CharacterImage} from './interfaces';
+    import {Character} from './interfaces';
 
     @Component
     export default class ImagesView extends Vue {
diff --git a/site/character_page/infotag.vue b/site/character_page/infotag.vue
index edf016f..473c12a 100644
--- a/site/character_page/infotag.vue
+++ b/site/character_page/infotag.vue
@@ -7,9 +7,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
     import {formatContactLink, formatContactValue} from './contact_utils';
     import {Store} from './data_store';
     import {DisplayInfotag} from './interfaces';
diff --git a/site/character_page/infotags.vue b/site/character_page/infotags.vue
index de43c7e..86d7b12 100644
--- a/site/character_page/infotags.vue
+++ b/site/character_page/infotags.vue
@@ -9,9 +9,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
     import * as Utils from '../utils';
     import {Store} from './data_store';
     import {Character, CONTACT_GROUP_ID, DisplayInfotag} from './interfaces';
@@ -19,15 +18,14 @@
     import InfotagView from './infotag.vue';
 
     interface DisplayInfotagGroup {
+        id: number
         name: string
         sortOrder: number
         infotags: DisplayInfotag[]
     }
 
     @Component({
-        components: {
-            infotag: InfotagView
-        }
+        components: {infotag: InfotagView}
     })
     export default class InfotagsView extends Vue {
         @Prop({required: true})
@@ -63,6 +61,7 @@
                     return infotagA.name < infotagB.name ? -1 : 1;
                 });
                 outputGroups.push({
+                    id: group.id,
                     name: group.name,
                     sortOrder: group.sort_order,
                     infotags: collectedTags
diff --git a/site/character_page/interfaces.ts b/site/character_page/interfaces.ts
index 16ed7d1..a53f5ef 100644
--- a/site/character_page/interfaces.ts
+++ b/site/character_page/interfaces.ts
@@ -1,8 +1,10 @@
+import {Character as CharacterInfo, CharacterImage, CharacterSettings, Infotag, Kink, KinkChoice} from '../../interfaces';
+
 export interface CharacterMenuItem {
     label: string
     permission: string
     link(character: Character): string
-    handleClick?(evt?: MouseEvent): void
+    handleClick?(evt: MouseEvent): void
 }
 
 export interface SelectItem {
@@ -69,7 +71,6 @@ export interface SharedKinks {
 }
 
 export type SiteDate = number | string | null;
-export type KinkChoice = 'favorite' | 'yes' | 'maybe' | 'no';
 export type KinkChoiceFull = KinkChoice | number;
 export const CONTACT_GROUP_ID = '1';
 
@@ -93,13 +94,6 @@ export interface DisplayInfotag {
     list?: number
 }
 
-export interface Kink {
-    id: number
-    name: string
-    description: string
-    kink_group: number
-}
-
 export interface KinkGroup {
     id: number
     name: string
@@ -107,16 +101,6 @@ export interface KinkGroup {
     sort_order: number
 }
 
-export interface Infotag {
-    id: number
-    name: string
-    type: 'number' | 'text' | 'list'
-    search_field: string
-    validator: string
-    allow_legacy: boolean
-    infotag_group: string
-}
-
 export interface InfotagGroup {
     id: number
     name: string
@@ -141,46 +125,6 @@ export interface CharacterKink {
     choice: KinkChoice
 }
 
-export interface CharacterInfotag {
-    list?: number
-    string?: string
-    number?: number
-}
-
-export interface CharacterCustom {
-    id: number
-    choice: KinkChoice
-    name: string
-    description: string
-}
-
-export interface CharacterInline {
-    id: number
-    hash: string
-    extension: string
-    nsfw: boolean
-}
-
-export type CharacterImage = CharacterImageOld | CharacterImageNew;
-
-export interface CharacterImageNew {
-    id: number
-    extension: string
-    description: string
-    hash: string
-    sort_order: number | null
-}
-
-export interface CharacterImageOld {
-    id: number
-    extension: string
-    height: number
-    width: number
-    description: string
-    sort_order: number | null
-    url: string
-}
-
 export type CharacterName = string | CharacterNameDetails;
 
 export interface CharacterNameDetails {
@@ -211,34 +155,6 @@ export interface CharacterGroup {
     owner: boolean
 }
 
-export interface CharacterInfo {
-    readonly id: number
-    readonly name: string
-    readonly description: string
-    readonly title?: string
-    readonly created_at: SiteDate
-    readonly updated_at: SiteDate
-    readonly views: number
-    readonly last_online_at?: SiteDate
-    readonly timezone?: number
-    readonly image_count?: number
-    readonly inlines: {[key: string]: CharacterInline | undefined}
-    images?: CharacterImage[]
-    readonly kinks: {[key: string]: KinkChoiceFull | undefined}
-    readonly customs: CharacterCustom[]
-    readonly infotags: {[key: string]: CharacterInfotag | undefined}
-    readonly online_chat?: boolean
-}
-
-export interface CharacterSettings {
-    readonly customs_first: boolean
-    readonly show_friends: boolean
-    readonly badges: boolean
-    readonly guestbook: boolean
-    readonly prevent_bookmarks: boolean
-    readonly public: boolean
-}
-
 export interface Character {
     readonly is_self: boolean
     character: CharacterInfo
diff --git a/site/character_page/kink.vue b/site/character_page/kink.vue
index c04bcd0..1a7b4a1 100644
--- a/site/character_page/kink.vue
+++ b/site/character_page/kink.vue
@@ -19,9 +19,8 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
     import {DisplayKink} from './interfaces';
 
     @Component({
diff --git a/site/character_page/kinks.vue b/site/character_page/kinks.vue
index f0f7845..0539fb8 100644
--- a/site/character_page/kinks.vue
+++ b/site/character_page/kinks.vue
@@ -9,8 +9,8 @@
             </div>
             <div class="form-inline">
                 <select v-model="highlightGroup" class="form-control">
-                    <option :value="null">None</option>
-                    <option v-for="group in kinkGroups" :value="group.id" :key="group.id">{{group.name}}</option>
+                    <option :value="undefined">None</option>
+                    <option v-for="group in kinkGroups" v-if="group" :value="group.id" :key="group.id">{{group.name}}</option>
                 </select>
             </div>
         </div>
@@ -65,33 +65,29 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop, Watch} from '@f-list/vue-ts';
     import Vue from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop, Watch} from 'vue-property-decorator';
+    import {Kink, KinkChoice} from '../../interfaces';
     import * as Utils from '../utils';
     import CopyCustomMenu from './copy_custom_menu.vue';
     import {methods, Store} from './data_store';
-    import {Character, DisplayKink, Kink, KinkChoice, KinkGroup} from './interfaces';
+    import {Character, DisplayKink, KinkGroup} from './interfaces';
     import KinkView from './kink.vue';
 
     @Component({
-        components: {
-            'context-menu': CopyCustomMenu,
-            kink: KinkView
-        }
+        components: {'context-menu': CopyCustomMenu, kink: KinkView}
     })
     export default class CharacterKinksView extends Vue {
-        //tslint:disable:no-null-keyword
         @Prop({required: true})
-        private readonly character!: Character;
+        readonly character!: Character;
         @Prop()
         readonly oldApi?: true;
-        private shared = Store;
+        shared = Store;
         characterToCompare = Utils.Settings.defaultCharacter;
-        highlightGroup: number | null = null;
+        highlightGroup: number | undefined;
 
-        private loading = false;
-        private comparing = false;
+        loading = false;
+        comparing = false;
         highlighting: {[key: string]: boolean} = {};
         comparison: {[key: string]: KinkChoice} = {};
 
@@ -142,7 +138,7 @@
             return this.comparing ? 'Clear' : 'Compare';
         }
 
-        get groupedKinks(): {[key in KinkChoice]: DisplayKink[]} | undefined {
+        get groupedKinks(): {[key in KinkChoice]: DisplayKink[]} {
             const kinks = this.shared.kinks.kinks;
             const characterKinks = this.character.character.kinks;
             const characterCustoms = this.character.character.customs;
@@ -167,8 +163,9 @@
                 return a.name < b.name ? -1 : 1;
             };
 
-            for(const custom of characterCustoms)
-                displayCustoms[custom.id] = {
+            for(const id in characterCustoms) {
+                const custom = characterCustoms[id]!;
+                displayCustoms[id] = {
                     id: custom.id,
                     name: custom.name,
                     description: custom.description,
@@ -179,6 +176,7 @@
                     ignore: false,
                     subkinks: []
                 };
+            }
 
             for(const kinkId in characterKinks) {
                 const kinkChoice = characterKinks[kinkId]!;
diff --git a/site/character_page/memo_dialog.vue b/site/character_page/memo_dialog.vue
index 0fcfa1f..3955596 100644
--- a/site/character_page/memo_dialog.vue
+++ b/site/character_page/memo_dialog.vue
@@ -1,5 +1,5 @@
 <template>
-    <Modal id="memoDialog" :action="'Memo for ' + name" buttonText="Save and Close" @close="onClose" @submit="save" dialog-class="modal-lg modal-dialog-centered">
+    <Modal :action="'Memo for ' + name" buttonText="Save and Close" @close="onClose" @submit="save" dialog-class="modal-lg modal-dialog-centered">
         <div class="form-group" v-if="editing">
             <textarea v-model="message" maxlength="1000" class="form-control"></textarea>
         </div>
@@ -12,33 +12,46 @@
 </template>
 
 <script lang="ts">
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
+    import {Component, Prop, Watch} from '@f-list/vue-ts';
     import CustomDialog from '../../components/custom_dialog';
     import Modal from '../../components/Modal.vue';
+    import {SimpleCharacter} from '../../interfaces';
     import * as Utils from '../utils';
     import {methods} from './data_store';
-    import {Character} from './interfaces';
+
+    export interface Memo {
+        id: number
+        memo: string
+        character: SimpleCharacter
+        created_at: number
+        updated_at: number
+    }
 
     @Component({
         components: {Modal}
     })
     export default class MemoDialog extends CustomDialog {
         @Prop({required: true})
-        private readonly character!: Character;
-
-        private message = '';
+        readonly character!: {id: number, name: string};
+        @Prop()
+        readonly memo?: Memo;
+        message = '';
         editing = false;
         saving = false;
 
         get name(): string {
-            return this.character.character.name;
+            return this.character.name;
         }
 
         show(): void {
             super.show();
-            if(this.character.memo !== undefined)
-                this.message = this.character.memo.memo;
+            this.setMemo();
+        }
+
+        @Watch('memo')
+        setMemo(): void {
+            if(this.memo !== undefined)
+                this.message = this.memo.memo;
         }
 
         onClose(): void {
@@ -48,7 +61,7 @@
         async save(): Promise<void> {
             try {
                 this.saving = true;
-                const memoReply = await methods.memoUpdate(this.character.character.id, this.message);
+                const memoReply = await methods.memoUpdate(this.character.id, this.message);
                 this.$emit('memo', this.message !== '' ? memoReply : undefined);
                 this.hide();
             } catch(e) {
diff --git a/site/character_page/report_dialog.vue b/site/character_page/report_dialog.vue
index 09144e2..52f4926 100644
--- a/site/character_page/report_dialog.vue
+++ b/site/character_page/report_dialog.vue
@@ -1,5 +1,5 @@
 <template>
-    <modal id="reportDialog" :action="'Report character' + name" :disabled="!dataValid || submitting" @submit.prevent="submitReport">
+    <modal id="reportDialog" :action="'Report character' + name" :disabled="!dataValid || submitting" @submit.prevent="submitReport()">
         <div class="form-group">
             <label>Type</label>
             <select v-select="validTypes" v-model="type" class="form-control"></select>
@@ -25,8 +25,7 @@
 </template>
 
 <script lang="ts">
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
+    import {Component, Prop} from '@f-list/vue-ts';
     import CustomDialog from '../../components/custom_dialog';
     import Modal from '../../components/Modal.vue';
     import * as Utils from '../utils';
@@ -38,12 +37,12 @@
     })
     export default class ReportDialog extends CustomDialog {
         @Prop({required: true})
-        private readonly character!: Character;
+        readonly character!: Character;
 
-        private ourCharacter = Utils.Settings.defaultCharacter;
-        private type = '';
-        private violation = '';
-        private message = '';
+        ourCharacter = Utils.Settings.defaultCharacter;
+        type = '';
+        violation = '';
+        message = '';
 
         submitting = false;
 
diff --git a/site/character_page/sidebar.vue b/site/character_page/sidebar.vue
index 77d4e86..4b4c582 100644
--- a/site/character_page/sidebar.vue
+++ b/site/character_page/sidebar.vue
@@ -3,7 +3,8 @@
         <div class="card-header">
             <span class="character-name">{{ character.character.name }}</span>
             <div v-if="character.character.title" class="character-title">{{ character.character.title }}</div>
-            <character-action-menu :character="character"></character-action-menu>
+            <character-action-menu :character="character" @rename="showRename()" @delete="showDelete()"
+                @block="showBlock()"></character-action-menu>
         </div>
         <div class="card-body">
             <img :src="avatarUrl(character.character.name)" class="character-avatar" style="margin-right:10px">
@@ -11,21 +12,21 @@
                 <template v-if="character.is_self">
                     <a :href="editUrl" class="edit-link"><i class="fa fa-fw fa-pencil-alt"></i>Edit</a>
                     <a @click="showDelete" class="delete-link"><i class="fa fa-fw fa-trash"></i>Delete</a>
-                    <a @click="showDuplicate" class="duplicate-link"><i class="fa fa-fw fa-copy"></i>Duplicate</a>
+                    <a @click="showDuplicate()" class="duplicate-link"><i class="fa fa-fw fa-copy"></i>Duplicate</a>
                 </template>
                 <template v-else>
-                    <span v-if="character.self_staff || character.settings.prevent_bookmarks !== true">
-                        <a @click.prevent="toggleBookmark" :class="{bookmarked: character.bookmarked, unbookmarked: !character.bookmarked}"
+                    <span v-if="character.self_staff || character.settings.block_bookmarks !== true">
+                        <a @click.prevent="toggleBookmark()" :class="{bookmarked: character.bookmarked, unbookmarked: !character.bookmarked}"
                             href="#" class="btn">
                             <i class="fa fa-fw" :class="{'fa-minus': character.bookmarked, 'fa-plus': !character.bookmarked}"></i>Bookmark
                         </a>
-                        <span v-if="character.settings.prevent_bookmarks" class="prevents-bookmarks">!</span>
+                        <span v-if="character.settings.block_bookmarks" class="prevents-bookmarks">!</span>
                     </span>
-                    <a href="#" @click.prevent="showFriends" class="friend-link btn"><i class="fa fa-fw fa-user"></i>Friend</a>
-                    <a href="#" v-if="!oldApi" @click.prevent="showReport" class="report-link btn">
+                    <a href="#" @click.prevent="showFriends()" class="friend-link btn"><i class="fa fa-fw fa-user"></i>Friend</a>
+                    <a href="#" v-if="!oldApi" @click.prevent="showReport()" class="report-link btn">
                         <i class="fa fa-fw fa-exclamation-triangle"></i>Report</a>
                 </template>
-                <a href="#" @click.prevent="showMemo" class="memo-link btn"><i class="far fa-sticky-note fa-fw"></i>Memo</a>
+                <a href="#" @click.prevent="showMemo()" class="memo-link btn"><i class="far fa-sticky-note fa-fw"></i>Memo</a>
             </div>
             <div v-if="character.badges && character.badges.length > 0" class="badges-block">
                 <div v-for="badge in character.badges" class="character-badge px-2 py-1" :class="badgeClass(badge)">
@@ -35,7 +36,7 @@
 
             <a v-if="authenticated && !character.is_self" :href="noteUrl" class="character-page-note-link btn" style="padding:0 4px">
                 <i class="far fa-envelope fa-fw"></i>Send Note</a>
-            <div v-if="character.character.online_chat" @click="showInChat" class="character-page-online-chat">Online In Chat</div>
+            <div v-if="character.character.online_chat" @click="showInChat()" class="character-page-online-chat">Online In Chat</div>
 
             <div class="contact-block">
                 <contact-method v-for="method in contactMethods" :method="method" :key="method.id"></contact-method>
@@ -67,7 +68,7 @@
                 </div>
             </div>
 
-            <div class="character-list-block">
+            <div class="character-list-block" v-if="character.character_list">
                 <div v-for="listCharacter in character.character_list">
                     <img :src="avatarUrl(listCharacter.name)" class="character-avatar icon" style="margin-right:5px">
                     <character-link :character="listCharacter.name"></character-link>
@@ -75,7 +76,7 @@
             </div>
         </div>
         <template>
-            <memo-dialog :character="character" ref="memo-dialog" @memo="memo"></memo-dialog>
+            <memo-dialog :character="character.character" :memo="character.memo" ref="memo-dialog" @memo="memo"></memo-dialog>
             <delete-dialog :character="character" ref="delete-dialog"></delete-dialog>
             <rename-dialog :character="character" ref="rename-dialog"></rename-dialog>
             <duplicate-dialog :character="character" ref="duplicate-dialog"></duplicate-dialog>
@@ -87,20 +88,18 @@
 </template>
 
 <script lang="ts">
+    import {Component, Prop} from '@f-list/vue-ts';
     import Vue, {Component as VueComponent, ComponentOptions, CreateElement, VNode} from 'vue';
-    import Component from 'vue-class-component';
-    import {Prop} from 'vue-property-decorator';
-    import * as Utils from '../utils';
-    import {methods, registeredComponents, Store} from './data_store';
-    import {Character, CONTACT_GROUP_ID, Infotag, SharedStore} from './interfaces';
-
     import DateDisplay from '../../components/date_display.vue';
-    import InfotagView from './infotag.vue';
-
+    import {Infotag} from '../../interfaces';
+    import * as Utils from '../utils';
     import ContactMethodView from './contact_method.vue';
+    import {methods, registeredComponents, Store} from './data_store';
     import DeleteDialog from './delete_dialog.vue';
     import DuplicateDialog from './duplicate_dialog.vue';
     import FriendDialog from './friend_dialog.vue';
+    import InfotagView from './infotag.vue';
+    import {Character, CONTACT_GROUP_ID, SharedStore} from './interfaces';
     import MemoDialog from './memo_dialog.vue';
     import ReportDialog from './report_dialog.vue';
 
@@ -177,6 +176,14 @@
             return badgeName in badgeMap ? badgeMap[badgeName] : badgeName;
         }
 
+        showBlock(): void {
+            (<ShowableVueDialog>this.$refs['block-dialog']).show();
+        }
+
+        showRename(): void {
+            (<ShowableVueDialog>this.$refs['rename-dialog']).show();
+        }
+
         showDelete(): void {
             (<ShowableVueDialog>this.$refs['delete-dialog']).show();
         }
@@ -197,6 +204,10 @@
             (<ShowableVueDialog>this.$refs['friend-dialog']).show();
         }
 
+        showInChat(): void {
+            //TODO implement this
+        }
+
         async toggleBookmark(): Promise<void> {
             const previousState = this.character.bookmarked;
             try {
@@ -218,7 +229,7 @@
             return methods.sendNoteUrl(this.character.character);
         }
 
-        get contactMethods(): object[] {
+        get contactMethods(): {id: number, value?: string}[] {
             const contactInfotags = Utils.groupObjectBy(Store.kinks.infotags, 'infotag_group');
             contactInfotags[CONTACT_GROUP_ID]!.sort((a: Infotag, b: Infotag) => a.name < b.name ? -1 : 1);
             const contactMethods = [];
@@ -233,7 +244,7 @@
             return contactMethods;
         }
 
-        get quickInfoItems(): object[] {
+        get quickInfoItems(): {id: number, string?: string, list?: number, number?: number}[] {
             const quickItems = [];
             for(const id of this.quickInfoIds) {
                 const infotag = this.character.character.infotags[id];
@@ -256,4 +267,4 @@
             this.$emit('memo', memo);
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/site/utils.ts b/site/utils.ts
index 3f90cb8..14e663a 100644
--- a/site/utils.ts
+++ b/site/utils.ts
@@ -8,7 +8,6 @@ interface Dictionary<T> {
 type flashMessageType = 'info' | 'success' | 'warning' | 'danger';
 type flashMessageImpl = (type: flashMessageType, message: string) => void;
 
-
 let flashImpl: flashMessageImpl = (type: flashMessageType, message: string) => {
     console.log(`${type}: ${message}`);
 };
diff --git a/tslint.json b/tslint.json
index ee46865..3ed0b4e 100644
--- a/tslint.json
+++ b/tslint.json
@@ -65,6 +65,7 @@
     "eofline": false,
     "file-name-casing": false,
     "forin": false,
+    "increment-decrement": false,
     "interface-name": false,
     "interface-over-type-literal": false,
     "linebreak-style": false,
@@ -83,10 +84,9 @@
     "no-angle-bracket-type-assertion": false,
     "no-bitwise": false,
     "no-conditional-assignment": false,
-    //disabled for Vue components
-    "no-consecutive-blank-lines": false,
     "no-console": false,
     "no-default-export": false,
+    "no-default-import": false,
     "no-dynamic-delete": false,
     "no-floating-promises": [true, "AxiosPromise"],
     "no-implicit-dependencies": false,
diff --git a/tslint/vuePropsRule.js b/tslint/vuePropsRule.js
index db98e6e..fa54afb 100644
--- a/tslint/vuePropsRule.js
+++ b/tslint/vuePropsRule.js
@@ -1,41 +1,36 @@
 "use strict";
-exports.__esModule = true;
-var tslib_1 = require("tslib");
-var Lint = require("tslint");
-var ts = require("typescript");
-var Rule = /** @class */ (function (_super) {
-    tslib_1.__extends(Rule, _super);
-    function Rule() {
-        return _super !== null && _super.apply(this, arguments) || this;
+Object.defineProperty(exports, "__esModule", { value: true });
+const ts = require("typescript");
+const Lint = require("tslint");
+class Rule extends Lint.Rules.AbstractRule {
+    apply(sourceFile) {
+        return this.applyWithFunction(sourceFile, walk, undefined);
     }
-    Rule.prototype.applyWithProgram = function (sourceFile, program) {
-        return this.applyWithFunction(sourceFile, walk, undefined, program.getTypeChecker());
-    };
-    return Rule;
-}(Lint.Rules.TypedRule));
+}
 exports.Rule = Rule;
-function walk(ctx, checker) {
+function walk(ctx) {
     if (ctx.sourceFile.isDeclarationFile)
         return;
     return ts.forEachChild(ctx.sourceFile, cb);
     function cb(node) {
-        if (node.kind !== ts.SyntaxKind.PropertyDeclaration || !node.decorators)
+        if (node.kind !== ts.SyntaxKind.PropertyDeclaration)
             return ts.forEachChild(node, cb);
-        for (var _i = 0, _a = node.decorators; _i < _a.length; _i++) {
-            var decorator = _a[_i];
-            var call = decorator.expression;
-            var propSymbol = checker.getTypeAtLocation(call.expression).symbol;
-            if (propSymbol.name === 'Prop' &&
-                propSymbol.parent.name.endsWith('node_modules/vue-property-decorator/lib/vue-property-decorator"')) {
-                if (!node.modifiers || !node.modifiers.some(function (x) { return x.kind === ts.SyntaxKind.ReadonlyKeyword; }))
-                    ctx.addFailureAtNode(node.name, 'Vue property should be readonly');
-                if (call.arguments.length > 0 && call.arguments[0].properties.map(function (x) { return x.name.getText(); })
-                    .some(function (x) { return x === 'default' || x === 'required'; })) {
-                    if (node.questionToken !== undefined)
-                        ctx.addFailureAtNode(node.name, 'Vue property is required and should not be optional.');
+        if (!node.decorators)
+            return;
+        const property = node;
+        for (const decorator of node.decorators) {
+            const call = decorator.expression.kind == ts.SyntaxKind.CallExpression ? decorator.expression : undefined;
+            const name = call && call.expression.getText() || decorator.expression.getText();
+            if (name === 'Prop') {
+                if (!node.modifiers || !node.modifiers.some((x) => x.kind === ts.SyntaxKind.ReadonlyKeyword))
+                    ctx.addFailureAtNode(property.name, 'Vue property should be readonly');
+                if (call && call.arguments.length > 0 &&
+                    call.arguments[0].properties.map((x) => x.name.getText()).some((x) => x === 'default' || x === 'required')) {
+                    if (property.questionToken !== undefined)
+                        ctx.addFailureAtNode(property.name, 'Vue property is required and should not be optional.');
                 }
-                else if (node.questionToken === undefined)
-                    ctx.addFailureAtNode(node.name, 'Vue property should be optional - it is not required and has no default value.');
+                else if (property.questionToken === undefined)
+                    ctx.addFailureAtNode(property.name, 'Vue property should be optional - it is not required and has no default value.');
             }
         }
     }
diff --git a/webchat/logs.ts b/webchat/logs.ts
index d445ad2..56e1962 100644
--- a/webchat/logs.ts
+++ b/webchat/logs.ts
@@ -1,6 +1,7 @@
 import {EventMessage, Message, Settings as SettingsImpl} from '../chat/common';
 import core from '../chat/core';
 import {Conversation, Logs as Logging, Settings} from '../chat/interfaces';
+import l from '../chat/localize';
 
 type StoredConversation = {id: number, key: string, name: string};
 type StoredMessage = {
@@ -10,7 +11,7 @@ type StoredMessage = {
 async function promisifyRequest<T>(req: IDBRequest): Promise<T> {
     return new Promise<T>((resolve, reject) => {
         req.onsuccess = () => resolve(<T>req.result);
-        req.onerror = reject;
+        req.onerror = () => reject(req.error);
     });
 }
 
@@ -23,7 +24,7 @@ async function iterate<S, T>(request: IDBRequest, map: (stored: S) => T, count:
             array.push(map(<S>c.value));
             c.continue();
         };
-        request.onerror = reject;
+        request.onerror = () => reject(request.error);
     });
 }
 
@@ -55,10 +56,15 @@ async function openDatabase(character: string): Promise<IDBDatabase> {
 }
 
 async function getIndex(db: IDBDatabase): Promise<Index> {
-    const trans = db.transaction(['conversations']);
-    const index: Index = {};
-    await iterate(trans.objectStore('conversations').openCursor(), (x: StoredConversation) => index[x.key] = x);
-    return index;
+    try {
+        const trans = db.transaction(['conversations']);
+        const index: Index = {};
+        await iterate(trans.objectStore('conversations').openCursor(), (x: StoredConversation) => index[x.key] = x);
+        return index;
+    } catch {
+        alert(l('logs.corruption.web'));
+        return {};
+    }
 }
 
 export class Logs implements Logging {
@@ -114,7 +120,7 @@ export class Logs implements Logging {
         if(character === this.loadedCharacter) return this.loadedIndex!;
         if(character === core.connection.character) {
             this.loadedDb = this.db;
-            this.loadedIndex = this.index;
+            this.loadedIndex = this.index !== undefined ? this.index : {};
         } else
             try {
                 this.loadedDb = await openDatabase(character);
@@ -124,7 +130,7 @@ export class Logs implements Logging {
                 return {};
             }
         this.loadedCharacter = character;
-        return this.loadedIndex!;
+        return this.loadedIndex;
     }
 
     async getConversations(character: string): Promise<ReadonlyArray<{key: string, name: string}>> {
diff --git a/webchat/package.json b/webchat/package.json
index 0acc5a5..3087b51 100644
--- a/webchat/package.json
+++ b/webchat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "net.f_list.fchat",
-  "version": "3.0.9",
+  "version": "3.0.10",
   "displayName": "F-Chat",
   "author": "The F-List Team",
   "description": "F-List.net Chat Client",
diff --git a/webchat/tsconfig.json b/webchat/tsconfig.json
index 124992f..cdd506c 100644
--- a/webchat/tsconfig.json
+++ b/webchat/tsconfig.json
@@ -5,7 +5,6 @@
     "sourceMap": true,
     "experimentalDecorators": true,
     "allowJs": true,
-    "outDir": "build",
     "noEmitHelpers": true,
     "importHelpers": true,
     "forceConsistentCasingInFileNames": true,
@@ -13,8 +12,5 @@
     "noUnusedLocals": true,
     "noUnusedParameters": true
   },
-  "include": ["chat.ts", "../**/*.d.ts"],
-  "exclude": [
-    "node_modules"
-  ]
+  "include": ["chat.ts", "../**/*.d.ts"]
 }
\ No newline at end of file
diff --git a/webchat/webpack.config.js b/webchat/webpack.config.js
index 095bf94..45ae833 100644
--- a/webchat/webpack.config.js
+++ b/webchat/webpack.config.js
@@ -1,6 +1,7 @@
 const path = require('path');
-const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
+const ForkTsCheckerWebpackPlugin = require('@f-list/fork-ts-checker-webpack-plugin');
 const VueLoaderPlugin = require('vue-loader/lib/plugin');
+const vueTransformer = require('@f-list/vue-ts/transform').default;
 
 const config = {
     entry: __dirname + '/chat.ts',
@@ -16,7 +17,8 @@ const config = {
                 options: {
                     appendTsSuffixTo: [/\.vue$/],
                     configFile: __dirname + '/tsconfig.json',
-                    transpileOnly: true
+                    transpileOnly: true,
+                    getCustomTransformers: () => ({before: [vueTransformer]})
                 }
             },
             {
diff --git a/yarn.lock b/yarn.lock
index 58430ff..c04fb69 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,35 +2,56 @@
 # yarn lockfile v1
 
 
-"@fortawesome/fontawesome-free-webfonts@^1.0.6":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.9.tgz#72f2c10453422aba0d338fa6a9cb761b50ba24d5"
-  integrity sha512-nLgl6b6a+tXaoJJnSRw0hjN8cWM/Q5DhxKAwI9Xr0AiC43lQ2F98vQ1KLA6kw5OoYeAyisGGqmlwtBj0WqOI5Q==
+"@f-list/fork-ts-checker-webpack-plugin@^0.5.2":
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/@f-list/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-0.5.2.tgz#ab5857c22ee20b6fd6c3f76303a3f0af335675d1"
+  integrity sha512-0MTjYGG6e8KuIPcMwSy/3uMC2jYWAV2d5+Q8V3DkHT9hC982aRI9FFO72yWow4vKq25z6Tdov/dtcOGn8jxu7g==
+  dependencies:
+    "@vue/component-compiler-utils" "^2.3.1"
+    babel-code-frame "^6.22.0"
+    chalk "^2.4.1"
+    chokidar "^2.0.4"
+    micromatch "^3.1.10"
+    minimatch "^3.0.4"
+    tapable "^1.0.0"
 
-"@types/lodash@^4.14.116":
-  version "4.14.116"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.116.tgz#5ccf215653e3e8c786a58390751033a9adca0eb9"
-  integrity sha512-lRnAtKnxMXcYYXqOiotTmJd74uawNWuPnsnPrrO7HiFuE3npE2iQhfABatbYDyxTNqZNuXzcKGhw37R7RjBFLg==
+"@f-list/vue-ts@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@f-list/vue-ts/-/vue-ts-1.0.2.tgz#0a3c2cd95c714df9f35ae52925bac27ffc0c9d7c"
+  integrity sha512-NWp79Io3DRAh7nYQ23yckW6IoI/Sn9O6JlfCvi2B9BFAXqXl7ShY2jcp+tlasDhFZ8CFBYoZDftnodEeGySHqw==
+  dependencies:
+    typescript "^3.2.2"
+    vue "^2.5.20"
 
-"@types/node@^10.11.2":
-  version "10.11.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.11.2.tgz#59508b88ce90fe2742f7b8414c6f5db3e359570d"
-  integrity sha512-XubfQDIg88PGJ7netQPf3QOKHF7Xht4WXGtg5W7cGBeQs9ETbYKwfchR9o+tRRA9iLTQ7nAre85M205JbYsjJA==
+"@fortawesome/fontawesome-free@^5.6.1":
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.6.1.tgz#eb096a49446d649bdc8c90f04400306eff7c33c2"
+  integrity sha512-0afQfB+HBeJHlXPzcF2Jjh78SbwPSkDjba/O7pZFzAW3WGKNzd4s4AqrZo7oIlMWGnfoyDo8+QeosK0+DTDrTg==
+
+"@types/lodash@^4.14.119":
+  version "4.14.119"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.119.tgz#be847e5f4bc3e35e46d041c394ead8b603ad8b39"
+  integrity sha512-Z3TNyBL8Vd/M9D9Ms2S3LmFq2sSMzahodD6rCS9V2N44HUMINb75jNkSuwAx7eo2ufqTdfOdtGQpNbieUjPQmw==
 
 "@types/node@^8.0.24":
-  version "8.10.30"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.30.tgz#2c82cbed5f79d72280c131d2acffa88fbd8dd353"
-  integrity sha512-Le8HGMI5gjFSBqcCuKP/wfHC19oURzkU2D+ERIescUoJd+CmNEMYBib9LQ4zj1HHEZOJQWhw2ZTnbD8weASh/Q==
+  version "8.10.39"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.39.tgz#e7e87ad00364dd7bc485c940926345b8ec1a26ca"
+  integrity sha512-rE7fktr02J8ybFf6eysife+WF+L4sAHWzw09DgdCebEu+qDwMvv4zl6Bc+825ttGZP73kCKxa3dhJOoGJ8+5mA==
 
-"@types/sortablejs@^1.3.31":
-  version "1.3.32"
-  resolved "https://registry.yarnpkg.com/@types/sortablejs/-/sortablejs-1.3.32.tgz#e7185fc4cd381c477564cd2375e095094064563d"
-  integrity sha512-U+q7Cp3FOFQmhUeQPiFvzSfnjhCpo9CXoShr5fxsKRIzilTVzHkI9WgEFHn/ivrcI4DR2SN0wzuBC+ZSQLfJwA==
+"@types/q@^1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.1.tgz#48fd98c1561fe718b61733daed46ff115b496e18"
+  integrity sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA==
 
-"@vue/component-compiler-utils@^2.0.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.2.0.tgz#bbbb7ed38a9a8a7c93abe7ef2e54a90a04b631b4"
-  integrity sha512-pS4zlcdD7BvedyB+IfiTfrbi6C977UMIfulSk8r6uL0BU46ZE2+fUj/zbSNSfVxeaj9ElmnSni5OMwF9np+b+w==
+"@types/sortablejs@^1.7.0":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@types/sortablejs/-/sortablejs-1.7.0.tgz#1a5af3f6c95b6564d40c74c23d8f1cb97800c721"
+  integrity sha512-VVsUcV+c3SEUqoLcP43zEkZArKulFK+NH2su9ZqWyzI9ZRZCVjQMdJh2H8LASnHzWxatpCzIfIyCT8B64ZDbMw==
+
+"@vue/component-compiler-utils@^2.0.0", "@vue/component-compiler-utils@^2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.3.1.tgz#d1c2623f02ad3fe6b6fc9c3762be55c9c61e3977"
+  integrity sha512-8VuzMhHTf5UU7+HvBeEbBmYiNLvRxIXtDpvxUl5x26WBPgKmQuuJVFY3dN3GFgnWK9Rveh/u/8NF4quhdUUQ1Q==
   dependencies:
     consolidate "^0.15.1"
     hash-sum "^1.0.2"
@@ -42,147 +63,147 @@
     source-map "^0.5.6"
     vue-template-es2015-compiler "^1.6.0"
 
-"@webassemblyjs/ast@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.8.tgz#f31f480debeef957f01b623f27eabc695fa4fe8f"
-  integrity sha512-dOrtdtEyB8sInpl75yLPNksY4sRl0j/+t6aHyB/YA+ab9hV3Fo7FmG12FHzP+2MvWVAJtDb+6eXR5EZbZJ+uVg==
+"@webassemblyjs/ast@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
+  integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
   dependencies:
-    "@webassemblyjs/helper-module-context" "1.7.8"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
-    "@webassemblyjs/wast-parser" "1.7.8"
+    "@webassemblyjs/helper-module-context" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/wast-parser" "1.7.11"
 
-"@webassemblyjs/floating-point-hex-parser@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.8.tgz#1b3ed0e27e384032254e9322fc646dd3e70ef1b9"
-  integrity sha512-kn2zNKGsbql5i56VAgRYkpG+VazqHhQQZQycT2uXAazrAEDs23gy+Odkh5VblybjnwX2/BITkDtNmSO76hdIvQ==
+"@webassemblyjs/floating-point-hex-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
+  integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
 
-"@webassemblyjs/helper-api-error@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.8.tgz#a2b49c11f615e736f815ec927f035dcfa690d572"
-  integrity sha512-xUwxDXsd1dUKArJEP5wWM5zxgCSwZApSOJyP1XO7M8rNUChUDblcLQ4FpzTpWG2YeylMwMl1MlP5Ztryiz1x4g==
+"@webassemblyjs/helper-api-error@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
+  integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
 
-"@webassemblyjs/helper-buffer@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.8.tgz#3fc66bfa09c1c60e824cf3d5887826fac062877d"
-  integrity sha512-WXiIMnuvuwlhWvVOm8xEXU9DnHaa3AgAU0ZPfvY8vO1cSsmYb2WbGbHnMLgs43vXnA7XAob9b56zuZaMkxpCBg==
+"@webassemblyjs/helper-buffer@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
+  integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
 
-"@webassemblyjs/helper-code-frame@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.8.tgz#cc5a7e9522b70e7580df056dfd34020cf29645b0"
-  integrity sha512-TLQxyD9qGOIdX5LPQOPo0Ernd88U5rHkFb8WAjeMIeA0sPjCHeVPaGqUGGIXjUcblUkjuDAc07bruCcNHUrHDA==
+"@webassemblyjs/helper-code-frame@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
+  integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
   dependencies:
-    "@webassemblyjs/wast-printer" "1.7.8"
+    "@webassemblyjs/wast-printer" "1.7.11"
 
-"@webassemblyjs/helper-fsm@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.8.tgz#fe4607430af466912797c21acafd3046080182ea"
-  integrity sha512-TjK0CnD8hAPkV5mbSp5aWl6SO1+H3WFcjWtixWoy8EMA99YnNzYhpc/WSYWhf7yrhpzkq5tZB0tvLK3Svr3IXA==
+"@webassemblyjs/helper-fsm@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
+  integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
 
-"@webassemblyjs/helper-module-context@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.8.tgz#3c2e7ee93d14ff4768ba66fb1be42fdc9dc7160a"
-  integrity sha512-uCutAKR7Nm0VsFixcvnB4HhAyHouNbj0Dx1p7eRjFjXGGZ+N7ftTaG1ZbWCasAEbtwGj54LP8+lkBZdTCPmLGg==
+"@webassemblyjs/helper-module-context@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
+  integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
 
-"@webassemblyjs/helper-wasm-bytecode@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.8.tgz#89bdb78cd6dd5209ae2ed2925de78d0f0e00b6f0"
-  integrity sha512-AdCCE3BMW6V34WYaKUmPgVHa88t2Z14P4/0LjLwuGkI0X6pf7nzp0CehzVVk51cKm2ymVXjl9dCG+gR1yhITIQ==
+"@webassemblyjs/helper-wasm-bytecode@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
+  integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
 
-"@webassemblyjs/helper-wasm-section@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.8.tgz#c68ef7d26a6fc12421b2e6e56f9bc810dfb33e87"
-  integrity sha512-BkBhYQuzyl4hgTGOKo87Vdw6f9nj8HhI7WYpI0MCC5qFa5ahrAPOGgyETVdnRbv+Rjukl9MxxfDmVcVC435lDg==
+"@webassemblyjs/helper-wasm-section@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
+  integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
   dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-buffer" "1.7.8"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
-    "@webassemblyjs/wasm-gen" "1.7.8"
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
 
-"@webassemblyjs/ieee754@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.8.tgz#1f37974b13cb486a9237e73ce04cac7a2f1265ed"
-  integrity sha512-tOarWChdG1a3y1yqCX0JMDKzrat5tQe4pV6K/TX19BcXsBLYxFQOL1DEDa5KG9syeyvCrvZ+i1+Mv1ExngvktQ==
+"@webassemblyjs/ieee754@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
+  integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.8.tgz#1bee83426819192db2ea1a234b84c7ebc6d34c1f"
-  integrity sha512-GCYeGPgUFWJiZuP4NICbcyUQNxNLJIf476Ei+K+jVuuebtLpfvwkvYT6iTUE7oZYehhkor4Zz2g7SJ/iZaPudQ==
+"@webassemblyjs/leb128@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
+  integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
   dependencies:
     "@xtuc/long" "4.2.1"
 
-"@webassemblyjs/utf8@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.8.tgz#2b489d5cf43e0aebb93d8e2d792aff9879c61f05"
-  integrity sha512-9X+f0VV+xNXW2ujfIRSXBJENGE6Qh7bNVKqu3yDjTFB3ar3nsThsGBBKdTG58aXOm2iUH6v28VIf88ymPXODHA==
+"@webassemblyjs/utf8@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
+  integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
 
-"@webassemblyjs/wasm-edit@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.8.tgz#f8bdbe7088718eca27b1c349bb7c06b8a457950c"
-  integrity sha512-6D3Hm2gFixrfyx9XjSON4ml1FZTugqpkIz5Awvrou8fnpyprVzcm4X8pyGRtA2Piixjl3DqmX/HB1xdWyE097A==
+"@webassemblyjs/wasm-edit@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
+  integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-buffer" "1.7.8"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
-    "@webassemblyjs/helper-wasm-section" "1.7.8"
-    "@webassemblyjs/wasm-gen" "1.7.8"
-    "@webassemblyjs/wasm-opt" "1.7.8"
-    "@webassemblyjs/wasm-parser" "1.7.8"
-    "@webassemblyjs/wast-printer" "1.7.8"
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/helper-wasm-section" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+    "@webassemblyjs/wasm-opt" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/wast-printer" "1.7.11"
 
-"@webassemblyjs/wasm-gen@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.8.tgz#7e8abf1545eae74ac6781d545c034af3cfd0c7d5"
-  integrity sha512-a7O/wE6eBeVKKUYgpMK7NOHmMADD85rSXLe3CqrWRDwWff5y3cSVbzpN6Qv3z6C4hdkpq9qyij1Ga1kemOZGvQ==
+"@webassemblyjs/wasm-gen@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
+  integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
   dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
-    "@webassemblyjs/ieee754" "1.7.8"
-    "@webassemblyjs/leb128" "1.7.8"
-    "@webassemblyjs/utf8" "1.7.8"
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/ieee754" "1.7.11"
+    "@webassemblyjs/leb128" "1.7.11"
+    "@webassemblyjs/utf8" "1.7.11"
 
-"@webassemblyjs/wasm-opt@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.8.tgz#7ada6e211914728fce02ff0ff9c344edc6d41f26"
-  integrity sha512-3lbQ0PT81NHCdi1sR/7+SNpZadM4qYcTSr62nFFAA7e5lFwJr14M1Gi+A/Y3PgcDWOHYjsaNGPpPU0H03N6Blg==
+"@webassemblyjs/wasm-opt@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
+  integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-buffer" "1.7.8"
-    "@webassemblyjs/wasm-gen" "1.7.8"
-    "@webassemblyjs/wasm-parser" "1.7.8"
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
 
-"@webassemblyjs/wasm-parser@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.8.tgz#dac47c291fb6a3e63529aecd647592cd34afbf94"
-  integrity sha512-rZ/zlhp9DHR/05zh1MbAjT2t624sjrPP/OkJCjXqzm7ynH+nIdNcn9Ixc+qzPMFXhIrk0rBoQ3to6sEIvHh9jQ==
+"@webassemblyjs/wasm-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
+  integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-api-error" "1.7.8"
-    "@webassemblyjs/helper-wasm-bytecode" "1.7.8"
-    "@webassemblyjs/ieee754" "1.7.8"
-    "@webassemblyjs/leb128" "1.7.8"
-    "@webassemblyjs/utf8" "1.7.8"
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-api-error" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/ieee754" "1.7.11"
+    "@webassemblyjs/leb128" "1.7.11"
+    "@webassemblyjs/utf8" "1.7.11"
 
-"@webassemblyjs/wast-parser@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.8.tgz#f8aab9a450c048c1f9537695c89faeb92fabfba5"
-  integrity sha512-Q/zrvtUvzWuSiJMcSp90fi6gp2nraiHXjTV2VgAluVdVapM4gy1MQn7akja2p6eSBDQpKJPJ6P4TxRkghRS5dg==
+"@webassemblyjs/wast-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
+  integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
   dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/floating-point-hex-parser" "1.7.8"
-    "@webassemblyjs/helper-api-error" "1.7.8"
-    "@webassemblyjs/helper-code-frame" "1.7.8"
-    "@webassemblyjs/helper-fsm" "1.7.8"
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/floating-point-hex-parser" "1.7.11"
+    "@webassemblyjs/helper-api-error" "1.7.11"
+    "@webassemblyjs/helper-code-frame" "1.7.11"
+    "@webassemblyjs/helper-fsm" "1.7.11"
     "@xtuc/long" "4.2.1"
 
-"@webassemblyjs/wast-printer@1.7.8":
-  version "1.7.8"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.8.tgz#e7e965782c1912f6a965f14a53ff43d8ad0403a5"
-  integrity sha512-GllIthRtwTxRDAURRNXscu7Napzmdf1jt1gpiZiK/QN4fH0lSGs3OTmvdfsMNP7tqI4B3ZtfaaWRlNIQug6Xyg==
+"@webassemblyjs/wast-printer@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
+  integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
   dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/wast-parser" "1.7.8"
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/wast-parser" "1.7.11"
     "@xtuc/long" "4.2.1"
 
 "@xtuc/ieee754@^1.2.0":
@@ -213,29 +234,19 @@ acorn@^5.0.0, acorn@^5.6.2:
   integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
 
 ajv-errors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
-  integrity sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
 ajv-keywords@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
   integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
-ajv@^5.1.0, ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ajv@^6.1.0:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.4.tgz#247d5274110db653706b550fcc2b797ca28cfc59"
-  integrity sha512-4Wyjt8+t6YszqaXnLDfMmG/8AlO5Zbcsy3ATHncCzjW/NoPzAId8AK6749Ybjmdt+kUY1gP60fCu46oDxPv/mg==
+ajv@^6.1.0, ajv@^6.5.5:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.6.2.tgz#caceccf474bf3fc3ce3b147443711a24063cc30d"
+  integrity sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
@@ -369,9 +380,9 @@ asar@^0.11.0:
     mksnapshot "^0.3.0"
 
 asar@^0.14.0:
-  version "0.14.3"
-  resolved "https://registry.yarnpkg.com/asar/-/asar-0.14.3.tgz#c72a81542a48e3bca459fb1b07ee2b6adfae265d"
-  integrity sha512-+hNnVVDmYbv05We/a9knj/98w171+A94A9DNHj+3kXUr3ENTQoSEcfbJRvBBRHyOh4vukBYWujmHvvaMmQoQbg==
+  version "0.14.6"
+  resolved "https://registry.yarnpkg.com/asar/-/asar-0.14.6.tgz#0e56ff7fad97470845391c3a2b8690b7cabef6d8"
+  integrity sha512-ZqybKcdO5At6y3ge2RHxVImc6Eltb2t3sxT7lk4T4zjZBSFUuIGCIZY6f41dCjlvJSizN5QPRr8YTgMhpgBjLg==
   dependencies:
     chromium-pickle-js "^0.2.0"
     commander "^2.9.0"
@@ -379,7 +390,7 @@ asar@^0.14.0:
     glob "^6.0.4"
     minimatch "^3.0.3"
     mkdirp "^0.5.0"
-    mksnapshot "^0.3.0"
+    mksnapshot "^0.3.4"
     tmp "0.0.28"
 
 asn1.js@^4.0.0:
@@ -450,20 +461,20 @@ aws-sign2@~0.7.0:
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
-aws4@^1.6.0, aws4@^1.8.0:
+aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
 axios@^0.18.0:
   version "0.18.0"
-  resolved "http://registry.npmjs.org/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.18.0.tgz#32d53e4851efdc0a11993b6cd000789d70c05102"
   integrity sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=
   dependencies:
     follow-redirects "^1.3.0"
     is-buffer "^1.1.5"
 
-babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.22.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
@@ -490,12 +501,7 @@ base32-encode@^0.1.0:
   resolved "https://registry.yarnpkg.com/base32-encode/-/base32-encode-0.1.1.tgz#7510f6aa44e2c695b7efcb2673a454f8f8505ea0"
   integrity sha512-jjc+6TC8PXrsxJ4CQr9ibioNhhAM1p/RvS9hy3Q+cxPphvXmLnFSkXoen2XXzNBrYjdmzajRtbFDl1x28F5F4A==
 
-base64-js@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
-  integrity sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=
-
-base64-js@^1.0.2:
+base64-js@^1.0.2, base64-js@^1.2.3:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
   integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
@@ -554,9 +560,9 @@ block-stream@*:
     inherits "~2.0.0"
 
 bluebird@^3.1.1, bluebird@^3.3.4, bluebird@^3.5.0, bluebird@^3.5.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
-  integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
+  integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
@@ -611,7 +617,7 @@ brorand@^1.0.1:
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
-  resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
   integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
   dependencies:
     buffer-xor "^1.0.3"
@@ -642,7 +648,7 @@ browserify-des@^1.0.0:
 
 browserify-rsa@^4.0.0:
   version "4.0.1"
-  resolved "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
   integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
   dependencies:
     bn.js "^4.1.0"
@@ -669,13 +675,13 @@ browserify-zlib@^0.2.0:
     pako "~1.0.5"
 
 browserslist@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.1.1.tgz#328eb4ff1215b12df6589e9ab82f8adaa4fc8cd6"
-  integrity sha512-VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q==
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.6.tgz#0f9d9081afc66b36f477c6bdf3813f784f42396a"
+  integrity sha512-kMGKs4BTzRWviZ8yru18xBpx+CyHG9eqgRbj9XbE3IMgtczf4aiA0Y1YCpVdvUieKGZ03kolSPXqTcscBCb9qw==
   dependencies:
-    caniuse-lite "^1.0.30000884"
-    electron-to-chromium "^1.3.62"
-    node-releases "^1.0.0-alpha.11"
+    caniuse-lite "^1.0.30000921"
+    electron-to-chromium "^1.3.92"
+    node-releases "^1.1.1"
 
 btoa@^1.2.1:
   version "1.2.1"
@@ -717,7 +723,7 @@ buffer-xor@^1.0.3:
 
 buffer@^4.3.0:
   version "4.9.1"
-  resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
   integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
   dependencies:
     base64-js "^1.0.2"
@@ -739,22 +745,23 @@ builtin-status-codes@^3.0.0:
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
-cacache@^10.0.4:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
-  integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
+cacache@^11.0.2:
+  version "11.3.1"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.1.tgz#d09d25f6c4aca7a6d305d141ae332613aa1d515f"
+  integrity sha512-2PEw4cRRDu+iQvBTTuttQifacYjLPhET+SYO/gEFMy8uhi+jlJREDAjSF5FWSdV/Aw5h18caHA7vMTw2c+wDzA==
   dependencies:
     bluebird "^3.5.1"
     chownr "^1.0.1"
+    figgy-pudding "^3.1.0"
     glob "^7.1.2"
     graceful-fs "^4.1.11"
-    lru-cache "^4.1.1"
-    mississippi "^2.0.0"
+    lru-cache "^4.1.3"
+    mississippi "^3.0.0"
     mkdirp "^0.5.1"
     move-concurrently "^1.0.1"
     promise-inflight "^1.0.1"
     rimraf "^2.6.2"
-    ssri "^5.2.4"
+    ssri "^6.0.0"
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
@@ -773,6 +780,25 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
+  dependencies:
+    callsites "^2.0.0"
+
+caller-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
+  dependencies:
+    caller-callsite "^2.0.0"
+
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
+
 camelcase-keys@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
@@ -791,10 +817,10 @@ camelcase@^3.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
   integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
 
-camelcase@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-  integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
+camelcase@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
+  integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
 
 caniuse-api@^3.0.0:
   version "3.0.0"
@@ -806,10 +832,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000884:
-  version "1.0.30000887"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000887.tgz#1769458c27bbdcf61b0cb6b5072bb6cd11fd9c23"
-  integrity sha512-AHpONWuGFWO8yY9igdXH94tikM6ERS84286r0cAMAXYFtJBk76lhiMhtCxBJNBZsD6hzlvpWZ2AtbVFEkf4JQA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000921:
+  version "1.0.30000921"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000921.tgz#7a607c1623444b22351d834e093aedda3c42fbe8"
+  integrity sha512-Bu09ciy0lMWLgpYC77I0YGuI8eFRBPPzaSOYJK1jTI64txCphYCqnWbxJYjHABYVt/TYX/p3jNjLBR87u1Bfpw==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -825,7 +851,7 @@ chainsaw@~0.1.0:
 
 chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
-  resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
@@ -863,7 +889,7 @@ chokidar@^2.0.2, chokidar@^2.0.4:
   optionalDependencies:
     fsevents "^1.2.2"
 
-chownr@^1.0.1:
+chownr@^1.0.1, chownr@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.1.tgz#54726b8b8fff4df053c42187e801fb4412df1494"
   integrity sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==
@@ -934,16 +960,13 @@ clone-deep@^2.0.1:
     kind-of "^6.0.0"
     shallow-clone "^1.0.0"
 
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-  integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
-
 coa@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.1.tgz#f3f8b0b15073e35d70263fb1042cb2c023db38af"
-  integrity sha512-5wfTTO8E2/ja4jFSxePXlG5nRu5bBtL/r1HCIpJW/lzT6yDtKl0u0Z4o/Vpz32IpKmBn7HerheEZQgA9N2DarQ==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
+  integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==
   dependencies:
+    "@types/q" "^1.5.1"
+    chalk "^2.4.1"
     q "^1.1.2"
 
 code-point-at@^1.0.0:
@@ -990,31 +1013,24 @@ color-string@^1.5.2:
     simple-swizzle "^0.2.2"
 
 color@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a"
-  integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/color/-/color-3.1.0.tgz#d8e9fb096732875774c84bf922815df0308d0ffc"
+  integrity sha512-CwyopLkuRYO5ei2EpzpIh6LqJMt6Mt+jZhO5VI5f/wJLZriXQE32/SSqzmrh+QB+AZT81Cj8yv+7zwToW8ahZg==
   dependencies:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
 colors@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
-  integrity sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.3.tgz#39e005d546afe01e01f9c4ca8fa50f686a01205d"
+  integrity sha512-mmGt/1pZqYRjMxB1axhTo16/snVZ5krrKkcmMeVKxzECMMXoCgnvTPp10QgHfcbQZw8Dq2jMNG6je4JlWU0gWg==
 
 colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
   integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM=
 
-combined-stream@1.0.6:
-  version "1.0.6"
-  resolved "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
-  integrity sha1-cj599ugBrFYTETp+RFqbactjKBg=
-  dependencies:
-    delayed-stream "~1.0.0"
-
-combined-stream@~1.0.5, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
   integrity sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==
@@ -1022,14 +1038,14 @@ combined-stream@~1.0.5, combined-stream@~1.0.6:
     delayed-stream "~1.0.0"
 
 commander@^2.12.1, commander@^2.9.0:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.18.0.tgz#2bf063ddee7c7891176981a2cc798e5754bc6970"
-  integrity sha512-6CYPa+JP2ftfRU2qkDK+UTVeQYosOg/2GbcjIcKPHfinyOLPVGXu/ovN86RP49Re5ndJK1N0kuiidFFuepc4ZQ==
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
-commander@~2.13.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-  integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
+commander@~2.17.1:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
 commondir@^1.0.1:
   version "1.0.1"
@@ -1103,9 +1119,9 @@ copy-descriptor@^0.1.0:
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-js@^2.4.0:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
-  integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.1.tgz#87416ae817de957a3f249b3b5ca475d4aaed6042"
+  integrity sha512-L72mmmEayPJBejKIWe2pYtGis5r0tQ5NaJekdhyXgeMQTpJoBsH0NL4ElY2LfSoV15xeQWKQ+XTTOZdyero5Xg==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -1113,10 +1129,11 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
 cosmiconfig@^5.0.0:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39"
-  integrity sha512-6DWfizHriCrFWURP1/qyhsiFvYdlJzbCzmtFWh744+KyWsJo5+kPzUZZaMRSSItoYc0pxFX7gEO7ZC1/gN/7AQ==
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
+  integrity sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==
   dependencies:
+    import-fresh "^2.0.0"
     is-directory "^0.3.1"
     js-yaml "^3.9.0"
     parse-json "^4.0.0"
@@ -1144,7 +1161,7 @@ create-ecdh@^4.0.0:
 
 create-hash@^1.1.0, create-hash@^1.1.2:
   version "1.2.0"
-  resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
   dependencies:
     cipher-base "^1.0.1"
@@ -1155,7 +1172,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
 
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
   version "1.1.7"
-  resolved "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
   integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
   dependencies:
     cipher-base "^1.0.3"
@@ -1211,43 +1228,41 @@ css-declaration-sorter@^4.0.1:
     postcss "^7.0.1"
     timsort "^0.3.0"
 
-css-loader@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.0.tgz#9f46aaa5ca41dbe31860e3b62b8e23c42916bf56"
-  integrity sha512-tMXlTYf3mIMt3b0dDCOQFJiVvxbocJ5Ho577WiGPYPZcqVEO218L2iU22pDXzkTZCLDE+9AmGSUkWxeh/nZReA==
+css-loader@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-2.0.1.tgz#2e51a15449ab3f7195b7e1bc00a407460016a3b3"
+  integrity sha512-XIVwoIOzSFRVsafOKa060GJ/A70c0IP/C1oVPHEX4eHIFF39z0Jl7j8Kua1SUTiqWDupUnbY3/yQx9r7EUB35w==
   dependencies:
-    babel-code-frame "^6.26.0"
-    css-selector-tokenizer "^0.7.0"
-    icss-utils "^2.1.0"
+    icss-utils "^4.0.0"
     loader-utils "^1.0.2"
-    lodash.camelcase "^4.3.0"
-    postcss "^6.0.23"
-    postcss-modules-extract-imports "^1.2.0"
-    postcss-modules-local-by-default "^1.2.0"
-    postcss-modules-scope "^1.1.0"
-    postcss-modules-values "^1.3.0"
+    lodash "^4.17.11"
+    postcss "^7.0.6"
+    postcss-modules-extract-imports "^2.0.0"
+    postcss-modules-local-by-default "^2.0.2"
+    postcss-modules-scope "^2.0.0"
+    postcss-modules-values "^2.0.0"
     postcss-value-parser "^3.3.0"
-    source-list-map "^2.0.0"
+    schema-utils "^1.0.0"
 
 css-select-base-adapter@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.0.tgz#0102b3d14630df86c3eb9fa9f5456270106cf990"
-  integrity sha1-AQKz0UYw34bD65+p9UVicBBs+ZA=
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7"
+  integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==
 
 css-select@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.0.0.tgz#7aa2921392114831f68db175c0b6a555df74bbd5"
-  integrity sha512-MGhoq1S9EyPgZIGnts8Yz5WwUOyHmPMdlqeifsYs/xFX7AAm3hY0RJe1dqVlXtYPI66Nsk39R/sa5/ree6L2qg==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.0.2.tgz#ab4386cec9e1f668855564b17c3733b43b2a5ede"
+  integrity sha512-dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ==
   dependencies:
     boolbase "^1.0.0"
-    css-what "2.1"
+    css-what "^2.1.2"
     domutils "^1.7.0"
-    nth-check "^1.0.1"
+    nth-check "^1.0.2"
 
 css-selector-tokenizer@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
-  integrity sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
+  integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==
   dependencies:
     cssesc "^0.1.0"
     fastparse "^1.1.1"
@@ -1279,32 +1294,37 @@ css-url-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz#83834230cc9f74c457de59eebd1543feeb83b7ec"
   integrity sha1-g4NCMMyfdMRX3lnuvRVD/uuDt+w=
 
-css-what@2.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
-  integrity sha1-lGfQMsOM+u+58teVASUwYvh/ob0=
+css-what@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.2.tgz#c0876d9d0480927d7d4920dcd72af3595649554d"
+  integrity sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==
 
 cssesc@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
   integrity sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=
 
-cssnano-preset-default@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.2.tgz#1de3f27e73b7f0fbf87c1d7fd7a63ae980ac3774"
-  integrity sha512-zO9PeP84l1E4kbrdyF7NSLtA/JrJY1paX5FHy5+w/ziIXO2kDqDMfJ/mosXkaHHSa3RPiIY3eB6aEgwx3IiGqA==
+cssesc@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
+  integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
+
+cssnano-preset-default@^4.0.5:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.5.tgz#d1756c0259d98ad311e601ba76e95c60f6771ac1"
+  integrity sha512-f1uhya0ZAjPYtDD58QkBB0R+uYdzHPei7cDxJyQQIHt5acdhyGXaSXl2nDLzWHLwGFbZcHxQtkJS8mmNwnxTvw==
   dependencies:
     css-declaration-sorter "^4.0.1"
     cssnano-util-raw-cache "^4.0.1"
     postcss "^7.0.0"
-    postcss-calc "^6.0.2"
+    postcss-calc "^7.0.0"
     postcss-colormin "^4.0.2"
     postcss-convert-values "^4.0.1"
     postcss-discard-comments "^4.0.1"
     postcss-discard-duplicates "^4.0.2"
     postcss-discard-empty "^4.0.1"
     postcss-discard-overridden "^4.0.1"
-    postcss-merge-longhand "^4.0.6"
+    postcss-merge-longhand "^4.0.9"
     postcss-merge-rules "^4.0.2"
     postcss-minify-font-values "^4.0.2"
     postcss-minify-gradients "^4.0.1"
@@ -1348,12 +1368,12 @@ cssnano-util-same-parent@^4.0.0:
   integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==
 
 cssnano@^4.1.0:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.4.tgz#55b71e3d8f5451dd3edc7955673415c98795788f"
-  integrity sha512-wP0wbOM9oqsek14CiNRYrK9N3w3jgadtGZKHXysgC/OMVpy0KZgWVPdNqODSZbz7txO9Gekr9taOfcCgL0pOOw==
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.7.tgz#0bf112294bec103ab5f68d3f805732c8325a0b1b"
+  integrity sha512-AiXL90l+MDuQmRNyypG2P7ux7K4XklxYzNNUd5HXZCNcH8/N9bHPcpN97v8tXgRVeFL/Ed8iP8mVmAAu0ZpT7A==
   dependencies:
     cosmiconfig "^5.0.0"
-    cssnano-preset-default "^4.0.2"
+    cssnano-preset-default "^4.0.5"
     is-resolvable "^1.0.0"
     postcss "^7.0.0"
 
@@ -1388,10 +1408,10 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-date-fns@^1.28.5:
-  version "1.29.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
-  integrity sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw==
+date-fns@^1.30.1:
+  version "1.30.1"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
+  integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
 date-now@^0.1.4:
   version "0.1.4"
@@ -1418,13 +1438,20 @@ debug@=3.1.0:
     ms "2.0.0"
 
 debug@^3.0.0, debug@^3.1.0:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407"
-  integrity sha512-D61LaDQPQkxJ5AUM2mbSJRbPkNs/TmdmOeLAi1hgDkpDfIfetSrjmWhccwtuResSwMbACjx/xXQofvM9CE/aeg==
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.1.1, decamelize@^1.1.2:
+debug@^4.0.1, debug@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
+  integrity sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==
+  dependencies:
+    ms "^2.1.1"
+
+decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -1518,7 +1545,7 @@ diff@^3.2.0:
 
 diffie-hellman@^5.0.0:
   version "5.0.3"
-  resolved "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
   integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
   dependencies:
     bn.js "^4.1.0"
@@ -1539,9 +1566,9 @@ domain-browser@^1.1.1:
   integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
 
 domelementtype@1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-  integrity sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
 domelementtype@~1.1.1:
   version "1.1.3"
@@ -1573,9 +1600,9 @@ ds-store@^0.1.5:
     tn1150 "^0.1.0"
 
 duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
-  integrity sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
+  integrity sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -1610,40 +1637,48 @@ electron-log@^2.2.17:
   resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-2.2.17.tgz#e71e2ebb949fc96ded7cdb99eeee7202e48981d2"
   integrity sha512-v+Af5W5z99ehhaLOfE9eTSXUwjzh2wFlQjz51dvkZ6ZIrET6OB/zAZPvsuwT6tm3t5x+M1r+Ed3U3xtPZYAyuQ==
 
-electron-osx-sign@^0.4.1:
-  version "0.4.10"
-  resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.10.tgz#be4f3b89b2a75a1dc5f1e7249081ab2929ca3a26"
-  integrity sha1-vk87ibKnWh3F8eckkIGrKSnKOiY=
+electron-notarize@^0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.0.5.tgz#d9e95c763a6af853ce16d31dde72d73cb25b0703"
+  integrity sha512-YzrqZ6RDQ7Wt2RWlxzRoQUuxnTeXrfp7laH7XKcmQqrZ6GaAr50DMPvFMpqDKdrZSHSbcgZgB7ktIQbjvITmCQ==
+  dependencies:
+    debug "^4.1.0"
+    fs-extra "^7.0.0"
+
+electron-osx-sign@^0.4.11:
+  version "0.4.11"
+  resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.11.tgz#8377732fe7b207969f264b67582ee47029ce092f"
+  integrity sha512-VVd40nrnVqymvFrY9ZkOYgHJOvexHHYTR3di/SN+mjJ0OWhR1I8BRVj3U+Yamw6hnkZZNKZp52rqL5EFAAPFkQ==
   dependencies:
     bluebird "^3.5.0"
     compare-version "^0.1.2"
     debug "^2.6.8"
     isbinaryfile "^3.0.2"
     minimist "^1.2.0"
-    plist "^2.1.0"
+    plist "^3.0.1"
 
-electron-packager@^12.1.2:
-  version "12.1.2"
-  resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-12.1.2.tgz#731fbbff432c94e4c768c5270db558644329d0dc"
-  integrity sha512-7UiTNquZqhQm+L0Oqn7bR/7Ry/7zGO/PKwFpSNqHbWxydoN2aNahKyWjOPhcxHCAz+C1uu+tdyRe7wEN0BaJsA==
+electron-packager@^13.0.1:
+  version "13.0.1"
+  resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-13.0.1.tgz#126b697aa2006d8e5df9eb28faa303b6167b08d4"
+  integrity sha512-fXfldaZ1wihpPaMTSGMxvCeETJwVArlnMmKafVXLJbbZwS+WTjY4iL7ju9WMQ0LNGuiiIwSMCQFxt5iA087mqg==
   dependencies:
     asar "^0.14.0"
-    debug "^3.0.0"
+    debug "^4.0.1"
     electron-download "^4.1.1"
-    electron-osx-sign "^0.4.1"
+    electron-notarize "^0.0.5"
+    electron-osx-sign "^0.4.11"
     extract-zip "^1.0.3"
-    fs-extra "^5.0.0"
+    fs-extra "^7.0.0"
     galactus "^0.2.1"
     get-package-info "^1.0.0"
-    nodeify "^1.0.1"
     parse-author "^2.0.0"
-    pify "^3.0.0"
-    plist "^2.0.0"
+    pify "^4.0.0"
+    plist "^3.0.0"
     rcedit "^1.0.0"
     resolve "^1.1.6"
     sanitize-filename "^1.6.0"
     semver "^5.3.0"
-    yargs-parser "^10.0.0"
+    yargs-parser "^11.0.0"
 
 electron-rebuild@^1.8.2:
   version "1.8.2"
@@ -1668,10 +1703,10 @@ electron-squirrel-startup@^1.0.0:
   dependencies:
     debug "^2.2.0"
 
-electron-to-chromium@^1.3.62:
-  version "1.3.72"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.72.tgz#b69683081d5b7eee6e1ea07b2f5fa30b3c72252d"
-  integrity sha512-OFbXEC01Lq7A66e3UywkvWYNN00HO1I9MAPereGe0NIXrt2MeaovL1bbY+951HKG0euUdPBe0L7yfKxgqxBMMw==
+electron-to-chromium@^1.3.92:
+  version "1.3.94"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.94.tgz#896dba14f6fefb431295b90543874925ee0cd46e"
+  integrity sha512-miQqXALb6eBD3OetCtg3UM5XTLMwHISux0l6mh14iiV5SE+qvftgOCXT9Vvp53fWaCLET4sfA/SmIMYHXkaNmw==
 
 electron-winstaller@^2.7.0:
   version "2.7.0"
@@ -1685,10 +1720,10 @@ electron-winstaller@^2.7.0:
     lodash.template "^4.2.2"
     temp "^0.8.3"
 
-electron@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.2.tgz#0aed43a331b43dfe671ddb54d75fc4102d362959"
-  integrity sha512-BsU/KJRPODlEoaOZhsmFTIaG2h1Y28JCrqeTGVqGL+fef/7xQZdHx5ZCStUDXXUSTcoqiHlc5QvLH4PfZFbOmg==
+electron@3.0.13:
+  version "3.0.13"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.13.tgz#7b065a3d130c6b6379dc78d49515e03f392c1303"
+  integrity sha512-tfx5jFgXhCmpe6oPjcesaRj7geHqQxrJdbpseanRzL9BbyYUtsj0HoxwPAUvCx4+52P6XryBwWTvne/1eBVf9Q==
   dependencies:
     "@types/node" "^8.0.24"
     electron-download "^4.1.0"
@@ -1729,9 +1764,9 @@ enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
     tapable "^1.0.0"
 
 entities@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
-  integrity sha1-blwtClYhtdra7O+AuQ7ftc13cvA=
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
 env-paths@^1.0.0:
   version "1.0.0"
@@ -1845,10 +1880,10 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expand-template@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-1.1.1.tgz#981f188c0c3a87d2e28f559bc541426ff94f21dd"
-  integrity sha512-cebqLtV8KOZfw0UI8TEFWxtczxxC1jvyUvx6H4fyp1K1FN7A4Q+uggVUlOsI1K8AGU0rwOGqP8nCapdrw8CYQg==
+expand-template@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
+  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
 
 extend-shallow@^2.0.1:
   version "2.0.1"
@@ -1865,7 +1900,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@~3.0.1, extend@~3.0.2:
+extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -1884,10 +1919,10 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-loader@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/extract-loader/-/extract-loader-3.0.0.tgz#7698047c72af59dedeafc821a64c417d662c3068"
-  integrity sha512-6GS8QCEtNBoQuujjn3BPS6s65ZaczlYUVGKQNf87x8qPAscfhDl29jDWW5Z6RjMUE+MBoXGh+yOkcgYekijzCA==
+extract-loader@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/extract-loader/-/extract-loader-3.1.0.tgz#d4b5fe517b9d28f035852602caeb4a215ea41dc3"
+  integrity sha512-baiz/xalbyQJOTHwcMJKXYsHbhEHGWQ2loK26vqZVoqO6eeinrnSrMx9681pNZgGRqz2L/PsyNxz+PVDiSmNPg==
   dependencies:
     babel-runtime "^6.26.0"
     btoa "^1.2.1"
@@ -1914,11 +1949,6 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
-
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
@@ -1930,9 +1960,9 @@ fast-json-stable-stringify@^2.0.0:
   integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
 fastparse@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
-  integrity sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
+  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
 
 fd-slicer@~1.0.1:
   version "1.0.1"
@@ -1941,6 +1971,11 @@ fd-slicer@~1.0.1:
   dependencies:
     pend "~1.2.0"
 
+figgy-pudding@^3.1.0, figgy-pudding@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
+  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
+
 file-loader@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-2.0.0.tgz#39749c82f020b9e85901dcff98e8004e6401cfde"
@@ -1959,14 +1994,14 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
-find-cache-dir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
-  integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
+find-cache-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.0.0.tgz#4c1faed59f45184530fb9d7fa123a4d04a98472d"
+  integrity sha512-LDUY6V1Xs5eFskUVYtIwatojt6+9xC9Chnlk/jYOOvn3FAFfSaWddxahDGyNHh0b2dMXa6YW2m0tk8TdVaXHlA==
   dependencies:
     commondir "^1.0.1"
     make-dir "^1.0.0"
-    pkg-dir "^2.0.0"
+    pkg-dir "^3.0.0"
 
 find-up@^1.0.0:
   version "1.1.2"
@@ -1976,17 +2011,19 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.0.0, find-up@^2.1.0:
+find-up@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
   dependencies:
     locate-path "^2.0.0"
 
-flatten@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
-  integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=
+find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
 
 flora-colossus@^1.0.0:
   version "1.0.0"
@@ -2012,9 +2049,9 @@ fmix@^0.1.0:
     imul "^1.0.0"
 
 follow-redirects@^1.3.0:
-  version "1.5.8"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.8.tgz#1dbfe13e45ad969f813e86c00e5296f525c885a1"
-  integrity sha512-sy1mXPmv7kLAMKW/8XofG7o9T+6gAjzdZK4AJF6ryqQYUa/hnzgiypoeUecZ53x7XiqKNEpNqLtS97MshW2nxg==
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.10.tgz#7b7a9f9aea2fdff36786a94ff643ed07f4ff5e2a"
+  integrity sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==
   dependencies:
     debug "=3.1.0"
 
@@ -2040,29 +2077,13 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-fork-ts-checker-webpack-plugin@^0.4.9:
-  version "0.4.9"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-0.4.9.tgz#78607899d4411fdc6faeca5b4db7654c9d8d28a2"
-  integrity sha512-uoUSu2qo8GpoonMrKtPlpIqPfRTO0vVLA1Gh2bPaDSyZ2zoUukrXCc38pJtYYNVLpvlv+g0PNr/9SheFyVAR4w==
-  dependencies:
-    babel-code-frame "^6.22.0"
-    chalk "^2.4.1"
-    chokidar "^2.0.4"
-    lodash.endswith "^4.2.1"
-    lodash.isfunction "^3.0.8"
-    lodash.isstring "^4.0.1"
-    lodash.startswith "^4.2.1"
-    minimatch "^3.0.4"
-    resolve "^1.5.0"
-    tapable "^1.0.0"
-
-form-data@~2.3.1, form-data@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
-  integrity sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=
+form-data@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
   dependencies:
     asynckit "^0.4.0"
-    combined-stream "1.0.6"
+    combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
 fragment-cache@^0.2.1:
@@ -2122,10 +2143,10 @@ fs-extra@^4.0.0, fs-extra@^4.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
-  integrity sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==
+fs-extra@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -2313,29 +2334,21 @@ globule@^1.0.0:
     minimatch "~3.0.2"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
+  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
 
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
-  integrity sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=
-  dependencies:
-    ajv "^5.1.0"
-    har-schema "^2.0.0"
-
 har-validator@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
-  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+  integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
   dependencies:
-    ajv "^5.3.0"
+    ajv "^6.5.5"
     har-schema "^2.0.0"
 
 has-ansi@^2.0.0:
@@ -2412,9 +2425,9 @@ hash-sum@^1.0.2:
   integrity sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=
 
 hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.5.tgz#e38ab4b85dfb1e0c40fe9265c0e9b54854c23812"
-  integrity sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
   dependencies:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
@@ -2454,9 +2467,9 @@ hsla-regex@^1.0.0:
   integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg=
 
 html-comment-regex@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
-  integrity sha1-ZouTd26q5V696POtRkswekljYl4=
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
+  integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==
 
 http-signature@~1.2.0:
   version "1.2.0"
@@ -2484,12 +2497,12 @@ icss-replace-symbols@^1.1.0:
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
   integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
 
-icss-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
-  integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=
+icss-utils@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.0.0.tgz#d52cf4bcdcfa1c45c2dbefb4ffdf6b00ef608098"
+  integrity sha512-bA/xGiwWM17qjllIs9X/y0EjsB7e0AV08F3OL8UPsoNkNRibIuu8f1eKTnQ8QO1DteKKTxTUAn+IEWUToIwGOA==
   dependencies:
-    postcss "^6.0.1"
+    postcss "^7.0.5"
 
 ieee754@^1.1.4:
   version "1.1.12"
@@ -2513,6 +2526,14 @@ image-size@^0.5.0:
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
   integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
 
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+  dependencies:
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
+
 imul@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/imul/-/imul-1.0.1.tgz#9d5867161e8b3de96c2c38d5dc7cb102f35e2ac9"
@@ -2616,7 +2637,7 @@ is-buffer@^1.1.5:
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
-  resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
   integrity sha1-VAVy0096wxGfj3bDDLwbHgN6/74=
   dependencies:
     builtin-modules "^1.0.0"
@@ -2755,7 +2776,7 @@ is-number@^3.0.0:
 
 is-obj@^1.0.0:
   version "1.0.1"
-  resolved "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
   integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
@@ -2765,11 +2786,6 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
-is-promise@~1, is-promise@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-1.0.1.tgz#31573761c057e33c2e91aab9e96da08cefbe76e5"
-  integrity sha1-MVc3YcBX4zwukaq56W2gjO++duU=
-
 is-property@^1.0.0, is-property@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
@@ -2861,9 +2877,9 @@ isstream@~0.1.2:
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
 js-base64@^2.1.8:
-  version "2.4.9"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
-  integrity sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.0.tgz#42255ba183ab67ce59a0dee640afdc00ab5ae93e"
+  integrity sha512-wlEBIZ5LP8usDylWbDNhKPEFVFdI5hCHpnVoT/Ysvoi/PRhJENm/Rlh9TvjYB38HFfKZN7OzEbRjmjvLkFw11g==
 
 js-tokens@^3.0.2:
   version "3.0.2"
@@ -2893,11 +2909,6 @@ json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -2920,7 +2931,7 @@ json5@^0.5.0:
 
 jsonfile@^2.1.0:
   version "2.4.0"
-  resolved "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
   integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
   optionalDependencies:
     graceful-fs "^4.1.6"
@@ -2954,13 +2965,13 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-keytar@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/keytar/-/keytar-4.2.1.tgz#8a06a6577fdf6373e0aa6b112277e63dec77fd12"
-  integrity sha1-igamV3/fY3PgqmsRInfmPex3/RI=
+keytar@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/keytar/-/keytar-4.3.0.tgz#4a3afd64fdeec300716ccf3985fdcf1cfd6e77e9"
+  integrity sha512-pd++/v+fS0LQKmzWlW6R1lziTXFqhfGeS6sYLfuTIqEy2pDzAbjutbSW8f9tnJdEEMn/9XhAQlT34VAtl9h4MQ==
   dependencies:
     nan "2.8.0"
-    prebuild-install "^2.4.1"
+    prebuild-install "^5.0.0"
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
@@ -3010,7 +3021,7 @@ lcid@^1.0.0:
 
 load-json-file@^1.0.0:
   version "1.1.0"
-  resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
   integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
   dependencies:
     graceful-fs "^4.1.2"
@@ -3021,7 +3032,7 @@ load-json-file@^1.0.0:
 
 load-json-file@^2.0.0:
   version "2.0.0"
-  resolved "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
   integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
   dependencies:
     graceful-fs "^4.1.2"
@@ -3051,6 +3062,14 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
+locate-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
+  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
+  dependencies:
+    p-locate "^3.0.0"
+    path-exists "^3.0.0"
+
 lodash._reinterpolate@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
@@ -3061,11 +3080,6 @@ lodash.assign@^4.2.0:
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
   integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
-
 lodash.clonedeep@^4.3.2:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
@@ -3076,26 +3090,11 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
-lodash.endswith@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/lodash.endswith/-/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09"
-  integrity sha1-/tWawXOO0+I27dcGTsRWRIs3vAk=
-
 lodash.get@^4.0.0:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
 
-lodash.isfunction@^3.0.8:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
-  integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-  integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
-
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
@@ -3106,11 +3105,6 @@ lodash.mergewith@^4.6.0:
   resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
   integrity sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==
 
-lodash.startswith@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/lodash.startswith/-/lodash.startswith-4.2.1.tgz#c598c4adce188a27e53145731cdc6c0e7177600c"
-  integrity sha1-xZjErc4YiiflMUVzHNxsDnF3YAw=
-
 lodash.tail@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
@@ -3156,10 +3150,10 @@ loud-rejection@^1.0.0:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
-lru-cache@^4.0.0, lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
-  integrity sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==
+lru-cache@^4.0.0, lru-cache@^4.0.1, lru-cache@^4.1.2, lru-cache@^4.1.3:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
@@ -3196,12 +3190,13 @@ map-visit@^1.0.0:
     object-visit "^1.0.0"
 
 md5.js@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
-  integrity sha1-6b296UogpawYsENA/Fdk1bCdkB0=
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
   dependencies:
     hash-base "^3.0.0"
     inherits "^2.0.1"
+    safe-buffer "^5.1.2"
 
 mdn-data@~1.1.0:
   version "1.1.4"
@@ -3266,17 +3261,17 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@~1.36.0:
-  version "1.36.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.36.0.tgz#5020478db3c7fe93aad7bbcc4dcf869c43363397"
-  integrity sha512-L+xvyD9MkoYMXb1jAmzI/lWYAxAMCPvIBSWur0PZ5nOf5euahRLVqH//FKW9mWp2lkqUgYiXPgkzfMUFi4zVDw==
+mime-db@~1.37.0:
+  version "1.37.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
+  integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
 
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19:
-  version "2.1.20"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.20.tgz#930cb719d571e903738520f8470911548ca2cc19"
-  integrity sha512-HrkrPaP9vGuWbLK1B1FfgAkbqNjIuy4eHlIYnFi7kamZyLLrGlo2mpcx0bBmNpKqBtYtAfGbodDddIgddSJC2A==
+mime-types@^2.1.12, mime-types@~2.1.19:
+  version "2.1.21"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
+  integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
   dependencies:
-    mime-db "~1.36.0"
+    mime-db "~1.37.0"
 
 mimic-fn@^1.0.0:
   version "1.2.0"
@@ -3307,33 +3302,33 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
 
 minimist@0.0.8:
   version "0.0.8"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
 minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
-  resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
 
-minipass@^2.2.1, minipass@^2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
-  integrity sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==
+minipass@^2.2.1, minipass@^2.3.4:
+  version "2.3.5"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
+  integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
   dependencies:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
-minizlib@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
-  integrity sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==
+minizlib@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
+  integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
   dependencies:
     minipass "^2.2.1"
 
-mississippi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
-  integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
   dependencies:
     concat-stream "^1.5.0"
     duplexify "^3.4.2"
@@ -3341,7 +3336,7 @@ mississippi@^2.0.0:
     flush-write-stream "^1.0.0"
     from2 "^2.1.0"
     parallel-transform "^1.1.0"
-    pump "^2.0.1"
+    pump "^3.0.0"
     pumpify "^1.3.3"
     stream-each "^1.1.0"
     through2 "^2.0.0"
@@ -3364,7 +3359,7 @@ mixin-object@^2.0.1:
 
 mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
-  resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
   dependencies:
     minimist "0.0.8"
@@ -3374,14 +3369,14 @@ mkpath@^0.1.0:
   resolved "https://registry.yarnpkg.com/mkpath/-/mkpath-0.1.0.tgz#7554a6f8d871834cc97b5462b122c4c124d6de91"
   integrity sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=
 
-mksnapshot@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/mksnapshot/-/mksnapshot-0.3.1.tgz#2501c05657436d742ce958a4ff92c77e40dd37e6"
-  integrity sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=
+mksnapshot@^0.3.0, mksnapshot@^0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/mksnapshot/-/mksnapshot-0.3.4.tgz#a3b9671095b46529daed44c3fb1c75b67387d3e3"
+  integrity sha512-FgUTiWiY+35LgL95P/MDYrBuQO5o0s3MmaWKX6ZJWoX4vMOY9vPsAv763l1OSSelL9jPsBQ/wf4bzfqTLNPSFg==
   dependencies:
     decompress-zip "0.3.0"
     fs-extra "0.26.7"
-    request "^2.79.0"
+    request "2.x"
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -3420,9 +3415,9 @@ nan@2.8.0:
   integrity sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=
 
 nan@^2.10.0, nan@^2.3.2, nan@^2.4.0, nan@^2.9.2:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
-  integrity sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.12.1.tgz#7b1aa193e9aa86057e3c7bbd0ac448e770925552"
+  integrity sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -3441,6 +3436,11 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+napi-build-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.1.tgz#1381a0f92c39d66bf19852e7873432fc2123e508"
+  integrity sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA==
+
 needle@^2.2.1:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.4.tgz#51931bff82533b1928b7d1d69e01f1b00ffd2a4e"
@@ -3451,9 +3451,9 @@ needle@^2.2.1:
     sax "^1.2.4"
 
 neo-async@^2.5.0:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.2.tgz#489105ce7bc54e709d736b195f82135048c50fcc"
-  integrity sha512-vdqTKI9GBIYcAEbFAcpKPErKINfPF5zIuz3/niBfq8WUZjpT2tytLlFVrBgWdOtqI4uaA/Rb6No0hux39XXDuw==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.0.tgz#b9d15e4d71c6762908654b5183ed38b753340835"
+  integrity sha512-MFh0d/Wa7vkKO3Y3LlacqAEeHK0mckVqzDieUKTT+KGxi+zIpeVsFxymkIiRpbpDziHc290Xr9A1O4Om7otoRA==
 
 nested-error-stacks@^1.0.1:
   version "1.0.2"
@@ -3463,9 +3463,9 @@ nested-error-stacks@^1.0.1:
     inherits "~2.0.1"
 
 node-abi@^2.0.0, node-abi@^2.2.0:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.4.4.tgz#410d8968809fe616dc078a181c44a370912f12fd"
-  integrity sha512-DQ9Mo2mf/XectC+s6+grPPRQ1Z9gI3ZbrGv6nyXRkjwT3HrE0xvtvrfnH7YHYBLgC/KLadg+h3XHnhZw1sv88A==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.5.0.tgz#942e1a78bce764bc0c1672d5821e492b9d032052"
+  integrity sha512-9g2twBGSP6wIR5PW7tXvAWnEWKJDH/VskdXp168xsw9VVxpEGov8K4jsP4/VeoC7b2ZAyzckvMCuQuQlw44lXg==
   dependencies:
     semver "^5.4.1"
 
@@ -3532,17 +3532,17 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.0.0-alpha.11:
-  version "1.0.0-alpha.12"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.12.tgz#32e461b879ea76ac674e511d9832cf29da345268"
-  integrity sha512-VPB4rTPqpVyWKBHbSa4YPFme3+8WHsOSpvbp0Mfj0bWsC8TEjt4HQrLl1hsBDELlp1nB4lflSgSuGTYiuyaP7Q==
+node-releases@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.2.tgz#93c17fba5eec8650ad908de5433fa8763baebe4d"
+  integrity sha512-j1gEV/zX821yxdWp/1vBMN0pSUjuH9oGUdLCb4PfUko6ZW7KdRs3Z+QGGwDUhYtSpQvdVVyLd2V0YvLsmdg5jQ==
   dependencies:
     semver "^5.3.0"
 
-node-sass@^4.9.3:
-  version "4.9.3"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224"
-  integrity sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==
+node-sass@^4.11.0:
+  version "4.11.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
+  integrity sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -3559,19 +3559,11 @@ node-sass@^4.9.3:
     nan "^2.10.0"
     node-gyp "^3.8.0"
     npmlog "^4.0.0"
-    request "2.87.0"
+    request "^2.88.0"
     sass-graph "^2.2.4"
     stdout-stream "^1.4.0"
     "true-case-path" "^1.0.2"
 
-nodeify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/nodeify/-/nodeify-1.0.1.tgz#64ab69a7bdbaf03ce107b4f0335c87c0b9e91b1d"
-  integrity sha1-ZKtpp7268DzhB7TwM1yHwLnpGx0=
-  dependencies:
-    is-promise "~1.0.0"
-    promise "~1.3.0"
-
 noop-logger@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
@@ -3627,9 +3619,9 @@ npm-bundled@^1.0.1:
   integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
 
 npm-packlist@^1.1.6:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
-  integrity sha512-CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz#22bde2ebc12e72ca482abd67afc51eb49377243a"
+  integrity sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==
   dependencies:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
@@ -3651,10 +3643,10 @@ npm-run-path@^1.0.0:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-nth-check@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
-  integrity sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=
+nth-check@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
   dependencies:
     boolbase "~1.0.0"
 
@@ -3676,11 +3668,6 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-oauth-sign@~0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
-  integrity sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=
-
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -3786,7 +3773,7 @@ os-homedir@^1.0.0, os-homedir@^1.0.1:
 
 os-locale@^1.4.0:
   version "1.4.0"
-  resolved "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
   integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
   dependencies:
     lcid "^1.0.0"
@@ -3811,6 +3798,13 @@ p-limit@^1.1.0:
   dependencies:
     p-try "^1.0.0"
 
+p-limit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
+  integrity sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -3818,15 +3812,27 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
+p-locate@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
+  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
+  dependencies:
+    p-limit "^2.0.0"
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
   integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
+p-try@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
+  integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
+
 pako@~1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
-  integrity sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.7.tgz#2473439021b57f1516c82f58be7275ad8ef1bb27"
+  integrity sha512-3HNK5tW4x8o5mO8RuHZp3Ydw9icZXx0RANAOMzlMzx7LVXhMJ4mo3MOBpzyd7r/+RUu8BmndP47LXT+vzjtWcQ==
 
 parallel-transform@^1.1.0:
   version "1.1.0"
@@ -3839,7 +3845,7 @@ parallel-transform@^1.1.0:
 
 parse-asn1@^5.0.0:
   version "5.1.1"
-  resolved "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
   integrity sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==
   dependencies:
     asn1.js "^4.0.0"
@@ -3914,7 +3920,7 @@ path-key@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-1.0.0.tgz#5d53d578019646c0d68800db4e146e6bdc2ac7af"
   integrity sha1-XVPVeAGWRsDWiADbThRua9wqx68=
 
-path-parse@^1.0.5:
+path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
@@ -3966,6 +3972,11 @@ pify@^3.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
+pify@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -3978,20 +3989,20 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
+pkg-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
+  integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==
   dependencies:
-    find-up "^2.1.0"
+    find-up "^3.0.0"
 
-plist@^2.0.0, plist@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/plist/-/plist-2.1.0.tgz#57ccdb7a0821df21831217a3cad54e3e146a1025"
-  integrity sha1-V8zbeggh3yGDEhejytVOPhRqECU=
+plist@^3.0.0, plist@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.1.tgz#a9b931d17c304e8912ef0ba3bdd6182baf2e1f8c"
+  integrity sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==
   dependencies:
-    base64-js "1.2.0"
-    xmlbuilder "8.2.2"
+    base64-js "^1.2.3"
+    xmlbuilder "^9.0.7"
     xmldom "0.1.x"
 
 posix-character-classes@^0.1.0:
@@ -3999,15 +4010,15 @@ posix-character-classes@^0.1.0:
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
   integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
-postcss-calc@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-6.0.2.tgz#4d9a43e27dbbf27d095fecb021ac6896e2318337"
-  integrity sha512-fiznXjEN5T42Qm7qqMCVJXS3roaj9r4xsSi+meaBVe7CJBl8t/QLOXu02Z2E6oWAMWIvCuF6JrvzFekmVEbOKA==
+postcss-calc@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz#36d77bab023b0ecbb9789d84dcb23c4941145436"
+  integrity sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==
   dependencies:
     css-unit-converter "^1.1.1"
-    postcss "^7.0.2"
-    postcss-selector-parser "^2.2.2"
-    reduce-css-calc "^2.0.0"
+    postcss "^7.0.5"
+    postcss-selector-parser "^5.0.0-rc.4"
+    postcss-value-parser "^3.3.1"
 
 postcss-colormin@^4.0.2:
   version "4.0.2"
@@ -4056,10 +4067,10 @@ postcss-discard-overridden@^4.0.1:
   dependencies:
     postcss "^7.0.0"
 
-postcss-merge-longhand@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.6.tgz#2b938fa3529c3d1657e53dc7ff0fd604dbc85ff1"
-  integrity sha512-JavnI+V4IHWsaUAfOoKeMEiJQGXTraEy1nHM0ILlE6NIQPEZrJDAnPh3lNGZ5HAk2mSSrwp66JoGhvjp6SqShA==
+postcss-merge-longhand@^4.0.9:
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.9.tgz#c2428b994833ffb2a072f290ca642e75ceabcd6f"
+  integrity sha512-UVMXrXF5K/kIwUbK/crPFCytpWbNX2Q3dZSc8+nQUgfOHrCT4+MHncpdxVphUlQeZxlLXUJbDyXc5NBhTnS2tA==
   dependencies:
     css-color-names "0.0.4"
     postcss "^7.0.0"
@@ -4118,36 +4129,37 @@ postcss-minify-selectors@^4.0.1:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
-postcss-modules-extract-imports@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
-  integrity sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=
+postcss-modules-extract-imports@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e"
+  integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==
   dependencies:
-    postcss "^6.0.1"
+    postcss "^7.0.5"
 
-postcss-modules-local-by-default@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
-  integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=
+postcss-modules-local-by-default@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.2.tgz#edfd6a874d326b52daaa3014bfc11e9e4b0cfafc"
+  integrity sha512-qghHvHeydUBQ3EQic5NjYryZ5jzXzAYxHR7lZQlCNmjGpJtINRyX/ELnh/7fxBBmHNkEzNkq2l5cV6trfidYng==
   dependencies:
     css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
+    postcss-value-parser "^3.3.1"
 
-postcss-modules-scope@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
-  integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A=
+postcss-modules-scope@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.0.1.tgz#2c0f2394cde4cd09147db054c68917e38f6d43a4"
+  integrity sha512-7+6k9c3/AuZ5c596LJx9n923A/j3nF3ormewYBF1RrIQvjvjXe1xE8V8A1KFyFwXbvnshT6FBZFX0k/F1igneg==
   dependencies:
     css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
 
-postcss-modules-values@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
-  integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=
+postcss-modules-values@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz#479b46dc0c5ca3dc7fa5270851836b9ec7152f64"
+  integrity sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==
   dependencies:
     icss-replace-symbols "^1.1.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
 
 postcss-normalize-charset@^4.0.1:
   version "4.0.1"
@@ -4259,15 +4271,6 @@ postcss-reduce-transforms@^4.0.1:
     postcss "^7.0.0"
     postcss-value-parser "^3.0.0"
 
-postcss-selector-parser@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
-  integrity sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=
-  dependencies:
-    flatten "^1.0.2"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-
 postcss-selector-parser@^3.0.0, postcss-selector-parser@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
@@ -4277,6 +4280,15 @@ postcss-selector-parser@^3.0.0, postcss-selector-parser@^3.1.1:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
+postcss-selector-parser@^5.0.0-rc.4:
+  version "5.0.0-rc.4"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0-rc.4.tgz#ca5e77238bf152966378c13e91ad6d611568ea87"
+  integrity sha512-0XvfYuShrKlTk1ooUrVzMCFQRcypsdEIsGqh5IxC5rdtBi4/M/tDAJeSONwC2MTqEFsmPZYAV7Dd4X8rgAfV0A==
+  dependencies:
+    cssesc "^2.0.0"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
 postcss-svgo@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.1.tgz#5628cdb38f015de6b588ce6d0bf0724b492b581d"
@@ -4296,12 +4308,12 @@ postcss-unique-selectors@^4.0.1:
     postcss "^7.0.0"
     uniqs "^2.0.0"
 
-postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
-  integrity sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=
+postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
+  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss@^6.0.1, postcss@^6.0.20, postcss@^6.0.23:
+postcss@^6.0.20:
   version "6.0.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
   integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
@@ -4310,31 +4322,32 @@ postcss@^6.0.1, postcss@^6.0.20, postcss@^6.0.23:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.4.tgz#b5a059597d2c1a8a9916cb6efb0b294f70b4f309"
-  integrity sha512-Bg1BrMZGKNOI0mkn8NtjJrOrZKgoHrl+geKJ45mTOkeY4WCsYq/mjd1BUWRgRvydHP/lA07Ys2n9m6Va5FsEsw==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.5, postcss@^7.0.6:
+  version "7.0.7"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.7.tgz#2754d073f77acb4ef08f1235c36c5721a7201614"
+  integrity sha512-HThWSJEPkupqew2fnuQMEI2YcTj/8gMV3n80cMdJsKxfIh5tHf7nM5JigNX6LxVMqo6zkgQNAI88hyFvBk41Pg==
   dependencies:
     chalk "^2.4.1"
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
-prebuild-install@^2.4.1:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.5.3.tgz#9f65f242782d370296353710e9bc843490c19f69"
-  integrity sha512-/rI36cN2g7vDQnKWN8Uzupi++KjyqS9iS+/fpwG4Ea8d0Pip0PQ5bshUNzVwt+/D2MRfhVAplYMMvWLqWrCF/g==
+prebuild-install@^5.0.0:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-5.2.2.tgz#237888f21bfda441d0ee5f5612484390bccd4046"
+  integrity sha512-4e8VJnP3zJdZv/uP0eNWmr2r9urp4NECw7Mt1OSAi3rcLrbBRxGiAkfUFtre2MhQ5wfREAjRV+K1gubvs/GPsA==
   dependencies:
     detect-libc "^1.0.3"
-    expand-template "^1.0.2"
+    expand-template "^2.0.3"
     github-from-package "0.0.0"
     minimist "^1.2.0"
     mkdirp "^0.5.1"
+    napi-build-utils "^1.0.1"
     node-abi "^2.2.0"
     noop-logger "^0.1.1"
     npmlog "^4.0.1"
     os-homedir "^1.0.1"
     pump "^2.0.1"
-    rc "^1.1.6"
+    rc "^1.2.7"
     simple-get "^2.7.0"
     tar-fs "^1.13.0"
     tunnel-agent "^0.6.0"
@@ -4376,13 +4389,6 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
-promise@~1.3.0:
-  version "1.3.0"
-  resolved "http://registry.npmjs.org/promise/-/promise-1.3.0.tgz#e5cc9a4c8278e4664ffedc01c7da84842b040175"
-  integrity sha1-5cyaTIJ45GZP/twBx9qEhCsEAXU=
-  dependencies:
-    is-promise "~1"
-
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -4394,20 +4400,21 @@ pseudomap@^1.0.2:
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
 psl@^1.1.24:
-  version "1.1.29"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
-  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
+  version "1.1.31"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
+  integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
 
 public-encrypt@^4.0.0:
-  version "4.0.2"
-  resolved "http://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
-  integrity sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
     create-hash "^1.1.0"
     parse-asn1 "^5.0.0"
     randombytes "^2.0.1"
+    safe-buffer "^5.1.2"
 
 pump@^1.0.0:
   version "1.0.3"
@@ -4425,6 +4432,14 @@ pump@^2.0.0, pump@^2.0.1:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
 pumpify@^1.3.3:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
@@ -4454,7 +4469,12 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
-qs@^6.5.1, qs@~6.5.1, qs@~6.5.2:
+qs@^6.6.0:
+  version "6.6.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2"
+  integrity sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==
+
+qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
@@ -4497,7 +4517,7 @@ raven-js@^3.27.0:
   resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.27.0.tgz#9f47c03e17933ce756e189f3669d49c441c1ba6e"
   integrity sha512-vChdOL+yzecfnGA+B5EhEZkJ3kY3KlMzxEhShKh6Vdtooyl0yZfYNFQfYzgMf2v4pyQa+OTZ5esTxxgOOZDHqw==
 
-rc@^1.1.6, rc@^1.2.1, rc@^1.2.7:
+rc@^1.2.1, rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -4508,9 +4528,9 @@ rc@^1.1.6, rc@^1.2.1, rc@^1.2.7:
     strip-json-comments "~2.0.1"
 
 rcedit@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-1.1.0.tgz#ae21c28d4efdd78e95fcab7309a5dd084920b16a"
-  integrity sha512-JkXJ0IrUcdupLoIx6gE4YcFaMVSGtu7kQf4NJoDJUnfBZGuATmJ2Yal2v55KTltp+WV8dGr7A0RtOzx6jmtM6Q==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-1.1.1.tgz#79321893357e74f79546617d792c572b38d2f7f0"
+  integrity sha512-6NjOhOpkvbc/gpMEfk2hpXuWyHfbLFN8as5jx3jf4bhELvouRoYvc8d/W3NVVPwEBF1ICfbpwp1oRm8OJ2WDWw==
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
@@ -4546,9 +4566,9 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
-  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
   dependencies:
     core-util-is "~1.0.0"
@@ -4561,7 +4581,7 @@ read-pkg@^2.0.0:
 
 readable-stream@^1.1.8, readable-stream@~1.1.9:
   version "1.1.14"
-  resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
   dependencies:
     core-util-is "~1.0.0"
@@ -4586,14 +4606,6 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
-reduce-css-calc@^2.0.0:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-2.1.5.tgz#f283712f0c9708ef952d328f4b16112d57b03714"
-  integrity sha512-AybiBU03FKbjYzyvJvwkJZY6NLN+80Ufc2EqEs+41yQH+8wqBEslD6eGiS0oIeq5TNLA5PrhBeYHXWdn8gtW7A==
-  dependencies:
-    css-unit-converter "^1.1.1"
-    postcss-value-parser "^3.3.0"
-
 regenerate@^1.2.1:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
@@ -4655,33 +4667,7 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request@2.87.0:
-  version "2.87.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
-  integrity sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
-request@^2.45.0, request@^2.79.0, request@^2.87.0:
+request@2.x, request@^2.45.0, request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
@@ -4717,17 +4703,22 @@ require-main-filename@^1.0.1:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
   integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
+
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
-  integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==
+resolve@^1.1.6, resolve@^1.3.2, resolve@^1.8.1:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06"
+  integrity sha512-TZNye00tI67lwYvzxCxHGjwTNlUV70io54/Ed4j6PscB8xVfuBJpRenI/o6dVk0cY0PYTY27AgCoGGxRnYuItQ==
   dependencies:
-    path-parse "^1.0.5"
+    path-parse "^1.0.6"
 
 restore-cursor@^2.0.0:
   version "2.0.0"
@@ -4761,7 +4752,7 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
 
 rimraf@~2.2.6:
   version "2.2.8"
-  resolved "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
   integrity sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
@@ -4837,7 +4828,7 @@ sax@^1.2.4, sax@~1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-schema-utils@^0.4.4, schema-utils@^0.4.5:
+schema-utils@^0.4.4:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
   integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
@@ -4863,9 +4854,9 @@ scss-tokenizer@^0.2.3:
     source-map "^0.4.2"
 
 "semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
-  integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
 semver@~5.3.0:
   version "5.3.0"
@@ -4909,7 +4900,7 @@ setimmediate@^1.0.4:
 
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
-  resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
   integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
   dependencies:
     inherits "^2.0.1"
@@ -4987,15 +4978,15 @@ snapdragon@^0.8.1:
     source-map-resolve "^0.5.0"
     use "^3.1.0"
 
-sortablejs@^1.6.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.7.0.tgz#80a2b2370abd568e1cec8c271131ef30a904fa28"
-  integrity sha1-gKKyNwq9Vo4c7IwnETHvMKkE+ig=
+sortablejs@^1.8.0-rc1:
+  version "1.8.0-rc1"
+  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.8.0-rc1.tgz#fe4731b2cb3ccb4730a26a8cdde2f74a634bb259"
+  integrity sha512-umyNbQVDwRgc0SZvUB+FRUIUqACnu5vCCmK0zv/xWA3eDSOh+IZsg3GHdWvEOcUBwnykqyk760+YPgVa8HfxFg==
 
 source-list-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
-  integrity sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
 source-map-resolve@^0.5.0:
   version "0.5.2"
@@ -5008,6 +4999,14 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
+source-map-support@~0.5.6:
+  version "0.5.9"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
+  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -5025,7 +5024,7 @@ source-map@^0.5.3, source-map@^0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -5040,17 +5039,17 @@ spawn-rx@^2.0.10:
     rxjs "^5.1.1"
 
 spdx-correct@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.1.tgz#434434ff9d1726b4d9f4219d1004813d80639e30"
-  integrity sha512-hxSPZbRZvSDuOvADntOElzJpenIR7wXJkuoUcUtS0erbgt2fgeaoPIYretfKpslMhfFDY4k0MZ2F5CUzhBsSvQ==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
+  integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
-  integrity sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
+  integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.0"
@@ -5061,9 +5060,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.1.tgz#e2a303236cac54b04031fa7a5a79c7e701df852f"
-  integrity sha512-TfOfPcYGBB5sDuPn3deByxPhmfegAhpDYKSOXZQN81Oyrrif8ZCodOLzK3AesELnCx03kikhyDwh0pfvvQvF8w==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz#a59efc09784c2a5bada13cfeaf5c75dd214044d2"
+  integrity sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg==
 
 speedometer@~0.1.2:
   version "0.1.4"
@@ -5091,27 +5090,26 @@ sprintf-js@~1.0.2:
   integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
 
 sshpk@^1.7.0:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98"
-  integrity sha1-xvxhZIo9nE52T9P8306hBeSSupg=
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.15.2.tgz#c946d6bd9b1a39d0e8635763f5242d6ed6dcb629"
+  integrity sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
-    dashdash "^1.12.0"
-    getpass "^0.1.1"
-    safer-buffer "^2.0.2"
-  optionalDependencies:
     bcrypt-pbkdf "^1.0.0"
+    dashdash "^1.12.0"
     ecc-jsbn "~0.1.1"
+    getpass "^0.1.1"
     jsbn "~0.1.0"
+    safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@^5.2.4:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
+ssri@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
   dependencies:
-    safe-buffer "^5.1.1"
+    figgy-pudding "^3.5.1"
 
 stable@~0.1.6:
   version "0.1.8"
@@ -5187,10 +5185,10 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string_decoder@^1.0.0, string_decoder@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
-  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+string_decoder@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
+  integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
   dependencies:
     safe-buffer "~5.1.0"
 
@@ -5199,6 +5197,13 @@ string_decoder@~0.10.x:
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
   integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
 
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
@@ -5242,13 +5247,13 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-style-loader@^0.23.0:
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.0.tgz#8377fefab68416a2e05f1cabd8c3a3acfcce74f1"
-  integrity sha512-uCcN7XWHkqwGVt7skpInW6IGO1tG6ReyFQ1Cseh0VcN6VdcFQi62aG/2F3Y9ueA8x4IVlfaSUxpmQXQD9QrEuQ==
+style-loader@^0.23.1:
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925"
+  integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==
   dependencies:
     loader-utils "^1.1.0"
-    schema-utils "^0.4.5"
+    schema-utils "^1.0.0"
 
 stylehacks@^4.0.0:
   version "4.0.1"
@@ -5304,9 +5309,9 @@ symbol-observable@1.0.1:
   integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=
 
 tapable@^1.0.0, tapable@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
-  integrity sha512-IlqtmLVaZA2qab8epUXbVWRn3aB1imbDMJtjB3nu4X0NqPkcY/JH9ZtCBWKHWPxs8Svi9tyo8w2dBoi07qZbBA==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"
+  integrity sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==
 
 tar-fs@^1.13.0:
   version "1.16.3"
@@ -5341,14 +5346,14 @@ tar@^2.0.0:
     inherits "2"
 
 tar@^4:
-  version "4.4.6"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.6.tgz#63110f09c00b4e60ac8bcfe1bf3c8660235fbc9b"
-  integrity sha512-tMkTnh9EdzxyfW+6GK6fCahagXsnYk6kE6S9Gr9pjVdys769+laCTbodXDhPAjzVtEBazRgP0gYqOjnk9dQzLg==
+  version "4.4.8"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
+  integrity sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==
   dependencies:
-    chownr "^1.0.1"
+    chownr "^1.1.1"
     fs-minipass "^1.2.5"
-    minipass "^2.3.3"
-    minizlib "^1.1.0"
+    minipass "^2.3.4"
+    minizlib "^1.1.1"
     mkdirp "^0.5.0"
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
@@ -5361,17 +5366,40 @@ temp@^0.8.3:
     os-tmpdir "^1.0.0"
     rimraf "~2.2.6"
 
+terser-webpack-plugin@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.1.0.tgz#cf7c25a1eee25bf121f4a587bb9e004e3f80e528"
+  integrity sha512-61lV0DSxMAZ8AyZG7/A4a3UPlrbOBo8NIQ4tJzLPAdGOQ+yoNC7l5ijEow27lBAL2humer01KLS6bGIMYQxKoA==
+  dependencies:
+    cacache "^11.0.2"
+    find-cache-dir "^2.0.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    terser "^3.8.1"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
+terser@^3.8.1:
+  version "3.11.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.11.0.tgz#60782893e1f4d6788acc696351f40636d0e37af0"
+  integrity sha512-5iLMdhEPIq3zFWskpmbzmKwMQixKmTYwY3Ox9pjtSklBLnHiuQ0GKJLhL1HSYtyffHM3/lDIFBnb82m9D7ewwQ==
+  dependencies:
+    commander "~2.17.1"
+    source-map "~0.6.1"
+    source-map-support "~0.5.6"
+
 throttleit@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-0.0.2.tgz#cfedf88e60c00dd9697b61fdd2a8343a9b680eaf"
   integrity sha1-z+34jmDADdlpe2H90qg0OptoDq8=
 
 through2@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
   dependencies:
-    readable-stream "^2.1.5"
+    readable-stream "~2.3.6"
     xtend "~4.0.1"
 
 through2@~0.2.3:
@@ -5450,13 +5478,6 @@ touch@0.0.3:
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@~2.3.3:
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
-  integrity sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==
-  dependencies:
-    punycode "^1.4.1"
-
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -5489,10 +5510,10 @@ truncate-utf8-bytes@^1.0.0:
   dependencies:
     utf8-byte-length "^1.0.1"
 
-ts-loader@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.2.1.tgz#e6815c631dcafc24319ce8be6f8af94908749cf3"
-  integrity sha512-KC0cOvsFVyxBlg5h9jvaMlIL2tNsyQLvT2/OvIlO0AMUBJ4iXTtOfaDEqvmqv2lM/icekQfDsP2PsYBCDHpuOQ==
+ts-loader@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.3.1.tgz#70614c8ec4354a9c8b89c9f97b2becb7a98a3980"
+  integrity sha512-fDDgpBH3SR8xlt2MasLdz3Yy611PQ/UY/KGyo7TgXhTRU/6sS8uGG0nJYnU1OdFBNKcoYbId1UTNaAOUn+i41g==
   dependencies:
     chalk "^2.3.0"
     enhanced-resolve "^4.0.0"
@@ -5500,15 +5521,15 @@ ts-loader@^5.2.1:
     micromatch "^3.1.4"
     semver "^5.0.1"
 
-tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
   integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
 
-tslint@^5.7.0:
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.11.0.tgz#98f30c02eae3cde7006201e4c33cb08b48581eed"
-  integrity sha1-mPMMAurjzecAYgHkwzywi0hYHu0=
+tslint@^5.12.0:
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.12.0.tgz#47f2dba291ed3d580752d109866fb640768fca36"
+  integrity sha512-CKEcH1MHUBhoV43SA/Jmy1l24HJJgI0eyLbBNSRyFlsQvb9v6Zdq+Nz2vEOH00nC5SUx4SneJ59PZUS/ARcokQ==
   dependencies:
     babel-code-frame "^6.22.0"
     builtin-modules "^1.1.1"
@@ -5552,32 +5573,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.1.tgz#3362ba9dd1e482ebb2355b02dfe8bcd19a2c7c96"
-  integrity sha512-Veu0w4dTc/9wlWNf2jeRInNodKlcdLgemvPsrNpfu5Pq39sgfFjvIIgTsvUHCoLBnMhPoUA+tFxsXjU6VexVRQ==
-
-uglify-es@^3.3.4:
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
-  integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==
-  dependencies:
-    commander "~2.13.0"
-    source-map "~0.6.1"
-
-uglifyjs-webpack-plugin@^1.2.4:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de"
-  integrity sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==
-  dependencies:
-    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.4"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
+typescript@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5"
+  integrity sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==
 
 union-value@^1.0.0:
   version "1.0.0"
@@ -5698,7 +5697,7 @@ util@^0.10.3:
   dependencies:
     inherits "2.0.3"
 
-uuid@^3.1.0, uuid@^3.3.2:
+uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
@@ -5732,11 +5731,6 @@ vm-browserify@0.0.4:
   dependencies:
     indexof "0.0.1"
 
-vue-class-component@^6.0.0, vue-class-component@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-6.2.0.tgz#7adb1daa9a868c75f30f97f33f4f1b94aee62089"
-  integrity sha512-U11yVeP5zjPSx4IU7Zas3MLC+Vy9dmufI+uLKLo8YuGQJGOihSYfh/fgNnbjMteN+hz5axjG6iC6ybMo6vGYnA==
-
 vue-hot-reload-api@^2.3.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.1.tgz#b2d3d95402a811602380783ea4f566eb875569a2"
@@ -5753,13 +5747,6 @@ vue-loader@^15.4.2:
     vue-hot-reload-api "^2.3.0"
     vue-style-loader "^4.1.0"
 
-vue-property-decorator@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/vue-property-decorator/-/vue-property-decorator-7.1.1.tgz#0b1eefde50a7451e911ad44b91258010ffc08d01"
-  integrity sha512-oD+IXx3jxvKLgzk111GYvYwC5GdE7qKdjw6Pcq3594unQiczi0y2ZTigL3/v2T/586zq1M+u9URoZlkHMWL07Q==
-  dependencies:
-    vue-class-component "^6.2.0"
-
 vue-style-loader@^4.1.0:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8"
@@ -5768,10 +5755,10 @@ vue-style-loader@^4.1.0:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.5.17:
-  version "2.5.17"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.17.tgz#52a4a078c327deb937482a509ae85c06f346c3cb"
-  integrity sha512-63uI4syCwtGR5IJvZM0LN5tVsahrelomHtCxvRkZPJ/Tf3ADm1U1wG6KWycK3qCfqR+ygM5vewUvmJ0REAYksg==
+vue-template-compiler@^2.5.21:
+  version "2.5.21"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.21.tgz#a57ceb903177e8f643560a8d639a0f8db647054a"
+  integrity sha512-Vmk5Cv7UcmI99B9nXJEkaK262IQNnHp5rJYo+EwYpe2epTAXqcVyExhV6pk8jTkxQK2vRc8v8KmZBAwdmUZvvw==
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"
@@ -5781,10 +5768,10 @@ vue-template-es2015-compiler@^1.6.0:
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
   integrity sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==
 
-vue@^2.5.17:
-  version "2.5.17"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.17.tgz#0f8789ad718be68ca1872629832ed533589c6ada"
-  integrity sha512-mFbcWoDIJi0w0Za4emyLiW72Jae0yjANHbCVquMKijcavBGypqlF7zHRgMa5k4sesdv7hv2rB4JPdZfR+TPfhQ==
+vue@^2.5.20, vue@^2.5.21:
+  version "2.5.21"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-2.5.21.tgz#3d33dcd03bb813912ce894a8303ab553699c4a85"
+  integrity sha512-Aejvyyfhn0zjVeLvXd70h4hrE4zZDx1wfZqia6ekkobLmUZ+vNFQer53B4fu0EjWBSiqApxPejzkO1Znt3joxQ==
 
 watchpack@^1.5.0:
   version "1.6.0"
@@ -5803,15 +5790,15 @@ webpack-sources@^1.1.0, webpack-sources@^1.3.0:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.20.2:
-  version "4.20.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.20.2.tgz#89f6486b6bb276a91b0823453d377501fc625b5a"
-  integrity sha512-75WFUMblcWYcocjSLlXCb71QuGyH7egdBZu50FtBGl2Nso8CK3Ej+J7bTZz2FPFq5l6fzCisD9modB7t30ikuA==
+webpack@^4.27.1:
+  version "4.27.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.27.1.tgz#5f2e2db446d2266376fa15d7d2277a1a9c2e12bb"
+  integrity sha512-WArHiLvHrlfyRM8i7f+2SFbr/XbQ0bXqTkPF8JpHOzub5482Y3wx7rEO8stuLGOKOgZJcqcisLhD7LrM/+fVMw==
   dependencies:
-    "@webassemblyjs/ast" "1.7.8"
-    "@webassemblyjs/helper-module-context" "1.7.8"
-    "@webassemblyjs/wasm-edit" "1.7.8"
-    "@webassemblyjs/wasm-parser" "1.7.8"
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-module-context" "1.7.11"
+    "@webassemblyjs/wasm-edit" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
     acorn "^5.6.2"
     acorn-dynamic-import "^3.0.0"
     ajv "^6.1.0"
@@ -5829,7 +5816,7 @@ webpack@^4.20.2:
     node-libs-browser "^2.0.0"
     schema-utils "^0.4.4"
     tapable "^1.1.0"
-    uglifyjs-webpack-plugin "^1.2.4"
+    terser-webpack-plugin "^1.1.0"
     watchpack "^1.5.0"
     webpack-sources "^1.3.0"
 
@@ -5866,7 +5853,7 @@ worker-farm@^1.5.2:
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
-  resolved "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
   integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
   dependencies:
     string-width "^1.0.1"
@@ -5877,10 +5864,10 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-xmlbuilder@8.2.2:
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-8.2.2.tgz#69248673410b4ba42e1a6136551d2922335aa773"
-  integrity sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=
+xmlbuilder@^9.0.7:
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
 
 xmldom@0.1.x:
   version "0.1.27"
@@ -5915,16 +5902,17 @@ yallist@^2.1.2:
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
 yallist@^3.0.0, yallist@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-  integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
+  integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
 
-yargs-parser@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
-  integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
+yargs-parser@^11.0.0:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+  integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
   dependencies:
-    camelcase "^4.1.0"
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
 
 yargs-parser@^5.0.0:
   version "5.0.0"