diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..a38cd0e
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,15 @@
+{
+  "presets": [
+    ["env", {
+      "useBuiltIns": "usage"
+    }],
+    "stage-2"
+  ],
+  "plugins": ["transform-runtime"],
+  "comments": false,
+  "env": {
+    "test": {
+      "plugins": [ "istanbul" ]
+    }
+  }
+}
diff --git a/package.json b/package.json
index e7961c7..7265ab8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "plugin-custom-welcome-asl",
     "version": "0.0.1",
-    "main": "custom-welcome.js",
+    "main": "./src/plugin.js",
     "license": "Apache-2.0",
     "private": true,
     "scripts": {
@@ -16,6 +16,8 @@
         "babel-core": "^6.26.0",
         "babel-eslint": "^8.1.2",
         "babel-loader": "7.1.1",
+        "babel-plugin-transform-runtime": "^6.23.0",
+        "babel-preset-env": "^1.7.0",
         "css-loader": "^0.28.8",
         "eslint": "^4.15.0",
         "eslint-config-airbnb-base": "^12.1.0",
@@ -25,13 +27,14 @@
         "eslint-plugin-promise": "^3.4.0",
         "eslint-plugin-standard": "^3.0.1",
         "eslint-plugin-vue": "^4.5.0",
+        "exports-loader": "^0.7.0",
         "less": "^3.8.1",
         "less-loader": "^4.1.0",
         "style-loader": "^0.21.0",
         "stylelint": "^9.3.0",
         "stylelint-config-standard": "^18.2.0",
         "vue-loader": "^15.2.4",
-        "vue-template-compiler": "^2.0.0",
+        "vue-template-compiler": "^2.6.10",
         "webpack": "^4.6.0",
         "webpack-cli": "^2.1.2",
         "webpack-dev-server": "^3.1.3"
diff --git a/src/components/CustomNicklistUser.vue b/src/components/CustomNicklistUser.vue
new file mode 100644
index 0000000..20f4367
--- /dev/null
+++ b/src/components/CustomNicklistUser.vue
@@ -0,0 +1,184 @@
+<template>
+    <div
+        :class="[
+            nicklist.userMode(user) ? 'kiwi-nicklist-user--mode-' + nicklist.userMode(user) : '',
+            user.away ? 'kiwi-nicklist-user--away' : '',
+            user.ignore ? 'kiwi-nicklist-user--ignore' : '',
+            user.gender ? 'kiwi-nicklist-user--gender-' + user.gender : '',
+        ]"
+        :data-nick="(user.nick||'').toLowerCase()"
+        class="kiwi-nicklist-user"
+        @click="nicklist.openUserbox(user)"
+    >
+        <div v-if="shouldShowAvatars" class="kiwi-avatar-container">
+            <Avatar
+                v-if="user"
+                :user="user"
+                size="small"
+            />
+            <away-status-indicator
+                :network="network"
+                :user="user"
+                :toggle="false"
+            />
+        </div>
+        <div v-else>
+            <away-status-indicator
+                :network="network"
+                :user="user"
+                :toggle="false"
+            />
+        </div>
+        <span class="kiwi-nicklist-user-prefix">{{ nicklist.userModePrefix(user) }}</span><span
+            :style="{ 'color': userColour }"
+            class="kiwi-nicklist-user-nick"
+        >{{ user.nick }}
+        </span>
+        <span class="kiwi-nicklist-messageuser" @click.stop="nicklist.openQuery(user)">
+            <i class="fa fa-comment" aria-hidden="true"/>
+        </span>
+        <typing-status-indicator :user="user" :buffer="nicklist.buffer" />
+    </div>
+</template>
+
+<script>
+'kiwi public';
+
+let AwayStatusIndicator = kiwi.require('components/AwayStatusIndicator');
+let TypingStatusIndicator = kiwi.require('components/TypingStatusIndicator');
+let Avatar = kiwi.require('components/Avatar');
+
+export default {
+    components: {
+        AwayStatusIndicator,
+        TypingStatusIndicator,
+	Avatar,
+    },
+    props: ['network', 'user', 'nicklist'],
+    computed: {
+        userColour() {
+            if (this.nicklist.useColouredNicks) {
+                return this.user.getColour();
+            }
+            return '';
+        },
+        shouldShowAvatars() {
+            return this.nicklist.buffer.setting('nicklist_avatars');
+        },
+    },
+};
+</script>
+
+<style>
+
+.kiwi-nicklist-user {
+    line-height: 26px;
+    padding: 0 12px 0 12px;
+    border-left: 4px solid;
+    margin: 0 0 0 0;
+    position: relative;
+    box-sizing: border-box;
+    transition: all 0.1s;
+    cursor: pointer;
+    white-space: nowrap;
+    display: flex;
+    align-items: center;
+}
+
+.kiwi-nicklist--avatars .kiwi-nicklist-user {
+    line-height: 32px;
+    padding-bottom: 6px;
+}
+
+.kiwi-nicklist-user--gender-Male .kiwi-nicklist-user-nick::after {
+    content:"\f222";
+    font-size: 0.25em;
+    vertical-align: super;
+    font-family: fontawesome;
+}
+
+.kiwi-nicklist-user--gender-Female .kiwi-nicklist-user-nick::after {
+    content:"\f221";
+    font-size: 0.25em;
+    vertical-align: super;
+    font-family: fontawesome;
+}
+
+.kiwi-nicklist-user--gender-Other .kiwi-nicklist-user-nick::after {
+    content:"\f224";
+    font-size: 0.25em;
+    vertical-align: super;
+    font-family: fontawesome;
+}
+
+.kiwi-nicklist-user--away.kiwi-nicklist-user--gender-Male .kiwi-nicklist-user-nick::after {
+    content:"\f222 Away";
+    font-size: 0.25em;
+    vertical-align: super;
+    font-family: fontawesome;
+}
+
+.kiwi-nicklist-user--away.kiwi-nicklist-user--gender-Female .kiwi-nicklist-user-nick::after {
+    content:"\f221 Away";
+    font-size: 0.25em;
+    vertical-align: super;
+    font-family: fontawesome;
+}
+
+.kiwi-nicklist-user--away.kiwi-nicklist-user--gender-Other .kiwi-nicklist-user-nick::after {
+    content:"\f224 Away";
+    font-size: 0.25em;
+    vertical-align: super;
+    font-family: fontawesome;
+}
+
+.kiwi-nicklist-user-nick {
+    font-weight: bold;
+    cursor: pointer;
+    flex: 1;
+}
+
+.kiwi-nicklist-messageuser {
+    position: absolute;
+    content: '\f075';
+    right: -1em;
+    font-family: fontAwesome, sans-serif;
+    line-height: 26px;
+    opacity: 0;
+}
+
+.kiwi-nicklist-messageuser:hover {
+    cursor: pointer;
+    transition: all 0.2s;
+}
+
+.kiwi-nicklist-user:hover .kiwi-nicklist-messageuser {
+    opacity: 1;
+    right: 1em;
+    transition: all 0.2s;
+    transition-delay: 0.1s;
+}
+
+.kiwi-avatar-container {
+    position: relative;
+    margin-right: 10px;
+    flex: 0;
+}
+
+.kiwi-avatar-container .kiwi-avatar {
+    width: 30px;
+    height: 30px;
+}
+
+.kiwi-avatar-container .kiwi-awaystatusindicator {
+    position: absolute;
+    top: 0;
+    right: 0;
+    margin: 0;
+}
+
+.kiwi-avatar-container-user-prefix {
+    flex: 0;
+}
+
+</style>
diff --git a/components/CustomUserBox.vue b/src/components/CustomUserBox.vue
similarity index 70%
rename from components/CustomUserBox.vue
rename to src/components/CustomUserBox.vue
index 33f2943..fceddfe 100644
--- a/components/CustomUserBox.vue
+++ b/src/components/CustomUserBox.vue
@@ -1,35 +1,35 @@
 <template>
     <div class="kiwi-userbox">
-
+        <span v-if="isSelf" class="kiwi-userbox-selfprofile">
+            {{ $t('user_you') }}
+        </span>
         <div class="kiwi-userbox-header">
-            <i class="fa fa-user kiwi-userbox-icon" aria-hidden="true"/>
-            <h3>{{ user.nick }}</h3>
+            <h3>
+                <away-status-indicator :network="network" :user="user"/> {{ user.nick }}
+                <span v-if="userMode" class="kiwi-userbox-modestring">+{{ userMode }}</span>
+            </h3>
             <div class="kiwi-userbox-usermask">{{ user.username }}@{{ user.host }}</div>
         </div>
 
         <div class="kiwi-userbox-basicinfo">
 
-            <span class="kiwi-userbox-basicinfo-title">{{ $t('whois_status') }}:</span>
-            <span class="kiwi-userbox-basicinfo-data">
-                {{ user.away ? user.away : $t('whois_status_available') }}
-            </span>
             <div v-if="asl.a">
-                <span class="kiwi-userbox-basicinfo-title">Age</span>
+                <span class="kiwi-userbox-basicinfo-title">Età</span>
                 <span class="kiwi-userbox-basicinfo-data">{{asl.a}}</span>
             </div>
             <div v-if="asl.s">
-                <span class="kiwi-userbox-basicinfo-title">Sex</span>
+                <span class="kiwi-userbox-basicinfo-title">Sesso</span>
                 <span class="kiwi-userbox-basicinfo-data">{{asl.s}}</span>
             </div>
             <div v-if="asl.l">
-                <span class="kiwi-userbox-basicinfo-title">Location</span>
+                <span class="kiwi-userbox-basicinfo-title">Località</span>
                 <span class="kiwi-userbox-basicinfo-data">{{asl.l}}</span>
             </div>
         </div>
 
 
         <p class="kiwi-userbox-actions">
-            <a class="kiwi-userbox-action" @click="openQuery">
+            <a v-if="!isSelf" class="kiwi-userbox-action" @click="openQuery">
                 <i class="fa fa-comment-o" aria-hidden="true"/>
                 {{ $t('send_a_message') }}
             </a>
@@ -37,10 +37,9 @@
                 <i class="fa fa-question-circle" aria-hidden="true"/>
                 {{ $t('more_information') }}
             </a>
-
         </p>
 
-        <form class="u-form kiwi-userbox-ignoreuser">
+        <form v-if="!isSelf" class="u-form kiwi-userbox-ignoreuser">
             <label>
                 <input v-model="user.ignore" type="checkbox" >
                 <span> {{ $t('ignore_user') }} </span>
@@ -84,13 +83,16 @@
                 <span v-if="user.secure" class="kiwi-userbox-whois-line">
                     {{ $t('user_secure') }}
                 </span>
-                <span v-if="user.channels" class="kiwi-userbox-whois-line">
-                    {{ $t('user_channels', {channels: user.channels}) }}
-                </span>
+                <span
+                    v-if="user.channels"
+                    class="kiwi-userbox-whois-line"
+                    @click="onChannelsClick($event)"
+                    v-html="$t('user_channels', {channels: userChannels})"
+	        />
             </template>
         </div>
 
-        <div v-if="buffer.isChannel() && areWeAnOp" class="kiwi-userbox-opactions">
+        <div v-if="buffer.isChannel() && areWeAnOp && !isSelf" class="kiwi-userbox-opactions">
             <form class="u-form" @submit.prevent="">
                 <label v-if="isUserOnBuffer">
                     {{ $t('user_access') }} <select v-model="userMode">
@@ -144,9 +146,17 @@
 'kiwi public';
 
 import * as utils from '../libs/utils.js';
-let state = kiwi.state;
+let ipRegex = kiwi.require('ip-regex');
+let TextFormatting = kiwi.require('helpers/TextFormatting');
+let IrcdDiffs = kiwi.require('helpers/IrcdDiffs');
+let toHtml = kiwi.require('libs/renderers/Html');
+let parseMessage = kiwi.require('libs/MessageParser');
+let AwayStatusIndicator = kiwi.require('components/AwayStatusIndicator');
 
 export default {
+    components: {
+        AwayStatusIndicator,
+    },
     props: ['buffer', 'network', 'user'],
     data: function data() {
         return {
@@ -163,7 +173,6 @@ export default {
         availableChannelModes: function availableChannelModes() {
             let availableModes = [];
             let prefixes = this.network.ircClient.network.options.PREFIX;
-            // TODO: Double check these modes mean the correct things
             let knownPrefix = {
                 q: 'Owner',
                 a: 'Admin',
@@ -171,6 +180,17 @@ export default {
                 h: 'Half-Operator',
                 v: 'Voice',
             };
+
+            if (!IrcdDiffs.isAChannelModeAdmin(this.network)) {
+                delete knownPrefix.a;
+            }
+            if (!IrcdDiffs.isQChannelModeOwner(this.network)) {
+                delete knownPrefix.q;
+            }
+            if (!IrcdDiffs.supportsHalfOp(this.network)) {
+                delete knownPrefix.h;
+            }
+
             prefixes.forEach((prefix) => {
                 let mode = prefix.mode;
                 if (knownPrefix[mode]) {
@@ -190,6 +210,11 @@ export default {
 
             return this.buffer.isUserAnOp(this.buffer.getNetwork().nick);
         },
+        formattedRealname() {
+            let blocks = parseMessage(this.user.realname || '', { extras: false });
+            let content = toHtml(blocks, false);
+            return content;
+        },
         isUserOnBuffer: function isUserOnBuffer() {
             if (!this.buffer) {
                 return false;
@@ -240,6 +265,16 @@ export default {
                 client.raw(params);
             },
         },
+        userChannels() {
+	    let channels = this.user.channels.trim().split(' ');
+	    for (let i = 0; i < channels.length; i++) {
+		channels[i] = TextFormatting.linkifyChannels(channels[i]);
+	    }
+	    return channels.join(' ');
+        },
+        isSelf() {
+            return this.user === this.network.currentUser();
+        },
     },
     watch: {
         user: function watchUser() {
@@ -261,9 +296,19 @@ export default {
                 '';
         },
         openQuery: function openQuery() {
-            let buffer = state.addBuffer(this.network.id, this.user.nick);
-            state.setActiveBuffer(this.network.id, buffer.name);
-            state.$emit('userbox.hide');
+            let buffer = this.$state.addBuffer(this.network.id, this.user.nick);
+            this.$state.setActiveBuffer(this.network.id, buffer.name);
+            if (this.$state.ui.is_narrow) {
+                this.$state.$emit('userbox.hide');
+            }
+        },
+        onChannelsClick(event) {
+            let channelName = event.target.getAttribute('data-channel-name');
+            if (channelName) {
+                let network = this.buffer.getNetwork();
+                this.$state.addBuffer(this.buffer.networkid, channelName);
+                network.ircClient.join(channelName);
+            }
         },
         updateWhoisData: function updateWhoisData() {
             this.whoisRequested = true;
@@ -273,11 +318,45 @@ export default {
             });
         },
         kickUser: function kickUser() {
-            let reason = state.setting('buffers.default_kick_reason');
+            let reason = this.$state.setting('buffers.default_kick_reason');
             this.network.ircClient.raw('KICK', this.buffer.name, this.user.nick, reason);
         },
-        createBanMask: function banMask() {
-            let mask = state.setting('buffers.default_ban_mask');
+        createBanMask: function createBanMask() {
+            // try to ban via user account first
+            if (this.user.account) {
+                // if EXTBAN is supported use that
+                let extban = IrcdDiffs.extbanAccount(this.network);
+                if (extban) {
+                    return extban + ':' + this.user.account;
+                }
+
+                // if the account name is in the host ban the host
+                // Eg. user@network/user/accountname
+                if (this.user.host.toLowerCase().indexOf(this.user.account.toLowerCase()) > -1) {
+                    return '*!*@' + this.user.host;
+                }
+            }
+
+            // if an ip address is in the host and not the whole host ban the ip
+            // Eg. user@gateway/1.2.3.4
+            let ipTest = new RegExp('(' + ipRegex.v4().source + '|' + ipRegex.v6().source + ')');
+            if (ipTest.test(this.user.host)) {
+                let match = this.user.host.match(ipTest)[0];
+                if (match !== this.user.host) {
+                    return '*!*@*' + match + '*';
+                }
+            }
+
+            // if an 8 char hex is the username ban by username. Commonly used in gateways
+            // Eg. 59d4c432@a.clients.kiwiirc.com
+            let hexTest = /^([a-f0-9]{8})$/i;
+            if (hexTest.test(this.user.username)) {
+                let match = this.user.username.match(hexTest)[0];
+                return '*!' + match + '@*';
+            }
+
+            // fallback to default_ban_mask from config
+            let mask = this.$state.setting('buffers.default_ban_mask');
             mask = mask.replace('%n', this.user.nick);
             mask = mask.replace('%i', this.user.username);
             mask = mask.replace('%h', this.user.host);
@@ -298,7 +377,7 @@ export default {
             }
 
             let banMask = this.createBanMask();
-            let reason = state.setting('buffers.default_kick_reason');
+            let reason = this.$state.setting('buffers.default_kick_reason');
             this.network.ircClient.raw('MODE', this.buffer.name, '+b', banMask);
             this.network.ircClient.raw('KICK', this.buffer.name, this.user.nick, reason);
         },
@@ -318,27 +397,42 @@ export default {
     height: 100%;
 }
 
+.kiwi-userbox-selfprofile {
+    display: block;
+    margin: 0 auto;
+    width: 100%;
+    padding: 1em;
+    text-align: center;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+    box-sizing: border-box;
+}
+	
 .kiwi-userbox-header {
     position: relative;
-    padding: 0.5em 1em 0.5em 5em;
+    padding: 0.5em 1em;
     overflow: hidden;
+}
 
-    h3 {
-        width: 100%;
-        padding: 0;
-        cursor: default;
-    }
+.kiwi-userbox-header h3 {
+    width: 100%;
+    padding: 0;
+    cursor: default;
+    display: inline-block;
+}
+
+.kiwi-userbox-modestring {
+    font-weight: normal;
+    font-size: 0.8em;
 }
 
 .fa-user.kiwi-userbox-icon {
-    position: absolute;
-    left: 0.5em;
-    top: 0.25em;
-    font-size: 3em;
+    display: inline-block;
+    font-size: 2em;
 }
 
 .kiwi-userbox-usermask {
     width: 100%;
+    opacity: 0.6;
     cursor: default;
 }
 
@@ -346,7 +440,7 @@ export default {
     width: 100%;
     margin: 0;
     display: block;
-    padding: 1em 1em 1em 1.4em;
+    padding: 0.5em 1em;
     box-sizing: border-box;
 }
 
@@ -363,7 +457,6 @@ export default {
     line-height: 1em;
     padding: 0;
     text-align: left;
-    opacity: 0.5;
     font-weight: 900;
 }
 
@@ -383,18 +476,12 @@ export default {
 
     .kiwi-userbox-action {
         display: inline-block;
-        border: 1px solid #000;
+        border: 1px solid;
         padding: 0.5em 1em;
-        color: #000;
         cursor: pointer;
-        margin: 0 auto 20px auto;
+        margin: 0 2px;
         transition: all 0.3s;
         border-radius: 3px;
-
-        &:hover {
-            background-color: #000;
-            color: #fff;
-        }
     }
 
     label {
@@ -442,12 +529,13 @@ export default {
     padding: 0 1em;
     text-align: left;
     border: none;
-    line-height: 2.8em;
-    font-size: 1em;
+    line-height: 2.2em;
+    font-size: 0.8em;
 }
 
 .kiwi-userbox-opaction i {
-    margin-right: 0.3em;
+    margin-right: 0.2em;
+    font-size: 1.2em;
 }
 
 .kiwi-userbox-actions a {
@@ -461,6 +549,7 @@ export default {
     margin: 0 5% 20px 5%;
     background: none;
     box-sizing: border-box;
+    border-radius: 2px;
 }
 
 .kiwi-userbox-whois-line {
@@ -479,7 +568,7 @@ export default {
 }
 
 @media screen and (max-width: 769px) {
-    .kiwi-container--sidebar-open .kiwi-sidebar-userbox {
+    .kiwi-container--sidebar-drawn .kiwi-sidebar-userbox {
         width: 100%;
     }
 
@@ -515,6 +604,7 @@ export default {
         width: 200px;
         clear: both;
         display: block;
+        margin: 0 auto 20px auto;
     }
 }
 </style>
diff --git a/components/CustomWelcome.vue b/src/components/CustomWelcome.vue
similarity index 57%
rename from components/CustomWelcome.vue
rename to src/components/CustomWelcome.vue
index 2fadc4c..ee14268 100644
--- a/components/CustomWelcome.vue
+++ b/src/components/CustomWelcome.vue
@@ -1,8 +1,10 @@
 <template>
-    <startup-layout ref="layout" class="kiwi-welcome-simple">
-        <div slot="connection">
-            <template v-if="!network || network.state === 'disconnected'">
-                <form class="u-form kiwi-welcome-simple-form" @submit.prevent="formSubmit">
+    <startup-layout ref="layout"
+                    :class="{ 'kiwi-welcome-simple--recaptcha': recaptchaSiteId }"
+                    class="kiwi-welcome-simple"
+    >
+        <template v-slot:connection v-if="!network || network.state === 'disconnected'">
+                <form class="u-form u-form--big kiwi-welcome-simple-form" @submit.prevent="formSubmit">
                     <h2 v-html="greetingText"/>
                     <div
                         v-if="network && (network.last_error || network.state_error)"
@@ -14,50 +16,59 @@
                         </span>
                     </div>
 
-                    <input-text
-                        v-if="showNick"
-                        :label="$t('nick')"
-                        v-model="nick"
-                        class="kiwi-welcome-simple-nick"
-                    />
-                    <label v-if="showPass" class="kiwi-welcome-simple-have-password">
+                <input-text v-model="nick" :label="$t('nick')" type="text" />
+	
+                <div v-if="showPass && toggablePass" class="kiwi-welcome-simple-input-container">
+                    <label
+                        class="kiwi-welcome-simple-have-password"
+                    >
                         <input v-model="show_password_box" type="checkbox" >
                         <span> {{ $t('password_have') }} </span>
                     </label>
+                </div>
+	
+                <div v-if="showPass && (show_password_box || !toggablePass)"
+                     class="kiwi-welcome-simple-input-container"
+                >
                     <input-text
-                        v-focus
-                        v-if="show_password_box"
-                        :label="$t('password')"
-                        v-model="password"
-                        class="kiwi-welcome-simple-password input-text--reveal-value"
-                        type="password"
-                    />
+	                        v-focus
+	                        v-model="password"
+	                        :show-plain-text="true"
+	                        :label="$t('password')"
+	                        type="password"
+	                    />
+                </div>
+                <div class="kiwi-welcome-simple-asl-container">
+
                     <input-text
-                        label="Age"
+                        label="Età"
                         v-model="age"
                         class="kiwi-welcome-simple-age"
                         type="number"
                     />
                     <div class="kiwi-welcome-simple-sex">
-                        <span >Sex: </span>
-                        <select v-model="sex">
-                            <option :value="null" selected disabled>Choose</option>
-                            <option value="M">Male</option>
-                            <option value="F">Female</option>
-                            <option value="O">Other</option>
+                        <label class="kiwi-welcome-simple-sex">Sesso</label>
+                        <select v-model="sex" class="kiwi-welcome-simple-sex-select" label="Sesso">
+                            <option :value="null" selected disabled>Scegli ...</option>
+                            <option value="M">Uomo</option>
+                            <option value="F">Donna</option>
+                            <option value="O">Altro</option>
                         </select>
                     </div>
+
+                </div>
+
                     <input-text
-                        label="Location"
+                        label="Località"
                         v-model="location"
                     />
-                    <input-text
-                        v-if="showChannel"
-                        :label="$t('channel')"
-                        v-model="channel"
-                        class="kiwi-welcome-simple-channel"
-                    />
 
+                    <div v-if="showChannel" class="kiwi-welcome-simple-input-container">
+	                    <input-text
+	                        v-model="channel"
+	                        :label="$t('channel')"
+	                    />
+                    </div>
                     <div
                         v-if="recaptchaSiteId"
                         :data-sitekey="recaptchaSiteId"
@@ -72,19 +83,20 @@
                     />
                 </form>
             </template>
-            <template v-else-if="network.state !== 'connected'">
+            <template v-slot:connection v-else>
                 <i class="fa fa-spin fa-spinner" aria-hidden="true"/>
             </template>
-        </div>
     </startup-layout>
 </template>
 
 <script>
 
-var state = kiwi.state;
-var Misc = kiwi.require('helpers/Misc');
-var StartupLayout = kiwi.require('components/startups/CommonLayout');
-
+let state = kiwi.state;
+let Misc = kiwi.require('helpers/Misc');
+let StartupLayout = kiwi.require('components/startups/CommonLayout');
+let Logger = kiwi.require('libs/Logger');
+let log = Logger.namespace('Welcome.vue');
+	
 export default {
     components: {
         StartupLayout,
@@ -97,11 +109,13 @@ export default {
             password: '',
             showChannel: true,
             showPass: true,
+            toggablePass: true,
             showNick: true,
             show_password_box: false,
             recaptchaSiteId: '',
             recaptchaResponseCache: '',
             connectWithoutChannel: false,
+            showPlainText: false,
             age: null,
             sex: null,
             location: null,
@@ -127,10 +141,38 @@ export default {
                 ready = false;
             }
 
+            let nickPatternStr = this.$state.setting('startupOptions.nick_format');
+            let nickPattern = '';
+            if (!nickPatternStr) {
             // Nicks cannot start with [0-9- ]
             // ? is not a valid nick character but we allow it as it gets replaced
             // with a number.
-            if (!this.nick.match(/^[a-z_\\[\]{}^`|][a-z0-9_\-\\[\]{}^`|]*$/i)) {
+                nickPattern = /^[a-z_\\[\]{}^`|][a-z0-9_\-\\[\]{}^`|]*$/i;
+            } else {
+                // Support custom pattern matches. Eg. only '@example.com' may be allowed
+                // on some IRCDs
+                let pattern = '';
+                let flags = '';
+                if (nickPatternStr[0] === '/') {
+                    // Custom regex
+                    let pos = nickPatternStr.lastIndexOf('/');
+                    pattern = nickPatternStr.substring(1, pos);
+                    flags = nickPatternStr.substr(pos + 1);
+                } else {
+                    // Basic contains rule
+                    pattern = _.escapeRegExp(nickPatternStr);
+                    flags = 'i';
+                }
+
+                try {
+                    nickPattern = new RegExp(pattern, flags);
+                } catch (error) {
+                    log.error('Nick format error: ' + error.message);
+                    return false;
+                }
+            }
+
+            if (!this.nick.match(nickPattern)) {        
                 ready = false;
             }
 
@@ -141,8 +183,11 @@ export default {
         let options = state.settings.startupOptions;
 
         this.nick = this.processNickRandomNumber(Misc.queryStringVal('nick') || options.nick || '');
+    	this.age = Misc.queryStringVal('age') || options.age || '';
+    	this.sex = Misc.queryStringVal('sex') || options.sex || '';
+    	this.location = Misc.queryStringVal('location') || options.location || '';
         this.password = options.password || '';
-        this.channel = decodeURI(window.location.hash) || options.channel || '';
+        this.channel = decodeURIComponent(window.location.hash) || options.channel || '';
         this.showChannel = typeof options.showChannel === 'boolean' ?
             options.showChannel :
             true;
@@ -152,13 +197,16 @@ export default {
         this.showPass = typeof options.showPassword === 'boolean' ?
             options.showPassword :
             true;
+        this.toggablePass = typeof options.toggablePassword === 'boolean' ?
+            options.toggablePassword :
+            true;
 
-        if (options.autoConnect && this.nick && this.channel) {
+        this.connectWithoutChannel = !!options.allowNoChannel;
+	
+        if (options.autoConnect && this.nick && (this.channel || this.connectWithoutChannel)) {
             this.startUp();
         }
 
-        this.connectWithoutChannel = !!options.allowNoChannel;
-
         this.recaptchaSiteId = options.recaptchaSiteId || '';
     },
     mounted() {
@@ -210,13 +258,6 @@ export default {
             // Check if we have this network already
             let net = this.network || state.getNetworkFromAddress(netAddress);
 
-            // If we retreived an existing network, update the nick+password with what
-            // the user has just put in place
-            if (net) {
-                net.nick = this.nick;
-                net.connection.password = this.password;
-            }
-
             // If the network doesn't already exist, add a new one
             net = net || state.addNetwork('Network', this.nick, {
                 server: netAddress,
@@ -229,6 +270,12 @@ export default {
                 gecos: this.buildGecos(),
             });
 
+            // If we retreived an existing network, update the nick+password with what
+            // the user has just put in place
+            net.connection.nick = this.nick;
+            net.password = this.password;
+            net.gecos = this.buildGecos();
+
             if (!this.network && options.recaptchaSiteId) {
                 net.captchaResponse = this.captchaResponse();
             }
@@ -251,6 +298,11 @@ export default {
                 }
             });
 
+            // switch to server buffer if no channels are joined
+            if (!hasSwitchedActiveBuffer) {
+                state.setActiveBuffer(net.id, net.serverBuffer().name);
+            }
+
             net.ircClient.connect();
             let onRegistered = () => {
                 if (this.$refs.layout) {
@@ -283,19 +335,57 @@ export default {
 
 <style>
 
-.kiwi-welcome-simple h2 {
+/* Containers */
+
+
+.kiwi-startup-common-section-connection {
+-webkit-box-align: center;
+align-items: center;
+-webkit-box-pack: center;
+justify-content: center;
+}
+
+.kiwi-startup-common-section-connection {
+	overflow-y:auto;
+}
+
+.kiwi-startup-common-section-info {
+-webkit-box-align: center;
+align-items: center;
+-webkit-box-pack: center;
+justify-content: center;
+padding:0px !important;
+}
+
+.kiwi-startup-common-section-info-content {
+	margin:0px !important;
+	padding:0px !important;
+}
+
+form.kiwi-welcome-simple-form {
+    width: 70%;
+    padding: 0 20px;
+}
+
+
+@media (max-width: 1025px) {
+    form.kiwi-welcome-simple-form {
+        width: 100%;
+    }
+}
+
+form.kiwi-welcome-simple-form h2 {
+    margin: 0 0 20px 0;
+    padding: 0;
+    cursor: default;
+    font-weight: 600;
     font-size: 1.7em;
     text-align: center;
-    padding: 0;
-    margin: 0.5em 0 1em 0;
 }
 
-.kiwi-welcome-simple-form {
-    width: 90%;
-    border-radius: 0.5em;
-    padding: 1em;
+form.kiwi-welcome-simple-form label {
+    margin-bottom:5px !important;
 }
-
 .kiwi-welcome-simple-error {
     text-align: center;
     margin: 1em 0;
@@ -317,144 +407,82 @@ export default {
     margin: 0;
 }
 
-.kiwi-welcome-simple-sex {
-    font-weight: 600;
-    color: #b3b3bc;
-    display: inline-block;
-    margin-bottom: 0.8em;
-}
 
-.kiwi-welcome-simple-sex select {
-    border: 0;
-}
-
-.kiwi-welcome-simple-section-connection label {
-    text-align: left;
-    display: inline-block;
-    margin-bottom: 0.8em;
-    padding: 0 0.5em;
-}
-
-.kiwi-welcome-simple-section-connection .input-text input[type="text"] {
-    margin-top: 5px;
-    padding: 0.3em 1em;
+.kiwi-welcome-simple-asl-container {
     width: 100%;
-    font-size: 1.1em;
-    box-sizing: border-box;
-}
-
-.kiwi-welcome-simple .input-text {
-    font-weight: 600;
-    opacity: 0.6;
-    font-size: 1.2em;
-    margin-bottom: 0.8em;
-}
-
-.kiwi-welcome-simple-form input {
-    padding: 0.5em;
-}
-
-.kiwi-welcome-simple-have-password input {
-    font-size: 0.8em;
-    margin: 0.8em 0;
-    margin-top: 2px;
+    height: auto;
+    position: relative;
+    margin: 0 0 0px 0;
+    display:flex;
 }
 
-.kiwi-welcome-simple .g-recaptcha {
-    margin-bottom: 10px;
-}
+.kiwi-welcome-simple-age {
 
-.kiwi-welcome-simple .u-form label span {
-    font-size: 1.1em;
-    margin-left: 5px;
 }
 
-.kiwi-welcome-simple-start {
-    font-size: 1.1em;
-    cursor: pointer;
+.kiwi-welcome-simple-sex {
+    flex:1;
+    margin-left:5px;   
 }
 
-.kiwi-welcome-simple-start[disabled] {
-    cursor: not-allowed;
-    opacity: 0.65;
+.kiwi-welcome-simple-sex-select {
+   -webkit-appearance: button;
+   -webkit-border-radius: 2px;
+   -webkit-box-shadow: 0px;
+   -webkit-padding-end: 20px;
+   -webkit-padding-start: 2px;
+   -webkit-user-select: none;
+   background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' height='32px' width='24px'><text x='0' y='24' fill='grey' style='font: 24px Verdana;'>\00BB</text></svg>"), -webkit-linear-gradient(#FAFAFA, #F4F4F4 40%, #E5E5E5);
+   background-position:95% center;
+   background-repeat: no-repeat;
+   border: 1px solid  !important;
+   border-color: #e2e2e2 !important;
+   border-radius: 5px;
+   color: #555;
+   font-size: inherit;
+   overflow: hidden;
+   padding: 15px 15px;
+   text-overflow: ellipsis;
+   white-space: nowrap;
+   box-sizing: border-box;
+   width:100%;
 }
 
-.kiwi-welcome-simple-channel {
-    margin-bottom: 0.8em;
+.kiwi-welcome-simple-sex-select:focus {
+    outline: 0;
+    border-color:#42b992 !important;
 }
 
-.kiwi-welcome-simple-form .u-submit {
+.kiwi-welcome-simple-form .kiwi-welcome-simple-input-container {
     width: 100%;
-    line-height: 50px;
-    padding: 0;
-    text-transform: uppercase;
-    letter-spacing: 1px;
-    font-weight: 400;
-    text-shadow: none;
-    margin: 0;
-    transition: all 0.2s;
-    border: none;
+    height: auto;
+    position: relative;
+    margin: 0 0 10x 0;
 }
 
-.kiwi-welcome-simple .help {
-    position: absolute;
-    bottom: 0.2em;
-    font-size: 0.8em;
-    width: 50%;
-    text-align: center;
+.kiwi-welcome-simple-input-container .u-input-text {
+    margin-top: 0px !important;
 }
 
-.kiwi-welcome-simple .help a {
-    text-decoration: underline;
+.kiwi-welcome-simple-input-container:last-of-type {
+    margin-top:0px !important;
+    margin-bottom:0px !important;
 }
 
-/* Styling the preloader */
+/* Make the preloader icon larger */
 .kiwi-welcome-simple .fa-spinner {
-    position: absolute;
-    top: 50%;
-    z-index: 999;
-    font-size: 100px;
-    margin-top: -0.5em;
-    left: 50%;
-    margin-left: -40px;
+    font-size:6em;
 }
 
-/** Smaller screen... **/
-@media screen and (max-width: 850px) {
-    .kiwi-welcome-simple-form {
-        left: auto;
-        margin: 20px auto 20px auto;
-        z-index: 100;
-        position: relative;
-        top: auto;
-        align-self: flex-start;
-    }
-
-    .kiwi-welcome-simple p.help {
-        position: absolute;
-        bottom: 20px;
-        width: 100%;
-        color: #fff;
-        z-index: 100;
-    }
+@media (max-height: 720px) {
 
-    .kiwi-welcome-simple p.help a {
-        color: #fff;
+    .kiwi-startup-common-section-connection {
+    -webkit-box-align: start;
+    align-items: start;
+    -webkit-box-pack: center;
+    justify-content: center;
     }
 
-    .fa-spinner {
-        position: absolute;
-        left: 48%;
-        top: 50%;
-        margin-top: -50px;
-        color: #fff;
-    }
-}
-
-@media (max-width: 400px) {
-    .kiwi-welcome-simple-form {
-        width: 90%;
-    }
 }
 
 </style>
diff --git a/libs/utils.js b/src/libs/utils.js
similarity index 85%
rename from libs/utils.js
rename to src/libs/utils.js
index e697871..61ca0b8 100644
--- a/libs/utils.js
+++ b/src/libs/utils.js
@@ -1,6 +1,6 @@
 export function getASL(str) {
 	let result = str.match(/\[(\d+|U)\/([MFOU])\/(.*)\]/);
-	let sex = {'M': 'Male', 'F': 'Female', 'O': 'Other'};
+	let sex = {'M': 'Uomo', 'F': 'Donna', 'O': 'Altro'};
 	if (result && result.length === 4) {
         let a = result[1] === 'U' ? null : result[1];
         let s = result[2] === 'U' ? null : sex[result[2]];
diff --git a/custom-welcome.js b/src/plugin.js
similarity index 58%
rename from custom-welcome.js
rename to src/plugin.js
index 4278cd6..feb70ff 100644
--- a/custom-welcome.js
+++ b/src/plugin.js
@@ -1,12 +1,25 @@
 import CustomWelcome from './components/CustomWelcome.vue';
 import CustomUserBox from './components/CustomUserBox.vue';
+import CustomNicklistUser from './components/CustomNicklistUser.vue';
 import * as utils from './libs/utils.js';
 
 // eslint-disable-next-line no-undef
 kiwi.plugin('custom-welcome', (kiwi) => {
     kiwi.addStartup('custom-welcome', CustomWelcome);
     kiwi.replaceModule('components/UserBox', CustomUserBox);
+    kiwi.replaceModule('components/NicklistUser', CustomNicklistUser);
+    
+    let icons = true;
+    let colours = true;
+    
+    if(kiwi.state.setting('asl.icons') === false) {
+        icons = kiwi.state.setting('asl.icons');
+    }
 
+    if(kiwi.state.setting('asl.colours') === false) {
+        colours = kiwi.state.setting('asl.colours');
+    }
+    
     kiwi.on('irc.join', function(event, net) {
         if (event.gecos) {
             kiwi.state.addUser(net, {
@@ -14,7 +27,8 @@ kiwi.plugin('custom-welcome', (kiwi) => {
                 username: event.ident,
                 host: event.hostname,
                 realname: event.gecos,
-                colour: getColour(event.gecos),
+                colour: (colours == true ) ? getColour(event.gecos) : '',
+                gender : (icons == true ) ? getGender(event.gecos) : null ,
             });
         }
     });
@@ -23,7 +37,8 @@ kiwi.plugin('custom-welcome', (kiwi) => {
         event.users.forEach((user) => {
             kiwi.state.addUser(net, {
                 nick: user.nick,
-                colour: getColour(user.real_name),
+                colour: (colours == true ) ? getColour(user.real_name) : '',
+                gender : (icons == true ) ? getGender(user.real_name) : null ,
             });
         });
     });
@@ -42,5 +57,10 @@ kiwi.plugin('custom-welcome', (kiwi) => {
             return '#000';
         }
     }
-});
 
+    function getGender(gecos) {
+        let asl = utils.getASL(gecos);
+        return asl.s;
+    }
+
+});
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index a4b6d4e..2601b2a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -3,9 +3,9 @@ const VueLoaderPlugin = require('vue-loader/lib/plugin');
 
 module.exports = {
     mode: 'production',
-    entry: './custom-welcome.js',
+    entry: './src/plugin.js',
     output: {
-        filename: 'plugin-custom-welcome-asl.js',
+        filename: 'asl.js',
     },
     module: {
         rules: [
@@ -15,7 +15,10 @@ module.exports = {
             },
             {
                 test: /\.js$/,
-                loader: 'babel-loader',
+                use: [{loader: 'exports-loader'}, {loader: 'babel-loader'}],
+                include: [
+                    path.join(__dirname, 'src')
+                ]
             },
             {
                 test: /\.css$/,
@@ -30,11 +33,10 @@ module.exports = {
     plugins: [
         new VueLoaderPlugin()
     ],
-    devtool: 'source-map',
     devServer: {
-        filename: 'plugin-custom-welcome-asl.js',
+        filename: 'asl.js',
         contentBase: path.join(__dirname, "dist"),
         compress: true,
         port: 9000
     }
-};
\ No newline at end of file
+};
diff --git a/yarn.lock b/yarn.lock
index d57a02c..0e5d474 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -898,7 +898,7 @@ babel-plugin-transform-async-generator-functions@^6.24.1:
     babel-plugin-syntax-async-generators "^6.5.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-async-to-generator@^6.24.1:
+babel-plugin-transform-async-to-generator@^6.22.0, babel-plugin-transform-async-to-generator@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
   integrity sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=
@@ -951,7 +951,7 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-block-scoping@^6.24.1:
+babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es2015-block-scoping@^6.24.1:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
   integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=
@@ -962,7 +962,7 @@ babel-plugin-transform-es2015-block-scoping@^6.24.1:
     babel-types "^6.26.0"
     lodash "^4.17.4"
 
-babel-plugin-transform-es2015-classes@^6.24.1:
+babel-plugin-transform-es2015-classes@^6.23.0, babel-plugin-transform-es2015-classes@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
   integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=
@@ -977,7 +977,7 @@ babel-plugin-transform-es2015-classes@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-computed-properties@^6.24.1:
+babel-plugin-transform-es2015-computed-properties@^6.22.0, babel-plugin-transform-es2015-computed-properties@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
   integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=
@@ -985,14 +985,14 @@ babel-plugin-transform-es2015-computed-properties@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-destructuring@^6.22.0:
+babel-plugin-transform-es2015-destructuring@^6.22.0, babel-plugin-transform-es2015-destructuring@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
   integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-duplicate-keys@^6.24.1:
+babel-plugin-transform-es2015-duplicate-keys@^6.22.0, babel-plugin-transform-es2015-duplicate-keys@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
   integrity sha1-c+s9MQypaePvnskcU3QabxV2Qj4=
@@ -1000,14 +1000,14 @@ babel-plugin-transform-es2015-duplicate-keys@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-for-of@^6.22.0:
+babel-plugin-transform-es2015-for-of@^6.22.0, babel-plugin-transform-es2015-for-of@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
   integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-function-name@^6.24.1:
+babel-plugin-transform-es2015-function-name@^6.22.0, babel-plugin-transform-es2015-function-name@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
   integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=
@@ -1023,7 +1023,7 @@ babel-plugin-transform-es2015-literals@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-modules-amd@^6.24.1:
+babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
   integrity sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=
@@ -1032,7 +1032,7 @@ babel-plugin-transform-es2015-modules-amd@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
   version "6.26.2"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
   integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==
@@ -1042,7 +1042,7 @@ babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
     babel-template "^6.26.0"
     babel-types "^6.26.0"
 
-babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
+babel-plugin-transform-es2015-modules-systemjs@^6.23.0, babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
   integrity sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=
@@ -1051,7 +1051,7 @@ babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-modules-umd@^6.24.1:
+babel-plugin-transform-es2015-modules-umd@^6.23.0, babel-plugin-transform-es2015-modules-umd@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
   integrity sha1-rJl+YoXNGO1hdq22B9YCNErThGg=
@@ -1060,7 +1060,7 @@ babel-plugin-transform-es2015-modules-umd@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-object-super@^6.24.1:
+babel-plugin-transform-es2015-object-super@^6.22.0, babel-plugin-transform-es2015-object-super@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
   integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40=
@@ -1068,7 +1068,7 @@ babel-plugin-transform-es2015-object-super@^6.24.1:
     babel-helper-replace-supers "^6.24.1"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-parameters@^6.24.1:
+babel-plugin-transform-es2015-parameters@^6.23.0, babel-plugin-transform-es2015-parameters@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
   integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=
@@ -1080,7 +1080,7 @@ babel-plugin-transform-es2015-parameters@^6.24.1:
     babel-traverse "^6.24.1"
     babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0, babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
   integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=
@@ -1095,7 +1095,7 @@ babel-plugin-transform-es2015-spread@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-sticky-regex@^6.24.1:
+babel-plugin-transform-es2015-sticky-regex@^6.22.0, babel-plugin-transform-es2015-sticky-regex@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
   integrity sha1-AMHNsaynERLN8M9hJsLta0V8zbw=
@@ -1111,14 +1111,14 @@ babel-plugin-transform-es2015-template-literals@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-typeof-symbol@^6.22.0:
+babel-plugin-transform-es2015-typeof-symbol@^6.22.0, babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
   integrity sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-unicode-regex@^6.24.1:
+babel-plugin-transform-es2015-unicode-regex@^6.22.0, babel-plugin-transform-es2015-unicode-regex@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
   integrity sha1-04sS9C6nMj9yk4fxinxa4frrNek=
@@ -1127,7 +1127,7 @@ babel-plugin-transform-es2015-unicode-regex@^6.24.1:
     babel-runtime "^6.22.0"
     regexpu-core "^2.0.0"
 
-babel-plugin-transform-exponentiation-operator@^6.24.1:
+babel-plugin-transform-exponentiation-operator@^6.22.0, babel-plugin-transform-exponentiation-operator@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
   integrity sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=
@@ -1160,13 +1160,20 @@ babel-plugin-transform-object-rest-spread@^6.22.0:
     babel-plugin-syntax-object-rest-spread "^6.8.0"
     babel-runtime "^6.26.0"
 
-babel-plugin-transform-regenerator@^6.24.1:
+babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.24.1:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
   integrity sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=
   dependencies:
     regenerator-transform "^0.10.0"
 
+babel-plugin-transform-runtime@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
+  integrity sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=
+  dependencies:
+    babel-runtime "^6.22.0"
+
 babel-plugin-transform-strict-mode@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
@@ -1175,6 +1182,42 @@ babel-plugin-transform-strict-mode@^6.24.1:
     babel-runtime "^6.22.0"
     babel-types "^6.24.1"
 
+babel-preset-env@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
+  integrity sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-syntax-trailing-function-commas "^6.22.0"
+    babel-plugin-transform-async-to-generator "^6.22.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoping "^6.23.0"
+    babel-plugin-transform-es2015-classes "^6.23.0"
+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-destructuring "^6.23.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-for-of "^6.23.0"
+    babel-plugin-transform-es2015-function-name "^6.22.0"
+    babel-plugin-transform-es2015-literals "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.22.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
+    babel-plugin-transform-es2015-modules-umd "^6.23.0"
+    babel-plugin-transform-es2015-object-super "^6.22.0"
+    babel-plugin-transform-es2015-parameters "^6.23.0"
+    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
+    babel-plugin-transform-es2015-spread "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
+    babel-plugin-transform-es2015-template-literals "^6.22.0"
+    babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
+    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-regenerator "^6.22.0"
+    browserslist "^3.2.6"
+    invariant "^2.2.2"
+    semver "^5.3.0"
+
 babel-preset-es2015@^6.9.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
@@ -1509,7 +1552,7 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
-browserslist@^3.2.8:
+browserslist@^3.2.6, browserslist@^3.2.8:
   version "3.2.8"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
   integrity sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==
@@ -3048,6 +3091,14 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
+exports-loader@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/exports-loader/-/exports-loader-0.7.0.tgz#84881c784dea6036b8e1cd1dac3da9b6409e21a5"
+  integrity sha512-RKwCrO4A6IiKm0pG3c9V46JxIHcDplwwGJn6+JJ1RcVnh/WSGJa0xkmk5cRVtgOPzCAtTMGj2F7nluh9L0vpSA==
+  dependencies:
+    loader-utils "^1.1.0"
+    source-map "0.5.0"
+
 express@^4.16.2:
   version "4.16.3"
   resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
@@ -7418,6 +7469,11 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
+source-map@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.0.tgz#0fe96503ac86a5adb5de63f4e412ae4872cdbe86"
+  integrity sha1-D+llA6yGpa213mP05BKuSHLNvoY=
+
 source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
@@ -8383,10 +8439,10 @@ vue-style-loader@^4.1.0:
     hash-sum "^1.0.2"
     loader-utils "^1.0.2"
 
-vue-template-compiler@^2.0.0:
-  version "2.5.16"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.5.16.tgz#93b48570e56c720cdf3f051cc15287c26fbd04cb"
-  integrity sha512-ZbuhCcF/hTYmldoUOVcu2fcbeSAZnfzwDskGduOrnjBiIWHgELAd+R8nAtX80aZkceWDKGQ6N9/0/EUpt+l22A==
+vue-template-compiler@^2.6.10:
+  version "2.6.10"
+  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.10.tgz#323b4f3495f04faa3503337a82f5d6507799c9cc"
+  integrity sha512-jVZkw4/I/HT5ZMvRnhv78okGusqe0+qH2A0Em0Cp8aq78+NK9TII263CDVz2QXZsIT+yyV/gZc/j/vlwa+Epyg==
   dependencies:
     de-indent "^1.0.2"
     he "^1.1.0"